Merge "Fix a transient view crash."
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 77b26f8..131d5e2 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -32,23 +32,12 @@
}
/////////////////////////////////////////////////////////////////////
-// Common metalava configs
-/////////////////////////////////////////////////////////////////////
-
-stubs_defaults {
- name: "metalava-non-updatable-api-stubs-default",
- defaults: ["android-non-updatable-stubs-defaults"],
- api_levels_annotations_enabled: false,
- defaults_visibility: ["//visibility:private"],
-}
-
-/////////////////////////////////////////////////////////////////////
// These modules provide source files for the stub libraries
/////////////////////////////////////////////////////////////////////
droidstubs {
name: "api-stubs-docs-non-updatable",
- defaults: ["metalava-non-updatable-api-stubs-default"],
+ defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args,
check_api: {
current: {
@@ -97,7 +86,7 @@
droidstubs {
name: "system-api-stubs-docs-non-updatable",
- defaults: ["metalava-non-updatable-api-stubs-default"],
+ defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + priv_apps,
check_api: {
current: {
@@ -133,7 +122,7 @@
droidstubs {
name: "test-api-stubs-docs-non-updatable",
- defaults: ["metalava-non-updatable-api-stubs-default"],
+ defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + test + priv_apps_in_stubs,
check_api: {
current: {
@@ -175,7 +164,7 @@
droidstubs {
name: "module-lib-api-stubs-docs-non-updatable",
- defaults: ["metalava-non-updatable-api-stubs-default"],
+ defaults: ["android-non-updatable-stubs-defaults"],
args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,
check_api: {
current: {
diff --git a/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java b/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java
index cf94e9e..4cd9741 100644
--- a/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java
+++ b/apct-tests/perftests/core/src/android/view/HandwritingInitiatorPerfTest.java
@@ -25,7 +25,6 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.graphics.Rect;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
import android.view.inputmethod.EditorInfo;
@@ -190,7 +189,7 @@
final View view = new View(mContext);
final EditorInfo editorInfo = new EditorInfo();
while (state.keepRunning()) {
- mHandwritingInitiator.onInputConnectionCreated(view, editorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(view);
state.pauseTiming();
mHandwritingInitiator.onInputConnectionClosed(view);
state.resumeTiming();
@@ -201,24 +200,14 @@
public void onInputConnectionClosed() {
final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
final View view = new View(mContext);
- final EditorInfo editorInfo = new EditorInfo();
while (state.keepRunning()) {
state.pauseTiming();
- mHandwritingInitiator.onInputConnectionCreated(view, editorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(view);
state.resumeTiming();
mHandwritingInitiator.onInputConnectionClosed(view);
}
}
- @Test
- public void updateEditorBoundary() {
- final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
- final Rect rect = new Rect(0, 0, 100, 100);
- while (state.keepRunning()) {
- mHandwritingInitiator.updateEditorBound(rect);
- }
- }
-
private MotionEvent createMotionEvent(int action, int toolType, int x, int y, long eventTime) {
MotionEvent.PointerProperties[] properties = MotionEvent.PointerProperties.createArray(1);
properties[0].toolType = toolType;
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
index 4de8ec8..dd102bd 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java
@@ -892,7 +892,8 @@
}
if (history.bucketExpiryTimesMs != null) {
xml.startTag(null, TAG_BUCKET_EXPIRY_TIMES);
- for (int j = 0; j < history.bucketExpiryTimesMs.size(); ++j) {
+ final int size = history.bucketExpiryTimesMs.size();
+ for (int j = 0; j < size; ++j) {
final long expiryTimeMs = history.bucketExpiryTimesMs.valueAt(j);
// Skip writing to disk if the expiry time already elapsed.
if (expiryTimeMs < elapsedTimeMs) {
@@ -994,7 +995,8 @@
return;
}
idpw.print("(");
- for (int i = 0; i < appUsageHistory.bucketExpiryTimesMs.size(); ++i) {
+ final int size = appUsageHistory.bucketExpiryTimesMs.size();
+ for (int i = 0; i < size; ++i) {
final int bucket = appUsageHistory.bucketExpiryTimesMs.keyAt(i);
final long expiryTimeMs = appUsageHistory.bucketExpiryTimesMs.valueAt(i);
if (i != 0) {
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index ee09952..0ad70e4 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -183,7 +183,7 @@
COMPRESS_TIME ? 1 * ONE_MINUTE : 12 * ONE_HOUR,
COMPRESS_TIME ? 4 * ONE_MINUTE : 24 * ONE_HOUR,
COMPRESS_TIME ? 16 * ONE_MINUTE : 48 * ONE_HOUR,
- COMPRESS_TIME ? 32 * ONE_MINUTE : 45 * ONE_DAY
+ COMPRESS_TIME ? 32 * ONE_MINUTE : 3 * ONE_DAY
};
/** The minimum allowed values for each index in {@link #DEFAULT_ELAPSED_TIME_THRESHOLDS}. */
@@ -2540,7 +2540,7 @@
switch (name) {
case KEY_AUTO_RESTRICTED_BUCKET_DELAY_MS:
mInjector.mAutoRestrictedBucketDelayMs = Math.max(
- COMPRESS_TIME ? ONE_MINUTE : 2 * ONE_HOUR,
+ COMPRESS_TIME ? ONE_MINUTE : 4 * ONE_HOUR,
properties.getLong(KEY_AUTO_RESTRICTED_BUCKET_DELAY_MS,
DEFAULT_AUTO_RESTRICTED_BUCKET_DELAY_MS));
break;
diff --git a/apex/media/framework/java/android/media/MediaSession2Service.java b/apex/media/framework/java/android/media/MediaSession2Service.java
index f6fd509..9f80c43 100644
--- a/apex/media/framework/java/android/media/MediaSession2Service.java
+++ b/apex/media/framework/java/android/media/MediaSession2Service.java
@@ -161,19 +161,19 @@
public abstract MediaSession2 onGetSession(@NonNull ControllerInfo controllerInfo);
/**
- * Called when notification UI needs update. Override this method to show or cancel your own
- * notification UI.
+ * Called to update the media notification when the playback state changes.
* <p>
- * This would be called on {@link MediaSession2}'s callback executor when playback state is
- * changed.
+ * If playback is active and a notification is returned, the service uses it to become a
+ * foreground service. If playback is not active then the notification is still posted, but the
+ * service does not become a foreground service.
* <p>
- * With the notification returned here, the service becomes foreground service when the playback
- * is started. Apps must request the permission
- * {@link android.Manifest.permission#FOREGROUND_SERVICE} in order to use this API. It becomes
- * background service after the playback is stopped.
+ * Apps must request the {@link android.Manifest.permission#FOREGROUND_SERVICE} permission
+ * in order to use this API. For apps targeting {@link android.os.Build.VERSION_CODES#TIRAMISU}
+ * or later, notifications will only be posted if the app has also been granted the
+ * {@link android.Manifest.permission#POST_NOTIFICATIONS} permission.
*
- * @param session a session that needs notification update.
- * @return a {@link MediaNotification}. Can be {@code null}.
+ * @param session the session for which an updated media notification is required.
+ * @return the {@link MediaNotification}. Can be {@code null}.
*/
@Nullable
public abstract MediaNotification onUpdateNotification(@NonNull MediaSession2 session);
diff --git a/api/Android.bp b/api/Android.bp
index 362f39f..a22c2f6 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -133,6 +133,7 @@
system_server_classpath: [
"service-media-s",
"service-permission",
+ "service-supplementalprocess",
],
}
diff --git a/core/api/current.txt b/core/api/current.txt
index 5145f03b..78d4b4d 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -125,11 +125,13 @@
field public static final String POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";
field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
+ field public static final String READ_ASSISTANT_APP_SEARCH_DATA = "android.permission.READ_ASSISTANT_APP_SEARCH_DATA";
field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE";
field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";
field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
+ field public static final String READ_HOME_APP_SEARCH_DATA = "android.permission.READ_HOME_APP_SEARCH_DATA";
field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
field public static final String READ_LOGS = "android.permission.READ_LOGS";
field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY";
@@ -824,6 +826,7 @@
field public static final int indicatorRight = 16843022; // 0x101010e
field public static final int indicatorStart = 16843729; // 0x10103d1
field public static final int inflatedId = 16842995; // 0x10100f3
+ field public static final int inheritKeyStoreKeys;
field public static final int inheritShowWhenLocked = 16844188; // 0x101059c
field public static final int initOrder = 16842778; // 0x101001a
field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
@@ -1132,6 +1135,7 @@
field public static final int popupWindowStyle = 16842870; // 0x1010076
field public static final int port = 16842793; // 0x1010029
field public static final int positiveButtonText = 16843253; // 0x10101f5
+ field public static final int preferKeepClear;
field public static final int preferMinimalPostProcessing = 16844300; // 0x101060c
field public static final int preferenceCategoryStyle = 16842892; // 0x101008c
field public static final int preferenceFragmentStyle = 16844038; // 0x1010506
@@ -7291,10 +7295,10 @@
method @Nullable public java.util.List<java.lang.String> getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String);
method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String);
method public CharSequence getDeviceOwnerLockScreenInfo();
- method @Nullable public android.graphics.drawable.Drawable getDrawable(int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
- method @Nullable public android.graphics.drawable.Drawable getDrawable(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
- method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
- method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
+ method @NonNull public android.graphics.drawable.Drawable getDrawable(int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
+ method @NonNull public android.graphics.drawable.Drawable getDrawable(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
+ method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
+ method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);
method @NonNull public String getEnrollmentSpecificId();
method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);
@@ -7311,6 +7315,7 @@
method public int getMaximumFailedPasswordsForWipe(@Nullable android.content.ComponentName);
method public long getMaximumTimeToLock(@Nullable android.content.ComponentName);
method @NonNull public java.util.List<java.lang.String> getMeteredDataDisabledPackages(@NonNull android.content.ComponentName);
+ method public int getMinimumRequiredWifiSecurityLevel();
method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyAppStreamingPolicy();
method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyNotificationStreamingPolicy();
method @Deprecated @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName);
@@ -7351,6 +7356,7 @@
method @NonNull public java.util.List<java.lang.String> getUserControlDisabledPackages(@NonNull android.content.ComponentName);
method @NonNull public android.os.Bundle getUserRestrictions(@NonNull android.content.ComponentName);
method @Nullable public String getWifiMacAddress(@NonNull android.content.ComponentName);
+ method @Nullable public android.app.admin.WifiSsidPolicy getWifiSsidPolicy();
method public boolean grantKeyPairToApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);
method public boolean grantKeyPairToWifiAuth(@NonNull String);
method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);
@@ -7455,6 +7461,7 @@
method public void setMaximumFailedPasswordsForWipe(@NonNull android.content.ComponentName, int);
method public void setMaximumTimeToLock(@NonNull android.content.ComponentName, long);
method @NonNull public java.util.List<java.lang.String> setMeteredDataDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
+ method public void setMinimumRequiredWifiSecurityLevel(int);
method public void setNearbyAppStreamingPolicy(int);
method public void setNearbyNotificationStreamingPolicy(int);
method public void setNetworkLoggingEnabled(@Nullable android.content.ComponentName, boolean);
@@ -7503,6 +7510,7 @@
method public void setUsbDataSignalingEnabled(boolean);
method public void setUserControlDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
method public void setUserIcon(@NonNull android.content.ComponentName, android.graphics.Bitmap);
+ method public void setWifiSsidPolicy(@Nullable android.app.admin.WifiSsidPolicy);
method public int startUserInBackground(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
method public int stopUser(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
method public boolean switchUser(@NonNull android.content.ComponentName, @Nullable android.os.UserHandle);
@@ -7554,6 +7562,7 @@
field public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE";
field public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";
field public static final String EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES = "android.app.extra.PROVISIONING_ALLOWED_PROVISIONING_MODES";
+ field public static final String EXTRA_PROVISIONING_ALLOW_OFFLINE = "android.app.extra.PROVISIONING_ALLOW_OFFLINE";
field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME";
field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";
field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";
@@ -7597,6 +7606,7 @@
field public static final String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE";
field public static final String EXTRA_RESOURCE_ID = "android.app.extra.RESOURCE_ID";
field public static final String EXTRA_RESOURCE_TYPE_DRAWABLE = "android.app.extra.RESOURCE_TYPE_DRAWABLE";
+ field public static final String EXTRA_RESOURCE_TYPE_STRING = "android.app.extra.RESOURCE_TYPE_STRING";
field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1
field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2
field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1
@@ -7671,6 +7681,10 @@
field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2
field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1
field public static final int SKIP_SETUP_WIZARD = 1; // 0x1
+ field public static final int WIFI_SECURITY_ENTERPRISE_192 = 3; // 0x3
+ field public static final int WIFI_SECURITY_ENTERPRISE_EAP = 2; // 0x2
+ field public static final int WIFI_SECURITY_OPEN = 0; // 0x0
+ field public static final int WIFI_SECURITY_PERSONAL = 1; // 0x1
field public static final int WIPE_EUICC = 4; // 0x4
field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1
field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
@@ -7858,6 +7872,18 @@
field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
}
+ public final class WifiSsidPolicy implements android.os.Parcelable {
+ method @NonNull public static android.app.admin.WifiSsidPolicy createAllowlistPolicy(@NonNull java.util.Set<java.lang.String>);
+ method @NonNull public static android.app.admin.WifiSsidPolicy createDenylistPolicy(@NonNull java.util.Set<java.lang.String>);
+ method public int describeContents();
+ method public int getPolicyType();
+ method @NonNull public java.util.Set<java.lang.String> getSsids();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.WifiSsidPolicy> CREATOR;
+ field public static final int WIFI_SSID_POLICY_TYPE_ALLOWLIST = 0; // 0x0
+ field public static final int WIFI_SSID_POLICY_TYPE_DENYLIST = 1; // 0x1
+ }
+
}
package android.app.assist {
@@ -8850,11 +8876,12 @@
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean isDiscovering();
method public boolean isEnabled();
method public boolean isLe2MPhySupported();
+ method public int isLeAudioBroadcastAssistantSupported();
+ method public int isLeAudioBroadcastSourceSupported();
method public int isLeAudioSupported();
method public boolean isLeCodedPhySupported();
method public boolean isLeExtendedAdvertisingSupported();
method public boolean isLePeriodicAdvertisingSupported();
- method public int isLePeriodicAdvertisingSyncTransferSenderSupported();
method public boolean isMultipleAdvertisementSupported();
method public boolean isOffloadedFilteringSupported();
method public boolean isOffloadedScanBatchingSupported();
@@ -9718,6 +9745,7 @@
method public void close();
method protected void finalize();
method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothDevice getConnectedGroupLeadDevice(int);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getGroupId(@NonNull android.bluetooth.BluetoothDevice);
@@ -9756,6 +9784,7 @@
field public static final String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
field public static final int GATT = 7; // 0x7
field public static final int GATT_SERVER = 8; // 0x8
+ field public static final int HAP_CLIENT = 28; // 0x1c
field public static final int HEADSET = 1; // 0x1
field @Deprecated public static final int HEALTH = 3; // 0x3
field public static final int HEARING_AID = 21; // 0x15
@@ -10931,10 +10960,10 @@
method @Nullable public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void removeStickyBroadcast(@RequiresPermission android.content.Intent);
method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void removeStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);
+ method public void revokeOwnPermissionOnKill(@NonNull String);
+ method public void revokeOwnPermissionsOnKill(@NonNull java.util.Collection<java.lang.String>);
method public abstract void revokeUriPermission(android.net.Uri, int);
method public abstract void revokeUriPermission(String, android.net.Uri, int);
- method public void selfRevokePermission(@NonNull String);
- method public void selfRevokePermissions(@NonNull java.util.Collection<java.lang.String>);
method public abstract void sendBroadcast(@RequiresPermission android.content.Intent);
method public abstract void sendBroadcast(@RequiresPermission android.content.Intent, @Nullable String);
method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);
@@ -11062,8 +11091,8 @@
field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";
field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
- field public static final String TV_IAPP_SERVICE = "tv_iapp";
field public static final String TV_INPUT_SERVICE = "tv_input";
+ field public static final String TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";
field public static final String UI_MODE_SERVICE = "uimode";
field public static final String USAGE_STATS_SERVICE = "usagestats";
field public static final String USB_SERVICE = "usb";
@@ -13182,6 +13211,7 @@
field public static final String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
field public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";
field public static final String FEATURE_WIFI_RTT = "android.hardware.wifi.rtt";
+ field public static final String FEATURE_WINDOW_MAGNIFICATION = "android.software.window_magnification";
field public static final int FLAG_PERMISSION_WHITELIST_INSTALLER = 2; // 0x2
field public static final int FLAG_PERMISSION_WHITELIST_SYSTEM = 1; // 0x1
field public static final int FLAG_PERMISSION_WHITELIST_UPGRADE = 4; // 0x4
@@ -13474,6 +13504,7 @@
public final class ShortcutInfo implements android.os.Parcelable {
method public int describeContents();
method @Nullable public android.content.ComponentName getActivity();
+ method @NonNull public java.util.List<java.lang.String> getCapabilityParameterValues(@NonNull String, @NonNull String);
method @Nullable public java.util.Set<java.lang.String> getCategories();
method @Nullable public CharSequence getDisabledMessage();
method public int getDisabledReason();
@@ -13488,6 +13519,7 @@
method public int getRank();
method @Nullable public CharSequence getShortLabel();
method public android.os.UserHandle getUserHandle();
+ method public boolean hasCapability(@NonNull String);
method public boolean hasKeyFieldsOnly();
method public boolean isCached();
method public boolean isDeclaredInManifest();
@@ -13512,6 +13544,7 @@
public static class ShortcutInfo.Builder {
ctor public ShortcutInfo.Builder(android.content.Context, String);
+ method @NonNull public android.content.pm.ShortcutInfo.Builder addCapabilityBinding(@NonNull String, @Nullable String, @Nullable java.util.List<java.lang.String>);
method @NonNull public android.content.pm.ShortcutInfo build();
method @NonNull public android.content.pm.ShortcutInfo.Builder setActivity(@NonNull android.content.ComponentName);
method @NonNull public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
@@ -18046,6 +18079,7 @@
field public static final long USAGE_CPU_READ_RARELY = 2L; // 0x2L
field public static final long USAGE_CPU_WRITE_OFTEN = 48L; // 0x30L
field public static final long USAGE_CPU_WRITE_RARELY = 32L; // 0x20L
+ field public static final long USAGE_FRONT_BUFFER = 1L; // 0x1L
field public static final long USAGE_GPU_COLOR_OUTPUT = 512L; // 0x200L
field public static final long USAGE_GPU_CUBE_MAP = 33554432L; // 0x2000000L
field public static final long USAGE_GPU_DATA_BUFFER = 16777216L; // 0x1000000L
@@ -22072,14 +22106,30 @@
public class ImageWriter implements java.lang.AutoCloseable {
method public void close();
method public android.media.Image dequeueInputImage();
+ method public long getDataSpace();
method public int getFormat();
+ method public int getHardwareBufferFormat();
+ method public int getHeight();
method public int getMaxImages();
+ method public long getUsage();
+ method public int getWidth();
method @NonNull public static android.media.ImageWriter newInstance(@NonNull android.view.Surface, @IntRange(from=1) int);
method @NonNull public static android.media.ImageWriter newInstance(@NonNull android.view.Surface, @IntRange(from=1) int, int);
method public void queueInputImage(android.media.Image);
method public void setOnImageReleasedListener(android.media.ImageWriter.OnImageReleasedListener, android.os.Handler);
}
+ public static final class ImageWriter.Builder {
+ ctor public ImageWriter.Builder(@NonNull android.view.Surface);
+ method @NonNull public android.media.ImageWriter build();
+ method @NonNull public android.media.ImageWriter.Builder setDataSpace(long);
+ method @NonNull public android.media.ImageWriter.Builder setHardwareBufferFormat(int);
+ method @NonNull public android.media.ImageWriter.Builder setImageFormat(int);
+ method @NonNull public android.media.ImageWriter.Builder setMaxImages(@IntRange(from=1) int);
+ method @NonNull public android.media.ImageWriter.Builder setUsage(long);
+ method @NonNull public android.media.ImageWriter.Builder setWidthAndHeight(@IntRange(from=1) int, @IntRange(from=1) int);
+ }
+
public static interface ImageWriter.OnImageReleasedListener {
method public void onImageReleased(android.media.ImageWriter);
}
@@ -22491,6 +22541,7 @@
field @Deprecated public static final int COLOR_TI_FormatYUV420PackedSemiPlanar = 2130706688; // 0x7f000100
field public static final String FEATURE_AdaptivePlayback = "adaptive-playback";
field public static final String FEATURE_DynamicTimestamp = "dynamic-timestamp";
+ field public static final String FEATURE_EncodingStatistics = "encoding-statistics";
field public static final String FEATURE_FrameParsing = "frame-parsing";
field public static final String FEATURE_IntraRefresh = "intra-refresh";
field public static final String FEATURE_LowLatency = "low-latency";
@@ -23265,6 +23316,7 @@
field public static final String KEY_OPERATING_RATE = "operating-rate";
field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";
field public static final String KEY_PCM_ENCODING = "pcm-encoding";
+ field public static final String KEY_PICTURE_TYPE = "picture-type";
field public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";
field public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";
field public static final String KEY_PREPEND_HEADER_TO_SYNC_FRAMES = "prepend-sps-pps-to-idr-frames";
@@ -23282,6 +23334,8 @@
field public static final String KEY_TILE_HEIGHT = "tile-height";
field public static final String KEY_TILE_WIDTH = "tile-width";
field public static final String KEY_TRACK_ID = "track-id";
+ field public static final String KEY_VIDEO_ENCODING_STATISTICS_LEVEL = "video-encoding-statistics-level";
+ field public static final String KEY_VIDEO_QP_AVERAGE = "video-qp-average";
field public static final String KEY_VIDEO_QP_B_MAX = "video-qp-b-max";
field public static final String KEY_VIDEO_QP_B_MIN = "video-qp-b-min";
field public static final String KEY_VIDEO_QP_I_MAX = "video-qp-i-max";
@@ -23342,12 +23396,18 @@
field public static final String MIMETYPE_VIDEO_SCRAMBLED = "video/scrambled";
field public static final String MIMETYPE_VIDEO_VP8 = "video/x-vnd.on2.vp8";
field public static final String MIMETYPE_VIDEO_VP9 = "video/x-vnd.on2.vp9";
+ field public static final int PICTURE_TYPE_B = 3; // 0x3
+ field public static final int PICTURE_TYPE_I = 1; // 0x1
+ field public static final int PICTURE_TYPE_P = 2; // 0x2
+ field public static final int PICTURE_TYPE_UNKNOWN = 0; // 0x0
field public static final int TYPE_BYTE_BUFFER = 5; // 0x5
field public static final int TYPE_FLOAT = 3; // 0x3
field public static final int TYPE_INTEGER = 1; // 0x1
field public static final int TYPE_LONG = 2; // 0x2
field public static final int TYPE_NULL = 0; // 0x0
field public static final int TYPE_STRING = 4; // 0x4
+ field public static final int VIDEO_ENCODING_STATISTICS_LEVEL_1 = 1; // 0x1
+ field public static final int VIDEO_ENCODING_STATISTICS_LEVEL_NONE = 0; // 0x0
}
public final class MediaMetadata implements android.os.Parcelable {
@@ -25775,12 +25835,12 @@
}
public final class MidiManager {
- method public android.media.midi.MidiDeviceInfo[] getDevices();
- method @NonNull public java.util.Collection<android.media.midi.MidiDeviceInfo> getDevicesForTransport(int);
+ method @Deprecated public android.media.midi.MidiDeviceInfo[] getDevices();
+ method @NonNull public java.util.Set<android.media.midi.MidiDeviceInfo> getDevicesForTransport(int);
method public void openBluetoothDevice(android.bluetooth.BluetoothDevice, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
method public void openDevice(android.media.midi.MidiDeviceInfo, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
- method public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler);
- method public void registerDeviceCallbackForTransport(@NonNull android.media.midi.MidiManager.DeviceCallback, @Nullable android.os.Handler, int);
+ method @Deprecated public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler);
+ method public void registerDeviceCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.media.midi.MidiManager.DeviceCallback);
method public void unregisterDeviceCallback(android.media.midi.MidiManager.DeviceCallback);
field public static final int TRANSPORT_MIDI_BYTE_STREAM = 1; // 0x1
field public static final int TRANSPORT_UNIVERSAL_MIDI_PACKETS = 2; // 0x2
@@ -26844,16 +26904,43 @@
package android.media.tv.interactive {
- public final class TvIAppManager {
+ public final class TvInteractiveAppInfo implements android.os.Parcelable {
+ ctor public TvInteractiveAppInfo(@NonNull android.content.Context, @NonNull android.content.ComponentName);
+ method public int describeContents();
+ method @NonNull public String getId();
+ method @Nullable public android.content.pm.ServiceInfo getServiceInfo();
+ method @NonNull public int getSupportedTypes();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.interactive.TvInteractiveAppInfo> CREATOR;
+ field public static final int INTERACTIVE_APP_TYPE_ATSC = 2; // 0x2
+ field public static final int INTERACTIVE_APP_TYPE_GINGA = 4; // 0x4
+ field public static final int INTERACTIVE_APP_TYPE_HBBTV = 1; // 0x1
}
- public abstract class TvIAppService extends android.app.Service {
- ctor public TvIAppService();
+ public final class TvInteractiveAppManager {
+ method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppInfo> getTvInteractiveAppServiceList();
+ }
+
+ public abstract class TvInteractiveAppService extends android.app.Service {
+ ctor public TvInteractiveAppService();
method public final android.os.IBinder onBind(android.content.Intent);
- field public static final String SERVICE_INTERFACE = "android.media.tv.interactive.TvIAppService";
+ field public static final String SERVICE_INTERFACE = "android.media.tv.interactive.TvInteractiveAppService";
field public static final String SERVICE_META_DATA = "android.media.tv.interactive.app";
}
+ public class TvInteractiveAppView extends android.view.ViewGroup {
+ ctor public TvInteractiveAppView(@NonNull android.content.Context);
+ ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet);
+ ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int);
+ method public void clearCallback();
+ method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);
+ method public void startInteractiveApp();
+ }
+
+ public abstract static class TvInteractiveAppView.TvInteractiveAppCallback {
+ ctor public TvInteractiveAppView.TvInteractiveAppCallback();
+ }
+
}
package android.mtp {
@@ -32231,7 +32318,7 @@
method @Deprecated public void readMap(@NonNull java.util.Map, @Nullable ClassLoader);
method public <K, V> void readMap(@NonNull java.util.Map<? super K,? super V>, @Nullable ClassLoader, @NonNull Class<K>, @NonNull Class<V>);
method @Deprecated @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader);
- method @Nullable public <T> T readParcelable(@Nullable ClassLoader, @NonNull Class<T>);
+ method @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader, @NonNull Class<? super T>);
method @Deprecated @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader);
method @Nullable public <T> T[] readParcelableArray(@Nullable ClassLoader, @NonNull Class<T>);
method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader);
@@ -32241,7 +32328,7 @@
method @Nullable public android.os.PersistableBundle readPersistableBundle();
method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader);
method @Deprecated @Nullable public java.io.Serializable readSerializable();
- method @Nullable public <T> T readSerializable(@Nullable ClassLoader, @NonNull Class<T>);
+ method @Nullable public <T extends java.io.Serializable> T readSerializable(@Nullable ClassLoader, @NonNull Class<? super T>);
method @NonNull public android.util.Size readSize();
method @NonNull public android.util.SizeF readSizeF();
method @Deprecated @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader);
@@ -32511,6 +32598,7 @@
method public static final boolean is64Bit();
method public static boolean isApplicationUid(int);
method public static final boolean isIsolated();
+ method public static final boolean isSupplemental();
method public static final void killProcess(int);
method public static final int myPid();
method @NonNull public static String myProcessName();
@@ -41750,11 +41838,11 @@
field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";
field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";
- field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
+ field @Deprecated public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
field public static final String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
field public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL = "carrier_volte_override_wfc_provisioning_bool";
- field public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
- field public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
+ field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
+ field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
field public static final String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";
field public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
field @Deprecated public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
@@ -42000,6 +42088,13 @@
field public static final int IPSEC_ENCRYPTION_ALGORITHM_AES_CBC = 2; // 0x2
field public static final int IPSEC_ENCRYPTION_ALGORITHM_DES_EDE3_CBC = 1; // 0x1
field public static final int IPSEC_ENCRYPTION_ALGORITHM_NULL = 0; // 0x0
+ field public static final String KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY = "ims.key_capability_type_call_composer_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY = "ims.key_capability_type_options_uce_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY = "ims.key_capability_type_presence_uce_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_SMS_INT_ARRAY = "ims.key_capability_type_sms_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_UT_INT_ARRAY = "ims.key_capability_type_ut_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY = "ims.key_capability_type_video_int_array";
+ field public static final String KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY = "ims.key_capability_type_voice_int_array";
field public static final String KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL = "ims.enable_presence_capability_exchange_bool";
field public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL = "ims.enable_presence_group_subscribe_bool";
field public static final String KEY_ENABLE_PRESENCE_PUBLISH_BOOL = "ims.enable_presence_publish_bool";
@@ -42014,11 +42109,13 @@
field public static final String KEY_IPV4_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv4_sip_mtu_size_cellular_int";
field public static final String KEY_IPV6_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv6_sip_mtu_size_cellular_int";
field public static final String KEY_KEEP_PDN_UP_IN_NO_VOPS_BOOL = "ims.keep_pdn_up_in_no_vops_bool";
+ field public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE = "ims.mmtel_requires_provisioning_bundle";
field public static final String KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT = "ims.non_rcs_capabilities_cache_expiration_sec_int";
field public static final String KEY_PHONE_CONTEXT_DOMAIN_NAME_STRING = "ims.phone_context_domain_name_string";
field public static final String KEY_PREFIX = "ims.";
field public static final String KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL = "ims.rcs_bulk_capability_exchange_bool";
field public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY = "ims.rcs_feature_tag_allowed_string_array";
+ field public static final String KEY_RCS_REQUIRES_PROVISIONING_BUNDLE = "ims.rcs_requires_provisioning_bundle";
field public static final String KEY_REGISTRATION_EVENT_PACKAGE_SUPPORTED_BOOL = "ims.registration_event_package_supported_bool";
field public static final String KEY_REGISTRATION_EXPIRY_TIMER_SEC_INT = "ims.registration_expiry_timer_sec_int";
field public static final String KEY_REGISTRATION_RETRY_BASE_TIMER_MILLIS_INT = "ims.registration_retry_base_timer_millis_int";
@@ -42260,7 +42357,6 @@
field public static final String KEY_CHILD_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_ctr_key_size_int_array";
field public static final String KEY_DIFFIE_HELLMAN_GROUPS_INT_ARRAY = "iwlan.diffie_hellman_groups_int_array";
field public static final String KEY_DPD_TIMER_SEC_INT = "iwlan.dpd_timer_sec_int";
- field public static final String KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.enable_support_for_eap_aka_fast_reauth_bool";
field public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY = "iwlan.epdg_address_priority_int_array";
field public static final String KEY_EPDG_AUTHENTICATION_METHOD_INT = "iwlan.epdg_authentication_method_int";
field public static final String KEY_EPDG_PCO_ID_IPV4_INT = "iwlan.epdg_pco_id_ipv4_int";
@@ -42282,6 +42378,7 @@
field public static final String KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = "iwlan.supported_ike_session_encryption_algorithms_int_array";
field public static final String KEY_SUPPORTED_INTEGRITY_ALGORITHMS_INT_ARRAY = "iwlan.supported_integrity_algorithms_int_array";
field public static final String KEY_SUPPORTED_PRF_ALGORITHMS_INT_ARRAY = "iwlan.supported_prf_algorithms_int_array";
+ field public static final String KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.supports_eap_aka_fast_reauth_bool";
}
public abstract class CellIdentity implements android.os.Parcelable {
@@ -44667,6 +44764,7 @@
public class ImsManager {
method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
+ method @NonNull public android.telephony.ims.ProvisioningManager getProvisioningManager(int);
field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
@@ -44917,6 +45015,23 @@
field public static final int REASON_UNKNOWN_TEMPORARY_ERROR = 1; // 0x1
}
+ public class ProvisioningManager {
+ method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);
+ method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int, int);
+ method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isProvisioningRequiredForCapability(int, int);
+ method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isRcsProvisioningRequiredForCapability(int, int);
+ method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void registerFeatureProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback) throws android.telephony.ims.ImsException;
+ method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);
+ method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, int, boolean);
+ method public void unregisterFeatureProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback);
+ }
+
+ public static class ProvisioningManager.FeatureProvisioningCallback {
+ ctor public ProvisioningManager.FeatureProvisioningCallback();
+ method public void onFeatureProvisioningChanged(int, int, boolean);
+ method public void onRcsFeatureProvisioningChanged(int, int, boolean);
+ }
+
public class RcsUceAdapter {
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
}
@@ -44957,6 +45072,27 @@
field public static final int CAPABILITY_TYPE_VOICE = 1; // 0x1
}
+ public class RcsFeature {
+ }
+
+ public static class RcsFeature.RcsImsCapabilities {
+ field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
+ field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
+ field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
+ }
+
+}
+
+package android.telephony.ims.stub {
+
+ public class ImsRegistrationImplBase {
+ field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2
+ field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1
+ field public static final int REGISTRATION_TECH_LTE = 0; // 0x0
+ field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff
+ field public static final int REGISTRATION_TECH_NR = 3; // 0x3
+ }
+
}
package android.telephony.mbms {
@@ -50155,6 +50291,7 @@
method public float getPivotX();
method public float getPivotY();
method public android.view.PointerIcon getPointerIcon();
+ method @NonNull public final java.util.List<android.graphics.Rect> getPreferKeepClearRects();
method @Nullable public String[] getReceiveContentMimeTypes();
method public android.content.res.Resources getResources();
method public final boolean getRevealOnFocusHint();
@@ -50272,6 +50409,7 @@
method protected boolean isPaddingOffsetRequired();
method public boolean isPaddingRelative();
method public boolean isPivotSet();
+ method public final boolean isPreferKeepClear();
method public boolean isPressed();
method public boolean isSaveEnabled();
method public boolean isSaveFromParentEnabled();
@@ -50514,6 +50652,8 @@
method public void setPivotX(float);
method public void setPivotY(float);
method public void setPointerIcon(android.view.PointerIcon);
+ method public final void setPreferKeepClear(boolean);
+ method public final void setPreferKeepClearRects(@NonNull java.util.List<android.graphics.Rect>);
method public void setPressed(boolean);
method public void setRenderEffect(@Nullable android.graphics.RenderEffect);
method public final void setRevealOnFocusHint(boolean);
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 2be0c5b..2a4e7a6 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -73,6 +73,11 @@
public class NetworkStatsManager {
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void forceUpdate();
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyNetworkStatus(@NonNull java.util.List<android.net.Network>, @NonNull java.util.List<android.net.NetworkStateSnapshot>, @Nullable String, @NonNull java.util.List<android.net.UnderlyingNetworkInfo>);
+ method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForDevice(@NonNull android.net.NetworkTemplate, long, long);
+ method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(@NonNull android.net.NetworkTemplate, long, long, int, int, int) throws java.lang.SecurityException;
+ method @NonNull @WorkerThread public android.app.usage.NetworkStats querySummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;
+ method @NonNull @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(@NonNull android.net.NetworkTemplate, long, long);
+ method @NonNull @WorkerThread public android.app.usage.NetworkStats queryTaggedSummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setDefaultGlobalAlert(long);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setPollOnOpen(boolean);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setStatsProviderWarningAndLimitAsync(@NonNull String, long, long);
@@ -81,6 +86,14 @@
}
+package android.bluetooth {
+
+ public final class BluetoothPan implements android.bluetooth.BluetoothProfile {
+ method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.TETHER_PRIVILEGED}) public android.net.TetheringManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.TetheringManager.TetheredInterfaceCallback);
+ }
+
+}
+
package android.content {
public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
@@ -134,10 +147,12 @@
field public static final int USB_DATA_TRANSFER_RATE_LOW_SPEED = 2; // 0x2
field public static final int USB_DATA_TRANSFER_RATE_UNKNOWN = -1; // 0xffffffff
field public static final int USB_HAL_NOT_SUPPORTED = -1; // 0xffffffff
+ field public static final int USB_HAL_RETRY = -2; // 0xfffffffe
field public static final int USB_HAL_V1_0 = 10; // 0xa
field public static final int USB_HAL_V1_1 = 11; // 0xb
field public static final int USB_HAL_V1_2 = 12; // 0xc
field public static final int USB_HAL_V1_3 = 13; // 0xd
+ field public static final int USB_HAL_V2_0 = 20; // 0x14
}
}
@@ -251,6 +266,32 @@
method public int getResourceId();
}
+ public class NetworkIdentity {
+ method public int getOemManaged();
+ method public int getRatType();
+ method @Nullable public String getSubscriberId();
+ method public int getType();
+ method @Nullable public String getWifiNetworkKey();
+ method public boolean isDefaultNetwork();
+ method public boolean isMetered();
+ method public boolean isRoaming();
+ }
+
+ public static final class NetworkIdentity.Builder {
+ ctor public NetworkIdentity.Builder();
+ method @NonNull public android.net.NetworkIdentity build();
+ method @NonNull public android.net.NetworkIdentity.Builder clearRatType();
+ method @NonNull public android.net.NetworkIdentity.Builder setDefaultNetwork(boolean);
+ method @NonNull public android.net.NetworkIdentity.Builder setMetered(boolean);
+ method @NonNull public android.net.NetworkIdentity.Builder setNetworkStateSnapshot(@NonNull android.net.NetworkStateSnapshot);
+ method @NonNull public android.net.NetworkIdentity.Builder setOemManaged(int);
+ method @NonNull public android.net.NetworkIdentity.Builder setRatType(int);
+ method @NonNull public android.net.NetworkIdentity.Builder setRoaming(boolean);
+ method @NonNull public android.net.NetworkIdentity.Builder setSubscriberId(@Nullable String);
+ method @NonNull public android.net.NetworkIdentity.Builder setType(int);
+ method @NonNull public android.net.NetworkIdentity.Builder setWifiNetworkKey(@Nullable String);
+ }
+
public class NetworkPolicyManager {
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getMultipathPreference(@NonNull android.net.Network);
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getRestrictBackgroundStatus(int);
@@ -278,6 +319,30 @@
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStateSnapshot> CREATOR;
}
+ public final class NetworkStatsHistory implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public java.util.List<android.net.NetworkStatsHistory.Entry> getEntries();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStatsHistory> CREATOR;
+ }
+
+ public static final class NetworkStatsHistory.Builder {
+ ctor public NetworkStatsHistory.Builder(long, int);
+ method @NonNull public android.net.NetworkStatsHistory.Builder addEntry(@NonNull android.net.NetworkStatsHistory.Entry);
+ method @NonNull public android.net.NetworkStatsHistory build();
+ }
+
+ public static final class NetworkStatsHistory.Entry {
+ ctor public NetworkStatsHistory.Entry(long, long, long, long, long, long, long);
+ method public long getActiveTime();
+ method public long getBucketStart();
+ method public long getOperations();
+ method public long getRxBytes();
+ method public long getRxPackets();
+ method public long getTxBytes();
+ method public long getTxPackets();
+ }
+
public final class NetworkTemplate implements android.os.Parcelable {
method public int describeContents();
method public int getDefaultNetworkStatus();
@@ -333,6 +398,10 @@
method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);
}
+ public class TrafficStats {
+ method public static void init(@NonNull android.content.Context);
+ }
+
public final class UnderlyingNetworkInfo implements android.os.Parcelable {
ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);
method public int describeContents();
@@ -376,6 +445,10 @@
}
public class Process {
+ method public static final boolean isSupplemental(int);
+ method public static final int toAppUid(int);
+ method public static final int toSupplementalUid(int);
+ field public static final int NFC_UID = 1027; // 0x403
field public static final int VPN_UID = 1016; // 0x3f8
}
@@ -407,6 +480,16 @@
method @NonNull public java.util.List<android.content.ComponentName> getEnabledComponentOverrides(@NonNull String);
}
+ public final class Trace {
+ method public static void asyncTraceBegin(long, @NonNull String, int);
+ method public static void asyncTraceEnd(long, @NonNull String, int);
+ method public static boolean isTagEnabled(long);
+ method public static void traceBegin(long, @NonNull String);
+ method public static void traceCounter(long, @NonNull String, int);
+ method public static void traceEnd(long);
+ field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L
+ }
+
}
package android.os.storage {
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index dea3ed5..34a8a8b 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -2,12 +2,14 @@
package android {
public static final class Manifest.permission {
+ field public static final String ACCESS_AMBIENT_CONTEXT_EVENT = "android.permission.ACCESS_AMBIENT_CONTEXT_EVENT";
field public static final String ACCESS_AMBIENT_LIGHT_STATS = "android.permission.ACCESS_AMBIENT_LIGHT_STATS";
field public static final String ACCESS_BROADCAST_RADIO = "android.permission.ACCESS_BROADCAST_RADIO";
field public static final String ACCESS_CACHE_FILESYSTEM = "android.permission.ACCESS_CACHE_FILESYSTEM";
field public static final String ACCESS_CONTEXT_HUB = "android.permission.ACCESS_CONTEXT_HUB";
field public static final String ACCESS_DRM_CERTIFICATES = "android.permission.ACCESS_DRM_CERTIFICATES";
field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";
+ field public static final String ACCESS_FPS_COUNTER = "android.permission.ACCESS_FPS_COUNTER";
field public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";
field public static final String ACCESS_LOCUS_ID_USAGE_STATS = "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";
field public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
@@ -37,6 +39,7 @@
field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";
field public static final String BACKUP = "android.permission.BACKUP";
field public static final String BATTERY_PREDICTION = "android.permission.BATTERY_PREDICTION";
+ field public static final String BIND_AMBIENT_CONTEXT_DETECTION_SERVICE = "android.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE";
field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";
field public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission.BIND_AUGMENTED_AUTOFILL_SERVICE";
field public static final String BIND_CALL_DIAGNOSTIC_SERVICE = "android.permission.BIND_CALL_DIAGNOSTIC_SERVICE";
@@ -139,6 +142,7 @@
field public static final String INTERNAL_SYSTEM_WINDOW = "android.permission.INTERNAL_SYSTEM_WINDOW";
field public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";
field public static final String KILL_UID = "android.permission.KILL_UID";
+ field public static final String LAUNCH_DEVICE_MANAGER_SETUP = "android.permission.LAUNCH_DEVICE_MANAGER_SETUP";
field public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
field public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE";
field public static final String LOOP_RADIO = "android.permission.LOOP_RADIO";
@@ -158,6 +162,7 @@
field public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";
field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";
+ field public static final String MANAGE_GAME_MODE = "android.permission.MANAGE_GAME_MODE";
field public static final String MANAGE_HOTWORD_DETECTION = "android.permission.MANAGE_HOTWORD_DETECTION";
field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";
field public static final String MANAGE_MUSIC_RECOGNITION = "android.permission.MANAGE_MUSIC_RECOGNITION";
@@ -366,6 +371,7 @@
}
public static final class R.bool {
+ field public static final int config_enableQrCodeScannerOnLockScreen;
field public static final int config_sendPackageName = 17891328; // 0x1110000
field public static final int config_showDefaultAssistant = 17891329; // 0x1110001
field public static final int config_showDefaultEmergency = 17891330; // 0x1110002
@@ -753,7 +759,17 @@
}
public final class GameManager {
- method @RequiresPermission("android.permission.MANAGE_GAME_MODE") public void setGameMode(@NonNull String, int);
+ method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_GAME_MODE) public android.app.GameModeInfo getGameModeInfo(@NonNull String);
+ method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_MODE) public void setGameMode(@NonNull String, int);
+ }
+
+ public final class GameModeInfo implements android.os.Parcelable {
+ ctor public GameModeInfo(int, @NonNull int[]);
+ method public int describeContents();
+ method public int getActiveGameMode();
+ method @NonNull public int[] getAvailableGameModes();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.GameModeInfo> CREATOR;
}
public abstract class InstantAppResolverService extends android.app.Service {
@@ -1037,6 +1053,8 @@
method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser();
method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException;
method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException;
+ method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>);
+ method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>, @NonNull java.lang.Object...);
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState();
method public boolean isDeviceManaged();
method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned();
@@ -1049,25 +1067,28 @@
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);
method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull int[]);
+ method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetStrings(@NonNull String[]);
method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;
method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();
method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set<android.app.admin.DevicePolicyDrawableResource>);
method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName);
method public void setSecondaryLockscreenEnabled(@NonNull android.content.ComponentName, boolean);
+ method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setStrings(@NonNull java.util.Set<android.app.admin.DevicePolicyStringResource>);
method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle);
field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";
field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";
field public static final String ACTION_BIND_SECONDARY_LOCKSCREEN_SERVICE = "android.app.action.BIND_SECONDARY_LOCKSCREEN_SERVICE";
+ field @RequiresPermission(android.Manifest.permission.DISPATCH_PROVISIONING_MESSAGE) public static final String ACTION_ESTABLISH_NETWORK_CONNECTION = "android.app.action.ESTABLISH_NETWORK_CONNECTION";
field public static final String ACTION_PROVISION_FINALIZATION = "android.app.action.PROVISION_FINALIZATION";
field public static final String ACTION_PROVISION_FINANCED_DEVICE = "android.app.action.PROVISION_FINANCED_DEVICE";
field public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";
field @RequiresPermission(android.Manifest.permission.MANAGE_FACTORY_RESET_PROTECTION) public static final String ACTION_RESET_PROTECTION_POLICY_CHANGED = "android.app.action.RESET_PROTECTION_POLICY_CHANGED";
- field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION = "android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION";
- field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";
- field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE";
+ field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION = "android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION";
+ field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";
+ field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE";
field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";
field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";
- field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";
+ field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";
field public static final int CODE_ACCOUNTS_NOT_EMPTY = 6; // 0x6
field public static final int CODE_CANNOT_ADD_MANAGED_PROFILE = 11; // 0xb
field public static final int CODE_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd
@@ -1121,6 +1142,48 @@
field public static final int STATE_USER_UNMANAGED = 0; // 0x0
}
+ public static final class DevicePolicyResources.Strings {
+ field public static final String UNDEFINED = "UNDEFINED";
+ }
+
+ public static final class DevicePolicyResources.Strings.DocumentsUi {
+ field public static final String CANT_SAVE_TO_PERSONAL_MESSAGE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_MESSAGE";
+ field public static final String CANT_SAVE_TO_PERSONAL_TITLE = "DocumentsUi.CANT_SAVE_TO_PERSONAL_TITLE";
+ field public static final String CANT_SAVE_TO_WORK_MESSAGE = "DocumentsUi.CANT_SAVE_TO_WORK_MESSAGE";
+ field public static final String CANT_SAVE_TO_WORK_TITLE = "DocumentsUi.CANT_SAVE_TO_WORK_TITLE";
+ field public static final String CANT_SELECT_PERSONAL_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_MESSAGE";
+ field public static final String CANT_SELECT_PERSONAL_FILES_TITLE = "DocumentsUi.CANT_SELECT_PERSONAL_FILES_TITLE";
+ field public static final String CANT_SELECT_WORK_FILES_MESSAGE = "DocumentsUi.CANT_SELECT_WORK_FILES_MESSAGE";
+ field public static final String CANT_SELECT_WORK_FILES_TITLE = "DocumentsUi.CANT_SELECT_WORK_FILES_TITLE";
+ field public static final String CROSS_PROFILE_NOT_ALLOWED_MESSAGE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_MESSAGE";
+ field public static final String CROSS_PROFILE_NOT_ALLOWED_TITLE = "DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_TITLE";
+ field public static final String PERSONAL_TAB = "DocumentsUi.PERSONAL_TAB";
+ field public static final String PREVIEW_WORK_FILE_ACCESSIBILITY = "DocumentsUi.PREVIEW_WORK_FILE_ACCESSIBILITY";
+ field public static final String WORK_ACCESSIBILITY = "DocumentsUi.WORK_ACCESSIBILITY";
+ field public static final String WORK_PROFILE_OFF_ENABLE_BUTTON = "DocumentsUi.WORK_PROFILE_OFF_ENABLE_BUTTON";
+ field public static final String WORK_PROFILE_OFF_ERROR_TITLE = "DocumentsUi.WORK_PROFILE_OFF_ERROR_TITLE";
+ field public static final String WORK_TAB = "DocumentsUi.WORK_TAB";
+ }
+
+ public static final class DevicePolicyResources.Strings.MediaProvider {
+ field public static final String BLOCKED_BY_ADMIN_TITLE = "MediaProvider.BLOCKED_BY_ADMIN_TITLE";
+ field public static final String BLOCKED_FROM_PERSONAL_MESSAGE = "MediaProvider.BLOCKED_FROM_PERSONAL_MESSAGE";
+ field public static final String BLOCKED_FROM_WORK_MESSAGE = "MediaProvider.BLOCKED_FROM_WORK_MESSAGE";
+ field public static final String SWITCH_TO_PERSONAL_MESSAGE = "MediaProvider.SWITCH_TO_PERSONAL_MESSAGE";
+ field public static final String SWITCH_TO_WORK_MESSAGE = "MediaProvider.SWITCH_TO_WORK_MESSAGE";
+ field public static final String WORK_PROFILE_PAUSED_MESSAGE = "MediaProvider.WORK_PROFILE_PAUSED_MESSAGE";
+ field public static final String WORK_PROFILE_PAUSED_TITLE = "MediaProvider.WORK_PROFILE_PAUSED_TITLE";
+ }
+
+ public final class DevicePolicyStringResource implements android.os.Parcelable {
+ ctor public DevicePolicyStringResource(@NonNull android.content.Context, @NonNull String, @StringRes int);
+ method public int describeContents();
+ method public int getCallingPackageResourceId();
+ method @NonNull public String getStringId();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DevicePolicyStringResource> CREATOR;
+ }
+
public final class FullyManagedDeviceProvisioningParams implements android.os.Parcelable {
method public boolean canDeviceOwnerGrantSensorsPermissions();
method public int describeContents();
@@ -1192,6 +1255,87 @@
}
+package android.app.ambientcontext {
+
+ public final class AmbientContextEvent implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getConfidenceLevel();
+ method public int getDensityLevel();
+ method @NonNull public java.time.Instant getEndTime();
+ method public int getEventType();
+ method @NonNull public java.time.Instant getStartTime();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.ambientcontext.AmbientContextEvent> CREATOR;
+ field public static final int EVENT_COUGH = 1; // 0x1
+ field public static final int EVENT_SNORE = 2; // 0x2
+ field public static final int EVENT_UNKNOWN = 0; // 0x0
+ field public static final int LEVEL_HIGH = 5; // 0x5
+ field public static final int LEVEL_LOW = 1; // 0x1
+ field public static final int LEVEL_MEDIUM = 3; // 0x3
+ field public static final int LEVEL_MEDIUM_HIGH = 4; // 0x4
+ field public static final int LEVEL_MEDIUM_LOW = 2; // 0x2
+ field public static final int LEVEL_UNKNOWN = 0; // 0x0
+ }
+
+ public static final class AmbientContextEvent.Builder {
+ ctor public AmbientContextEvent.Builder();
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent build();
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent.Builder setConfidenceLevel(int);
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent.Builder setDensityLevel(int);
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent.Builder setEndTime(@NonNull java.time.Instant);
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent.Builder setEventType(int);
+ method @NonNull public android.app.ambientcontext.AmbientContextEvent.Builder setStartTime(@NonNull java.time.Instant);
+ }
+
+ public final class AmbientContextEventRequest implements android.os.Parcelable {
+ method public int describeContents();
+ method @NonNull public java.util.Set<java.lang.Integer> getEventTypes();
+ method @NonNull public android.os.PersistableBundle getOptions();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.ambientcontext.AmbientContextEventRequest> CREATOR;
+ }
+
+ public static final class AmbientContextEventRequest.Builder {
+ ctor public AmbientContextEventRequest.Builder();
+ method @NonNull public android.app.ambientcontext.AmbientContextEventRequest.Builder addEventType(int);
+ method @NonNull public android.app.ambientcontext.AmbientContextEventRequest build();
+ method @NonNull public android.app.ambientcontext.AmbientContextEventRequest.Builder setOptions(@NonNull android.os.PersistableBundle);
+ }
+
+ public final class AmbientContextEventResponse implements android.os.Parcelable {
+ method public int describeContents();
+ method @Nullable public android.app.PendingIntent getActionPendingIntent();
+ method @NonNull public java.util.List<android.app.ambientcontext.AmbientContextEvent> getEvents();
+ method @NonNull public String getPackageName();
+ method public int getStatusCode();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.ambientcontext.AmbientContextEventResponse> CREATOR;
+ field public static final int STATUS_ACCESS_DENIED = 5; // 0x5
+ field public static final int STATUS_MICROPHONE_DISABLED = 4; // 0x4
+ field public static final int STATUS_NOT_SUPPORTED = 2; // 0x2
+ field public static final int STATUS_SERVICE_UNAVAILABLE = 3; // 0x3
+ field public static final int STATUS_SUCCESS = 1; // 0x1
+ field public static final int STATUS_UNKNOWN = 0; // 0x0
+ }
+
+ public static final class AmbientContextEventResponse.Builder {
+ ctor public AmbientContextEventResponse.Builder();
+ method @NonNull public android.app.ambientcontext.AmbientContextEventResponse.Builder addEvent(@NonNull android.app.ambientcontext.AmbientContextEvent);
+ method @NonNull public android.app.ambientcontext.AmbientContextEventResponse build();
+ method @NonNull public android.app.ambientcontext.AmbientContextEventResponse.Builder setActionPendingIntent(@NonNull android.app.PendingIntent);
+ method @NonNull public android.app.ambientcontext.AmbientContextEventResponse.Builder setPackageName(@NonNull String);
+ method @NonNull public android.app.ambientcontext.AmbientContextEventResponse.Builder setStatusCode(int);
+ }
+
+ public final class AmbientContextManager {
+ method @Nullable public static android.app.ambientcontext.AmbientContextEventResponse getResponseFromIntent(@NonNull android.content.Intent);
+ method @RequiresPermission(android.Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT) public void registerObserver(@NonNull android.app.ambientcontext.AmbientContextEventRequest, @NonNull android.app.PendingIntent);
+ method @RequiresPermission(android.Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT) public void unregisterObserver();
+ field public static final String EXTRA_AMBIENT_CONTEXT_EVENT_RESPONSE = "android.app.ambientcontext.extra.AMBIENT_CONTEXT_EVENT_RESPONSE";
+ }
+
+}
+
package android.app.assist {
public class ActivityId {
@@ -2041,6 +2185,8 @@
}
public class NetworkStatsManager {
+ method @NonNull @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public android.net.NetworkStats getMobileUidStats();
+ method @NonNull @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public android.net.NetworkStats getWifiUidStats();
method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void registerNetworkStatsProvider(@NonNull String, @NonNull android.net.netstats.provider.NetworkStatsProvider);
method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void unregisterNetworkStatsProvider(@NonNull android.net.netstats.provider.NetworkStatsProvider);
}
@@ -2217,6 +2363,7 @@
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isEncrypted();
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isInSilenceMode();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond();
+ method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setLowLatencyAudioAllowed(boolean);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setMessageAccessPermission(int);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setMetadata(int, @NonNull byte[]);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPhonebookAccessPermission(int);
@@ -2287,6 +2434,10 @@
field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED";
}
+ public final class BluetoothLeAudio implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
+ method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getAudioLocation(@NonNull android.bluetooth.BluetoothDevice);
+ }
+
public final class BluetoothMap implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
method public void close();
method protected void finalize();
@@ -2304,7 +2455,7 @@
method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isTetheringOn();
- method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.TETHER_PRIVILEGED}) public void setBluetoothTethering(boolean);
+ method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.TETHER_PRIVILEGED}) public void setBluetoothTethering(boolean);
method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED";
field public static final String ACTION_TETHERING_STATE_CHANGED = "android.bluetooth.action.TETHERING_STATE_CHANGED";
@@ -2325,6 +2476,15 @@
field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED";
}
+ public final class BluetoothPbapClient implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
+ method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+ method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
+ method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
+ method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
+ method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
+ field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pbapclient.profile.action.CONNECTION_STATE_CHANGED";
+ }
+
public interface BluetoothProfile {
field public static final int A2DP_SINK = 11; // 0xb
field public static final int AVRCP_CONTROLLER = 12; // 0xc
@@ -2366,6 +2526,7 @@
field @NonNull public static final android.os.ParcelUuid COORDINATED_SET;
field @NonNull public static final android.os.ParcelUuid DIP;
field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL;
+ field @NonNull public static final android.os.ParcelUuid HAS;
field @NonNull public static final android.os.ParcelUuid HEARING_AID;
field @NonNull public static final android.os.ParcelUuid HFP;
field @NonNull public static final android.os.ParcelUuid HFP_AG;
@@ -2582,10 +2743,32 @@
package android.companion.virtual {
public final class VirtualDeviceManager {
+ method @Nullable @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.VirtualDeviceManager.VirtualDevice createVirtualDevice(int, @NonNull android.companion.virtual.VirtualDeviceParams);
}
public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable {
method public void close();
+ method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(int, int, int, @Nullable android.view.Surface, int, @Nullable android.os.Handler, @Nullable android.hardware.display.VirtualDisplay.Callback);
+ method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
+ method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
+ method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
+ }
+
+ public final class VirtualDeviceParams implements android.os.Parcelable {
+ method public int describeContents();
+ method public int getLockState();
+ method @NonNull public java.util.Set<android.os.UserHandle> getUsersWithMatchingAccounts();
+ method public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.VirtualDeviceParams> CREATOR;
+ field public static final int LOCK_STATE_ALWAYS_LOCKED = 0; // 0x0
+ field public static final int LOCK_STATE_ALWAYS_UNLOCKED = 1; // 0x1
+ }
+
+ public static final class VirtualDeviceParams.Builder {
+ ctor public VirtualDeviceParams.Builder();
+ method @NonNull public android.companion.virtual.VirtualDeviceParams build();
+ method @NonNull @RequiresPermission(value="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY", conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int);
+ method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setUsersWithMatchingAccounts(@NonNull java.util.Set<android.os.UserHandle>);
}
}
@@ -2643,6 +2826,7 @@
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);
+ field public static final String AMBIENT_CONTEXT_SERVICE = "ambient_context";
field public static final String APP_HIBERNATION_SERVICE = "app_hibernation";
field public static final String APP_INTEGRITY_SERVICE = "app_integrity";
field public static final String APP_PREDICTION_SERVICE = "app_prediction";
@@ -3639,6 +3823,7 @@
method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);
method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfigurationForDisplay(@NonNull android.hardware.display.BrightnessConfiguration, @NonNull String);
method @Deprecated @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_SATURATION) public void setSaturationLevel(float);
+ field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400
}
}
@@ -4074,6 +4259,7 @@
public class VirtualMouse implements java.io.Closeable {
method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();
+ method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.graphics.PointF getCursorPosition();
method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendButtonEvent(@NonNull android.hardware.input.VirtualMouseButtonEvent);
method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendRelativeEvent(@NonNull android.hardware.input.VirtualMouseRelativeEvent);
method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendScrollEvent(@NonNull android.hardware.input.VirtualMouseScrollEvent);
@@ -5033,8 +5219,20 @@
}
public final class UsbPort {
+ method @CheckResult @RequiresPermission(android.Manifest.permission.MANAGE_USB) public int enableLimitPowerTransfer(boolean);
+ method @CheckResult @RequiresPermission(android.Manifest.permission.MANAGE_USB) public int enableUsbData(boolean);
method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USB) public android.hardware.usb.UsbPortStatus getStatus();
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void setRoles(int, int);
+ field public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_INTERNAL = 1; // 0x1
+ field public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_NOT_SUPPORTED = 2; // 0x2
+ field public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_OTHER = 4; // 0x4
+ field public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_PORT_MISMATCH = 3; // 0x3
+ field public static final int ENABLE_LIMIT_POWER_TRANSFER_SUCCESS = 0; // 0x0
+ field public static final int ENABLE_USB_DATA_ERROR_INTERNAL = 1; // 0x1
+ field public static final int ENABLE_USB_DATA_ERROR_NOT_SUPPORTED = 2; // 0x2
+ field public static final int ENABLE_USB_DATA_ERROR_OTHER = 4; // 0x4
+ field public static final int ENABLE_USB_DATA_ERROR_PORT_MISMATCH = 3; // 0x3
+ field public static final int ENABLE_USB_DATA_SUCCESS = 0; // 0x0
}
public final class UsbPortStatus implements android.os.Parcelable {
@@ -5044,6 +5242,7 @@
method public int getCurrentPowerRole();
method public int getSupportedRoleCombinations();
method public boolean isConnected();
+ method public boolean isPowerTransferLimited();
method public boolean isRoleCombinationSupported(int, int);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.hardware.usb.UsbPortStatus> CREATOR;
@@ -6573,6 +6772,7 @@
method @Nullable public android.media.tv.tuner.Lnb openLnbByName(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.LnbCallback);
method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_SHARED_FILTER) public static android.media.tv.tuner.filter.SharedFilter openSharedFilter(@NonNull android.content.Context, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.filter.SharedFilterCallback);
method @Nullable public android.media.tv.tuner.filter.TimeFilter openTimeFilter();
+ method public int removeOutputPid(@IntRange(from=0) int);
method public int scan(@NonNull android.media.tv.tuner.frontend.FrontendSettings, int, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.ScanCallback);
method public int setLnaEnabled(boolean);
method public int setMaxNumberOfFrontends(int, @IntRange(from=0) int);
@@ -7013,7 +7213,7 @@
}
public abstract class SectionSettings extends android.media.tv.tuner.filter.Settings {
- method public int getBitWidthOfLengthField();
+ method public int getLengthFieldBitWidth();
method public boolean isCrcEnabled();
method public boolean isRaw();
method public boolean isRepeat();
@@ -7713,6 +7913,7 @@
public class FrontendStatus {
method public int getAgc();
+ method @NonNull public android.media.tv.tuner.frontend.Atsc3PlpInfo[] getAllAtsc3PlpInfo();
method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpTuningInfo[] getAtsc3PlpTuningInfo();
method public int getBandwidth();
method public int getBer();
@@ -7755,6 +7956,7 @@
method public boolean isRfLocked();
method public boolean isShortFramesEnabled();
field public static final int FRONTEND_STATUS_TYPE_AGC = 14; // 0xe
+ field public static final int FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO = 41; // 0x29
field public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO = 21; // 0x15
field public static final int FRONTEND_STATUS_TYPE_BANDWIDTH = 25; // 0x19
field public static final int FRONTEND_STATUS_TYPE_BER = 2; // 0x2
@@ -8646,6 +8848,7 @@
method @Nullable public android.net.wifi.nl80211.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);
method @NonNull public java.util.List<android.net.wifi.nl80211.NativeScanResult> getScanResults(@NonNull String, int);
method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);
+ method public boolean notifyCountryCodeChanged();
method @Nullable public static android.net.wifi.nl80211.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);
method @Deprecated public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);
method public boolean registerCountryCodeChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangedListener);
@@ -9674,9 +9877,9 @@
method @BinderThread public void onOneTimePermissionSessionTimeout(@NonNull String);
method @Deprecated @BinderThread public void onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.function.Consumer<java.lang.Boolean>);
method @Deprecated @BinderThread public void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);
+ method @BinderThread public void onRevokeOwnPermissionsOnKill(@NonNull String, @NonNull java.util.List<java.lang.String>, @NonNull Runnable);
method @BinderThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String, @NonNull Runnable);
method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);
- method @BinderThread public void onSelfRevokePermissions(@NonNull String, @NonNull java.util.List<java.lang.String>, @NonNull Runnable);
method @Deprecated @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
method @BinderThread public void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull android.permission.AdminPermissionControlParams, @NonNull java.util.function.Consumer<java.lang.Boolean>);
method @BinderThread public void onStageAndApplyRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);
@@ -9884,6 +10087,7 @@
method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean);
field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";
field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot";
+ field public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE = "ambient_context_manager_service";
field public static final String NAMESPACE_APPSEARCH = "appsearch";
field public static final String NAMESPACE_APP_COMPAT = "app_compat";
field public static final String NAMESPACE_APP_HIBERNATION = "app_hibernation";
@@ -9926,6 +10130,7 @@
field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot";
field @Deprecated public static final String NAMESPACE_STORAGE = "storage";
field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";
+ field public static final String NAMESPACE_SUPPLEMENTAL_API = "supplemental_api";
field public static final String NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT = "surface_flinger_native_boot";
field public static final String NAMESPACE_SWCODEC_NATIVE = "swcodec_native";
field public static final String NAMESPACE_SYSTEMUI = "systemui";
@@ -10154,6 +10359,7 @@
field public static final String AUTO_REVOKE_DISABLED = "auto_revoke_disabled";
field public static final String COMPLETED_CATEGORY_PREFIX = "suggested.completed_category.";
field public static final String DOZE_ALWAYS_ON = "doze_always_on";
+ field public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled";
field public static final String HUSH_GESTURE_USED = "hush_gesture_used";
field public static final String INSTANT_APPS_ENABLED = "instant_apps_enabled";
field public static final String LAST_SETUP_SHOWN = "last_setup_shown";
@@ -10454,6 +10660,18 @@
}
+package android.service.ambientcontext {
+
+ public abstract class AmbientContextDetectionService extends android.app.Service {
+ ctor public AmbientContextDetectionService();
+ method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
+ method public abstract void onStartDetection(@NonNull android.app.ambientcontext.AmbientContextEventRequest, @NonNull String, @NonNull java.util.function.Consumer<android.app.ambientcontext.AmbientContextEventResponse>);
+ method public abstract void onStopDetection(@NonNull String);
+ field public static final String SERVICE_INTERFACE = "android.service.ambientcontext.AmbientContextDetectionService";
+ }
+
+}
+
package android.service.appprediction {
public abstract class AppPredictionService extends android.app.Service {
@@ -10905,6 +11123,15 @@
ctor public GameSession();
method public void onCreate();
method public void onDestroy();
+ method public void onGameTaskFocusChanged(boolean);
+ method public void setTaskOverlayView(@NonNull android.view.View, @NonNull android.view.ViewGroup.LayoutParams);
+ method public void takeScreenshot(@NonNull java.util.concurrent.Executor, @NonNull android.service.games.GameSession.ScreenshotCallback);
+ }
+
+ public static interface GameSession.ScreenshotCallback {
+ method public void onFailure(int);
+ method public void onSuccess(@NonNull android.graphics.Bitmap);
+ field public static final int ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR = 0; // 0x0
}
public abstract class GameSessionService extends android.app.Service {
@@ -11045,6 +11272,7 @@
method @android.service.persistentdata.PersistentDataBlockManager.FlashLockState @RequiresPermission(anyOf={android.Manifest.permission.READ_OEM_UNLOCK_STATE, "android.permission.OEM_UNLOCK_STATE"}) public int getFlashLockState();
method public long getMaximumDataBlockSize();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_OEM_UNLOCK_STATE, "android.permission.OEM_UNLOCK_STATE"}) public boolean getOemUnlockEnabled();
+ method @NonNull public String getPersistentDataPackageName();
method public byte[] read();
method @Deprecated @RequiresPermission("android.permission.OEM_UNLOCK_STATE") public void setOemUnlockEnabled(boolean);
method @RequiresPermission("android.permission.OEM_UNLOCK_STATE") public void wipe();
@@ -14328,18 +14556,16 @@
public class ProvisioningManager {
method @NonNull public static android.telephony.ims.ProvisioningManager createForSubscriptionId(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public int getProvisioningIntValue(int);
- method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int);
- method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);
+ method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public boolean isRcsVolteSingleRegistrationCapable() throws android.telephony.ims.ImsException;
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyRcsAutoConfigurationReceived(@NonNull byte[], boolean);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void registerRcsProvisioningCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback) throws android.telephony.ims.ImsException;
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);
- method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void setRcsClientConfiguration(@NonNull android.telephony.ims.RcsClientConfiguration) throws android.telephony.ims.ImsException;
- method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
+ method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void triggerRcsReconfiguration();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void unregisterRcsProvisioningCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);
@@ -14772,9 +14998,6 @@
method public void addCapabilities(int);
method public boolean isCapable(int);
method public void removeCapabilities(int);
- field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
- field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
- field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
}
}
@@ -14924,11 +15147,6 @@
method public void triggerFullNetworkRegistration(@IntRange(from=100, to=699) int, @Nullable String);
method public void triggerSipDelegateDeregistration();
method public void updateSipDelegateRegistration();
- field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2
- field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1
- field public static final int REGISTRATION_TECH_LTE = 0; // 0x0
- field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff
- field public static final int REGISTRATION_TECH_NR = 3; // 0x3
}
public class ImsSmsImplBase {
@@ -15206,6 +15424,8 @@
public interface WindowManager extends android.view.ViewManager {
method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public android.graphics.Region getCurrentImeTouchRegion();
+ method public default void registerTaskFpsCallback(@IntRange(from=0) int, @NonNull android.window.TaskFpsCallback);
+ method public default void unregisterTaskFpsCallback(@NonNull android.window.TaskFpsCallback);
}
public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
@@ -15793,3 +16013,15 @@
}
+package android.window {
+
+ public final class TaskFpsCallback {
+ ctor public TaskFpsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.window.TaskFpsCallback.OnFpsCallbackListener);
+ }
+
+ public static interface TaskFpsCallback.OnFpsCallbackListener {
+ method public void onFpsReported(float);
+ }
+
+}
+
diff --git a/core/api/system-lint-baseline.txt b/core/api/system-lint-baseline.txt
index 9a06423..3d756ba 100644
--- a/core/api/system-lint-baseline.txt
+++ b/core/api/system-lint-baseline.txt
@@ -91,6 +91,10 @@
+NoSettingsProvider: android.provider.Settings.Secure#FAST_PAIR_SCAN_ENABLED:
+ New setting keys are not allowed (Field: FAST_PAIR_SCAN_ENABLED); use getters/setters in relevant manager class
+
+
OnNameExpected: android.service.smartspace.SmartspaceService#notifySmartspaceEvent(android.app.smartspace.SmartspaceSessionId, android.app.smartspace.SmartspaceTargetEvent):
Methods implemented by developers should follow the on<Something> style, was `notifySmartspaceEvent`
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 0e52c5d..e97ef6c 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1928,6 +1928,9 @@
method @NonNull public static String convert(@NonNull java.util.UUID);
method public boolean isAppIoBlocked(@NonNull java.util.UUID, int, int, int);
method public static boolean isUserKeyUnlocked(int);
+ field public static final String CACHE_RESERVE_PERCENT_HIGH_KEY = "cache_reserve_percent_high";
+ field public static final String CACHE_RESERVE_PERCENT_LOW_KEY = "cache_reserve_percent_low";
+ field public static final String STORAGE_THRESHOLD_PERCENT_HIGH_KEY = "storage_threshold_percent_high";
}
public final class StorageVolume implements android.os.Parcelable {
diff --git a/core/java/android/accessibilityservice/TouchInteractionController.java b/core/java/android/accessibilityservice/TouchInteractionController.java
index a8ba1d3..bb2b8d4 100644
--- a/core/java/android/accessibilityservice/TouchInteractionController.java
+++ b/core/java/android/accessibilityservice/TouchInteractionController.java
@@ -24,6 +24,8 @@
import android.view.MotionEvent;
import android.view.accessibility.AccessibilityInteractionClient;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.concurrent.Executor;
/**
@@ -102,6 +104,11 @@
private boolean mServiceDetectsGestures;
/** Map of callbacks to executors. Lazily created when adding the first callback. */
private ArrayMap<Callback, Executor> mCallbacks;
+ // A list of motion events that should be queued until a pending transition has taken place.
+ private Queue<MotionEvent> mQueuedMotionEvents = new LinkedList<>();
+ // Whether this controller is waiting for a state transition.
+ // Motion events will be queued and sent to listeners after the transition has taken place.
+ private boolean mStateChangeRequested = false;
// The current state of the display.
private int mState = STATE_CLEAR;
@@ -169,6 +176,14 @@
* main thread.
*/
void onMotionEvent(MotionEvent event) {
+ if (mStateChangeRequested) {
+ mQueuedMotionEvents.add(event);
+ } else {
+ sendEventToAllListeners(event);
+ }
+ }
+
+ private void sendEventToAllListeners(MotionEvent event) {
final ArrayMap<Callback, Executor> entries;
synchronized (mLock) {
// callbacks may remove themselves. Perform a shallow copy to avoid concurrent
@@ -209,6 +224,10 @@
callback.onStateChanged(state);
}
}
+ mStateChangeRequested = false;
+ while (mQueuedMotionEvents.size() > 0) {
+ sendEventToAllListeners(mQueuedMotionEvents.poll());
+ }
}
/**
@@ -253,6 +272,7 @@
} catch (RemoteException re) {
throw new RuntimeException(re);
}
+ mStateChangeRequested = true;
}
}
@@ -281,6 +301,7 @@
} catch (RemoteException re) {
throw new RuntimeException(re);
}
+ mStateChangeRequested = true;
}
}
@@ -302,6 +323,7 @@
} catch (RemoteException re) {
throw new RuntimeException(re);
}
+ mStateChangeRequested = true;
}
}
diff --git a/core/java/android/accounts/CantAddAccountActivity.java b/core/java/android/accounts/CantAddAccountActivity.java
index f7f232e..107efc3 100644
--- a/core/java/android/accounts/CantAddAccountActivity.java
+++ b/core/java/android/accounts/CantAddAccountActivity.java
@@ -16,9 +16,13 @@
package android.accounts;
+import static android.app.admin.DevicePolicyResources.Strings.Core.CANT_ADD_ACCOUNT_MESSAGE;
+
import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
import android.os.Bundle;
import android.view.View;
+import android.widget.TextView;
import com.android.internal.R;
@@ -33,6 +37,12 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.app_not_authorized);
+
+ TextView view = findViewById(R.id.description);
+ String text = getSystemService(DevicePolicyManager.class).getString(
+ CANT_ADD_ACCOUNT_MESSAGE,
+ () -> getString(R.string.error_message_change_not_allowed));
+ view.setText(text);
}
public void onCancelButtonClicked(View view) {
diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java
index 2e9f73c..0d82ac9 100644
--- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java
+++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java
@@ -15,7 +15,10 @@
*/
package android.accounts;
+import static android.app.admin.DevicePolicyResources.Strings.Core.CANT_ADD_ACCOUNT_MESSAGE;
+
import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
@@ -199,7 +202,14 @@
if (mPossiblyVisibleAccounts.isEmpty() && mDisallowAddAccounts) {
requestWindowFeature(Window.FEATURE_NO_TITLE);
+
setContentView(R.layout.app_not_authorized);
+ TextView view = findViewById(R.id.description);
+ String text = getSystemService(DevicePolicyManager.class).getString(
+ CANT_ADD_ACCOUNT_MESSAGE,
+ () -> getString(R.string.error_message_change_not_allowed));
+ view.setText(text);
+
mDontShowPicker = true;
}
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 1e0b143..a7b96a6 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1524,7 +1524,10 @@
}
private void dispatchActivityConfigurationChanged() {
- getApplication().dispatchActivityConfigurationChanged(this);
+ // In case the new config comes before mApplication is assigned.
+ if (getApplication() != null) {
+ getApplication().dispatchActivityConfigurationChanged(this);
+ }
Object[] callbacks = collectActivityLifecycleCallbacks();
if (callbacks != null) {
for (int i = 0; i < callbacks.length; i++) {
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 686ca3b..3ddbe9e 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -105,6 +105,7 @@
import android.media.MediaServiceManager;
import android.net.ConnectivityManager;
import android.net.Proxy;
+import android.net.TrafficStats;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
@@ -6725,6 +6726,13 @@
NetworkSecurityConfigProvider.install(appContext);
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
+ // For backward compatibility, TrafficStats needs static access to the application context.
+ // But for isolated apps which cannot access network related services, service discovery
+ // is restricted. Hence, calling this would result in NPE.
+ if (!Process.isIsolated()) {
+ TrafficStats.init(appContext);
+ }
+
// Continue loading instrumentation.
if (ii != null) {
initInstrumentation(ii, data, appContext);
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index fa48730..f3315a8 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2179,8 +2179,8 @@
}
@Override
- public void selfRevokePermissions(@NonNull Collection<String> permissions) {
- getSystemService(PermissionManager.class).selfRevokePermissions(permissions);
+ public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {
+ getSystemService(PermissionManager.class).revokeOwnPermissionsOnKill(permissions);
}
@Override
diff --git a/core/java/android/app/GameManager.java b/core/java/android/app/GameManager.java
index 29e1b70..76471d3 100644
--- a/core/java/android/app/GameManager.java
+++ b/core/java/android/app/GameManager.java
@@ -119,6 +119,31 @@
}
/**
+ * Returns the {@link GameModeInfo} associated with the game associated with
+ * the given {@code packageName}. If the given package is not a game, {@code null} is
+ * always returned.
+ * <p>
+ * An application can use <code>android:isGame="true"</code> or
+ * <code>android:appCategory="game"</code> to indicate that the application is a game.
+ * If the manifest doesn't define a category, the category can also be
+ * provided by the installer via
+ * {@link android.content.pm.PackageManager#setApplicationCategoryHint(String, int)}.
+ * <p>
+ *
+ * @hide
+ */
+ @SystemApi
+ @UserHandleAware
+ @RequiresPermission(Manifest.permission.MANAGE_GAME_MODE)
+ public @Nullable GameModeInfo getGameModeInfo(@NonNull String packageName) {
+ try {
+ return mService.getGameModeInfo(packageName, mContext.getUserId());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Sets the game mode for the given package.
* <p>
* The caller must have {@link android.Manifest.permission#MANAGE_GAME_MODE}.
diff --git a/core/java/android/app/GameModeInfo.aidl b/core/java/android/app/GameModeInfo.aidl
new file mode 100644
index 0000000..3b13201
--- /dev/null
+++ b/core/java/android/app/GameModeInfo.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.app;
+
+/**
+ * @hide
+ */
+parcelable GameModeInfo;
\ No newline at end of file
diff --git a/core/java/android/app/GameModeInfo.java b/core/java/android/app/GameModeInfo.java
new file mode 100644
index 0000000..fe0ac35
--- /dev/null
+++ b/core/java/android/app/GameModeInfo.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2021 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.app;
+
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * GameModeInfo returned from {@link GameManager#getGameModeInfo(String)}.
+ * @hide
+ */
+@SystemApi
+public final class GameModeInfo implements Parcelable {
+
+ public static final @NonNull Creator<GameModeInfo> CREATOR = new Creator<GameModeInfo>() {
+ @Override
+ public GameModeInfo createFromParcel(Parcel in) {
+ return new GameModeInfo(in);
+ }
+
+ @Override
+ public GameModeInfo[] newArray(int size) {
+ return new GameModeInfo[size];
+ }
+ };
+
+ public GameModeInfo(@GameManager.GameMode int activeGameMode,
+ @NonNull @GameManager.GameMode int[] availableGameModes) {
+ mActiveGameMode = activeGameMode;
+ mAvailableGameModes = availableGameModes;
+ }
+
+ GameModeInfo(Parcel in) {
+ mActiveGameMode = in.readInt();
+ final int availableGameModesCount = in.readInt();
+ mAvailableGameModes = new int[availableGameModesCount];
+ in.readIntArray(mAvailableGameModes);
+ }
+
+ /**
+ * Returns the {@link GameManager.GameMode} the application is currently using.
+ * Developers can enable game modes by adding
+ * <code>
+ * <meta-data android:name="android.game_mode_intervention"
+ * android:resource="@xml/GAME_MODE_CONFIG_FILE" />
+ * </code>
+ * to the {@link <application> tag}, where the GAME_MODE_CONFIG_FILE is an XML file that
+ * specifies the game mode enablement and configuration:
+ * <code>
+ * <game-mode-config xmlns:android="http://schemas.android.com/apk/res/android"
+ * android:gameModePerformance="true"
+ * android:gameModeBattery="false"
+ * />
+ * </code>
+ */
+ public @GameManager.GameMode int getActiveGameMode() {
+ return mActiveGameMode;
+ }
+
+ /**
+ * The collection of {@link GameManager.GameMode GameModes} that can be applied to the game.
+ */
+ @NonNull
+ public @GameManager.GameMode int[] getAvailableGameModes() {
+ return mAvailableGameModes;
+ }
+
+ // Ideally there should be callback that the caller can register to know when the available
+ // GameMode and/or the active GameMode is changed, however, there's no concrete use case
+ // at the moment so there's no callback mechanism introduced .
+ private final @GameManager.GameMode int[] mAvailableGameModes;
+ private final @GameManager.GameMode int mActiveGameMode;
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(mActiveGameMode);
+ dest.writeInt(mAvailableGameModes.length);
+ dest.writeIntArray(mAvailableGameModes);
+ }
+}
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index a9ec11e..0801b24 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -72,6 +72,7 @@
import android.view.RemoteAnimationDefinition;
import android.view.RemoteAnimationAdapter;
import android.window.IWindowOrganizerController;
+import android.window.BackNavigationInfo;
import android.window.SplashScreenView;
import com.android.internal.app.IVoiceInteractor;
import com.android.internal.os.IResultReceiver;
@@ -346,7 +347,8 @@
void setRunningRemoteTransitionDelegate(in IApplicationThread caller);
/**
- * Prepare the back preview in the server
+ * Prepare the back navigation in the server. This setups the leashed for sysui to animate
+ * the back gesture and returns the data needed for the animation.
*/
- void startBackPreview(IRemoteAnimationRunner runner);
+ android.window.BackNavigationInfo startBackNavigation();
}
diff --git a/core/java/android/app/IGameManagerService.aidl b/core/java/android/app/IGameManagerService.aidl
index d9aa586..57de8c7 100644
--- a/core/java/android/app/IGameManagerService.aidl
+++ b/core/java/android/app/IGameManagerService.aidl
@@ -16,6 +16,7 @@
package android.app;
+import android.app.GameModeInfo;
import android.app.GameState;
/**
@@ -27,4 +28,5 @@
int[] getAvailableGameModes(String packageName);
boolean getAngleEnabled(String packageName, int userId);
void setGameState(String packageName, in GameState gameState, int userId);
-}
\ No newline at end of file
+ GameModeInfo getGameModeInfo(String packageName, int userId);
+}
diff --git a/core/java/android/app/ServiceStartNotAllowedException.java b/core/java/android/app/ServiceStartNotAllowedException.java
index 33285b2..b1f47ee 100644
--- a/core/java/android/app/ServiceStartNotAllowedException.java
+++ b/core/java/android/app/ServiceStartNotAllowedException.java
@@ -40,4 +40,11 @@
return new BackgroundServiceStartNotAllowedException(message);
}
}
+
+ @Override
+ public synchronized Throwable getCause() {
+ // "Cause" is often used for clustering exceptions, and developers don't want to have it
+ // for this exception. b/210890426
+ return null;
+ }
}
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 67c42f6..f0208c6 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -24,6 +24,8 @@
import android.app.ContextImpl.ServiceInitializationState;
import android.app.admin.DevicePolicyManager;
import android.app.admin.IDevicePolicyManager;
+import android.app.ambientcontext.AmbientContextManager;
+import android.app.ambientcontext.IAmbientContextEventObserver;
import android.app.appsearch.AppSearchManagerFrameworkInitializer;
import android.app.blob.BlobStoreManagerFrameworkInitializer;
import android.app.contentsuggestions.ContentSuggestionsManager;
@@ -124,8 +126,8 @@
import android.media.soundtrigger.SoundTriggerManager;
import android.media.tv.ITvInputManager;
import android.media.tv.TvInputManager;
-import android.media.tv.interactive.ITvIAppManager;
-import android.media.tv.interactive.TvIAppManager;
+import android.media.tv.interactive.ITvInteractiveAppManager;
+import android.media.tv.interactive.TvInteractiveAppManager;
import android.media.tv.tunerresourcemanager.ITunerResourceManager;
import android.media.tv.tunerresourcemanager.TunerResourceManager;
import android.nearby.NearbyFrameworkInitializer;
@@ -964,13 +966,16 @@
}
});
- registerService(Context.TV_IAPP_SERVICE, TvIAppManager.class,
- new CachedServiceFetcher<TvIAppManager>() {
+ registerService(Context.TV_INTERACTIVE_APP_SERVICE, TvInteractiveAppManager.class,
+ new CachedServiceFetcher<TvInteractiveAppManager>() {
@Override
- public TvIAppManager createService(ContextImpl ctx) throws ServiceNotFoundException {
- IBinder iBinder = ServiceManager.getServiceOrThrow(Context.TV_IAPP_SERVICE);
- ITvIAppManager service = ITvIAppManager.Stub.asInterface(iBinder);
- return new TvIAppManager(service, ctx.getUserId());
+ public TvInteractiveAppManager createService(ContextImpl ctx)
+ throws ServiceNotFoundException {
+ IBinder iBinder =
+ ServiceManager.getServiceOrThrow(Context.TV_INTERACTIVE_APP_SERVICE);
+ ITvInteractiveAppManager service =
+ ITvInteractiveAppManager.Stub.asInterface(iBinder);
+ return new TvInteractiveAppManager(service, ctx.getUserId());
}});
registerService(Context.TV_INPUT_SERVICE, TvInputManager.class,
@@ -1021,19 +1026,21 @@
}});
registerService(Context.PERSISTENT_DATA_BLOCK_SERVICE, PersistentDataBlockManager.class,
- new StaticServiceFetcher<PersistentDataBlockManager>() {
+ new CachedServiceFetcher<PersistentDataBlockManager>() {
@Override
- public PersistentDataBlockManager createService() throws ServiceNotFoundException {
+ public PersistentDataBlockManager createService(ContextImpl ctx)
+ throws ServiceNotFoundException {
IBinder b = ServiceManager.getServiceOrThrow(Context.PERSISTENT_DATA_BLOCK_SERVICE);
IPersistentDataBlockService persistentDataBlockService =
IPersistentDataBlockService.Stub.asInterface(b);
if (persistentDataBlockService != null) {
- return new PersistentDataBlockManager(persistentDataBlockService);
+ return new PersistentDataBlockManager(ctx, persistentDataBlockService);
} else {
// not supported
return null;
}
- }});
+ }
+ });
registerService(Context.OEM_LOCK_SERVICE, OemLockManager.class,
new StaticServiceFetcher<OemLockManager>() {
@@ -1518,6 +1525,18 @@
}
});
+ registerService(Context.AMBIENT_CONTEXT_SERVICE, AmbientContextManager.class,
+ new CachedServiceFetcher<AmbientContextManager>() {
+ @Override
+ public AmbientContextManager createService(ContextImpl ctx)
+ throws ServiceNotFoundException {
+ IBinder iBinder = ServiceManager.getServiceOrThrow(
+ Context.AMBIENT_CONTEXT_SERVICE);
+ IAmbientContextEventObserver manager =
+ IAmbientContextEventObserver.Stub.asInterface(iBinder);
+ return new AmbientContextManager(ctx.getOuterContext(), manager);
+ }});
+
sInitializing = true;
try {
// Note: the following functions need to be @SystemApis, once they become mainline
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9682593..fa0af2d 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -622,6 +622,32 @@
"android.app.extra.FORCE_UPDATE_ROLE_HOLDER";
/**
+ * A boolean extra indicating whether offline provisioning is allowed.
+ *
+ * <p>For the online provisioning flow, there will be an attempt to download and install
+ * the latest version of the device management role holder. The platform will then delegate
+ * provisioning to the device management role holder via role holder-specific provisioning
+ * actions.
+ *
+ * <p>For the offline provisioning flow, the provisioning flow will always be handled by
+ * the platform.
+ *
+ * <p>If this extra is set to {@code false}, the provisioning flow will enforce that an
+ * internet connection is established, which will start the online provisioning flow. If an
+ * internet connection cannot be established, provisioning will fail.
+ *
+ * <p>If this extra is set to {@code true}, the provisioning flow will still try to connect to
+ * the internet, but if it fails it will start the offline provisioning flow.
+ *
+ * <p>The default value is {@code false}.
+ *
+ * <p>This extra is respected when provided via the provisioning intent actions such as {@link
+ * #ACTION_PROVISION_MANAGED_PROFILE}.
+ */
+ public static final String EXTRA_PROVISIONING_ALLOW_OFFLINE =
+ "android.app.extra.PROVISIONING_ALLOW_OFFLINE";
+
+ /**
* Action: Bugreport sharing with device owner has been accepted by the user.
*
* @hide
@@ -1552,6 +1578,78 @@
public static final int FLAG_SUPPORTED_MODES_DEVICE_OWNER = 1 << 2;
/**
+ * Constant for {@link #getMinimumRequiredWifiSecurityLevel()} and
+ * {@link #setMinimumRequiredWifiSecurityLevel(int)}: no minimum security level.
+ *
+ * <p> When returned from {@link #getMinimumRequiredWifiSecurityLevel()}, the constant
+ * represents the current minimum security level required.
+ * When passed to {@link #setMinimumRequiredWifiSecurityLevel(int)}, it sets the
+ * minimum security level a Wi-Fi network must meet.
+ *
+ * @see #WIFI_SECURITY_PERSONAL
+ * @see #WIFI_SECURITY_ENTERPRISE_EAP
+ * @see #WIFI_SECURITY_ENTERPRISE_192
+ */
+ public static final int WIFI_SECURITY_OPEN = 0;
+
+ /**
+ * Constant for {@link #getMinimumRequiredWifiSecurityLevel()} and
+ * {@link #setMinimumRequiredWifiSecurityLevel(int)}: personal network such as WEP, WPA2-PSK.
+ *
+ * <p> When returned from {@link #getMinimumRequiredWifiSecurityLevel()}, the constant
+ * represents the current minimum security level required.
+ * When passed to {@link #setMinimumRequiredWifiSecurityLevel(int)}, it sets the
+ * minimum security level a Wi-Fi network must meet.
+ *
+ * @see #WIFI_SECURITY_OPEN
+ * @see #WIFI_SECURITY_ENTERPRISE_EAP
+ * @see #WIFI_SECURITY_ENTERPRISE_192
+ */
+ public static final int WIFI_SECURITY_PERSONAL = 1;
+
+ /**
+ * Constant for {@link #getMinimumRequiredWifiSecurityLevel()} and
+ * {@link #setMinimumRequiredWifiSecurityLevel(int)}: enterprise EAP network.
+ *
+ * <p> When returned from {@link #getMinimumRequiredWifiSecurityLevel()}, the constant
+ * represents the current minimum security level required.
+ * When passed to {@link #setMinimumRequiredWifiSecurityLevel(int)}, it sets the
+ * minimum security level a Wi-Fi network must meet.
+ *
+ * @see #WIFI_SECURITY_OPEN
+ * @see #WIFI_SECURITY_PERSONAL
+ * @see #WIFI_SECURITY_ENTERPRISE_192
+ */
+ public static final int WIFI_SECURITY_ENTERPRISE_EAP = 2;
+
+ /**
+ * Constant for {@link #getMinimumRequiredWifiSecurityLevel()} and
+ * {@link #setMinimumRequiredWifiSecurityLevel(int)}: enterprise 192 bit network.
+ *
+ * <p> When returned from {@link #getMinimumRequiredWifiSecurityLevel()}, the constant
+ * represents the current minimum security level required.
+ * When passed to {@link #setMinimumRequiredWifiSecurityLevel(int)}, it sets the
+ * minimum security level a Wi-Fi network must meet.
+ *
+ * @see #WIFI_SECURITY_OPEN
+ * @see #WIFI_SECURITY_PERSONAL
+ * @see #WIFI_SECURITY_ENTERPRISE_EAP
+ */
+ public static final int WIFI_SECURITY_ENTERPRISE_192 = 3;
+
+ /**
+ * Possible Wi-Fi minimum security levels
+ *
+ * @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(prefix = {"WIFI_SECURITY_"}, value = {
+ WIFI_SECURITY_OPEN,
+ WIFI_SECURITY_PERSONAL,
+ WIFI_SECURITY_ENTERPRISE_EAP,
+ WIFI_SECURITY_ENTERPRISE_192})
+ public @interface WifiSecurity {}
+
+ /**
* This MIME type is used for starting the device owner provisioning.
*
* <p>During device owner provisioning a device admin app is set as the owner of the device.
@@ -2986,6 +3084,54 @@
"android.app.extra.PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT";
/**
+ * Activity action: attempts to establish network connection
+ *
+ * <p>This intent can be accompanied by any of the relevant provisioning extras related to
+ * network connectivity, such as:
+ * <ul>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_SSID}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_HIDDEN}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_SECURITY_TYPE}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_PASSWORD}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_HOST}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_PORT}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_BYPASS}</li>
+ * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_EAP_METHOD}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_PHASE2_AUTH}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_IDENTITY}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY}</li>
+ * <li>{@code #EXTRA_PROVISIONING_WIFI_DOMAIN}</li>
+ * </ul>
+ *
+ * <p>If there are provisioning extras related to network connectivity, this activity
+ * attempts to connect to the specified network. Otherwise it prompts the end-user to connect.
+ *
+ * <p>This activity is meant to be started by the provisioning initiator prior to starting
+ * {@link #ACTION_PROVISION_MANAGED_PROFILE} or {@link
+ * #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}.
+ *
+ * <p>Note that network connectivity is still also handled when provisioning via {@link
+ * #ACTION_PROVISION_MANAGED_PROFILE} or {@link
+ * #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}. {@link
+ * #ACTION_ESTABLISH_NETWORK_CONNECTION} should only be used in cases when the provisioning
+ * initiator would like to do some additional logic after the network connectivity step and
+ * before the start of provisioning.
+ *
+ * If network connection is established, {@link Activity#RESULT_OK} will be returned. Otherwise
+ * the result will be {@link Activity#RESULT_CANCELED}.
+ *
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.DISPATCH_PROVISIONING_MESSAGE)
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ @SystemApi
+ public static final String ACTION_ESTABLISH_NETWORK_CONNECTION =
+ "android.app.action.ESTABLISH_NETWORK_CONNECTION";
+
+ /**
* Maximum supported password length. Kind-of arbitrary.
* @hide
*/
@@ -3256,14 +3402,15 @@
/**
* Broadcast action: notify system apps (e.g. settings, SysUI, etc) that the device management
- * resources with IDs {@link #EXTRA_RESOURCE_ID} has been updated using, the updated resources
- * can be retrieved using {@link #getDrawable}.
+ * resources with IDs {@link #EXTRA_RESOURCE_ID} has been updated, the updated resources can be
+ * retrieved using {@link #getDrawable} and {@code #getString}.
*
* <p>This broadcast is sent to registered receivers only.
*
* <p> The following extras will be included to identify the type of resource being updated:
* <ul>
* <li>{@link #EXTRA_RESOURCE_TYPE_DRAWABLE} for drawable resources</li>
+ * <li>{@link #EXTRA_RESOURCE_TYPE_STRING} for string resources</li>
* </ul>
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@@ -3278,8 +3425,16 @@
"android.app.extra.RESOURCE_TYPE_DRAWABLE";
/**
+ * A boolean extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate that a
+ * resource of type {@link String} is being updated.
+ */
+ public static final String EXTRA_RESOURCE_TYPE_STRING =
+ "android.app.extra.RESOURCE_TYPE_STRING";
+
+ /**
* An integer array extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate which
- * drawable IDs (see {@link DevicePolicyResources.UpdatableDrawableId}) have been updated.
+ * resource IDs (see {@link DevicePolicyResources.UpdatableDrawableId} and
+ * {@link DevicePolicyResources.UpdatableStringId}) have been updated.
*/
public static final String EXTRA_RESOURCE_ID =
"android.app.extra.RESOURCE_ID";
@@ -14477,6 +14632,105 @@
}
/**
+ * Called by device owner or profile owner of an organization-owned managed profile to
+ * specify the minimum security level required for Wi-Fi networks.
+ * The device may not connect to networks that do not meet the minimum security level.
+ * If the current network does not meet the minimum security level set, it will be disconnected.
+ *
+ *
+ * @param level minimum security level
+ * @throws SecurityException if the caller is not a device owner or a profile owner on
+ * an organization-owned managed profile.
+ */
+ public void setMinimumRequiredWifiSecurityLevel(@WifiSecurity int level) {
+ throwIfParentInstance("setMinimumRequiredWifiSecurityLevel");
+ if (mService != null) {
+ try {
+ mService.setMinimumRequiredWifiSecurityLevel(level);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+ }
+
+ /**
+ * Returns the current Wi-Fi minimum security level.
+ *
+ * @see #setMinimumRequiredWifiSecurityLevel(int)
+ */
+ public @WifiSecurity int getMinimumRequiredWifiSecurityLevel() {
+ throwIfParentInstance("getMinimumRequiredWifiSecurityLevel");
+ if (mService == null) {
+ return WIFI_SECURITY_OPEN;
+ }
+ try {
+ return mService.getMinimumRequiredWifiSecurityLevel();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Called by device owner or profile owner of an organization-owned managed profile to
+ * specify the Wi-Fi SSID policy ({@link WifiSsidPolicy}).
+ * Wi-Fi SSID policy specifies the SSID restriction the network must satisfy
+ * in order to be eligible for a connection. Providing a null policy results in the
+ * deactivation of the SSID restriction
+ *
+ * @param policy Wi-Fi SSID policy
+ * @throws SecurityException if the caller is not a device owner or a profile owner on
+ * an organization-owned managed profile.
+ */
+ public void setWifiSsidPolicy(@Nullable WifiSsidPolicy policy) {
+ throwIfParentInstance("setWifiSsidPolicy");
+ if (mService != null) {
+ try {
+ if (policy == null) {
+ mService.setSsidAllowlist(new ArrayList<>());
+ } else {
+ int policyType = policy.getPolicyType();
+ if (policyType == WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST) {
+ mService.setSsidAllowlist(new ArrayList<>(policy.getSsids()));
+ } else {
+ mService.setSsidDenylist(new ArrayList<>(policy.getSsids()));
+ }
+ }
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+ }
+
+ /**
+ * Returns the current Wi-Fi SSID policy.
+ * If the policy has not been set, it will return NULL.
+ *
+ * @see #setWifiSsidPolicy(WifiSsidPolicy)
+ * @throws SecurityException if the caller is not a device owner or a profile owner on
+ * an organization-owned managed profile or a system app.
+ */
+ @Nullable
+ public WifiSsidPolicy getWifiSsidPolicy() {
+ throwIfParentInstance("getWifiSsidPolicy");
+ if (mService == null) {
+ return null;
+ }
+ try {
+ List<String> allowlist = mService.getSsidAllowlist();
+ if (!allowlist.isEmpty()) {
+ return WifiSsidPolicy.createAllowlistPolicy(new ArraySet<>(allowlist));
+ }
+ List<String> denylist = mService.getSsidDenylist();
+ if (!denylist.isEmpty()) {
+ return WifiSsidPolicy.createDenylistPolicy(new ArraySet<>(denylist));
+ }
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ return null;
+ }
+
+ /**
* For each {@link DevicePolicyDrawableResource} item in {@code drawables}, if
* {@link DevicePolicyDrawableResource#getDrawableSource()} is not set or is set to
* {@link DevicePolicyResources.Drawable.Source#UNDEFINED}, it updates the drawable resource for
@@ -14509,11 +14763,6 @@
*
* @param drawables The list of {@link DevicePolicyDrawableResource} to update.
*
- * @throws IllegalArgumentException if {@link DevicePolicyDrawableResource#getDrawableId()},
- * {@link DevicePolicyDrawableResource#getDrawableStyle()}, or
- * {@link DevicePolicyDrawableResource#getDrawableSource()} aren't defined in
- * {@link DevicePolicyResources.Drawable}.
- *
* @hide
*/
@SystemApi
@@ -14541,9 +14790,6 @@
*
* @param drawableIds The list of IDs to remove.
*
- * @throws IllegalArgumentException if IDs are not defined in
- * {@link DevicePolicyResources.Drawable}
- *
* @hide
*/
@SystemApi
@@ -14567,6 +14813,9 @@
* <p>Also returns the drawable from {@code defaultDrawableLoader} if
* {@link DevicePolicyResources.Drawable#INVALID_ID} was passed.
*
+ * <p>{@code defaultDrawableLoader} must return a non {@code null} {@link Drawable}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
* <p>This API uses the screen density returned from {@link Resources#getConfiguration()}, to
* set a different value use
* {@link #getDrawableForDensity(int, int, int, Callable)}.
@@ -14582,7 +14831,7 @@
* @param defaultDrawableLoader To get the default drawable if no updated drawable was set for
* the provided params.
*/
- @Nullable
+ @NonNull
public Drawable getDrawable(
@DevicePolicyResources.UpdatableDrawableId int drawableId,
@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
@@ -14596,6 +14845,9 @@
* could result in returning a different drawable than {@link #getDrawable(int, int, Callable)}
* if an override was set for that specific source.
*
+ * <p>{@code defaultDrawableLoader} must return a non {@code null} {@link Drawable}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
* <p>Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get
* notified when a resource has been updated.
*
@@ -14605,7 +14857,7 @@
* @param defaultDrawableLoader To get the default drawable if no updated drawable was set for
* the provided params.
*/
- @Nullable
+ @NonNull
public Drawable getDrawable(
@DevicePolicyResources.UpdatableDrawableId int drawableId,
@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
@@ -14643,6 +14895,9 @@
* Similar to {@link #getDrawable(int, int, Callable)}, but also accepts
* {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}.
*
+ * <p>{@code defaultDrawableLoader} must return a non {@code null} {@link Drawable}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
* <p>Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get
* notified when a resource has been updated.
*
@@ -14654,7 +14909,7 @@
* @param defaultDrawableLoader To get the default drawable if no updated drawable was set for
* the provided params.
*/
- @Nullable
+ @NonNull
public Drawable getDrawableForDensity(
@DevicePolicyResources.UpdatableDrawableId int drawableId,
@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
@@ -14672,6 +14927,9 @@
* Similar to {@link #getDrawable(int, int, int, Callable)}, but also accepts
* {@code density}. See {@link Resources#getDrawableForDensity(int, int, Resources.Theme)}.
*
+ * <p>{@code defaultDrawableLoader} must return a non {@code null} {@link Drawable}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
* <p>Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get
* notified when a resource has been updated.
*
@@ -14684,7 +14942,7 @@
* @param defaultDrawableLoader To get the default drawable if no updated drawable was set for
* the provided params.
*/
- @Nullable
+ @NonNull
public Drawable getDrawableForDensity(
@DevicePolicyResources.UpdatableDrawableId int drawableId,
@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
@@ -14714,4 +14972,167 @@
}
return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader);
}
+
+ /**
+ * For each {@link DevicePolicyStringResource} item in {@code strings}, it updates the string
+ * resource for {@link DevicePolicyStringResource#getStringId()} to the string with ID
+ * {@code callingPackageResourceId} (see {@link DevicePolicyResources.String}), meaning any
+ * system UI surface calling {@link #getString} with {@code stringId} will get
+ * the new resource after this API is called.
+ *
+ * <p>Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to
+ * registered receivers when a resource has been updated successfully.
+ *
+ * <p>Important notes to consider when using this API:
+ * <ul>
+ * <li> {@link #getString} references the resource
+ * {@code callingPackageResourceId} in the calling package each time it gets called. You have to
+ * ensure that the resource is always available in the calling package as long as it is used as
+ * an updated resource.
+ * <li> You still have to re-call {@code setStrings} even if you only make changes to the
+ * content of the resource with ID {@code callingPackageResourceId} as the content might be
+ * cached and would need updating.
+ * </ul>
+ *
+ * @param strings The list of {@link DevicePolicyStringResource} to update.
+ *
+ * @hide
+ */
+ @SystemApi
+ @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+ public void setStrings(@NonNull Set<DevicePolicyStringResource> strings) {
+ if (mService != null) {
+ try {
+ mService.setStrings(new ArrayList<>(strings));
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+ }
+
+ /**
+ * Removes the updated strings for the list of {@code stringIds} (see
+ * {@link DevicePolicyResources.String}) that was previously set by calling {@link #setStrings},
+ * meaning any subsequent calls to {@link #getString} for the provided IDs will
+ * return the default string from {@code defaultStringLoader}.
+ *
+ * <p>Sends a broadcast with action {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to
+ * registered receivers when a resource has been reset successfully.
+ *
+ * @param stringIds The list of IDs to remove the updated resources for.
+ *
+ * @hide
+ */
+ @SystemApi
+ @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+ public void resetStrings(@NonNull String[] stringIds) {
+ if (mService != null) {
+ try {
+ mService.resetStrings(stringIds);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+ }
+
+ /**
+ * Returns the appropriate updated string for the {@code stringId} (see
+ * {@link DevicePolicyResources.String}) if one was set using
+ * {@link #setStrings}, otherwise returns the string from {@code defaultStringLoader}.
+ *
+ * <p>Also returns the string from {@code defaultStringLoader} if
+ * {@link DevicePolicyResources.String#INVALID_ID} was passed.
+ *
+ * <p>{@code defaultStringLoader} must return a non {@code null} {@link String}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
+ * <p>Callers should register for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to get
+ * notified when a resource has been updated.
+ *
+ * <p>Note that each call to this API loads the resource from the package that called
+ * {@link #setStrings} to set the updated resource.
+ *
+ * @param stringId The IDs to get the updated resource for.
+ * @param defaultStringLoader To get the default string if no updated string was set for
+ * {@code stringId}.
+ *
+ * @hide
+ */
+ @SystemApi
+ @NonNull
+ public String getString(
+ @NonNull @DevicePolicyResources.UpdatableStringId String stringId,
+ @NonNull Callable<String> defaultStringLoader) {
+
+ Objects.requireNonNull(stringId, "stringId can't be null");
+ Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null");
+
+ if (stringId.equals(DevicePolicyResources.Strings.UNDEFINED)) {
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ if (mService != null) {
+ try {
+ ParcelableResource resource = mService.getString(stringId);
+ if (resource == null) {
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ return resource.getString(mContext, defaultStringLoader);
+ } catch (RemoteException e) {
+ Log.e(
+ TAG,
+ "Error getting the updated string from DevicePolicyManagerService.",
+ e);
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ }
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+
+ /**
+ * Similar to {@link #getString(String, Callable)} but accepts {@code formatArgs} and returns a
+ * localized formatted string, substituting the format arguments as defined in
+ * {@link java.util.Formatter} and {@link java.lang.String#format}, (see
+ * {@link Resources#getString(int, Object...)}).
+ *
+ * <p>{@code defaultStringLoader} must return a non {@code null} {@link String}, otherwise a
+ * {@link NullPointerException} is thrown.
+ *
+ * @param stringId The IDs to get the updated resource for.
+ * @param defaultStringLoader To get the default string if no updated string was set for
+ * {@code stringId}.
+ * @param formatArgs The format arguments that will be used for substitution.
+ *
+ * @hide
+ */
+ @SystemApi
+ @NonNull
+ @SuppressLint("SamShouldBeLast")
+ public String getString(
+ @NonNull @DevicePolicyResources.UpdatableStringId String stringId,
+ @NonNull Callable<String> defaultStringLoader,
+ @NonNull Object... formatArgs) {
+
+ Objects.requireNonNull(stringId, "stringId can't be null");
+ Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null");
+
+ if (stringId.equals(DevicePolicyResources.Strings.UNDEFINED)) {
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ if (mService != null) {
+ try {
+ ParcelableResource resource = mService.getString(stringId);
+ if (resource == null) {
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ return resource.getString(mContext, defaultStringLoader, formatArgs);
+ } catch (RemoteException e) {
+ Log.e(
+ TAG,
+ "Error getting the updated string from DevicePolicyManagerService.",
+ e);
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
+ }
+ return ParcelableResource.loadDefaultString(defaultStringLoader);
+ }
}
diff --git a/core/java/android/app/admin/DevicePolicyResources.java b/core/java/android/app/admin/DevicePolicyResources.java
index 5133f26..46e2cce 100644
--- a/core/java/android/app/admin/DevicePolicyResources.java
+++ b/core/java/android/app/admin/DevicePolicyResources.java
@@ -16,8 +16,123 @@
package android.app.admin;
+import static android.app.admin.DevicePolicyResources.Strings.Core.CANT_ADD_ACCOUNT_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_CHANNEL_DEVICE_ADMIN;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_DELETED_BY_DO;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_INSTALLED_BY_DO;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_UPDATED_BY_DO;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_SOON_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PRINTING_DISABLED_NAMED_ADMIN;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_DETAIL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_PERSONAL_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_WORK_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PAUSED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PROFILE_NOT_SUPPORTED;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_PERSONAL_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_WORK_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_BADGED_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_GENERIC_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_PERSONAL_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_PERSONAL_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_WORK_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SAVE_TO_WORK_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_PERSONAL_FILES_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_PERSONAL_FILES_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_WORK_FILES_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CANT_SELECT_WORK_FILES_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.CROSS_PROFILE_NOT_ALLOWED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.PERSONAL_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.PREVIEW_WORK_FILE_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_PROFILE_OFF_ENABLE_BUTTON;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_PROFILE_OFF_ERROR_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.DocumentsUi.WORK_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_PERSONAL_TAB_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.ALL_APPS_WORK_TAB_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.DISABLED_BY_ADMIN_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_PERSONAL_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WIDGETS_WORK_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_FOLDER_NAME;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_EDU_ACCEPT;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_ENABLE_BUTTON;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSED_DESCRIPTION;
+import static android.app.admin.DevicePolicyResources.Strings.Launcher.WORK_PROFILE_PAUSE_BUTTON;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_BY_ADMIN_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_FROM_PERSONAL_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.BLOCKED_FROM_WORK_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_PERSONAL_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.SWITCH_TO_WORK_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.MediaProvider.WORK_PROFILE_PAUSED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_MANAGEMENT_DISCLOSURE;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.ONGOING_PRIVACY_DIALOG_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_CA_CERT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_NETWORK;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_NAMED_MANAGEMENT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_VIEW_POLICIES;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_CA_CERT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_DIALOG_WORK_PROFILE_NETWORK;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_MONITORING;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_MULTIPLE_VPNS;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_MANAGEMENT_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_MONITORING;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_MANAGEMENT_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_NAMED_WORK_PROFILE_MONITORING;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_PERSONAL_PROFILE_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_MONITORING;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_NAMED_VPN;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_MSG_WORK_PROFILE_NETWORK;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.STATUS_BAR_WORK_ICON_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.SystemUi.WORK_LOCK_ACCESSIBILITY;
+
import android.annotation.IntDef;
+import android.annotation.StringDef;
import android.annotation.SuppressLint;
+import android.annotation.SystemApi;
+import android.os.UserHandle;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -27,8 +142,8 @@
/**
* Class containing the required identifiers to update device management resources.
*
- * <p>See {@link DevicePolicyManager#getDrawable}.
- *
+ * <p>See {@link DevicePolicyManager#getDrawable} and
+ * {@code DevicePolicyManager#getString}.
*/
public final class DevicePolicyResources {
@@ -78,6 +193,74 @@
})
public @interface UpdatableDrawableSource {}
+ /**
+ * Resource identifiers used to update device management-related string resources.
+ *
+ * @hide
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @StringDef({
+ // Launcher Strings
+ WORK_PROFILE_EDU, WORK_PROFILE_EDU_ACCEPT, Strings.Launcher.WORK_PROFILE_PAUSED_TITLE,
+ WORK_PROFILE_PAUSED_DESCRIPTION, WORK_PROFILE_PAUSE_BUTTON, WORK_PROFILE_ENABLE_BUTTON,
+ ALL_APPS_WORK_TAB, ALL_APPS_PERSONAL_TAB, ALL_APPS_WORK_TAB_ACCESSIBILITY,
+ ALL_APPS_PERSONAL_TAB_ACCESSIBILITY, WORK_FOLDER_NAME, WIDGETS_WORK_TAB,
+ WIDGETS_PERSONAL_TAB, DISABLED_BY_ADMIN_MESSAGE,
+
+ // SysUI Strings
+ QS_MSG_MANAGEMENT, QS_MSG_NAMED_MANAGEMENT, QS_MSG_MANAGEMENT_MONITORING,
+ QS_MSG_NAMED_MANAGEMENT_MONITORING, QS_MSG_MANAGEMENT_NAMED_VPN,
+ QS_MSG_NAMED_MANAGEMENT_NAMED_VPN, QS_MSG_MANAGEMENT_MULTIPLE_VPNS,
+ QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS, QS_MSG_WORK_PROFILE_MONITORING,
+ QS_MSG_NAMED_WORK_PROFILE_MONITORING, QS_MSG_WORK_PROFILE_NETWORK,
+ QS_MSG_WORK_PROFILE_NAMED_VPN, QS_MSG_PERSONAL_PROFILE_NAMED_VPN,
+ QS_DIALOG_MANAGEMENT_TITLE, QS_DIALOG_VIEW_POLICIES, QS_DIALOG_MANAGEMENT,
+ QS_DIALOG_NAMED_MANAGEMENT, QS_DIALOG_MANAGEMENT_CA_CERT,
+ QS_DIALOG_WORK_PROFILE_CA_CERT, QS_DIALOG_MANAGEMENT_NETWORK,
+ QS_DIALOG_WORK_PROFILE_NETWORK, QS_DIALOG_MANAGEMENT_NAMED_VPN,
+ QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN, QS_DIALOG_WORK_PROFILE_NAMED_VPN,
+ QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN, BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT,
+ BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT, BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT,
+ BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS, STATUS_BAR_WORK_ICON_ACCESSIBILITY,
+ ONGOING_PRIVACY_DIALOG_WORK, KEYGUARD_MANAGEMENT_DISCLOSURE,
+ KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE, WORK_LOCK_ACCESSIBILITY,
+
+ // Core Strings
+ WORK_PROFILE_DELETED_TITLE, WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE,
+ WORK_PROFILE_DELETED_GENERIC_MESSAGE, WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE,
+ PERSONAL_APP_SUSPENSION_TITLE, PERSONAL_APP_SUSPENSION_MESSAGE,
+ PERSONAL_APP_SUSPENSION_SOON_MESSAGE, PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE,
+ PRINTING_DISABLED_NAMED_ADMIN, LOCATION_CHANGED_TITLE, LOCATION_CHANGED_MESSAGE,
+ NETWORK_LOGGING_TITLE, NETWORK_LOGGING_MESSAGE,
+ NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION, NOTIFICATION_CHANNEL_DEVICE_ADMIN,
+ SWITCH_TO_WORK_LABEL, SWITCH_TO_PERSONAL_LABEL, FORWARD_INTENT_TO_WORK,
+ FORWARD_INTENT_TO_PERSONAL, RESOLVER_WORK_PROFILE_NOT_SUPPORTED, RESOLVER_PERSONAL_TAB,
+ RESOLVER_WORK_TAB, RESOLVER_PERSONAL_TAB_ACCESSIBILITY, RESOLVER_WORK_TAB_ACCESSIBILITY,
+ RESOLVER_CROSS_PROFILE_BLOCKED_TITLE, RESOLVER_CANT_SHARE_WITH_PERSONAL,
+ RESOLVER_CANT_SHARE_WITH_WORK, RESOLVER_CANT_ACCESS_PERSONAL, RESOLVER_CANT_ACCESS_WORK,
+ RESOLVER_WORK_PAUSED_TITLE, RESOLVER_NO_WORK_APPS, RESOLVER_NO_PERSONAL_APPS,
+ CANT_ADD_ACCOUNT_MESSAGE, PACKAGE_INSTALLED_BY_DO, PACKAGE_UPDATED_BY_DO,
+ PACKAGE_DELETED_BY_DO, UNLAUNCHABLE_APP_WORK_PAUSED_TITLE,
+ UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE, PROFILE_ENCRYPTED_TITLE, PROFILE_ENCRYPTED_DETAIL,
+ PROFILE_ENCRYPTED_MESSAGE, WORK_PROFILE_BADGED_LABEL,
+
+ // DocsUi Strings
+ WORK_PROFILE_OFF_ERROR_TITLE, WORK_PROFILE_OFF_ENABLE_BUTTON,
+ CANT_SELECT_WORK_FILES_TITLE, CANT_SELECT_WORK_FILES_MESSAGE,
+ CANT_SELECT_PERSONAL_FILES_TITLE, CANT_SELECT_PERSONAL_FILES_MESSAGE,
+ CANT_SAVE_TO_WORK_TITLE, CANT_SAVE_TO_WORK_MESSAGE, CANT_SAVE_TO_PERSONAL_TITLE,
+ CANT_SAVE_TO_PERSONAL_MESSAGE, CROSS_PROFILE_NOT_ALLOWED_TITLE,
+ CROSS_PROFILE_NOT_ALLOWED_MESSAGE, PREVIEW_WORK_FILE_ACCESSIBILITY, PERSONAL_TAB,
+ WORK_TAB, WORK_ACCESSIBILITY,
+
+ // MediaProvider Strings
+ SWITCH_TO_WORK_MESSAGE, SWITCH_TO_PERSONAL_MESSAGE, BLOCKED_BY_ADMIN_TITLE,
+ BLOCKED_FROM_PERSONAL_MESSAGE, BLOCKED_FROM_PERSONAL_MESSAGE,
+ BLOCKED_FROM_WORK_MESSAGE, Strings.MediaProvider.WORK_PROFILE_PAUSED_TITLE,
+ WORK_PROFILE_PAUSED_MESSAGE
+ })
+ public @interface UpdatableStringId {
+ }
/**
* Class containing the identifiers used to update device management-related system drawable.
@@ -240,4 +423,995 @@
}
}
}
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final class Strings {
+
+ private Strings() {}
+
+ /**
+ * An ID for any string that can't be updated.
+ */
+ public static final String UNDEFINED = "UNDEFINED";
+
+ /**
+ * @hide
+ */
+ public static final Set<String> UPDATABLE_STRING_IDS = buildStringsSet();
+
+ private static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.addAll(Launcher.buildStringsSet());
+ strings.addAll(SystemUi.buildStringsSet());
+ strings.addAll(Core.buildStringsSet());
+ strings.addAll(DocumentsUi.buildStringsSet());
+ strings.addAll(MediaProvider.buildStringsSet());
+ return strings;
+ }
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings
+ * in the Launcher package.
+ *
+ * @hide
+ */
+ public static final class Launcher {
+
+ private Launcher(){}
+
+ private static final String PREFIX = "Launcher.";
+
+ /**
+ * User on-boarding title for work profile apps.
+ */
+ public static final String WORK_PROFILE_EDU = PREFIX + "WORK_PROFILE_EDU";
+
+ /**
+ * Action label to finish work profile edu.
+ */
+ public static final String WORK_PROFILE_EDU_ACCEPT = PREFIX + "WORK_PROFILE_EDU_ACCEPT";
+
+ /**
+ * Title shown when user opens work apps tab while work profile is paused.
+ */
+ public static final String WORK_PROFILE_PAUSED_TITLE =
+ PREFIX + "WORK_PROFILE_PAUSED_TITLE";
+
+ /**
+ * Description shown when user opens work apps tab while work profile is paused.
+ */
+ public static final String WORK_PROFILE_PAUSED_DESCRIPTION =
+ PREFIX + "WORK_PROFILE_PAUSED_DESCRIPTION";
+
+ /**
+ * Shown on the button to pause work profile.
+ */
+ public static final String WORK_PROFILE_PAUSE_BUTTON =
+ PREFIX + "WORK_PROFILE_PAUSE_BUTTON";
+
+ /**
+ * Shown on the button to enable work profile.
+ */
+ public static final String WORK_PROFILE_ENABLE_BUTTON =
+ PREFIX + "WORK_PROFILE_ENABLE_BUTTON";
+
+ /**
+ * Label on launcher tab to indicate work apps.
+ */
+ public static final String ALL_APPS_WORK_TAB = PREFIX + "ALL_APPS_WORK_TAB";
+
+ /**
+ * Label on launcher tab to indicate personal apps.
+ */
+ public static final String ALL_APPS_PERSONAL_TAB = PREFIX + "ALL_APPS_PERSONAL_TAB";
+
+ /**
+ * Accessibility description for launcher tab to indicate work apps.
+ */
+ public static final String ALL_APPS_WORK_TAB_ACCESSIBILITY =
+ PREFIX + "ALL_APPS_WORK_TAB_ACCESSIBILITY";
+
+ /**
+ * Accessibility description for launcher tab to indicate personal apps.
+ */
+ public static final String ALL_APPS_PERSONAL_TAB_ACCESSIBILITY =
+ PREFIX + "ALL_APPS_PERSONAL_TAB_ACCESSIBILITY";
+
+ /**
+ * Work folder name.
+ */
+ public static final String WORK_FOLDER_NAME = PREFIX + "WORK_FOLDER_NAME";
+
+ /**
+ * Label on widget tab to indicate work app widgets.
+ */
+ public static final String WIDGETS_WORK_TAB = PREFIX + "WIDGETS_WORK_TAB";
+
+ /**
+ * Label on widget tab to indicate personal app widgets.
+ */
+ public static final String WIDGETS_PERSONAL_TAB = PREFIX + "WIDGETS_PERSONAL_TAB";
+
+ /**
+ * Message shown when a feature is disabled by the admin (e.g. changing wallpaper).
+ */
+ public static final String DISABLED_BY_ADMIN_MESSAGE =
+ PREFIX + "DISABLED_BY_ADMIN_MESSAGE";
+
+ /**
+ * @hide
+ */
+ static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.add(WORK_PROFILE_EDU);
+ strings.add(WORK_PROFILE_EDU_ACCEPT);
+ strings.add(WORK_PROFILE_PAUSED_TITLE);
+ strings.add(WORK_PROFILE_PAUSED_DESCRIPTION);
+ strings.add(WORK_PROFILE_PAUSE_BUTTON);
+ strings.add(WORK_PROFILE_ENABLE_BUTTON);
+ strings.add(ALL_APPS_WORK_TAB);
+ strings.add(ALL_APPS_PERSONAL_TAB);
+ strings.add(ALL_APPS_PERSONAL_TAB_ACCESSIBILITY);
+ strings.add(ALL_APPS_WORK_TAB_ACCESSIBILITY);
+ strings.add(WORK_FOLDER_NAME);
+ strings.add(WIDGETS_WORK_TAB);
+ strings.add(WIDGETS_PERSONAL_TAB);
+ strings.add(DISABLED_BY_ADMIN_MESSAGE);
+ return strings;
+ }
+ }
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings
+ * in the SystemUi package.
+ *
+ * @hide
+ */
+ public static final class SystemUi {
+
+ private SystemUi() {
+ }
+ private static final String PREFIX = "SystemUi.";
+
+ /**
+ * Label in quick settings for toggling work profile on/off.
+ */
+ public static final String QS_WORK_PROFILE_LABEL = PREFIX + "QS_WORK_PROFILE_LABEL";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate device management.
+ */
+ public static final String QS_MSG_MANAGEMENT = PREFIX + "QS_MSG_MANAGEMENT";
+
+ /**
+ * Similar to {@link #QS_MSG_MANAGEMENT} but accepts the organization name as a
+ * param.
+ */
+ public static final String QS_MSG_NAMED_MANAGEMENT = PREFIX + "QS_MSG_NAMED_MANAGEMENT";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate device management monitoring.
+ */
+ public static final String QS_MSG_MANAGEMENT_MONITORING =
+ PREFIX + "QS_MSG_MANAGEMENT_MONITORING";
+
+ /**
+ * Similar to {@link #QS_MSG_MANAGEMENT_MONITORING} but accepts the
+ * organization name as a param.
+ */
+ public static final String QS_MSG_NAMED_MANAGEMENT_MONITORING =
+ PREFIX + "QS_MSG_NAMED_MANAGEMENT_MONITORING";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate device management and the
+ * device is connected to a VPN, accepts VPN name as a param.
+ */
+ public static final String QS_MSG_MANAGEMENT_NAMED_VPN =
+ PREFIX + "QS_MSG_MANAGEMENT_NAMED_VPN";
+
+ /**
+ * Similar to {@link #QS_MSG_MANAGEMENT_NAMED_VPN} but also accepts the
+ * organization name as a param.
+ */
+ public static final String QS_MSG_NAMED_MANAGEMENT_NAMED_VPN =
+ PREFIX + "QS_MSG_NAMED_MANAGEMENT_NAMED_VPN";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate device management and the
+ * device is connected to multiple VPNs.
+ */
+ public static final String QS_MSG_MANAGEMENT_MULTIPLE_VPNS =
+ PREFIX + "QS_MSG_MANAGEMENT_MULTIPLE_VPNS";
+
+ /**
+ * Similar to {@link #QS_MSG_MANAGEMENT_MULTIPLE_VPNS} but also accepts the
+ * organization name as a param.
+ */
+ public static final String QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS =
+ PREFIX + "QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate work profile monitoring.
+ */
+ public static final String QS_MSG_WORK_PROFILE_MONITORING =
+ PREFIX + "QS_MSG_WORK_PROFILE_MONITORING";
+
+ /**
+ * Similar to {@link #QS_MSG_WORK_PROFILE_MONITORING} but accepts the
+ * organization name as a param.
+ */
+ public static final String QS_MSG_NAMED_WORK_PROFILE_MONITORING =
+ PREFIX + "QS_MSG_NAMED_WORK_PROFILE_MONITORING";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate network activity is visible to
+ * admin.
+ */
+ public static final String QS_MSG_WORK_PROFILE_NETWORK =
+ PREFIX + "QS_MSG_WORK_PROFILE_NETWORK";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate work profile is connected to a
+ * VPN, accepts VPN name as a param.
+ */
+ public static final String QS_MSG_WORK_PROFILE_NAMED_VPN =
+ PREFIX + "QS_MSG_WORK_PROFILE_NAMED_VPN";
+
+ /**
+ * Disclosure at the bottom of Quick Settings to indicate personal profile is connected
+ * to a VPN, accepts VPN name as a param.
+ */
+ public static final String QS_MSG_PERSONAL_PROFILE_NAMED_VPN =
+ PREFIX + "QS_MSG_PERSONAL_PROFILE_NAMED_VPN";
+
+ /**
+ * Title for dialog to indicate device management.
+ */
+ public static final String QS_DIALOG_MANAGEMENT_TITLE =
+ PREFIX + "QS_DIALOG_MANAGEMENT_TITLE";
+
+ /**
+ * Label for button in the device management dialog to open a page with more information
+ * on the admin's abilities.
+ */
+ public static final String QS_DIALOG_VIEW_POLICIES =
+ PREFIX + "QS_DIALOG_VIEW_POLICIES";
+
+ /**
+ * Description for device management dialog to indicate admin abilities.
+ */
+ public static final String QS_DIALOG_MANAGEMENT = PREFIX + "QS_DIALOG_MANAGEMENT";
+
+ /**
+ * Similar to {@link #QS_DIALOG_MANAGEMENT} but accepts the organization name as a
+ * param.
+ */
+ public static final String QS_DIALOG_NAMED_MANAGEMENT =
+ PREFIX + "QS_DIALOG_NAMED_MANAGEMENT";
+
+ /**
+ * Description for the managed device certificate authorities in the device management
+ * dialog.
+ */
+ public static final String QS_DIALOG_MANAGEMENT_CA_CERT =
+ PREFIX + "QS_DIALOG_MANAGEMENT_CA_CERT";
+
+ /**
+ * Description for the work profile certificate authorities in the device management
+ * dialog.
+ */
+ public static final String QS_DIALOG_WORK_PROFILE_CA_CERT =
+ PREFIX + "QS_DIALOG_WORK_PROFILE_CA_CERT";
+
+ /**
+ * Description for the managed device network logging in the device management dialog.
+ */
+ public static final String QS_DIALOG_MANAGEMENT_NETWORK =
+ PREFIX + "QS_DIALOG_MANAGEMENT_NETWORK";
+
+ /**
+ * Description for the work profile network logging in the device management dialog.
+ */
+ public static final String QS_DIALOG_WORK_PROFILE_NETWORK =
+ PREFIX + "QS_DIALOG_WORK_PROFILE_NETWORK";
+
+ /**
+ * Description for an active VPN in the device management dialog, accepts VPN name as a
+ * param.
+ */
+ public static final String QS_DIALOG_MANAGEMENT_NAMED_VPN =
+ PREFIX + "QS_DIALOG_MANAGEMENT_NAMED_VPN";
+
+ /**
+ * Description for two active VPN in the device management dialog, accepts two VPN names
+ * as params.
+ */
+ public static final String QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN =
+ PREFIX + "QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN";
+
+ /**
+ * Description for an active work profile VPN in the device management dialog, accepts
+ * VPN name as a param.
+ */
+ public static final String QS_DIALOG_WORK_PROFILE_NAMED_VPN =
+ PREFIX + "QS_DIALOG_WORK_PROFILE_NAMED_VPN";
+
+ /**
+ * Description for an active personal profile VPN in the device management dialog,
+ * accepts VPN name as a param.
+ */
+ public static final String QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN =
+ PREFIX + "QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN";
+
+ /**
+ * Content of a dialog shown when the user only has one attempt left to provide the
+ * correct pin before the work profile is removed.
+ */
+ public static final String BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT =
+ PREFIX + "BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT";
+
+ /**
+ * Content of a dialog shown when the user only has one attempt left to provide the
+ * correct pattern before the work profile is removed.
+ */
+ public static final String BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT =
+ PREFIX + "BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT";
+
+ /**
+ * Content of a dialog shown when the user only has one attempt left to provide the
+ * correct password before the work profile is removed.
+ */
+ public static final String BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT =
+ PREFIX + "BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT";
+
+ /**
+ * Content of a dialog shown when the user has failed to provide the work lock too many
+ * times and the work profile is removed.
+ */
+ public static final String BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS =
+ PREFIX + "BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS";
+
+ /**
+ * Accessibility label for managed profile icon in the status bar
+ */
+ public static final String STATUS_BAR_WORK_ICON_ACCESSIBILITY =
+ PREFIX + "STATUS_BAR_WORK_ICON_ACCESSIBILITY";
+
+ /**
+ * Text appended to privacy dialog, indicating that the application is in the work
+ * profile.
+ */
+ public static final String ONGOING_PRIVACY_DIALOG_WORK =
+ PREFIX + "ONGOING_PRIVACY_DIALOG_WORK";
+
+ /**
+ * Text on keyguard screen indicating device management.
+ */
+ public static final String KEYGUARD_MANAGEMENT_DISCLOSURE =
+ PREFIX + "KEYGUARD_MANAGEMENT_DISCLOSURE";
+
+ /**
+ * Similar to {@link #KEYGUARD_MANAGEMENT_DISCLOSURE} but also accepts organization name
+ * as a param.
+ */
+ public static final String KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE =
+ PREFIX + "KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE";
+
+ /**
+ * Content description for the work profile lock screen.
+ */
+ public static final String WORK_LOCK_ACCESSIBILITY = PREFIX + "WORK_LOCK_ACCESSIBILITY";
+
+ /**
+ * @hide
+ */
+ static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.add(QS_WORK_PROFILE_LABEL);
+ strings.add(QS_MSG_MANAGEMENT);
+ strings.add(QS_MSG_NAMED_MANAGEMENT);
+ strings.add(QS_MSG_MANAGEMENT_MONITORING);
+ strings.add(QS_MSG_NAMED_MANAGEMENT_MONITORING);
+ strings.add(QS_MSG_MANAGEMENT_NAMED_VPN);
+ strings.add(QS_MSG_NAMED_MANAGEMENT_NAMED_VPN);
+ strings.add(QS_MSG_MANAGEMENT_MULTIPLE_VPNS);
+ strings.add(QS_MSG_NAMED_MANAGEMENT_MULTIPLE_VPNS);
+ strings.add(QS_MSG_WORK_PROFILE_MONITORING);
+ strings.add(QS_MSG_NAMED_WORK_PROFILE_MONITORING);
+ strings.add(QS_MSG_WORK_PROFILE_NETWORK);
+ strings.add(QS_MSG_WORK_PROFILE_NAMED_VPN);
+ strings.add(QS_MSG_PERSONAL_PROFILE_NAMED_VPN);
+ strings.add(QS_DIALOG_MANAGEMENT_TITLE);
+ strings.add(QS_DIALOG_VIEW_POLICIES);
+ strings.add(QS_DIALOG_MANAGEMENT);
+ strings.add(QS_DIALOG_NAMED_MANAGEMENT);
+ strings.add(QS_DIALOG_MANAGEMENT_CA_CERT);
+ strings.add(QS_DIALOG_WORK_PROFILE_CA_CERT);
+ strings.add(QS_DIALOG_MANAGEMENT_NETWORK);
+ strings.add(QS_DIALOG_WORK_PROFILE_NETWORK);
+ strings.add(QS_DIALOG_MANAGEMENT_NAMED_VPN);
+ strings.add(QS_DIALOG_MANAGEMENT_TWO_NAMED_VPN);
+ strings.add(QS_DIALOG_WORK_PROFILE_NAMED_VPN);
+ strings.add(QS_DIALOG_PERSONAL_PROFILE_NAMED_VPN);
+ strings.add(BIOMETRIC_DIALOG_WORK_PIN_LAST_ATTEMPT);
+ strings.add(BIOMETRIC_DIALOG_WORK_PATTERN_LAST_ATTEMPT);
+ strings.add(BIOMETRIC_DIALOG_WORK_PASSWORD_LAST_ATTEMPT);
+ strings.add(BIOMETRIC_DIALOG_WORK_LOCK_FAILED_ATTEMPTS);
+ strings.add(STATUS_BAR_WORK_ICON_ACCESSIBILITY);
+ strings.add(ONGOING_PRIVACY_DIALOG_WORK);
+ strings.add(KEYGUARD_MANAGEMENT_DISCLOSURE);
+ strings.add(KEYGUARD_NAMED_MANAGEMENT_DISCLOSURE);
+ strings.add(WORK_LOCK_ACCESSIBILITY);
+ return strings;
+ }
+ }
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings
+ * in the android core package.
+ *
+ * @hide
+ */
+ public static final class Core {
+
+ private Core() {
+ }
+
+ private static final String PREFIX = "Core.";
+ /**
+ * Notification title when the system deletes the work profile.
+ */
+ public static final String WORK_PROFILE_DELETED_TITLE =
+ PREFIX + "WORK_PROFILE_DELETED_TITLE";
+
+ /**
+ * Content text for the "Work profile deleted" notification to indicates that a work
+ * profile has been deleted because the maximum failed password attempts as been
+ * reached.
+ */
+ public static final String WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE =
+ PREFIX + "WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE";
+
+ /**
+ * Content text for the "Work profile deleted" notification to indicate that a work
+ * profile has been deleted.
+ */
+ public static final String WORK_PROFILE_DELETED_GENERIC_MESSAGE =
+ PREFIX + "WORK_PROFILE_DELETED_GENERIC_MESSAGE";
+
+ /**
+ * Content text for the "Work profile deleted" notification to indicates that a work
+ * profile has been deleted because the admin of an organization-owned device has
+ * relinquishes it.
+ */
+ public static final String WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE =
+ PREFIX + "WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE";
+
+ /**
+ * Notification title for when personal apps are either blocked or will be blocked
+ * soon due to a work policy from their admin.
+ */
+ public static final String PERSONAL_APP_SUSPENSION_TITLE =
+ PREFIX + "PERSONAL_APP_SUSPENSION_TITLE";
+
+ /**
+ * Content text for the personal app suspension notification to indicate that personal
+ * apps are blocked due to a work policy from the admin.
+ */
+ public static final String PERSONAL_APP_SUSPENSION_MESSAGE =
+ PREFIX + "PERSONAL_APP_SUSPENSION_MESSAGE";
+
+ /**
+ * Content text for the personal app suspension notification to indicate that personal
+ * apps will be blocked at a particular time due to a work policy from their admin.
+ * It also explains for how many days the profile is allowed to be off.
+ * <ul>Takes in the following as params:
+ * <li> The date that the personal apps will get suspended at</li>
+ * <li> The time that the personal apps will get suspended at</li>
+ * <li> The max allowed days for the work profile stay switched off</li>
+ * </ul>
+ */
+ public static final String PERSONAL_APP_SUSPENSION_SOON_MESSAGE =
+ PREFIX + "PERSONAL_APP_SUSPENSION_SOON_MESSAGE";
+
+ /**
+ * Title for the button that turns work profile in the personal app suspension
+ * notification.
+ */
+ public static final String PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE =
+ PREFIX + "PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE";
+
+ /**
+ * A toast message displayed when printing is attempted but disabled by policy, accepts
+ * admin name as a param.
+ */
+ public static final String PRINTING_DISABLED_NAMED_ADMIN =
+ PREFIX + "PRINTING_DISABLED_NAMED_ADMIN";
+
+ /**
+ * Notification title to indicate that the device owner has changed the location
+ * settings.
+ */
+ public static final String LOCATION_CHANGED_TITLE = PREFIX + "LOCATION_CHANGED_TITLE";
+
+ /**
+ * Content text for the location changed notification to indicate that the device owner
+ * has changed the location settings.
+ */
+ public static final String LOCATION_CHANGED_MESSAGE =
+ PREFIX + "LOCATION_CHANGED_MESSAGE";
+
+ /**
+ * Notification title to indicate that the device is managed and network logging was
+ * activated by a device owner.
+ */
+ public static final String NETWORK_LOGGING_TITLE = PREFIX + "NETWORK_LOGGING_TITLE";
+
+ /**
+ * Content text for the network logging notification to indicate that the device is
+ * managed and network logging was activated by a device owner.
+ */
+ public static final String NETWORK_LOGGING_MESSAGE = PREFIX + "NETWORK_LOGGING_MESSAGE";
+
+ /**
+ * Content description of the work profile icon in the notifications.
+ */
+ public static final String NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION =
+ PREFIX + "NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION";
+
+ /**
+ * Notification channel name for high-priority alerts from the user's IT admin for key
+ * updates about the device.
+ */
+ public static final String NOTIFICATION_CHANNEL_DEVICE_ADMIN =
+ PREFIX + "NOTIFICATION_CHANNEL_DEVICE_ADMIN";
+
+ /**
+ * Label returned from
+ * {@link android.content.pm.CrossProfileApps#getProfileSwitchingLabel(UserHandle)}
+ * that calling app can show to user for the semantic of switching to work profile.
+ */
+ public static final String SWITCH_TO_WORK_LABEL = PREFIX + "SWITCH_TO_WORK_LABEL";
+
+ /**
+ * Label returned from
+ * {@link android.content.pm.CrossProfileApps#getProfileSwitchingLabel(UserHandle)}
+ * that calling app can show to user for the semantic of switching to personal profile.
+ */
+ public static final String SWITCH_TO_PERSONAL_LABEL =
+ PREFIX + "SWITCH_TO_PERSONAL_LABEL";
+
+ /**
+ * Message to show when an intent automatically switches users into the work profile.
+ */
+ public static final String FORWARD_INTENT_TO_WORK = PREFIX + "FORWARD_INTENT_TO_WORK";
+
+ /**
+ * Message to show when an intent automatically switches users into the personal
+ * profile.
+ */
+ public static final String FORWARD_INTENT_TO_PERSONAL =
+ PREFIX + "FORWARD_INTENT_TO_PERSONAL";
+
+ /**
+ * Text for the toast that is shown when the user clicks on a launcher that doesn't
+ * support the work profile, takes in the launcher name as a param.
+ */
+ public static final String RESOLVER_WORK_PROFILE_NOT_SUPPORTED =
+ PREFIX + "RESOLVER_WORK_PROFILE_NOT_SUPPORTED";
+
+ /**
+ * Label for the personal tab in the {@link com.android.internal.app.ResolverActivity).
+ */
+ public static final String RESOLVER_PERSONAL_TAB = PREFIX + "RESOLVER_PERSONAL_TAB";
+
+ /**
+ * Label for the work tab in the {@link com.android.internal.app.ResolverActivity).
+ */
+ public static final String RESOLVER_WORK_TAB = PREFIX + "RESOLVER_WORK_TAB";
+
+ /**
+ * Accessibility Label for the personal tab in the
+ * {@link com.android.internal.app.ResolverActivity).
+ */
+ public static final String RESOLVER_PERSONAL_TAB_ACCESSIBILITY =
+ PREFIX + "RESOLVER_PERSONAL_TAB_ACCESSIBILITY";
+
+ /**
+ * Accessibility Label for the work tab in the
+ * {@link com.android.internal.app.ResolverActivity).
+ */
+ public static final String RESOLVER_WORK_TAB_ACCESSIBILITY =
+ PREFIX + "RESOLVER_WORK_TAB_ACCESSIBILITY";
+
+ /**
+ * Title for resolver screen to let the user know that their IT admin doesn't allow
+ * them to share this content across profiles.
+ */
+ public static final String RESOLVER_CROSS_PROFILE_BLOCKED_TITLE =
+ PREFIX + "RESOLVER_CROSS_PROFILE_BLOCKED_TITLE";
+
+ /**
+ * Description for resolver screen to let the user know that their IT admin doesn't
+ * allow them to share this content with apps in their personal profile.
+ */
+ public static final String RESOLVER_CANT_SHARE_WITH_PERSONAL =
+ PREFIX + "RESOLVER_CANT_SHARE_WITH_PERSONAL";
+
+ /**
+ * Description for resolver screen to let the user know that their IT admin doesn't
+ * allow them to share this content with apps in their work profile.
+ */
+ public static final String RESOLVER_CANT_SHARE_WITH_WORK =
+ PREFIX + "RESOLVER_CANT_SHARE_WITH_WORK";
+
+ /**
+ * Description for resolver screen to let the user know that their IT admin doesn't
+ * allow them to open this specific content with an app in their personal profile.
+ */
+ public static final String RESOLVER_CANT_ACCESS_PERSONAL =
+ PREFIX + "RESOLVER_CANT_ACCESS_PERSONAL";
+
+ /**
+ * Description for resolver screen to let the user know that their IT admin doesn't
+ * allow them to open this specific content with an app in their work profile.
+ */
+ public static final String RESOLVER_CANT_ACCESS_WORK =
+ PREFIX + "RESOLVER_CANT_ACCESS_WORK";
+
+ /**
+ * Title for resolver screen to let the user know that they need to turn on work apps
+ * in order to share or open content
+ */
+ public static final String RESOLVER_WORK_PAUSED_TITLE =
+ PREFIX + "RESOLVER_WORK_PAUSED_TITLE";
+
+ /**
+ * Text on resolver screen to let the user know that their current work apps don't
+ * support the specific content.
+ */
+ public static final String RESOLVER_NO_WORK_APPS = PREFIX + "RESOLVER_NO_WORK_APPS";
+
+ /**
+ * Text on resolver screen to let the user know that their current personal apps don't
+ * support the specific content.
+ */
+ public static final String RESOLVER_NO_PERSONAL_APPS =
+ PREFIX + "RESOLVER_NO_PERSONAL_APPS";
+
+ /**
+ * Message informing user that the adding the account is disallowed by an administrator.
+ */
+ public static final String CANT_ADD_ACCOUNT_MESSAGE =
+ PREFIX + "CANT_ADD_ACCOUNT_MESSAGE";
+
+ /**
+ * Notification shown when device owner silently installs a package.
+ */
+ public static final String PACKAGE_INSTALLED_BY_DO = PREFIX + "PACKAGE_INSTALLED_BY_DO";
+
+ /**
+ * Notification shown when device owner silently updates a package.
+ */
+ public static final String PACKAGE_UPDATED_BY_DO = PREFIX + "PACKAGE_UPDATED_BY_DO";
+
+ /**
+ * Notification shown when device owner silently deleted a package.
+ */
+ public static final String PACKAGE_DELETED_BY_DO = PREFIX + "PACKAGE_DELETED_BY_DO";
+
+ /**
+ * Title for dialog shown when user tries to open a work app when the work profile is
+ * turned off, confirming that the user wants to turn on access to their
+ * work apps.
+ */
+ public static final String UNLAUNCHABLE_APP_WORK_PAUSED_TITLE =
+ PREFIX + "UNLAUNCHABLE_APP_WORK_PAUSED_TITLE";
+
+ /**
+ * Text for dialog shown when user tries to open a work app when the work profile is
+ * turned off, confirming that the user wants to turn on access to their
+ * work apps.
+ */
+ public static final String UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE =
+ PREFIX + "UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE";
+
+ /**
+ * Notification title shown when work profile is credential encrypted and requires
+ * the user to unlock before it's usable.
+ */
+ public static final String PROFILE_ENCRYPTED_TITLE = PREFIX + "PROFILE_ENCRYPTED_TITLE";
+
+ /**
+ * Notification detail shown when work profile is credential encrypted and requires
+ * the user to unlock before it's usable.
+ */
+ public static final String PROFILE_ENCRYPTED_DETAIL =
+ PREFIX + "PROFILE_ENCRYPTED_DETAIL";
+
+ /**
+ * Notification message shown when work profile is credential encrypted and requires
+ * the user to unlock before it's usable.
+ */
+ public static final String PROFILE_ENCRYPTED_MESSAGE =
+ PREFIX + "PROFILE_ENCRYPTED_MESSAGE";
+
+ /**
+ * Used to badge a string with "Work" for work profile content, e.g. "Work Email".
+ * Accepts the string to badge as an argument.
+ * <p>See {@link android.content.pm.PackageManager#getUserBadgedLabel}</p>
+ */
+ public static final String WORK_PROFILE_BADGED_LABEL =
+ PREFIX + "WORK_PROFILE_BADGED_LABEL";
+
+ /**
+ * @hide
+ */
+ static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.add(WORK_PROFILE_DELETED_TITLE);
+ strings.add(WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE);
+ strings.add(WORK_PROFILE_DELETED_GENERIC_MESSAGE);
+ strings.add(WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE);
+ strings.add(PERSONAL_APP_SUSPENSION_TITLE);
+ strings.add(PERSONAL_APP_SUSPENSION_MESSAGE);
+ strings.add(PERSONAL_APP_SUSPENSION_SOON_MESSAGE);
+ strings.add(PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE);
+ strings.add(PRINTING_DISABLED_NAMED_ADMIN);
+ strings.add(LOCATION_CHANGED_TITLE);
+ strings.add(LOCATION_CHANGED_MESSAGE);
+ strings.add(NETWORK_LOGGING_TITLE);
+ strings.add(NETWORK_LOGGING_MESSAGE);
+ strings.add(NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION);
+ strings.add(NOTIFICATION_CHANNEL_DEVICE_ADMIN);
+ strings.add(SWITCH_TO_WORK_LABEL);
+ strings.add(SWITCH_TO_PERSONAL_LABEL);
+ strings.add(FORWARD_INTENT_TO_WORK);
+ strings.add(FORWARD_INTENT_TO_PERSONAL);
+ strings.add(RESOLVER_WORK_PROFILE_NOT_SUPPORTED);
+ strings.add(RESOLVER_PERSONAL_TAB);
+ strings.add(RESOLVER_WORK_TAB);
+ strings.add(RESOLVER_PERSONAL_TAB_ACCESSIBILITY);
+ strings.add(RESOLVER_WORK_TAB_ACCESSIBILITY);
+ strings.add(RESOLVER_CROSS_PROFILE_BLOCKED_TITLE);
+ strings.add(RESOLVER_CANT_SHARE_WITH_PERSONAL);
+ strings.add(RESOLVER_CANT_SHARE_WITH_WORK);
+ strings.add(RESOLVER_CANT_ACCESS_PERSONAL);
+ strings.add(RESOLVER_CANT_ACCESS_WORK);
+ strings.add(RESOLVER_WORK_PAUSED_TITLE);
+ strings.add(RESOLVER_NO_WORK_APPS);
+ strings.add(RESOLVER_NO_PERSONAL_APPS);
+ strings.add(CANT_ADD_ACCOUNT_MESSAGE);
+ strings.add(PACKAGE_INSTALLED_BY_DO);
+ strings.add(PACKAGE_UPDATED_BY_DO);
+ strings.add(PACKAGE_DELETED_BY_DO);
+ strings.add(UNLAUNCHABLE_APP_WORK_PAUSED_TITLE);
+ strings.add(UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE);
+ strings.add(PROFILE_ENCRYPTED_TITLE);
+ strings.add(PROFILE_ENCRYPTED_DETAIL);
+ strings.add(PROFILE_ENCRYPTED_MESSAGE);
+ strings.add(WORK_PROFILE_BADGED_LABEL);
+ return strings;
+ }
+ }
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings
+ * in the DocumentsUi package.
+ */
+ public static final class DocumentsUi {
+
+ private DocumentsUi() {
+ }
+
+ private static final String PREFIX = "DocumentsUi.";
+
+ /**
+ * Title for error message shown when work profile is turned off.
+ */
+ public static final String WORK_PROFILE_OFF_ERROR_TITLE =
+ PREFIX + "WORK_PROFILE_OFF_ERROR_TITLE";
+
+ /**
+ * Button text shown when work profile is turned off.
+ */
+ public static final String WORK_PROFILE_OFF_ENABLE_BUTTON =
+ PREFIX + "WORK_PROFILE_OFF_ENABLE_BUTTON";
+
+ /**
+ * Title for error message shown when a user's IT admin does not allow the user to
+ * select work files from a personal app.
+ */
+ public static final String CANT_SELECT_WORK_FILES_TITLE =
+ PREFIX + "CANT_SELECT_WORK_FILES_TITLE";
+
+ /**
+ * Message shown when a user's IT admin does not allow the user to select work files
+ * from a personal app.
+ */
+ public static final String CANT_SELECT_WORK_FILES_MESSAGE =
+ PREFIX + "CANT_SELECT_WORK_FILES_MESSAGE";
+
+ /**
+ * Title for error message shown when a user's IT admin does not allow the user to
+ * select personal files from a work app.
+ */
+ public static final String CANT_SELECT_PERSONAL_FILES_TITLE =
+ PREFIX + "CANT_SELECT_PERSONAL_FILES_TITLE";
+
+ /**
+ * Message shown when a user's IT admin does not allow the user to select personal files
+ * from a work app.
+ */
+ public static final String CANT_SELECT_PERSONAL_FILES_MESSAGE =
+ PREFIX + "CANT_SELECT_PERSONAL_FILES_MESSAGE";
+
+ /**
+ * Title for error message shown when a user's IT admin does not allow the user to save
+ * files from their personal profile to their work profile.
+ */
+ public static final String CANT_SAVE_TO_WORK_TITLE =
+ PREFIX + "CANT_SAVE_TO_WORK_TITLE";
+
+ /**
+ * Message shown when a user's IT admin does not allow the user to save files from their
+ * personal profile to their work profile.
+ */
+ public static final String CANT_SAVE_TO_WORK_MESSAGE =
+ PREFIX + "CANT_SAVE_TO_WORK_MESSAGE";
+
+ /**
+ * Title for error message shown when a user's IT admin does not allow the user to save
+ * files from their work profile to their personal profile.
+ */
+ public static final String CANT_SAVE_TO_PERSONAL_TITLE =
+ PREFIX + "CANT_SAVE_TO_PERSONAL_TITLE";
+
+ /**
+ * Message shown when a user's IT admin does not allow the user to save files from their
+ * work profile to their personal profile.
+ */
+ public static final String CANT_SAVE_TO_PERSONAL_MESSAGE =
+ PREFIX + "CANT_SAVE_TO_PERSONAL_MESSAGE";
+
+ /**
+ * Title for error message shown when a user tries to do something on their work
+ * device, but that action isn't allowed by their IT admin.
+ */
+ public static final String CROSS_PROFILE_NOT_ALLOWED_TITLE =
+ PREFIX + "CROSS_PROFILE_NOT_ALLOWED_TITLE";
+
+ /**
+ * Message shown when a user tries to do something on their work device, but that action
+ * isn't allowed by their IT admin.
+ */
+ public static final String CROSS_PROFILE_NOT_ALLOWED_MESSAGE =
+ PREFIX + "CROSS_PROFILE_NOT_ALLOWED_MESSAGE";
+
+ /**
+ * Content description text that's spoken by a screen reader for previewing a work file
+ * before opening it. Accepts file name as a param.
+ */
+ public static final String PREVIEW_WORK_FILE_ACCESSIBILITY =
+ PREFIX + "PREVIEW_WORK_FILE_ACCESSIBILITY";
+
+ /**
+ * Label for tab and sidebar to indicate personal content.
+ */
+ public static final String PERSONAL_TAB = PREFIX + "PERSONAL_TAB";
+
+ /**
+ * Label for tab and sidebar tab to indicate work content
+ */
+ public static final String WORK_TAB = PREFIX + "WORK_TAB";
+
+ /**
+ * Accessibility label to indicate the subject(e.g. file/folder) is from work profile.
+ */
+ public static final String WORK_ACCESSIBILITY = PREFIX + "WORK_ACCESSIBILITY";
+
+ /**
+ * @hide
+ */
+ static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.add(WORK_PROFILE_OFF_ERROR_TITLE);
+ strings.add(WORK_PROFILE_OFF_ENABLE_BUTTON);
+ strings.add(CANT_SELECT_WORK_FILES_TITLE);
+ strings.add(CANT_SELECT_WORK_FILES_MESSAGE);
+ strings.add(CANT_SELECT_PERSONAL_FILES_TITLE);
+ strings.add(CANT_SELECT_PERSONAL_FILES_MESSAGE);
+ strings.add(CANT_SAVE_TO_WORK_TITLE);
+ strings.add(CANT_SAVE_TO_WORK_MESSAGE);
+ strings.add(CANT_SAVE_TO_PERSONAL_TITLE);
+ strings.add(CANT_SAVE_TO_PERSONAL_MESSAGE);
+ strings.add(CROSS_PROFILE_NOT_ALLOWED_TITLE);
+ strings.add(CROSS_PROFILE_NOT_ALLOWED_MESSAGE);
+ strings.add(PREVIEW_WORK_FILE_ACCESSIBILITY);
+ strings.add(PERSONAL_TAB);
+ strings.add(WORK_TAB);
+ strings.add(WORK_ACCESSIBILITY);
+ return strings;
+ }
+ }
+
+ /**
+ * Class containing the identifiers used to update device management-related system strings
+ * in the MediaProvider module.
+ */
+ public static final class MediaProvider {
+
+ private MediaProvider() {
+ }
+
+ private static final String PREFIX = "MediaProvider.";
+
+ /**
+ * The text shown to switch to the work profile in PhotoPicker.
+ */
+ public static final String SWITCH_TO_WORK_MESSAGE =
+ PREFIX + "SWITCH_TO_WORK_MESSAGE";
+
+ /**
+ * The text shown to switch to the personal profile in PhotoPicker.
+ */
+ public static final String SWITCH_TO_PERSONAL_MESSAGE =
+ PREFIX + "SWITCH_TO_PERSONAL_MESSAGE";
+
+ /**
+ * The title for error dialog in PhotoPicker when the admin blocks cross user
+ * interaction for the intent.
+ */
+ public static final String BLOCKED_BY_ADMIN_TITLE =
+ PREFIX + "BLOCKED_BY_ADMIN_TITLE";
+
+ /**
+ * The message for error dialog in PhotoPicker when the admin blocks cross user
+ * interaction from the personal profile.
+ */
+ public static final String BLOCKED_FROM_PERSONAL_MESSAGE =
+ PREFIX + "BLOCKED_FROM_PERSONAL_MESSAGE";
+
+ /**
+ * The message for error dialog in PhotoPicker when the admin blocks cross user
+ * interaction from the work profile.
+ */
+ public static final String BLOCKED_FROM_WORK_MESSAGE =
+ PREFIX + "BLOCKED_FROM_WORK_MESSAGE";
+
+ /**
+ * The title of the error dialog in PhotoPicker when the user tries to switch to work
+ * content, but work profile is off.
+ */
+ public static final String WORK_PROFILE_PAUSED_TITLE =
+ PREFIX + "WORK_PROFILE_PAUSED_TITLE";
+
+ /**
+ * The message of the error dialog in PhotoPicker when the user tries to switch to work
+ * content, but work profile is off.
+ */
+ public static final String WORK_PROFILE_PAUSED_MESSAGE =
+ PREFIX + "WORK_PROFILE_PAUSED_MESSAGE";
+
+ /**
+ * @hide
+ */
+ static Set<String> buildStringsSet() {
+ Set<String> strings = new HashSet<>();
+ strings.add(SWITCH_TO_WORK_MESSAGE);
+ strings.add(SWITCH_TO_PERSONAL_MESSAGE);
+ strings.add(BLOCKED_BY_ADMIN_TITLE);
+ strings.add(BLOCKED_FROM_PERSONAL_MESSAGE);
+ strings.add(BLOCKED_FROM_WORK_MESSAGE);
+ strings.add(WORK_PROFILE_PAUSED_TITLE);
+ strings.add(WORK_PROFILE_PAUSED_MESSAGE);
+ return strings;
+ }
+ }
+ }
}
diff --git a/core/java/android/app/admin/DevicePolicyStringResource.aidl b/core/java/android/app/admin/DevicePolicyStringResource.aidl
new file mode 100644
index 0000000..13b0b95
--- /dev/null
+++ b/core/java/android/app/admin/DevicePolicyStringResource.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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.app.admin;
+
+parcelable DevicePolicyStringResource;
diff --git a/core/java/android/app/admin/DevicePolicyStringResource.java b/core/java/android/app/admin/DevicePolicyStringResource.java
new file mode 100644
index 0000000..5f09bfd
--- /dev/null
+++ b/core/java/android/app/admin/DevicePolicyStringResource.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2022 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.app.admin;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.StringRes;
+import android.annotation.SystemApi;
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+/**
+ * Used to pass in the required information for updating an enterprise string resource using
+ * {@link DevicePolicyManager#setStrings}.
+ *
+ * @hide
+ */
+@SystemApi
+public final class DevicePolicyStringResource implements Parcelable {
+ @NonNull private final @DevicePolicyResources.UpdatableStringId String mStringId;
+ private final @StringRes int mCallingPackageResourceId;
+ @NonNull private ParcelableResource mResource;
+
+ /**
+ * Creates an object containing the required information for updating an enterprise string
+ * resource using {@link DevicePolicyManager#setStrings}.
+ *
+ * <p>It will be used to update the string defined by {@code stringId} to the string with ID
+ * {@code callingPackageResourceId} in the calling package</p>
+ *
+ * @param stringId The ID of the string to update.
+ * @param callingPackageResourceId The ID of the {@link StringRes} in the calling package to
+ * use as an updated resource.
+ *
+ * @throws IllegalStateException if the resource with ID {@code callingPackageResourceId}
+ * doesn't exist in the {@code context} package.
+ */
+ public DevicePolicyStringResource(
+ @NonNull Context context,
+ @NonNull @DevicePolicyResources.UpdatableStringId String stringId,
+ @StringRes int callingPackageResourceId) {
+ this(stringId, callingPackageResourceId, new ParcelableResource(
+ context, callingPackageResourceId, ParcelableResource.RESOURCE_TYPE_STRING));
+ }
+
+ private DevicePolicyStringResource(
+ @NonNull @DevicePolicyResources.UpdatableStringId String stringId,
+ @StringRes int callingPackageResourceId,
+ @NonNull ParcelableResource resource) {
+ Objects.requireNonNull(stringId, "stringId must be provided.");
+ Objects.requireNonNull(resource, "ParcelableResource must be provided.");
+
+ this.mStringId = stringId;
+ this.mCallingPackageResourceId = callingPackageResourceId;
+ this.mResource = resource;
+ }
+
+ /**
+ * Returns the ID of the string to update.
+ */
+ @DevicePolicyResources.UpdatableStringId
+ @NonNull
+ public String getStringId() {
+ return mStringId;
+ }
+
+ /**
+ * Returns the ID of the {@link StringRes} in the calling package to use as an updated
+ * resource.
+ */
+ public int getCallingPackageResourceId() {
+ return mCallingPackageResourceId;
+ }
+
+ /**
+ * Returns the {@link ParcelableResource} of the string.
+ *
+ * @hide
+ */
+ @NonNull
+ public ParcelableResource getResource() {
+ return mResource;
+ }
+
+ @Override
+ public boolean equals(@Nullable Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ DevicePolicyStringResource other = (DevicePolicyStringResource) o;
+ return mStringId == other.mStringId
+ && mCallingPackageResourceId == other.mCallingPackageResourceId
+ && mResource.equals(other.mResource);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mStringId, mCallingPackageResourceId, mResource);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeString(mStringId);
+ dest.writeInt(mCallingPackageResourceId);
+ dest.writeTypedObject(mResource, flags);
+ }
+
+ public static final @NonNull Creator<DevicePolicyStringResource> CREATOR =
+ new Creator<DevicePolicyStringResource>() {
+ @Override
+ public DevicePolicyStringResource createFromParcel(Parcel in) {
+ String stringId = in.readString();
+ int callingPackageResourceId = in.readInt();
+ ParcelableResource resource = in.readTypedObject(ParcelableResource.CREATOR);
+
+ return new DevicePolicyStringResource(stringId, callingPackageResourceId, resource);
+ }
+
+ @Override
+ public DevicePolicyStringResource[] newArray(int size) {
+ return new DevicePolicyStringResource[size];
+ }
+ };
+}
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 8320087..f663c17 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -18,6 +18,7 @@
package android.app.admin;
import android.app.admin.DevicePolicyDrawableResource;
+import android.app.admin.DevicePolicyStringResource;
import android.app.admin.ParcelableResource;
import android.app.admin.NetworkEvent;
import android.app.IApplicationThread;
@@ -532,8 +533,20 @@
boolean isUsbDataSignalingEnabledForUser(int userId);
boolean canUsbDataSignalingBeDisabled();
+ void setMinimumRequiredWifiSecurityLevel(int level);
+ int getMinimumRequiredWifiSecurityLevel();
+
+ void setSsidAllowlist(in List<String> ssids);
+ List<String> getSsidAllowlist();
+ void setSsidDenylist(in List<String> ssids);
+ List<String> getSsidDenylist();
+
List<UserHandle> listForegroundAffiliatedUsers();
- void setDrawables(in List<DevicePolicyDrawableResource> resource);
+ void setDrawables(in List<DevicePolicyDrawableResource> drawables);
void resetDrawables(in int[] drawableIds);
ParcelableResource getDrawable(int drawableId, int drawableStyle, int drawableSource);
+
+ void setStrings(in List<DevicePolicyStringResource> strings);
+ void resetStrings(in String[] stringIds);
+ ParcelableResource getString(String stringId);
}
diff --git a/core/java/android/app/admin/ParcelableResource.java b/core/java/android/app/admin/ParcelableResource.java
index e517162..dba3628 100644
--- a/core/java/android/app/admin/ParcelableResource.java
+++ b/core/java/android/app/admin/ParcelableResource.java
@@ -43,7 +43,7 @@
/**
* Used to store the required information to load a resource that was updated using
- * {@link DevicePolicyManager#setDrawables}.
+ * {@link DevicePolicyManager#setDrawables} and {@link DevicePolicyManager#setStrings}.
*
* @hide
*/
@@ -57,10 +57,13 @@
private static final String ATTR_RESOURCE_TYPE = "resource-type";
public static final int RESOURCE_TYPE_DRAWABLE = 1;
+ public static final int RESOURCE_TYPE_STRING = 2;
+
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = { "RESOURCE_TYPE_" }, value = {
- RESOURCE_TYPE_DRAWABLE
+ RESOURCE_TYPE_DRAWABLE,
+ RESOURCE_TYPE_STRING
})
public @interface ResourceType {}
@@ -78,13 +81,11 @@
* resource
* @param resourceId of the resource to use as an updated resource
* @param resourceType see {@link ResourceType}
- * @throws IllegalArgumentException if the given {@code resourceId} doesn't exist in the
- * {@link Context#getResources()} of the given {@code context}
*/
- public ParcelableResource(@NonNull Context context, @AnyRes int resourceId,
- @ResourceType int resourceType) throws IllegalArgumentException {
+ public ParcelableResource(
+ @NonNull Context context, @AnyRes int resourceId, @ResourceType int resourceType)
+ throws IllegalStateException, IllegalArgumentException {
Objects.requireNonNull(context, "context must be provided");
-
verifyResourceExistsInCallingPackage(context, resourceId, resourceType);
this.mResourceId = resourceId;
@@ -108,25 +109,41 @@
private static void verifyResourceExistsInCallingPackage(
Context context, @AnyRes int resourceId, @ResourceType int resourceType)
- throws IllegalArgumentException {
+ throws IllegalStateException, IllegalArgumentException {
switch (resourceType) {
case RESOURCE_TYPE_DRAWABLE:
if (!hasDrawableInCallingPackage(context, resourceId)) {
- throw new IllegalArgumentException(String.format(
+ throw new IllegalStateException(String.format(
"Drawable with id %d doesn't exist in the calling package %s",
resourceId,
context.getPackageName()));
}
break;
+ case RESOURCE_TYPE_STRING:
+ if (!hasStringInCallingPackage(context, resourceId)) {
+ throw new IllegalStateException(String.format(
+ "String with id %d doesn't exist in the calling package %s",
+ resourceId,
+ context.getPackageName()));
+ }
+ break;
default:
throw new IllegalArgumentException(
- "Unknown ParcelableDevicePolicyResourceType: " + resourceType);
+ "Unknown ResourceType: " + resourceType);
}
}
private static boolean hasDrawableInCallingPackage(Context context, @AnyRes int resourceId) {
try {
- return context.getDrawable(resourceId) != null;
+ return "drawable".equals(context.getResources().getResourceTypeName(resourceId));
+ } catch (Resources.NotFoundException e) {
+ return false;
+ }
+ }
+
+ private static boolean hasStringInCallingPackage(Context context, @AnyRes int resourceId) {
+ try {
+ return "string".equals(context.getResources().getResourceTypeName(resourceId));
} catch (Resources.NotFoundException e) {
return false;
}
@@ -158,7 +175,7 @@
* <p>Returns the default drawable by calling the {@code defaultDrawableLoader} if the updated
* drawable was not found or could not be loaded.</p>
*/
- @Nullable
+ @NonNull
public Drawable getDrawable(
Context context,
int density,
@@ -175,6 +192,59 @@
}
}
+ /**
+ * Loads the string with id {@code mResourceId} from {@code mPackageName} using the
+ * configuration returned from {@link Resources#getConfiguration} of the provided
+ * {@code context}.
+ *
+ * <p>Returns the default string by calling {@code defaultStringLoader} if the updated
+ * string was not found or could not be loaded.</p>
+ */
+ @NonNull
+ public String getString(
+ Context context,
+ @NonNull Callable<String> defaultStringLoader) {
+ // TODO(b/203548565): properly handle edge case when the device manager role holder is
+ // unavailable because it's being updated.
+ try {
+ Resources resources = getAppResourcesWithCallersConfiguration(context);
+ verifyResourceName(resources);
+ return resources.getString(mResourceId);
+ } catch (PackageManager.NameNotFoundException | RuntimeException e) {
+ Slog.e(TAG, "Unable to load string resource " + mResourceName, e);
+ return loadDefaultString(defaultStringLoader);
+ }
+ }
+
+ /**
+ * Loads the string with id {@code mResourceId} from {@code mPackageName} using the
+ * configuration returned from {@link Resources#getConfiguration} of the provided
+ * {@code context}.
+ *
+ * <p>Returns the default string by calling {@code defaultStringLoader} if the updated
+ * string was not found or could not be loaded.</p>
+ */
+ @Nullable
+ public String getString(
+ Context context,
+ @NonNull Callable<String> defaultStringLoader,
+ @NonNull Object... formatArgs) {
+ // TODO(b/203548565): properly handle edge case when the device manager role holder is
+ // unavailable because it's being updated.
+ try {
+ Resources resources = getAppResourcesWithCallersConfiguration(context);
+ verifyResourceName(resources);
+ String rawString = resources.getString(mResourceId);
+ return String.format(
+ context.getResources().getConfiguration().getLocales().get(0),
+ rawString,
+ formatArgs);
+ } catch (PackageManager.NameNotFoundException | RuntimeException e) {
+ Slog.e(TAG, "Unable to load string resource " + mResourceName, e);
+ return loadDefaultString(defaultStringLoader);
+ }
+ }
+
private Resources getAppResourcesWithCallersConfiguration(Context context)
throws PackageManager.NameNotFoundException {
PackageManager pm = context.getPackageManager();
@@ -195,15 +265,40 @@
}
/**
- * returns the {@link Drawable} loaded from calling
- * {@code defaultDrawableLoader}.
+ * returns the {@link Drawable} loaded from calling {@code defaultDrawableLoader}.
*/
- public static Drawable loadDefaultDrawable(
- @NonNull Callable<Drawable> defaultDrawableLoader) {
+ @NonNull
+ public static Drawable loadDefaultDrawable(@NonNull Callable<Drawable> defaultDrawableLoader) {
try {
- return defaultDrawableLoader.call();
+ Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null");
+
+ Drawable drawable = defaultDrawableLoader.call();
+ Objects.requireNonNull(drawable, "defaultDrawable can't be null");
+
+ return drawable;
+ } catch (NullPointerException rethrown) {
+ throw rethrown;
} catch (Exception e) {
- throw new RuntimeException("Couldn't load default drawable", e);
+ throw new RuntimeException("Couldn't load default drawable: ", e);
+ }
+ }
+
+ /**
+ * returns the {@link String} loaded from calling {@code defaultStringLoader}.
+ */
+ @NonNull
+ public static String loadDefaultString(@NonNull Callable<String> defaultStringLoader) {
+ try {
+ Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null");
+
+ String string = defaultStringLoader.call();
+ Objects.requireNonNull(string, "defaultString can't be null");
+
+ return string;
+ } catch (NullPointerException rethrown) {
+ throw rethrown;
+ } catch (Exception e) {
+ throw new RuntimeException("Couldn't load default string: ", e);
}
}
diff --git a/core/java/android/app/admin/WifiSsidPolicy.java b/core/java/android/app/admin/WifiSsidPolicy.java
new file mode 100644
index 0000000..3715017
--- /dev/null
+++ b/core/java/android/app/admin/WifiSsidPolicy.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2022 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.app.admin;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.ArraySet;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Set;
+
+/**
+ * Used to indicate the Wi-Fi SSID restriction policy the network must satisfy
+ * in order to be eligible for a connection.
+ *
+ * If the policy type is a denylist, the device may not connect to networks on the denylist.
+ * If the policy type is an allowlist, the device may only connect to networks on the allowlist.
+ * Admin configured networks are not exempt from this restriction.
+ * This policy only prohibits connecting to a restricted network and
+ * does not affect adding a restricted network.
+ * If the current network is present in the denylist or not present in the allowlist,
+ * it will be disconnected.
+ */
+public final class WifiSsidPolicy implements Parcelable {
+ /**
+ * SSID policy type indicator for {@link WifiSsidPolicy}.
+ *
+ * <p> When returned from {@link WifiSsidPolicy#getPolicyType()}, the constant
+ * indicates that the SSID policy type is an allowlist.
+ *
+ * @see #WIFI_SSID_POLICY_TYPE_DENYLIST
+ */
+ public static final int WIFI_SSID_POLICY_TYPE_ALLOWLIST = 0;
+
+ /**
+ * SSID policy type indicator for {@link WifiSsidPolicy}.
+ *
+ * <p> When returned from {@link WifiSsidPolicy#getPolicyType()}, the constant
+ * indicates that the SSID policy type is a denylist.
+ *
+ * @see #WIFI_SSID_POLICY_TYPE_ALLOWLIST
+ */
+ public static final int WIFI_SSID_POLICY_TYPE_DENYLIST = 1;
+
+ /**
+ * Possible SSID policy types
+ *
+ * @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(prefix = {"WIFI_SSID_POLICY_TYPE_"}, value = {
+ WIFI_SSID_POLICY_TYPE_ALLOWLIST,
+ WIFI_SSID_POLICY_TYPE_DENYLIST})
+ public @interface WifiSsidPolicyType {}
+
+ private @WifiSsidPolicyType int mPolicyType;
+ private ArraySet<String> mSsids;
+
+ private WifiSsidPolicy(@WifiSsidPolicyType int policyType, @NonNull Set<String> ssids) {
+ mPolicyType = policyType;
+ mSsids = new ArraySet<>(ssids);
+ }
+
+ private WifiSsidPolicy(Parcel in) {
+ mPolicyType = in.readInt();
+ mSsids = (ArraySet<String>) in.readArraySet(null);
+ }
+ /**
+ * Create the allowlist Wi-Fi SSID Policy.
+ *
+ * @param ssids allowlist of SSIDs in UTF-8 without double quotes format
+ * @throws IllegalArgumentException if the input ssids list is empty
+ */
+ @NonNull
+ public static WifiSsidPolicy createAllowlistPolicy(@NonNull Set<String> ssids) {
+ if (ssids.isEmpty()) {
+ throw new IllegalArgumentException("SSID list cannot be empty");
+ }
+ return new WifiSsidPolicy(WIFI_SSID_POLICY_TYPE_ALLOWLIST, ssids);
+ }
+
+ /**
+ * Create the denylist Wi-Fi SSID Policy.
+ *
+ * @param ssids denylist of SSIDs in UTF-8 without double quotes format
+ * @throws IllegalArgumentException if the input ssids list is empty
+ */
+ @NonNull
+ public static WifiSsidPolicy createDenylistPolicy(@NonNull Set<String> ssids) {
+ if (ssids.isEmpty()) {
+ throw new IllegalArgumentException("SSID list cannot be empty");
+ }
+ return new WifiSsidPolicy(WIFI_SSID_POLICY_TYPE_DENYLIST, ssids);
+ }
+
+ /**
+ * Returns the set of SSIDs in UTF-8 without double quotes format.
+ */
+ @NonNull
+ public Set<String> getSsids() {
+ return mSsids;
+ }
+
+ /**
+ * Returns the policy type.
+ */
+ public @WifiSsidPolicyType int getPolicyType() {
+ return mPolicyType;
+ }
+
+ /**
+ * @see Parcelable.Creator
+ */
+ @NonNull
+ public static final Creator<WifiSsidPolicy> CREATOR = new Creator<WifiSsidPolicy>() {
+ @Override
+ public WifiSsidPolicy createFromParcel(Parcel source) {
+ return new WifiSsidPolicy(source);
+ }
+
+ @Override
+ public WifiSsidPolicy[] newArray(int size) {
+ return new WifiSsidPolicy[size];
+ }
+ };
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(mPolicyType);
+ dest.writeArraySet(mSsids);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+}
diff --git a/core/java/android/app/ambientcontext/AmbientContextEvent.aidl b/core/java/android/app/ambientcontext/AmbientContextEvent.aidl
new file mode 100644
index 0000000..0965b1a
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEvent.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2021 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.app.ambientcontext;
+
+parcelable AmbientContextEvent;
diff --git a/core/java/android/app/ambientcontext/AmbientContextEvent.java b/core/java/android/app/ambientcontext/AmbientContextEvent.java
new file mode 100644
index 0000000..11e695ad
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEvent.java
@@ -0,0 +1,492 @@
+/*
+ * Copyright (C) 2022 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.app.ambientcontext;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.os.Parcelable;
+
+import com.android.internal.util.DataClass;
+import com.android.internal.util.Parcelling;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.time.Instant;
+
+
+/**
+ * Represents a detected ambient event. Each event has a type, start time, end time,
+ * plus some optional data.
+ *
+ * @hide
+ */
+@SystemApi
+@DataClass(
+ genBuilder = true,
+ genConstructor = false,
+ genHiddenConstDefs = true,
+ genParcelable = true,
+ genToString = true
+)
+public final class AmbientContextEvent implements Parcelable {
+ /**
+ * The integer indicating an unknown event was detected.
+ */
+ public static final int EVENT_UNKNOWN = 0;
+
+ /**
+ * The integer indicating a cough event was detected.
+ */
+ public static final int EVENT_COUGH = 1;
+
+ /**
+ * The integer indicating a snore event was detected.
+ */
+ public static final int EVENT_SNORE = 2;
+
+ /** @hide */
+ @IntDef(prefix = { "EVENT_" }, value = {
+ EVENT_UNKNOWN,
+ EVENT_COUGH,
+ EVENT_SNORE,
+ }) public @interface EventCode {}
+
+ /** The integer indicating an unknown level. */
+ public static final int LEVEL_UNKNOWN = 0;
+
+ /** The integer indicating a low level. */
+ public static final int LEVEL_LOW = 1;
+
+ /** The integer indicating a medium low level. */
+ public static final int LEVEL_MEDIUM_LOW = 2;
+
+ /** The integer indicating a medium Level. */
+ public static final int LEVEL_MEDIUM = 3;
+
+ /** The integer indicating a medium high level. */
+ public static final int LEVEL_MEDIUM_HIGH = 4;
+
+ /** The integer indicating a high level. */
+ public static final int LEVEL_HIGH = 5;
+
+ /** @hide */
+ @IntDef(prefix = {"LEVEL_"}, value = {
+ LEVEL_UNKNOWN,
+ LEVEL_LOW,
+ LEVEL_MEDIUM_LOW,
+ LEVEL_MEDIUM,
+ LEVEL_MEDIUM_HIGH,
+ LEVEL_HIGH
+ }) public @interface LevelValue {}
+
+ @EventCode private final int mEventType;
+ private static int defaultEventType() {
+ return EVENT_UNKNOWN;
+ }
+
+ /** Event start time */
+ @DataClass.ParcelWith(Parcelling.BuiltIn.ForInstant.class)
+ @NonNull private final Instant mStartTime;
+ @NonNull private static Instant defaultStartTime() {
+ return Instant.MIN;
+ }
+
+ /** Event end time */
+ @DataClass.ParcelWith(Parcelling.BuiltIn.ForInstant.class)
+ @NonNull private final Instant mEndTime;
+ @NonNull private static Instant defaultEndTime() {
+ return Instant.MAX;
+ }
+
+ /**
+ * Confidence level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @LevelValue private final int mConfidenceLevel;
+ private static int defaultConfidenceLevel() {
+ return LEVEL_UNKNOWN;
+ }
+
+ /**
+ * Density level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @LevelValue private final int mDensityLevel;
+ private static int defaultDensityLevel() {
+ return LEVEL_UNKNOWN;
+ }
+
+
+
+ // Code below generated by codegen v1.0.23.
+ //
+ // DO NOT MODIFY!
+ // CHECKSTYLE:OFF Generated code
+ //
+ // To regenerate run:
+ // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/app/ambientcontext/AmbientContextEvent.java
+ //
+ // To exclude the generated code from IntelliJ auto-formatting enable (one-time):
+ // Settings > Editor > Code Style > Formatter Control
+ //@formatter:off
+
+
+ /** @hide */
+ @IntDef(prefix = "EVENT_", value = {
+ EVENT_UNKNOWN,
+ EVENT_COUGH,
+ EVENT_SNORE
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @DataClass.Generated.Member
+ public @interface Event {}
+
+ /** @hide */
+ @DataClass.Generated.Member
+ public static String eventToString(@Event int value) {
+ switch (value) {
+ case EVENT_UNKNOWN:
+ return "EVENT_UNKNOWN";
+ case EVENT_COUGH:
+ return "EVENT_COUGH";
+ case EVENT_SNORE:
+ return "EVENT_SNORE";
+ default: return Integer.toHexString(value);
+ }
+ }
+
+ /** @hide */
+ @IntDef(prefix = "LEVEL_", value = {
+ LEVEL_UNKNOWN,
+ LEVEL_LOW,
+ LEVEL_MEDIUM_LOW,
+ LEVEL_MEDIUM,
+ LEVEL_MEDIUM_HIGH,
+ LEVEL_HIGH
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @DataClass.Generated.Member
+ public @interface Level {}
+
+ /** @hide */
+ @DataClass.Generated.Member
+ public static String levelToString(@Level int value) {
+ switch (value) {
+ case LEVEL_UNKNOWN:
+ return "LEVEL_UNKNOWN";
+ case LEVEL_LOW:
+ return "LEVEL_LOW";
+ case LEVEL_MEDIUM_LOW:
+ return "LEVEL_MEDIUM_LOW";
+ case LEVEL_MEDIUM:
+ return "LEVEL_MEDIUM";
+ case LEVEL_MEDIUM_HIGH:
+ return "LEVEL_MEDIUM_HIGH";
+ case LEVEL_HIGH:
+ return "LEVEL_HIGH";
+ default: return Integer.toHexString(value);
+ }
+ }
+
+ @DataClass.Generated.Member
+ /* package-private */ AmbientContextEvent(
+ @EventCode int eventType,
+ @NonNull Instant startTime,
+ @NonNull Instant endTime,
+ @LevelValue int confidenceLevel,
+ @LevelValue int densityLevel) {
+ this.mEventType = eventType;
+ com.android.internal.util.AnnotationValidations.validate(
+ EventCode.class, null, mEventType);
+ this.mStartTime = startTime;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mStartTime);
+ this.mEndTime = endTime;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mEndTime);
+ this.mConfidenceLevel = confidenceLevel;
+ com.android.internal.util.AnnotationValidations.validate(
+ LevelValue.class, null, mConfidenceLevel);
+ this.mDensityLevel = densityLevel;
+ com.android.internal.util.AnnotationValidations.validate(
+ LevelValue.class, null, mDensityLevel);
+
+ // onConstructed(); // You can define this method to get a callback
+ }
+
+ @DataClass.Generated.Member
+ public @EventCode int getEventType() {
+ return mEventType;
+ }
+
+ /**
+ * Event start time
+ */
+ @DataClass.Generated.Member
+ public @NonNull Instant getStartTime() {
+ return mStartTime;
+ }
+
+ /**
+ * Event end time
+ */
+ @DataClass.Generated.Member
+ public @NonNull Instant getEndTime() {
+ return mEndTime;
+ }
+
+ /**
+ * Confidence level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @DataClass.Generated.Member
+ public @LevelValue int getConfidenceLevel() {
+ return mConfidenceLevel;
+ }
+
+ /**
+ * Density level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @DataClass.Generated.Member
+ public @LevelValue int getDensityLevel() {
+ return mDensityLevel;
+ }
+
+ @Override
+ @DataClass.Generated.Member
+ public String toString() {
+ // You can override field toString logic by defining methods like:
+ // String fieldNameToString() { ... }
+
+ return "AmbientContextEvent { " +
+ "eventType = " + mEventType + ", " +
+ "startTime = " + mStartTime + ", " +
+ "endTime = " + mEndTime + ", " +
+ "confidenceLevel = " + mConfidenceLevel + ", " +
+ "densityLevel = " + mDensityLevel +
+ " }";
+ }
+
+ @DataClass.Generated.Member
+ static Parcelling<Instant> sParcellingForStartTime =
+ Parcelling.Cache.get(
+ Parcelling.BuiltIn.ForInstant.class);
+ static {
+ if (sParcellingForStartTime == null) {
+ sParcellingForStartTime = Parcelling.Cache.put(
+ new Parcelling.BuiltIn.ForInstant());
+ }
+ }
+
+ @DataClass.Generated.Member
+ static Parcelling<Instant> sParcellingForEndTime =
+ Parcelling.Cache.get(
+ Parcelling.BuiltIn.ForInstant.class);
+ static {
+ if (sParcellingForEndTime == null) {
+ sParcellingForEndTime = Parcelling.Cache.put(
+ new Parcelling.BuiltIn.ForInstant());
+ }
+ }
+
+ @Override
+ @DataClass.Generated.Member
+ public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
+ // You can override field parcelling by defining methods like:
+ // void parcelFieldName(Parcel dest, int flags) { ... }
+
+ dest.writeInt(mEventType);
+ sParcellingForStartTime.parcel(mStartTime, dest, flags);
+ sParcellingForEndTime.parcel(mEndTime, dest, flags);
+ dest.writeInt(mConfidenceLevel);
+ dest.writeInt(mDensityLevel);
+ }
+
+ @Override
+ @DataClass.Generated.Member
+ public int describeContents() { return 0; }
+
+ /** @hide */
+ @SuppressWarnings({"unchecked", "RedundantCast"})
+ @DataClass.Generated.Member
+ /* package-private */ AmbientContextEvent(@NonNull android.os.Parcel in) {
+ // You can override field unparcelling by defining methods like:
+ // static FieldType unparcelFieldName(Parcel in) { ... }
+
+ int eventType = in.readInt();
+ Instant startTime = sParcellingForStartTime.unparcel(in);
+ Instant endTime = sParcellingForEndTime.unparcel(in);
+ int confidenceLevel = in.readInt();
+ int densityLevel = in.readInt();
+
+ this.mEventType = eventType;
+ com.android.internal.util.AnnotationValidations.validate(
+ EventCode.class, null, mEventType);
+ this.mStartTime = startTime;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mStartTime);
+ this.mEndTime = endTime;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mEndTime);
+ this.mConfidenceLevel = confidenceLevel;
+ com.android.internal.util.AnnotationValidations.validate(
+ LevelValue.class, null, mConfidenceLevel);
+ this.mDensityLevel = densityLevel;
+ com.android.internal.util.AnnotationValidations.validate(
+ LevelValue.class, null, mDensityLevel);
+
+ // onConstructed(); // You can define this method to get a callback
+ }
+
+ @DataClass.Generated.Member
+ public static final @NonNull Parcelable.Creator<AmbientContextEvent> CREATOR
+ = new Parcelable.Creator<AmbientContextEvent>() {
+ @Override
+ public AmbientContextEvent[] newArray(int size) {
+ return new AmbientContextEvent[size];
+ }
+
+ @Override
+ public AmbientContextEvent createFromParcel(@NonNull android.os.Parcel in) {
+ return new AmbientContextEvent(in);
+ }
+ };
+
+ /**
+ * A builder for {@link AmbientContextEvent}
+ */
+ @SuppressWarnings("WeakerAccess")
+ @DataClass.Generated.Member
+ public static final class Builder {
+
+ private @EventCode int mEventType;
+ private @NonNull Instant mStartTime;
+ private @NonNull Instant mEndTime;
+ private @LevelValue int mConfidenceLevel;
+ private @LevelValue int mDensityLevel;
+
+ private long mBuilderFieldsSet = 0L;
+
+ public Builder() {
+ }
+
+ @DataClass.Generated.Member
+ public @NonNull Builder setEventType(@EventCode int value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x1;
+ mEventType = value;
+ return this;
+ }
+
+ /**
+ * Event start time
+ */
+ @DataClass.Generated.Member
+ public @NonNull Builder setStartTime(@NonNull Instant value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x2;
+ mStartTime = value;
+ return this;
+ }
+
+ /**
+ * Event end time
+ */
+ @DataClass.Generated.Member
+ public @NonNull Builder setEndTime(@NonNull Instant value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x4;
+ mEndTime = value;
+ return this;
+ }
+
+ /**
+ * Confidence level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @DataClass.Generated.Member
+ public @NonNull Builder setConfidenceLevel(@LevelValue int value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x8;
+ mConfidenceLevel = value;
+ return this;
+ }
+
+ /**
+ * Density level from LEVEL_LOW to LEVEL_HIGH, or LEVEL_NONE if not available.
+ * Apps can add post-processing filter using this value if needed.
+ */
+ @DataClass.Generated.Member
+ public @NonNull Builder setDensityLevel(@LevelValue int value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x10;
+ mDensityLevel = value;
+ return this;
+ }
+
+ /** Builds the instance. This builder should not be touched after calling this! */
+ public @NonNull AmbientContextEvent build() {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x20; // Mark builder used
+
+ if ((mBuilderFieldsSet & 0x1) == 0) {
+ mEventType = defaultEventType();
+ }
+ if ((mBuilderFieldsSet & 0x2) == 0) {
+ mStartTime = defaultStartTime();
+ }
+ if ((mBuilderFieldsSet & 0x4) == 0) {
+ mEndTime = defaultEndTime();
+ }
+ if ((mBuilderFieldsSet & 0x8) == 0) {
+ mConfidenceLevel = defaultConfidenceLevel();
+ }
+ if ((mBuilderFieldsSet & 0x10) == 0) {
+ mDensityLevel = defaultDensityLevel();
+ }
+ AmbientContextEvent o = new AmbientContextEvent(
+ mEventType,
+ mStartTime,
+ mEndTime,
+ mConfidenceLevel,
+ mDensityLevel);
+ return o;
+ }
+
+ private void checkNotUsed() {
+ if ((mBuilderFieldsSet & 0x20) != 0) {
+ throw new IllegalStateException(
+ "This Builder should not be reused. Use a new Builder instance instead");
+ }
+ }
+ }
+
+ @DataClass.Generated(
+ time = 1642040319323L,
+ codegenVersion = "1.0.23",
+ sourceFile = "frameworks/base/core/java/android/app/ambientcontext/AmbientContextEvent.java",
+ inputSignatures = "public static final int EVENT_UNKNOWN\npublic static final int EVENT_COUGH\npublic static final int EVENT_SNORE\npublic static final int LEVEL_UNKNOWN\npublic static final int LEVEL_LOW\npublic static final int LEVEL_MEDIUM_LOW\npublic static final int LEVEL_MEDIUM\npublic static final int LEVEL_MEDIUM_HIGH\npublic static final int LEVEL_HIGH\nprivate final @android.app.ambientcontext.AmbientContextEvent.EventCode int mEventType\nprivate final @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInstant.class) @android.annotation.NonNull java.time.Instant mStartTime\nprivate final @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForInstant.class) @android.annotation.NonNull java.time.Instant mEndTime\nprivate final @android.app.ambientcontext.AmbientContextEvent.LevelValue int mConfidenceLevel\nprivate final @android.app.ambientcontext.AmbientContextEvent.LevelValue int mDensityLevel\nprivate static int defaultEventType()\nprivate static @android.annotation.NonNull java.time.Instant defaultStartTime()\nprivate static @android.annotation.NonNull java.time.Instant defaultEndTime()\nprivate static int defaultConfidenceLevel()\nprivate static int defaultDensityLevel()\nclass AmbientContextEvent extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genConstructor=false, genHiddenConstDefs=true, genParcelable=true, genToString=true)")
+ @Deprecated
+ private void __metadata() {}
+
+
+ //@formatter:on
+ // End of generated code
+
+}
diff --git a/core/java/android/app/ambientcontext/AmbientContextEventRequest.aidl b/core/java/android/app/ambientcontext/AmbientContextEventRequest.aidl
new file mode 100644
index 0000000..e24c6ad
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEventRequest.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2022 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.app.ambientcontext;
+
+parcelable AmbientContextEventRequest;
diff --git a/core/java/android/app/ambientcontext/AmbientContextEventRequest.java b/core/java/android/app/ambientcontext/AmbientContextEventRequest.java
new file mode 100644
index 0000000..82b16a2
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEventRequest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2022 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.app.ambientcontext;
+
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.PersistableBundle;
+import android.util.ArraySet;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Represents the request for ambient event detection.
+ *
+ * @hide
+ */
+@SystemApi
+public final class AmbientContextEventRequest implements Parcelable {
+ @NonNull private final Set<Integer> mEventTypes;
+ @NonNull private final PersistableBundle mOptions;
+
+ AmbientContextEventRequest(
+ @NonNull Set<Integer> eventTypes,
+ @NonNull PersistableBundle options) {
+ this.mEventTypes = eventTypes;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mEventTypes);
+ this.mOptions = options;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mOptions);
+ }
+
+ /**
+ * The event types to detect.
+ */
+ public @NonNull Set<Integer> getEventTypes() {
+ return mEventTypes;
+ }
+
+ /**
+ * Optional detection options.
+ */
+ public @NonNull PersistableBundle getOptions() {
+ return mOptions;
+ }
+
+ @Override
+ public String toString() {
+ return "AmbientContextEventRequest { " + "eventTypes = " + mEventTypes + ", "
+ + "options = " + mOptions + " }";
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeArraySet(new ArraySet<>(mEventTypes));
+ dest.writeTypedObject(mOptions, flags);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /** @hide */
+ @SuppressWarnings({"unchecked", "RedundantCast"})
+ AmbientContextEventRequest(@NonNull Parcel in) {
+ Set<Integer> eventTypes = (Set<Integer>) in.readArraySet(Integer.class.getClassLoader());
+ PersistableBundle options = (PersistableBundle) in.readTypedObject(
+ PersistableBundle.CREATOR);
+
+ this.mEventTypes = eventTypes;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mEventTypes);
+ this.mOptions = options;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mOptions);
+ }
+
+ public static final @NonNull Parcelable.Creator<AmbientContextEventRequest> CREATOR =
+ new Parcelable.Creator<AmbientContextEventRequest>() {
+ @Override
+ public AmbientContextEventRequest[] newArray(int size) {
+ return new AmbientContextEventRequest[size];
+ }
+
+ @Override
+ public AmbientContextEventRequest createFromParcel(@NonNull Parcel in) {
+ return new AmbientContextEventRequest(in);
+ }
+ };
+
+ /**
+ * A builder for {@link AmbientContextEventRequest}
+ */
+ @SuppressWarnings("WeakerAccess")
+ public static final class Builder {
+ private @NonNull Set<Integer> mEventTypes;
+ private @NonNull PersistableBundle mOptions;
+
+ private long mBuilderFieldsSet = 0L;
+
+ public Builder() {
+ }
+
+ /**
+ * Add an event type to detect.
+ */
+ public @NonNull Builder addEventType(@AmbientContextEvent.EventCode int value) {
+ checkNotUsed();
+ if (mEventTypes == null) {
+ mBuilderFieldsSet |= 0x1;
+ mEventTypes = new HashSet<>();
+ }
+ mEventTypes.add(value);
+ return this;
+ }
+
+ /**
+ * Optional detection options.
+ */
+ public @NonNull Builder setOptions(@NonNull PersistableBundle value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x2;
+ mOptions = value;
+ return this;
+ }
+
+ /** Builds the instance. This builder should not be touched after calling this! */
+ public @NonNull AmbientContextEventRequest build() {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x4; // Mark builder used
+
+ if ((mBuilderFieldsSet & 0x1) == 0) {
+ mEventTypes = new HashSet<>();
+ }
+ if ((mBuilderFieldsSet & 0x2) == 0) {
+ mOptions = new PersistableBundle();
+ }
+ AmbientContextEventRequest o = new AmbientContextEventRequest(
+ mEventTypes,
+ mOptions);
+ return o;
+ }
+
+ private void checkNotUsed() {
+ if ((mBuilderFieldsSet & 0x4) != 0) {
+ throw new IllegalStateException(
+ "This Builder should not be reused. Use a new Builder instance instead");
+ }
+ }
+ }
+}
diff --git a/core/java/android/app/ambientcontext/AmbientContextEventResponse.aidl b/core/java/android/app/ambientcontext/AmbientContextEventResponse.aidl
new file mode 100644
index 0000000..4dc6466
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEventResponse.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2021 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.app.ambientcontext;
+
+parcelable AmbientContextEventResponse;
\ No newline at end of file
diff --git a/core/java/android/app/ambientcontext/AmbientContextEventResponse.java b/core/java/android/app/ambientcontext/AmbientContextEventResponse.java
new file mode 100644
index 0000000..472a78b
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextEventResponse.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2022 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.app.ambientcontext;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.SystemApi;
+import android.app.PendingIntent;
+import android.os.Parcelable;
+
+import com.android.internal.util.AnnotationValidations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents a response from the {@code AmbientContextEvent} service.
+ *
+ * @hide
+ */
+@SystemApi
+public final class AmbientContextEventResponse implements Parcelable {
+ /**
+ * An unknown status.
+ */
+ public static final int STATUS_UNKNOWN = 0;
+ /**
+ * The value of the status code that indicates success.
+ */
+ public static final int STATUS_SUCCESS = 1;
+ /**
+ * The value of the status code that indicates one or more of the
+ * requested events are not supported.
+ */
+ public static final int STATUS_NOT_SUPPORTED = 2;
+ /**
+ * The value of the status code that indicates service not available.
+ */
+ public static final int STATUS_SERVICE_UNAVAILABLE = 3;
+ /**
+ * The value of the status code that microphone is disabled.
+ */
+ public static final int STATUS_MICROPHONE_DISABLED = 4;
+ /**
+ * The value of the status code that the app is not granted access.
+ */
+ public static final int STATUS_ACCESS_DENIED = 5;
+
+ /** @hide */
+ @IntDef(prefix = { "STATUS_" }, value = {
+ STATUS_UNKNOWN,
+ STATUS_SUCCESS,
+ STATUS_NOT_SUPPORTED,
+ STATUS_SERVICE_UNAVAILABLE,
+ STATUS_MICROPHONE_DISABLED,
+ STATUS_ACCESS_DENIED
+ }) public @interface StatusCode {}
+
+ @StatusCode private final int mStatusCode;
+ @NonNull private final List<AmbientContextEvent> mEvents;
+ @NonNull private final String mPackageName;
+ @Nullable private final PendingIntent mActionPendingIntent;
+
+ /** @hide */
+ public static String statusToString(@StatusCode int value) {
+ switch (value) {
+ case STATUS_UNKNOWN:
+ return "STATUS_UNKNOWN";
+ case STATUS_SUCCESS:
+ return "STATUS_SUCCESS";
+ case STATUS_NOT_SUPPORTED:
+ return "STATUS_NOT_SUPPORTED";
+ case STATUS_SERVICE_UNAVAILABLE:
+ return "STATUS_SERVICE_UNAVAILABLE";
+ case STATUS_MICROPHONE_DISABLED:
+ return "STATUS_MICROPHONE_DISABLED";
+ case STATUS_ACCESS_DENIED:
+ return "STATUS_ACCESS_DENIED";
+ default: return Integer.toHexString(value);
+ }
+ }
+
+ AmbientContextEventResponse(
+ @StatusCode int statusCode,
+ @NonNull List<AmbientContextEvent> events,
+ @NonNull String packageName,
+ @Nullable PendingIntent actionPendingIntent) {
+ this.mStatusCode = statusCode;
+ AnnotationValidations.validate(StatusCode.class, null, mStatusCode);
+ this.mEvents = events;
+ AnnotationValidations.validate(NonNull.class, null, mEvents);
+ this.mPackageName = packageName;
+ AnnotationValidations.validate(NonNull.class, null, mPackageName);
+ this.mActionPendingIntent = actionPendingIntent;
+ }
+
+ /**
+ * The status of the response.
+ */
+ public @StatusCode int getStatusCode() {
+ return mStatusCode;
+ }
+
+ /**
+ * The detected event.
+ */
+ public @NonNull List<AmbientContextEvent> getEvents() {
+ return mEvents;
+ }
+
+ /**
+ * The package to deliver the response to.
+ */
+ public @NonNull String getPackageName() {
+ return mPackageName;
+ }
+
+ /**
+ * A {@link PendingIntent} that the client should call to allow further actions by user.
+ * For example, with {@link STATUS_ACCESS_DENIED}, the PendingIntent can redirect users to the
+ * grant access activity.
+ */
+ public @Nullable PendingIntent getActionPendingIntent() {
+ return mActionPendingIntent;
+ }
+
+ @Override
+ public String toString() {
+ return "AmbientContextEventResponse { " + "statusCode = " + mStatusCode + ", "
+ + "events = " + mEvents + ", " + "packageName = " + mPackageName + ", "
+ + "callbackPendingIntent = " + mActionPendingIntent + " }";
+ }
+
+ @Override
+ public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
+ byte flg = 0;
+ if (mActionPendingIntent != null) flg |= 0x8;
+ dest.writeByte(flg);
+ dest.writeInt(mStatusCode);
+ dest.writeParcelableList(mEvents, flags);
+ dest.writeString(mPackageName);
+ if (mActionPendingIntent != null) dest.writeTypedObject(mActionPendingIntent, flags);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /** @hide */
+ @SuppressWarnings({"unchecked", "RedundantCast"})
+ AmbientContextEventResponse(@NonNull android.os.Parcel in) {
+ byte flg = in.readByte();
+ int statusCode = in.readInt();
+ List<AmbientContextEvent> events = new ArrayList<>();
+ in.readParcelableList(events, AmbientContextEvent.class.getClassLoader(),
+ AmbientContextEvent.class);
+ String packageName = in.readString();
+ PendingIntent callbackPendingIntent = (flg & 0x8) == 0 ? null
+ : (PendingIntent) in.readTypedObject(PendingIntent.CREATOR);
+
+ this.mStatusCode = statusCode;
+ AnnotationValidations.validate(
+ StatusCode.class, null, mStatusCode);
+ this.mEvents = events;
+ AnnotationValidations.validate(
+ NonNull.class, null, mEvents);
+ this.mPackageName = packageName;
+ AnnotationValidations.validate(
+ NonNull.class, null, mPackageName);
+ this.mActionPendingIntent = callbackPendingIntent;
+ }
+
+ public static final @NonNull Parcelable.Creator<AmbientContextEventResponse> CREATOR =
+ new Parcelable.Creator<AmbientContextEventResponse>() {
+ @Override
+ public AmbientContextEventResponse[] newArray(int size) {
+ return new AmbientContextEventResponse[size];
+ }
+
+ @Override
+ public AmbientContextEventResponse createFromParcel(@NonNull android.os.Parcel in) {
+ return new AmbientContextEventResponse(in);
+ }
+ };
+
+ /**
+ * A builder for {@link AmbientContextEventResponse}
+ */
+ @SuppressWarnings("WeakerAccess")
+ public static final class Builder {
+ private @StatusCode int mStatusCode;
+ private @NonNull List<AmbientContextEvent> mEvents;
+ private @NonNull String mPackageName;
+ private @Nullable PendingIntent mCallbackPendingIntent;
+ private long mBuilderFieldsSet = 0L;
+
+ public Builder() {
+ }
+
+ /**
+ * The status of the response.
+ */
+ public @NonNull Builder setStatusCode(@StatusCode int value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x1;
+ mStatusCode = value;
+ return this;
+ }
+
+ /**
+ * Adds an event to the builder.
+ */
+ public @NonNull Builder addEvent(@NonNull AmbientContextEvent value) {
+ checkNotUsed();
+ if (mEvents == null) {
+ mBuilderFieldsSet |= 0x2;
+ mEvents = new ArrayList<>();
+ }
+ mEvents.add(value);
+ return this;
+ }
+
+ /**
+ * The package to deliver the response to.
+ */
+ public @NonNull Builder setPackageName(@NonNull String value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x4;
+ mPackageName = value;
+ return this;
+ }
+
+ /**
+ * A {@link PendingIntent} that the client should call to allow further actions by user.
+ * For example, with {@link STATUS_ACCESS_DENIED}, the PendingIntent can redirect users to
+ * the grant access activity.
+ */
+ public @NonNull Builder setActionPendingIntent(@NonNull PendingIntent value) {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x8;
+ mCallbackPendingIntent = value;
+ return this;
+ }
+
+ /** Builds the instance. This builder should not be touched after calling this! */
+ public @NonNull AmbientContextEventResponse build() {
+ checkNotUsed();
+ mBuilderFieldsSet |= 0x10; // Mark builder used
+
+ if ((mBuilderFieldsSet & 0x1) == 0) {
+ mStatusCode = STATUS_UNKNOWN;
+ }
+ if ((mBuilderFieldsSet & 0x2) == 0) {
+ mEvents = new ArrayList<>();
+ }
+ if ((mBuilderFieldsSet & 0x4) == 0) {
+ mPackageName = "";
+ }
+ if ((mBuilderFieldsSet & 0x8) == 0) {
+ mCallbackPendingIntent = null;
+ }
+ AmbientContextEventResponse o = new AmbientContextEventResponse(
+ mStatusCode,
+ mEvents,
+ mPackageName,
+ mCallbackPendingIntent);
+ return o;
+ }
+
+ private void checkNotUsed() {
+ if ((mBuilderFieldsSet & 0x10) != 0) {
+ throw new IllegalStateException(
+ "This Builder should not be reused. Use a new Builder instance instead");
+ }
+ }
+ }
+}
diff --git a/core/java/android/app/ambientcontext/AmbientContextManager.java b/core/java/android/app/ambientcontext/AmbientContextManager.java
new file mode 100644
index 0000000..6841d1b
--- /dev/null
+++ b/core/java/android/app/ambientcontext/AmbientContextManager.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2022 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.app.ambientcontext;
+
+import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
+import android.annotation.SystemApi;
+import android.annotation.SystemService;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+
+import com.android.internal.util.Preconditions;
+
+/**
+ * Allows granted apps to register for particular pre-defined {@link AmbientContextEvent}s.
+ * After successful registration, the app receives a callback on the provided {@link PendingIntent}
+ * when the requested event is detected.
+ * <p />
+ *
+ * Example:
+ *
+ * <pre><code>
+ * // Create request
+ * AmbientContextEventRequest request = new AmbientContextEventRequest.Builder()
+ * .addEventType(AmbientContextEvent.EVENT_COUGH)
+ * .addEventTYpe(AmbientContextEvent.EVENT_SNORE)
+ * .build();
+ * // Create PendingIntent
+ * Intent intent = new Intent(actionString, null, context, MyBroadcastReceiver.class)
+ * .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ * PendingIntent pendingIntent = PendingIntents.getBroadcastMutable(context, 0, intent, 0);
+ * // Register for events
+ * AmbientContextManager ambientContextManager =
+ * context.getSystemService(AmbientContextManager.class);
+ * ambientContextManager.registerObserver(request, pendingIntent);
+ *
+ * // Handle the callback intent in your receiver
+ * {@literal @}Override
+ * protected void onReceive(Context context, Intent intent) {
+ * AmbientContextEventResponse response =
+ * AmbientContextManager.getResponseFromIntent(intent);
+ * if (response != null) {
+ * if (response.getStatusCode() == AmbientContextEventResponse.STATUS_SUCCESS) {
+ * // Do something useful with response.getEvent()
+ * } else if (response.getStatusCode() == AmbientContextEventResponse.STATUS_ACCESS_DENIED) {
+ * // Redirect users to grant access
+ * PendingIntent callbackPendingIntent = response.getCallbackPendingIntent();
+ * if (callbackPendingIntent != null) {
+ * callbackPendingIntent.send();
+ * }
+ * } else ...
+ * }
+ * }
+ * </code></pre>
+ *
+ * @hide
+ */
+@SystemApi
+@SystemService(Context.AMBIENT_CONTEXT_SERVICE)
+public final class AmbientContextManager {
+
+ /**
+ * The key of an Intent extra indicating the response.
+ */
+ public static final String EXTRA_AMBIENT_CONTEXT_EVENT_RESPONSE =
+ "android.app.ambientcontext.extra.AMBIENT_CONTEXT_EVENT_RESPONSE";
+
+ /**
+ * Allows clients to retrieve the response from the intent.
+ * @param intent received from the PendingIntent callback
+ *
+ * @return the AmbientContextEventResponse, or null if not present
+ */
+ @Nullable
+ public static AmbientContextEventResponse getResponseFromIntent(
+ @NonNull Intent intent) {
+ if (intent.hasExtra(AmbientContextManager.EXTRA_AMBIENT_CONTEXT_EVENT_RESPONSE)) {
+ return intent.getParcelableExtra(EXTRA_AMBIENT_CONTEXT_EVENT_RESPONSE);
+ } else {
+ return null;
+ }
+ }
+
+ private final Context mContext;
+ private final IAmbientContextEventObserver mService;
+
+ /**
+ * {@hide}
+ */
+ public AmbientContextManager(Context context, IAmbientContextEventObserver service) {
+ mContext = context;
+ mService = service;
+ }
+
+ /**
+ * Allows app to register as a {@link AmbientContextEvent} observer. The
+ * observer receives a callback on the provided {@link PendingIntent} when the requested
+ * event is detected. Registering another observer from the same package that has already been
+ * registered will override the previous observer.
+ *
+ * @param request The request with events to observe.
+ * @param pendingIntent A mutable {@link PendingIntent} that will be dispatched when any
+ * requested event is detected.
+ */
+ @RequiresPermission(Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT)
+ public void registerObserver(
+ @NonNull AmbientContextEventRequest request,
+ @NonNull PendingIntent pendingIntent) {
+ Preconditions.checkArgument(!pendingIntent.isImmutable());
+ try {
+ mService.registerObserver(request, pendingIntent);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Unregisters the requesting app as an {@code AmbientContextEvent} observer. Unregistering an
+ * observer that was already unregistered or never registered will have no effect.
+ */
+ @RequiresPermission(Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT)
+ public void unregisterObserver() {
+ try {
+ mService.unregisterObserver(mContext.getOpPackageName());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+}
diff --git a/core/java/android/app/ambientcontext/IAmbientContextEventObserver.aidl b/core/java/android/app/ambientcontext/IAmbientContextEventObserver.aidl
new file mode 100644
index 0000000..9032fe1
--- /dev/null
+++ b/core/java/android/app/ambientcontext/IAmbientContextEventObserver.aidl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.app.ambientcontext;
+
+import android.app.PendingIntent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+
+/**
+ * Interface for an AmbientContextEventManager that provides access to AmbientContextEvents.
+ *
+ * @hide
+ */
+oneway interface IAmbientContextEventObserver {
+ void registerObserver(in AmbientContextEventRequest request, in PendingIntent pendingIntent);
+ void unregisterObserver(in String callingPackage);
+}
\ No newline at end of file
diff --git a/core/java/android/app/ambientcontext/OWNERS b/core/java/android/app/ambientcontext/OWNERS
new file mode 100644
index 0000000..a863297
--- /dev/null
+++ b/core/java/android/app/ambientcontext/OWNERS
@@ -0,0 +1,3 @@
+enxun@google.com
+kxchen@google.com
+tgadh@google.com
diff --git a/core/java/android/app/trust/ITrustListener.aidl b/core/java/android/app/trust/ITrustListener.aidl
index 65b0249..6b9d2c73 100644
--- a/core/java/android/app/trust/ITrustListener.aidl
+++ b/core/java/android/app/trust/ITrustListener.aidl
@@ -16,13 +16,16 @@
*/
package android.app.trust;
+import java.util.List;
+
/**
* Private API to be notified about trust changes.
*
* {@hide}
*/
oneway interface ITrustListener {
- void onTrustChanged(boolean enabled, int userId, int flags);
+ void onTrustChanged(boolean enabled, int userId, int flags,
+ in List<String> trustGrantedMessages);
void onTrustManagedChanged(boolean managed, int userId);
void onTrustError(in CharSequence message);
}
\ No newline at end of file
diff --git a/core/java/android/app/trust/ITrustManager.aidl b/core/java/android/app/trust/ITrustManager.aidl
index 1291766c..edabccf 100644
--- a/core/java/android/app/trust/ITrustManager.aidl
+++ b/core/java/android/app/trust/ITrustManager.aidl
@@ -26,6 +26,7 @@
*/
interface ITrustManager {
void reportUnlockAttempt(boolean successful, int userId);
+ void reportUserRequestedUnlock(int userId);
void reportUnlockLockout(int timeoutMs, int userId);
void reportEnabledTrustAgentsChanged(int userId);
void registerTrustListener(in ITrustListener trustListener);
diff --git a/core/java/android/app/trust/OWNERS b/core/java/android/app/trust/OWNERS
new file mode 100644
index 0000000..e2c6ce1
--- /dev/null
+++ b/core/java/android/app/trust/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/trust/OWNERS
diff --git a/core/java/android/app/trust/TrustManager.java b/core/java/android/app/trust/TrustManager.java
index e214007..70b7de0 100644
--- a/core/java/android/app/trust/TrustManager.java
+++ b/core/java/android/app/trust/TrustManager.java
@@ -29,6 +29,9 @@
import android.os.RemoteException;
import android.util.ArrayMap;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* See {@link com.android.server.trust.TrustManagerService}
* @hide
@@ -43,6 +46,7 @@
private static final String TAG = "TrustManager";
private static final String DATA_FLAGS = "initiatedByUser";
private static final String DATA_MESSAGE = "message";
+ private static final String DATA_GRANTED_MESSAGES = "grantedMessages";
private final ITrustManager mService;
private final ArrayMap<TrustListener, ITrustListener> mTrustListeners;
@@ -85,6 +89,19 @@
}
/**
+ * Reports that the user {@code userId} is likely interested in unlocking the device.
+ *
+ * Requires the {@link android.Manifest.permission#ACCESS_KEYGUARD_SECURE_STORAGE} permission.
+ */
+ public void reportUserRequestedUnlock(int userId) {
+ try {
+ mService.reportUserRequestedUnlock(userId);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Reports that user {@param userId} has entered a temporary device lockout.
*
* This generally occurs when the user has unsuccessfully tried to unlock the device too many
@@ -139,12 +156,15 @@
try {
ITrustListener.Stub iTrustListener = new ITrustListener.Stub() {
@Override
- public void onTrustChanged(boolean enabled, int userId, int flags) {
+ public void onTrustChanged(boolean enabled, int userId, int flags,
+ List<String> trustGrantedMessages) {
Message m = mHandler.obtainMessage(MSG_TRUST_CHANGED, (enabled ? 1 : 0), userId,
trustListener);
if (flags != 0) {
m.getData().putInt(DATA_FLAGS, flags);
}
+ m.getData().putCharSequenceArrayList(
+ DATA_GRANTED_MESSAGES, (ArrayList) trustGrantedMessages);
m.sendToTarget();
}
@@ -231,14 +251,15 @@
switch(msg.what) {
case MSG_TRUST_CHANGED:
int flags = msg.peekData() != null ? msg.peekData().getInt(DATA_FLAGS) : 0;
- ((TrustListener)msg.obj).onTrustChanged(msg.arg1 != 0, msg.arg2, flags);
+ ((TrustListener) msg.obj).onTrustChanged(msg.arg1 != 0, msg.arg2, flags,
+ msg.getData().getStringArrayList(DATA_GRANTED_MESSAGES));
break;
case MSG_TRUST_MANAGED_CHANGED:
((TrustListener)msg.obj).onTrustManagedChanged(msg.arg1 != 0, msg.arg2);
break;
case MSG_TRUST_ERROR:
final CharSequence message = msg.peekData().getCharSequence(DATA_MESSAGE);
- ((TrustListener)msg.obj).onTrustError(message);
+ ((TrustListener) msg.obj).onTrustError(message);
}
}
};
@@ -252,8 +273,11 @@
* @param flags Flags specified by the trust agent when granting trust. See
* {@link android.service.trust.TrustAgentService#grantTrust(CharSequence, long, int)
* TrustAgentService.grantTrust(CharSequence, long, int)}.
+ * @param trustGrantedMessages Messages to display to the user when trust has been granted
+ * by one or more trust agents.
*/
- void onTrustChanged(boolean enabled, int userId, int flags);
+ void onTrustChanged(boolean enabled, int userId, int flags,
+ List<String> trustGrantedMessages);
/**
* Reports that whether trust is managed has changed
diff --git a/core/java/android/app/wallpapereffectsgeneration/OWNERS b/core/java/android/app/wallpapereffectsgeneration/OWNERS
new file mode 100644
index 0000000..2bc0154
--- /dev/null
+++ b/core/java/android/app/wallpapereffectsgeneration/OWNERS
@@ -0,0 +1,5 @@
+susharon@google.com
+shanh@google.com
+huiwu@google.com
+srazdan@google.com
+
diff --git a/core/java/android/companion/virtual/IVirtualDevice.aidl b/core/java/android/companion/virtual/IVirtualDevice.aidl
index 85855be..339e9a2 100644
--- a/core/java/android/companion/virtual/IVirtualDevice.aidl
+++ b/core/java/android/companion/virtual/IVirtualDevice.aidl
@@ -18,6 +18,7 @@
import android.app.PendingIntent;
import android.graphics.Point;
+import android.graphics.PointF;
import android.hardware.input.VirtualKeyEvent;
import android.hardware.input.VirtualMouseButtonEvent;
import android.hardware.input.VirtualMouseRelativeEvent;
@@ -75,4 +76,5 @@
*/
void launchPendingIntent(
int displayId, in PendingIntent pendingIntent, in ResultReceiver resultReceiver);
+ PointF getCursorPosition(IBinder token);
}
diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java
index 8ab6688..c723468 100644
--- a/core/java/android/companion/virtual/VirtualDeviceManager.java
+++ b/core/java/android/companion/virtual/VirtualDeviceManager.java
@@ -16,7 +16,6 @@
package android.companion.virtual;
-import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -43,10 +42,6 @@
import android.os.ResultReceiver;
import android.view.Surface;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import java.util.concurrent.Executor;
/**
@@ -61,23 +56,6 @@
private static final boolean DEBUG = false;
private static final String LOG_TAG = "VirtualDeviceManager";
- /** @hide */
- @IntDef(prefix = "DISPLAY_FLAG_",
- flag = true,
- value = {DISPLAY_FLAG_TRUSTED})
- @Retention(RetentionPolicy.SOURCE)
- @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})
- public @interface DisplayFlags {}
-
- /**
- * Indicates that the display is trusted to show system decorations and receive inputs without
- * users' touch.
- *
- * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_TRUSTED
- * @hide // TODO(b/194949534): Unhide this API
- */
- public static final int DISPLAY_FLAG_TRUSTED = 1;
-
private static final int DEFAULT_VIRTUAL_DISPLAY_FLAGS =
DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC
| DisplayManager.VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
@@ -102,12 +80,12 @@
* @param associationId The association ID as returned by {@link AssociationInfo#getId()} from
* Companion Device Manager. Virtual devices must have a corresponding association with CDM in
* order to be created.
- * @hide
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
@Nullable
- public VirtualDevice createVirtualDevice(int associationId, VirtualDeviceParams params) {
- // TODO(b/194949534): Unhide this API
+ public VirtualDevice createVirtualDevice(
+ int associationId,
+ @NonNull VirtualDeviceParams params) {
try {
IVirtualDevice virtualDevice = mService.createVirtualDevice(
new Binder(), mContext.getPackageName(), associationId, params);
@@ -179,7 +157,9 @@
/**
* Creates a virtual display for this virtual device. All displays created on the same
- * device belongs to the same display group.
+ * device belongs to the same display group. Requires the ADD_TRUSTED_DISPLAY permission
+ * to create a virtual display which is not in the default DisplayGroup, and to create
+ * trusted displays.
*
* @param width The width of the virtual display in pixels, must be greater than 0.
* @param height The height of the virtual display in pixels, must be greater than 0.
@@ -187,7 +167,12 @@
* @param surface The surface to which the content of the virtual display should
* be rendered, or null if there is none initially. The surface can also be set later using
* {@link VirtualDisplay#setSurface(Surface)}.
- * @param flags Either 0, or {@link #DISPLAY_FLAG_TRUSTED}.
+ * @param flags A combination of virtual display flags accepted by
+ * {@link DisplayManager#createVirtualDisplay}. In addition, the following flags are
+ * automatically set for all virtual devices:
+ * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_PUBLIC VIRTUAL_DISPLAY_FLAG_PUBLIC} and
+ * {@link DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
+ * VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY}.
* @param callback Callback to call when the state of the {@link VirtualDisplay} changes
* @param handler The handler on which the listener should be invoked, or null
* if the listener should be invoked on the calling thread's looper.
@@ -195,9 +180,7 @@
* not create the virtual display.
*
* @see DisplayManager#createVirtualDisplay
- * @hide
*/
- // TODO(b/194949534): Unhide this API
// Suppress "ExecutorRegistration" because DisplayManager.createVirtualDisplay takes a
// handler
@SuppressLint("ExecutorRegistration")
@@ -207,7 +190,7 @@
int height,
int densityDpi,
@Nullable Surface surface,
- @DisplayFlags int flags,
+ int flags,
@Nullable Handler handler,
@Nullable VirtualDisplay.Callback callback) {
// TODO(b/205343547): Handle display groups properly instead of creating a new display
@@ -246,7 +229,6 @@
* @param inputDeviceName the name to call this input device
* @param vendorId the vendor id
* @param productId the product id
- * @hide
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
@NonNull
@@ -273,7 +255,6 @@
* @param inputDeviceName the name to call this input device
* @param vendorId the vendor id
* @param productId the product id
- * @hide
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
@NonNull
@@ -300,7 +281,6 @@
* @param inputDeviceName the name to call this input device
* @param vendorId the vendor id
* @param productId the product id
- * @hide
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
@NonNull
@@ -328,12 +308,8 @@
* com.android.server.companion.virtual.VirtualDeviceImpl#getBaseVirtualDisplayFlags()} will
* be added by DisplayManagerService.
*/
- private int getVirtualDisplayFlags(@DisplayFlags int flags) {
- int virtualDisplayFlags = DEFAULT_VIRTUAL_DISPLAY_FLAGS;
- if ((flags & DISPLAY_FLAG_TRUSTED) != 0) {
- virtualDisplayFlags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;
- }
- return virtualDisplayFlags;
+ private int getVirtualDisplayFlags(int flags) {
+ return DEFAULT_VIRTUAL_DISPLAY_FLAGS | flags;
}
private String getVirtualDisplayName() {
diff --git a/core/java/android/companion/virtual/VirtualDeviceParams.java b/core/java/android/companion/virtual/VirtualDeviceParams.java
index d61d474..2ddfeb4 100644
--- a/core/java/android/companion/virtual/VirtualDeviceParams.java
+++ b/core/java/android/companion/virtual/VirtualDeviceParams.java
@@ -20,7 +20,10 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.annotation.RequiresPermission;
+import android.annotation.SystemApi;
+import android.content.ComponentName;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.UserHandle;
@@ -39,7 +42,7 @@
*
* @hide
*/
-// TODO(b/194949534): Unhide this API
+@SystemApi
public final class VirtualDeviceParams implements Parcelable {
/** @hide */
@@ -51,32 +54,36 @@
/**
* Indicates that the lock state of the virtual device should be always locked.
- *
- * @hide // TODO(b/194949534): Unhide this API
*/
public static final int LOCK_STATE_ALWAYS_LOCKED = 0;
/**
* Indicates that the lock state of the virtual device should be always unlocked.
- *
- * @hide // TODO(b/194949534): Unhide this API
*/
public static final int LOCK_STATE_ALWAYS_UNLOCKED = 1;
private final int mLockState;
private final ArraySet<UserHandle> mUsersWithMatchingAccounts;
+ @Nullable private final ArraySet<ComponentName> mAllowedActivities;
+ @Nullable private final ArraySet<ComponentName> mBlockedActivities;
private VirtualDeviceParams(
@LockState int lockState,
- @NonNull Set<UserHandle> usersWithMatchingAccounts) {
+ @NonNull Set<UserHandle> usersWithMatchingAccounts,
+ @Nullable Set<ComponentName> allowedActivities,
+ @Nullable Set<ComponentName> blockedActivities) {
mLockState = lockState;
mUsersWithMatchingAccounts = new ArraySet<>(usersWithMatchingAccounts);
+ mAllowedActivities = allowedActivities == null ? null : new ArraySet<>(allowedActivities);
+ mBlockedActivities = blockedActivities == null ? null : new ArraySet<>(blockedActivities);
}
@SuppressWarnings("unchecked")
private VirtualDeviceParams(Parcel parcel) {
mLockState = parcel.readInt();
mUsersWithMatchingAccounts = (ArraySet<UserHandle>) parcel.readArraySet(null);
+ mAllowedActivities = (ArraySet<ComponentName>) parcel.readArraySet(null);
+ mBlockedActivities = (ArraySet<ComponentName>) parcel.readArraySet(null);
}
/**
@@ -98,6 +105,35 @@
return Collections.unmodifiableSet(mUsersWithMatchingAccounts);
}
+ /**
+ * Returns the set of activities allowed to be streamed, or {@code null} if this is not set.
+ *
+ * @see Builder#setAllowedActivities(Set)
+ * @hide // TODO(b/194949534): Unhide this API
+ */
+ @Nullable
+ public Set<ComponentName> getAllowedActivities() {
+ if (mAllowedActivities == null) {
+ return null;
+ }
+ return Collections.unmodifiableSet(mAllowedActivities);
+ }
+
+ /**
+ * Returns the set of activities that are blocked from streaming, or {@code null} if this is not
+ * set.
+ *
+ * @see Builder#setBlockedActivities(Set)
+ * @hide // TODO(b/194949534): Unhide this API
+ */
+ @Nullable
+ public Set<ComponentName> getBlockedActivities() {
+ if (mBlockedActivities == null) {
+ return null;
+ }
+ return Collections.unmodifiableSet(mBlockedActivities);
+ }
+
@Override
public int describeContents() {
return 0;
@@ -107,6 +143,8 @@
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeInt(mLockState);
dest.writeArraySet(mUsersWithMatchingAccounts);
+ dest.writeArraySet(mAllowedActivities);
+ dest.writeArraySet(mBlockedActivities);
}
@Override
@@ -118,8 +156,10 @@
return false;
}
VirtualDeviceParams that = (VirtualDeviceParams) o;
- return mLockState == that.mLockState && mUsersWithMatchingAccounts.equals(
- that.mUsersWithMatchingAccounts);
+ return mLockState == that.mLockState
+ && mUsersWithMatchingAccounts.equals(that.mUsersWithMatchingAccounts)
+ && Objects.equals(mAllowedActivities, that.mAllowedActivities)
+ && Objects.equals(mBlockedActivities, that.mBlockedActivities);
}
@Override
@@ -128,13 +168,17 @@
}
@Override
+ @NonNull
public String toString() {
return "VirtualDeviceParams("
+ " mLockState=" + mLockState
+ " mUsersWithMatchingAccounts=" + mUsersWithMatchingAccounts
+ + " mAllowedActivities=" + mAllowedActivities
+ + " mBlockedActivities=" + mBlockedActivities
+ ")";
}
+ @NonNull
public static final Parcelable.Creator<VirtualDeviceParams> CREATOR =
new Parcelable.Creator<VirtualDeviceParams>() {
public VirtualDeviceParams createFromParcel(Parcel in) {
@@ -153,6 +197,8 @@
private @LockState int mLockState = LOCK_STATE_ALWAYS_LOCKED;
private Set<UserHandle> mUsersWithMatchingAccounts;
+ @Nullable private Set<ComponentName> mBlockedActivities;
+ @Nullable private Set<ComponentName> mAllowedActivities;
/**
* Sets the lock state of the device. The permission {@code ADD_ALWAYS_UNLOCKED_DISPLAY}
@@ -171,12 +217,25 @@
/**
* Sets the user handles with matching managed accounts on the remote device to which
- * this virtual device is streaming.
+ * this virtual device is streaming. The caller is responsible for verifying the presence
+ * and legitimacy of a matching managed account on the remote device.
+ *
+ * <p>If the app streaming policy is
+ * {@link android.app.admin.DevicePolicyManager#NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY
+ * NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY}, activities not in
+ * {@code usersWithMatchingAccounts} will be blocked from starting.
+ *
+ * <p> If {@code usersWithMatchingAccounts} is empty (the default), streaming is allowed
+ * only if there is no device policy, or if the nearby streaming policy is
+ * {@link android.app.admin.DevicePolicyManager#NEARBY_STREAMING_ENABLED
+ * NEARBY_STREAMING_ENABLED}.
*
* @param usersWithMatchingAccounts A set of user handles with matching managed
* accounts on the remote device this is streaming to.
+ *
* @see android.app.admin.DevicePolicyManager#NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY
*/
+ @NonNull
public Builder setUsersWithMatchingAccounts(
@NonNull Set<UserHandle> usersWithMatchingAccounts) {
mUsersWithMatchingAccounts = usersWithMatchingAccounts;
@@ -184,6 +243,54 @@
}
/**
+ * Sets the activities allowed to be launched in the virtual device. If
+ * {@code allowedActivities} is non-null, all activities other than the ones in the set will
+ * be blocked from launching.
+ *
+ * <p>{@code allowedActivities} and the set in {@link #setBlockedActivities(Set)} cannot
+ * both be non-null at the same time.
+ *
+ * @throws IllegalArgumentException if {@link #setBlockedActivities(Set)} has been set to a
+ * non-null value.
+ *
+ * @param allowedActivities A set of activity {@link ComponentName} allowed to be launched
+ * in the virtual device.
+ * @hide // TODO(b/194949534): Unhide this API
+ */
+ public Builder setAllowedActivities(@Nullable Set<ComponentName> allowedActivities) {
+ if (mBlockedActivities != null && allowedActivities != null) {
+ throw new IllegalArgumentException(
+ "Allowed activities and Blocked activities cannot both be set.");
+ }
+ mAllowedActivities = allowedActivities;
+ return this;
+ }
+
+ /**
+ * Sets the activities blocked from launching in the virtual device. If the {@code
+ * blockedActivities} is non-null, activities in the set are blocked from launching in the
+ * virtual device.
+ *
+ * {@code blockedActivities} and the set in {@link #setAllowedActivities(Set)} cannot both
+ * be non-null at the same time.
+ *
+ * @throws IllegalArgumentException if {@link #setAllowedActivities(Set)} has been set to a
+ * non-null value.
+ *
+ * @param blockedActivities A set of {@link ComponentName} to be blocked launching from
+ * virtual device.
+ * @hide // TODO(b/194949534): Unhide this API
+ */
+ public Builder setBlockedActivities(@Nullable Set<ComponentName> blockedActivities) {
+ if (mAllowedActivities != null && blockedActivities != null) {
+ throw new IllegalArgumentException(
+ "Allowed activities and Blocked activities cannot both be set.");
+ }
+ mBlockedActivities = blockedActivities;
+ return this;
+ }
+
+ /**
* Builds the {@link VirtualDeviceParams} instance.
*/
@NonNull
@@ -191,7 +298,13 @@
if (mUsersWithMatchingAccounts == null) {
mUsersWithMatchingAccounts = Collections.emptySet();
}
- return new VirtualDeviceParams(mLockState, mUsersWithMatchingAccounts);
+ if (mAllowedActivities != null && mBlockedActivities != null) {
+ // Should never reach here because the setters block this as well.
+ throw new IllegalStateException(
+ "Allowed activities and Blocked activities cannot both be set.");
+ }
+ return new VirtualDeviceParams(mLockState, mUsersWithMatchingAccounts,
+ mAllowedActivities, mBlockedActivities);
}
}
}
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index c714f507..b4f2302 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -48,10 +48,13 @@
import android.os.RemoteException;
import android.os.Trace;
import android.os.UserHandle;
+import android.os.UserManager;
import android.os.storage.StorageManager;
import android.permission.PermissionCheckerManager;
+import android.provider.MediaStore;
import android.text.TextUtils;
import android.util.Log;
+import android.util.SparseBooleanArray;
import com.android.internal.annotations.VisibleForTesting;
@@ -134,9 +137,18 @@
private boolean mExported;
private boolean mNoPerms;
private boolean mSingleUser;
+ private SparseBooleanArray mUsersRedirectedToOwner = new SparseBooleanArray();
private ThreadLocal<AttributionSource> mCallingAttributionSource;
+ /**
+ * @hide
+ */
+ public static boolean isAuthorityRedirectedForCloneProfile(String authority) {
+ // For now, only MediaProvider gets redirected.
+ return MediaStore.AUTHORITY.equals(authority);
+ }
+
private Transport mTransport = new Transport();
/**
@@ -726,13 +738,47 @@
}
boolean checkUser(int pid, int uid, Context context) {
- if (UserHandle.getUserId(uid) == context.getUserId() || mSingleUser) {
+ int callingUserId = UserHandle.getUserId(uid);
+
+ if (callingUserId == context.getUserId() || mSingleUser) {
return true;
}
- return context.checkPermission(INTERACT_ACROSS_USERS, pid, uid)
- == PackageManager.PERMISSION_GRANTED
+ if (context.checkPermission(INTERACT_ACROSS_USERS, pid, uid)
+ == PackageManager.PERMISSION_GRANTED
|| context.checkPermission(INTERACT_ACROSS_USERS_FULL, pid, uid)
- == PackageManager.PERMISSION_GRANTED;
+ == PackageManager.PERMISSION_GRANTED) {
+ return true;
+ }
+
+ if (isAuthorityRedirectedForCloneProfile(mAuthority)) {
+ if (mUsersRedirectedToOwner.indexOfKey(callingUserId) >= 0) {
+ return mUsersRedirectedToOwner.get(callingUserId);
+ }
+
+ // Haven't seen this user yet, look it up
+ try {
+ UserHandle callingUser = UserHandle.getUserHandleForUid(uid);
+ Context callingUserContext = mContext.createPackageContextAsUser("system",
+ 0, callingUser);
+ UserManager um = callingUserContext.getSystemService(UserManager.class);
+
+ if (um != null && um.isCloneProfile()) {
+ UserHandle parent = um.getProfileParent(callingUser);
+
+ if (parent != null && parent.equals(context.getUser())) {
+ mUsersRedirectedToOwner.put(callingUser.getIdentifier(), true);
+ return true;
+ }
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ // ignore
+ }
+
+ mUsersRedirectedToOwner.put(UserHandle.getUserId(uid), false);
+ return false;
+ }
+
+ return false;
}
/**
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 2309fb6..ce2efcf 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -41,6 +41,7 @@
import android.app.IApplicationThread;
import android.app.IServiceConnection;
import android.app.VrManager;
+import android.app.ambientcontext.AmbientContextManager;
import android.app.people.PeopleManager;
import android.app.time.TimeManager;
import android.compat.annotation.UnsupportedAppUsage;
@@ -3829,7 +3830,7 @@
PRINT_SERVICE,
CONSUMER_IR_SERVICE,
//@hide: TRUST_SERVICE,
- TV_IAPP_SERVICE,
+ TV_INTERACTIVE_APP_SERVICE,
TV_INPUT_SERVICE,
//@hide: TV_TUNER_RESOURCE_MGR_SERVICE,
//@hide: NETWORK_SCORE_SERVICE,
@@ -5356,13 +5357,13 @@
/**
* Use with {@link #getSystemService(String)} to retrieve a
- * {@link android.media.tv.interactive.TvIAppManager} for interacting with TV interactive
- * applications (TV iApp) on the device.
+ * {@link android.media.tv.interactive.TvInteractiveAppManager} for interacting with TV
+ * interactive applications on the device.
*
* @see #getSystemService(String)
- * @see android.media.tv.interactive.TvIAppManager
+ * @see android.media.tv.interactive.TvInteractiveAppManager
*/
- public static final String TV_IAPP_SERVICE = "tv_iapp";
+ public static final String TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";
/**
* Use with {@link #getSystemService(String)} to retrieve a
@@ -5931,6 +5932,17 @@
public static final String NEARBY_SERVICE = "nearby";
/**
+ * Use with {@link #getSystemService(String)} to retrieve a
+ * {@link android.app.ambientcontext.AmbientContextManager}.
+ *
+ * @see #getSystemService(String)
+ * @see AmbientContextManager
+ * @hide
+ */
+ @SystemApi
+ public static final String AMBIENT_CONTEXT_SERVICE = "ambient_context";
+
+ /**
* Determine whether the given permission is allowed for a particular
* process and user ID running in the system.
*
@@ -6417,10 +6429,10 @@
* Triggers the asynchronous revocation of a permission.
*
* @param permName The name of the permission to be revoked.
- * @see #selfRevokePermissions(Collection)
+ * @see #revokeOwnPermissionsOnKill(Collection)
*/
- public void selfRevokePermission(@NonNull String permName) {
- selfRevokePermissions(Collections.singletonList(permName));
+ public void revokeOwnPermissionOnKill(@NonNull String permName) {
+ revokeOwnPermissionsOnKill(Collections.singletonList(permName));
}
/**
@@ -6445,7 +6457,7 @@
* @see PackageManager#getGroupOfPlatformPermission(String, Executor, Consumer)
* @see PackageManager#getPlatformPermissionsForGroup(String, Executor, Consumer)
*/
- public void selfRevokePermissions(@NonNull Collection<String> permissions) {
+ public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {
throw new AbstractMethodError("Must be overridden in implementing class");
}
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 805e499..6ae768a 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -1016,8 +1016,8 @@
}
@Override
- public void selfRevokePermissions(@NonNull Collection<String> permissions) {
- mBase.selfRevokePermissions(permissions);
+ public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {
+ mBase.revokeOwnPermissionsOnKill(permissions);
}
@Override
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 58a7d87..7f00bcb 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -8190,6 +8190,37 @@
hasIntentInfo = true;
}
break;
+ case "--ed": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ intent.putExtra(key, Double.valueOf(value));
+ hasIntentInfo = true;
+ }
+ break;
+ case "--eda": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ double[] list = new double[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ list[i] = Double.valueOf(strings[i]);
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
+ case "--edal": {
+ String key = cmd.getNextArgRequired();
+ String value = cmd.getNextArgRequired();
+ String[] strings = value.split(",");
+ ArrayList<Double> list = new ArrayList<>(strings.length);
+ for (int i = 0; i < strings.length; i++) {
+ list.add(Double.valueOf(strings[i]));
+ }
+ intent.putExtra(key, list);
+ hasIntentInfo = true;
+ }
+ break;
case "--esa": {
String key = cmd.getNextArgRequired();
String value = cmd.getNextArgRequired();
@@ -8435,25 +8466,30 @@
" [--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]",
" [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]",
" [--ef <EXTRA_KEY> <EXTRA_FLOAT_VALUE> ...]",
+ " [--ed <EXTRA_KEY> <EXTRA_DOUBLE_VALUE> ...]",
" [--eu <EXTRA_KEY> <EXTRA_URI_VALUE> ...]",
" [--ecn <EXTRA_KEY> <EXTRA_COMPONENT_NAME_VALUE>]",
" [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]",
- " (mutiple extras passed as Integer[])",
+ " (multiple extras passed as Integer[])",
" [--eial <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]",
- " (mutiple extras passed as List<Integer>)",
+ " (multiple extras passed as List<Integer>)",
" [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]",
- " (mutiple extras passed as Long[])",
+ " (multiple extras passed as Long[])",
" [--elal <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]",
- " (mutiple extras passed as List<Long>)",
+ " (multiple extras passed as List<Long>)",
" [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]",
- " (mutiple extras passed as Float[])",
+ " (multiple extras passed as Float[])",
" [--efal <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]",
- " (mutiple extras passed as List<Float>)",
+ " (multiple extras passed as List<Float>)",
+ " [--eda <EXTRA_KEY> <EXTRA_DOUBLE_VALUE>[,<EXTRA_DOUBLE_VALUE...]]",
+ " (multiple extras passed as Double[])",
+ " [--edal <EXTRA_KEY> <EXTRA_DOUBLE_VALUE>[,<EXTRA_DOUBLE_VALUE...]]",
+ " (multiple extras passed as List<Double>)",
" [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]",
- " (mutiple extras passed as String[]; to embed a comma into a string,",
+ " (multiple extras passed as String[]; to embed a comma into a string,",
" escape it using \"\\,\")",
" [--esal <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]",
- " (mutiple extras passed as List<String>; to embed a comma into a string,",
+ " (multiple extras passed as List<String>; to embed a comma into a string,",
" escape it using \"\\,\")",
" [-f <FLAG>]",
" [--grant-read-uri-permission] [--grant-write-uri-permission]",
diff --git a/core/java/android/content/pm/AppSearchShortcutInfo.java b/core/java/android/content/pm/AppSearchShortcutInfo.java
index 806091e..8d9ef853 100644
--- a/core/java/android/content/pm/AppSearchShortcutInfo.java
+++ b/core/java/android/content/pm/AppSearchShortcutInfo.java
@@ -423,7 +423,7 @@
shortLabelResName, longLabel, longLabelResId, longLabelResName, disabledMessage,
disabledMessageResId, disabledMessageResName, categoriesSet, intents, rank, extras,
getCreationTimestampMillis(), flags, iconResId, iconResName, bitmapPath, iconUri,
- disabledReason, persons, locusId, null);
+ disabledReason, persons, locusId, null, null);
si.setImplicitRank(implicitRank);
if ((implicitRank & ShortcutInfo.RANK_CHANGED_BIT) != 0) {
si.setRankChanged();
diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java
index 11b2ea1..1e88758 100644
--- a/core/java/android/content/pm/CrossProfileApps.java
+++ b/core/java/android/content/pm/CrossProfileApps.java
@@ -15,6 +15,9 @@
*/
package android.content.pm;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_PERSONAL_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_WORK_LABEL;
+
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -22,6 +25,7 @@
import android.annotation.TestApi;
import android.app.Activity;
import android.app.AppOpsManager.Mode;
+import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -241,12 +245,24 @@
public @NonNull CharSequence getProfileSwitchingLabel(@NonNull UserHandle userHandle) {
verifyCanAccessUser(userHandle);
- final int stringRes = mUserManager.isManagedProfile(userHandle.getIdentifier())
- ? R.string.managed_profile_label
- : R.string.user_owner_label;
+ final boolean isManagedProfile = mUserManager.isManagedProfile(userHandle.getIdentifier());
+ final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(
+ getUpdatableProfileSwitchingLabelId(isManagedProfile),
+ () -> getDefaultProfileSwitchingLabel(isManagedProfile));
+ }
+
+ private String getUpdatableProfileSwitchingLabelId(boolean isManagedProfile) {
+ return isManagedProfile ? SWITCH_TO_WORK_LABEL : SWITCH_TO_PERSONAL_LABEL;
+ }
+
+ private String getDefaultProfileSwitchingLabel(boolean isManagedProfile) {
+ final int stringRes = isManagedProfile
+ ? R.string.managed_profile_label : R.string.user_owner_label;
return mResources.getString(stringRes);
}
+
/**
* Return a drawable that calling app can show to user for the semantic of profile switching --
* launching its own activity in specified user profile. For example, it may return a briefcase
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index c8f88f2..1021d3e 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -4077,6 +4077,14 @@
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_DREAM_OVERLAY = "android.software.dream_overlay";
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
+ * supports window magnification.
+ */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_WINDOW_MAGNIFICATION =
+ "android.software.window_magnification";
+
/** @hide */
public static final boolean APP_ENUMERATION_ENABLED_BY_DEFAULT = true;
diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java
index 7d4f7ec..ab827aa 100644
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -41,6 +41,7 @@
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
import android.view.contentcapture.ContentCaptureContext;
@@ -50,9 +51,15 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* Represents a shortcut that can be published via {@link ShortcutManager}.
@@ -463,6 +470,9 @@
private int mExcludedSurfaces;
+ @Nullable
+ private Map<String, Map<String, List<String>>> mCapabilityBindings;
+
private ShortcutInfo(Builder b) {
mUserId = b.mContext.getUserId();
@@ -490,7 +500,7 @@
mRank = b.mRank;
mExtras = b.mExtras;
mLocusId = b.mLocusId;
-
+ mCapabilityBindings = b.mCapabilityBindings;
mStartingThemeResName = b.mStartingThemeResId != 0
? b.mContext.getResources().getResourceName(b.mStartingThemeResId) : null;
updateTimestamp();
@@ -602,7 +612,7 @@
mLocusId = source.mLocusId;
mExcludedSurfaces = source.mExcludedSurfaces;
- // Just always keep it since it's cheep.
+ // Just always keep it since it's cheap.
mIconResId = source.mIconResId;
if ((cloneFlags & CLONE_REMOVE_NON_KEY_INFO) == 0) {
@@ -641,6 +651,7 @@
// Set this bit.
mFlags |= FLAG_KEY_FIELDS_ONLY;
}
+ mCapabilityBindings = source.mCapabilityBindings;
mStartingThemeResName = source.mStartingThemeResName;
}
@@ -968,6 +979,9 @@
if (source.mStartingThemeResName != null && !source.mStartingThemeResName.isEmpty()) {
mStartingThemeResName = source.mStartingThemeResName;
}
+ if (source.mCapabilityBindings != null) {
+ mCapabilityBindings = source.mCapabilityBindings;
+ }
}
/**
@@ -1039,6 +1053,9 @@
private int mStartingThemeResId;
+ @Nullable
+ private Map<String, Map<String, List<String>>> mCapabilityBindings;
+
private int mExcludedSurfaces;
/**
@@ -1401,6 +1418,53 @@
}
/**
+ * Associates a shortcut with a capability, and a parameter of that capability. Used when
+ * the shortcut is an instance of a capability.
+ *
+ * <P>This method can be called multiple times to add multiple parameters to the same
+ * capability.
+ *
+ * @param capability capability associated with the shortcut. e.g. actions.intent
+ * .START_EXERCISE.
+ * @param parameterName name of the parameter associated with given capability.
+ * e.g. exercise.name.
+ * @param parameterValues a list of values for that parameters. The first value will be
+ * the primary name, while the rest will be alternative names. If
+ * the values are empty, then the parameter will not be saved in
+ * the shortcut.
+ */
+ @NonNull
+ public Builder addCapabilityBinding(@NonNull String capability,
+ @Nullable String parameterName, @Nullable List<String> parameterValues) {
+ Objects.requireNonNull(capability);
+ if (capability.contains("/")) {
+ throw new IllegalArgumentException("Illegal character '/' is found in capability");
+ }
+ if (mCapabilityBindings == null) {
+ mCapabilityBindings = new ArrayMap<>(1);
+ }
+ if (!mCapabilityBindings.containsKey(capability)) {
+ mCapabilityBindings.put(capability, new ArrayMap<>(0));
+ }
+ if (parameterName == null || parameterValues == null || parameterValues.isEmpty()) {
+ return this;
+ }
+ if (parameterName.contains("/")) {
+ throw new IllegalArgumentException(
+ "Illegal character '/' is found in parameter name");
+ }
+ final Map<String, List<String>> params = mCapabilityBindings.get(capability);
+ if (!params.containsKey(parameterName)) {
+ params.put(parameterName, parameterValues);
+ return this;
+ }
+ params.put(parameterName,
+ Stream.of(params.get(parameterName), parameterValues)
+ .flatMap(Collection::stream).collect(Collectors.toList()));
+ return this;
+ }
+
+ /**
* Sets which surfaces a shortcut will be excluded from.
*
* If the shortcut is set to be excluded from {@link #SURFACE_LAUNCHER}, shortcuts will be
@@ -2176,6 +2240,44 @@
return (mExcludedSurfaces & surface) == 0;
}
+ /**
+ * @hide
+ */
+ public Map<String, Map<String, List<String>>> getCapabilityBindings() {
+ return mCapabilityBindings;
+ }
+
+ /**
+ * Return true if the shortcut is or can be used in specified capability.
+ */
+ public boolean hasCapability(@NonNull String capability) {
+ Objects.requireNonNull(capability);
+ return mCapabilityBindings != null && mCapabilityBindings.containsKey(capability);
+ }
+
+ /**
+ * Returns the values of specified parameter in associated with given capability.
+ *
+ * @param capability capability associated with the shortcut. e.g. actions.intent
+ * .START_EXERCISE.
+ * @param parameterName name of the parameter associated with given capability.
+ * e.g. exercise.name.
+ */
+ @NonNull
+ public List<String> getCapabilityParameterValues(
+ @NonNull String capability, @NonNull String parameterName) {
+ Objects.requireNonNull(capability);
+ Objects.requireNonNull(parameterName);
+ if (mCapabilityBindings == null) {
+ return Collections.emptyList();
+ }
+ final Map<String, List<String>> param = mCapabilityBindings.get(capability);
+ if (param == null || !param.containsKey(parameterName)) {
+ return Collections.emptyList();
+ }
+ return param.get(parameterName);
+ }
+
private ShortcutInfo(Parcel source) {
final ClassLoader cl = getClass().getClassLoader();
@@ -2225,6 +2327,15 @@
mIconUri = source.readString8();
mStartingThemeResName = source.readString8();
mExcludedSurfaces = source.readInt();
+
+ final Map<String, Map> rawCapabilityBindings = source.readHashMap(
+ /*loader*/ null, /*clazzKey*/ String.class, /*clazzValue*/ HashMap.class);
+ if (rawCapabilityBindings != null && !rawCapabilityBindings.isEmpty()) {
+ final Map<String, Map<String, List<String>>> capabilityBindings =
+ new ArrayMap<>(rawCapabilityBindings.size());
+ rawCapabilityBindings.forEach(capabilityBindings::put);
+ mCapabilityBindings = capabilityBindings;
+ }
}
@Override
@@ -2278,6 +2389,7 @@
dest.writeString8(mIconUri);
dest.writeString8(mStartingThemeResName);
dest.writeInt(mExcludedSurfaces);
+ dest.writeMap(mCapabilityBindings);
}
public static final @NonNull Creator<ShortcutInfo> CREATOR =
@@ -2529,7 +2641,8 @@
long lastChangedTimestamp,
int flags, int iconResId, String iconResName, String bitmapPath, String iconUri,
int disabledReason, Person[] persons, LocusId locusId,
- @Nullable String startingThemeResName) {
+ @Nullable String startingThemeResName,
+ @Nullable Map<String, Map<String, List<String>>> capabilityBindings) {
mUserId = userId;
mId = id;
mPackageName = packageName;
@@ -2559,5 +2672,6 @@
mPersons = persons;
mLocusId = locusId;
mStartingThemeResName = startingThemeResName;
+ mCapabilityBindings = capabilityBindings;
}
}
diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java
index 4683d25..acceb654 100644
--- a/core/java/android/hardware/HardwareBuffer.java
+++ b/core/java/android/hardware/HardwareBuffer.java
@@ -110,9 +110,9 @@
@Retention(RetentionPolicy.SOURCE)
@LongDef(flag = true, value = {USAGE_CPU_READ_RARELY, USAGE_CPU_READ_OFTEN,
USAGE_CPU_WRITE_RARELY, USAGE_CPU_WRITE_OFTEN, USAGE_GPU_SAMPLED_IMAGE,
- USAGE_GPU_COLOR_OUTPUT, USAGE_PROTECTED_CONTENT, USAGE_VIDEO_ENCODE,
- USAGE_GPU_DATA_BUFFER, USAGE_SENSOR_DIRECT_DATA, USAGE_GPU_CUBE_MAP,
- USAGE_GPU_MIPMAP_COMPLETE})
+ USAGE_GPU_COLOR_OUTPUT, USAGE_COMPOSER_OVERLAY, USAGE_PROTECTED_CONTENT,
+ USAGE_VIDEO_ENCODE, USAGE_GPU_DATA_BUFFER, USAGE_SENSOR_DIRECT_DATA,
+ USAGE_GPU_CUBE_MAP, USAGE_GPU_MIPMAP_COMPLETE, USAGE_FRONT_BUFFER})
public @interface Usage {};
@Usage
@@ -151,6 +151,12 @@
public static final long USAGE_GPU_CUBE_MAP = 1 << 25;
/** Usage: The buffer contains a complete mipmap hierarchy */
public static final long USAGE_GPU_MIPMAP_COMPLETE = 1 << 26;
+ /** Usage: The buffer is used for front-buffer rendering. When front-buffering rendering is
+ * specified, different usages may adjust their behavior as a result. For example, when
+ * used as USAGE_GPU_COLOR_OUTPUT the buffer will behave similar to a single-buffered window.
+ * When used with USAGE_COMPOSER_OVERLAY, the system will try to prioritize the buffer
+ * receiving an overlay plane & avoid caching it in intermediate composition buffers. */
+ public static final long USAGE_FRONT_BUFFER = 1 << 32;
/**
* Creates a new <code>HardwareBuffer</code> instance.
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java
index 89ac8bf..eefa1d3 100644
--- a/core/java/android/hardware/display/DisplayManager.java
+++ b/core/java/android/hardware/display/DisplayManager.java
@@ -334,6 +334,7 @@
* @hide
*/
@TestApi
+ @SystemApi
public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1 << 10;
/**
diff --git a/core/java/android/hardware/input/InputManagerInternal.java b/core/java/android/hardware/input/InputManagerInternal.java
index 1173c31..f866a2e 100644
--- a/core/java/android/hardware/input/InputManagerInternal.java
+++ b/core/java/android/hardware/input/InputManagerInternal.java
@@ -17,6 +17,7 @@
package android.hardware.input;
import android.annotation.NonNull;
+import android.graphics.PointF;
import android.hardware.display.DisplayViewport;
import android.os.IBinder;
import android.view.InputEvent;
@@ -79,6 +80,22 @@
public abstract boolean transferTouchFocus(@NonNull IBinder fromChannelToken,
@NonNull IBinder toChannelToken);
+ /**
+ * Sets the display id that the MouseCursorController will be forced to target. Pass
+ * {@link android.view.Display#INVALID_DISPLAY} to clear the override.
+ */
+ public abstract void setVirtualMousePointerDisplayId(int pointerDisplayId);
+
+ /** Gets the current position of the mouse cursor. */
+ public abstract PointF getCursorPosition();
+
+ /**
+ * Sets the eligibility of windows on a given display for pointer capture. If a display is
+ * marked ineligible, requests to enable pointer capture for windows on that display will be
+ * ignored.
+ */
+ public abstract void setDisplayEligibilityForPointerCapture(int displayId, boolean isEligible);
+
/** Registers the {@link LidSwitchCallback} to begin receiving notifications. */
public abstract void registerLidSwitchCallback(@NonNull LidSwitchCallback callbacks);
diff --git a/core/java/android/hardware/input/VirtualMouse.java b/core/java/android/hardware/input/VirtualMouse.java
index 6599dd2..6e2b56a 100644
--- a/core/java/android/hardware/input/VirtualMouse.java
+++ b/core/java/android/hardware/input/VirtualMouse.java
@@ -20,6 +20,7 @@
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.companion.virtual.IVirtualDevice;
+import android.graphics.PointF;
import android.os.IBinder;
import android.os.RemoteException;
import android.view.MotionEvent;
@@ -61,6 +62,8 @@
* Send a mouse button event to the system.
*
* @param event the event
+ * @throws IllegalStateException if the display this mouse is associated with is not currently
+ * targeted
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
public void sendButtonEvent(@NonNull VirtualMouseButtonEvent event) {
@@ -76,6 +79,8 @@
* {@link MotionEvent#AXIS_SCROLL}.
*
* @param event the event
+ * @throws IllegalStateException if the display this mouse is associated with is not currently
+ * targeted
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
public void sendScrollEvent(@NonNull VirtualMouseScrollEvent event) {
@@ -90,6 +95,8 @@
* Sends a relative movement event to the system.
*
* @param event the event
+ * @throws IllegalStateException if the display this mouse is associated with is not currently
+ * targeted
*/
@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
public void sendRelativeEvent(@NonNull VirtualMouseRelativeEvent event) {
@@ -99,4 +106,20 @@
throw e.rethrowFromSystemServer();
}
}
+
+ /**
+ * Gets the current cursor position.
+ *
+ * @return the position, expressed as x and y coordinates
+ * @throws IllegalStateException if the display this mouse is associated with is not currently
+ * targeted
+ */
+ @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
+ public @NonNull PointF getCursorPosition() {
+ try {
+ return mVirtualDevice.getCursorPosition(mToken);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
}
diff --git a/core/java/android/hardware/usb/IUsbManager.aidl b/core/java/android/hardware/usb/IUsbManager.aidl
index 7f07af7..1d0837e 100644
--- a/core/java/android/hardware/usb/IUsbManager.aidl
+++ b/core/java/android/hardware/usb/IUsbManager.aidl
@@ -18,6 +18,7 @@
import android.app.PendingIntent;
import android.content.ComponentName;
+import android.hardware.usb.IUsbOperationInternal;
import android.hardware.usb.UsbAccessory;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.ParcelableUsbPort;
@@ -136,7 +137,7 @@
void resetUsbGadget();
/* Set USB data on or off */
- boolean enableUsbDataSignal(boolean enable);
+ boolean enableUsbData(in String portId, boolean enable, int operationId, in IUsbOperationInternal callback);
/* Gets the USB Hal Version. */
int getUsbHalVersion();
@@ -156,9 +157,14 @@
/* Sets the port's current role. */
void setPortRoles(in String portId, int powerRole, int dataRole);
+ /* Limit power transfer in & out of the port within the allowed limit by the USB
+ * specification.
+ */
+ void enableLimitPowerTransfer(in String portId, boolean limit, int operationId, in IUsbOperationInternal callback);
+
/* Enable/disable contaminant detection */
void enableContaminantDetection(in String portId, boolean enable);
- /* Sets USB device connection handler. */
- void setUsbDeviceConnectionHandler(in ComponentName usbDeviceConnectionHandler);
+ /* Sets USB device connection handler. */
+ void setUsbDeviceConnectionHandler(in ComponentName usbDeviceConnectionHandler);
}
diff --git a/core/java/android/hardware/usb/IUsbOperationInternal.aidl b/core/java/android/hardware/usb/IUsbOperationInternal.aidl
new file mode 100644
index 0000000..3f3bbf6
--- /dev/null
+++ b/core/java/android/hardware/usb/IUsbOperationInternal.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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.hardware.usb;
+
+/**
+ * @hide
+ */
+oneway interface IUsbOperationInternal {
+void onOperationComplete(in int status);
+}
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java
index c29a948..eb3e84d 100644
--- a/core/java/android/hardware/usb/UsbManager.java
+++ b/core/java/android/hardware/usb/UsbManager.java
@@ -36,6 +36,8 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.hardware.usb.gadget.V1_0.GadgetFunction;
import android.hardware.usb.gadget.V1_2.UsbSpeed;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbPort;
import android.os.Build;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
@@ -48,6 +50,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.StringJoiner;
/**
@@ -517,6 +520,14 @@
public static final int USB_DATA_TRANSFER_RATE_40G = 40 * 1024;
/**
+ * Returned when the client has to retry querying the version.
+ *
+ * @hide
+ */
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+ public static final int USB_HAL_RETRY = -2;
+
+ /**
* The Value for USB hal is not presented.
*
* {@hide}
@@ -557,6 +568,14 @@
public static final int USB_HAL_V1_3 = 13;
/**
+ * Value for USB Hal Version v2.0.
+ *
+ * @hide
+ */
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+ public static final int USB_HAL_V2_0 = 20;
+
+ /**
* Code for the charging usb function. Passed into {@link #setCurrentFunctions(long)}
* {@hide}
*/
@@ -665,6 +684,7 @@
USB_HAL_V1_1,
USB_HAL_V1_2,
USB_HAL_V1_3,
+ USB_HAL_V2_0,
})
public @interface UsbHalVersion {}
@@ -1169,8 +1189,9 @@
/**
* Enable/Disable the USB data signaling.
* <p>
- * Enables/Disables USB data path in all the USB ports.
+ * Enables/Disables USB data path of the first port..
* It will force to stop or restore USB data signaling.
+ * Call UsbPort API if the device has more than one UsbPort.
* </p>
*
* @param enable enable or disable USB data signaling
@@ -1181,11 +1202,11 @@
*/
@RequiresPermission(Manifest.permission.MANAGE_USB)
public boolean enableUsbDataSignal(boolean enable) {
- try {
- return mService.enableUsbDataSignal(enable);
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
+ List<UsbPort> usbPorts = getPorts();
+ if (usbPorts.size() == 1) {
+ return usbPorts.get(0).enableUsbData(enable) == UsbPort.ENABLE_USB_DATA_SUCCESS;
}
+ return false;
}
/**
@@ -1271,6 +1292,73 @@
}
/**
+ * Should only be called by {@link UsbPort#enableLimitPowerTransfer}.
+ * <p>
+ * limits or restores power transfer in and out of USB port.
+ *
+ * @param port USB port for which power transfer has to be limited or restored.
+ * @param limit limit power transfer when true.
+ * relax power transfer restrictions when false.
+ * @param operationId operationId for the request.
+ * @param callback callback object to be invoked when the operation is complete.
+ *
+ * @hide
+ */
+ @RequiresPermission(Manifest.permission.MANAGE_USB)
+ void enableLimitPowerTransfer(@NonNull UsbPort port, boolean limit, int operationId,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(port, "enableLimitPowerTransfer:port must not be null. opId:"
+ + operationId);
+ try {
+ mService.enableLimitPowerTransfer(port.getId(), limit, operationId, callback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "enableLimitPowerTransfer failed. opId:" + operationId, e);
+ try {
+ callback.onOperationComplete(UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException r) {
+ Log.e(TAG, "enableLimitPowerTransfer failed to call onOperationComplete. opId:"
+ + operationId, r);
+ }
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Should only be called by {@link UsbPort#enableUsbData}.
+ * <p>
+ * Enables or disables USB data on the specific port.
+ *
+ * @param port USB port for which USB data needs to be enabled or disabled.
+ * @param enable Enable USB data when true.
+ * Disable USB data when false.
+ * @param operationId operationId for the request.
+ * @param callback callback object to be invoked when the operation is complete.
+ * @return True when the operation is asynchronous. The caller must therefore call
+ * {@link UsbOperationInternal#waitForOperationComplete} for processing
+ * the result.
+ * False when the operation is synchronous. Caller can proceed reading the result
+ * through {@link UsbOperationInternal#getStatus}
+ * @hide
+ */
+ @RequiresPermission(Manifest.permission.MANAGE_USB)
+ boolean enableUsbData(@NonNull UsbPort port, boolean enable, int operationId,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(port, "enableUsbData: port must not be null. opId:" + operationId);
+ try {
+ return mService.enableUsbData(port.getId(), enable, operationId, callback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "enableUsbData: failed. opId:" + operationId, e);
+ try {
+ callback.onOperationComplete(UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException r) {
+ Log.e(TAG, "enableUsbData: failed to call onOperationComplete. opId:"
+ + operationId, r);
+ }
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Sets the component that will handle USB device connection.
* <p>
* Setting component allows to specify external USB host manager to handle use cases, where
diff --git a/core/java/android/hardware/usb/UsbOperationInternal.java b/core/java/android/hardware/usb/UsbOperationInternal.java
new file mode 100644
index 0000000..9bc2b38
--- /dev/null
+++ b/core/java/android/hardware/usb/UsbOperationInternal.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2022 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.hardware.usb;
+
+import android.annotation.IntDef;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbPort;
+import android.util.Log;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.TimeUnit;
+/**
+ * UsbOperationInternal allows UsbPort to support both synchronous and
+ * asynchronous function irrespective of whether the underlying hal
+ * method is synchronous or asynchronous.
+ *
+ * @hide
+ */
+public final class UsbOperationInternal extends IUsbOperationInternal.Stub {
+ private static final String TAG = "UsbPortStatus";
+ private final int mOperationID;
+ // Cached portId.
+ private final String mId;
+ // True implies operation did not timeout.
+ private boolean mOperationComplete;
+ private @UsbOperationStatus int mStatus;
+ final ReentrantLock mLock = new ReentrantLock();
+ final Condition mOperationWait = mLock.newCondition();
+ // Maximum time the caller has to wait for onOperationComplete to be called.
+ private static final int USB_OPERATION_TIMEOUT_MSECS = 5000;
+
+ /**
+ * The requested operation was successfully completed.
+ * Returned in {@link onOperationComplete} and {@link getStatus}.
+ */
+ public static final int USB_OPERATION_SUCCESS = 0;
+
+ /**
+ * The requested operation failed due to internal error.
+ * Returned in {@link onOperationComplete} and {@link getStatus}.
+ */
+ public static final int USB_OPERATION_ERROR_INTERNAL = 1;
+
+ /**
+ * The requested operation failed as it's not supported.
+ * Returned in {@link onOperationComplete} and {@link getStatus}.
+ */
+ public static final int USB_OPERATION_ERROR_NOT_SUPPORTED = 2;
+
+ /**
+ * The requested operation failed as it's not supported.
+ * Returned in {@link onOperationComplete} and {@link getStatus}.
+ */
+ public static final int USB_OPERATION_ERROR_PORT_MISMATCH = 3;
+
+ @IntDef(prefix = { "USB_OPERATION_" }, value = {
+ USB_OPERATION_SUCCESS,
+ USB_OPERATION_ERROR_INTERNAL,
+ USB_OPERATION_ERROR_NOT_SUPPORTED,
+ USB_OPERATION_ERROR_PORT_MISMATCH
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface UsbOperationStatus{}
+
+ UsbOperationInternal(int operationID, String id) {
+ this.mOperationID = operationID;
+ this.mId = id;
+ }
+
+ /**
+ * Hal glue layer would directly call this function when the requested
+ * operation is complete.
+ */
+ @Override
+ public void onOperationComplete(@UsbOperationStatus int status) {
+ mLock.lock();
+ try {
+ mOperationComplete = true;
+ mStatus = status;
+ Log.i(TAG, "Port:" + mId + " opID:" + mOperationID + " status:" + mStatus);
+ mOperationWait.signal();
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ /**
+ * Caller invokes this function to wait for the operation to be complete.
+ */
+ public void waitForOperationComplete() {
+ mLock.lock();
+ try {
+ long now = System.currentTimeMillis();
+ long deadline = now + USB_OPERATION_TIMEOUT_MSECS;
+ // Wait in loop to overcome spurious wakeups.
+ do {
+ mOperationWait.await(deadline - System.currentTimeMillis(),
+ TimeUnit.MILLISECONDS);
+ } while (!mOperationComplete && System.currentTimeMillis() < deadline);
+ if (!mOperationComplete) {
+ Log.e(TAG, "Port:" + mId + " opID:" + mOperationID
+ + " operationComplete not received in " + USB_OPERATION_TIMEOUT_MSECS
+ + "msecs");
+ }
+ } catch (InterruptedException e) {
+ Log.e(TAG, "Port:" + mId + " opID:" + mOperationID + " operationComplete interrupted");
+ } finally {
+ mLock.unlock();
+ }
+ }
+
+ public @UsbOperationStatus int getStatus() {
+ return mOperationComplete ? mStatus : USB_OPERATION_ERROR_INTERNAL;
+ }
+}
diff --git a/core/java/android/hardware/usb/UsbPort.java b/core/java/android/hardware/usb/UsbPort.java
index 274e23f..e908c24 100644
--- a/core/java/android/hardware/usb/UsbPort.java
+++ b/core/java/android/hardware/usb/UsbPort.java
@@ -16,6 +16,10 @@
package android.hardware.usb;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_NOT_SUPPORTED;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_PORT_MISMATCH;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_SUCCESS;
import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_DETECTED;
import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_DISABLED;
import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_NOT_DETECTED;
@@ -34,15 +38,23 @@
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
import android.Manifest;
+import android.annotation.CheckResult;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
+import android.hardware.usb.UsbOperationInternal;
import android.hardware.usb.V1_0.Constants;
+import android.os.Binder;
+import android.util.Log;
import com.android.internal.util.Preconditions;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Represents a physical USB port and describes its characteristics.
@@ -51,6 +63,7 @@
*/
@SystemApi
public final class UsbPort {
+ private static final String TAG = "UsbPort";
private final String mId;
private final int mSupportedModes;
private final UsbManager mUsbManager;
@@ -64,6 +77,83 @@
*/
private static final int POWER_ROLE_OFFSET = Constants.PortPowerRole.NONE;
+ /**
+ * Counter for tracking UsbOperation operations.
+ */
+ private static final AtomicInteger sUsbOperationCount = new AtomicInteger();
+
+ /**
+ * The {@link #enableUsbData} request was successfully completed.
+ */
+ public static final int ENABLE_USB_DATA_SUCCESS = 0;
+
+ /**
+ * The {@link #enableUsbData} request failed due to internal error.
+ */
+ public static final int ENABLE_USB_DATA_ERROR_INTERNAL = 1;
+
+ /**
+ * The {@link #enableUsbData} request failed as it's not supported.
+ */
+ public static final int ENABLE_USB_DATA_ERROR_NOT_SUPPORTED = 2;
+
+ /**
+ * The {@link #enableUsbData} request failed as port id mismatched.
+ */
+ public static final int ENABLE_USB_DATA_ERROR_PORT_MISMATCH = 3;
+
+ /**
+ * The {@link #enableUsbData} request failed due to other reasons.
+ */
+ public static final int ENABLE_USB_DATA_ERROR_OTHER = 4;
+
+ /** @hide */
+ @IntDef(prefix = { "ENABLE_USB_DATA_" }, value = {
+ ENABLE_USB_DATA_SUCCESS,
+ ENABLE_USB_DATA_ERROR_INTERNAL,
+ ENABLE_USB_DATA_ERROR_NOT_SUPPORTED,
+ ENABLE_USB_DATA_ERROR_PORT_MISMATCH,
+ ENABLE_USB_DATA_ERROR_OTHER
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface EnableUsbDataStatus{}
+
+ /**
+ * The {@link #enableLimitPowerTransfer} request was successfully completed.
+ */
+ public static final int ENABLE_LIMIT_POWER_TRANSFER_SUCCESS = 0;
+
+ /**
+ * The {@link #enableLimitPowerTransfer} request failed due to internal error.
+ */
+ public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_INTERNAL = 1;
+
+ /**
+ * The {@link #enableLimitPowerTransfer} request failed as it's not supported.
+ */
+ public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_NOT_SUPPORTED = 2;
+
+ /**
+ * The {@link #enableLimitPowerTransfer} request failed as port id mismatched.
+ */
+ public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_PORT_MISMATCH = 3;
+
+ /**
+ * The {@link #enableLimitPowerTransfer} request failed due to other reasons.
+ */
+ public static final int ENABLE_LIMIT_POWER_TRANSFER_ERROR_OTHER = 4;
+
+ /** @hide */
+ @IntDef(prefix = { "ENABLE_LIMIT_POWER_TRANSFER_" }, value = {
+ ENABLE_LIMIT_POWER_TRANSFER_SUCCESS,
+ ENABLE_LIMIT_POWER_TRANSFER_ERROR_INTERNAL,
+ ENABLE_LIMIT_POWER_TRANSFER_ERROR_NOT_SUPPORTED,
+ ENABLE_LIMIT_POWER_TRANSFER_ERROR_PORT_MISMATCH,
+ ENABLE_LIMIT_POWER_TRANSFER_ERROR_OTHER
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface EnableLimitPowerTransferStatus{}
+
/** @hide */
public UsbPort(@NonNull UsbManager usbManager, @NonNull String id, int supportedModes,
int supportedContaminantProtectionModes,
@@ -157,7 +247,7 @@
* {@link UsbPortStatus#isRoleCombinationSupported UsbPortStatus.isRoleCombinationSupported}.
* </p><p>
* Note: This function is asynchronous and may fail silently without applying
- * the requested changes. If this function does cause a status change to occur then
+ * the operationed changes. If this function does cause a status change to occur then
* a {@link UsbManager#ACTION_USB_PORT_CHANGED} broadcast will be sent.
* </p>
*
@@ -177,6 +267,88 @@
}
/**
+ * Enables/Disables Usb data on the port.
+ *
+ * @param enable When true enables USB data if disabled.
+ * When false disables USB data if enabled.
+ * @return {@link #ENABLE_USB_DATA_SUCCESS} when request completes successfully or
+ * {@link #ENABLE_USB_DATA_ERROR_INTERNAL} when request fails due to internal
+ * error or
+ * {@link ENABLE_USB_DATA_ERROR_NOT_SUPPORTED} when not supported or
+ * {@link ENABLE_USB_DATA_ERROR_PORT_MISMATCH} when request fails due to port id
+ * mismatch or
+ * {@link ENABLE_USB_DATA_ERROR_OTHER} when fails due to other reasons.
+ */
+ @CheckResult
+ @RequiresPermission(Manifest.permission.MANAGE_USB)
+ public @EnableUsbDataStatus int enableUsbData(boolean enable) {
+ // UID is added To minimize operationID overlap between two different packages.
+ int operationId = sUsbOperationCount.incrementAndGet() + Binder.getCallingUid();
+ Log.i(TAG, "enableUsbData opId:" + operationId
+ + " callingUid:" + Binder.getCallingUid());
+ UsbOperationInternal opCallback =
+ new UsbOperationInternal(operationId, mId);
+ if (mUsbManager.enableUsbData(this, enable, operationId, opCallback) == true) {
+ opCallback.waitForOperationComplete();
+ }
+
+ int result = opCallback.getStatus();
+ switch (result) {
+ case USB_OPERATION_SUCCESS:
+ return ENABLE_USB_DATA_SUCCESS;
+ case USB_OPERATION_ERROR_INTERNAL:
+ return ENABLE_USB_DATA_ERROR_INTERNAL;
+ case USB_OPERATION_ERROR_NOT_SUPPORTED:
+ return ENABLE_USB_DATA_ERROR_NOT_SUPPORTED;
+ case USB_OPERATION_ERROR_PORT_MISMATCH:
+ return ENABLE_USB_DATA_ERROR_PORT_MISMATCH;
+ default:
+ return ENABLE_USB_DATA_ERROR_OTHER;
+ }
+ }
+
+ /**
+ * Limits power transfer In and out of the port.
+ * <p>
+ * Disables charging and limits sourcing power(when permitted by the USB spec) until
+ * port disconnect event.
+ * </p>
+ * @param enable limits power transfer when true.
+ * @return {@link #ENABLE_LIMIT_POWER_TRANSFER_SUCCESS} when request completes successfully or
+ * {@link #ENABLE_LIMIT_POWER_TRANSFER_ERROR_INTERNAL} when request fails due to
+ * internal error or
+ * {@link ENABLE_LIMIT_POWER_TRANSFER_ERROR_NOT_SUPPORTED} when not supported or
+ * {@link ENABLE_LIMIT_POWER_TRANSFER_ERROR_PORT_MISMATCH} when request fails due to
+ * port id mismatch or
+ * {@link ENABLE_LIMIT_POWER_TRANSFER_ERROR_OTHER} when fails due to other reasons.
+ */
+ @CheckResult
+ @RequiresPermission(Manifest.permission.MANAGE_USB)
+ public @EnableLimitPowerTransferStatus int enableLimitPowerTransfer(boolean enable) {
+ // UID is added To minimize operationID overlap between two different packages.
+ int operationId = sUsbOperationCount.incrementAndGet() + Binder.getCallingUid();
+ Log.i(TAG, "enableLimitPowerTransfer opId:" + operationId
+ + " callingUid:" + Binder.getCallingUid());
+ UsbOperationInternal opCallback =
+ new UsbOperationInternal(operationId, mId);
+ mUsbManager.enableLimitPowerTransfer(this, enable, operationId, opCallback);
+ opCallback.waitForOperationComplete();
+ int result = opCallback.getStatus();
+ switch (result) {
+ case USB_OPERATION_SUCCESS:
+ return ENABLE_LIMIT_POWER_TRANSFER_SUCCESS;
+ case USB_OPERATION_ERROR_INTERNAL:
+ return ENABLE_LIMIT_POWER_TRANSFER_ERROR_INTERNAL;
+ case USB_OPERATION_ERROR_NOT_SUPPORTED:
+ return ENABLE_LIMIT_POWER_TRANSFER_ERROR_NOT_SUPPORTED;
+ case USB_OPERATION_ERROR_PORT_MISMATCH:
+ return ENABLE_LIMIT_POWER_TRANSFER_ERROR_PORT_MISMATCH;
+ default:
+ return ENABLE_LIMIT_POWER_TRANSFER_ERROR_OTHER;
+ }
+ }
+
+ /**
* @hide
**/
public void enableContaminantDetection(boolean enable) {
diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java
index bb7aff6..934c506 100644
--- a/core/java/android/hardware/usb/UsbPortStatus.java
+++ b/core/java/android/hardware/usb/UsbPortStatus.java
@@ -19,7 +19,6 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.SystemApi;
-import android.hardware.usb.V1_0.Constants;
import android.os.Parcel;
import android.os.Parcelable;
@@ -36,27 +35,30 @@
@Immutable
@SystemApi
public final class UsbPortStatus implements Parcelable {
+ private static final String TAG = "UsbPortStatus";
private final int mCurrentMode;
private final @UsbPowerRole int mCurrentPowerRole;
private final @UsbDataRole int mCurrentDataRole;
private final int mSupportedRoleCombinations;
private final @ContaminantProtectionStatus int mContaminantProtectionStatus;
private final @ContaminantDetectionStatus int mContaminantDetectionStatus;
+ private final boolean mUsbDataEnabled;
+ private final boolean mPowerTransferLimited;
/**
* Power role: This USB port does not have a power role.
*/
- public static final int POWER_ROLE_NONE = Constants.PortPowerRole.NONE;
+ public static final int POWER_ROLE_NONE = 0;
/**
* Power role: This USB port can act as a source (provide power).
*/
- public static final int POWER_ROLE_SOURCE = Constants.PortPowerRole.SOURCE;
+ public static final int POWER_ROLE_SOURCE = 1;
/**
* Power role: This USB port can act as a sink (receive power).
*/
- public static final int POWER_ROLE_SINK = Constants.PortPowerRole.SINK;
+ public static final int POWER_ROLE_SINK = 2;
@IntDef(prefix = { "POWER_ROLE_" }, value = {
POWER_ROLE_NONE,
@@ -69,17 +71,17 @@
/**
* Power role: This USB port does not have a data role.
*/
- public static final int DATA_ROLE_NONE = Constants.PortDataRole.NONE;
+ public static final int DATA_ROLE_NONE = 0;
/**
* Data role: This USB port can act as a host (access data services).
*/
- public static final int DATA_ROLE_HOST = Constants.PortDataRole.HOST;
+ public static final int DATA_ROLE_HOST = 1;
/**
* Data role: This USB port can act as a device (offer data services).
*/
- public static final int DATA_ROLE_DEVICE = Constants.PortDataRole.DEVICE;
+ public static final int DATA_ROLE_DEVICE = 2;
@IntDef(prefix = { "DATA_ROLE_" }, value = {
DATA_ROLE_NONE,
@@ -92,15 +94,7 @@
/**
* There is currently nothing connected to this USB port.
*/
- public static final int MODE_NONE = Constants.PortMode.NONE;
-
- /**
- * This USB port can act as a downstream facing port (host).
- *
- * <p> Implies that the port supports the {@link #POWER_ROLE_SOURCE} and
- * {@link #DATA_ROLE_HOST} combination of roles (and possibly others as well).
- */
- public static final int MODE_DFP = Constants.PortMode.DFP;
+ public static final int MODE_NONE = 0;
/**
* This USB port can act as an upstream facing port (device).
@@ -108,7 +102,15 @@
* <p> Implies that the port supports the {@link #POWER_ROLE_SINK} and
* {@link #DATA_ROLE_DEVICE} combination of roles (and possibly others as well).
*/
- public static final int MODE_UFP = Constants.PortMode.UFP;
+ public static final int MODE_UFP = 1 << 0;
+
+ /**
+ * This USB port can act as a downstream facing port (host).
+ *
+ * <p> Implies that the port supports the {@link #POWER_ROLE_SOURCE} and
+ * {@link #DATA_ROLE_HOST} combination of roles (and possibly others as well).
+ */
+ public static final int MODE_DFP = 1 << 1;
/**
* This USB port can act either as an downstream facing port (host) or as
@@ -120,87 +122,76 @@
*
* @hide
*/
- public static final int MODE_DUAL = Constants.PortMode.DRP;
+ public static final int MODE_DUAL = MODE_UFP | MODE_DFP;
/**
* This USB port can support USB Type-C Audio accessory.
*/
- public static final int MODE_AUDIO_ACCESSORY =
- android.hardware.usb.V1_1.Constants.PortMode_1_1.AUDIO_ACCESSORY;
+ public static final int MODE_AUDIO_ACCESSORY = 1 << 2;
/**
* This USB port can support USB Type-C debug accessory.
*/
- public static final int MODE_DEBUG_ACCESSORY =
- android.hardware.usb.V1_1.Constants.PortMode_1_1.DEBUG_ACCESSORY;
+ public static final int MODE_DEBUG_ACCESSORY = 1 << 3;
/**
* Contaminant presence detection not supported by the device.
* @hide
*/
- public static final int CONTAMINANT_DETECTION_NOT_SUPPORTED =
- android.hardware.usb.V1_2.Constants.ContaminantDetectionStatus.NOT_SUPPORTED;
+ public static final int CONTAMINANT_DETECTION_NOT_SUPPORTED = 0;
/**
* Contaminant presence detection supported but disabled.
* @hide
*/
- public static final int CONTAMINANT_DETECTION_DISABLED =
- android.hardware.usb.V1_2.Constants.ContaminantDetectionStatus.DISABLED;
+ public static final int CONTAMINANT_DETECTION_DISABLED = 1;
/**
* Contaminant presence enabled but not detected.
* @hide
*/
- public static final int CONTAMINANT_DETECTION_NOT_DETECTED =
- android.hardware.usb.V1_2.Constants.ContaminantDetectionStatus.NOT_DETECTED;
+ public static final int CONTAMINANT_DETECTION_NOT_DETECTED = 2;
/**
* Contaminant presence enabled and detected.
* @hide
*/
- public static final int CONTAMINANT_DETECTION_DETECTED =
- android.hardware.usb.V1_2.Constants.ContaminantDetectionStatus.DETECTED;
+ public static final int CONTAMINANT_DETECTION_DETECTED = 3;
/**
* Contaminant protection - No action performed upon detection of
* contaminant presence.
* @hide
*/
- public static final int CONTAMINANT_PROTECTION_NONE =
- android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.NONE;
+ public static final int CONTAMINANT_PROTECTION_NONE = 0;
/**
* Contaminant protection - Port is forced to sink upon detection of
* contaminant presence.
* @hide
*/
- public static final int CONTAMINANT_PROTECTION_SINK =
- android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.FORCE_SINK;
+ public static final int CONTAMINANT_PROTECTION_SINK = 1 << 0;
/**
* Contaminant protection - Port is forced to source upon detection of
* contaminant presence.
* @hide
*/
- public static final int CONTAMINANT_PROTECTION_SOURCE =
- android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.FORCE_SOURCE;
+ public static final int CONTAMINANT_PROTECTION_SOURCE = 1 << 1;
/**
* Contaminant protection - Port is disabled upon detection of
* contaminant presence.
* @hide
*/
- public static final int CONTAMINANT_PROTECTION_FORCE_DISABLE =
- android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.FORCE_DISABLE;
+ public static final int CONTAMINANT_PROTECTION_FORCE_DISABLE = 1 << 2;
/**
* Contaminant protection - Port is disabled upon detection of
* contaminant presence.
* @hide
*/
- public static final int CONTAMINANT_PROTECTION_DISABLED =
- android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.DISABLED;
+ public static final int CONTAMINANT_PROTECTION_DISABLED = 1 << 3;
@IntDef(prefix = { "CONTAMINANT_DETECTION_" }, value = {
CONTAMINANT_DETECTION_NOT_SUPPORTED,
@@ -234,6 +225,21 @@
/** @hide */
public UsbPortStatus(int currentMode, int currentPowerRole, int currentDataRole,
int supportedRoleCombinations, int contaminantProtectionStatus,
+ int contaminantDetectionStatus, boolean usbDataEnabled,
+ boolean powerTransferLimited) {
+ mCurrentMode = currentMode;
+ mCurrentPowerRole = currentPowerRole;
+ mCurrentDataRole = currentDataRole;
+ mSupportedRoleCombinations = supportedRoleCombinations;
+ mContaminantProtectionStatus = contaminantProtectionStatus;
+ mContaminantDetectionStatus = contaminantDetectionStatus;
+ mUsbDataEnabled = usbDataEnabled;
+ mPowerTransferLimited = powerTransferLimited;
+ }
+
+ /** @hide */
+ public UsbPortStatus(int currentMode, int currentPowerRole, int currentDataRole,
+ int supportedRoleCombinations, int contaminantProtectionStatus,
int contaminantDetectionStatus) {
mCurrentMode = currentMode;
mCurrentPowerRole = currentPowerRole;
@@ -241,6 +247,8 @@
mSupportedRoleCombinations = supportedRoleCombinations;
mContaminantProtectionStatus = contaminantProtectionStatus;
mContaminantDetectionStatus = contaminantDetectionStatus;
+ mUsbDataEnabled = true;
+ mPowerTransferLimited = false;
}
/**
@@ -323,6 +331,25 @@
return mContaminantProtectionStatus;
}
+ /**
+ * Returns UsbData status.
+ *
+ * @hide
+ */
+ public boolean getUsbDataStatus() {
+ return mUsbDataEnabled;
+ }
+
+ /**
+ * Returns whether power transfer is limited.
+ *
+ * @return true when power transfer is limited.
+ * false otherwise.
+ */
+ public boolean isPowerTransferLimited() {
+ return mPowerTransferLimited;
+ }
+
@NonNull
@Override
public String toString() {
@@ -336,6 +363,10 @@
+ getContaminantDetectionStatus()
+ ", contaminantProtectionStatus="
+ getContaminantProtectionStatus()
+ + ", usbDataEnabled="
+ + getUsbDataStatus()
+ + ", isPowerTransferLimited="
+ + isPowerTransferLimited()
+ "}";
}
@@ -352,6 +383,8 @@
dest.writeInt(mSupportedRoleCombinations);
dest.writeInt(mContaminantProtectionStatus);
dest.writeInt(mContaminantDetectionStatus);
+ dest.writeBoolean(mUsbDataEnabled);
+ dest.writeBoolean(mPowerTransferLimited);
}
public static final @NonNull Parcelable.Creator<UsbPortStatus> CREATOR =
@@ -364,9 +397,11 @@
int supportedRoleCombinations = in.readInt();
int contaminantProtectionStatus = in.readInt();
int contaminantDetectionStatus = in.readInt();
+ boolean usbDataEnabled = in.readBoolean();
+ boolean powerTransferLimited = in.readBoolean();
return new UsbPortStatus(currentMode, currentPowerRole, currentDataRole,
supportedRoleCombinations, contaminantProtectionStatus,
- contaminantDetectionStatus);
+ contaminantDetectionStatus, usbDataEnabled, powerTransferLimited);
}
@Override
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index 6f15588..cc325cd 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -72,7 +72,6 @@
private static final int DO_START_INPUT = 32;
private static final int DO_CREATE_SESSION = 40;
private static final int DO_SET_SESSION_ENABLED = 45;
- private static final int DO_REVOKE_SESSION = 50;
private static final int DO_SHOW_SOFT_INPUT = 60;
private static final int DO_HIDE_SOFT_INPUT = 70;
private static final int DO_CHANGE_INPUTMETHOD_SUBTYPE = 80;
@@ -215,9 +214,6 @@
inputMethod.setSessionEnabled((InputMethodSession)msg.obj,
msg.arg1 != 0);
return;
- case DO_REVOKE_SESSION:
- inputMethod.revokeSession((InputMethodSession)msg.obj);
- return;
case DO_SHOW_SOFT_INPUT: {
final SomeArgs args = (SomeArgs)msg.obj;
inputMethod.showSoftInputWithToken(
@@ -368,22 +364,6 @@
@BinderThread
@Override
- public void revokeSession(IInputMethodSession session) {
- try {
- InputMethodSession ls = ((IInputMethodSessionWrapper)
- session).getInternalInputMethodSession();
- if (ls == null) {
- Log.w(TAG, "Session is already finished: " + session);
- return;
- }
- mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_REVOKE_SESSION, ls));
- } catch (ClassCastException e) {
- Log.w(TAG, "Incoming session not of correct type: " + session, e);
- }
- }
-
- @BinderThread
- @Override
public void showSoftInput(IBinder showInputToken, int flags, ResultReceiver resultReceiver) {
mCaller.executeOrSendMessage(mCaller.obtainMessageIOO(DO_SHOW_SOFT_INPUT,
flags, showInputToken, resultReceiver));
diff --git a/core/java/android/os/BatteryConsumer.java b/core/java/android/os/BatteryConsumer.java
index d2f788f..47a272c 100644
--- a/core/java/android/os/BatteryConsumer.java
+++ b/core/java/android/os/BatteryConsumer.java
@@ -192,6 +192,7 @@
POWER_COMPONENT_CPU,
POWER_COMPONENT_MOBILE_RADIO,
POWER_COMPONENT_WIFI,
+ POWER_COMPONENT_BLUETOOTH,
};
static final int COLUMN_INDEX_BATTERY_CONSUMER_TYPE = 0;
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index a453887..2d33817 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -1037,6 +1037,16 @@
public abstract long getBluetoothMeasuredBatteryConsumptionUC();
/**
+ * Returns the battery consumption (in microcoulombs) of the uid's bluetooth usage
+ * when in the specified process state.
+ * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable.
+ *
+ * {@hide}
+ */
+ public abstract long getBluetoothMeasuredBatteryConsumptionUC(
+ @BatteryConsumer.ProcessState int processState);
+
+ /**
* Returns the battery consumption (in microcoulombs) of the uid's cpu usage, derived from
* on device power measurement data.
* Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable.
@@ -3396,6 +3406,11 @@
public abstract WakeLockStats getWakeLockStats();
/**
+ * Returns aggregated Bluetooth stats.
+ */
+ public abstract BluetoothBatteryStats getBluetoothBatteryStats();
+
+ /**
* Returns Timers tracking the total time of each Resource Power Manager state and voter.
*/
public abstract Map<String, ? extends Timer> getRpmStats();
diff --git a/core/java/android/os/BatteryStatsManager.java b/core/java/android/os/BatteryStatsManager.java
index 6339435..2a609b8 100644
--- a/core/java/android/os/BatteryStatsManager.java
+++ b/core/java/android/os/BatteryStatsManager.java
@@ -368,6 +368,21 @@
}
/**
+ * Retrieves accumulated bluetooth stats.
+ *
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.BATTERY_STATS)
+ @NonNull
+ public BluetoothBatteryStats getBluetoothBatteryStats() {
+ try {
+ return mBatteryStats.getBluetoothBatteryStats();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Indicates an app acquiring full wifi lock.
*
* @param ws worksource (to be used for battery blaming).
diff --git a/core/java/android/os/BluetoothBatteryStats.aidl b/core/java/android/os/BluetoothBatteryStats.aidl
new file mode 100644
index 0000000..d0514b6
--- /dev/null
+++ b/core/java/android/os/BluetoothBatteryStats.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+/** {@hide} */
+parcelable BluetoothBatteryStats;
diff --git a/core/java/android/os/BluetoothBatteryStats.java b/core/java/android/os/BluetoothBatteryStats.java
new file mode 100644
index 0000000..3d99a08
--- /dev/null
+++ b/core/java/android/os/BluetoothBatteryStats.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.os;
+
+import android.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Snapshot of Bluetooth battery stats.
+ *
+ * @hide
+ */
+public class BluetoothBatteryStats implements Parcelable {
+
+ /** @hide */
+ public static class UidStats {
+ public final int uid;
+ public final long scanTimeMs;
+ public final long unoptimizedScanTimeMs;
+ public final int scanResultCount;
+ public final long rxTimeMs;
+ public final long txTimeMs;
+
+ public UidStats(int uid, long scanTimeMs, long unoptimizedScanTimeMs, int scanResultCount,
+ long rxTimeMs, long txTimeMs) {
+ this.uid = uid;
+ this.scanTimeMs = scanTimeMs;
+ this.unoptimizedScanTimeMs = unoptimizedScanTimeMs;
+ this.scanResultCount = scanResultCount;
+ this.rxTimeMs = rxTimeMs;
+ this.txTimeMs = txTimeMs;
+ }
+
+ private UidStats(Parcel in) {
+ uid = in.readInt();
+ scanTimeMs = in.readLong();
+ unoptimizedScanTimeMs = in.readLong();
+ scanResultCount = in.readInt();
+ rxTimeMs = in.readLong();
+ txTimeMs = in.readLong();
+ }
+
+ private void writeToParcel(Parcel out) {
+ out.writeInt(uid);
+ out.writeLong(scanTimeMs);
+ out.writeLong(unoptimizedScanTimeMs);
+ out.writeInt(scanResultCount);
+ out.writeLong(rxTimeMs);
+ out.writeLong(txTimeMs);
+ }
+
+ @Override
+ public String toString() {
+ return "UidStats{"
+ + "uid=" + uid
+ + ", scanTimeMs=" + scanTimeMs
+ + ", unoptimizedScanTimeMs=" + unoptimizedScanTimeMs
+ + ", scanResultCount=" + scanResultCount
+ + ", rxTimeMs=" + rxTimeMs
+ + ", txTimeMs=" + txTimeMs
+ + '}';
+ }
+ }
+
+ private final List<UidStats> mUidStats;
+
+ public BluetoothBatteryStats(@NonNull List<UidStats> uidStats) {
+ mUidStats = uidStats;
+ }
+
+ @NonNull
+ public List<UidStats> getUidStats() {
+ return mUidStats;
+ }
+
+ protected BluetoothBatteryStats(Parcel in) {
+ final int size = in.readInt();
+ mUidStats = new ArrayList<>(size);
+ for (int i = 0; i < size; i++) {
+ mUidStats.add(new UidStats(in));
+ }
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel out, int flags) {
+ final int size = mUidStats.size();
+ out.writeInt(size);
+ for (int i = 0; i < size; i++) {
+ UidStats stats = mUidStats.get(i);
+ stats.writeToParcel(out);
+ }
+ }
+
+ public static final Creator<BluetoothBatteryStats> CREATOR =
+ new Creator<BluetoothBatteryStats>() {
+ @Override
+ public BluetoothBatteryStats createFromParcel(Parcel in) {
+ return new BluetoothBatteryStats(in);
+ }
+
+ @Override
+ public BluetoothBatteryStats[] newArray(int size) {
+ return new BluetoothBatteryStats[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+}
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index 3bc3ec8..e8b3ae9 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -3711,10 +3711,10 @@
final int m = list.size();
int i = 0;
for (; i < m && i < n; i++) {
- list.set(i, (T) readParcelableInternal(cl, clazz));
+ list.set(i, readParcelableInternal(cl, clazz));
}
for (; i < n; i++) {
- list.add((T) readParcelableInternal(cl, clazz));
+ list.add(readParcelableInternal(cl, clazz));
}
for (; i < m; i++) {
list.remove(n);
@@ -4217,7 +4217,8 @@
* trying to instantiate an element.
*/
@Nullable
- public <T> T readParcelable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {
+ public <T extends Parcelable> T readParcelable(@Nullable ClassLoader loader,
+ @NonNull Class<? super T> clazz) {
Objects.requireNonNull(clazz);
return readParcelableInternal(loader, clazz);
}
@@ -4227,7 +4228,8 @@
*/
@SuppressWarnings("unchecked")
@Nullable
- private <T> T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class<T> clazz) {
+ private <T extends Parcelable> T readParcelableInternal(@Nullable ClassLoader loader,
+ @Nullable Class<? super T> clazz) {
Parcelable.Creator<?> creator = readParcelableCreatorInternal(loader, clazz);
if (creator == null) {
return null;
@@ -4463,7 +4465,8 @@
* deserializing the object.
*/
@Nullable
- public <T> T readSerializable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {
+ public <T extends Serializable> T readSerializable(@Nullable ClassLoader loader,
+ @NonNull Class<? super T> clazz) {
Objects.requireNonNull(clazz);
return readSerializableInternal(
loader == null ? getClass().getClassLoader() : loader, clazz);
@@ -4473,8 +4476,8 @@
* @param clazz The type of the serializable expected or {@code null} for performing no checks
*/
@Nullable
- private <T> T readSerializableInternal(@Nullable final ClassLoader loader,
- @Nullable Class<T> clazz) {
+ private <T extends Serializable> T readSerializableInternal(@Nullable final ClassLoader loader,
+ @Nullable Class<? super T> clazz) {
String name = readString();
if (name == null) {
// For some reason we were unable to read the name of the Serializable (either there
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 742a542..2fe0622 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -132,6 +132,7 @@
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@TestApi
+ @SystemApi(client = MODULE_LIBRARIES)
public static final int NFC_UID = 1027;
/**
@@ -279,6 +280,26 @@
public static final int LAST_APPLICATION_UID = 19999;
/**
+ * Defines the start of a range of UIDs going from this number to
+ * {@link #LAST_SUPPLEMENTAL_UID} that are reserved for assigning to
+ * supplemental processes. There is a 1-1 mapping between a supplemental
+ * process UID and the app that it belongs to, which can be computed by
+ * subtracting (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID) from the
+ * uid of a supplemental process.
+ *
+ * Note that there are no GIDs associated with these processes; storage
+ * attribution for them will be done using project IDs.
+ * @hide
+ */
+ public static final int FIRST_SUPPLEMENTAL_UID = 20000;
+
+ /**
+ * Last UID that is used for supplemental processes.
+ * @hide
+ */
+ public static final int LAST_SUPPLEMENTAL_UID = 29999;
+
+ /**
* First uid used for fully isolated sandboxed processes spawned from an app zygote
* @hide
*/
@@ -880,6 +901,46 @@
}
/**
+ * Returns whether the provided UID belongs to a supplemental process.
+ *
+ * @hide
+ */
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static final boolean isSupplemental(int uid) {
+ uid = UserHandle.getAppId(uid);
+ return (uid >= FIRST_SUPPLEMENTAL_UID && uid <= LAST_SUPPLEMENTAL_UID);
+ }
+
+ /**
+ *
+ * Returns the app process corresponding to a supplemental process.
+ *
+ * @hide
+ */
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static final int toAppUid(int uid) {
+ return uid - (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID);
+ }
+
+ /**
+ *
+ * Returns the supplemental process corresponding to an app process.
+ *
+ * @hide
+ */
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static final int toSupplementalUid(int uid) {
+ return uid + (FIRST_SUPPLEMENTAL_UID - FIRST_APPLICATION_UID);
+ }
+
+ /**
+ * Returns whether the current process is a supplemental process.
+ */
+ public static final boolean isSupplemental() {
+ return isSupplemental(myUid());
+ }
+
+ /**
* Returns the UID assigned to a particular user name, or -1 if there is
* none. If the given string consists of only numbers, it is converted
* directly to a uid.
diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING
index 07f4082..22ddbcc 100644
--- a/core/java/android/os/TEST_MAPPING
+++ b/core/java/android/os/TEST_MAPPING
@@ -31,15 +31,6 @@
]
},
{
- "file_patterns": ["Environment\\.java"],
- "name": "FrameworksServicesTests",
- "options": [
- {
- "include-filter": "com.android.server.pm.parsing.PackageInfoUserFieldsTest"
- }
- ]
- },
- {
"file_patterns": [
"BatteryStats[^/]*\\.java",
"BatteryUsageStats[^/]*\\.java",
diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index d974e0c..6b869f1 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -16,7 +16,10 @@
package android.os;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+
import android.annotation.NonNull;
+import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import dalvik.annotation.optimization.CriticalNative;
@@ -90,6 +93,7 @@
/** @hide */
public static final long TRACE_TAG_DATABASE = 1L << 20;
/** @hide */
+ @SystemApi(client = MODULE_LIBRARIES)
public static final long TRACE_TAG_NETWORK = 1L << 21;
/** @hide */
public static final long TRACE_TAG_ADB = 1L << 22;
@@ -148,6 +152,7 @@
* @hide
*/
@UnsupportedAppUsage
+ @SystemApi(client = MODULE_LIBRARIES)
public static boolean isTagEnabled(long traceTag) {
long tags = nativeGetEnabledTags();
return (tags & traceTag) != 0;
@@ -163,7 +168,8 @@
* @hide
*/
@UnsupportedAppUsage
- public static void traceCounter(long traceTag, String counterName, int counterValue) {
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static void traceCounter(long traceTag, @NonNull String counterName, int counterValue) {
if (isTagEnabled(traceTag)) {
nativeTraceCounter(traceTag, counterName, counterValue);
}
@@ -202,7 +208,8 @@
* @hide
*/
@UnsupportedAppUsage
- public static void traceBegin(long traceTag, String methodName) {
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static void traceBegin(long traceTag, @NonNull String methodName) {
if (isTagEnabled(traceTag)) {
nativeTraceBegin(traceTag, methodName);
}
@@ -217,6 +224,7 @@
* @hide
*/
@UnsupportedAppUsage
+ @SystemApi(client = MODULE_LIBRARIES)
public static void traceEnd(long traceTag) {
if (isTagEnabled(traceTag)) {
nativeTraceEnd(traceTag);
@@ -237,7 +245,8 @@
* @hide
*/
@UnsupportedAppUsage
- public static void asyncTraceBegin(long traceTag, String methodName, int cookie) {
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static void asyncTraceBegin(long traceTag, @NonNull String methodName, int cookie) {
if (isTagEnabled(traceTag)) {
nativeAsyncTraceBegin(traceTag, methodName, cookie);
}
@@ -255,7 +264,8 @@
* @hide
*/
@UnsupportedAppUsage
- public static void asyncTraceEnd(long traceTag, String methodName, int cookie) {
+ @SystemApi(client = MODULE_LIBRARIES)
+ public static void asyncTraceEnd(long traceTag, @NonNull String methodName, int cookie) {
if (isTagEnabled(traceTag)) {
nativeAsyncTraceEnd(traceTag, methodName, cookie);
}
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 190f5f1..f18c9c9 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -16,6 +16,9 @@
package android.os;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_BADGED_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
+
import android.Manifest;
import android.accounts.AccountManager;
import android.annotation.ColorInt;
@@ -820,6 +823,20 @@
public static final String DISALLOW_ADD_MANAGED_PROFILE = "no_add_managed_profile";
/**
+ * Specifies if a user is disallowed from creating clone profile.
+ * <p>The default value for an unmanaged user is <code>false</code>.
+ * For users with a device owner set, the default is <code>true</code>.
+ *
+ * <p>Key for user restrictions.
+ * <p>Type: Boolean
+ * @see DevicePolicyManager#addUserRestriction(ComponentName, String)
+ * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
+ * @see #getUserRestrictions()
+ * @hide
+ */
+ public static final String DISALLOW_ADD_CLONE_PROFILE = "no_add_clone_profile";
+
+ /**
* Specifies if a user is disallowed from disabling application verification. The default
* value is <code>false</code>.
*
@@ -1497,6 +1514,7 @@
DISALLOW_FACTORY_RESET,
DISALLOW_ADD_USER,
DISALLOW_ADD_MANAGED_PROFILE,
+ DISALLOW_ADD_CLONE_PROFILE,
ENSURE_VERIFY_APPS,
DISALLOW_CONFIG_CELL_BROADCASTS,
DISALLOW_CONFIG_MOBILE_NETWORKS,
@@ -4645,6 +4663,18 @@
if (!hasBadge(userId)) {
return label;
}
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(
+ getUpdatableUserBadgedLabelId(userId),
+ () -> getDefaultUserBadgedLabel(label, userId),
+ /* formatArgs= */ label);
+ }
+
+ private String getUpdatableUserBadgedLabelId(int userId) {
+ return isManagedProfile(userId) ? WORK_PROFILE_BADGED_LABEL : UNDEFINED;
+ }
+
+ private String getDefaultUserBadgedLabel(CharSequence label, int userId) {
try {
final int resourceId = mService.getUserBadgeLabelResId(userId);
return Resources.getSystem().getString(resourceId, label);
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 29accb9..8df659d 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -80,6 +80,7 @@
import android.os.ServiceManager.ServiceNotFoundException;
import android.os.SystemProperties;
import android.os.UserHandle;
+import android.provider.DeviceConfig;
import android.provider.MediaStore;
import android.provider.Settings;
import android.sysprop.VoldProperties;
@@ -1443,28 +1444,39 @@
*
* @hide
*/
- public static final int STORAGE_THRESHOLD_PERCENT_HIGH = 20;
+ public static final int DEFAULT_STORAGE_THRESHOLD_PERCENT_HIGH = 20;
+ /** {@hide} */
+ @TestApi
+ public static final String
+ STORAGE_THRESHOLD_PERCENT_HIGH_KEY = "storage_threshold_percent_high";
/**
* Devices having below STORAGE_THRESHOLD_PERCENT_LOW of total space free are considered to be
- * in low free space category.
+ * in low free space category and can be configured via
+ * Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE.
*
* @hide
*/
- public static final int STORAGE_THRESHOLD_PERCENT_LOW = 5;
+ public static final int DEFAULT_STORAGE_THRESHOLD_PERCENT_LOW = 5;
/**
* For devices in high free space category, CACHE_RESERVE_PERCENT_HIGH percent of total space is
* allocated for cache.
*
* @hide
*/
- public static final int CACHE_RESERVE_PERCENT_HIGH = 10;
+ public static final int DEFAULT_CACHE_RESERVE_PERCENT_HIGH = 10;
+ /** {@hide} */
+ @TestApi
+ public static final String CACHE_RESERVE_PERCENT_HIGH_KEY = "cache_reserve_percent_high";
/**
* For devices in low free space category, CACHE_RESERVE_PERCENT_LOW percent of total space is
* allocated for cache.
*
* @hide
*/
- public static final int CACHE_RESERVE_PERCENT_LOW = 2;
+ public static final int DEFAULT_CACHE_RESERVE_PERCENT_LOW = 2;
+ /** {@hide} */
+ @TestApi
+ public static final String CACHE_RESERVE_PERCENT_LOW_KEY = "cache_reserve_percent_low";
private static final long DEFAULT_THRESHOLD_MAX_BYTES = DataUnit.MEBIBYTES.toBytes(500);
@@ -1490,7 +1502,8 @@
@UnsupportedAppUsage
public long getStorageLowBytes(File path) {
final long lowPercent = Settings.Global.getInt(mResolver,
- Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE, STORAGE_THRESHOLD_PERCENT_LOW);
+ Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE,
+ DEFAULT_STORAGE_THRESHOLD_PERCENT_LOW);
final long lowBytes = (path.getTotalSpace() * lowPercent) / 100;
final long maxLowBytes = Settings.Global.getLong(mResolver,
@@ -1510,24 +1523,33 @@
@TestApi
@SuppressLint("StreamFiles")
public long computeStorageCacheBytes(@NonNull File path) {
+ final int storageThresholdPercentHigh = DeviceConfig.getInt(
+ DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ STORAGE_THRESHOLD_PERCENT_HIGH_KEY, DEFAULT_STORAGE_THRESHOLD_PERCENT_HIGH);
+ final int cacheReservePercentHigh = DeviceConfig.getInt(
+ DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ CACHE_RESERVE_PERCENT_HIGH_KEY, DEFAULT_CACHE_RESERVE_PERCENT_HIGH);
+ final int cacheReservePercentLow = DeviceConfig.getInt(
+ DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ CACHE_RESERVE_PERCENT_LOW_KEY, DEFAULT_CACHE_RESERVE_PERCENT_LOW);
final long totalBytes = path.getTotalSpace();
final long usableBytes = path.getUsableSpace();
- final long storageThresholdHighBytes = totalBytes * STORAGE_THRESHOLD_PERCENT_HIGH / 100;
+ final long storageThresholdHighBytes = totalBytes * storageThresholdPercentHigh / 100;
final long storageThresholdLowBytes = getStorageLowBytes(path);
long result;
if (usableBytes > storageThresholdHighBytes) {
- // If free space is >STORAGE_THRESHOLD_PERCENT_HIGH of total space,
- // reserve CACHE_RESERVE_PERCENT_HIGH of total space
- result = totalBytes * CACHE_RESERVE_PERCENT_HIGH / 100;
+ // If free space is >storageThresholdPercentHigh of total space,
+ // reserve cacheReservePercentHigh of total space
+ result = totalBytes * cacheReservePercentHigh / 100;
} else if (usableBytes < storageThresholdLowBytes) {
- // If free space is <min(STORAGE_THRESHOLD_PERCENT_LOW of total space, 500MB),
- // reserve CACHE_RESERVE_PERCENT_LOW of total space
- result = totalBytes * CACHE_RESERVE_PERCENT_LOW / 100;
+ // If free space is <min(storageThresholdPercentLow of total space, 500MB),
+ // reserve cacheReservePercentLow of total space
+ result = totalBytes * cacheReservePercentLow / 100;
} else {
// Else, linearly interpolate the amount of space to reserve
- double slope = (CACHE_RESERVE_PERCENT_HIGH - CACHE_RESERVE_PERCENT_LOW) * totalBytes
+ double slope = (cacheReservePercentHigh - cacheReservePercentLow) * totalBytes
/ (100.0 * (storageThresholdHighBytes - storageThresholdLowBytes));
- double intercept = totalBytes * CACHE_RESERVE_PERCENT_LOW / 100.0
+ double intercept = totalBytes * cacheReservePercentLow / 100.0
- storageThresholdLowBytes * slope;
result = Math.round(slope * usableBytes + intercept);
}
diff --git a/core/java/android/permission/IPermissionController.aidl b/core/java/android/permission/IPermissionController.aidl
index 5814bac..0894e37 100644
--- a/core/java/android/permission/IPermissionController.aidl
+++ b/core/java/android/permission/IPermissionController.aidl
@@ -56,6 +56,6 @@
in AndroidFuture<String> callback);
void getUnusedAppCount(
in AndroidFuture callback);
- void selfRevokePermissions(in String packageName, in List<String> permissions,
+ void revokeOwnPermissionsOnKill(in String packageName, in List<String> permissions,
in AndroidFuture callback);
}
diff --git a/core/java/android/permission/IPermissionManager.aidl b/core/java/android/permission/IPermissionManager.aidl
index 8e5581b..1c0320e 100644
--- a/core/java/android/permission/IPermissionManager.aidl
+++ b/core/java/android/permission/IPermissionManager.aidl
@@ -76,7 +76,7 @@
List<SplitPermissionInfoParcelable> getSplitPermissions();
- void selfRevokePermissions(String packageName, in List<String> permissions);
+ void revokeOwnPermissionsOnKill(String packageName, in List<String> permissions);
void startOneTimePermissionSession(String packageName, int userId, long timeout,
int importanceToResetTimer, int importanceToKeepSessionAlive);
diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java
index 47cd107..a0115a9 100644
--- a/core/java/android/permission/PermissionControllerManager.java
+++ b/core/java/android/permission/PermissionControllerManager.java
@@ -835,17 +835,17 @@
*
* @param packageName The name of the package for which the permissions will be revoked.
* @param permissions List of permissions to be revoked.
+ * @param callback Callback called when the revocation request has been completed.
*
- * @see Context#selfRevokePermissions(Collection)
+ * @see Context#revokeOwnPermissionsOnKill(Collection)
*
* @hide
*/
- public void selfRevokePermissions(@NonNull String packageName,
- @NonNull List<String> permissions) {
+ public void revokeOwnPermissionsOnKill(@NonNull String packageName,
+ @NonNull List<String> permissions, AndroidFuture<Void> callback) {
mRemoteService.postAsync(service -> {
- AndroidFuture<Void> future = new AndroidFuture<>();
- service.selfRevokePermissions(packageName, permissions, future);
- return future;
+ service.revokeOwnPermissionsOnKill(packageName, permissions, callback);
+ return callback;
}).whenComplete((result, err) -> {
if (err != null) {
Log.e(TAG, "Failed to self revoke " + String.join(",", permissions)
diff --git a/core/java/android/permission/PermissionControllerService.java b/core/java/android/permission/PermissionControllerService.java
index dcbab62..b1e3cfc 100644
--- a/core/java/android/permission/PermissionControllerService.java
+++ b/core/java/android/permission/PermissionControllerService.java
@@ -337,10 +337,10 @@
* @param permissions List of permissions to be revoked.
* @param callback Callback waiting for operation to be complete.
*
- * @see PermissionManager#selfRevokePermissions(java.util.Collection)
+ * @see PermissionManager#revokeOwnPermissionsOnKill(java.util.Collection)
*/
@BinderThread
- public void onSelfRevokePermissions(@NonNull String packageName,
+ public void onRevokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions, @NonNull Runnable callback) {
throw new AbstractMethodError("Must be overridden in implementing class");
}
@@ -669,13 +669,13 @@
}
@Override
- public void selfRevokePermissions(@NonNull String packageName,
+ public void revokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions, @NonNull AndroidFuture callback) {
try {
enforceSomePermissionsGrantedToCaller(
Manifest.permission.REVOKE_RUNTIME_PERMISSIONS);
Objects.requireNonNull(callback);
- onSelfRevokePermissions(packageName, permissions,
+ onRevokeOwnPermissionsOnKill(packageName, permissions,
() -> callback.complete(null));
} catch (Throwable t) {
callback.completeExceptionally(t);
diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java
index 13941dc..e4aee76 100644
--- a/core/java/android/permission/PermissionManager.java
+++ b/core/java/android/permission/PermissionManager.java
@@ -562,12 +562,12 @@
}
/**
- * @see Context#selfRevokePermissions(Collection)
+ * @see Context#revokeOwnPermissionsOnKill(Collection)
* @hide
*/
- public void selfRevokePermissions(@NonNull Collection<String> permissions) {
+ public void revokeOwnPermissionsOnKill(@NonNull Collection<String> permissions) {
try {
- mPermissionManager.selfRevokePermissions(mContext.getPackageName(),
+ mPermissionManager.revokeOwnPermissionsOnKill(mContext.getPackageName(),
new ArrayList<String>(permissions));
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 6349cde..87f4489 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -464,6 +464,13 @@
public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";
/**
+ * Namespace for all Supplemental Api related features.
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_SUPPLEMENTAL_API = "supplemental_api";
+
+ /**
* Namespace for all SurfaceFlinger features that are used at the native level.
* These features are applied on boot or after reboot.
*
@@ -687,6 +694,15 @@
@SystemApi
public static final String NAMESPACE_UWB = "uwb";
+ /**
+ * Namespace for AmbientContextEventManagerService related features.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE =
+ "ambient_context_manager_service";
+
private static final Object sLock = new Object();
@GuardedBy("sLock")
private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index bca0286..3f54408 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7168,6 +7168,12 @@
public static final String LOCATION_COARSE_ACCURACY_M = "locationCoarseAccuracy";
/**
+ * Whether or not to show display system location accesses.
+ * @hide
+ */
+ public static final String LOCATION_SHOW_SYSTEM_OPS = "locationShowSystemOps";
+
+ /**
* A flag containing settings used for biometric weak
* @hide
*/
@@ -9057,6 +9063,16 @@
public static final String SCREENSAVER_DEFAULT_COMPONENT = "screensaver_default_component";
/**
+ * The complications that are enabled to be shown over the screensaver by the user. Holds
+ * a comma separated list of
+ * {@link com.android.settingslib.dream.DreamBackend.ComplicationType}.
+ *
+ * @hide
+ */
+ public static final String SCREENSAVER_ENABLED_COMPLICATIONS =
+ "screensaver_enabled_complications";
+
+ /**
* The default NFC payment component
* @hide
*/
@@ -10586,6 +10602,14 @@
"communal_mode_trusted_networks";
/**
+ * Setting to allow Fast Pair scans to be enabled.
+ * @hide
+ */
+ @SystemApi
+ @Readable
+ public static final String FAST_PAIR_SCAN_ENABLED = "fast_pair_scan_enabled";
+
+ /**
* These entries are considered common between the personal and the managed profile,
* since the managed profile doesn't get to change them.
*/
@@ -12817,16 +12841,6 @@
SYS_STORAGE_CACHE_PERCENTAGE = "sys_storage_cache_percentage";
/**
- * Maximum bytes of storage on the device that is reserved for cached
- * data.
- *
- * @hide
- */
- @Readable
- public static final String
- SYS_STORAGE_CACHE_MAX_BYTES = "sys_storage_cache_max_bytes";
-
- /**
* The maximum reconnect delay for short network outages or when the
* network is suspended due to phone use.
*
diff --git a/core/java/android/service/ambientcontext/AmbientContextDetectionService.java b/core/java/android/service/ambientcontext/AmbientContextDetectionService.java
new file mode 100644
index 0000000..dccfe36
--- /dev/null
+++ b/core/java/android/service/ambientcontext/AmbientContextDetectionService.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.ambientcontext;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.SystemApi;
+import android.app.Service;
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextEventResponse;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteCallback;
+import android.util.Slog;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * Abstract base class for {@link AmbientContextEvent} detection service.
+ *
+ * <p> A service that provides requested ambient context events to the system.
+ * The system's default AmbientContextDetectionService implementation is configured in
+ * {@code config_defaultAmbientContextDetectionService}. If this config has no value, a stub is
+ * returned.
+ *
+ * See: {@code AmbientContextManagerService}.
+ *
+ * <pre>
+ * {@literal
+ * <service android:name=".YourAmbientContextDetectionService"
+ * android:permission="android.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE">
+ * </service>}
+ * </pre>
+ *
+ * @hide
+ */
+@SystemApi
+public abstract class AmbientContextDetectionService extends Service {
+ private static final String TAG = AmbientContextDetectionService.class.getSimpleName();
+
+ /**
+ * The {@link Intent} that must be declared as handled by the service. To be supported, the
+ * service must also require the
+ * {@link android.Manifest.permission#BIND_AMBIENT_CONTEXT_DETECTION_SERVICE}
+ * permission so that other applications can not abuse it.
+ */
+ public static final String SERVICE_INTERFACE =
+ "android.service.ambientcontext.AmbientContextDetectionService";
+
+ /**
+ * The key for the bundle the parameter of {@code RemoteCallback#sendResult}. Implementation
+ * should set bundle result with this key.
+ *
+ * @hide
+ */
+ public static final String RESPONSE_BUNDLE_KEY =
+ "android.service.ambientcontext.EventResponseKey";
+
+ @Nullable
+ @Override
+ public final IBinder onBind(@NonNull Intent intent) {
+ if (SERVICE_INTERFACE.equals(intent.getAction())) {
+ return new IAmbientContextDetectionService.Stub() {
+ /** {@inheritDoc} */
+ @Override
+ public void startDetection(
+ @NonNull AmbientContextEventRequest request, String packageName,
+ RemoteCallback callback) {
+ Objects.requireNonNull(request);
+ Objects.requireNonNull(callback);
+ Consumer<AmbientContextEventResponse> consumer =
+ response -> {
+ Bundle bundle = new Bundle();
+ bundle.putParcelable(
+ AmbientContextDetectionService.RESPONSE_BUNDLE_KEY,
+ response);
+ callback.sendResult(bundle);
+ };
+ AmbientContextDetectionService.this.onStartDetection(
+ request, packageName, consumer);
+ Slog.d(TAG, "startDetection " + request);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void stopDetection(String packageName) {
+ Objects.requireNonNull(packageName);
+ AmbientContextDetectionService.this.onStopDetection(packageName);
+ }
+ };
+ }
+ return null;
+ }
+
+ /**
+ * Starts detection and provides detected events to the consumer. The ongoing detection will
+ * keep running, until onStopDetection is called. If there were previously requested
+ * detection from the same package, the previous request will be replaced with the new request.
+ * The implementation should keep track of whether the user consented each requested
+ * AmbientContextEvent for the app. If not consented, the response should set status
+ * STATUS_ACCESS_DENIED and include an action PendingIntent for the app to redirect the user
+ * to the consent screen.
+ *
+ * @param request The request with events to detect, optional detection window and other
+ * options.
+ * @param packageName the requesting app's package name
+ * @param consumer the consumer for the detected event
+ */
+ public abstract void onStartDetection(
+ @NonNull AmbientContextEventRequest request,
+ @NonNull String packageName,
+ @NonNull Consumer<AmbientContextEventResponse> consumer);
+
+ /**
+ * Stops detection of the events. Events that are not being detected will be ignored.
+ *
+ * @param packageName stops detection for the given package.
+ */
+ public abstract void onStopDetection(@NonNull String packageName);
+}
diff --git a/core/java/android/service/ambientcontext/IAmbientContextDetectionService.aidl b/core/java/android/service/ambientcontext/IAmbientContextDetectionService.aidl
new file mode 100644
index 0000000..1c6e25e
--- /dev/null
+++ b/core/java/android/service/ambientcontext/IAmbientContextDetectionService.aidl
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.ambientcontext;
+
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.os.RemoteCallback;
+
+/**
+ * Interface for a concrete implementation to provide AmbientContextEvents to the framework.
+ *
+ * @hide
+ */
+oneway interface IAmbientContextDetectionService {
+ void startDetection(in AmbientContextEventRequest request, in String packageName,
+ in RemoteCallback callback);
+ void stopDetection(in String packageName);
+}
\ No newline at end of file
diff --git a/core/java/android/service/ambientcontext/OWNERS b/core/java/android/service/ambientcontext/OWNERS
new file mode 100644
index 0000000..a863297
--- /dev/null
+++ b/core/java/android/service/ambientcontext/OWNERS
@@ -0,0 +1,3 @@
+enxun@google.com
+kxchen@google.com
+tgadh@google.com
diff --git a/core/java/android/service/games/CreateGameSessionResult.aidl b/core/java/android/service/games/CreateGameSessionResult.aidl
new file mode 100644
index 0000000..b7c5e16
--- /dev/null
+++ b/core/java/android/service/games/CreateGameSessionResult.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+
+/**
+ * @hide
+ */
+parcelable CreateGameSessionResult;
diff --git a/core/java/android/service/games/CreateGameSessionResult.java b/core/java/android/service/games/CreateGameSessionResult.java
new file mode 100644
index 0000000..8448b0f
--- /dev/null
+++ b/core/java/android/service/games/CreateGameSessionResult.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+
+import android.annotation.Hide;
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.view.SurfaceControlViewHost;
+
+/**
+ * Internal result object that contains the successful creation of a game session.
+ *
+ * @see IGameSessionService#create(CreateGameSessionRequest, GameSessionViewHostConfiguration,
+ * com.android.internal.infra.AndroidFuture)
+ * @hide
+ */
+@Hide
+public final class CreateGameSessionResult implements Parcelable {
+
+ @NonNull
+ public static final Parcelable.Creator<CreateGameSessionResult> CREATOR =
+ new Parcelable.Creator<CreateGameSessionResult>() {
+ @Override
+ public CreateGameSessionResult createFromParcel(Parcel source) {
+ return new CreateGameSessionResult(
+ IGameSession.Stub.asInterface(source.readStrongBinder()),
+ source.readParcelable(
+ SurfaceControlViewHost.SurfacePackage.class.getClassLoader(),
+ SurfaceControlViewHost.SurfacePackage.class));
+ }
+
+ @Override
+ public CreateGameSessionResult[] newArray(int size) {
+ return new CreateGameSessionResult[0];
+ }
+ };
+
+ private final IGameSession mGameSession;
+ private final SurfaceControlViewHost.SurfacePackage mSurfacePackage;
+
+ public CreateGameSessionResult(
+ @NonNull IGameSession gameSession,
+ @NonNull SurfaceControlViewHost.SurfacePackage surfacePackage) {
+ mGameSession = gameSession;
+ mSurfacePackage = surfacePackage;
+ }
+
+ @NonNull
+ public IGameSession getGameSession() {
+ return mGameSession;
+ }
+
+ @NonNull
+ public SurfaceControlViewHost.SurfacePackage getSurfacePackage() {
+ return mSurfacePackage;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeStrongBinder(mGameSession.asBinder());
+ dest.writeParcelable(mSurfacePackage, flags);
+ }
+}
diff --git a/core/java/android/service/games/GameScreenshotResult.java b/core/java/android/service/games/GameScreenshotResult.java
new file mode 100644
index 0000000..ae76e08
--- /dev/null
+++ b/core/java/android/service/games/GameScreenshotResult.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.graphics.Bitmap;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Objects;
+
+/**
+ * Result object for calls to {@link IGameSessionController#takeScreenshot}.
+ *
+ * It includes a status (see {@link #getStatus}) and, if the status is
+ * {@link #GAME_SCREENSHOT_SUCCESS} an {@link android.graphics.Bitmap} result (see {@link
+ * #getBitmap}).
+ *
+ * @hide
+ */
+public final class GameScreenshotResult implements Parcelable {
+
+ /**
+ * The status of a call to {@link IGameSessionController#takeScreenshot} will be represented by
+ * one of these values.
+ *
+ * @hide
+ */
+ @IntDef(flag = false, prefix = {"GAME_SCREENSHOT_"}, value = {
+ GAME_SCREENSHOT_SUCCESS, // 0
+ GAME_SCREENSHOT_ERROR_INTERNAL_ERROR, // 1
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface GameScreenshotStatus {
+ }
+
+ /**
+ * Indicates that the result of a call to {@link IGameSessionController#takeScreenshot} was
+ * successful and an {@link android.graphics.Bitmap} result should be available by calling
+ * {@link #getBitmap}.
+ *
+ * @hide
+ */
+ public static final int GAME_SCREENSHOT_SUCCESS = 0;
+
+ /**
+ * Indicates that the result of a call to {@link IGameSessionController#takeScreenshot} failed
+ * due to an internal error.
+ *
+ * This error may occur if the device is not in a suitable state for a screenshot to be taken
+ * (e.g., the screen is off) or if the game task is not in a suitable state for a screenshot
+ * to be taken (e.g., the task is not visible). To make sure that the device and game are
+ * in a suitable state, the caller can monitor the lifecycle methods for the {@link
+ * GameSession} to make sure that the game task is focused. If the conditions are met, then the
+ * caller may try again immediately.
+ *
+ * @hide
+ */
+ public static final int GAME_SCREENSHOT_ERROR_INTERNAL_ERROR = 1;
+
+ @NonNull
+ public static final Parcelable.Creator<GameScreenshotResult> CREATOR =
+ new Parcelable.Creator<GameScreenshotResult>() {
+ @Override
+ public GameScreenshotResult createFromParcel(Parcel source) {
+ return new GameScreenshotResult(
+ source.readInt(),
+ source.readParcelable(null, Bitmap.class));
+ }
+
+ @Override
+ public GameScreenshotResult[] newArray(int size) {
+ return new GameScreenshotResult[0];
+ }
+ };
+
+ @GameScreenshotStatus
+ private final int mStatus;
+
+ @Nullable
+ private final Bitmap mBitmap;
+
+ /**
+ * Creates a successful {@link GameScreenshotResult} with the provided bitmap.
+ */
+ public static GameScreenshotResult createSuccessResult(@NonNull Bitmap bitmap) {
+ return new GameScreenshotResult(GAME_SCREENSHOT_SUCCESS, bitmap);
+ }
+
+ /**
+ * Creates a failed {@link GameScreenshotResult} with an
+ * {@link #GAME_SCREENSHOT_ERROR_INTERNAL_ERROR} status.
+ */
+ public static GameScreenshotResult createInternalErrorResult() {
+ return new GameScreenshotResult(GAME_SCREENSHOT_ERROR_INTERNAL_ERROR, null);
+ }
+
+ private GameScreenshotResult(@GameScreenshotStatus int status, @Nullable Bitmap bitmap) {
+ this.mStatus = status;
+ this.mBitmap = bitmap;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(mStatus);
+ dest.writeParcelable(mBitmap, flags);
+ }
+
+ @GameScreenshotStatus
+ public int getStatus() {
+ return mStatus;
+ }
+
+ /**
+ * Gets the {@link Bitmap} result from a successful screenshot attempt.
+ *
+ * @return The bitmap.
+ * @throws IllegalStateException if this method is called when {@link #getStatus} does not
+ * return {@link #GAME_SCREENSHOT_SUCCESS}.
+ */
+ @NonNull
+ public Bitmap getBitmap() {
+ if (mBitmap == null) {
+ throw new IllegalStateException("Bitmap not available for failed screenshot result");
+ }
+ return mBitmap;
+ }
+
+ @Override
+ public String toString() {
+ return "GameScreenshotResult{"
+ + "mStatus="
+ + mStatus
+ + ", has bitmap='"
+ + mBitmap != null ? "yes" : "no"
+ + "\'}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+
+ if (!(o instanceof GameScreenshotResult)) {
+ return false;
+ }
+
+ GameScreenshotResult that = (GameScreenshotResult) o;
+ return mStatus == that.mStatus
+ && Objects.equals(mBitmap, that.mBitmap);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mStatus, mBitmap);
+ }
+}
diff --git a/core/java/android/service/games/GameSession.java b/core/java/android/service/games/GameSession.java
index 0ff08c0..cb5c19b 100644
--- a/core/java/android/service/games/GameSession.java
+++ b/core/java/android/service/games/GameSession.java
@@ -16,11 +16,32 @@
package android.service.games;
+import android.annotation.Hide;
+import android.annotation.IntDef;
+import android.annotation.MainThread;
+import android.annotation.NonNull;
import android.annotation.SystemApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.util.Slog;
+import android.view.SurfaceControlViewHost;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.infra.AndroidFuture;
import com.android.internal.util.function.pooled.PooledLambda;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.Executor;
+
/**
* An active game session, providing a facility for the implementation to interact with the game.
*
@@ -28,25 +49,177 @@
* which is then returned when a game session is created via
* {@link GameSessionService#onNewSession(CreateGameSessionRequest)}.
*
+ * This class exposes various lifecycle methods which are guaranteed to be called in the following
+ * fashion:
+ *
+ * {@link #onCreate()}: Will always be the first lifecycle method to be called, once the game
+ * session is created.
+ *
+ * {@link #onGameTaskFocusChanged(boolean)}: Will be called after {@link #onCreate()} with
+ * focused=true when the game task first comes into focus (if it does). If the game task is focused
+ * when the game session is created, this method will be called immediately after
+ * {@link #onCreate()} with focused=true. After this method is called with focused=true, it will be
+ * called again with focused=false when the task goes out of focus. If this method is ever called
+ * with focused=true, it is guaranteed to be called again with focused=false before
+ * {@link #onDestroy()} is called. If the game task never comes into focus during the session
+ * lifetime, this method will never be called.
+ *
+ * {@link #onDestroy()}: Will always be called after {@link #onCreate()}. If the game task ever
+ * comes into focus before the game session is destroyed, then this method will be called after one
+ * or more pairs of calls to {@link #onGameTaskFocusChanged(boolean)}.
+ *
* @hide
*/
@SystemApi
public abstract class GameSession {
+ private static final String TAG = "GameSession";
+ private static final boolean DEBUG = false;
final IGameSession mInterface = new IGameSession.Stub() {
@Override
- public void destroy() {
+ public void onDestroyed() {
Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage(
GameSession::doDestroy, GameSession.this));
}
+
+ @Override
+ public void onTaskFocusChanged(boolean focused) {
+ Handler.getMain().executeOrSendMessage(PooledLambda.obtainMessage(
+ GameSession::moveToState, GameSession.this,
+ focused ? LifecycleState.TASK_FOCUSED : LifecycleState.TASK_UNFOCUSED));
+ }
};
- void doCreate() {
- onCreate();
+ /**
+ * @hide
+ */
+ @VisibleForTesting
+ public enum LifecycleState {
+ // Initial state; may transition to CREATED.
+ INITIALIZED,
+ // May transition to TASK_FOCUSED or DESTROYED.
+ CREATED,
+ // May transition to TASK_UNFOCUSED.
+ TASK_FOCUSED,
+ // May transition to TASK_FOCUSED or DESTROYED.
+ TASK_UNFOCUSED,
+ // May not transition once reached.
+ DESTROYED
}
+ private LifecycleState mLifecycleState = LifecycleState.INITIALIZED;
+ private IGameSessionController mGameSessionController;
+ private int mTaskId;
+ private GameSessionRootView mGameSessionRootView;
+ private SurfaceControlViewHost mSurfaceControlViewHost;
+
+ /**
+ * @hide
+ */
+ @VisibleForTesting
+ public void attach(
+ IGameSessionController gameSessionController,
+ int taskId,
+ @NonNull Context context,
+ @NonNull SurfaceControlViewHost surfaceControlViewHost,
+ int widthPx,
+ int heightPx) {
+ mGameSessionController = gameSessionController;
+ mTaskId = taskId;
+ mSurfaceControlViewHost = surfaceControlViewHost;
+ mGameSessionRootView = new GameSessionRootView(context, mSurfaceControlViewHost);
+ surfaceControlViewHost.setView(mGameSessionRootView, widthPx, heightPx);
+ }
+
+ @Hide
+ void doCreate() {
+ moveToState(LifecycleState.CREATED);
+ }
+
+ @Hide
void doDestroy() {
- onDestroy();
+ mSurfaceControlViewHost.release();
+ moveToState(LifecycleState.DESTROYED);
+ }
+
+ /**
+ * @hide
+ */
+ @VisibleForTesting
+ @MainThread
+ public void moveToState(LifecycleState newLifecycleState) {
+ if (DEBUG) {
+ Slog.d(TAG, "moveToState: " + mLifecycleState + " -> " + newLifecycleState);
+ }
+
+ if (Looper.myLooper() != Looper.getMainLooper()) {
+ throw new RuntimeException("moveToState should be used only from the main thread");
+ }
+
+ if (mLifecycleState == newLifecycleState) {
+ // Nothing to do.
+ return;
+ }
+
+ switch (mLifecycleState) {
+ case INITIALIZED:
+ if (newLifecycleState == LifecycleState.CREATED) {
+ onCreate();
+ } else if (newLifecycleState == LifecycleState.DESTROYED) {
+ onCreate();
+ onDestroy();
+ } else {
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring moveToState: INITIALIZED -> " + newLifecycleState);
+ }
+ return;
+ }
+ break;
+ case CREATED:
+ if (newLifecycleState == LifecycleState.TASK_FOCUSED) {
+ onGameTaskFocusChanged(/*focused=*/ true);
+ } else if (newLifecycleState == LifecycleState.DESTROYED) {
+ onDestroy();
+ } else {
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring moveToState: CREATED -> " + newLifecycleState);
+ }
+ return;
+ }
+ break;
+ case TASK_FOCUSED:
+ if (newLifecycleState == LifecycleState.TASK_UNFOCUSED) {
+ onGameTaskFocusChanged(/*focused=*/ false);
+ } else if (newLifecycleState == LifecycleState.DESTROYED) {
+ onGameTaskFocusChanged(/*focused=*/ false);
+ onDestroy();
+ } else {
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring moveToState: TASK_FOCUSED -> " + newLifecycleState);
+ }
+ return;
+ }
+ break;
+ case TASK_UNFOCUSED:
+ if (newLifecycleState == LifecycleState.TASK_FOCUSED) {
+ onGameTaskFocusChanged(/*focused=*/ true);
+ } else if (newLifecycleState == LifecycleState.DESTROYED) {
+ onDestroy();
+ } else {
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring moveToState: TASK_UNFOCUSED -> " + newLifecycleState);
+ }
+ return;
+ }
+ break;
+ case DESTROYED:
+ if (DEBUG) {
+ Slog.d(TAG, "Ignoring moveToState: DESTROYED -> " + newLifecycleState);
+ }
+ return;
+ }
+
+ mLifecycleState = newLifecycleState;
}
/**
@@ -54,12 +227,173 @@
*
* This should be used perform any setup required now that the game session is created.
*/
- public void onCreate() {}
+ public void onCreate() {
+ }
/**
- * Finalizer called when the game session is ending.
+ * Finalizer called when the game session is ending. This method will always be called after a
+ * call to {@link #onCreate()}. If the game task is ever in focus, this method will be called
+ * after one or more pairs of calls to {@link #onGameTaskFocusChanged(boolean)}.
*
* This should be used to perform any cleanup before the game session is destroyed.
*/
- public void onDestroy() {}
+ public void onDestroy() {
+ }
+
+ /**
+ * Called when the game task for this session is or unfocused. The initial call to this method
+ * will always come after a call to {@link #onCreate()} with focused=true (when the game task
+ * first comes into focus after the session is created, or immediately after the session is
+ * created if the game task is already focused).
+ *
+ * This should be used to perform any setup required when the game task comes into focus or any
+ * cleanup that is required when the game task goes out of focus.
+ *
+ * @param focused True if the game task is focused, false if the game task is unfocused.
+ */
+ public void onGameTaskFocusChanged(boolean focused) {}
+
+ /**
+ * Sets the task overlay content to an explicit view. This view is placed directly into the game
+ * session's task overlay view hierarchy. It can itself be a complex view hierarchy. The size
+ * the task overlay view will always match the dimensions of the associated task's window. The
+ * {@code View} may not be cleared once set, but may be replaced by invoking
+ * {@link #setTaskOverlayView(View, ViewGroup.LayoutParams)} again.
+ *
+ * @param view The desired content to display.
+ * @param layoutParams Layout parameters for the view.
+ */
+ public void setTaskOverlayView(
+ @NonNull View view,
+ @NonNull ViewGroup.LayoutParams layoutParams) {
+ mGameSessionRootView.removeAllViews();
+ mGameSessionRootView.addView(view, layoutParams);
+ }
+
+ /**
+ * Root view of the {@link SurfaceControlViewHost} associated with the {@link GameSession}
+ * instance. It is responsible for observing changes in the size of the window and resizing
+ * itself to match.
+ */
+ private static final class GameSessionRootView extends FrameLayout {
+ private final SurfaceControlViewHost mSurfaceControlViewHost;
+
+ GameSessionRootView(@NonNull Context context,
+ SurfaceControlViewHost surfaceControlViewHost) {
+ super(context);
+ mSurfaceControlViewHost = surfaceControlViewHost;
+ }
+
+ @Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+
+ // TODO(b/204504596): Investigate skipping the relayout in cases where the size has
+ // not changed.
+ Rect bounds = newConfig.windowConfiguration.getBounds();
+ mSurfaceControlViewHost.relayout(bounds.width(), bounds.height());
+ }
+ }
+
+ /**
+ * Interface for returning screenshot outcome from calls to {@link #takeScreenshot}.
+ */
+ public interface ScreenshotCallback {
+
+ /**
+ * The status of a failed screenshot attempt provided by {@link #onFailure}.
+ *
+ * @hide
+ */
+ @IntDef(flag = false, prefix = {"ERROR_TAKE_SCREENSHOT_"}, value = {
+ ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR, // 0
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface ScreenshotFailureStatus {
+ }
+
+ /**
+ * An error code indicating that an internal error occurred when attempting to take a
+ * screenshot of the game task. If this code is returned, the caller should verify that the
+ * conditions for taking a screenshot are met (device screen is on and the game task is
+ * visible). To do so, the caller can monitor the lifecycle methods for this session to
+ * make sure that the game task is focused. If the conditions are met, then the caller may
+ * try again immediately.
+ */
+ int ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR = 0;
+
+ /**
+ * Called when taking the screenshot failed.
+ * @param statusCode Indicates the reason for failure.
+ */
+ void onFailure(@ScreenshotFailureStatus int statusCode);
+
+ /**
+ * Called when taking the screenshot succeeded.
+ * @param bitmap The screenshot.
+ */
+ void onSuccess(@NonNull Bitmap bitmap);
+ }
+
+ /**
+ * Takes a screenshot of the associated game. For this call to succeed, the device screen
+ * must be turned on and the game task must be visible.
+ *
+ * If the callback is called with {@link ScreenshotCallback#onSuccess}, the provided {@link
+ * Bitmap} may be used.
+ *
+ * If the callback is called with {@link ScreenshotCallback#onFailure}, the provided status
+ * code should be checked.
+ *
+ * If the status code is {@link ScreenshotCallback#ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR},
+ * then the caller should verify that the conditions for calling this method are met (device
+ * screen is on and the game task is visible). To do so, the caller can monitor the lifecycle
+ * methods for this session to make sure that the game task is focused. If the conditions are
+ * met, then the caller may try again immediately.
+ *
+ * @param executor Executor on which to run the callback.
+ * @param callback The callback invoked when taking screenshot has succeeded
+ * or failed.
+ * @throws IllegalStateException if this method is called prior to {@link #onCreate}.
+ */
+ public void takeScreenshot(@NonNull Executor executor, @NonNull ScreenshotCallback callback) {
+ if (mGameSessionController == null) {
+ throw new IllegalStateException("Can not call before onCreate()");
+ }
+
+ AndroidFuture<GameScreenshotResult> takeScreenshotResult =
+ new AndroidFuture<GameScreenshotResult>().whenCompleteAsync((result, error) -> {
+ handleScreenshotResult(callback, result, error);
+ }, executor);
+
+ try {
+ mGameSessionController.takeScreenshot(mTaskId, takeScreenshotResult);
+ } catch (RemoteException ex) {
+ takeScreenshotResult.completeExceptionally(ex);
+ }
+ }
+
+ private void handleScreenshotResult(
+ @NonNull ScreenshotCallback callback,
+ @NonNull GameScreenshotResult result,
+ @NonNull Throwable error) {
+ if (error != null) {
+ Slog.w(TAG, error.getMessage(), error.getCause());
+ callback.onFailure(
+ ScreenshotCallback.ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR);
+ return;
+ }
+
+ @GameScreenshotResult.GameScreenshotStatus int status = result.getStatus();
+ switch (status) {
+ case GameScreenshotResult.GAME_SCREENSHOT_SUCCESS:
+ callback.onSuccess(result.getBitmap());
+ break;
+ case GameScreenshotResult.GAME_SCREENSHOT_ERROR_INTERNAL_ERROR:
+ Slog.w(TAG, "Error taking screenshot");
+ callback.onFailure(
+ ScreenshotCallback.ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR);
+ break;
+ }
+ }
}
diff --git a/core/java/android/service/games/GameSessionService.java b/core/java/android/service/games/GameSessionService.java
index c1a3eb5..df5bad5 100644
--- a/core/java/android/service/games/GameSessionService.java
+++ b/core/java/android/service/games/GameSessionService.java
@@ -22,8 +22,12 @@
import android.annotation.SystemApi;
import android.app.Service;
import android.content.Intent;
+import android.hardware.display.DisplayManager;
+import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
+import android.view.Display;
+import android.view.SurfaceControlViewHost;
import com.android.internal.infra.AndroidFuture;
import com.android.internal.util.function.pooled.PooledLambda;
@@ -48,8 +52,6 @@
*/
@SystemApi
public abstract class GameSessionService extends Service {
- private static final String TAG = "GameSessionService";
-
/**
* The {@link Intent} action used when binding to the service.
* To be supported, the service must require the
@@ -62,15 +64,28 @@
private final IGameSessionService mInterface = new IGameSessionService.Stub() {
@Override
- public void create(CreateGameSessionRequest createGameSessionRequest,
+ public void create(
+ IGameSessionController gameSessionController,
+ CreateGameSessionRequest createGameSessionRequest,
+ GameSessionViewHostConfiguration gameSessionViewHostConfiguration,
AndroidFuture gameSessionFuture) {
Handler.getMain().post(PooledLambda.obtainRunnable(
GameSessionService::doCreate, GameSessionService.this,
+ gameSessionController,
createGameSessionRequest,
+ gameSessionViewHostConfiguration,
gameSessionFuture));
}
};
+ private DisplayManager mDisplayManager;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mDisplayManager = this.getSystemService(DisplayManager.class);
+ }
+
@Override
@Nullable
public final IBinder onBind(@Nullable Intent intent) {
@@ -85,12 +100,39 @@
return mInterface.asBinder();
}
- private void doCreate(CreateGameSessionRequest createGameSessionRequest,
- AndroidFuture<IBinder> gameSessionFuture) {
+ private void doCreate(
+ IGameSessionController gameSessionController,
+ CreateGameSessionRequest createGameSessionRequest,
+ GameSessionViewHostConfiguration gameSessionViewHostConfiguration,
+ AndroidFuture<CreateGameSessionResult> createGameSessionResultFuture) {
GameSession gameSession = onNewSession(createGameSessionRequest);
Objects.requireNonNull(gameSession);
- gameSessionFuture.complete(gameSession.mInterface.asBinder());
+ Display display = mDisplayManager.getDisplay(gameSessionViewHostConfiguration.mDisplayId);
+ if (display == null) {
+ createGameSessionResultFuture.completeExceptionally(
+ new IllegalStateException("No display found for id: "
+ + gameSessionViewHostConfiguration.mDisplayId));
+ return;
+ }
+
+ IBinder hostToken = new Binder();
+ SurfaceControlViewHost surfaceControlViewHost =
+ new SurfaceControlViewHost(this, display, hostToken);
+
+ gameSession.attach(
+ gameSessionController,
+ createGameSessionRequest.getTaskId(),
+ this,
+ surfaceControlViewHost,
+ gameSessionViewHostConfiguration.mWidthPx,
+ gameSessionViewHostConfiguration.mHeightPx);
+
+ CreateGameSessionResult createGameSessionResult =
+ new CreateGameSessionResult(gameSession.mInterface,
+ surfaceControlViewHost.getSurfacePackage());
+
+ createGameSessionResultFuture.complete(createGameSessionResult);
gameSession.doCreate();
}
diff --git a/core/java/android/service/games/GameSessionViewHostConfiguration.aidl b/core/java/android/service/games/GameSessionViewHostConfiguration.aidl
new file mode 100644
index 0000000..b900b9d
--- /dev/null
+++ b/core/java/android/service/games/GameSessionViewHostConfiguration.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+/**
+ * @hide
+ */
+parcelable GameSessionViewHostConfiguration;
diff --git a/core/java/android/service/games/GameSessionViewHostConfiguration.java b/core/java/android/service/games/GameSessionViewHostConfiguration.java
new file mode 100644
index 0000000..53db0df
--- /dev/null
+++ b/core/java/android/service/games/GameSessionViewHostConfiguration.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+import android.annotation.Hide;
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.Objects;
+
+/**
+ * Represents the configuration of the {@link android.view.SurfaceControlViewHost} used to render
+ * the overlay for a game session.
+ *
+ * @hide
+ */
+@Hide
+public final class GameSessionViewHostConfiguration implements Parcelable {
+
+ @NonNull
+ public static final Creator<GameSessionViewHostConfiguration> CREATOR =
+ new Creator<GameSessionViewHostConfiguration>() {
+ @Override
+ public GameSessionViewHostConfiguration createFromParcel(Parcel source) {
+ return new GameSessionViewHostConfiguration(
+ source.readInt(),
+ source.readInt(),
+ source.readInt());
+ }
+
+ @Override
+ public GameSessionViewHostConfiguration[] newArray(int size) {
+ return new GameSessionViewHostConfiguration[0];
+ }
+ };
+
+ final int mDisplayId;
+ final int mWidthPx;
+ final int mHeightPx;
+
+ public GameSessionViewHostConfiguration(int displayId, int widthPx, int heightPx) {
+ this.mDisplayId = displayId;
+ this.mWidthPx = widthPx;
+ this.mHeightPx = heightPx;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(mDisplayId);
+ dest.writeInt(mWidthPx);
+ dest.writeInt(mHeightPx);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof GameSessionViewHostConfiguration)) return false;
+ GameSessionViewHostConfiguration that = (GameSessionViewHostConfiguration) o;
+ return mDisplayId == that.mDisplayId && mWidthPx == that.mWidthPx
+ && mHeightPx == that.mHeightPx;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mDisplayId, mWidthPx, mHeightPx);
+ }
+
+ @Override
+ public String toString() {
+ return "GameSessionViewHostConfiguration{"
+ + "mDisplayId=" + mDisplayId
+ + ", mWidthPx=" + mWidthPx
+ + ", mHeightPx=" + mHeightPx
+ + '}';
+ }
+}
diff --git a/core/java/android/service/games/IGameSession.aidl b/core/java/android/service/games/IGameSession.aidl
index b2e9f1d..71da630 100644
--- a/core/java/android/service/games/IGameSession.aidl
+++ b/core/java/android/service/games/IGameSession.aidl
@@ -20,5 +20,6 @@
* @hide
*/
oneway interface IGameSession {
- void destroy();
+ void onDestroyed();
+ void onTaskFocusChanged(boolean focused);
}
diff --git a/core/java/android/service/games/IGameSessionController.aidl b/core/java/android/service/games/IGameSessionController.aidl
new file mode 100644
index 0000000..fe1d362
--- /dev/null
+++ b/core/java/android/service/games/IGameSessionController.aidl
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+import com.android.internal.infra.AndroidFuture;
+
+/**
+ * @hide
+ */
+oneway interface IGameSessionController {
+ void takeScreenshot(int taskId, in AndroidFuture gameScreenshotResultFuture);
+}
\ No newline at end of file
diff --git a/core/java/android/service/games/IGameSessionService.aidl b/core/java/android/service/games/IGameSessionService.aidl
index 2a53ea7..37cde56 100644
--- a/core/java/android/service/games/IGameSessionService.aidl
+++ b/core/java/android/service/games/IGameSessionService.aidl
@@ -16,8 +16,10 @@
package android.service.games;
+import android.service.games.IGameSessionController;
import android.service.games.IGameSession;
import android.service.games.CreateGameSessionRequest;
+import android.service.games.GameSessionViewHostConfiguration;
import com.android.internal.infra.AndroidFuture;
@@ -27,6 +29,8 @@
*/
oneway interface IGameSessionService {
void create(
+ in IGameSessionController gameSessionController,
in CreateGameSessionRequest createGameSessionRequest,
- in AndroidFuture /* T=IBinder for IGameSession */ gameSessionFuture);
+ in GameSessionViewHostConfiguration gameSessionViewHostConfiguration,
+ in AndroidFuture /* T=CreateGameSessionResult */ createGameSessionResultFuture);
}
diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java
index 8242f4e..44a8862 100644
--- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java
+++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java
@@ -17,6 +17,7 @@
package android.service.persistentdata;
import android.annotation.IntDef;
+import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
@@ -25,6 +26,8 @@
import android.os.RemoteException;
import android.service.oemlock.OemLockManager;
+import com.android.internal.R;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -50,6 +53,7 @@
@SystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE)
public class PersistentDataBlockManager {
private static final String TAG = PersistentDataBlockManager.class.getSimpleName();
+ private final Context mContext;
private IPersistentDataBlockService sService;
/**
@@ -74,7 +78,10 @@
public @interface FlashLockState {}
/** @hide */
- public PersistentDataBlockManager(IPersistentDataBlockService service) {
+ public PersistentDataBlockManager(
+ Context context,
+ IPersistentDataBlockService service) {
+ mContext = context;
sService = service;
}
@@ -204,4 +211,15 @@
throw e.rethrowFromSystemServer();
}
}
+
+ /**
+ * Returns the package name which can access the persistent data partition.
+ *
+ * @hide
+ */
+ @SystemApi
+ @NonNull
+ public String getPersistentDataPackageName() {
+ return mContext.getString(R.string.config_persistentDataPackageName);
+ }
}
diff --git a/core/java/android/service/security/attestationverification/OWNERS b/core/java/android/service/security/attestationverification/OWNERS
new file mode 100644
index 0000000..12c9978
--- /dev/null
+++ b/core/java/android/service/security/attestationverification/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/base:/core/java/android/security/attestationverification/OWNERS
diff --git a/core/java/android/service/smartspace/SmartspaceService.java b/core/java/android/service/smartspace/SmartspaceService.java
index 7dd85cc..b903fbe 100644
--- a/core/java/android/service/smartspace/SmartspaceService.java
+++ b/core/java/android/service/smartspace/SmartspaceService.java
@@ -245,7 +245,9 @@
public abstract void onDestroySmartspaceSession(@NonNull SmartspaceSessionId sessionId);
private void doDestroy(@NonNull SmartspaceSessionId sessionId) {
- Log.d(TAG, "doDestroy mSessionCallbacks: " + mSessionCallbacks);
+ if (DEBUG) {
+ Log.d(TAG, "doDestroy mSessionCallbacks: " + mSessionCallbacks);
+ }
super.onDestroy();
mSessionCallbacks.remove(sessionId);
onDestroySmartspaceSession(sessionId);
diff --git a/core/java/android/service/trust/ITrustAgentService.aidl b/core/java/android/service/trust/ITrustAgentService.aidl
index 21661db..ec3b857 100644
--- a/core/java/android/service/trust/ITrustAgentService.aidl
+++ b/core/java/android/service/trust/ITrustAgentService.aidl
@@ -25,6 +25,7 @@
*/
interface ITrustAgentService {
oneway void onUnlockAttempt(boolean successful);
+ oneway void onUserRequestedUnlock();
oneway void onUnlockLockout(int timeoutMs);
oneway void onTrustTimeout();
oneway void onDeviceLocked();
diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java
index 22ed1b8..fba61cf 100644
--- a/core/java/android/service/trust/TrustAgentService.java
+++ b/core/java/android/service/trust/TrustAgentService.java
@@ -186,6 +186,7 @@
private static final int MSG_ESCROW_TOKEN_ADDED = 7;
private static final int MSG_ESCROW_TOKEN_STATE_RECEIVED = 8;
private static final int MSG_ESCROW_TOKEN_REMOVED = 9;
+ private static final int MSG_USER_REQUESTED_UNLOCK = 10;
private static final String EXTRA_TOKEN = "token";
private static final String EXTRA_TOKEN_HANDLE = "token_handle";
@@ -219,6 +220,9 @@
case MSG_UNLOCK_ATTEMPT:
onUnlockAttempt(msg.arg1 != 0);
break;
+ case MSG_USER_REQUESTED_UNLOCK:
+ onUserRequestedUnlock();
+ break;
case MSG_UNLOCK_LOCKOUT:
onDeviceUnlockLockout(msg.arg1);
break;
@@ -306,7 +310,7 @@
*
* @see #FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE
*
- * TODO(b/213631672): Hook up call from system server & SystemUI, then un-hide
+ * TODO(b/213631672): Add CTS tests
* @hide
*/
public void onUserRequestedUnlock() {
@@ -665,6 +669,11 @@
}
@Override
+ public void onUserRequestedUnlock() {
+ mHandler.obtainMessage(MSG_USER_REQUESTED_UNLOCK).sendToTarget();
+ }
+
+ @Override
public void onUnlockLockout(int timeoutMs) {
mHandler.obtainMessage(MSG_UNLOCK_LOCKOUT, timeoutMs, 0).sendToTarget();
}
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index bff75a6..dd4355d 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -278,6 +278,7 @@
private Display mDisplay;
private Context mDisplayContext;
private int mDisplayState;
+ private @Surface.Rotation int mDisplayInstallOrientation;
private float mWallpaperDimAmount = 0.05f;
private float mPreviousWallpaperDimAmount = mWallpaperDimAmount;
private float mDefaultDimAmount = mWallpaperDimAmount;
@@ -1122,6 +1123,11 @@
mWindow, mLayout, mWidth, mHeight,
View.VISIBLE, 0, -1, mWinFrames, mMergedConfiguration, mSurfaceControl,
mInsetsState, mTempControls, mSurfaceSize);
+
+ final int transformHint = SurfaceControl.rotationToBufferTransform(
+ (mDisplayInstallOrientation + mDisplay.getRotation()) % 4);
+ mSurfaceControl.setTransformHint(transformHint);
+
if (mSurfaceControl.isValid()) {
if (mBbqSurfaceControl == null) {
mBbqSurfaceControl = new SurfaceControl.Builder()
@@ -1135,9 +1141,9 @@
.build();
updateSurfaceDimming();
}
- // Propagate transform hint from WM so we can use the right hint for the
+ // Propagate transform hint from WM, so we can use the right hint for the
// first frame.
- mBbqSurfaceControl.setTransformHint(mSurfaceControl.getTransformHint());
+ mBbqSurfaceControl.setTransformHint(transformHint);
Surface blastSurface = getOrCreateBLASTSurface(mSurfaceSize.x,
mSurfaceSize.y, mFormat);
// If blastSurface == null that means it hasn't changed since the last
@@ -1377,6 +1383,7 @@
mWallpaperDimAmount = mDefaultDimAmount;
mPreviousWallpaperDimAmount = mWallpaperDimAmount;
mDisplayState = mDisplay.getState();
+ mDisplayInstallOrientation = mDisplay.getInstallOrientation();
if (DEBUG) Log.v(TAG, "onCreate(): " + this);
onCreate(mSurfaceHolder);
@@ -1629,6 +1636,7 @@
return;
}
Surface surface = mSurfaceHolder.getSurface();
+ if (!surface.isValid()) return;
boolean widthIsLarger = mSurfaceSize.x > mSurfaceSize.y;
int smaller = widthIsLarger ? mSurfaceSize.x
: mSurfaceSize.y;
diff --git a/core/java/android/service/wallpapereffectsgeneration/OWNERS b/core/java/android/service/wallpapereffectsgeneration/OWNERS
new file mode 100644
index 0000000..d2d3e2c0
--- /dev/null
+++ b/core/java/android/service/wallpapereffectsgeneration/OWNERS
@@ -0,0 +1,4 @@
+susharon@google.com
+shanh@google.com
+huiwu@google.com
+srazdan@google.com
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java
index 52f1fae..96a1fc6 100644
--- a/core/java/android/util/FeatureFlagUtils.java
+++ b/core/java/android/util/FeatureFlagUtils.java
@@ -81,6 +81,7 @@
DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true");
DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true");
DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "true");
+ DEFAULT_FLAGS.put("settings_search_always_expand", "false");
DEFAULT_FLAGS.put(SETTINGS_APP_LANGUAGE_SELECTION, "false");
DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true");
}
diff --git a/core/java/android/util/SparseDoubleArray.java b/core/java/android/util/SparseDoubleArray.java
index dc93a47..e8d96d8 100644
--- a/core/java/android/util/SparseDoubleArray.java
+++ b/core/java/android/util/SparseDoubleArray.java
@@ -81,9 +81,17 @@
* if no such mapping has been made.
*/
public double get(int key) {
+ return get(key, 0);
+ }
+
+ /**
+ * Gets the double mapped from the specified key, or the specified value
+ * if no such mapping has been made.
+ */
+ public double get(int key, double valueIfKeyNotFound) {
final int index = mValues.indexOfKey(key);
if (index < 0) {
- return 0.0d;
+ return valueIfKeyNotFound;
}
return valueAt(index);
}
@@ -105,7 +113,7 @@
* <p>This differs from {@link #put} because instead of replacing any previous value, it adds
* (in the numerical sense) to it.
*/
- public void add(int key, double summand) {
+ public void incrementValue(int key, double summand) {
final double oldValue = get(key);
put(key, oldValue + summand);
}
@@ -138,6 +146,13 @@
}
/**
+ * Removes all key-value mappings from this SparseDoubleArray.
+ */
+ public void clear() {
+ mValues.clear();
+ }
+
+ /**
* {@inheritDoc}
*
* <p>This implementation composes a string by iterating over its mappings.
diff --git a/core/java/android/util/SparseLongArray.java b/core/java/android/util/SparseLongArray.java
index f2bc0c5..7185972 100644
--- a/core/java/android/util/SparseLongArray.java
+++ b/core/java/android/util/SparseLongArray.java
@@ -164,6 +164,30 @@
}
/**
+ * Adds a mapping from the specified key to the specified value,
+ * <b>adding</b> its value to the previous mapping from the specified key if there
+ * was one.
+ *
+ * <p>This differs from {@link #put} because instead of replacing any previous value, it adds
+ * (in the numerical sense) to it.
+ *
+ * @hide
+ */
+ public void incrementValue(int key, long summand) {
+ int i = ContainerHelpers.binarySearch(mKeys, mSize, key);
+
+ if (i >= 0) {
+ mValues[i] += summand;
+ } else {
+ i = ~i;
+
+ mKeys = GrowingArrayUtils.insert(mKeys, mSize, i, key);
+ mValues = GrowingArrayUtils.insert(mValues, mSize, i, summand);
+ mSize++;
+ }
+ }
+
+ /**
* Returns the number of key-value mappings that this SparseLongArray
* currently stores.
*/
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index 9b8523f..b8eb602 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -779,7 +779,7 @@
+ "time to " + (lastFrameOffset * 0.000001f) + " ms in the past.");
}
frameTimeNanos = startNanos - lastFrameOffset;
- frameData.setFrameTimeNanos(-lastFrameOffset);
+ frameData.setFrameTimeNanos(frameTimeNanos);
}
if (frameTimeNanos < mLastFrameTimeNanos) {
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 70266c1..d6e074f 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -928,6 +928,18 @@
}
/**
+ * Returns the install orientation of the display.
+ * @hide
+ */
+ @Surface.Rotation
+ public int getInstallOrientation() {
+ synchronized (mLock) {
+ updateDisplayInfoLocked();
+ return mDisplayInfo.installOrientation;
+ }
+ }
+
+ /**
* @deprecated use {@link #getRotation}
* @return orientation of this display.
*/
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 678c80a..6917d66 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -318,6 +318,12 @@
@Nullable
public RoundedCorners roundedCorners;
+ /**
+ * Install orientation of the display relative to its natural orientation.
+ */
+ @Surface.Rotation
+ public int installOrientation;
+
public static final @android.annotation.NonNull Creator<DisplayInfo> CREATOR = new Creator<DisplayInfo>() {
@Override
public DisplayInfo createFromParcel(Parcel source) {
@@ -389,7 +395,8 @@
&& brightnessMaximum == other.brightnessMaximum
&& brightnessDefault == other.brightnessDefault
&& Objects.equals(roundedCorners, other.roundedCorners)
- && shouldConstrainMetricsForLauncher == other.shouldConstrainMetricsForLauncher;
+ && shouldConstrainMetricsForLauncher == other.shouldConstrainMetricsForLauncher
+ && installOrientation == other.installOrientation;
}
@Override
@@ -441,6 +448,7 @@
brightnessDefault = other.brightnessDefault;
roundedCorners = other.roundedCorners;
shouldConstrainMetricsForLauncher = other.shouldConstrainMetricsForLauncher;
+ installOrientation = other.installOrientation;
}
public void readFromParcel(Parcel source) {
@@ -498,6 +506,7 @@
userDisabledHdrTypes[i] = source.readInt();
}
shouldConstrainMetricsForLauncher = source.readBoolean();
+ installOrientation = source.readInt();
}
@Override
@@ -553,6 +562,7 @@
dest.writeInt(userDisabledHdrTypes[i]);
}
dest.writeBoolean(shouldConstrainMetricsForLauncher);
+ dest.writeInt(installOrientation);
}
@Override
@@ -809,6 +819,8 @@
sb.append(brightnessDefault);
sb.append(", shouldConstrainMetricsForLauncher ");
sb.append(shouldConstrainMetricsForLauncher);
+ sb.append(", installOrientation ");
+ sb.append(Surface.rotationToString(installOrientation));
sb.append("}");
return sb.toString();
}
diff --git a/core/java/android/view/GestureExclusionTracker.java b/core/java/android/view/GestureExclusionTracker.java
deleted file mode 100644
index fffb323e..0000000
--- a/core/java/android/view/GestureExclusionTracker.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 android.view;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.graphics.Rect;
-
-import com.android.internal.util.Preconditions;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Used by {@link ViewRootImpl} to track system gesture exclusion rects reported by views.
- */
-class GestureExclusionTracker {
- private boolean mGestureExclusionViewsChanged = false;
- private boolean mRootGestureExclusionRectsChanged = false;
- private List<Rect> mRootGestureExclusionRects = Collections.emptyList();
- private List<GestureExclusionViewInfo> mGestureExclusionViewInfos = new ArrayList<>();
- private List<Rect> mGestureExclusionRects = Collections.emptyList();
-
- public void updateRectsForView(@NonNull View view) {
- boolean found = false;
- final Iterator<GestureExclusionViewInfo> i = mGestureExclusionViewInfos.iterator();
- while (i.hasNext()) {
- final GestureExclusionViewInfo info = i.next();
- final View v = info.getView();
- if (v == null || !v.isAttachedToWindow() || !v.isAggregatedVisible()) {
- mGestureExclusionViewsChanged = true;
- i.remove();
- continue;
- }
- if (v == view) {
- found = true;
- info.mDirty = true;
- break;
- }
- }
- if (!found && view.isAttachedToWindow()) {
- mGestureExclusionViewInfos.add(new GestureExclusionViewInfo(view));
- mGestureExclusionViewsChanged = true;
- }
- }
-
- @Nullable
- public List<Rect> computeChangedRects() {
- boolean changed = mRootGestureExclusionRectsChanged;
- final Iterator<GestureExclusionViewInfo> i = mGestureExclusionViewInfos.iterator();
- final List<Rect> rects = new ArrayList<>(mRootGestureExclusionRects);
- while (i.hasNext()) {
- final GestureExclusionViewInfo info = i.next();
- switch (info.update()) {
- case GestureExclusionViewInfo.CHANGED:
- changed = true;
- // Deliberate fall-through
- case GestureExclusionViewInfo.UNCHANGED:
- rects.addAll(info.mExclusionRects);
- break;
- case GestureExclusionViewInfo.GONE:
- mGestureExclusionViewsChanged = true;
- i.remove();
- break;
- }
- }
- if (changed || mGestureExclusionViewsChanged) {
- mGestureExclusionViewsChanged = false;
- mRootGestureExclusionRectsChanged = false;
- if (!mGestureExclusionRects.equals(rects)) {
- mGestureExclusionRects = rects;
- return rects;
- }
- }
- return null;
- }
-
- public void setRootSystemGestureExclusionRects(@NonNull List<Rect> rects) {
- Preconditions.checkNotNull(rects, "rects must not be null");
- mRootGestureExclusionRects = rects;
- mRootGestureExclusionRectsChanged = true;
- }
-
- @NonNull
- public List<Rect> getRootSystemGestureExclusionRects() {
- return mRootGestureExclusionRects;
- }
-
- private static class GestureExclusionViewInfo {
- public static final int CHANGED = 0;
- public static final int UNCHANGED = 1;
- public static final int GONE = 2;
-
- private final WeakReference<View> mView;
- boolean mDirty = true;
- List<Rect> mExclusionRects = Collections.emptyList();
-
- GestureExclusionViewInfo(View view) {
- mView = new WeakReference<>(view);
- }
-
- public View getView() {
- return mView.get();
- }
-
- public int update() {
- final View excludedView = getView();
- if (excludedView == null || !excludedView.isAttachedToWindow()
- || !excludedView.isAggregatedVisible()) return GONE;
- final List<Rect> localRects = excludedView.getSystemGestureExclusionRects();
- final List<Rect> newRects = new ArrayList<>(localRects.size());
- for (Rect src : localRects) {
- Rect mappedRect = new Rect(src);
- ViewParent p = excludedView.getParent();
- if (p != null && p.getChildVisibleRect(excludedView, mappedRect, null)) {
- newRects.add(mappedRect);
- }
- }
-
- if (mExclusionRects.equals(localRects)) return UNCHANGED;
- mExclusionRects = newRects;
- return CHANGED;
- }
- }
-}
diff --git a/core/java/android/view/HandwritingInitiator.java b/core/java/android/view/HandwritingInitiator.java
index 8524ac84..097d1d0 100644
--- a/core/java/android/view/HandwritingInitiator.java
+++ b/core/java/android/view/HandwritingInitiator.java
@@ -19,7 +19,6 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.graphics.Rect;
-import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import com.android.internal.annotations.VisibleForTesting;
@@ -75,11 +74,6 @@
@VisibleForTesting
public WeakReference<View> mConnectedView = null;
- /** The editor bound reported by the connected View. */
- @Nullable
- @VisibleForTesting
- public Rect mEditorBound = null;
-
/**
* When InputConnection restarts for a View, View#onInputConnectionCreatedInternal
* might be called before View#onInputConnectionClosedInternal, so we need to count the input
@@ -174,9 +168,8 @@
* @param view the view that created the current InputConnection.
* @see #onInputConnectionClosed(View)
*/
- public void onInputConnectionCreated(@NonNull View view, @NonNull EditorInfo editorInfo) {
+ public void onInputConnectionCreated(@NonNull View view) {
final View connectedView = getConnectedView();
-// updateEditorBound(editorInfo.getInitialEditorBound());
if (connectedView == view) {
++mConnectionCount;
} else {
@@ -198,33 +191,15 @@
--mConnectionCount;
if (mConnectionCount == 0) {
mConnectedView = null;
- mEditorBound = null;
}
} else {
// Unexpected branch, set mConnectedView to null to avoid further problem.
mConnectedView = null;
- mEditorBound = null;
mConnectionCount = 0;
}
}
/**
- * Notify the HandwritingInitiator that editor bound of the connected view(the view with
- * active InputConnection) has be updated.
- * @param editorBound new the editor bounds of the connected view.
- */
- public void updateEditorBound(@NonNull Rect editorBound) {
- if (mEditorBound == null) {
- mEditorBound = new Rect(editorBound);
- } else {
- mEditorBound.left = editorBound.left;
- mEditorBound.top = editorBound.top;
- mEditorBound.right = editorBound.right;
- mEditorBound.bottom = editorBound.bottom;
- }
- }
-
- /**
* Try to initiate handwriting. For this method to successfully send startHandwriting signal,
* the following 3 conditions should meet:
* a) The stylus movement exceeds the touchSlop.
@@ -240,18 +215,19 @@
return;
}
final View connectedView = getConnectedView();
- if (connectedView == null || mEditorBound == null) {
+ if (connectedView == null) {
return;
}
final ViewParent viewParent = connectedView.getParent();
// Do a final check before startHandwriting.
if (viewParent != null && connectedView.isAttachedToWindow()) {
- final Rect editorBounds = new Rect(mEditorBound);
+ final Rect editorBounds =
+ new Rect(0, 0, connectedView.getWidth(), connectedView.getHeight());
if (viewParent.getChildVisibleRect(connectedView, editorBounds, null)) {
final int roundedInitX = Math.round(mState.mStylusDownX);
final int roundedInitY = Math.round(mState.mStylusDownY);
if (editorBounds.contains(roundedInitX, roundedInitY)) {
- startHandwriting(mConnectedView.get());
+ startHandwriting(connectedView);
}
}
}
@@ -261,7 +237,7 @@
/** For test only. */
@VisibleForTesting
public void startHandwriting(View view) {
- // mImm.startHandwriting(view);
+ mImm.startStylusHandwriting(view);
}
private boolean largerThanTouchSlop(float x1, float y1, float x2, float y2) {
diff --git a/core/java/android/view/IDisplayWindowListener.aidl b/core/java/android/view/IDisplayWindowListener.aidl
index f95d6b3..449e9b3 100644
--- a/core/java/android/view/IDisplayWindowListener.aidl
+++ b/core/java/android/view/IDisplayWindowListener.aidl
@@ -16,8 +16,11 @@
package android.view;
+import android.graphics.Rect;
import android.content.res.Configuration;
+import java.util.List;
+
/**
* Interface to listen for changes to display window-containers.
*
@@ -56,4 +59,9 @@
* Called when the previous fixed rotation on a display is finished.
*/
void onFixedRotationFinished(int displayId);
+
+ /**
+ * Called when the keep clear ares on a display have changed.
+ */
+ void onKeepClearAreasChanged(int displayId, in List<Rect> keepClearAreas);
}
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 2c766bd..fb848ad 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -25,7 +25,6 @@
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.GraphicBuffer;
-import android.graphics.Insets;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
@@ -66,6 +65,7 @@
import android.view.SurfaceControl;
import android.view.displayhash.DisplayHash;
import android.view.displayhash.VerifiedDisplayHash;
+import android.window.IOnFpsCallbackListener;
/**
* System private interface to the window manager.
@@ -484,16 +484,6 @@
void getStableInsets(int displayId, out Rect outInsets);
/**
- * Set the forwarded insets on the display.
- * <p>
- * This is only used in case a virtual display is displayed on another display that has insets,
- * and the bounds of the virtual display is overlapping with the insets from the host display.
- * In that case, the contents on the virtual display won't be placed over the forwarded insets.
- * Only the owner of the display is permitted to set the forwarded insets on it.
- */
- void setForwardedInsets(int displayId, in Insets insets);
-
- /**
* Register shortcut key. Shortcut code is packed as:
* (MetaState << Integer.SIZE) | KeyCode
* @hide
@@ -922,4 +912,28 @@
* reverts to using the default task transition with no spec changes.
*/
void clearTaskTransitionSpec();
+
+ /**
+ * Registers the frame rate per second count callback for one given task ID.
+ * Each callback can only register for receiving FPS callback for one task id until unregister
+ * is called. If there's no task associated with the given task id,
+ * {@link IllegalArgumentException} will be thrown. If a task id destroyed after a callback is
+ * registered, the registered callback will not be unregistered until
+ * {@link unregisterTaskFpsCallback()} is called
+ * @param taskId task id of the task.
+ * @param listener listener to be registered.
+ *
+ * @hide
+ */
+ void registerTaskFpsCallback(in int taskId, in IOnFpsCallbackListener listener);
+
+ /**
+ * Unregisters the frame rate per second count callback which was registered with
+ * {@link #registerTaskFpsCallback(int,TaskFpsCallback)}.
+ *
+ * @param listener listener to be unregistered.
+ *
+ * @hide
+ */
+ void unregisterTaskFpsCallback(in IOnFpsCallbackListener listener);
}
diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl
index 921ce53..6226566 100644
--- a/core/java/android/view/IWindowSession.aidl
+++ b/core/java/android/view/IWindowSession.aidl
@@ -37,6 +37,7 @@
import android.view.SurfaceControl;
import android.view.SurfaceControl.Transaction;
import android.window.ClientWindowFrames;
+import android.window.IOnBackInvokedCallback;
import java.util.List;
@@ -290,6 +291,11 @@
oneway void reportSystemGestureExclusionChanged(IWindow window, in List<Rect> exclusionRects);
/**
+ * Called when the keep-clear areas for this window have changed.
+ */
+ oneway void reportKeepClearAreasChanged(IWindow window, in List<Rect> keepClearRects);
+
+ /**
* Request the server to call setInputWindowInfo on a given Surface, and return
* an input channel where the client can receive input.
*/
@@ -328,4 +334,12 @@
*/
oneway void generateDisplayHash(IWindow window, in Rect boundsInWindow,
in String hashAlgorithm, in RemoteCallback callback);
+
+ /**
+ * Sets the {@link IOnBackInvokedCallback} to be invoked for a window when back is triggered.
+ *
+ * @param window The token for the window to set the callback to.
+ * @param callback The {@link IOnBackInvokedCallback} to set.
+ */
+ oneway void setOnBackInvokedCallback(IWindow window, IOnBackInvokedCallback callback);
}
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index b7f9be7..e751720b 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -1831,13 +1831,15 @@
public float density;
public boolean secure;
public DeviceProductInfo deviceProductInfo;
+ public @Surface.Rotation int installOrientation;
@Override
public String toString() {
return "StaticDisplayInfo{isInternal=" + isInternal
+ ", density=" + density
+ ", secure=" + secure
- + ", deviceProductInfo=" + deviceProductInfo + "}";
+ + ", deviceProductInfo=" + deviceProductInfo
+ + ", installOrientation=" + installOrientation + "}";
}
@Override
@@ -1848,12 +1850,13 @@
return isInternal == that.isInternal
&& density == that.density
&& secure == that.secure
- && Objects.equals(deviceProductInfo, that.deviceProductInfo);
+ && Objects.equals(deviceProductInfo, that.deviceProductInfo)
+ && installOrientation == that.installOrientation;
}
@Override
public int hashCode() {
- return Objects.hash(isInternal, density, secure, deviceProductInfo);
+ return Objects.hash(isInternal, density, secure, deviceProductInfo, installOrientation);
}
}
diff --git a/core/java/android/view/SurfaceControlFpsListener.java b/core/java/android/view/SurfaceControlFpsListener.java
deleted file mode 100644
index 20a511a..0000000
--- a/core/java/android/view/SurfaceControlFpsListener.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view;
-
-import android.annotation.NonNull;
-
-/**
- * Listener for sampling the frames per second for a SurfaceControl and its children.
- * This should only be used by a system component that needs to listen to a SurfaceControl's
- * tree's FPS when it is not actively submitting transactions for that SurfaceControl.
- * Otherwise, ASurfaceTransaction_OnComplete callbacks should be used.
- *
- * @hide
- */
-public abstract class SurfaceControlFpsListener {
- private long mNativeListener;
-
- public SurfaceControlFpsListener() {
- mNativeListener = nativeCreate(this);
- }
-
- protected void destroy() {
- if (mNativeListener == 0) {
- return;
- }
- unregister();
- nativeDestroy(mNativeListener);
- mNativeListener = 0;
- }
-
- @Override
- protected void finalize() throws Throwable {
- try {
- destroy();
- } finally {
- super.finalize();
- }
- }
-
- /**
- * Reports the fps from the registered SurfaceControl
- */
- public abstract void onFpsReported(float fps);
-
- /**
- * Registers the sampling listener for a particular task ID
- */
- public void register(int taskId) {
- if (mNativeListener == 0) {
- return;
- }
-
- nativeRegister(mNativeListener, taskId);
- }
-
- /**
- * Unregisters the sampling listener.
- */
- public void unregister() {
- if (mNativeListener == 0) {
- return;
- }
- nativeUnregister(mNativeListener);
- }
-
- /**
- * Dispatch the collected sample.
- *
- * Called from native code on a binder thread.
- */
- private static void dispatchOnFpsReported(
- @NonNull SurfaceControlFpsListener listener, float fps) {
- listener.onFpsReported(fps);
- }
-
- private static native long nativeCreate(SurfaceControlFpsListener thiz);
- private static native void nativeDestroy(long ptr);
- private static native void nativeRegister(long ptr, int taskId);
- private static native void nativeUnregister(long ptr);
-}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2126fd5..93fdee0 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4734,15 +4734,18 @@
WindowInsetsAnimation.Callback mWindowInsetsAnimationCallback;
/**
- * This lives here since it's only valid for interactive views. This list is null until the
- * first use.
+ * This lives here since it's only valid for interactive views. This list is null
+ * until its first use.
*/
private List<Rect> mSystemGestureExclusionRects = null;
+ private List<Rect> mKeepClearRects = null;
+ private boolean mPreferKeepClear = false;
/**
- * Used to track {@link #mSystemGestureExclusionRects}
+ * Used to track {@link #mSystemGestureExclusionRects} and {@link #mKeepClearRects}
*/
public RenderNode.PositionUpdateListener mPositionUpdateListener;
+ private Runnable mPositionChangedUpdate;
/**
* Allows the application to implement custom scroll capture support.
@@ -6028,6 +6031,9 @@
case R.styleable.View_clipToOutline:
setClipToOutline(a.getBoolean(attr, false));
break;
+ case R.styleable.View_preferKeepClear:
+ setPreferKeepClear(a.getBoolean(attr, false));
+ break;
}
}
@@ -11665,37 +11671,49 @@
} else {
info.mSystemGestureExclusionRects = new ArrayList<>(rects);
}
- if (rects.isEmpty()) {
+
+ updatePositionUpdateListener();
+ postUpdate(this::updateSystemGestureExclusionRects);
+ }
+
+ private void updatePositionUpdateListener() {
+ final ListenerInfo info = getListenerInfo();
+ if (getSystemGestureExclusionRects().isEmpty()
+ && collectPreferKeepClearRects().isEmpty()) {
if (info.mPositionUpdateListener != null) {
mRenderNode.removePositionUpdateListener(info.mPositionUpdateListener);
+ info.mPositionChangedUpdate = null;
}
} else {
if (info.mPositionUpdateListener == null) {
+ info.mPositionChangedUpdate = () -> {
+ updateSystemGestureExclusionRects();
+ updateKeepClearRects();
+ };
info.mPositionUpdateListener = new RenderNode.PositionUpdateListener() {
@Override
public void positionChanged(long n, int l, int t, int r, int b) {
- postUpdateSystemGestureExclusionRects();
+ postUpdate(info.mPositionChangedUpdate);
}
@Override
public void positionLost(long frameNumber) {
- postUpdateSystemGestureExclusionRects();
+ postUpdate(info.mPositionChangedUpdate);
}
};
mRenderNode.addPositionUpdateListener(info.mPositionUpdateListener);
}
}
- postUpdateSystemGestureExclusionRects();
}
/**
* WARNING: this can be called by a hwui worker thread, not just the UI thread!
*/
- void postUpdateSystemGestureExclusionRects() {
+ private void postUpdate(Runnable r) {
// Potentially racey from a background thread. It's ok if it's not perfect.
final Handler h = getHandler();
if (h != null) {
- h.postAtFrontOfQueue(this::updateSystemGestureExclusionRects);
+ h.postAtFrontOfQueue(r);
}
}
@@ -11727,6 +11745,106 @@
}
/**
+ * Set a preference to keep the bounds of this view clear from floating windows above this
+ * view's window. This informs the system that the view is considered a vital area for the
+ * user and that ideally it should not be covered. Setting this is only appropriate for UI
+ * where the user would likely take action to uncover it.
+ * <p>
+ * The system will try to respect this, but when not possible will ignore it.
+ * <p>
+ * @see #setPreferKeepClearRects
+ * @see #isPreferKeepClear
+ * @attr ref android.R.styleable#View_preferKeepClear
+ */
+ public final void setPreferKeepClear(boolean preferKeepClear) {
+ getListenerInfo().mPreferKeepClear = preferKeepClear;
+ updatePositionUpdateListener();
+ postUpdate(this::updateKeepClearRects);
+ }
+
+ /**
+ * Retrieve the preference for this view to be kept clear. This is set either by
+ * {@link #setPreferKeepClear} or via the attribute android.R.styleable#View_preferKeepClear.
+ * <p>
+ * If this is {@code true}, the system will ignore the Rects set by
+ * {@link #setPreferKeepClearRects} and try to keep the whole view clear.
+ * <p>
+ * @see #setPreferKeepClear
+ * @attr ref android.R.styleable#View_preferKeepClear
+ */
+ public final boolean isPreferKeepClear() {
+ return mListenerInfo != null && mListenerInfo.mPreferKeepClear;
+ }
+
+ /**
+ * Set a preference to keep the provided rects clear from floating windows above this
+ * view's window. This informs the system that these rects are considered vital areas for the
+ * user and that ideally they should not be covered. Setting this is only appropriate for UI
+ * where the user would likely take action to uncover it.
+ * <p>
+ * If the whole view is preferred to be clear ({@link #isPreferKeepClear}), the rects set here
+ * will be ignored.
+ * <p>
+ * The system will try to respect this preference, but when not possible will ignore it.
+ * <p>
+ * @see #setPreferKeepClear
+ * @see #getPreferKeepClearRects
+ */
+ public final void setPreferKeepClearRects(@NonNull List<Rect> rects) {
+ final ListenerInfo info = getListenerInfo();
+ if (info.mKeepClearRects != null) {
+ info.mKeepClearRects.clear();
+ info.mKeepClearRects.addAll(rects);
+ } else {
+ info.mKeepClearRects = new ArrayList<>(rects);
+ }
+ updatePositionUpdateListener();
+ postUpdate(this::updateKeepClearRects);
+ }
+
+ /**
+ * @return the list of rects, set by {@link #setPreferKeepClearRects}.
+ *
+ * @see #setPreferKeepClearRects
+ */
+ @NonNull
+ public final List<Rect> getPreferKeepClearRects() {
+ final ListenerInfo info = mListenerInfo;
+ if (info != null && info.mKeepClearRects != null) {
+ return new ArrayList(info.mKeepClearRects);
+ }
+
+ return Collections.emptyList();
+ }
+
+ void updateKeepClearRects() {
+ final AttachInfo ai = mAttachInfo;
+ if (ai != null) {
+ ai.mViewRootImpl.updateKeepClearRectsForView(this);
+ }
+ }
+
+ /**
+ * Retrieve the list of areas within this view's post-layout coordinate space which the
+ * system will try to not cover with other floating elements, like the pip window.
+ */
+ @NonNull
+ List<Rect> collectPreferKeepClearRects() {
+ final ListenerInfo info = mListenerInfo;
+ if (info != null) {
+ final List<Rect> list = new ArrayList();
+ if (info.mPreferKeepClear) {
+ list.add(new Rect(0, 0, getWidth(), getHeight()));
+ } else if (info.mKeepClearRects != null) {
+ list.addAll(info.mKeepClearRects);
+ }
+ return list;
+ }
+
+ return Collections.emptyList();
+ }
+
+ /**
* Compute the view's coordinate within the surface.
*
* <p>Computes the coordinates of this view in its surface. The argument
@@ -15120,7 +15238,11 @@
notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
if (!getSystemGestureExclusionRects().isEmpty()) {
- postUpdateSystemGestureExclusionRects();
+ postUpdate(this::updateSystemGestureExclusionRects);
+ }
+
+ if (!collectPreferKeepClearRects().isEmpty()) {
+ postUpdate(this::updateKeepClearRects);
}
}
}
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index cec8d4c..97b5a31 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -398,6 +398,8 @@
final DisplayManager mDisplayManager;
final String mBasePackageName;
+ private @Surface.Rotation int mDisplayInstallOrientation;
+
final int[] mTmpLocation = new int[2];
final TypedValue mTmpValue = new TypedValue();
@@ -749,7 +751,10 @@
return mImeFocusController;
}
- private final GestureExclusionTracker mGestureExclusionTracker = new GestureExclusionTracker();
+ private final ViewRootRectTracker mGestureExclusionTracker =
+ new ViewRootRectTracker(v -> v.getSystemGestureExclusionRects());
+ private final ViewRootRectTracker mKeepClearRectsTracker =
+ new ViewRootRectTracker(v -> v.collectPreferKeepClearRects());
private IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection;
@@ -1025,6 +1030,7 @@
mView = view;
mAttachInfo.mDisplayState = mDisplay.getState();
+ mDisplayInstallOrientation = mDisplay.getInstallOrientation();
mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
mFallbackEventHandler.setView(view);
mWindowAttributes.copyFrom(attrs);
@@ -4767,7 +4773,7 @@
* the root's view hierarchy.
*/
public void setRootSystemGestureExclusionRects(@NonNull List<Rect> rects) {
- mGestureExclusionTracker.setRootSystemGestureExclusionRects(rects);
+ mGestureExclusionTracker.setRootRects(rects);
mHandler.sendEmptyMessage(MSG_SYSTEM_GESTURE_EXCLUSION_CHANGED);
}
@@ -4777,7 +4783,26 @@
*/
@NonNull
public List<Rect> getRootSystemGestureExclusionRects() {
- return mGestureExclusionTracker.getRootSystemGestureExclusionRects();
+ return mGestureExclusionTracker.getRootRects();
+ }
+
+ /**
+ * Called from View when the position listener is triggered
+ */
+ void updateKeepClearRectsForView(View view) {
+ mKeepClearRectsTracker.updateRectsForView(view);
+ mHandler.sendEmptyMessage(MSG_KEEP_CLEAR_RECTS_CHANGED);
+ }
+
+ void keepClearRectsChanged() {
+ final List<Rect> rectsForWindowManager = mKeepClearRectsTracker.computeChangedRects();
+ if (rectsForWindowManager != null && mView != null) {
+ try {
+ mWindowSession.reportKeepClearAreasChanged(mWindow, rectsForWindowManager);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
}
/**
@@ -5273,6 +5298,7 @@
private static final int MSG_HIDE_INSETS = 35;
private static final int MSG_REQUEST_SCROLL_CAPTURE = 36;
private static final int MSG_WINDOW_TOUCH_MODE_CHANGED = 37;
+ private static final int MSG_KEEP_CLEAR_RECTS_CHANGED = 38;
final class ViewRootHandler extends Handler {
@@ -5341,6 +5367,8 @@
return "MSG_HIDE_INSETS";
case MSG_WINDOW_TOUCH_MODE_CHANGED:
return "MSG_WINDOW_TOUCH_MODE_CHANGED";
+ case MSG_KEEP_CLEAR_RECTS_CHANGED:
+ return "MSG_KEEP_CLEAR_RECTS_CHANGED";
}
return super.getMessageName(message);
}
@@ -5564,7 +5592,10 @@
} break;
case MSG_SYSTEM_GESTURE_EXCLUSION_CHANGED: {
systemGestureExclusionChanged();
- } break;
+ } break;
+ case MSG_KEEP_CLEAR_RECTS_CHANGED: {
+ keepClearRectsChanged();
+ } break;
case MSG_REQUEST_SCROLL_CAPTURE:
handleScrollCaptureRequest((IScrollCaptureResponseListener) msg.obj);
break;
@@ -7909,6 +7940,10 @@
mTmpFrames, mPendingMergedConfiguration, mSurfaceControl, mTempInsets,
mTempControls, mSurfaceSize);
+ final int transformHint = SurfaceControl.rotationToBufferTransform(
+ (mDisplayInstallOrientation + mDisplay.getRotation()) % 4);
+ mSurfaceControl.setTransformHint(transformHint);
+
if (mAttachInfo.mContentCaptureManager != null) {
MainContentCaptureSession mainSession = mAttachInfo.mContentCaptureManager
.getMainContentCaptureSession();
@@ -7927,7 +7962,6 @@
mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);
mAttachInfo.mThreadedRenderer.setBlastBufferQueue(mBlastBufferQueue);
}
- int transformHint = mSurfaceControl.getTransformHint();
if (mPreviousTransformHint != transformHint) {
mPreviousTransformHint = transformHint;
dispatchTransformHintChanged(transformHint);
diff --git a/core/java/android/view/ViewRootRectTracker.java b/core/java/android/view/ViewRootRectTracker.java
new file mode 100644
index 0000000..fd9cc19
--- /dev/null
+++ b/core/java/android/view/ViewRootRectTracker.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.view;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.graphics.Rect;
+
+import com.android.internal.util.Preconditions;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * Abstract class to track a collection of rects reported by the views under the same
+ * {@link ViewRootImpl}.
+ */
+class ViewRootRectTracker {
+ private final Function<View, List<Rect>> mRectCollector;
+ private boolean mViewsChanged = false;
+ private boolean mRootRectsChanged = false;
+ private List<Rect> mRootRects = Collections.emptyList();
+ private List<ViewInfo> mViewInfos = new ArrayList<>();
+ private List<Rect> mRects = Collections.emptyList();
+
+ /**
+ * @param rectCollector given a view returns a list of the rects of interest for this
+ * ViewRootRectTracker
+ */
+ ViewRootRectTracker(Function<View, List<Rect>> rectCollector) {
+ mRectCollector = rectCollector;
+ }
+
+ public void updateRectsForView(@NonNull View view) {
+ boolean found = false;
+ final Iterator<ViewInfo> i = mViewInfos.iterator();
+ while (i.hasNext()) {
+ final ViewInfo info = i.next();
+ final View v = info.getView();
+ if (v == null || !v.isAttachedToWindow() || !v.isAggregatedVisible()) {
+ mViewsChanged = true;
+ i.remove();
+ continue;
+ }
+ if (v == view) {
+ found = true;
+ info.mDirty = true;
+ break;
+ }
+ }
+ if (!found && view.isAttachedToWindow()) {
+ mViewInfos.add(new ViewInfo(view));
+ mViewsChanged = true;
+ }
+ }
+
+ /**
+ * @return all visible rects from all views in the global (root) coordinate system
+ */
+ @Nullable
+ public List<Rect> computeChangedRects() {
+ boolean changed = mRootRectsChanged;
+ final Iterator<ViewInfo> i = mViewInfos.iterator();
+ final List<Rect> rects = new ArrayList<>(mRootRects);
+ while (i.hasNext()) {
+ final ViewInfo info = i.next();
+ switch (info.update()) {
+ case ViewInfo.CHANGED:
+ changed = true;
+ // Deliberate fall-through
+ case ViewInfo.UNCHANGED:
+ rects.addAll(info.mRects);
+ break;
+ case ViewInfo.GONE:
+ mViewsChanged = true;
+ i.remove();
+ break;
+ }
+ }
+ if (changed || mViewsChanged) {
+ mViewsChanged = false;
+ mRootRectsChanged = false;
+ if (!mRects.equals(rects)) {
+ mRects = rects;
+ return rects;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Sets rects defined in the global (root) coordinate system, i.e. not for a specific view.
+ */
+ public void setRootRects(@NonNull List<Rect> rects) {
+ Preconditions.checkNotNull(rects, "rects must not be null");
+ mRootRects = rects;
+ mRootRectsChanged = true;
+ }
+
+ @NonNull
+ public List<Rect> getRootRects() {
+ return mRootRects;
+ }
+
+ @NonNull
+ private List<Rect> getTrackedRectsForView(@NonNull View v) {
+ final List<Rect> rects = mRectCollector.apply(v);
+ return rects == null ? Collections.emptyList() : rects;
+ }
+
+ private class ViewInfo {
+ public static final int CHANGED = 0;
+ public static final int UNCHANGED = 1;
+ public static final int GONE = 2;
+
+ private final WeakReference<View> mView;
+ boolean mDirty = true;
+ List<Rect> mRects = Collections.emptyList();
+
+ ViewInfo(View view) {
+ mView = new WeakReference<>(view);
+ }
+
+ public View getView() {
+ return mView.get();
+ }
+
+ public int update() {
+ final View view = getView();
+ if (view == null || !view.isAttachedToWindow()
+ || !view.isAggregatedVisible()) return GONE;
+ final List<Rect> localRects = getTrackedRectsForView(view);
+ final List<Rect> newRects = new ArrayList<>(localRects.size());
+ for (Rect src : localRects) {
+ Rect mappedRect = new Rect(src);
+ ViewParent p = view.getParent();
+ if (p != null && p.getChildVisibleRect(view, mappedRect, null)) {
+ newRects.add(mappedRect);
+ }
+ }
+
+ if (mRects.equals(localRects)) return UNCHANGED;
+ mRects = newRects;
+ return CHANGED;
+ }
+ }
+}
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 5be3a57..ca7f900 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -118,6 +118,7 @@
import android.view.WindowInsets.Type;
import android.view.WindowInsets.Type.InsetsType;
import android.view.accessibility.AccessibilityNodeInfo;
+import android.window.TaskFpsCallback;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -4858,4 +4859,31 @@
default boolean isTaskSnapshotSupported() {
return false;
}
+
+ /**
+ * Registers the frame rate per second count callback for one given task ID.
+ * Each callback can only register for receiving FPS callback for one task id until unregister
+ * is called. If there's no task associated with the given task id,
+ * {@link IllegalArgumentException} will be thrown. If a task id destroyed after a callback is
+ * registered, the registered callback will not be unregistered until
+ * {@link #unregisterTaskFpsCallback(TaskFpsCallback))} is called
+ * @param taskId task id of the task.
+ * @param callback callback to be registered.
+ *
+ * @hide
+ */
+ @SystemApi
+ default void registerTaskFpsCallback(@IntRange(from = 0) int taskId,
+ @NonNull TaskFpsCallback callback) {}
+
+ /**
+ * Unregisters the frame rate per second count callback which was registered with
+ * {@link #registerTaskFpsCallback(int,TaskFpsCallback)}.
+ *
+ * @param callback callback to be unregistered.
+ *
+ * @hide
+ */
+ @SystemApi
+ default void unregisterTaskFpsCallback(@NonNull TaskFpsCallback callback) {}
}
diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java
index dd80416..c16703ef 100644
--- a/core/java/android/view/WindowManagerImpl.java
+++ b/core/java/android/view/WindowManagerImpl.java
@@ -24,6 +24,7 @@
import static android.window.WindowProviderService.isWindowProviderService;
import android.annotation.CallbackExecutor;
+import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UiContext;
@@ -37,6 +38,7 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.StrictMode;
+import android.window.TaskFpsCallback;
import android.window.WindowContext;
import android.window.WindowProvider;
@@ -419,4 +421,22 @@
}
return false;
}
+
+ @Override
+ public void registerTaskFpsCallback(@IntRange(from = 0) int taskId, TaskFpsCallback callback) {
+ try {
+ WindowManagerGlobal.getWindowManagerService().registerTaskFpsCallback(
+ taskId, callback.getListener());
+ } catch (RemoteException e) {
+ }
+ }
+
+ @Override
+ public void unregisterTaskFpsCallback(TaskFpsCallback callback) {
+ try {
+ WindowManagerGlobal.getWindowManagerService().unregisterTaskFpsCallback(
+ callback.getListener());
+ } catch (RemoteException e) {
+ }
+ }
}
diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java
index 5176f9b..998498b 100644
--- a/core/java/android/view/WindowlessWindowManager.java
+++ b/core/java/android/view/WindowlessWindowManager.java
@@ -28,6 +28,7 @@
import android.util.Log;
import android.util.MergedConfiguration;
import android.window.ClientWindowFrames;
+import android.window.IOnBackInvokedCallback;
import java.util.HashMap;
import java.util.Objects;
@@ -459,6 +460,11 @@
}
@Override
+ public void reportKeepClearAreasChanged(android.view.IWindow window,
+ java.util.List<android.graphics.Rect> exclusionRects) {
+ }
+
+ @Override
public void grantInputChannel(int displayId, SurfaceControl surface, IWindow window,
IBinder hostInputToken, int flags, int privateFlags, int type,
InputChannel outInputChannel) {
@@ -496,6 +502,10 @@
}
@Override
+ public void setOnBackInvokedCallback(IWindow iWindow,
+ IOnBackInvokedCallback iOnBackInvokedCallback) throws RemoteException { }
+
+ @Override
public boolean dropForAccessibility(IWindow window, int x, int y) {
return false;
}
diff --git a/core/java/android/view/accessibility/CaptioningManager.java b/core/java/android/view/accessibility/CaptioningManager.java
index 05c74f2..4f9781b 100644
--- a/core/java/android/view/accessibility/CaptioningManager.java
+++ b/core/java/android/view/accessibility/CaptioningManager.java
@@ -254,7 +254,13 @@
* Returns true if system wide call captioning is enabled for this device.
*/
public boolean isCallCaptioningEnabled() {
- return mResources.getBoolean(R.bool.config_systemCaptionsServiceCallsEnabled);
+ try {
+ return mResources.getBoolean(
+ R.bool.config_systemCaptionsServiceCallsEnabled);
+ } catch (Resources.NotFoundException e) {
+ // The resource may not be defined, return false in that case
+ return false;
+ }
}
private void notifyEnabledChanged() {
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 6fc246e..6a22023 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -2139,7 +2139,7 @@
view.onInputConnectionOpenedInternal(ic, tba, icHandler);
final ViewRootImpl viewRoot = view.getViewRootImpl();
if (viewRoot != null) {
- viewRoot.getHandwritingInitiator().onInputConnectionCreated(view, tba);
+ viewRoot.getHandwritingInitiator().onInputConnectionCreated(view);
}
}
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index ac28c31..dd70d69 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -17,6 +17,7 @@
package android.widget;
import static android.view.ContentInfo.SOURCE_DRAG_AND_DROP;
+import static android.widget.TextView.ACCESSIBILITY_ACTION_SMART_START_ID;
import android.R;
import android.animation.ValueAnimator;
@@ -84,6 +85,7 @@
import android.util.ArraySet;
import android.util.DisplayMetrics;
import android.util.Log;
+import android.util.Pair;
import android.util.SparseArray;
import android.util.TypedValue;
import android.view.ActionMode;
@@ -112,6 +114,7 @@
import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.animation.LinearInterpolator;
import android.view.inputmethod.CorrectionInfo;
import android.view.inputmethod.CursorAnchorInfo;
@@ -449,11 +452,14 @@
private int mLineChangeSlopMax;
private int mLineChangeSlopMin;
+ private final AccessibilitySmartActions mA11ySmartActions;
+
Editor(TextView textView) {
mTextView = textView;
// Synchronize the filter list, which places the undo input filter at the end.
mTextView.setFilters(mTextView.getFilters());
mProcessTextIntentActionsHandler = new ProcessTextIntentActionsHandler(this);
+ mA11ySmartActions = new AccessibilitySmartActions(mTextView);
mHapticTextHandleEnabled = mTextView.getContext().getResources().getBoolean(
com.android.internal.R.bool.config_enableHapticTextHandle);
@@ -4381,6 +4387,7 @@
item.setShowAsAction(showAsAction);
mAssistClickHandlers.put(item,
TextClassification.createIntentOnClickListener(action.getActionIntent()));
+ mA11ySmartActions.addAction(action);
return item;
}
@@ -4394,6 +4401,7 @@
}
i++;
}
+ mA11ySmartActions.reset();
}
private boolean hasLegacyAssistItem(TextClassification classification) {
@@ -7656,7 +7664,7 @@
private final PackageManager mPackageManager;
private final String mPackageName;
private final SparseArray<Intent> mAccessibilityIntents = new SparseArray<>();
- private final SparseArray<AccessibilityNodeInfo.AccessibilityAction> mAccessibilityActions =
+ private final SparseArray<AccessibilityAction> mAccessibilityActions =
new SparseArray<>();
private final List<ResolveInfo> mSupportedActivities = new ArrayList<>();
@@ -7706,8 +7714,7 @@
int actionId = TextView.ACCESSIBILITY_ACTION_PROCESS_TEXT_START_ID + i++;
mAccessibilityActions.put(
actionId,
- new AccessibilityNodeInfo.AccessibilityAction(
- actionId, getLabel(resolveInfo)));
+ new AccessibilityAction(actionId, getLabel(resolveInfo)));
mAccessibilityIntents.put(
actionId, createProcessTextIntentForResolveInfo(resolveInfo));
}
@@ -7786,6 +7793,65 @@
}
}
+ /**
+ * Accessibility helper for "smart" (i.e. textAssist) actions.
+ * Helps ensure that "smart" actions are shown in the accessibility menu.
+ * NOTE that these actions are only available when an action mode is live.
+ *
+ * @hide
+ */
+ private static final class AccessibilitySmartActions {
+
+ private final TextView mTextView;
+ private final SparseArray<Pair<AccessibilityAction, RemoteAction>> mActions =
+ new SparseArray<>();
+
+ private AccessibilitySmartActions(TextView textView) {
+ mTextView = Objects.requireNonNull(textView);
+ }
+
+ private void addAction(RemoteAction action) {
+ final int actionId = ACCESSIBILITY_ACTION_SMART_START_ID + mActions.size();
+ mActions.put(actionId,
+ new Pair(new AccessibilityAction(actionId, action.getTitle()), action));
+ }
+
+ private void reset() {
+ mActions.clear();
+ }
+
+ void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo nodeInfo) {
+ for (int i = 0; i < mActions.size(); i++) {
+ nodeInfo.addAction(mActions.valueAt(i).first);
+ }
+ }
+
+ boolean performAccessibilityAction(int actionId) {
+ final Pair<AccessibilityAction, RemoteAction> pair = mActions.get(actionId);
+ if (pair != null) {
+ TextClassification.createIntentOnClickListener(pair.second.getActionIntent())
+ .onClick(mTextView);
+ return true;
+ }
+ return false;
+ }
+ }
+
+ /**
+ * Initializes the nodeInfo with smart actions.
+ */
+ void onInitializeSmartActionsAccessibilityNodeInfo(AccessibilityNodeInfo nodeInfo) {
+ mA11ySmartActions.onInitializeAccessibilityNodeInfo(nodeInfo);
+ }
+
+ /**
+ * Handles the accessibility action if it is an active smart action.
+ * Return false if this method does not hanle the action.
+ */
+ boolean performSmartActionsAccessibilityAction(int actionId) {
+ return mA11ySmartActions.performAccessibilityAction(actionId);
+ }
+
static void logCursor(String location, @Nullable String msgFormat, Object ... msgArgs) {
if (msgFormat == null) {
Log.d(TAG, location);
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 0fe06be..7161730 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -442,6 +442,9 @@
// Accessibility action start id for "process text" actions.
static final int ACCESSIBILITY_ACTION_PROCESS_TEXT_START_ID = 0x10000100;
+ /** Accessibility action start id for "smart" actions. @hide */
+ static final int ACCESSIBILITY_ACTION_SMART_START_ID = 0x10001000;
+
/**
* @hide
*/
@@ -12223,6 +12226,7 @@
}
if (canProcessText()) { // also implies mEditor is not null.
mEditor.mProcessTextIntentActionsHandler.onInitializeAccessibilityNodeInfo(info);
+ mEditor.onInitializeSmartActionsAccessibilityNodeInfo(info);
}
}
@@ -12426,9 +12430,11 @@
*/
@Override
public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
- if (mEditor != null
- && mEditor.mProcessTextIntentActionsHandler.performAccessibilityAction(action)) {
- return true;
+ if (mEditor != null) {
+ if (mEditor.mProcessTextIntentActionsHandler.performAccessibilityAction(action)
+ || mEditor.performSmartActionsAccessibilityAction(action)) {
+ return true;
+ }
}
switch (action) {
case AccessibilityNodeInfo.ACTION_CLICK: {
diff --git a/core/java/android/window/BackNavigationInfo.aidl b/core/java/android/window/BackNavigationInfo.aidl
new file mode 100644
index 0000000..1529902
--- /dev/null
+++ b/core/java/android/window/BackNavigationInfo.aidl
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+/**
+ * @hide
+ */
+parcelable BackNavigationInfo;
\ No newline at end of file
diff --git a/core/java/android/window/BackNavigationInfo.java b/core/java/android/window/BackNavigationInfo.java
new file mode 100644
index 0000000..571714c
--- /dev/null
+++ b/core/java/android/window/BackNavigationInfo.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+import static java.util.Objects.requireNonNull;
+
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.WindowConfiguration;
+import android.hardware.HardwareBuffer;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteCallback;
+import android.view.SurfaceControl;
+
+/**
+ * Information to be sent to SysUI about a back event.
+ *
+ * @hide
+ */
+public final class BackNavigationInfo implements Parcelable {
+
+ /**
+ * The target of the back navigation is undefined.
+ */
+ public static final int TYPE_UNDEFINED = -1;
+
+ /**
+ * Navigating back will close the currently visible dialog
+ */
+ public static final int TYPE_DIALOG_CLOSE = 0;
+
+ /**
+ * Navigating back will bring the user back to the home screen
+ */
+ public static final int TYPE_RETURN_TO_HOME = 1;
+
+ /**
+ * Navigating back will bring the user to the previous activity in the same Task
+ */
+ public static final int TYPE_CROSS_ACTIVITY = 2;
+
+ /**
+ * Navigating back will bring the user to the previous activity in the previous Task
+ */
+ public static final int TYPE_CROSS_TASK = 3;
+
+ /**
+ * Defines the type of back destinations a back even can lead to. This is used to define the
+ * type of animation that need to be run on SystemUI.
+ */
+ @IntDef(prefix = "TYPE_", value = {
+ TYPE_UNDEFINED,
+ TYPE_DIALOG_CLOSE,
+ TYPE_RETURN_TO_HOME,
+ TYPE_CROSS_ACTIVITY,
+ TYPE_CROSS_TASK})
+ @interface BackTargetType {
+ }
+
+ private final int mType;
+ @Nullable
+ private final SurfaceControl mDepartingWindowContainer;
+ @Nullable
+ private final SurfaceControl mScreenshotSurface;
+ @Nullable
+ private final HardwareBuffer mScreenshotBuffer;
+ @Nullable
+ private final RemoteCallback mRemoteCallback;
+ @Nullable
+ private final WindowConfiguration mTaskWindowConfiguration;
+
+ /**
+ * Create a new {@link BackNavigationInfo} instance.
+ *
+ * @param type The {@link BackTargetType} of the destination (what will be displayed after
+ * the back action)
+ * @param topWindowLeash The leash to animate away the current topWindow. The consumer
+ * of the leash is responsible for removing it.
+ * @param screenshotSurface The screenshot of the previous activity to be displayed.
+ * @param screenshotBuffer A buffer containing a screenshot used to display the activity.
+ * See {@link #getScreenshotHardwareBuffer()} for information
+ * about nullity.
+ * @param taskWindowConfiguration The window configuration of the Task being animated
+ * beneath.
+ * @param onBackNavigationDone The callback to be called once the client is done with the back
+ * preview.
+ */
+ public BackNavigationInfo(@BackTargetType int type,
+ @Nullable SurfaceControl topWindowLeash,
+ @Nullable SurfaceControl screenshotSurface,
+ @Nullable HardwareBuffer screenshotBuffer,
+ @Nullable WindowConfiguration taskWindowConfiguration,
+ @NonNull RemoteCallback onBackNavigationDone) {
+ mType = type;
+ mDepartingWindowContainer = topWindowLeash;
+ mScreenshotSurface = screenshotSurface;
+ mScreenshotBuffer = screenshotBuffer;
+ mTaskWindowConfiguration = taskWindowConfiguration;
+ mRemoteCallback = onBackNavigationDone;
+ }
+
+ private BackNavigationInfo(@NonNull Parcel in) {
+ mType = in.readInt();
+ mDepartingWindowContainer = in.readTypedObject(SurfaceControl.CREATOR);
+ mScreenshotSurface = in.readTypedObject(SurfaceControl.CREATOR);
+ mScreenshotBuffer = in.readTypedObject(HardwareBuffer.CREATOR);
+ mTaskWindowConfiguration = in.readTypedObject(WindowConfiguration.CREATOR);
+ mRemoteCallback = requireNonNull(in.readTypedObject(RemoteCallback.CREATOR));
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(mType);
+ dest.writeTypedObject(mDepartingWindowContainer, flags);
+ dest.writeTypedObject(mScreenshotSurface, flags);
+ dest.writeTypedObject(mScreenshotBuffer, flags);
+ dest.writeTypedObject(mTaskWindowConfiguration, flags);
+ dest.writeTypedObject(mRemoteCallback, flags);
+ }
+
+ /**
+ * Returns the type of back navigation that is about to happen.
+ * @see BackTargetType
+ */
+ public @BackTargetType int getType() {
+ return mType;
+ }
+
+ /**
+ * Returns a leash to the top window container that needs to be animated. This can be null if
+ * the back animation is controlled by the application.
+ */
+ @Nullable
+ public SurfaceControl getDepartingWindowContainer() {
+ return mDepartingWindowContainer;
+ }
+
+ /**
+ * Returns the {@link SurfaceControl} that should be used to display a screenshot of the
+ * previous activity.
+ */
+ @Nullable
+ public SurfaceControl getScreenshotSurface() {
+ return mScreenshotSurface;
+ }
+
+ /**
+ * Returns the {@link HardwareBuffer} containing the screenshot the activity about to be
+ * shown. This can be null if one of the following conditions is met:
+ * <ul>
+ * <li>The screenshot is not available
+ * <li> The previous activity is the home screen ( {@link #TYPE_RETURN_TO_HOME}
+ * <li> The current window is a dialog ({@link #TYPE_DIALOG_CLOSE}
+ * <li> The back animation is controlled by the application
+ * </ul>
+ */
+ @Nullable
+ public HardwareBuffer getScreenshotHardwareBuffer() {
+ return mScreenshotBuffer;
+ }
+
+ /**
+ * Returns the {@link WindowConfiguration} of the current task. This is null when the top
+ * application is controlling the back animation.
+ */
+ @Nullable
+ public WindowConfiguration getTaskWindowConfiguration() {
+ return mTaskWindowConfiguration;
+ }
+
+ /**
+ * Callback to be called when the back preview is finished in order to notify the server that
+ * it can clean up the resources created for the animation.
+ */
+ public void onBackNavigationFinished() {
+ mRemoteCallback.sendResult(null);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ public static final Creator<BackNavigationInfo> CREATOR = new Creator<BackNavigationInfo>() {
+ @Override
+ public BackNavigationInfo createFromParcel(Parcel in) {
+ return new BackNavigationInfo(in);
+ }
+
+ @Override
+ public BackNavigationInfo[] newArray(int size) {
+ return new BackNavigationInfo[size];
+ }
+ };
+
+ @Override
+ public String toString() {
+ return "BackNavigationInfo{"
+ + "mType=" + typeToString(mType) + " (" + mType + ")"
+ + ", mDepartingWindowContainer=" + mDepartingWindowContainer
+ + ", mScreenshotSurface=" + mScreenshotSurface
+ + ", mTaskWindowConfiguration= " + mTaskWindowConfiguration
+ + ", mScreenshotBuffer=" + mScreenshotBuffer
+ + ", mRemoteCallback=" + mRemoteCallback
+ + '}';
+ }
+
+ /**
+ * Translates the {@link BackNavigationInfo} integer type to its String representation
+ */
+ public static String typeToString(@BackTargetType int type) {
+ switch (type) {
+ case TYPE_UNDEFINED:
+ return "TYPE_UNDEFINED";
+ case TYPE_DIALOG_CLOSE:
+ return "TYPE_DIALOG_CLOSE";
+ case TYPE_RETURN_TO_HOME:
+ return "TYPE_RETURN_TO_HOME";
+ case TYPE_CROSS_ACTIVITY:
+ return "TYPE_CROSS_ACTIVITY";
+ case TYPE_CROSS_TASK:
+ return "TYPE_CROSS_TASK";
+ }
+ return String.valueOf(type);
+ }
+}
diff --git a/core/java/android/window/IOnBackInvokedCallback.aidl b/core/java/android/window/IOnBackInvokedCallback.aidl
new file mode 100644
index 0000000..a42863c
--- /dev/null
+++ b/core/java/android/window/IOnBackInvokedCallback.aidl
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+/**
+ * Interface that wraps a {@link OnBackInvokedCallback} object, to be stored in window manager
+ * and called from back handling process when back is invoked.
+ *
+ * @hide
+ */
+oneway interface IOnBackInvokedCallback {
+ /**
+ * Called when a back gesture has been started, or back button has been pressed down.
+ * Wraps {@link OnBackInvokedCallback#onBackStarted()}.
+ */
+ void onBackStarted();
+
+ /**
+ * Called on back gesture progress.
+ * Wraps {@link OnBackInvokedCallback#onBackProgressed()}.
+ *
+ * @param touchX Absolute X location of the touch point.
+ * @param touchY Absolute Y location of the touch point.
+ * @param progress Value between 0 and 1 on how far along the back gesture is.
+ */
+ void onBackProgressed(int touchX, int touchY, float progress);
+
+ /**
+ * Called when a back gesture or back button press has been cancelled.
+ * Wraps {@link OnBackInvokedCallback#onBackCancelled()}.
+ */
+ void onBackCancelled();
+
+ /**
+ * Called when a back gesture has been completed and committed, or back button pressed
+ * has been released and committed.
+ * Wraps {@link OnBackInvokedCallback#onBackInvoked()}.
+ */
+ void onBackInvoked();
+}
diff --git a/core/java/android/window/IOnFpsCallbackListener.aidl b/core/java/android/window/IOnFpsCallbackListener.aidl
new file mode 100644
index 0000000..3091df3
--- /dev/null
+++ b/core/java/android/window/IOnFpsCallbackListener.aidl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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.window;
+
+/**
+ * @hide
+ */
+oneway interface IOnFpsCallbackListener {
+
+ /**
+ * Reports the fps from the registered task
+ * @param fps The frame rate per second of the task that has the registered task id
+ * and its children.
+ */
+ void onFpsReported(in float fps);
+}
diff --git a/core/java/android/window/TaskFpsCallback.java b/core/java/android/window/TaskFpsCallback.java
new file mode 100644
index 0000000..a8e01b6
--- /dev/null
+++ b/core/java/android/window/TaskFpsCallback.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+import android.annotation.BinderThread;
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.os.RemoteException;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Callback for sampling the frames per second for a task and its children.
+ * This should only be used by a system component that needs to listen to a task's
+ * tree's FPS when it is not actively submitting transactions for that corresponding SurfaceControl.
+ * Otherwise, ASurfaceTransaction_OnComplete callbacks should be used.
+ *
+ * Each callback can only register for receiving FPS report for one task id until
+ * {@link WindowManager#unregister()} is called.
+ *
+ * @hide
+ */
+@SystemApi
+public final class TaskFpsCallback {
+
+ /**
+ * Listener interface to receive frame per second of a task.
+ */
+ public interface OnFpsCallbackListener {
+ /**
+ * Reports the fps from the registered task
+ * @param fps The frame per second of the task that has the registered task id
+ * and its children.
+ */
+ void onFpsReported(float fps);
+ }
+
+ private final IOnFpsCallbackListener mListener;
+
+ public TaskFpsCallback(@NonNull Executor executor, @NonNull OnFpsCallbackListener listener) {
+ mListener = new IOnFpsCallbackListener.Stub() {
+ @Override
+ public void onFpsReported(float fps) {
+ executor.execute(() -> {
+ listener.onFpsReported(fps);
+ });
+ }
+ };
+ }
+
+ /**
+ * @hide
+ */
+ public IOnFpsCallbackListener getListener() {
+ return mListener;
+ }
+
+ /**
+ * Dispatch the collected sample.
+ *
+ * Called from native code on a binder thread.
+ */
+ @BinderThread
+ private static void dispatchOnFpsReported(
+ @NonNull IOnFpsCallbackListener listener, float fps) {
+ try {
+ listener.onFpsReported(fps);
+ } catch (RemoteException e) {
+ /* ignore */
+ }
+ }
+}
diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java
index 53734eb..2978604 100644
--- a/core/java/android/window/WindowOnBackInvokedDispatcher.java
+++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java
@@ -17,11 +17,19 @@
package android.window;
import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.util.Log;
import android.view.IWindow;
import android.view.IWindowSession;
import android.view.OnBackInvokedCallback;
import android.view.OnBackInvokedDispatcher;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.TreeMap;
+
/**
* Provides window based implementation of {@link OnBackInvokedDispatcher}.
*
@@ -39,6 +47,18 @@
public class WindowOnBackInvokedDispatcher extends OnBackInvokedDispatcher {
private IWindowSession mWindowSession;
private IWindow mWindow;
+ private static final String TAG = "WindowOnBackDispatcher";
+ private static final boolean DEBUG = false;
+
+ /** The currently most prioritized callback. */
+ @Nullable
+ private OnBackInvokedCallbackWrapper mTopCallback;
+
+ /** Convenience hashmap to quickly decide if a callback has been added. */
+ private final HashMap<OnBackInvokedCallback, Integer> mAllCallbacks = new HashMap<>();
+ /** Holds all callbacks by priorities. */
+ private final TreeMap<Integer, ArrayList<OnBackInvokedCallback>>
+ mOnBackInvokedCallbacks = new TreeMap<>();
/**
* Sends the pending top callback (if one exists) to WM when the view root
@@ -47,7 +67,9 @@
public void attachToWindow(@NonNull IWindowSession windowSession, @NonNull IWindow window) {
mWindowSession = windowSession;
mWindow = window;
- // TODO(b/209867448): Send the top callback to WM (if one exists).
+ if (mTopCallback != null) {
+ setTopOnBackInvokedCallback(mTopCallback);
+ }
}
/** Detaches the dispatcher instance from its window. */
@@ -56,20 +78,124 @@
mWindowSession = null;
}
+ // TODO: Take an Executor for the callback to run on.
@Override
public void registerOnBackInvokedCallback(
@NonNull OnBackInvokedCallback callback, @Priority int priority) {
- // TODO(b/209867448): To be implemented.
+ if (!mOnBackInvokedCallbacks.containsKey(priority)) {
+ mOnBackInvokedCallbacks.put(priority, new ArrayList<>());
+ }
+ ArrayList<OnBackInvokedCallback> callbacks = mOnBackInvokedCallbacks.get(priority);
+
+ // If callback has already been added, remove it and re-add it.
+ if (mAllCallbacks.containsKey(callback)) {
+ if (DEBUG) {
+ Log.i(TAG, "Callback already added. Removing and re-adding it.");
+ }
+ Integer prevPriority = mAllCallbacks.get(callback);
+ mOnBackInvokedCallbacks.get(prevPriority).remove(callback);
+ }
+
+ callbacks.add(callback);
+ mAllCallbacks.put(callback, priority);
+ if (mTopCallback == null || (mTopCallback.getCallback() != callback
+ && mAllCallbacks.get(mTopCallback.getCallback()) <= priority)) {
+ setTopOnBackInvokedCallback(new OnBackInvokedCallbackWrapper(callback, priority));
+ }
}
@Override
- public void unregisterOnBackInvokedCallback(
- @NonNull OnBackInvokedCallback callback) {
- // TODO(b/209867448): To be implemented.
+ public void unregisterOnBackInvokedCallback(@NonNull OnBackInvokedCallback callback) {
+ if (!mAllCallbacks.containsKey(callback)) {
+ if (DEBUG) {
+ Log.i(TAG, "Callback not found. returning...");
+ }
+ return;
+ }
+ Integer priority = mAllCallbacks.get(callback);
+ mOnBackInvokedCallbacks.get(priority).remove(callback);
+ mAllCallbacks.remove(callback);
+ if (mTopCallback != null && mTopCallback.getCallback() == callback) {
+ findAndSetTopOnBackInvokedCallback();
+ }
}
/** Clears all registered callbacks on the instance. */
public void clear() {
- // TODO(b/209867448): To be implemented.
+ mAllCallbacks.clear();
+ mTopCallback = null;
+ mOnBackInvokedCallbacks.clear();
+ }
+
+ /**
+ * Iterates through all callbacks to find the most prioritized one and pushes it to
+ * window manager.
+ */
+ private void findAndSetTopOnBackInvokedCallback() {
+ if (mAllCallbacks.isEmpty()) {
+ setTopOnBackInvokedCallback(null);
+ return;
+ }
+
+ for (Integer priority : mOnBackInvokedCallbacks.descendingKeySet()) {
+ ArrayList<OnBackInvokedCallback> callbacks = mOnBackInvokedCallbacks.get(priority);
+ if (!callbacks.isEmpty()) {
+ OnBackInvokedCallbackWrapper callback = new OnBackInvokedCallbackWrapper(
+ callbacks.get(callbacks.size() - 1), priority);
+ setTopOnBackInvokedCallback(callback);
+ return;
+ }
+ }
+ setTopOnBackInvokedCallback(null);
+ }
+
+ // Pushes the top priority callback to window manager.
+ private void setTopOnBackInvokedCallback(@Nullable OnBackInvokedCallbackWrapper callback) {
+ mTopCallback = callback;
+ if (mWindowSession == null || mWindow == null) {
+ return;
+ }
+ try {
+ mWindowSession.setOnBackInvokedCallback(mWindow, mTopCallback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to set OnBackInvokedCallback to WM. Error: " + e);
+ }
+ }
+
+ private class OnBackInvokedCallbackWrapper extends IOnBackInvokedCallback.Stub {
+ private final OnBackInvokedCallback mCallback;
+ private final @Priority int mPriority;
+
+ OnBackInvokedCallbackWrapper(
+ @NonNull OnBackInvokedCallback callback, @Priority int priority) {
+ mCallback = callback;
+ mPriority = priority;
+ }
+
+ @NonNull
+ public OnBackInvokedCallback getCallback() {
+ return mCallback;
+ }
+
+ @Override
+ public void onBackStarted() throws RemoteException {
+ Handler.getMain().post(() -> mCallback.onBackStarted());
+ }
+
+ @Override
+ public void onBackProgressed(int touchX, int touchY, float progress)
+ throws RemoteException {
+ Handler.getMain().post(() -> mCallback.onBackProgressed(touchX, touchY, progress));
+ }
+
+ @Override
+ public void onBackCancelled() throws RemoteException {
+ Handler.getMain().post(() -> mCallback.onBackCancelled());
+ }
+
+ @Override
+ public void onBackInvoked() throws RemoteException {
+ Handler.getMain().post(() -> mCallback.onBackInvoked());
+ }
}
}
diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
index 14fd4c2..40ca9fb 100644
--- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
+++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
@@ -90,6 +90,14 @@
public static final ComponentName ACCESSIBILITY_BUTTON_COMPONENT_NAME =
new ComponentName("com.android.server.accessibility", "AccessibilityButton");
+ public static final ComponentName COLOR_INVERSION_TILE_COMPONENT_NAME =
+ new ComponentName("com.android.server.accessibility", "ColorInversionTile");
+ public static final ComponentName DALTONIZER_TILE_COMPONENT_NAME =
+ new ComponentName("com.android.server.accessibility", "ColorCorrectionTile");
+ public static final ComponentName ONE_HANDED_TILE_COMPONENT_NAME =
+ new ComponentName("com.android.server.accessibility", "OneHandedModeTile");
+ public static final ComponentName REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME =
+ new ComponentName("com.android.server.accessibility", "ReduceBrightColorsTile");
private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
diff --git a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java
index b723db2..4ad232a 100644
--- a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java
@@ -467,8 +467,21 @@
}
protected void showEmptyState(ResolverListAdapter activeListAdapter,
+ @DrawableRes int iconRes, String title, String subtitle) {
+ showEmptyState(activeListAdapter, iconRes, title, subtitle, /* buttonOnClick */ null);
+ }
+
+ protected void showEmptyState(ResolverListAdapter activeListAdapter,
@DrawableRes int iconRes, @StringRes int titleRes, @StringRes int subtitleRes,
View.OnClickListener buttonOnClick) {
+ String title = titleRes == 0 ? null : mContext.getString(titleRes);
+ String subtitle = subtitleRes == 0 ? null : mContext.getString(subtitleRes);
+ showEmptyState(activeListAdapter, iconRes, title, subtitle, buttonOnClick);
+ }
+
+ protected void showEmptyState(ResolverListAdapter activeListAdapter,
+ @DrawableRes int iconRes, String title, String subtitle,
+ View.OnClickListener buttonOnClick) {
ProfileDescriptor descriptor = getItem(
userHandleToPageIndex(activeListAdapter.getUserHandle()));
descriptor.rootView.findViewById(R.id.resolver_list).setVisibility(View.GONE);
@@ -479,15 +492,15 @@
View container = emptyStateView.findViewById(R.id.resolver_empty_state_container);
setupContainerPadding(container);
- TextView title = emptyStateView.findViewById(R.id.resolver_empty_state_title);
- title.setText(titleRes);
+ TextView titleView = emptyStateView.findViewById(R.id.resolver_empty_state_title);
+ titleView.setText(title);
- TextView subtitle = emptyStateView.findViewById(R.id.resolver_empty_state_subtitle);
- if (subtitleRes != 0) {
- subtitle.setVisibility(View.VISIBLE);
- subtitle.setText(subtitleRes);
+ TextView subtitleView = emptyStateView.findViewById(R.id.resolver_empty_state_subtitle);
+ if (subtitle != null) {
+ subtitleView.setVisibility(View.VISIBLE);
+ subtitleView.setText(subtitle);
} else {
- subtitle.setVisibility(View.GONE);
+ subtitleView.setVisibility(View.GONE);
}
Button button = emptyStateView.findViewById(R.id.resolver_empty_state_button);
diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
index 3b6a877..393bff4 100644
--- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
@@ -16,7 +16,17 @@
package com.android.internal.app;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_PERSONAL_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_WORK_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PAUSED_TITLE;
+
import android.annotation.Nullable;
+import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.UserHandle;
import android.view.LayoutInflater;
@@ -184,8 +194,8 @@
View.OnClickListener listener) {
showEmptyState(activeListAdapter,
R.drawable.ic_work_apps_off,
- R.string.resolver_turn_on_work_apps,
- /* subtitleRes */ 0,
+ getWorkAppPausedTitle(),
+ /* subtitle = */ null,
listener);
}
@@ -194,13 +204,13 @@
if (mIsSendAction) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_share_with_work_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantShareWithWorkMessage());
} else {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_access_work_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantAccessWorkMessage());
}
}
@@ -209,13 +219,13 @@
if (mIsSendAction) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_share_with_personal_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantShareWithPersonalMessage());
} else {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_access_personal_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantAccessPersonalMessage());
}
}
@@ -223,8 +233,8 @@
protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
showEmptyState(listAdapter,
R.drawable.ic_no_apps,
- R.string.resolver_no_personal_apps_available,
- /* subtitleRes */ 0);
+ getNoPersonalAppsAvailableMessage(),
+ /* subtitle= */ null);
}
@@ -232,10 +242,65 @@
protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
showEmptyState(listAdapter,
R.drawable.ic_no_apps,
- R.string.resolver_no_work_apps_available,
- /* subtitleRes */ 0);
+ getNoWorkAppsAvailableMessage(),
+ /* subtitle = */ null);
}
+ private String getWorkAppPausedTitle() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_WORK_PAUSED_TITLE,
+ () -> getContext().getString(R.string.resolver_turn_on_work_apps));
+ }
+
+ private String getCrossProfileBlockedTitle() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CROSS_PROFILE_BLOCKED_TITLE,
+ () -> getContext().getString(R.string.resolver_cross_profile_blocked));
+ }
+
+ private String getCantShareWithWorkMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_SHARE_WITH_WORK,
+ () -> getContext().getString(
+ R.string.resolver_cant_share_with_work_apps_explanation));
+ }
+
+ private String getCantShareWithPersonalMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_SHARE_WITH_PERSONAL,
+ () -> getContext().getString(
+ R.string.resolver_cant_share_with_personal_apps_explanation));
+ }
+
+ private String getCantAccessWorkMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_ACCESS_WORK,
+ () -> getContext().getString(
+ R.string.resolver_cant_access_work_apps_explanation));
+ }
+
+ private String getCantAccessPersonalMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_ACCESS_PERSONAL,
+ () -> getContext().getString(
+ R.string.resolver_cant_access_personal_apps_explanation));
+ }
+
+ private String getNoWorkAppsAvailableMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_NO_WORK_APPS,
+ () -> getContext().getString(
+ R.string.resolver_no_work_apps_available));
+ }
+
+ private String getNoPersonalAppsAvailableMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_NO_PERSONAL_APPS,
+ () -> getContext().getString(
+ R.string.resolver_no_personal_apps_available));
+ }
+
+
void setEmptyStateBottomOffset(int bottomOffset) {
mBottomOffset = bottomOffset;
}
diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl
index 587876d..9648008 100644
--- a/core/java/com/android/internal/app/IBatteryStats.aidl
+++ b/core/java/com/android/internal/app/IBatteryStats.aidl
@@ -21,6 +21,7 @@
import android.bluetooth.BluetoothActivityEnergyInfo;
import android.os.BatteryUsageStats;
import android.os.BatteryUsageStatsQuery;
+import android.os.BluetoothBatteryStats;
import android.os.ParcelFileDescriptor;
import android.os.WakeLockStats;
import android.os.WorkSource;
@@ -162,6 +163,10 @@
@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BATTERY_STATS)")
WakeLockStats getWakeLockStats();
+ /** {@hide} */
+ @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BATTERY_STATS)")
+ BluetoothBatteryStats getBluetoothBatteryStats();
+
HealthStatsParceler takeUidSnapshot(int uid);
HealthStatsParceler[] takeUidSnapshots(in int[] uid);
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index 0f37dc5..25b8dba 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -16,13 +16,14 @@
package com.android.internal.app;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK;
import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
import static com.android.internal.app.ResolverActivity.EXTRA_CALLING_USER;
import static com.android.internal.app.ResolverActivity.EXTRA_SELECTED_PROFILE;
import android.annotation.Nullable;
-import android.annotation.StringRes;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.AppGlobals;
@@ -101,16 +102,16 @@
Intent intentReceived = getIntent();
String className = intentReceived.getComponent().getClassName();
final int targetUserId;
- final int userMessageId;
+ final String userMessage;
if (className.equals(FORWARD_INTENT_TO_PARENT)) {
- userMessageId = com.android.internal.R.string.forward_intent_to_owner;
+ userMessage = getForwardToPersonalMessage();
targetUserId = getProfileParent();
getMetricsLogger().write(
new LogMaker(MetricsEvent.ACTION_SWITCH_SHARE_PROFILE)
.setSubtype(MetricsEvent.PARENT_PROFILE));
} else if (className.equals(FORWARD_INTENT_TO_MANAGED_PROFILE)) {
- userMessageId = com.android.internal.R.string.forward_intent_to_work;
+ userMessage = getForwardToWorkMessage();
targetUserId = getManagedProfile();
getMetricsLogger().write(
@@ -118,7 +119,7 @@
.setSubtype(MetricsEvent.MANAGED_PROFILE));
} else {
Slog.wtf(TAG, IntentForwarderActivity.class.getName() + " cannot be called directly");
- userMessageId = -1;
+ userMessage = null;
targetUserId = UserHandle.USER_NULL;
}
if (targetUserId == UserHandle.USER_NULL) {
@@ -156,11 +157,23 @@
return targetResolveInfo;
}, mExecutorService)
.thenAcceptAsync(result -> {
- maybeShowDisclosure(intentReceived, result, userMessageId);
+ maybeShowDisclosure(intentReceived, result, userMessage);
finish();
}, getApplicationContext().getMainExecutor());
}
+ private String getForwardToPersonalMessage() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ FORWARD_INTENT_TO_PERSONAL,
+ () -> getString(com.android.internal.R.string.forward_intent_to_owner));
+ }
+
+ private String getForwardToWorkMessage() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ FORWARD_INTENT_TO_WORK,
+ () -> getString(com.android.internal.R.string.forward_intent_to_work));
+ }
+
private boolean isIntentForwarderResolveInfo(ResolveInfo resolveInfo) {
if (resolveInfo == null) {
return false;
@@ -183,9 +196,9 @@
}
private void maybeShowDisclosure(
- Intent intentReceived, ResolveInfo resolveInfo, int messageId) {
- if (shouldShowDisclosure(resolveInfo, intentReceived)) {
- mInjector.showToast(messageId, Toast.LENGTH_LONG);
+ Intent intentReceived, ResolveInfo resolveInfo, @Nullable String message) {
+ if (shouldShowDisclosure(resolveInfo, intentReceived) && message != null) {
+ mInjector.showToast(message, Toast.LENGTH_LONG);
}
}
@@ -405,8 +418,8 @@
}
@Override
- public void showToast(int messageId, int duration) {
- Toast.makeText(IntentForwarderActivity.this, getString(messageId), duration).show();
+ public void showToast(String message, int duration) {
+ Toast.makeText(IntentForwarderActivity.this, message, duration).show();
}
}
@@ -419,6 +432,6 @@
CompletableFuture<ResolveInfo> resolveActivityAsUser(Intent intent, int flags, int userId);
- void showToast(@StringRes int messageId, int duration);
+ void showToast(String message, int duration);
}
}
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index f9a8c7b..347153c 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -17,6 +17,13 @@
package com.android.internal.app;
import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_PERSONAL_TAB_ACCESSIBILITY;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PROFILE_NOT_SUPPORTED;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_TAB_ACCESSIBILITY;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.PermissionChecker.PID_UNKNOWN;
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
@@ -32,6 +39,7 @@
import android.app.VoiceInteractor.PickOptionRequest.Option;
import android.app.VoiceInteractor.Prompt;
import android.app.admin.DevicePolicyEventLogger;
+import android.app.admin.DevicePolicyManager;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -123,7 +131,7 @@
protected View mProfileView;
private int mLastSelected = AbsListView.INVALID_POSITION;
private boolean mResolvingHome = false;
- private int mProfileSwitchMessageId = -1;
+ private String mProfileSwitchMessage;
private int mLayoutId;
@VisibleForTesting
protected final ArrayList<Intent> mIntents = new ArrayList<>();
@@ -441,7 +449,7 @@
// Determine whether we should show that intent is forwarded
// from managed profile to owner or other way around.
- setProfileSwitchMessageId(intent.getContentUserHint());
+ setProfileSwitchMessage(intent.getContentUserHint());
mLaunchedFromUid = getLaunchedFromUid();
if (mLaunchedFromUid < 0 || UserHandle.isIsolated(mLaunchedFromUid)) {
@@ -674,7 +682,7 @@
}
// Do not show the profile switch message anymore.
- mProfileSwitchMessageId = -1;
+ mProfileSwitchMessage = null;
onTargetSelected(dri, false);
if (!mAwaitingDelegateResponse) {
@@ -828,7 +836,7 @@
}
}
- private void setProfileSwitchMessageId(int contentUserHint) {
+ private void setProfileSwitchMessage(int contentUserHint) {
if (contentUserHint != UserHandle.USER_CURRENT &&
contentUserHint != UserHandle.myUserId()) {
UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -837,13 +845,25 @@
: false;
boolean targetIsManaged = userManager.isManagedProfile();
if (originIsManaged && !targetIsManaged) {
- mProfileSwitchMessageId = com.android.internal.R.string.forward_intent_to_owner;
+ mProfileSwitchMessage = getForwardToPersonalMsg();
} else if (!originIsManaged && targetIsManaged) {
- mProfileSwitchMessageId = com.android.internal.R.string.forward_intent_to_work;
+ mProfileSwitchMessage = getForwardToWorkMsg();
}
}
}
+ private String getForwardToPersonalMsg() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ FORWARD_INTENT_TO_PERSONAL,
+ () -> getString(com.android.internal.R.string.forward_intent_to_owner));
+ }
+
+ private String getForwardToWorkMsg() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ FORWARD_INTENT_TO_WORK,
+ () -> getString(com.android.internal.R.string.forward_intent_to_work));
+ }
+
/**
* Turn on launch mode that is safe to use when forwarding intents received from
* applications and running in system processes. This mode uses Activity.startActivityAsCaller
@@ -1095,9 +1115,9 @@
ResolveInfo ri = mMultiProfilePagerAdapter.getActiveListAdapter()
.resolveInfoForPosition(which, hasIndexBeenFiltered);
if (mResolvingHome && hasManagedProfile() && !supportsManagedProfiles(ri)) {
- Toast.makeText(this, String.format(getResources().getString(
- com.android.internal.R.string.activity_resolver_work_profiles_support),
- ri.activityInfo.loadLabel(getPackageManager()).toString()),
+ Toast.makeText(this,
+ getWorkProfileNotSupportedMsg(
+ ri.activityInfo.loadLabel(getPackageManager()).toString()),
Toast.LENGTH_LONG).show();
return;
}
@@ -1128,6 +1148,15 @@
}
}
+ private String getWorkProfileNotSupportedMsg(String launcherName) {
+ return getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_WORK_PROFILE_NOT_SUPPORTED,
+ () -> getString(
+ com.android.internal.R.string.activity_resolver_work_profiles_support,
+ launcherName),
+ launcherName);
+ }
+
/**
* Replace me in subclasses!
*/
@@ -1394,8 +1423,8 @@
}
// If needed, show that intent is forwarded
// from managed profile to owner or other way around.
- if (mProfileSwitchMessageId != -1) {
- Toast.makeText(this, getString(mProfileSwitchMessageId), Toast.LENGTH_LONG).show();
+ if (mProfileSwitchMessage != null) {
+ Toast.makeText(this, mProfileSwitchMessage, Toast.LENGTH_LONG).show();
}
if (!mSafeForwardingMode) {
if (cti.startAsUser(this, null, user)) {
@@ -1742,12 +1771,12 @@
viewPager.setSaveEnabled(false);
TabHost.TabSpec tabSpec = tabHost.newTabSpec(TAB_TAG_PERSONAL)
.setContent(R.id.profile_pager)
- .setIndicator(getString(R.string.resolver_personal_tab));
+ .setIndicator(getPersonalTabLabel());
tabHost.addTab(tabSpec);
tabSpec = tabHost.newTabSpec(TAB_TAG_WORK)
.setContent(R.id.profile_pager)
- .setIndicator(getString(R.string.resolver_work_tab));
+ .setIndicator(getWorkTabLabel());
tabHost.addTab(tabSpec);
TabWidget tabWidget = tabHost.getTabWidget();
@@ -1799,6 +1828,16 @@
findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE);
}
+ private String getPersonalTabLabel() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_PERSONAL_TAB, () -> getString(R.string.resolver_personal_tab));
+ }
+
+ private String getWorkTabLabel() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_WORK_TAB, () -> getString(R.string.resolver_work_tab));
+ }
+
void onHorizontalSwipeStateChanged(int state) {}
private void maybeHideDivider() {
@@ -1830,8 +1869,6 @@
}
private void resetTabsHeaderStyle(TabWidget tabWidget) {
- String workContentDescription = getString(R.string.resolver_work_tab_accessibility);
- String personalContentDescription = getString(R.string.resolver_personal_tab_accessibility);
for (int i = 0; i < tabWidget.getChildCount(); i++) {
View tabView = tabWidget.getChildAt(i);
TextView title = tabView.findViewById(android.R.id.title);
@@ -1839,14 +1876,26 @@
title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary));
title.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getResources().getDimension(R.dimen.resolver_tab_text_size));
- if (title.getText().equals(getString(R.string.resolver_personal_tab))) {
- tabView.setContentDescription(personalContentDescription);
- } else if (title.getText().equals(getString(R.string.resolver_work_tab))) {
- tabView.setContentDescription(workContentDescription);
+ if (title.getText().equals(getPersonalTabLabel())) {
+ tabView.setContentDescription(getPersonalTabAccessibilityLabel());
+ } else if (title.getText().equals(getWorkTabLabel())) {
+ tabView.setContentDescription(getWorkTabAccessibilityLabel());
}
}
}
+ private String getPersonalTabAccessibilityLabel() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_PERSONAL_TAB_ACCESSIBILITY,
+ () -> getString(R.string.resolver_personal_tab_accessibility));
+ }
+
+ private String getWorkTabAccessibilityLabel() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_WORK_TAB_ACCESSIBILITY,
+ () -> getString(R.string.resolver_work_tab_accessibility));
+ }
+
private static int getAttrColor(Context context, int attr) {
TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
int colorAccent = ta.getColor(0, 0);
diff --git a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
index 622f166..4da59a3 100644
--- a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java
@@ -16,7 +16,15 @@
package com.android.internal.app;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_PERSONAL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_ACCESS_WORK;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_PERSONAL_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_WORK_APPS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PAUSED_TITLE;
+
import android.annotation.Nullable;
+import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.res.Resources;
import android.os.UserHandle;
@@ -196,8 +204,8 @@
View.OnClickListener listener) {
showEmptyState(activeListAdapter,
R.drawable.ic_work_apps_off,
- R.string.resolver_turn_on_work_apps,
- /* subtitleRes */ 0,
+ getWorkAppPausedTitle(),
+ /* subtitle = */ null,
listener);
}
@@ -205,32 +213,72 @@
protected void showNoPersonalToWorkIntentsEmptyState(ResolverListAdapter activeListAdapter) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_access_work_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantAccessWorkMessage());
}
@Override
protected void showNoWorkToPersonalIntentsEmptyState(ResolverListAdapter activeListAdapter) {
showEmptyState(activeListAdapter,
R.drawable.ic_sharing_disabled,
- R.string.resolver_cross_profile_blocked,
- R.string.resolver_cant_access_personal_apps_explanation);
+ getCrossProfileBlockedTitle(),
+ getCantAccessPersonalMessage());
}
@Override
protected void showNoPersonalAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
showEmptyState(listAdapter,
R.drawable.ic_no_apps,
- R.string.resolver_no_personal_apps_available,
- /* subtitleRes */ 0);
+ getNoPersonalAppsAvailableMessage(),
+ /* subtitle = */ null);
}
@Override
protected void showNoWorkAppsAvailableEmptyState(ResolverListAdapter listAdapter) {
showEmptyState(listAdapter,
R.drawable.ic_no_apps,
- R.string.resolver_no_work_apps_available,
- /* subtitleRes */ 0);
+ getNoWorkAppsAvailableMessage(),
+ /* subtitle= */ null);
+ }
+
+ private String getWorkAppPausedTitle() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_WORK_PAUSED_TITLE,
+ () -> getContext().getString(R.string.resolver_turn_on_work_apps));
+ }
+
+ private String getCrossProfileBlockedTitle() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CROSS_PROFILE_BLOCKED_TITLE,
+ () -> getContext().getString(R.string.resolver_cross_profile_blocked));
+ }
+
+ private String getCantAccessWorkMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_ACCESS_WORK,
+ () -> getContext().getString(
+ R.string.resolver_cant_access_work_apps_explanation));
+ }
+
+ private String getCantAccessPersonalMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_CANT_ACCESS_PERSONAL,
+ () -> getContext().getString(
+ R.string.resolver_cant_access_personal_apps_explanation));
+ }
+
+ private String getNoWorkAppsAvailableMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_NO_WORK_APPS,
+ () -> getContext().getString(
+ R.string.resolver_no_work_apps_available));
+ }
+
+ private String getNoPersonalAppsAvailableMessage() {
+ return getContext().getSystemService(DevicePolicyManager.class).getString(
+ RESOLVER_NO_PERSONAL_APPS,
+ () -> getContext().getString(
+ R.string.resolver_no_personal_apps_available));
}
void setUseLayoutWithDefault(boolean useLayoutWithDefault) {
diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
index ca0856238..3531fad 100644
--- a/core/java/com/android/internal/app/UnlaunchableAppActivity.java
+++ b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
@@ -16,11 +16,14 @@
package com.android.internal.app;
+import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.UNLAUNCHABLE_APP_WORK_PAUSED_TITLE;
import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import android.app.Activity;
import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.DialogInterface;
import android.content.Intent;
@@ -70,8 +73,8 @@
String dialogTitle;
String dialogMessage = null;
if (mReason == UNLAUNCHABLE_REASON_QUIET_MODE) {
- dialogTitle = getResources().getString(R.string.work_mode_off_title);
- dialogMessage = getResources().getString(R.string.work_mode_off_message);
+ dialogTitle = getDialogTitle();
+ dialogMessage = getDialogMessage();
} else {
Log.wtf(TAG, "Invalid unlaunchable type: " + mReason);
finish();
@@ -91,6 +94,17 @@
builder.show();
}
+ private String getDialogTitle() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ UNLAUNCHABLE_APP_WORK_PAUSED_TITLE, () -> getString(R.string.work_mode_off_title));
+ }
+
+ private String getDialogMessage() {
+ return getSystemService(DevicePolicyManager.class).getString(
+ UNLAUNCHABLE_APP_WORK_PAUSED_MESSAGE,
+ () -> getString(R.string.work_mode_off_message));
+ }
+
@Override
public void onDismiss(DialogInterface dialog) {
finish();
diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
index 13a39de..0ada13a7 100644
--- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
+++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
@@ -163,6 +163,12 @@
public static final String PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED =
"location_indicators_small_enabled";
+ /**
+ * Whether to show the location indicator for system apps.
+ */
+ public static final String PROPERTY_LOCATION_INDICATORS_SHOW_SYSTEM =
+ "location_indicators_show_system";
+
// Flags related to Assistant
/**
diff --git a/core/java/com/android/internal/midi/MidiFramer.java b/core/java/com/android/internal/midi/MidiFramer.java
index 62517fa..bf23ad1 100644
--- a/core/java/com/android/internal/midi/MidiFramer.java
+++ b/core/java/com/android/internal/midi/MidiFramer.java
@@ -99,6 +99,12 @@
}
} else { // data byte
if (!mInSysEx) {
+ // Hack to avoid crashing if we start parsing in the middle
+ // of a data stream
+ if (mNeeded <= 0) {
+ break;
+ }
+
mBuffer[mCount++] = currentByte;
if (--mNeeded == 0) {
if (mRunningStatus != 0) {
diff --git a/core/java/com/android/internal/midi/OWNERS b/core/java/com/android/internal/midi/OWNERS
new file mode 100644
index 0000000..af273a6
--- /dev/null
+++ b/core/java/com/android/internal/midi/OWNERS
@@ -0,0 +1 @@
+include /services/midi/OWNERS
diff --git a/core/java/com/android/internal/notification/SystemNotificationChannels.java b/core/java/com/android/internal/notification/SystemNotificationChannels.java
index 2f40d3b..3b6f8f6 100644
--- a/core/java/com/android/internal/notification/SystemNotificationChannels.java
+++ b/core/java/com/android/internal/notification/SystemNotificationChannels.java
@@ -14,10 +14,13 @@
package com.android.internal.notification;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_CHANNEL_DEVICE_ADMIN;
+
import android.app.INotificationManager;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
+import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ParceledListSlice;
import android.media.AudioAttributes;
@@ -143,7 +146,7 @@
final NotificationChannel deviceAdmin = new NotificationChannel(
DEVICE_ADMIN,
- context.getString(R.string.notification_channel_device_admin),
+ getDeviceAdminNotificationChannelName(context),
NotificationManager.IMPORTANCE_HIGH);
channelsList.add(deviceAdmin);
@@ -209,6 +212,12 @@
nm.createNotificationChannels(channelsList);
}
+ private static String getDeviceAdminNotificationChannelName(Context context) {
+ DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(NOTIFICATION_CHANNEL_DEVICE_ADMIN,
+ () -> context.getString(R.string.notification_channel_device_admin));
+ }
+
/** Remove notification channels which are no longer used */
public static void removeDeprecated(Context context) {
final NotificationManager nm = context.getSystemService(NotificationManager.class);
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index a4183ca..8213c86 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -45,6 +45,7 @@
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.Binder;
+import android.os.BluetoothBatteryStats;
import android.os.Build;
import android.os.Handler;
import android.os.IBatteryPropertiesRegistrar;
@@ -84,7 +85,6 @@
import android.util.LongSparseArray;
import android.util.LongSparseLongArray;
import android.util.MutableInt;
-import android.util.Pools;
import android.util.PrintWriterPrinter;
import android.util.Printer;
import android.util.Slog;
@@ -137,9 +137,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Queue;
-import java.util.Set;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
@@ -265,6 +263,7 @@
MeasuredEnergyStats.POWER_BUCKET_CPU,
MeasuredEnergyStats.POWER_BUCKET_MOBILE_RADIO,
MeasuredEnergyStats.POWER_BUCKET_WIFI,
+ MeasuredEnergyStats.POWER_BUCKET_BLUETOOTH,
};
// TimeInState counters need NUM_PROCESS_STATE states in order to accommodate
@@ -1198,6 +1197,48 @@
return new WakeLockStats(uidWakeLockStats);
}
+ @Override
+ @GuardedBy("this")
+ public BluetoothBatteryStats getBluetoothBatteryStats() {
+ final long elapsedRealtimeUs = mClock.elapsedRealtime() * 1000;
+ ArrayList<BluetoothBatteryStats.UidStats> uidStats = new ArrayList<>();
+ for (int i = mUidStats.size() - 1; i >= 0; i--) {
+ final Uid uid = mUidStats.valueAt(i);
+ final Timer scanTimer = uid.getBluetoothScanTimer();
+ final long scanTimeMs =
+ scanTimer != null ? scanTimer.getTotalTimeLocked(
+ elapsedRealtimeUs, STATS_SINCE_CHARGED) / 1000 : 0;
+
+ final Timer unoptimizedScanTimer = uid.getBluetoothUnoptimizedScanTimer();
+ final long unoptimizedScanTimeMs =
+ unoptimizedScanTimer != null ? unoptimizedScanTimer.getTotalTimeLocked(
+ elapsedRealtimeUs, STATS_SINCE_CHARGED) / 1000 : 0;
+
+ final Counter scanResultCounter = uid.getBluetoothScanResultCounter();
+ final int scanResultCount =
+ scanResultCounter != null ? scanResultCounter.getCountLocked(
+ STATS_SINCE_CHARGED) : 0;
+
+ final ControllerActivityCounter counter = uid.getBluetoothControllerActivity();
+ final long rxTimeMs = counter != null ? counter.getRxTimeCounter().getCountLocked(
+ STATS_SINCE_CHARGED) : 0;
+ final long txTimeMs = counter != null ? counter.getTxTimeCounters()[0].getCountLocked(
+ STATS_SINCE_CHARGED) : 0;
+
+ if (scanTimeMs != 0 || unoptimizedScanTimeMs != 0 || scanResultCount != 0
+ || rxTimeMs != 0 || txTimeMs != 0) {
+ uidStats.add(new BluetoothBatteryStats.UidStats(uid.getUid(),
+ scanTimeMs,
+ unoptimizedScanTimeMs,
+ scanResultCount,
+ rxTimeMs,
+ txTimeMs));
+ }
+ }
+
+ return new BluetoothBatteryStats(uidStats);
+ }
+
String mLastWakeupReason = null;
long mLastWakeupUptimeMs = 0;
private final HashMap<String, SamplingTimer> mWakeupReasonStats = new HashMap<>();
@@ -8371,6 +8412,11 @@
if (wifiControllerActivity != null) {
wifiControllerActivity.setState(batteryConsumerProcessState, elapsedTimeMs);
}
+ final ControllerActivityCounterImpl bluetoothControllerActivity =
+ getBluetoothControllerActivity();
+ if (bluetoothControllerActivity != null) {
+ bluetoothControllerActivity.setState(batteryConsumerProcessState, elapsedTimeMs);
+ }
final MeasuredEnergyStats energyStats =
getOrCreateMeasuredEnergyStatsIfSupportedLocked();
if (energyStats != null) {
@@ -8718,7 +8764,7 @@
}
@Override
- public ControllerActivityCounter getBluetoothControllerActivity() {
+ public ControllerActivityCounterImpl getBluetoothControllerActivity() {
return mBluetoothControllerActivity;
}
@@ -8839,6 +8885,14 @@
@GuardedBy("mBsi")
@Override
+ public long getBluetoothMeasuredBatteryConsumptionUC(
+ @BatteryConsumer.ProcessState int processState) {
+ return getMeasuredBatteryConsumptionUC(MeasuredEnergyStats.POWER_BUCKET_BLUETOOTH,
+ processState);
+ }
+
+ @GuardedBy("mBsi")
+ @Override
public long getCpuMeasuredBatteryConsumptionUC() {
return getMeasuredBatteryConsumptionUC(MeasuredEnergyStats.POWER_BUCKET_CPU);
}
@@ -11424,6 +11478,13 @@
wifiControllerActivity.setState(batteryConsumerProcessState, elapsedRealtimeMs);
}
+ final ControllerActivityCounterImpl bluetoothControllerActivity =
+ getBluetoothControllerActivity();
+ if (bluetoothControllerActivity != null) {
+ bluetoothControllerActivity.setState(batteryConsumerProcessState,
+ elapsedRealtimeMs);
+ }
+
final MeasuredEnergyStats energyStats =
getOrCreateMeasuredEnergyStatsIfSupportedLocked();
if (energyStats != null) {
@@ -12669,8 +12730,6 @@
}
}
- private final Pools.Pool<NetworkStats> mNetworkStatsPool = new Pools.SynchronizedPool<>(6);
-
private final Object mWifiNetworkLock = new Object();
@GuardedBy("mWifiNetworkLock")
@@ -12688,13 +12747,15 @@
private NetworkStats mLastModemNetworkStats = new NetworkStats(0, -1);
@VisibleForTesting
- protected NetworkStats readNetworkStatsLocked(@NonNull NetworkStatsManager networkStatsManager,
- String[] ifaces) {
- Objects.requireNonNull(networkStatsManager);
- if (!ArrayUtils.isEmpty(ifaces)) {
- return networkStatsManager.getDetailedUidStats(Set.of(ifaces));
- }
- return null;
+ protected NetworkStats readMobileNetworkStatsLocked(
+ @NonNull NetworkStatsManager networkStatsManager) {
+ return networkStatsManager.getMobileUidStats();
+ }
+
+ @VisibleForTesting
+ protected NetworkStats readWifiNetworkStatsLocked(
+ @NonNull NetworkStatsManager networkStatsManager) {
+ return networkStatsManager.getWifiUidStats();
}
/**
@@ -12714,21 +12775,15 @@
// Grab a separate lock to acquire the network stats, which may do I/O.
NetworkStats delta = null;
synchronized (mWifiNetworkLock) {
- final NetworkStats latestStats = readNetworkStatsLocked(networkStatsManager,
- mWifiIfaces);
+ final NetworkStats latestStats = readWifiNetworkStatsLocked(networkStatsManager);
if (latestStats != null) {
- delta = NetworkStats.subtract(latestStats, mLastWifiNetworkStats, null, null,
- mNetworkStatsPool.acquire());
- mNetworkStatsPool.release(mLastWifiNetworkStats);
+ delta = latestStats.subtract(mLastWifiNetworkStats);
mLastWifiNetworkStats = latestStats;
}
}
synchronized (this) {
if (!mOnBatteryInternal || mIgnoreNextExternalStats) {
- if (delta != null) {
- mNetworkStatsPool.release(delta);
- }
if (mIgnoreNextExternalStats) {
// TODO: Strictly speaking, we should re-mark all 5 timers for each uid (and the
// global one) here like we do for display. But I'm not sure it's worth the
@@ -12746,63 +12801,63 @@
SparseLongArray rxPackets = new SparseLongArray();
SparseLongArray txPackets = new SparseLongArray();
+ SparseLongArray rxTimesMs = new SparseLongArray();
+ SparseLongArray txTimesMs = new SparseLongArray();
long totalTxPackets = 0;
long totalRxPackets = 0;
if (delta != null) {
- NetworkStats.Entry entry = new NetworkStats.Entry();
- final int size = delta.size();
- for (int i = 0; i < size; i++) {
- entry = delta.getValues(i, entry);
-
+ for (NetworkStats.Entry entry : delta) {
if (DEBUG_ENERGY) {
- Slog.d(TAG, "Wifi uid " + entry.uid + ": delta rx=" + entry.rxBytes
- + " tx=" + entry.txBytes + " rxPackets=" + entry.rxPackets
- + " txPackets=" + entry.txPackets);
+ Slog.d(TAG, "Wifi uid " + entry.getUid()
+ + ": delta rx=" + entry.getRxBytes()
+ + " tx=" + entry.getTxBytes()
+ + " rxPackets=" + entry.getRxPackets()
+ + " txPackets=" + entry.getTxPackets());
}
- if (entry.rxBytes == 0 && entry.txBytes == 0) {
+ if (entry.getRxBytes() == 0 && entry.getTxBytes() == 0) {
// Skip the lookup below since there is no work to do.
continue;
}
- final int uid = mapUid(entry.uid);
+ final int uid = mapUid(entry.getUid());
final Uid u = getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs);
- if (entry.rxBytes != 0) {
- u.noteNetworkActivityLocked(NETWORK_WIFI_RX_DATA, entry.rxBytes,
- entry.rxPackets);
- if (entry.set == NetworkStats.SET_DEFAULT) { // Background transfers
- u.noteNetworkActivityLocked(NETWORK_WIFI_BG_RX_DATA, entry.rxBytes,
- entry.rxPackets);
+ if (entry.getRxBytes() != 0) {
+ u.noteNetworkActivityLocked(NETWORK_WIFI_RX_DATA, entry.getRxBytes(),
+ entry.getRxPackets());
+ if (entry.getSet() == NetworkStats.SET_DEFAULT) { // Background transfers
+ u.noteNetworkActivityLocked(NETWORK_WIFI_BG_RX_DATA, entry.getRxBytes(),
+ entry.getRxPackets());
}
mNetworkByteActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
- entry.rxBytes);
+ entry.getRxBytes());
mNetworkPacketActivityCounters[NETWORK_WIFI_RX_DATA].addCountLocked(
- entry.rxPackets);
+ entry.getRxPackets());
- add(rxPackets, uid, entry.rxPackets);
+ rxPackets.incrementValue(uid, entry.getRxPackets());
// Sum the total number of packets so that the Rx Power can
// be evenly distributed amongst the apps.
- totalRxPackets += entry.rxPackets;
+ totalRxPackets += entry.getRxPackets();
}
- if (entry.txBytes != 0) {
- u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.txBytes,
- entry.txPackets);
- if (entry.set == NetworkStats.SET_DEFAULT) { // Background transfers
- u.noteNetworkActivityLocked(NETWORK_WIFI_BG_TX_DATA, entry.txBytes,
- entry.txPackets);
+ if (entry.getTxBytes() != 0) {
+ u.noteNetworkActivityLocked(NETWORK_WIFI_TX_DATA, entry.getTxBytes(),
+ entry.getTxPackets());
+ if (entry.getSet() == NetworkStats.SET_DEFAULT) { // Background transfers
+ u.noteNetworkActivityLocked(NETWORK_WIFI_BG_TX_DATA, entry.getTxBytes(),
+ entry.getTxPackets());
}
mNetworkByteActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
- entry.txBytes);
+ entry.getTxBytes());
mNetworkPacketActivityCounters[NETWORK_WIFI_TX_DATA].addCountLocked(
- entry.txPackets);
+ entry.getTxPackets());
- add(txPackets, uid, entry.txPackets);
+ txPackets.incrementValue(uid, entry.getTxPackets());
// Sum the total number of packets so that the Tx Power can
// be evenly distributed amongst the apps.
- totalTxPackets += entry.txPackets;
+ totalTxPackets += entry.getTxPackets();
}
// Calculate consumed energy for this uid. Only do so if WifiReporting isn't
@@ -12828,13 +12883,12 @@
}
}
- uidEstimatedConsumptionMah.add(u.getUid(),
+ uidEstimatedConsumptionMah.incrementValue(u.getUid(),
mWifiPowerCalculator.calcPowerWithoutControllerDataMah(
- entry.rxPackets, entry.txPackets,
+ entry.getRxPackets(), entry.getTxPackets(),
uidRunningMs, uidScanMs, uidBatchScanMs));
}
}
- mNetworkStatsPool.release(delta);
delta = null;
}
@@ -12923,12 +12977,9 @@
+ scanTxTimeSinceMarkMs + " ms)");
}
- ControllerActivityCounterImpl activityCounter =
- uid.getOrCreateWifiControllerActivityLocked();
- activityCounter.getOrCreateRxTimeCounter()
- .increment(scanRxTimeSinceMarkMs, elapsedRealtimeMs);
- activityCounter.getOrCreateTxTimeCounters()[0]
- .increment(scanTxTimeSinceMarkMs, elapsedRealtimeMs);
+ rxTimesMs.incrementValue(uid.getUid(), scanRxTimeSinceMarkMs);
+ txTimesMs.incrementValue(uid.getUid(), scanTxTimeSinceMarkMs);
+
leftOverRxTimeMs -= scanRxTimeSinceMarkMs;
leftOverTxTimeMs -= scanTxTimeSinceMarkMs;
}
@@ -12955,7 +13006,7 @@
if (uidEstimatedConsumptionMah != null) {
double uidEstMah = mWifiPowerCalculator.calcPowerFromControllerDataMah(
scanRxTimeSinceMarkMs, scanTxTimeSinceMarkMs, myIdleTimeMs);
- uidEstimatedConsumptionMah.add(uid.getUid(), uidEstMah);
+ uidEstimatedConsumptionMah.incrementValue(uid.getUid(), uidEstMah);
}
}
@@ -12967,36 +13018,51 @@
// Distribute the remaining Tx power appropriately between all apps that transmitted
// packets.
for (int i = 0; i < txPackets.size(); i++) {
- final Uid uid = getUidStatsLocked(txPackets.keyAt(i),
- elapsedRealtimeMs, uptimeMs);
+ final int uid = txPackets.keyAt(i);
final long myTxTimeMs = (txPackets.valueAt(i) * leftOverTxTimeMs)
/ totalTxPackets;
- if (DEBUG_ENERGY) {
- Slog.d(TAG, " TxTime for UID " + uid.getUid() + ": " + myTxTimeMs + " ms");
- }
- uid.getOrCreateWifiControllerActivityLocked().getOrCreateTxTimeCounters()[0]
- .increment(myTxTimeMs, elapsedRealtimeMs);
- if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(uid.getUid(),
- mWifiPowerCalculator.calcPowerFromControllerDataMah(
- 0, myTxTimeMs, 0));
- }
+ txTimesMs.incrementValue(uid, myTxTimeMs);
}
// Distribute the remaining Rx power appropriately between all apps that received
// packets.
for (int i = 0; i < rxPackets.size(); i++) {
- final Uid uid = getUidStatsLocked(rxPackets.keyAt(i),
- elapsedRealtimeMs, uptimeMs);
+ final int uid = rxPackets.keyAt(i);
final long myRxTimeMs = (rxPackets.valueAt(i) * leftOverRxTimeMs)
/ totalRxPackets;
+ rxTimesMs.incrementValue(uid, myRxTimeMs);
+ }
+
+ for (int i = 0; i < txTimesMs.size(); i++) {
+ final int uid = txTimesMs.keyAt(i);
+ final long myTxTimeMs = txTimesMs.valueAt(i);
if (DEBUG_ENERGY) {
- Slog.d(TAG, " RxTime for UID " + uid.getUid() + ": " + myRxTimeMs + " ms");
+ Slog.d(TAG, " TxTime for UID " + uid + ": " + myTxTimeMs + " ms");
}
- uid.getOrCreateWifiControllerActivityLocked().getOrCreateRxTimeCounter()
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .getOrCreateWifiControllerActivityLocked()
+ .getOrCreateTxTimeCounters()[0]
+ .increment(myTxTimeMs, elapsedRealtimeMs);
+ if (uidEstimatedConsumptionMah != null) {
+ uidEstimatedConsumptionMah.incrementValue(uid,
+ mWifiPowerCalculator.calcPowerFromControllerDataMah(
+ 0, myTxTimeMs, 0));
+ }
+ }
+
+ for (int i = 0; i < rxTimesMs.size(); i++) {
+ final int uid = rxTimesMs.keyAt(i);
+ final long myRxTimeMs = rxTimesMs.valueAt(i);
+ if (DEBUG_ENERGY) {
+ Slog.d(TAG, " RxTime for UID " + uid + ": " + myRxTimeMs + " ms");
+ }
+
+ getUidStatsLocked(rxTimesMs.keyAt(i), elapsedRealtimeMs, uptimeMs)
+ .getOrCreateWifiControllerActivityLocked()
+ .getOrCreateRxTimeCounter()
.increment(myRxTimeMs, elapsedRealtimeMs);
if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(uid.getUid(),
+ uidEstimatedConsumptionMah.incrementValue(uid,
mWifiPowerCalculator.calcPowerFromControllerDataMah(
myRxTimeMs, 0, 0));
}
@@ -13004,7 +13070,6 @@
// Any left over power use will be picked up by the WiFi category in BatteryStatsHelper.
-
// Update WiFi controller stats.
mWifiActivity.getOrCreateRxTimeCounter().increment(
info.getControllerRxDurationMillis(), elapsedRealtimeMs);
@@ -13083,21 +13148,15 @@
// Grab a separate lock to acquire the network stats, which may do I/O.
NetworkStats delta = null;
synchronized (mModemNetworkLock) {
- final NetworkStats latestStats = readNetworkStatsLocked(networkStatsManager,
- mModemIfaces);
+ final NetworkStats latestStats = readMobileNetworkStatsLocked(networkStatsManager);
if (latestStats != null) {
- delta = NetworkStats.subtract(latestStats, mLastModemNetworkStats, null, null,
- mNetworkStatsPool.acquire());
- mNetworkStatsPool.release(mLastModemNetworkStats);
+ delta = latestStats.subtract(mLastModemNetworkStats);
mLastModemNetworkStats = latestStats;
}
}
synchronized (this) {
if (!mOnBatteryInternal || mIgnoreNextExternalStats) {
- if (delta != null) {
- mNetworkStatsPool.release(delta);
- }
return;
}
@@ -13224,7 +13283,7 @@
// Distribute measured mobile radio charge consumption based on app radio
// active time
if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(u.getUid(),
+ uidEstimatedConsumptionMah.incrementValue(u.getUid(),
mMobileRadioPowerCalculator.calcPowerFromRadioActiveDurationMah(
appRadioTimeUs / 1000));
}
@@ -13303,7 +13362,6 @@
totalEstimatedConsumptionMah, elapsedRealtimeMs);
}
- mNetworkStatsPool.release(delta);
delta = null;
}
}
@@ -13349,8 +13407,8 @@
energy = info.getControllerEnergyUsed();
if (!info.getUidTraffic().isEmpty()) {
for (UidTraffic traffic : info.getUidTraffic()) {
- add(uidRxBytes, traffic.getUid(), traffic.getRxBytes());
- add(uidTxBytes, traffic.getUid(), traffic.getTxBytes());
+ uidRxBytes.incrementValue(traffic.getUid(), traffic.getRxBytes());
+ uidTxBytes.incrementValue(traffic.getUid(), traffic.getTxBytes());
}
}
}
@@ -13442,6 +13500,9 @@
long leftOverRxTimeMs = rxTimeMs;
long leftOverTxTimeMs = txTimeMs;
+ final SparseLongArray rxTimesMs = new SparseLongArray(uidCount);
+ final SparseLongArray txTimesMs = new SparseLongArray(uidCount);
+
for (int i = 0; i < uidCount; i++) {
final Uid u = mUidStats.valueAt(i);
if (u.mBluetoothScanTimer == null) {
@@ -13471,15 +13532,11 @@
scanTimeTxSinceMarkMs = (txTimeMs * scanTimeTxSinceMarkMs) / totalScanTimeMs;
}
- final ControllerActivityCounterImpl counter =
- u.getOrCreateBluetoothControllerActivityLocked();
- counter.getOrCreateRxTimeCounter()
- .increment(scanTimeRxSinceMarkMs, elapsedRealtimeMs);
- counter.getOrCreateTxTimeCounters()[0]
- .increment(scanTimeTxSinceMarkMs, elapsedRealtimeMs);
+ rxTimesMs.incrementValue(u.getUid(), scanTimeRxSinceMarkMs);
+ txTimesMs.incrementValue(u.getUid(), scanTimeTxSinceMarkMs);
if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(u.getUid(),
+ uidEstimatedConsumptionMah.incrementValue(u.getUid(),
mBluetoothPowerCalculator.calculatePowerMah(
scanTimeRxSinceMarkMs, scanTimeTxSinceMarkMs, 0));
}
@@ -13540,29 +13597,45 @@
if (totalRxBytes > 0 && rxBytes > 0) {
final long timeRxMs = (leftOverRxTimeMs * rxBytes) / totalRxBytes;
- if (DEBUG_ENERGY) {
- Slog.d(TAG, "UID=" + uid + " rx_bytes=" + rxBytes + " rx_time=" + timeRxMs);
- }
- counter.getOrCreateRxTimeCounter().increment(timeRxMs, elapsedRealtimeMs);
-
- if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(u.getUid(),
- mBluetoothPowerCalculator.calculatePowerMah(timeRxMs, 0, 0));
- }
+ rxTimesMs.incrementValue(uid, timeRxMs);
}
if (totalTxBytes > 0 && txBytes > 0) {
final long timeTxMs = (leftOverTxTimeMs * txBytes) / totalTxBytes;
- if (DEBUG_ENERGY) {
- Slog.d(TAG, "UID=" + uid + " tx_bytes=" + txBytes + " tx_time=" + timeTxMs);
- }
- counter.getOrCreateTxTimeCounters()[0]
- .increment(timeTxMs, elapsedRealtimeMs);
+ txTimesMs.incrementValue(uid, timeTxMs);
+ }
+ }
- if (uidEstimatedConsumptionMah != null) {
- uidEstimatedConsumptionMah.add(u.getUid(),
- mBluetoothPowerCalculator.calculatePowerMah(0, timeTxMs, 0));
- }
+ for (int i = 0; i < txTimesMs.size(); i++) {
+ final int uid = txTimesMs.keyAt(i);
+ final long myTxTimeMs = txTimesMs.valueAt(i);
+ if (DEBUG_ENERGY) {
+ Slog.d(TAG, " TxTime for UID " + uid + ": " + myTxTimeMs + " ms");
+ }
+ getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs)
+ .getOrCreateBluetoothControllerActivityLocked()
+ .getOrCreateTxTimeCounters()[0]
+ .increment(myTxTimeMs, elapsedRealtimeMs);
+ if (uidEstimatedConsumptionMah != null) {
+ uidEstimatedConsumptionMah.incrementValue(uid,
+ mBluetoothPowerCalculator.calculatePowerMah(0, myTxTimeMs, 0));
+ }
+ }
+
+ for (int i = 0; i < rxTimesMs.size(); i++) {
+ final int uid = rxTimesMs.keyAt(i);
+ final long myRxTimeMs = rxTimesMs.valueAt(i);
+ if (DEBUG_ENERGY) {
+ Slog.d(TAG, " RxTime for UID " + uid + ": " + myRxTimeMs + " ms");
+ }
+
+ getUidStatsLocked(rxTimesMs.keyAt(i), elapsedRealtimeMs, uptimeMs)
+ .getOrCreateBluetoothControllerActivityLocked()
+ .getOrCreateRxTimeCounter()
+ .increment(myRxTimeMs, elapsedRealtimeMs);
+ if (uidEstimatedConsumptionMah != null) {
+ uidEstimatedConsumptionMah.incrementValue(uid,
+ mBluetoothPowerCalculator.calculatePowerMah(myRxTimeMs, 0, 0));
}
}
}
@@ -16183,6 +16256,18 @@
iPw.decreaseIndent();
}
+ /**
+ * Dump Power Profile
+ */
+ @GuardedBy("this")
+ public void dumpPowerProfileLocked(PrintWriter pw) {
+ final IndentingPrintWriter iPw = new IndentingPrintWriter(pw, " ");
+ iPw.printf("Power Profile: \n");
+ iPw.increaseIndent();
+ mPowerProfile.dump(iPw);
+ iPw.decreaseIndent();
+ }
+
final ReentrantLock mWriteLock = new ReentrantLock();
@GuardedBy("this")
@@ -18140,8 +18225,4 @@
pw.println();
dumpMeasuredEnergyStatsLocked(pw);
}
-
- private static void add(SparseLongArray array, int key, long delta) {
- array.put(key, array.get(key) + delta);
- }
}
diff --git a/core/java/com/android/internal/os/BatteryUsageStatsStore.java b/core/java/com/android/internal/os/BatteryUsageStatsStore.java
index fd54b32..af82f40 100644
--- a/core/java/com/android/internal/os/BatteryUsageStatsStore.java
+++ b/core/java/com/android/internal/os/BatteryUsageStatsStore.java
@@ -58,6 +58,7 @@
new BatteryUsageStatsQuery.Builder()
.setMaxStatsAgeMs(0)
.includePowerModels()
+ .includeProcessStateData()
.build());
private static final String BATTERY_USAGE_STATS_DIR = "battery-usage-stats";
private static final String SNAPSHOT_FILE_EXTENSION = ".bus";
diff --git a/core/java/com/android/internal/os/BinderLatencyObserver.java b/core/java/com/android/internal/os/BinderLatencyObserver.java
index 20cf102..e9d55db 100644
--- a/core/java/com/android/internal/os/BinderLatencyObserver.java
+++ b/core/java/com/android/internal/os/BinderLatencyObserver.java
@@ -19,7 +19,6 @@
import android.annotation.Nullable;
import android.os.Binder;
import android.os.Handler;
-import android.os.Looper;
import android.os.SystemClock;
import android.util.ArrayMap;
import android.util.Slog;
@@ -181,7 +180,7 @@
}
public Handler getHandler() {
- return new Handler(Looper.getMainLooper());
+ return BackgroundThread.getHandler();
}
}
diff --git a/core/java/com/android/internal/os/BluetoothPowerCalculator.java b/core/java/com/android/internal/os/BluetoothPowerCalculator.java
index c322258..20535d2 100644
--- a/core/java/com/android/internal/os/BluetoothPowerCalculator.java
+++ b/core/java/com/android/internal/os/BluetoothPowerCalculator.java
@@ -15,6 +15,7 @@
*/
package com.android.internal.os;
+import android.annotation.Nullable;
import android.os.BatteryConsumer;
import android.os.BatteryStats;
import android.os.BatteryStats.ControllerActivityCounter;
@@ -26,19 +27,33 @@
import android.util.Log;
import android.util.SparseArray;
+import java.util.Arrays;
import java.util.List;
public class BluetoothPowerCalculator extends PowerCalculator {
private static final String TAG = "BluetoothPowerCalc";
private static final boolean DEBUG = BatteryStatsHelper.DEBUG;
+
+ private static final BatteryConsumer.Key[] UNINITIALIZED_KEYS = new BatteryConsumer.Key[0];
+
private final double mIdleMa;
private final double mRxMa;
private final double mTxMa;
private final boolean mHasBluetoothPowerController;
private static class PowerAndDuration {
+ // Return value of BT duration per app
public long durationMs;
+ // Return value of BT power per app
public double powerMah;
+
+ public BatteryConsumer.Key[] keys;
+ public double[] powerPerKeyMah;
+
+ // Aggregated BT duration across all apps
+ public long totalDurationMs;
+ // Aggregated BT power across all apps
+ public double totalPowerMah;
}
public BluetoothPowerCalculator(PowerProfile profile) {
@@ -55,59 +70,88 @@
return;
}
- final PowerAndDuration total = new PowerAndDuration();
+ BatteryConsumer.Key[] keys = UNINITIALIZED_KEYS;
+ final PowerAndDuration powerAndDuration = new PowerAndDuration();
final SparseArray<UidBatteryConsumer.Builder> uidBatteryConsumerBuilders =
builder.getUidBatteryConsumerBuilders();
for (int i = uidBatteryConsumerBuilders.size() - 1; i >= 0; i--) {
final UidBatteryConsumer.Builder app = uidBatteryConsumerBuilders.valueAt(i);
- calculateApp(app, total, query);
+ if (keys == UNINITIALIZED_KEYS) {
+ if (query.isProcessStateDataNeeded()) {
+ keys = app.getKeys(BatteryConsumer.POWER_COMPONENT_BLUETOOTH);
+ powerAndDuration.keys = keys;
+ powerAndDuration.powerPerKeyMah = new double[keys.length];
+ } else {
+ keys = null;
+ }
+ }
+ calculateApp(app, powerAndDuration, query);
}
final long measuredChargeUC = batteryStats.getBluetoothMeasuredBatteryConsumptionUC();
final int powerModel = getPowerModel(measuredChargeUC, query);
final ControllerActivityCounter activityCounter =
batteryStats.getBluetoothControllerActivity();
- final long systemDurationMs = calculateDuration(activityCounter);
- final double systemPowerMah = calculatePowerMah(powerModel, measuredChargeUC,
- activityCounter, query.shouldForceUsePowerProfileModel());
+ calculatePowerAndDuration(null, powerModel, measuredChargeUC,
+ activityCounter, query.shouldForceUsePowerProfileModel(), powerAndDuration);
// Subtract what the apps used, but clamp to 0.
- final long systemComponentDurationMs = Math.max(0, systemDurationMs - total.durationMs);
+ final long systemComponentDurationMs = Math.max(0,
+ powerAndDuration.durationMs - powerAndDuration.totalDurationMs);
if (DEBUG) {
Log.d(TAG, "Bluetooth active: time=" + (systemComponentDurationMs)
- + " power=" + formatCharge(systemPowerMah));
+ + " power=" + formatCharge(powerAndDuration.powerMah));
}
builder.getAggregateBatteryConsumerBuilder(
- BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE)
- .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, systemDurationMs)
+ BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_DEVICE)
+ .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ powerAndDuration.durationMs)
.setConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
- Math.max(systemPowerMah, total.powerMah), powerModel);
+ Math.max(powerAndDuration.powerMah, powerAndDuration.totalPowerMah),
+ powerModel);
builder.getAggregateBatteryConsumerBuilder(
- BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS)
- .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, total.durationMs)
- .setConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, total.powerMah,
+ BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_ALL_APPS)
+ .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ powerAndDuration.totalDurationMs)
+ .setConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ powerAndDuration.totalPowerMah,
powerModel);
}
- private void calculateApp(UidBatteryConsumer.Builder app, PowerAndDuration total,
+ private void calculateApp(UidBatteryConsumer.Builder app, PowerAndDuration powerAndDuration,
BatteryUsageStatsQuery query) {
final long measuredChargeUC =
app.getBatteryStatsUid().getBluetoothMeasuredBatteryConsumptionUC();
final int powerModel = getPowerModel(measuredChargeUC, query);
final ControllerActivityCounter activityCounter =
app.getBatteryStatsUid().getBluetoothControllerActivity();
- final long durationMs = calculateDuration(activityCounter);
- final double powerMah = calculatePowerMah(powerModel, measuredChargeUC, activityCounter,
- query.shouldForceUsePowerProfileModel());
+ calculatePowerAndDuration(app.getBatteryStatsUid(), powerModel, measuredChargeUC,
+ activityCounter, query.shouldForceUsePowerProfileModel(), powerAndDuration);
- app.setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, durationMs)
- .setConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH, powerMah, powerModel);
+ app.setUsageDurationMillis(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH, powerAndDuration.durationMs)
+ .setConsumedPower(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH, powerAndDuration.powerMah,
+ powerModel);
- total.durationMs += durationMs;
- total.powerMah += powerMah;
+ powerAndDuration.totalDurationMs += powerAndDuration.durationMs;
+ powerAndDuration.totalPowerMah += powerAndDuration.powerMah;
+
+ if (query.isProcessStateDataNeeded() && powerAndDuration.keys != null) {
+ for (int j = 0; j < powerAndDuration.keys.length; j++) {
+ BatteryConsumer.Key key = powerAndDuration.keys[j];
+ final int processState = key.processState;
+ if (processState == BatteryConsumer.PROCESS_STATE_UNSPECIFIED) {
+ // Already populated with the powerAndDuration across all process states
+ continue;
+ }
+
+ app.setConsumedPower(key, powerAndDuration.powerPerKeyMah[j], powerModel);
+ }
+ }
}
@Override
@@ -117,12 +161,12 @@
return;
}
- PowerAndDuration total = new PowerAndDuration();
+ PowerAndDuration powerAndDuration = new PowerAndDuration();
for (int i = sippers.size() - 1; i >= 0; i--) {
final BatterySipper app = sippers.get(i);
if (app.drainType == BatterySipper.DrainType.APP) {
- calculateApp(app, app.uidObj, statsType, total);
+ calculateApp(app, app.uidObj, statsType, powerAndDuration);
}
}
@@ -131,13 +175,14 @@
final int powerModel = getPowerModel(measuredChargeUC);
final ControllerActivityCounter activityCounter =
batteryStats.getBluetoothControllerActivity();
- final long systemDurationMs = calculateDuration(activityCounter);
- final double systemPowerMah =
- calculatePowerMah(powerModel, measuredChargeUC, activityCounter, false);
+ calculatePowerAndDuration(null, powerModel, measuredChargeUC, activityCounter, false,
+ powerAndDuration);
// Subtract what the apps used, but clamp to 0.
- final double powerMah = Math.max(0, systemPowerMah - total.powerMah);
- final long durationMs = Math.max(0, systemDurationMs - total.durationMs);
+ final double powerMah = Math.max(0,
+ powerAndDuration.powerMah - powerAndDuration.totalPowerMah);
+ final long durationMs = Math.max(0,
+ powerAndDuration.durationMs - powerAndDuration.totalDurationMs);
if (DEBUG && powerMah != 0) {
Log.d(TAG, "Bluetooth active: time=" + (durationMs)
+ " power=" + formatCharge(powerMah));
@@ -160,65 +205,102 @@
}
private void calculateApp(BatterySipper app, BatteryStats.Uid u, int statsType,
- PowerAndDuration total) {
-
+ PowerAndDuration powerAndDuration) {
final long measuredChargeUC = u.getBluetoothMeasuredBatteryConsumptionUC();
final int powerModel = getPowerModel(measuredChargeUC);
final ControllerActivityCounter activityCounter = u.getBluetoothControllerActivity();
- final long durationMs = calculateDuration(activityCounter);
- final double powerMah = calculatePowerMah(powerModel, measuredChargeUC, activityCounter,
- false);
+ calculatePowerAndDuration(u, powerModel, measuredChargeUC, activityCounter,
+ false, powerAndDuration);
- app.bluetoothRunningTimeMs = durationMs;
- app.bluetoothPowerMah = powerMah;
+ app.bluetoothRunningTimeMs = powerAndDuration.durationMs;
+ app.bluetoothPowerMah = powerAndDuration.powerMah;
app.btRxBytes = u.getNetworkActivityBytes(BatteryStats.NETWORK_BT_RX_DATA, statsType);
app.btTxBytes = u.getNetworkActivityBytes(BatteryStats.NETWORK_BT_TX_DATA, statsType);
- total.durationMs += durationMs;
- total.powerMah += powerMah;
- }
-
- private long calculateDuration(ControllerActivityCounter counter) {
- if (counter == null) {
- return 0;
- }
-
- return counter.getIdleTimeCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED)
- + counter.getRxTimeCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED)
- + counter.getTxTimeCounters()[0].getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+ powerAndDuration.totalDurationMs += powerAndDuration.durationMs;
+ powerAndDuration.totalPowerMah += powerAndDuration.powerMah;
}
/** Returns bluetooth power usage based on the best data available. */
- private double calculatePowerMah(@BatteryConsumer.PowerModel int powerModel,
- long measuredChargeUC, ControllerActivityCounter counter, boolean ignoreReportedPower) {
- if (powerModel == BatteryConsumer.POWER_MODEL_MEASURED_ENERGY) {
- return uCtoMah(measuredChargeUC);
- }
-
+ private void calculatePowerAndDuration(@Nullable BatteryStats.Uid uid,
+ @BatteryConsumer.PowerModel int powerModel,
+ long measuredChargeUC, ControllerActivityCounter counter, boolean ignoreReportedPower,
+ PowerAndDuration powerAndDuration) {
if (counter == null) {
- return 0;
+ powerAndDuration.durationMs = 0;
+ powerAndDuration.powerMah = 0;
+ if (powerAndDuration.powerPerKeyMah != null) {
+ Arrays.fill(powerAndDuration.powerPerKeyMah, 0);
+ }
+ return;
}
- if (!ignoreReportedPower) {
- final double powerMah =
- counter.getPowerCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED)
- / (double) (1000 * 60 * 60);
- if (powerMah != 0) {
- return powerMah;
+ final BatteryStats.LongCounter idleTimeCounter = counter.getIdleTimeCounter();
+ final BatteryStats.LongCounter rxTimeCounter = counter.getRxTimeCounter();
+ final BatteryStats.LongCounter txTimeCounter = counter.getTxTimeCounters()[0];
+ final long idleTimeMs = idleTimeCounter.getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+ final long rxTimeMs = rxTimeCounter.getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+ final long txTimeMs = txTimeCounter.getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
+
+ powerAndDuration.durationMs = idleTimeMs + rxTimeMs + txTimeMs;
+
+ if (powerModel == BatteryConsumer.POWER_MODEL_MEASURED_ENERGY) {
+ powerAndDuration.powerMah = uCtoMah(measuredChargeUC);
+ if (uid != null && powerAndDuration.keys != null) {
+ for (int i = 0; i < powerAndDuration.keys.length; i++) {
+ BatteryConsumer.Key key = powerAndDuration.keys[i];
+ final int processState = key.processState;
+ if (processState == BatteryConsumer.PROCESS_STATE_UNSPECIFIED) {
+ // Already populated with the powerAndDuration across all process states
+ continue;
+ }
+
+ powerAndDuration.powerPerKeyMah[i] =
+ uCtoMah(uid.getBluetoothMeasuredBatteryConsumptionUC(processState));
+ }
+ }
+ } else {
+ if (!ignoreReportedPower) {
+ final double powerMah =
+ counter.getPowerCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED)
+ / (double) (1000 * 60 * 60);
+ if (powerMah != 0) {
+ powerAndDuration.powerMah = powerMah;
+ if (powerAndDuration.powerPerKeyMah != null) {
+ // Leave this use case unsupported: used energy is reported
+ // via BluetoothActivityEnergyInfo rather than PowerStats HAL.
+ Arrays.fill(powerAndDuration.powerPerKeyMah, 0);
+ }
+ return;
+ }
+ }
+
+ if (mHasBluetoothPowerController) {
+ powerAndDuration.powerMah = calculatePowerMah(rxTimeMs, txTimeMs, idleTimeMs);
+
+ if (powerAndDuration.keys != null) {
+ for (int i = 0; i < powerAndDuration.keys.length; i++) {
+ BatteryConsumer.Key key = powerAndDuration.keys[i];
+ final int processState = key.processState;
+ if (processState == BatteryConsumer.PROCESS_STATE_UNSPECIFIED) {
+ // Already populated with the powerAndDuration across all process states
+ continue;
+ }
+
+ powerAndDuration.powerPerKeyMah[i] =
+ calculatePowerMah(
+ rxTimeCounter.getCountForProcessState(processState),
+ txTimeCounter.getCountForProcessState(processState),
+ idleTimeCounter.getCountForProcessState(processState));
+ }
+ }
+ } else {
+ powerAndDuration.powerMah = 0;
+ if (powerAndDuration.powerPerKeyMah != null) {
+ Arrays.fill(powerAndDuration.powerPerKeyMah, 0);
+ }
}
}
-
- if (!mHasBluetoothPowerController) {
- return 0;
- }
-
- final long idleTimeMs =
- counter.getIdleTimeCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
- final long rxTimeMs =
- counter.getRxTimeCounter().getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
- final long txTimeMs =
- counter.getTxTimeCounters()[0].getCountLocked(BatteryStats.STATS_SINCE_CHARGED);
- return calculatePowerMah(rxTimeMs, txTimeMs, idleTimeMs);
}
/** Returns estimated bluetooth power usage based on usage times. */
diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index 7766b77..fd1d86b 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -12,4 +12,5 @@
per-file *PowerEstimator* = file:/BATTERY_STATS_OWNERS
per-file *Kernel* = file:/BATTERY_STATS_OWNERS
per-file *MultiState* = file:/BATTERY_STATS_OWNERS
+per-file *PowerProfile* = file:/BATTERY_STATS_OWNERS
diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java
index 4d19b35..7f8accc 100644
--- a/core/java/com/android/internal/os/PowerProfile.java
+++ b/core/java/com/android/internal/os/PowerProfile.java
@@ -17,24 +17,31 @@
package com.android.internal.os;
+import android.annotation.LongDef;
import android.annotation.StringDef;
+import android.annotation.XmlRes;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.util.IndentingPrintWriter;
import android.util.Slog;
import android.util.proto.ProtoOutputStream;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.power.ModemPowerProfile;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
+import java.io.PrintWriter;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
/**
@@ -259,6 +266,35 @@
public @interface PowerGroup {}
/**
+ * Constants for generating a 64bit power constant key.
+ *
+ * The bitfields of a key describes what its corresponding power constant represents:
+ * [63:40] - RESERVED
+ * [39:32] - {@link Subsystem} (max count = 16).
+ * [31:0] - per Subsystem fields, see {@link ModemPowerProfile}.
+ *
+ */
+ private static final int SUBSYSTEM_SHIFT = 32;
+ private static final long SUBSYSTEM_MASK = 0xF << SUBSYSTEM_SHIFT;
+ /**
+ * Power constant not associated with a subsystem.
+ */
+ public static final long SUBSYSTEM_NONE = 0 << SUBSYSTEM_SHIFT;
+ /**
+ * Modem power constant.
+ */
+ public static final long SUBSYSTEM_MODEM = 1 << SUBSYSTEM_SHIFT;
+
+ @LongDef(prefix = { "SUBSYSTEM_" }, value = {
+ SUBSYSTEM_NONE,
+ SUBSYSTEM_MODEM,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Subsystem {}
+
+ private static final long SUBSYSTEM_FIELDS_MASK = 0xFFFFFFFF;
+
+ /**
* A map from Power Use Item to its power consumption.
*/
static final HashMap<String, Double> sPowerItemMap = new HashMap<>();
@@ -268,12 +304,16 @@
*/
static final HashMap<String, Double[]> sPowerArrayMap = new HashMap<>();
+ static final ModemPowerProfile sModemPowerProfile = new ModemPowerProfile();
+
private static final String TAG_DEVICE = "device";
private static final String TAG_ITEM = "item";
private static final String TAG_ARRAY = "array";
private static final String TAG_ARRAYITEM = "value";
private static final String ATTR_NAME = "name";
+ private static final String TAG_MODEM = "modem";
+
private static final Object sLock = new Object();
@VisibleForTesting
@@ -289,19 +329,40 @@
public PowerProfile(Context context, boolean forTest) {
// Read the XML file for the given profile (normally only one per device)
synchronized (sLock) {
- if (sPowerItemMap.size() == 0 && sPowerArrayMap.size() == 0) {
- readPowerValuesFromXml(context, forTest);
- }
- initCpuClusters();
- initDisplays();
+ final int xmlId = forTest ? com.android.internal.R.xml.power_profile_test
+ : com.android.internal.R.xml.power_profile;
+ initLocked(context, xmlId);
}
}
- private void readPowerValuesFromXml(Context context, boolean forTest) {
- final int id = forTest ? com.android.internal.R.xml.power_profile_test :
- com.android.internal.R.xml.power_profile;
+ /**
+ * Reinitialize the PowerProfile with the provided XML.
+ * WARNING: use only for testing!
+ */
+ @VisibleForTesting
+ public void forceInitForTesting(Context context, @XmlRes int xmlId) {
+ synchronized (sLock) {
+ sPowerItemMap.clear();
+ sPowerArrayMap.clear();
+ sModemPowerProfile.clear();
+ initLocked(context, xmlId);
+ }
+
+ }
+
+ @GuardedBy("sLock")
+ private void initLocked(Context context, @XmlRes int xmlId) {
+ if (sPowerItemMap.size() == 0 && sPowerArrayMap.size() == 0) {
+ readPowerValuesFromXml(context, xmlId);
+ }
+ initCpuClusters();
+ initDisplays();
+ initModem();
+ }
+
+ private void readPowerValuesFromXml(Context context, @XmlRes int xmlId) {
final Resources resources = context.getResources();
- XmlResourceParser parser = resources.getXml(id);
+ XmlResourceParser parser = resources.getXml(xmlId);
boolean parsingArray = false;
ArrayList<Double> array = new ArrayList<>();
String arrayName = null;
@@ -340,6 +401,8 @@
array.add(value);
}
}
+ } else if (element.equals(TAG_MODEM)) {
+ sModemPowerProfile.parseFromXml(parser);
}
}
if (parsingArray) {
@@ -515,6 +578,39 @@
return mNumDisplays;
}
+ private void initModem() {
+ handleDeprecatedModemConstant(ModemPowerProfile.MODEM_DRAIN_TYPE_SLEEP,
+ POWER_MODEM_CONTROLLER_SLEEP, 0);
+ handleDeprecatedModemConstant(ModemPowerProfile.MODEM_DRAIN_TYPE_IDLE,
+ POWER_MODEM_CONTROLLER_SLEEP, 0);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_RX,
+ POWER_MODEM_CONTROLLER_RX, 0);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0, POWER_MODEM_CONTROLLER_TX, 0);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1, POWER_MODEM_CONTROLLER_TX, 1);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2, POWER_MODEM_CONTROLLER_TX, 2);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3, POWER_MODEM_CONTROLLER_TX, 3);
+ handleDeprecatedModemConstant(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4, POWER_MODEM_CONTROLLER_TX, 4);
+ }
+
+ private void handleDeprecatedModemConstant(int key, String deprecatedKey, int level) {
+ final double drain = sModemPowerProfile.getAverageBatteryDrainMa(key);
+ if (!Double.isNaN(drain)) return; // Value already set, don't overwrite it.
+
+ final double deprecatedDrain = getAveragePower(deprecatedKey, level);
+ sModemPowerProfile.setPowerConstant(key, Double.toString(deprecatedDrain));
+ }
+
/**
* Returns the number of memory bandwidth buckets defined in power_profile.xml, or a
* default value if the subsystem has no recorded value.
@@ -560,6 +656,43 @@
}
/**
+ * Returns the average current in mA consumed by a subsystem's specified operation, or the given
+ * default value if the subsystem has no recorded value.
+ *
+ * @param key that describes a subsystem's battery draining operation
+ * The key is built from multiple constant, see {@link Subsystem} and
+ * {@link ModemPowerProfile}.
+ * @param defaultValue the value to return if the subsystem has no recorded value.
+ * @return the average current in milliAmps.
+ */
+ public double getAverageBatteryDrainOrDefaultMa(long key, double defaultValue) {
+ final long subsystemType = key & SUBSYSTEM_MASK;
+ final int subsystemFields = (int) (key & SUBSYSTEM_FIELDS_MASK);
+
+ final double value;
+ if (subsystemType == SUBSYSTEM_MODEM) {
+ value = sModemPowerProfile.getAverageBatteryDrainMa(subsystemFields);
+ } else {
+ value = Double.NaN;
+ }
+
+ if (Double.isNaN(value)) return defaultValue;
+ return value;
+ }
+
+ /**
+ * Returns the average current in mA consumed by a subsystem's specified operation.
+ *
+ * @param key that describes a subsystem's battery draining operation
+ * The key is built from multiple constant, see {@link Subsystem} and
+ * {@link ModemPowerProfile}.
+ * @return the average current in milliAmps.
+ */
+ public double getAverageBatteryDrainMa(long key) {
+ return getAverageBatteryDrainOrDefaultMa(key, 0);
+ }
+
+ /**
* Returns the average current in mA consumed by the subsystem for the given level.
*
* @param type the subsystem type
@@ -784,6 +917,25 @@
PowerProfileProto.BATTERY_CAPACITY);
}
+ /**
+ * Dump the PowerProfile values.
+ */
+ public void dump(PrintWriter pw) {
+ final IndentingPrintWriter ipw = new IndentingPrintWriter(pw);
+ sPowerItemMap.forEach((key, value) -> {
+ ipw.print(key, value);
+ ipw.println();
+ });
+ sPowerArrayMap.forEach((key, value) -> {
+ ipw.print(key, Arrays.toString(value));
+ ipw.println();
+ });
+ ipw.println("Modem values:");
+ ipw.increaseIndent();
+ sModemPowerProfile.dump(ipw);
+ ipw.decreaseIndent();
+ }
+
// Writes items in sPowerItemMap to proto if exists.
private void writePowerConstantToProto(ProtoOutputStream proto, String key, long fieldId) {
if (sPowerItemMap.containsKey(key)) {
diff --git a/core/java/com/android/internal/power/ModemPowerProfile.java b/core/java/com/android/internal/power/ModemPowerProfile.java
new file mode 100644
index 0000000..456ff4b
--- /dev/null
+++ b/core/java/com/android/internal/power/ModemPowerProfile.java
@@ -0,0 +1,442 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.power;
+
+import android.annotation.IntDef;
+import android.content.res.XmlResourceParser;
+import android.telephony.ModemActivityInfo;
+import android.telephony.ServiceState;
+import android.telephony.TelephonyManager;
+import android.util.Slog;
+import android.util.SparseDoubleArray;
+
+import com.android.internal.telephony.util.ArrayUtils;
+import com.android.internal.util.XmlUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
+
+/**
+ * ModemPowerProfile for handling the modem element in the power_profile.xml
+ */
+public class ModemPowerProfile {
+ private static final String TAG = "ModemPowerProfile";
+
+ private static final String TAG_SLEEP = "sleep";
+ private static final String TAG_IDLE = "idle";
+ private static final String TAG_ACTIVE = "active";
+ private static final String TAG_RECEIVE = "receive";
+ private static final String TAG_TRANSMIT = "transmit";
+ private static final String ATTR_RAT = "rat";
+ private static final String ATTR_NR_FREQUENCY = "nrFrequency";
+ private static final String ATTR_LEVEL = "level";
+
+ /**
+ * A flattened list of the modem power constant extracted from the given XML parser.
+ *
+ * The bitfields of a key describes what its corresponding power constant represents:
+ * [31:28] - {@link ModemDrainType} (max count = 16).
+ * [27:24] - {@link ModemTxLevel} (only for {@link MODEM_DRAIN_TYPE_TX}) (max count = 16).
+ * [23:20] - {@link ModemRatType} (max count = 16).
+ * [19:16] - {@link ModemNrFrequencyRange} (only for {@link MODEM_RAT_TYPE_NR})
+ * (max count = 16).
+ * [15:0] - RESERVED
+ */
+ private final SparseDoubleArray mPowerConstants = new SparseDoubleArray();
+
+ private static final int MODEM_DRAIN_TYPE_SHIFT = 28;
+ private static final int MODEM_DRAIN_TYPE_MASK = 0xF << MODEM_DRAIN_TYPE_SHIFT;
+
+ private static final int MODEM_TX_LEVEL_SHIFT = 24;
+ private static final int MODEM_TX_LEVEL_MASK = 0xF << MODEM_TX_LEVEL_SHIFT;
+
+ private static final int MODEM_RAT_TYPE_SHIFT = 20;
+ private static final int MODEM_RAT_TYPE_MASK = 0xF << MODEM_RAT_TYPE_SHIFT;
+
+ private static final int MODEM_NR_FREQUENCY_RANGE_SHIFT = 16;
+ private static final int MODEM_NR_FREQUENCY_RANGE_MASK = 0xF << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ /**
+ * Corresponds to the overall modem battery drain while asleep.
+ */
+ public static final int MODEM_DRAIN_TYPE_SLEEP = 0 << MODEM_DRAIN_TYPE_SHIFT;
+
+ /**
+ * Corresponds to the overall modem battery drain while idle.
+ */
+ public static final int MODEM_DRAIN_TYPE_IDLE = 1 << MODEM_DRAIN_TYPE_SHIFT;
+
+ /**
+ * Corresponds to the modem battery drain while receiving data. A specific Rx battery drain
+ * power constant can be selected using a bitwise OR (|) with {@link ModemRatType} and
+ * {@link ModemNrFrequencyRange} (when applicable).
+ */
+ public static final int MODEM_DRAIN_TYPE_RX = 2 << MODEM_DRAIN_TYPE_SHIFT;
+
+ /**
+ * Corresponds to the modem battery drain while receiving data.
+ * {@link ModemTxLevel} must be specified with this drain type.
+ * Specific Tx battery drain power constanta can be selected using a bitwise OR (|) with
+ * {@link ModemRatType} and {@link ModemNrFrequencyRange} (when applicable).
+ */
+ public static final int MODEM_DRAIN_TYPE_TX = 3 << MODEM_DRAIN_TYPE_SHIFT;
+
+ @IntDef(prefix = {"MODEM_DRAIN_TYPE_"}, value = {
+ MODEM_DRAIN_TYPE_SLEEP,
+ MODEM_DRAIN_TYPE_IDLE,
+ MODEM_DRAIN_TYPE_RX,
+ MODEM_DRAIN_TYPE_TX,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ModemDrainType {
+ }
+
+ private static final String[] MODEM_DRAIN_TYPE_NAMES =
+ new String[]{"SLEEP", "IDLE", "RX", "TX"};
+
+ /**
+ * Corresponds to {@link ModemActivityInfo#TX_POWER_LEVEL_0}.
+ */
+ public static final int MODEM_TX_LEVEL_0 = 0 << MODEM_TX_LEVEL_SHIFT;
+
+ /**
+ * Corresponds to {@link ModemActivityInfo#TX_POWER_LEVEL_1}.
+ */
+ public static final int MODEM_TX_LEVEL_1 = 1 << MODEM_TX_LEVEL_SHIFT;
+
+ /**
+ * Corresponds to {@link ModemActivityInfo#TX_POWER_LEVEL_2}.
+ */
+ public static final int MODEM_TX_LEVEL_2 = 2 << MODEM_TX_LEVEL_SHIFT;
+
+ /**
+ * Corresponds to {@link ModemActivityInfo#TX_POWER_LEVEL_3}.
+ */
+ public static final int MODEM_TX_LEVEL_3 = 3 << MODEM_TX_LEVEL_SHIFT;
+
+ /**
+ * Corresponds to {@link ModemActivityInfo#TX_POWER_LEVEL_4}.
+ */
+ public static final int MODEM_TX_LEVEL_4 = 4 << MODEM_TX_LEVEL_SHIFT;
+
+ private static final int MODEM_TX_LEVEL_COUNT = 5;
+
+ @IntDef(prefix = {"MODEM_TX_LEVEL_"}, value = {
+ MODEM_TX_LEVEL_0,
+ MODEM_TX_LEVEL_1,
+ MODEM_TX_LEVEL_2,
+ MODEM_TX_LEVEL_3,
+ MODEM_TX_LEVEL_4,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ModemTxLevel {
+ }
+
+ /**
+ * Fallback for any active modem usage that does not match specified Radio Access Technology
+ * (RAT) power constants.
+ */
+ public static final int MODEM_RAT_TYPE_DEFAULT = 0 << MODEM_RAT_TYPE_SHIFT;
+
+ /**
+ * Corresponds to active modem usage on 4G {@link TelephonyManager#NETWORK_TYPE_LTE} RAT.
+ */
+ public static final int MODEM_RAT_TYPE_LTE = 1 << MODEM_RAT_TYPE_SHIFT;
+
+ /**
+ * Corresponds to active modem usage on 5G {@link TelephonyManager#NETWORK_TYPE_NR} RAT.
+ */
+ public static final int MODEM_RAT_TYPE_NR = 2 << MODEM_RAT_TYPE_SHIFT;
+
+ @IntDef(prefix = {"MODEM_RAT_TYPE_"}, value = {
+ MODEM_RAT_TYPE_DEFAULT,
+ MODEM_RAT_TYPE_LTE,
+ MODEM_RAT_TYPE_NR,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ModemRatType {
+ }
+
+ private static final String[] MODEM_RAT_TYPE_NAMES = new String[]{"DEFAULT", "LTE", "NR"};
+
+ /**
+ * Fallback for any active 5G modem usage that does not match specified NR frequency power
+ * constants.
+ */
+ public static final int MODEM_NR_FREQUENCY_RANGE_DEFAULT = 0 << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ /**
+ * Corresponds to active NR modem usage on {@link ServiceState#FREQUENCY_RANGE_LOW}.
+ */
+ public static final int MODEM_NR_FREQUENCY_RANGE_LOW = 1 << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ /**
+ * Corresponds to active NR modem usage on {@link ServiceState#FREQUENCY_RANGE_MID}.
+ */
+ public static final int MODEM_NR_FREQUENCY_RANGE_MID = 2 << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ /**
+ * Corresponds to active NR modem usage on {@link ServiceState#FREQUENCY_RANGE_HIGH}.
+ */
+ public static final int MODEM_NR_FREQUENCY_RANGE_HIGH = 3 << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ /**
+ * Corresponds to active NR modem usage on {@link ServiceState#FREQUENCY_RANGE_MMWAVE}.
+ */
+ public static final int MODEM_NR_FREQUENCY_RANGE_MMWAVE = 4 << MODEM_NR_FREQUENCY_RANGE_SHIFT;
+
+ @IntDef(prefix = {"MODEM_NR_FREQUENCY_RANGE_"}, value = {
+ MODEM_RAT_TYPE_DEFAULT,
+ MODEM_NR_FREQUENCY_RANGE_LOW,
+ MODEM_NR_FREQUENCY_RANGE_MID,
+ MODEM_NR_FREQUENCY_RANGE_HIGH,
+ MODEM_NR_FREQUENCY_RANGE_MMWAVE,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ModemNrFrequencyRange {
+ }
+
+ private static final String[] MODEM_NR_FREQUENCY_RANGE_NAMES =
+ new String[]{"DEFAULT", "LOW", "MID", "HIGH", "MMWAVE"};
+
+ public ModemPowerProfile() {
+ }
+
+ /**
+ * Generates a ModemPowerProfile object from the <modem /> element of a power_profile.xml
+ */
+ public void parseFromXml(XmlResourceParser parser) throws IOException,
+ XmlPullParserException {
+ final int depth = parser.getDepth();
+ while (XmlUtils.nextElementWithin(parser, depth)) {
+ final String name = parser.getName();
+ switch (name) {
+ case TAG_SLEEP:
+ if (parser.next() != XmlPullParser.TEXT) {
+ continue;
+ }
+ final String sleepDrain = parser.getText();
+ setPowerConstant(MODEM_DRAIN_TYPE_SLEEP, sleepDrain);
+ break;
+ case TAG_IDLE:
+ if (parser.next() != XmlPullParser.TEXT) {
+ continue;
+ }
+ final String idleDrain = parser.getText();
+ setPowerConstant(MODEM_DRAIN_TYPE_IDLE, idleDrain);
+ break;
+ case TAG_ACTIVE:
+ parseActivePowerConstantsFromXml(parser);
+ break;
+ default:
+ Slog.e(TAG, "Unexpected element parsed: " + name);
+ }
+ }
+ }
+
+ /** Parse the <active /> XML element */
+ private void parseActivePowerConstantsFromXml(XmlResourceParser parser)
+ throws IOException, XmlPullParserException {
+ // Parse attributes to get the type of active modem usage the power constants are for.
+ final int ratType;
+ final int nrfType;
+ try {
+ ratType = getTypeFromAttribute(parser, ATTR_RAT, MODEM_RAT_TYPE_SHIFT,
+ MODEM_RAT_TYPE_NAMES);
+ if (ratType == MODEM_RAT_TYPE_NR) {
+ nrfType = getTypeFromAttribute(parser, ATTR_NR_FREQUENCY,
+ MODEM_NR_FREQUENCY_RANGE_SHIFT, MODEM_NR_FREQUENCY_RANGE_NAMES);
+ } else {
+ nrfType = 0;
+ }
+ } catch (IllegalArgumentException iae) {
+ Slog.e(TAG, "Failed parse to active modem power constants", iae);
+ return;
+ }
+
+ // Parse and populate the active modem use power constants.
+ final int depth = parser.getDepth();
+ while (XmlUtils.nextElementWithin(parser, depth)) {
+ final String name = parser.getName();
+ switch (name) {
+ case TAG_RECEIVE:
+ if (parser.next() != XmlPullParser.TEXT) {
+ continue;
+ }
+ final String rxDrain = parser.getText();
+ final int rxKey = MODEM_DRAIN_TYPE_RX | ratType | nrfType;
+ setPowerConstant(rxKey, rxDrain);
+ break;
+ case TAG_TRANSMIT:
+ final int level = XmlUtils.readIntAttribute(parser, ATTR_LEVEL, -1);
+ if (parser.next() != XmlPullParser.TEXT) {
+ continue;
+ }
+ final String txDrain = parser.getText();
+ if (level < 0 || level >= MODEM_TX_LEVEL_COUNT) {
+ Slog.e(TAG,
+ "Unexpected tx level: " + level + ". Must be between 0 and " + (
+ MODEM_TX_LEVEL_COUNT - 1));
+ continue;
+ }
+ final int modemTxLevel = level << MODEM_TX_LEVEL_SHIFT;
+ Slog.d("MWACHENS",
+ "parsing tx at level:" + level + ", aka 0x" + Integer.toHexString(
+ modemTxLevel));
+ final int txKey = MODEM_DRAIN_TYPE_TX | modemTxLevel | ratType | nrfType;
+ setPowerConstant(txKey, txDrain);
+ break;
+ default:
+ Slog.e(TAG, "Unexpected element parsed: " + name);
+ }
+ }
+ }
+
+ private static int getTypeFromAttribute(XmlResourceParser parser, String attr, int shift,
+ String[] names) {
+ final String value = XmlUtils.readStringAttribute(parser, attr);
+ final int index = ArrayUtils.indexOf(names, value);
+ if (value == null) {
+ // Attribute was not specified, just use the default.
+ return 0;
+ }
+ if (index < 0) {
+ throw new IllegalArgumentException(
+ "Unexpected " + attr + " value : " + value + ". Acceptable values are "
+ + Arrays.toString(names));
+ }
+ return index << shift;
+ }
+
+ /**
+ * Set the average battery drain in milli-amps of the modem for a given drain type.
+ *
+ * @param key a key built from the union of {@link ModemDrainType}, {@link ModemTxLevel},
+ * {@link ModemRatType}, and {@link ModemNrFrequencyRange}.key
+ * @param value the battery dram in milli-amps for the given key.
+ */
+ public void setPowerConstant(int key, String value) {
+ try {
+ mPowerConstants.put(key, Double.valueOf(value));
+ } catch (Exception e) {
+ Slog.e(TAG, "Failed to set power constant 0x" + Integer.toHexString(
+ key) + "(" + keyToString(key) + ") to " + value, e);
+ }
+ }
+
+ /**
+ * Returns the average battery drain in milli-amps of the modem for a given drain type.
+ * Returns {@link Double.NaN} if a suitable value is not found for the given key.
+ *
+ * @param key a key built from the union of {@link ModemDrainType}, {@link ModemTxLevel},
+ * {@link ModemRatType}, and {@link ModemNrFrequencyRange}.
+ */
+ public double getAverageBatteryDrainMa(int key) {
+ int bestKey = key;
+ double value;
+ value = mPowerConstants.get(bestKey, Double.NaN);
+ if (!Double.isNaN(value)) return value;
+ // The power constant for given key was not explicitly set. Try to fallback to possible
+ // defaults.
+
+ if ((bestKey & MODEM_NR_FREQUENCY_RANGE_MASK) != MODEM_NR_FREQUENCY_RANGE_DEFAULT) {
+ // Fallback to NR Frequency default value
+ bestKey &= ~MODEM_NR_FREQUENCY_RANGE_MASK;
+ bestKey |= MODEM_NR_FREQUENCY_RANGE_DEFAULT;
+ value = mPowerConstants.get(bestKey, Double.NaN);
+ if (!Double.isNaN(value)) return value;
+ }
+
+ if ((bestKey & MODEM_RAT_TYPE_MASK) != MODEM_RAT_TYPE_DEFAULT) {
+ // Fallback to RAT default value
+ bestKey &= ~MODEM_RAT_TYPE_MASK;
+ bestKey |= MODEM_RAT_TYPE_DEFAULT;
+ value = mPowerConstants.get(bestKey, Double.NaN);
+ if (!Double.isNaN(value)) return value;
+ }
+
+ Slog.w(TAG,
+ "getAverageBatteryDrainMaH called with unexpected key: 0x" + Integer.toHexString(
+ key) + ", " + keyToString(key));
+ return Double.NaN;
+ }
+
+ private static String keyToString(int key) {
+ StringBuilder sb = new StringBuilder();
+ final int drainType = key & MODEM_DRAIN_TYPE_MASK;
+ appendFieldToString(sb, "drain", MODEM_DRAIN_TYPE_NAMES,
+ drainType >> MODEM_DRAIN_TYPE_SHIFT);
+ sb.append(",");
+
+ if (drainType == MODEM_DRAIN_TYPE_TX) {
+ final int txLevel = (key & MODEM_TX_LEVEL_MASK) >> MODEM_TX_LEVEL_SHIFT;
+ sb.append("level:");
+ sb.append(txLevel);
+ sb.append(",");
+ }
+
+ final int ratType = key & MODEM_RAT_TYPE_MASK;
+ appendFieldToString(sb, "RAT", MODEM_RAT_TYPE_NAMES, ratType >> MODEM_RAT_TYPE_SHIFT);
+
+ if (ratType == MODEM_RAT_TYPE_NR) {
+ sb.append(",");
+ final int nrFreq = key & MODEM_NR_FREQUENCY_RANGE_MASK;
+ appendFieldToString(sb, "nrFreq", MODEM_NR_FREQUENCY_RANGE_NAMES,
+ nrFreq >> MODEM_NR_FREQUENCY_RANGE_SHIFT);
+ }
+ return sb.toString();
+ }
+
+ private static void appendFieldToString(StringBuilder sb, String fieldName, String[] names,
+ int index) {
+ sb.append(fieldName);
+ sb.append(":");
+ if (index < 0 || index >= names.length) {
+ sb.append("UNKNOWN(");
+ sb.append(index);
+ sb.append(")");
+ } else {
+ sb.append(names[index]);
+ }
+ }
+
+ /**
+ * Clear this ModemPowerProfile power constants.
+ */
+ public void clear() {
+ mPowerConstants.clear();
+ }
+
+
+ /**
+ * Dump this ModemPowerProfile power constants.
+ */
+ public void dump(PrintWriter pw) {
+ final int size = mPowerConstants.size();
+ for (int i = 0; i < size; i++) {
+ pw.print(keyToString(mPowerConstants.keyAt(i)));
+ pw.print("=");
+ pw.println(mPowerConstants.valueAt(i));
+ }
+ }
+}
diff --git a/core/java/com/android/internal/protolog/ProtoLogGroup.java b/core/java/com/android/internal/protolog/ProtoLogGroup.java
index 5ac4936..def598c 100644
--- a/core/java/com/android/internal/protolog/ProtoLogGroup.java
+++ b/core/java/com/android/internal/protolog/ProtoLogGroup.java
@@ -85,6 +85,8 @@
WM_DEBUG_LAYER_MIRRORING(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
Consts.TAG_WM),
WM_DEBUG_WALLPAPER(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),
+ WM_DEBUG_BACK_PREVIEW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+ "CoreBackPreview"),
TEST_GROUP(true, true, false, "WindowManagerProtoLogTest");
private final boolean mEnabled;
diff --git a/core/java/com/android/internal/usb/DumpUtils.java b/core/java/com/android/internal/usb/DumpUtils.java
index 3260136..b06a7f4 100644
--- a/core/java/com/android/internal/usb/DumpUtils.java
+++ b/core/java/com/android/internal/usb/DumpUtils.java
@@ -244,7 +244,10 @@
writeContaminantPresenceStatus(dump, "contaminant_presence_status",
UsbPortStatusProto.CONTAMINANT_PRESENCE_STATUS,
status.getContaminantDetectionStatus());
-
+ dump.write("usb_data_enabled", UsbPortStatusProto.USB_DATA_ENABLED,
+ status.getUsbDataStatus());
+ dump.write("is_power_transfer_limited", UsbPortStatusProto.IS_POWER_TRANSFER_LIMITED,
+ status.isPowerTransferLimited());
dump.end(token);
}
}
diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/view/IInputMethod.aidl
index 402fa64..6a626ee 100644
--- a/core/java/com/android/internal/view/IInputMethod.aidl
+++ b/core/java/com/android/internal/view/IInputMethod.aidl
@@ -53,8 +53,6 @@
void setSessionEnabled(IInputMethodSession session, boolean enabled);
- void revokeSession(IInputMethodSession session);
-
void showSoftInput(in IBinder showInputToken, int flags, in ResultReceiver resultReceiver);
void hideSoftInput(in IBinder hideInputToken, int flags, in ResultReceiver resultReceiver);
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index a3ac472..430d84e 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -124,7 +124,6 @@
"android_view_PointerIcon.cpp",
"android_view_Surface.cpp",
"android_view_SurfaceControl.cpp",
- "android_view_SurfaceControlFpsListener.cpp",
"android_view_SurfaceControlHdrLayerInfoListener.cpp",
"android_graphics_BLASTBufferQueue.cpp",
"android_view_SurfaceSession.cpp",
@@ -255,7 +254,6 @@
"libandroidicu",
"libbattery",
"libbpf_android",
- "libnetdbpf",
"libnetdutils",
"libmemtrack",
"libandroidfw",
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 21ec64b..f4296be 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -123,7 +123,6 @@
extern int register_android_view_InputWindowHandle(JNIEnv* env);
extern int register_android_view_Surface(JNIEnv* env);
extern int register_android_view_SurfaceControl(JNIEnv* env);
-extern int register_android_view_SurfaceControlFpsListener(JNIEnv* env);
extern int register_android_view_SurfaceControlHdrLayerInfoListener(JNIEnv* env);
extern int register_android_view_SurfaceSession(JNIEnv* env);
extern int register_android_view_CompositionSamplingListener(JNIEnv* env);
@@ -1546,7 +1545,6 @@
REG_JNI(register_android_view_InputWindowHandle),
REG_JNI(register_android_view_Surface),
REG_JNI(register_android_view_SurfaceControl),
- REG_JNI(register_android_view_SurfaceControlFpsListener),
REG_JNI(register_android_view_SurfaceControlHdrLayerInfoListener),
REG_JNI(register_android_view_SurfaceSession),
REG_JNI(register_android_view_CompositionSamplingListener),
diff --git a/core/jni/android_text_Hyphenator.cpp b/core/jni/android_text_Hyphenator.cpp
index 3651dbd..571a8e2 100644
--- a/core/jni/android_text_Hyphenator.cpp
+++ b/core/jni/android_text_Hyphenator.cpp
@@ -127,6 +127,7 @@
addHyphenator("or", INDIC_MIN_PREFIX, INDIC_MIN_SUFFIX); // Oriya
addHyphenator("pa", INDIC_MIN_PREFIX, INDIC_MIN_SUFFIX); // Punjabi
addHyphenator("pt", 2, 3); // Portuguese
+ addHyphenator("ru", 2, 2); // Russian
addHyphenator("sk", 2, 2); // Slovak
addHyphenator("sl", 2, 2); // Slovenian
addHyphenator("sq", 2, 2); // Albanian
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index dd5af04..d5470cc 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -91,6 +91,7 @@
jfieldID density;
jfieldID secure;
jfieldID deviceProductInfo;
+ jfieldID installOrientation;
} gStaticDisplayInfoClassInfo;
static struct {
@@ -1210,6 +1211,8 @@
env->SetBooleanField(object, gStaticDisplayInfoClassInfo.secure, info.secure);
env->SetObjectField(object, gStaticDisplayInfoClassInfo.deviceProductInfo,
convertDeviceProductInfoToJavaObject(env, info.deviceProductInfo));
+ env->SetIntField(object, gStaticDisplayInfoClassInfo.installOrientation,
+ static_cast<uint32_t>(info.installOrientation));
return object;
}
@@ -2152,6 +2155,8 @@
gStaticDisplayInfoClassInfo.deviceProductInfo =
GetFieldIDOrDie(env, infoClazz, "deviceProductInfo",
"Landroid/hardware/display/DeviceProductInfo;");
+ gStaticDisplayInfoClassInfo.installOrientation =
+ GetFieldIDOrDie(env, infoClazz, "installOrientation", "I");
jclass dynamicInfoClazz = FindClassOrDie(env, "android/view/SurfaceControl$DynamicDisplayInfo");
gDynamicDisplayInfoClassInfo.clazz = MakeGlobalRefOrDie(env, dynamicInfoClazz);
diff --git a/core/jni/android_view_SurfaceControlFpsListener.cpp b/core/jni/android_view_SurfaceControlFpsListener.cpp
deleted file mode 100644
index 0b15acd..0000000
--- a/core/jni/android_view_SurfaceControlFpsListener.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-#define LOG_TAG "SurfaceControlFpsListener"
-
-#include <android/gui/BnFpsListener.h>
-#include <android_runtime/AndroidRuntime.h>
-#include <android_runtime/Log.h>
-#include <gui/ISurfaceComposer.h>
-#include <gui/SurfaceComposerClient.h>
-#include <nativehelper/JNIHelp.h>
-#include <utils/Log.h>
-#include <utils/RefBase.h>
-
-#include "android_util_Binder.h"
-#include "core_jni_helpers.h"
-
-namespace android {
-
-namespace {
-
-struct {
- jclass mClass;
- jmethodID mDispatchOnFpsReported;
-} gListenerClassInfo;
-
-struct SurfaceControlFpsListener : public gui::BnFpsListener {
- SurfaceControlFpsListener(JNIEnv* env, jobject listener)
- : mListener(env->NewWeakGlobalRef(listener)) {}
-
- binder::Status onFpsReported(float fps) override {
- JNIEnv* env = AndroidRuntime::getJNIEnv();
- LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onFpsReported.");
-
- jobject listener = env->NewGlobalRef(mListener);
- if (listener == NULL) {
- // Weak reference went out of scope
- return binder::Status::ok();
- }
- env->CallStaticVoidMethod(gListenerClassInfo.mClass,
- gListenerClassInfo.mDispatchOnFpsReported, listener,
- static_cast<jfloat>(fps));
- env->DeleteGlobalRef(listener);
-
- if (env->ExceptionCheck()) {
- ALOGE("SurfaceControlFpsListener.onFpsReported() failed.");
- LOGE_EX(env);
- env->ExceptionClear();
- }
- return binder::Status::ok();
- }
-
-protected:
- virtual ~SurfaceControlFpsListener() {
- JNIEnv* env = AndroidRuntime::getJNIEnv();
- env->DeleteWeakGlobalRef(mListener);
- }
-
-private:
- jweak mListener;
-};
-
-jlong nativeCreate(JNIEnv* env, jclass clazz, jobject obj) {
- SurfaceControlFpsListener* listener = new SurfaceControlFpsListener(env, obj);
- listener->incStrong((void*)nativeCreate);
- return reinterpret_cast<jlong>(listener);
-}
-
-void nativeDestroy(JNIEnv* env, jclass clazz, jlong ptr) {
- SurfaceControlFpsListener* listener = reinterpret_cast<SurfaceControlFpsListener*>(ptr);
- listener->decStrong((void*)nativeCreate);
-}
-
-void nativeRegister(JNIEnv* env, jclass clazz, jlong ptr, jint taskId) {
- sp<SurfaceControlFpsListener> listener = reinterpret_cast<SurfaceControlFpsListener*>(ptr);
- if (SurfaceComposerClient::addFpsListener(taskId, listener) != OK) {
- constexpr auto error_msg = "Couldn't addFpsListener";
- ALOGE(error_msg);
- jniThrowRuntimeException(env, error_msg);
- }
-}
-
-void nativeUnregister(JNIEnv* env, jclass clazz, jlong ptr) {
- sp<SurfaceControlFpsListener> listener = reinterpret_cast<SurfaceControlFpsListener*>(ptr);
-
- if (SurfaceComposerClient::removeFpsListener(listener) != OK) {
- constexpr auto error_msg = "Couldn't removeFpsListener";
- ALOGE(error_msg);
- jniThrowRuntimeException(env, error_msg);
- }
-}
-
-const JNINativeMethod gMethods[] = {
- /* name, signature, funcPtr */
- {"nativeCreate", "(Landroid/view/SurfaceControlFpsListener;)J", (void*)nativeCreate},
- {"nativeDestroy", "(J)V", (void*)nativeDestroy},
- {"nativeRegister", "(JI)V", (void*)nativeRegister},
- {"nativeUnregister", "(J)V", (void*)nativeUnregister}};
-
-} // namespace
-
-int register_android_view_SurfaceControlFpsListener(JNIEnv* env) {
- int res = jniRegisterNativeMethods(env, "android/view/SurfaceControlFpsListener", gMethods,
- NELEM(gMethods));
- LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods.");
-
- jclass clazz = env->FindClass("android/view/SurfaceControlFpsListener");
- gListenerClassInfo.mClass = MakeGlobalRefOrDie(env, clazz);
- gListenerClassInfo.mDispatchOnFpsReported =
- env->GetStaticMethodID(clazz, "dispatchOnFpsReported",
- "(Landroid/view/SurfaceControlFpsListener;F)V");
- return 0;
-}
-
-} // namespace android
diff --git a/core/proto/OWNERS b/core/proto/OWNERS
index 78650ed..a4463e4 100644
--- a/core/proto/OWNERS
+++ b/core/proto/OWNERS
@@ -18,7 +18,8 @@
per-file apphibernationservice.proto = file:/core/java/android/apphibernation/OWNERS
# Biometrics
-kchyn@google.com
+jaggies@google.com
+jbolinger@google.com
# Launcher
hyunyoungs@google.com
diff --git a/core/proto/android/server/vibrator/vibratormanagerservice.proto b/core/proto/android/server/vibrator/vibratormanagerservice.proto
index fbe2170..2f2158d 100644
--- a/core/proto/android/server/vibrator/vibratormanagerservice.proto
+++ b/core/proto/android/server/vibrator/vibratormanagerservice.proto
@@ -97,7 +97,7 @@
optional int32 status = 6;
}
-// Next id: 24
+// Next id: 25
message VibratorManagerServiceDumpProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC;
repeated int32 vibrator_ids = 1;
@@ -106,6 +106,7 @@
optional VibrationProto current_external_vibration = 4;
optional bool vibrator_under_external_control = 5;
optional bool low_power_mode = 6;
+ optional bool vibrate_on = 24;
optional int32 alarm_intensity = 18;
optional int32 alarm_default_intensity = 19;
optional int32 haptic_feedback_intensity = 7;
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index 23453876..11560a5 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -225,6 +225,7 @@
repeated InsetsSourceProviderProto insets_source_providers = 35;
optional bool is_sleeping = 36;
repeated string sleep_tokens = 37;
+ repeated .android.graphics.RectProto keep_clear_areas = 38;
}
@@ -443,6 +444,7 @@
optional bool force_seamless_rotation = 42;
optional bool has_compat_scale = 43;
optional float global_scale = 44;
+ repeated .android.graphics.RectProto keep_clear_areas = 45;
}
message IdentifierProto {
diff --git a/core/proto/android/service/usb.proto b/core/proto/android/service/usb.proto
index 97097ff..b3f54f9 100644
--- a/core/proto/android/service/usb.proto
+++ b/core/proto/android/service/usb.proto
@@ -196,9 +196,19 @@
message UsbPortManagerProto {
option (android.msg_privacy).dest = DEST_AUTOMATIC;
+ enum HalVersion {
+ V_UNKNOWN = 0;
+ V1_0 = 10;
+ V1_1 = 11;
+ V1_2 = 12;
+ V1_3 = 13;
+ V2 = 20;
+ }
+
optional bool is_simulation_active = 1;
repeated UsbPortInfoProto usb_ports = 2;
optional bool enable_usb_data_signaling = 3;
+ optional HalVersion hal_version = 4;
}
message UsbPortInfoProto {
@@ -254,6 +264,8 @@
optional DataRole data_role = 4;
repeated UsbPortStatusRoleCombinationProto role_combinations = 5;
optional android.service.ContaminantPresenceStatus contaminant_presence_status = 6;
+ optional bool usb_data_enabled = 7;
+ optional bool is_power_transfer_limited = 8;
}
message UsbPortStatusRoleCombinationProto {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0fd4629..a4d4069 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -6043,10 +6043,15 @@
<permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING"
android:protectionLevel="signature" />
- <!-- Allows managing the Game Mode
- @hide Used internally. -->
+ <!-- @SystemApi Allows managing the Game Mode
+ @hide -->
<permission android:name="android.permission.MANAGE_GAME_MODE"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature|privileged" />
+
+ <!-- @SystemApi Allows accessing the frame rate per second of a given application
+ @hide -->
+ <permission android:name="android.permission.ACCESS_FPS_COUNTER"
+ android:protectionLevel="signature|privileged" />
<!-- @SystemApi Allows the holder to register callbacks to inform the RebootReadinessManager
when they are performing reboot-blocking work.
@@ -6105,11 +6110,21 @@
<permission android:name="android.permission.CAPTURE_BLACKOUT_CONTENT"
android:protectionLevel="signature" />
- <!-- @SystemApi Allows an application to query over global data in AppSearch.
+ <!-- @SystemApi Allows an application to query over global data in AppSearch.
@hide -->
<permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA"
android:protectionLevel="internal|role" />
+ <!-- Allows an application to query over global data in AppSearch that's visible to the
+ ASSISTANT role. -->
+ <permission android:name="android.permission.READ_ASSISTANT_APP_SEARCH_DATA"
+ android:protectionLevel="internal|role" />
+
+ <!-- Allows an application to query over global data in AppSearch that's visible to the
+ HOME role. -->
+ <permission android:name="android.permission.READ_HOME_APP_SEARCH_DATA"
+ android:protectionLevel="internal|role" />
+
<!-- @SystemApi Allows an application to create virtual devices in VirtualDeviceManager.
@hide -->
<permission android:name="android.permission.CREATE_VIRTUAL_DEVICE"
@@ -6123,7 +6138,7 @@
<permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE"
android:protectionLevel="signature|privileged" />
- <!-- Allows an application to launch device manager setup screens.
+ <!-- @SystemApi Allows an application to launch device manager setup screens.
<p>Not for use by third-party applications.
@hide
-->
@@ -6151,6 +6166,19 @@
<permission android:name="android.permission.MANAGE_SAFETY_CENTER"
android:protectionLevel="internal|installer|role" />
+ <!-- @SystemApi Allows an application to access the AmbientContextEvent service.
+ @hide
+ -->
+ <permission android:name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"
+ android:protectionLevel="internal|role"/>
+
+ <!-- @SystemApi Required by a AmbientContextEventDetectionService
+ to ensure that only the service with this permission can bind to it.
+ @hide
+ -->
+ <permission android:name="android.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE"
+ android:protectionLevel="signature" />
+
<!-- Attribution for Geofencing service. -->
<attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>
<!-- Attribution for Country Detector. -->
diff --git a/core/res/OWNERS b/core/res/OWNERS
index b18a989..4bea4d5 100644
--- a/core/res/OWNERS
+++ b/core/res/OWNERS
@@ -34,3 +34,7 @@
# Wear
per-file res/*-watch/* = file:/platform/frameworks/opt/wear:/OWNERS
+
+# PowerProfile
+per-file res/xml/power_profile.xml = file:/BATTERY_STATS_OWNERS
+per-file res/xml/power_profile_test.xml = file:/BATTERY_STATS_OWNERS
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index e232d85..a5da1ba 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3347,6 +3347,14 @@
<p>Note that this flag will only be respected if the View's Outline returns true from
{@link android.graphics.Outline#canClip()}. -->
<attr name="clipToOutline" format="boolean" />
+
+ <!-- <p> Sets a preference to keep the bounds of this view clear from floating windows
+ above this view's window. This informs the system that the view is considered a vital
+ area for the user and that ideally it should not be covered. Setting this is only
+ appropriate for UI where the user would likely take action to uncover it.
+ <p>The system will try to respect this, but when not possible will ignore it.
+ See {@link android.view.View#setPreferKeepClear}. -->
+ <attr name="preferKeepClear" format="boolean" />
</declare-styleable>
<!-- Attributes that can be assigned to a tag for a particular View. -->
@@ -9376,11 +9384,12 @@
<attr name="canPauseRecording" format="boolean" />
</declare-styleable>
- <!-- Use <code>tv-iapp</code> as the root tag of the XML resource that describes a
- {@link android.media.tv.interactive.TvIAppService}, which is referenced from its
- {@link android.media.tv.interactive.TvIAppService#SERVICE_META_DATA} meta-data entry.
- Described here are the attributes that can be included in that tag. -->
- <declare-styleable name="TvIAppService">
+ <!-- Use <code>tv-interactive-app</code> as the root tag of the XML resource that describes a
+ {@link android.media.tv.interactive.TvInteractiveAppService}, which is referenced
+ from its
+ {@link android.media.tv.interactive.TvInteractiveAppService#SERVICE_META_DATA}
+ meta-data entry. Described here are the attributes that can be included in that tag. -->
+ <declare-styleable name="TvInteractiveAppService">
<!-- The interactive app types that the TV interactive app service supports.
Reference to a string array resource that describes the supported types,
e.g. HbbTv, Ginga. -->
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index a595433..3a2fb6e 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -401,6 +401,15 @@
and before. -->
<attr name="sharedUserMaxSdkVersion" format="integer" />
+ <!-- Whether the application should inherit all AndroidKeyStore keys of its shared user
+ group in the case of leaving its shared user ID in an upgrade. If set to false, all
+ AndroidKeyStore keys will remain in the shared user group, and the application will no
+ longer have access to those keys after the upgrade. If set to true, all AndroidKeyStore
+ keys owned by the shared user group will be transferred to the upgraded application;
+ other applications in the shared user group will no longer have access to those keys
+ after the migration. The default value is false if not explicitly set. -->
+ <attr name="inheritKeyStoreKeys" format="boolean" />
+
<!-- Internal version code. This is the number used to determine whether
one version is more recent than another: it has no other meaning than
that higher numbers are more recent. You could use this number to
@@ -1677,6 +1686,7 @@
<attr name="sharedUserId" />
<attr name="sharedUserLabel" />
<attr name="sharedUserMaxSdkVersion" />
+ <attr name="inheritKeyStoreKeys" />
<attr name="installLocation" />
<attr name="isolatedSplits" />
<attr name="isFeatureSplit" />
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4a5df99..c0c8618 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4077,6 +4077,12 @@
-->
<string name="config_defaultRotationResolverService" translatable="false"></string>
+ <!-- The component name for the default system AmbientContextEvent detection service.
+ This service must be trusted, as it can be activated without explicit consent of the user.
+ See android.service.ambientcontext.AmbientContextDetectionService.
+ -->
+ <string name="config_defaultAmbientContextDetectionService" translatable="false"></string>
+
<!-- The component name for the system-wide captions service.
This service must be trusted, as it controls part of the UI of the volume bar.
Example: "com.android.captions/.SystemCaptionsService"
@@ -4247,7 +4253,7 @@
<string translatable="false" name="config_defaultRingtoneVibrationSound"></string>
<!-- Default number of notifications from the same app before they are automatically grouped by the OS -->
- <integer translatable="false" name="config_autoGroupAtCount">4</integer>
+ <integer translatable="false" name="config_autoGroupAtCount">2</integer>
<!-- The OEM specified sensor type for the lift trigger to launch the camera app. -->
<integer name="config_cameraLiftTriggerSensorType">-1</integer>
@@ -5612,4 +5618,7 @@
<!-- Flag indicating if help links for Settings app should be enabled. -->
<bool name="config_settingsHelpLinksEnabled">false</bool>
+
+ <!-- Whether or not to enable the lock screen entry point for the QR code scanner. -->
+ <bool name="config_enableQrCodeScannerOnLockScreen">false</bool>
</resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index d2ac8a3..42386fc 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3256,6 +3256,8 @@
<public name="gameSessionService" />
<public name="localeConfig" />
<public name="showBackground" />
+ <public name="inheritKeyStoreKeys" />
+ <public name="preferKeepClear" />
</staging-public-group>
<staging-public-group type="id" first-id="0x01de0000">
@@ -3324,6 +3326,8 @@
<staging-public-group type="bool" first-id="0x01cf0000">
<!-- @hide @TestApi -->
<public name="config_preventImeStartupUnlessTextEditor" />
+ <!-- @hide @SystemApi -->
+ <public name="config_enableQrCodeScannerOnLockScreen" />
</staging-public-group>
<staging-public-group type="fraction" first-id="0x01ce0000">
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 5e88519..f639350 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3652,6 +3652,7 @@
<java-symbol type="string" name="config_defaultRotationResolverService" />
<java-symbol type="string" name="config_defaultSystemCaptionsService" />
<java-symbol type="string" name="config_defaultSystemCaptionsManagerService" />
+ <java-symbol type="string" name="config_defaultAmbientContextDetectionService" />
<java-symbol type="string" name="config_retailDemoPackage" />
<java-symbol type="string" name="config_retailDemoPackageSignature" />
diff --git a/core/res/res/xml/power_profile.xml b/core/res/res/xml/power_profile.xml
index d310736..fc63657 100644
--- a/core/res/res/xml/power_profile.xml
+++ b/core/res/res/xml/power_profile.xml
@@ -144,17 +144,49 @@
<value>2</value> <!-- 4097-/hr -->
</array>
- <!-- Cellular modem related values. Default is 0.-->
- <item name="modem.controller.sleep">0</item>
- <item name="modem.controller.idle">0</item>
- <item name="modem.controller.rx">0</item>
- <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
- <value>0</value>
- <value>0</value>
- <value>0</value>
- <value>0</value>
- <value>0</value>
- </array>
+ <!-- Cellular modem related values.-->
+ <modem>
+ <!-- Modem sleep drain current value in mA. -->
+ <sleep>0</sleep>
+ <!-- Modem idle drain current value in mA. -->
+ <idle>0</idle>
+ <!-- Modem active drain current values.
+ Multiple <active /> can be defined to specify current drain for different modes of
+ operation.
+ Available attributes:
+ rat - Specify the current drain for a Radio Access Technology.
+ Available options are "LTE", "NR" and "DEFAULT".
+ <active rat="default" /> will be used for any usage that does not match any other
+ defined <active /> rat.
+
+ nrFrequency - Specify the current drain for a frequency level while NR is active.
+ Available options are "LOW", "MID", "HIGH", "MMWAVE", and "DEFAULT",
+ where,
+ "LOW" indicated <1GHz frequencies,
+ "MID" indicates 1GHz to 3GHz frequencies,
+ "HIGH" indicates 3GHz to 6GHz frequencies,
+ "MMWAVE"indicates >6GHz frequencies.
+ <active rat="NR" nrFrequency="default"/> will be used for any usage that
+ does not match any other defined <active rat="NR" /> nrFrequency.
+ -->
+ <active rat="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>0</receive>
+
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">0</transmit>
+ <transmit level="1">0</transmit>
+ <transmit level="2">0</transmit>
+ <transmit level="3">0</transmit>
+ <transmit level="4">0</transmit>
+ </active>
+ <!-- Additional <active /> may be defined.
+ Example:
+ <active rat="LTE"> ... </active>
+ <active rat="NR" nrFrequency="MMWAVE"> ... </active>
+ <active rat="NR" nrFrequency="DEFAULT"> ... </active>
+ -->
+ </modem>
<item name="modem.controller.voltage">0</item>
<!-- GPS related values. Default is 0.-->
@@ -163,5 +195,4 @@
<value>0</value>
</array>
<item name="gps.voltage">0</item>
-
</device>
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index f2b35c7..a80424e 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -38,6 +38,7 @@
<uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED" />
+ <uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" />
<uses-permission android:name="android.permission.DOWNLOAD_CACHE_NON_PURGEABLE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -64,6 +65,7 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<uses-permission android:name="android.permission.READ_DREAM_STATE" />
+ <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
<uses-permission android:name="android.permission.WRITE_DREAM_STATE" />
<uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />
<uses-permission android:name="android.permission.READ_LOGS"/>
diff --git a/core/tests/coretests/res/xml/power_profile_test_modem.xml b/core/tests/coretests/res/xml/power_profile_test_modem.xml
new file mode 100644
index 0000000..ff36a9c
--- /dev/null
+++ b/core/tests/coretests/res/xml/power_profile_test_modem.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2021, 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.
+*/
+-->
+
+<device name="test">
+ <test-modem name="testModemPowerProfile_defaultRat">
+ <!-- Modem sleep drain current value in mA. -->
+ <sleep>10</sleep>
+ <!-- Modem idle drain current value in mA. -->
+ <idle>20</idle>
+ <active rat="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>30</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">40</transmit>
+ <transmit level="1">50</transmit>
+ <transmit level="2">60</transmit>
+ <transmit level="3">70</transmit>
+ <transmit level="4">80</transmit>
+ </active>
+ </test-modem>
+
+ <test-modem name="testModemPowerProfile_partiallyDefined">
+ <!-- Modem sleep drain current value in mA. -->
+ <sleep>1</sleep>
+ <!-- Modem idle drain current value in mA. -->
+ <idle>2</idle>
+ <active rat="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>3</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">4</transmit>
+ <transmit level="1">5</transmit>
+ <transmit level="2">6</transmit>
+ <transmit level="3">7</transmit>
+ <transmit level="4">8</transmit>
+ </active>
+ <active rat="NR" nrFrequency="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>13</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">14</transmit>
+ <transmit level="1">15</transmit>
+ <transmit level="2">16</transmit>
+ <transmit level="3">17</transmit>
+ <transmit level="4">18</transmit>
+ </active>
+ <active rat="NR" nrFrequency="MMWAVE">
+ <!-- Transmit current drain in mA. -->
+ <receive>53</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">54</transmit>
+ <transmit level="1">55</transmit>
+ <transmit level="2">56</transmit>
+ <transmit level="3">57</transmit>
+ <transmit level="4">58</transmit>
+ </active>
+ </test-modem>
+
+ <test-modem name="testModemPowerProfile_fullyDefined">
+ <!-- Modem sleep drain current value in mA. -->
+ <sleep>1</sleep>
+ <!-- Modem idle drain current value in mA. -->
+ <idle>2</idle>
+ <active rat="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>3</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">4</transmit>
+ <transmit level="1">5</transmit>
+ <transmit level="2">6</transmit>
+ <transmit level="3">7</transmit>
+ <transmit level="4">8</transmit>
+ </active>
+ <active rat="LTE">
+ <!-- Transmit current drain in mA. -->
+ <receive>10</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">20</transmit>
+ <transmit level="1">30</transmit>
+ <transmit level="2">40</transmit>
+ <transmit level="3">50</transmit>
+ <transmit level="4">60</transmit>
+ </active>
+ <active rat="NR" nrFrequency="DEFAULT">
+ <!-- Transmit current drain in mA. -->
+ <receive>13</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">14</transmit>
+ <transmit level="1">15</transmit>
+ <transmit level="2">16</transmit>
+ <transmit level="3">17</transmit>
+ <transmit level="4">18</transmit>
+ </active>
+ <active rat="NR" nrFrequency="LOW">
+ <!-- Transmit current drain in mA. -->
+ <receive>23</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">24</transmit>
+ <transmit level="1">25</transmit>
+ <transmit level="2">26</transmit>
+ <transmit level="3">27</transmit>
+ <transmit level="4">28</transmit>
+ </active>
+ <active rat="NR" nrFrequency="MID">
+ <!-- Transmit current drain in mA. -->
+ <receive>33</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">34</transmit>
+ <transmit level="1">35</transmit>
+ <transmit level="2">36</transmit>
+ <transmit level="3">37</transmit>
+ <transmit level="4">38</transmit>
+ </active>
+ <active rat="NR" nrFrequency="HIGH">
+ <!-- Transmit current drain in mA. -->
+ <receive>43</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">44</transmit>
+ <transmit level="1">45</transmit>
+ <transmit level="2">46</transmit>
+ <transmit level="3">47</transmit>
+ <transmit level="4">48</transmit>
+ </active>
+ <active rat="NR" nrFrequency="MMWAVE">
+ <!-- Transmit current drain in mA. -->
+ <receive>53</receive>
+ <!-- Transmit current drains in mA. Must be defined for all levels (0 to 4) -->
+ <transmit level="0">54</transmit>
+ <transmit level="1">55</transmit>
+ <transmit level="2">56</transmit>
+ <transmit level="3">57</transmit>
+ <transmit level="4">58</transmit>
+ </active>
+ </test-modem>
+</device>
diff --git a/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java b/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
index 0cfcd8f8..b66642c 100644
--- a/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
+++ b/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
@@ -16,11 +16,17 @@
package android.content.pm;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_PERSONAL_LABEL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.SWITCH_TO_WORK_LABEL;
+
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@@ -58,6 +64,8 @@
@Mock
private UserManager mUserManager;
@Mock
+ private DevicePolicyManager mDevicePolicyManager;
+ @Mock
private ICrossProfileApps mService;
@Mock
private Resources mResources;
@@ -75,6 +83,10 @@
when(mContext.getPackageName()).thenReturn(MY_PACKAGE);
when(mContext.getSystemServiceName(UserManager.class)).thenReturn(Context.USER_SERVICE);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mContext.getSystemServiceName(DevicePolicyManager.class)).thenReturn(
+ Context.DEVICE_POLICY_SERVICE);
+ when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
+ mDevicePolicyManager);
}
@Before
@@ -98,7 +110,7 @@
setValidTargetProfile(MANAGED_PROFILE);
mCrossProfileApps.getProfileSwitchingLabel(MANAGED_PROFILE);
- verify(mResources).getString(R.string.managed_profile_label);
+ verify(mDevicePolicyManager).getString(eq(SWITCH_TO_WORK_LABEL), any());
}
@Test
@@ -106,7 +118,7 @@
setValidTargetProfile(PERSONAL_PROFILE);
mCrossProfileApps.getProfileSwitchingLabel(PERSONAL_PROFILE);
- verify(mResources).getString(R.string.user_owner_label);
+ verify(mDevicePolicyManager).getString(eq(SWITCH_TO_PERSONAL_LABEL), any());
}
@Test(expected = SecurityException.class)
diff --git a/core/tests/coretests/src/android/util/SparseDoubleArrayTest.java b/core/tests/coretests/src/android/util/SparseDoubleArrayTest.java
index 2dd3f69..ba9c8d9 100644
--- a/core/tests/coretests/src/android/util/SparseDoubleArrayTest.java
+++ b/core/tests/coretests/src/android/util/SparseDoubleArrayTest.java
@@ -64,12 +64,12 @@
}
@Test
- public void testAdd() {
+ public void testIncrementValue() {
final SparseDoubleArray sda = new SparseDoubleArray();
sda.put(4, 6.1);
- sda.add(4, -1.2);
- sda.add(2, -1.2);
+ sda.incrementValue(4, -1.2);
+ sda.incrementValue(2, -1.2);
assertEquals(6.1 - 1.2, sda.get(4), PRECISION);
assertEquals(-1.2, sda.get(2), PRECISION);
diff --git a/core/tests/coretests/src/android/util/SparseLongArrayTest.java b/core/tests/coretests/src/android/util/SparseLongArrayTest.java
index df2d752..b29b6f1 100644
--- a/core/tests/coretests/src/android/util/SparseLongArrayTest.java
+++ b/core/tests/coretests/src/android/util/SparseLongArrayTest.java
@@ -154,4 +154,16 @@
assertRemoved(startIndex, endIndex);
assertTrue(isSame(sparseLongArray2, mSparseLongArray));
}
+
+ @Test
+ public void testIncrementValue() {
+ final SparseLongArray sla = new SparseLongArray();
+
+ sla.put(4, 6);
+ sla.incrementValue(4, 4);
+ sla.incrementValue(2, 5);
+
+ assertEquals(6 + 4, sla.get(4));
+ assertEquals(5, sla.get(2));
+ }
}
diff --git a/core/tests/coretests/src/android/view/HandwritingInitiatorTest.java b/core/tests/coretests/src/android/view/HandwritingInitiatorTest.java
index 8f04461..5ea9199 100644
--- a/core/tests/coretests/src/android/view/HandwritingInitiatorTest.java
+++ b/core/tests/coretests/src/android/view/HandwritingInitiatorTest.java
@@ -33,7 +33,6 @@
import android.content.Context;
import android.graphics.Rect;
import android.platform.test.annotations.Presubmit;
-import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,7 +56,6 @@
private static final int TOUCH_SLOP = 8;
private static final long TAP_TIMEOUT = ViewConfiguration.getTapTimeout();
private static final Rect sHwArea = new Rect(100, 200, 500, 500);
- private static final EditorInfo sFakeEditorInfo = new EditorInfo();
private HandwritingInitiator mHandwritingInitiator;
private View mTestView;
@@ -72,7 +70,6 @@
InputMethodManager inputMethodManager = context.getSystemService(InputMethodManager.class);
mHandwritingInitiator =
spy(new HandwritingInitiator(viewConfiguration, inputMethodManager));
- mHandwritingInitiator.updateEditorBound(sHwArea);
// mock a parent so that HandwritingInitiator can get
ViewGroup parent = new ViewGroup(context) {
@@ -82,10 +79,7 @@
}
@Override
public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
- r.left = sHwArea.left;
- r.top = sHwArea.top;
- r.right = sHwArea.right;
- r.bottom = sHwArea.bottom;
+ r.set(sHwArea);
return true;
}
};
@@ -97,7 +91,7 @@
@Test
public void onTouchEvent_startHandwriting_when_stylusMoveOnce_withinHWArea() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
final int x1 = (sHwArea.left + sHwArea.right) / 2;
final int y1 = (sHwArea.top + sHwArea.bottom) / 2;
MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0);
@@ -109,13 +103,13 @@
MotionEvent stylusEvent2 = createStylusEvent(ACTION_MOVE, x2, y2, 0);
mHandwritingInitiator.onTouchEvent(stylusEvent2);
- // Stylus movement win HandwritingArea should trigger IMM.startHandwriting once.
+ // Stylus movement within HandwritingArea should trigger IMM.startHandwriting once.
verify(mHandwritingInitiator, times(1)).startHandwriting(mTestView);
}
@Test
public void onTouchEvent_startHandwritingOnce_when_stylusMoveMultiTimes_withinHWArea() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
final int x1 = (sHwArea.left + sHwArea.right) / 2;
final int y1 = (sHwArea.top + sHwArea.bottom) / 2;
MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0);
@@ -152,14 +146,14 @@
mHandwritingInitiator.onTouchEvent(stylusEvent2);
// InputConnection is created after stylus movement.
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
verify(mHandwritingInitiator, times(1)).startHandwriting(mTestView);
}
@Test
public void onTouchEvent_notStartHandwriting_when_stylusTap_withinHWArea() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
final int x1 = 200;
final int y1 = 200;
MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0);
@@ -175,7 +169,7 @@
@Test
public void onTouchEvent_notStartHandwriting_when_stylusMove_outOfHWArea() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
final int x1 = 10;
final int y1 = 10;
MotionEvent stylusEvent1 = createStylusEvent(ACTION_DOWN, x1, y1, 0);
@@ -191,7 +185,7 @@
@Test
public void onTouchEvent_notStartHandwriting_when_stylusMove_afterTapTimeOut() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
final int x1 = 10;
final int y1 = 10;
final long time1 = 10L;
@@ -210,18 +204,17 @@
@Test
public void onInputConnectionCreated_inputConnectionCreated() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
assertThat(mHandwritingInitiator.mConnectedView).isNotNull();
assertThat(mHandwritingInitiator.mConnectedView.get()).isEqualTo(mTestView);
}
@Test
public void onInputConnectionCreated_inputConnectionClosed() {
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
mHandwritingInitiator.onInputConnectionClosed(mTestView);
assertThat(mHandwritingInitiator.mConnectedView).isNull();
- assertThat(mHandwritingInitiator.mEditorBound).isNull();
}
@Test
@@ -229,22 +222,14 @@
// When IMM restarts input connection, View#onInputConnectionCreatedInternal might be
// called before View#onInputConnectionClosedInternal. As a result, we need to handle the
// case where "one view "2 InputConnections".
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
- mHandwritingInitiator.onInputConnectionCreated(mTestView, sFakeEditorInfo);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
+ mHandwritingInitiator.onInputConnectionCreated(mTestView);
mHandwritingInitiator.onInputConnectionClosed(mTestView);
assertThat(mHandwritingInitiator.mConnectedView).isNotNull();
assertThat(mHandwritingInitiator.mConnectedView.get()).isEqualTo(mTestView);
}
- @Test
- public void updateEditorBound() {
- Rect rect = new Rect(1, 2, 3, 4);
- mHandwritingInitiator.updateEditorBound(rect);
-
- assertThat(mHandwritingInitiator.mEditorBound).isEqualTo(rect);
- }
-
private MotionEvent createStylusEvent(int action, int x, int y, long eventTime) {
MotionEvent.PointerProperties[] properties = MotionEvent.PointerProperties.createArray(1);
properties[0].toolType = MotionEvent.TOOL_TYPE_STYLUS;
diff --git a/core/tests/coretests/src/android/view/SurfaceControlFpsListenerTest.java b/core/tests/coretests/src/android/view/SurfaceControlFpsListenerTest.java
deleted file mode 100644
index c15fc3a..0000000
--- a/core/tests/coretests/src/android/view/SurfaceControlFpsListenerTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.view;
-
-import android.platform.test.annotations.Presubmit;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-@Presubmit
-public class SurfaceControlFpsListenerTest {
-
- @Test
- public void registersAndUnregisters() {
-
- SurfaceControlFpsListener listener = new SurfaceControlFpsListener() {
- @Override
- public void onFpsReported(float fps) {
- // Ignore
- }
- };
-
- listener.register(0);
-
- listener.unregister();
- }
-}
diff --git a/core/tests/coretests/src/android/window/TaskFpsCallbackTest.java b/core/tests/coretests/src/android/window/TaskFpsCallbackTest.java
new file mode 100644
index 0000000..bf508db
--- /dev/null
+++ b/core/tests/coretests/src/android/window/TaskFpsCallbackTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
+import android.content.Context;
+import android.platform.test.annotations.Presubmit;
+import android.view.WindowManager;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+@Presubmit
+public class TaskFpsCallbackTest {
+
+ private Context mContext;
+ private WindowManager mWindowManager;
+ private ActivityTaskManager mActivityTaskManager;
+
+ @Before
+ public void setup() {
+ mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ mActivityTaskManager = mContext.getSystemService(ActivityTaskManager.class);
+ mWindowManager = mContext.getSystemService(WindowManager.class);
+ }
+
+ @Test
+ public void testRegisterAndUnregister() {
+
+ final TaskFpsCallback.OnFpsCallbackListener listener = fps -> {
+ // Ignore
+ };
+ final TaskFpsCallback callback = new TaskFpsCallback(Runnable::run, listener);
+
+ final List<ActivityManager.RunningTaskInfo> tasks = mActivityTaskManager.getTasks(1);
+ assertEquals(tasks.size(), 1);
+ mWindowManager.registerTaskFpsCallback(tasks.get(0).taskId, callback);
+ mWindowManager.unregisterTaskFpsCallback(callback);
+ }
+}
diff --git a/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java b/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java
new file mode 100644
index 0000000..a1a1e20
--- /dev/null
+++ b/core/tests/coretests/src/android/window/WindowOnBackInvokedDispatcherTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2021 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.window;
+
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.view.IWindow;
+import android.view.IWindowSession;
+import android.view.OnBackInvokedCallback;
+import android.view.OnBackInvokedDispatcher;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Tests for {@link WindowOnBackInvokedDispatcherTest}
+ *
+ * <p>Build/Install/Run:
+ * atest FrameworksCoreTests:WindowOnBackInvokedDispatcherTest
+ */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+@Presubmit
+public class WindowOnBackInvokedDispatcherTest {
+ @Mock
+ private IWindowSession mWindowSession;
+ @Mock
+ private IWindow mWindow;
+ private WindowOnBackInvokedDispatcher mDispatcher;
+ @Mock
+ private OnBackInvokedCallback mCallback1;
+ @Mock
+ private OnBackInvokedCallback mCallback2;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mDispatcher = new WindowOnBackInvokedDispatcher();
+ mDispatcher.attachToWindow(mWindowSession, mWindow);
+ }
+
+ private void waitForIdle() {
+ InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+ }
+
+ @Test
+ public void propagatesTopCallback_samePriority() throws RemoteException {
+ ArgumentCaptor<IOnBackInvokedCallback> captor =
+ ArgumentCaptor.forClass(IOnBackInvokedCallback.class);
+
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback1, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback2, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+
+ verify(mWindowSession, times(2))
+ .setOnBackInvokedCallback(Mockito.eq(mWindow), captor.capture());
+ captor.getAllValues().get(0).onBackStarted();
+ waitForIdle();
+ verify(mCallback1).onBackStarted();
+ verifyZeroInteractions(mCallback2);
+
+ captor.getAllValues().get(1).onBackStarted();
+ waitForIdle();
+ verify(mCallback2).onBackStarted();
+ verifyNoMoreInteractions(mCallback1);
+ }
+
+ @Test
+ public void propagatesTopCallback_differentPriority() throws RemoteException {
+ ArgumentCaptor<IOnBackInvokedCallback> captor =
+ ArgumentCaptor.forClass(IOnBackInvokedCallback.class);
+
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback1, OnBackInvokedDispatcher.PRIORITY_OVERLAY);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback2, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+
+ verify(mWindowSession)
+ .setOnBackInvokedCallback(Mockito.eq(mWindow), captor.capture());
+ verifyNoMoreInteractions(mWindowSession);
+ captor.getValue().onBackStarted();
+ waitForIdle();
+ verify(mCallback1).onBackStarted();
+ }
+
+ @Test
+ public void propagatesTopCallback_withRemoval() throws RemoteException {
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback1, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback2, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+
+ reset(mWindowSession);
+ mDispatcher.unregisterOnBackInvokedCallback(mCallback1);
+ verifyZeroInteractions(mWindowSession);
+
+ mDispatcher.unregisterOnBackInvokedCallback(mCallback2);
+ verify(mWindowSession).setOnBackInvokedCallback(Mockito.eq(mWindow), isNull());
+ }
+
+
+ @Test
+ public void propagatesTopCallback_sameInstanceAddedTwice() throws RemoteException {
+ ArgumentCaptor<IOnBackInvokedCallback> captor =
+ ArgumentCaptor.forClass(IOnBackInvokedCallback.class);
+
+ mDispatcher.registerOnBackInvokedCallback(mCallback1,
+ OnBackInvokedDispatcher.PRIORITY_OVERLAY);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback2, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback1, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
+
+ reset(mWindowSession);
+ mDispatcher.registerOnBackInvokedCallback(
+ mCallback2, OnBackInvokedDispatcher.PRIORITY_OVERLAY);
+ verify(mWindowSession)
+ .setOnBackInvokedCallback(Mockito.eq(mWindow), captor.capture());
+ captor.getValue().onBackStarted();
+ waitForIdle();
+ verify(mCallback2).onBackStarted();
+ }
+}
diff --git a/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java b/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java
index 43590ba..1f6b57e 100644
--- a/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java
+++ b/core/tests/coretests/src/com/android/internal/app/IntentForwarderActivityTest.java
@@ -297,7 +297,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector).showToast(anyInt(), anyInt());
+ verify(sInjector).showToast(anyString(), anyInt());
}
@Test
@@ -312,7 +312,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -324,7 +324,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -336,7 +336,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -348,7 +348,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -360,7 +360,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -372,7 +372,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector).showToast(anyInt(), anyInt());
+ verify(sInjector).showToast(anyString(), anyInt());
}
@Test
@@ -386,7 +386,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -399,7 +399,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -412,7 +412,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -425,7 +425,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -438,7 +438,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -452,7 +452,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -466,7 +466,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -480,7 +480,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -494,7 +494,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -507,7 +507,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector).showToast(anyInt(), anyInt());
+ verify(sInjector).showToast(anyString(), anyInt());
}
@Test
@@ -521,7 +521,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector).showToast(anyInt(), anyInt());
+ verify(sInjector).showToast(anyString(), anyInt());
}
@Test
@@ -535,7 +535,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector).showToast(anyInt(), anyInt());
+ verify(sInjector).showToast(anyString(), anyInt());
}
@Test
@@ -551,7 +551,7 @@
mActivityRule.launchActivity(intent);
verify(mIPm).canForwardTo(any(), any(), anyInt(), anyInt());
- verify(sInjector, never()).showToast(anyInt(), anyInt());
+ verify(sInjector, never()).showToast(anyString(), anyInt());
}
@Test
@@ -692,6 +692,6 @@
}
@Override
- public void showToast(int messageId, int duration) {}
+ public void showToast(String message, int duration) {}
}
}
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
index 388cf6e..be8045d 100644
--- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsImplTest.java
@@ -37,8 +37,12 @@
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
+import android.bluetooth.BluetoothActivityEnergyInfo;
+import android.bluetooth.UidTraffic;
import android.os.BatteryStats;
+import android.os.BluetoothBatteryStats;
import android.os.WakeLockStats;
+import android.os.WorkSource;
import android.util.SparseArray;
import android.view.Display;
@@ -47,6 +51,8 @@
import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader;
+import com.google.common.collect.ImmutableList;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -66,6 +72,8 @@
private KernelCpuUidFreqTimeReader mKernelUidCpuFreqTimeReader;
@Mock
private KernelSingleUidTimeReader mKernelSingleUidTimeReader;
+ @Mock
+ private PowerProfile mPowerProfile;
private final MockClock mMockClock = new MockClock();
private MockBatteryStatsImpl mBatteryStatsImpl;
@@ -79,6 +87,7 @@
when(mKernelUidCpuFreqTimeReader.allUidTimesAvailable()).thenReturn(true);
when(mKernelSingleUidTimeReader.singleUidCpuTimesAvailable()).thenReturn(true);
mBatteryStatsImpl = new MockBatteryStatsImpl(mMockClock)
+ .setPowerProfile(mPowerProfile)
.setKernelCpuUidFreqTimeReader(mKernelUidCpuFreqTimeReader)
.setKernelSingleUidTimeReader(mKernelSingleUidTimeReader);
}
@@ -559,4 +568,38 @@
assertThat(wakeLock2.timeHeldMs).isEqualTo(3000); // 9000-6000
assertThat(wakeLock2.totalTimeHeldMs).isEqualTo(4000); // (5000-4000) + (9000-6000)
}
+
+ @Test
+ public void testGetBluetoothBatteryStats() {
+ when(mPowerProfile.getAveragePower(
+ PowerProfile.POWER_BLUETOOTH_CONTROLLER_OPERATING_VOLTAGE)).thenReturn(3.0);
+ mBatteryStatsImpl.setOnBatteryInternal(true);
+ mBatteryStatsImpl.updateTimeBasesLocked(true, Display.STATE_OFF, 0, 0);
+
+ final WorkSource ws = new WorkSource(10042);
+ mBatteryStatsImpl.noteBluetoothScanStartedFromSourceLocked(ws, false, 1000, 1000);
+ mBatteryStatsImpl.noteBluetoothScanStoppedFromSourceLocked(ws, false, 5000, 5000);
+ mBatteryStatsImpl.noteBluetoothScanStartedFromSourceLocked(ws, true, 6000, 6000);
+ mBatteryStatsImpl.noteBluetoothScanStoppedFromSourceLocked(ws, true, 9000, 9000);
+ mBatteryStatsImpl.noteBluetoothScanResultsFromSourceLocked(ws, 42, 9000, 9000);
+
+ BluetoothActivityEnergyInfo info = new BluetoothActivityEnergyInfo(1000,
+ BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 9000, 8000, 12000, 0);
+ info.setUidTraffic(ImmutableList.of(
+ new UidTraffic(10042, 3000, 4000),
+ new UidTraffic(10043, 5000, 8000)));
+ mBatteryStatsImpl.updateBluetoothStateLocked(info, -1, 1000, 1000);
+
+ BluetoothBatteryStats stats =
+ mBatteryStatsImpl.getBluetoothBatteryStats();
+ assertThat(stats.getUidStats()).hasSize(2);
+
+ final BluetoothBatteryStats.UidStats uidStats =
+ stats.getUidStats().stream().filter(u -> u.uid == 10042).findFirst().get();
+ assertThat(uidStats.scanTimeMs).isEqualTo(7000); // 4000+3000
+ assertThat(uidStats.unoptimizedScanTimeMs).isEqualTo(3000);
+ assertThat(uidStats.scanResultCount).isEqualTo(42);
+ assertThat(uidStats.rxTimeMs).isEqualTo(7375); // Some scan time is treated as RX
+ assertThat(uidStats.txTimeMs).isEqualTo(7666); // Some scan time is treated as TX
+ }
}
diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java
index 9699275..8cc4c34 100644
--- a/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java
@@ -83,7 +83,7 @@
final Parcel parcel = Parcel.obtain();
parcel.writeParcelable(outBatteryUsageStats, 0);
- assertThat(parcel.dataSize()).isLessThan(6000);
+ assertThat(parcel.dataSize()).isLessThan(7000);
parcel.setDataPosition(0);
diff --git a/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java
index d361da9..ed035e5 100644
--- a/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/BluetoothPowerCalculatorTest.java
@@ -25,18 +25,21 @@
import android.os.BatteryStats;
import android.os.BatteryUsageStatsQuery;
import android.os.Process;
+import android.os.UidBatteryConsumer;
+import android.os.WorkSource;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
+import com.google.common.collect.ImmutableList;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.ArrayList;
-
@RunWith(AndroidJUnit4.class)
@SmallTest
+@SuppressWarnings("GuardedBy")
public class BluetoothPowerCalculatorTest {
private static final double PRECISION = 0.00001;
private static final int APP_UID = Process.FIRST_APPLICATION_UID + 42;
@@ -50,6 +53,12 @@
@Test
public void testTimerBasedModel() {
+ BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();
+
+ final WorkSource ws = new WorkSource(APP_UID);
+ batteryStats.noteBluetoothScanStartedFromSourceLocked(ws, false, 0, 0);
+ batteryStats.noteBluetoothScanStoppedFromSourceLocked(ws, false, 1000, 1000);
+
setupBluetoothEnergyInfo(0, BatteryStats.POWER_DATA_UNAVAILABLE);
BluetoothPowerCalculator calculator =
@@ -57,8 +66,81 @@
mStatsRule.apply(BatteryUsageStatsRule.POWER_PROFILE_MODEL_ONLY, calculator);
- assertCalculatedPower(0.08216, 0.18169, 0.26388, 0.26386,
- BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
+ 0.06944, 3000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(APP_UID),
+ 0.19444, 9000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getDeviceBatteryConsumer(),
+ 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getAppsBatteryConsumer(),
+ 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ }
+
+ @Test
+ public void testTimerBasedModel_byProcessState() {
+ mStatsRule.setTime(1000, 1000);
+
+ BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();
+
+ BatteryStatsImpl.Uid uid = batteryStats.getUidStatsLocked(APP_UID);
+ uid.setProcessStateForTest(
+ BatteryStats.Uid.PROCESS_STATE_FOREGROUND, 1000);
+
+ BluetoothActivityEnergyInfo info1 = new BluetoothActivityEnergyInfo(2000,
+ BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 1000, 2000, 3000, 4000);
+ info1.setUidTraffic(ImmutableList.of(
+ new UidTraffic(Process.BLUETOOTH_UID, 1000, 2000),
+ new UidTraffic(APP_UID, 3000, 4000)));
+
+ batteryStats.updateBluetoothStateLocked(info1,
+ 0/*1_000_000*/, 2000, 2000);
+
+ uid.setProcessStateForTest(
+ BatteryStats.Uid.PROCESS_STATE_BACKGROUND, 3000);
+
+ BluetoothActivityEnergyInfo info2 = new BluetoothActivityEnergyInfo(4000,
+ BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 5000, 6000, 7000, 8000);
+ info2.setUidTraffic(ImmutableList.of(
+ new UidTraffic(Process.BLUETOOTH_UID, 5000, 6000),
+ new UidTraffic(APP_UID, 7000, 8000)));
+
+ batteryStats.updateBluetoothStateLocked(info2,
+ 0 /*5_000_000 */, 4000, 4000);
+
+ BluetoothPowerCalculator calculator =
+ new BluetoothPowerCalculator(mStatsRule.getPowerProfile());
+
+ mStatsRule.apply(new BatteryUsageStatsQuery.Builder()
+ .powerProfileModeledOnly()
+ .includePowerModels()
+ .includeProcessStateData()
+ .build(), calculator);
+
+ UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID);
+ assertThat(uidConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isEqualTo(6166);
+ assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isWithin(PRECISION).of(0.1226666);
+ assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+
+ final BatteryConsumer.Key foreground = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_FOREGROUND);
+ final BatteryConsumer.Key background = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_BACKGROUND);
+ final BatteryConsumer.Key fgs = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE);
+
+ assertThat(uidConsumer.getConsumedPower(foreground)).isWithin(PRECISION).of(0.081);
+ assertThat(uidConsumer.getConsumedPower(background)).isWithin(PRECISION).of(0.0416666);
+ assertThat(uidConsumer.getConsumedPower(fgs)).isWithin(PRECISION).of(0);
}
@Test
@@ -71,8 +153,18 @@
mStatsRule.apply(new BatteryUsageStatsQuery.Builder().includePowerModels().build(),
calculator);
- assertCalculatedPower(0.08216, 0.18169, 0.30030, 0.26386,
- BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
+ 0.08216, 3583, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(APP_UID),
+ 0.18169, 8416, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getDeviceBatteryConsumer(),
+ 0.30030, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getAppsBatteryConsumer(),
+ 0.26386, 11999, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
}
@Test
@@ -85,11 +177,85 @@
mStatsRule.apply(calculator);
- assertCalculatedPower(0.10378, 0.22950, 0.33333, 0.33329,
- BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
+ 0.10378, 3583, BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(APP_UID),
+ 0.22950, 8416, BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getDeviceBatteryConsumer(),
+ 0.33333, 12000, BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getAppsBatteryConsumer(),
+ 0.33329, 11999, BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
}
@Test
+ public void testMeasuredEnergyBasedModel_byProcessState() {
+ mStatsRule.initMeasuredEnergyStatsLocked();
+ mStatsRule.setTime(1000, 1000);
+
+ BatteryStatsImpl batteryStats = mStatsRule.getBatteryStats();
+
+ BatteryStatsImpl.Uid uid = batteryStats.getUidStatsLocked(APP_UID);
+ uid.setProcessStateForTest(
+ BatteryStats.Uid.PROCESS_STATE_FOREGROUND, 1000);
+
+ BluetoothActivityEnergyInfo info1 = new BluetoothActivityEnergyInfo(2000,
+ BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 1000, 2000, 3000, 4000);
+ info1.setUidTraffic(ImmutableList.of(
+ new UidTraffic(Process.BLUETOOTH_UID, 1000, 2000),
+ new UidTraffic(APP_UID, 3000, 4000)));
+
+ batteryStats.updateBluetoothStateLocked(info1,
+ 1_000_000, 2000, 2000);
+
+ uid.setProcessStateForTest(
+ BatteryStats.Uid.PROCESS_STATE_BACKGROUND, 3000);
+
+ BluetoothActivityEnergyInfo info2 = new BluetoothActivityEnergyInfo(4000,
+ BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 5000, 6000, 7000, 8000);
+ info2.setUidTraffic(ImmutableList.of(
+ new UidTraffic(Process.BLUETOOTH_UID, 5000, 6000),
+ new UidTraffic(APP_UID, 7000, 8000)));
+
+ batteryStats.updateBluetoothStateLocked(info2,
+ 5_000_000, 4000, 4000);
+
+ BluetoothPowerCalculator calculator =
+ new BluetoothPowerCalculator(mStatsRule.getPowerProfile());
+
+ mStatsRule.apply(new BatteryUsageStatsQuery.Builder()
+ .includePowerModels()
+ .includeProcessStateData()
+ .build(), calculator);
+
+ UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID);
+ assertThat(uidConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isEqualTo(6166);
+ assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isWithin(PRECISION).of(0.8220561);
+ assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_BLUETOOTH))
+ .isEqualTo(BatteryConsumer.POWER_MODEL_MEASURED_ENERGY);
+
+ final BatteryConsumer.Key foreground = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_FOREGROUND);
+ final BatteryConsumer.Key background = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_BACKGROUND);
+ final BatteryConsumer.Key fgs = uidConsumer.getKey(
+ BatteryConsumer.POWER_COMPONENT_BLUETOOTH,
+ BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE);
+
+ assertThat(uidConsumer.getConsumedPower(foreground)).isWithin(PRECISION).of(0.4965352);
+ assertThat(uidConsumer.getConsumedPower(background)).isWithin(PRECISION).of(0.3255208);
+ assertThat(uidConsumer.getConsumedPower(fgs)).isWithin(PRECISION).of(0);
+ }
+
+
+ @Test
public void testIgnoreMeasuredEnergyBasedModel() {
mStatsRule.initMeasuredEnergyStatsLocked();
setupBluetoothEnergyInfo(4000000, 1200000);
@@ -99,38 +265,31 @@
mStatsRule.apply(BatteryUsageStatsRule.POWER_PROFILE_MODEL_ONLY, calculator);
- assertCalculatedPower(0.08216, 0.18169, 0.26388, 0.26386,
- BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
+ 0.08216, 3583, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getUidBatteryConsumer(APP_UID),
+ 0.18169, 8416, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getDeviceBatteryConsumer(),
+ 0.26388, 12000, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
+ assertBluetoothPowerAndDuration(
+ mStatsRule.getAppsBatteryConsumer(),
+ 0.26386, 11999, BatteryConsumer.POWER_MODEL_POWER_PROFILE);
}
private void setupBluetoothEnergyInfo(long reportedEnergyUc, long consumedEnergyUc) {
final BluetoothActivityEnergyInfo info = new BluetoothActivityEnergyInfo(1000,
BluetoothActivityEnergyInfo.BT_STACK_STATE_STATE_ACTIVE, 7000, 5000, 0,
reportedEnergyUc);
- info.setUidTraffic(new ArrayList<UidTraffic>(){{
- add(new UidTraffic(Process.BLUETOOTH_UID, 1000, 2000));
- add(new UidTraffic(APP_UID, 3000, 4000));
- }});
+ info.setUidTraffic(ImmutableList.of(
+ new UidTraffic(Process.BLUETOOTH_UID, 1000, 2000),
+ new UidTraffic(APP_UID, 3000, 4000)));
mStatsRule.getBatteryStats().updateBluetoothStateLocked(info,
consumedEnergyUc, 1000, 1000);
}
- private void assertCalculatedPower(double bluetoothUidPowerMah, double appPowerMah,
- double devicePowerMah, double allAppsPowerMah, int powerModelPowerProfile) {
- assertBluetoothPowerAndDuration(
- mStatsRule.getUidBatteryConsumer(Process.BLUETOOTH_UID),
- bluetoothUidPowerMah, 3583, powerModelPowerProfile);
- assertBluetoothPowerAndDuration(
- mStatsRule.getUidBatteryConsumer(APP_UID),
- appPowerMah, 8416, powerModelPowerProfile);
- assertBluetoothPowerAndDuration(
- mStatsRule.getDeviceBatteryConsumer(),
- devicePowerMah, 12000, powerModelPowerProfile);
- assertBluetoothPowerAndDuration(
- mStatsRule.getAppsBatteryConsumer(),
- allAppsPowerMah, 11999, powerModelPowerProfile);
- }
-
private void assertBluetoothPowerAndDuration(@Nullable BatteryConsumer batteryConsumer,
double powerMah, int durationMs, @BatteryConsumer.PowerModel int powerModel) {
assertThat(batteryConsumer).isNotNull();
diff --git a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
index bddb3a1..1bb41a8 100644
--- a/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
+++ b/core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java
@@ -43,6 +43,7 @@
*/
public class MockBatteryStatsImpl extends BatteryStatsImpl {
public boolean mForceOnBattery;
+ // The mNetworkStats will be used for both wifi and mobile categories
private NetworkStats mNetworkStats;
private DummyExternalStatsSync mExternalStatsSync = new DummyExternalStatsSync();
@@ -118,11 +119,16 @@
}
@Override
- protected NetworkStats readNetworkStatsLocked(@NonNull NetworkStatsManager networkStatsManager,
- String[] ifaces) {
+ protected NetworkStats readMobileNetworkStatsLocked(
+ @NonNull NetworkStatsManager networkStatsManager) {
return mNetworkStats;
}
+ @Override
+ protected NetworkStats readWifiNetworkStatsLocked(
+ @NonNull NetworkStatsManager networkStatsManager) {
+ return mNetworkStats;
+ }
public MockBatteryStatsImpl setPowerProfile(PowerProfile powerProfile) {
mPowerProfile = powerProfile;
return this;
diff --git a/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java b/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java
index 88ee405..1efd78b 100644
--- a/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/PowerProfileTest.java
@@ -21,25 +21,43 @@
import static com.android.internal.os.PowerProfile.POWER_GROUP_DISPLAY_SCREEN_FULL;
import static com.android.internal.os.PowerProfile.POWER_GROUP_DISPLAY_SCREEN_ON;
+import android.annotation.XmlRes;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
+import com.android.frameworks.coretests.R;
+import com.android.internal.power.ModemPowerProfile;
+import com.android.internal.util.XmlUtils;
+
import junit.framework.TestCase;
import org.junit.Before;
import org.junit.Test;
/*
- * Keep this file in sync with frameworks/base/core/res/res/xml/power_profile_test.xml
+ * Keep this file in sync with frameworks/base/core/res/res/xml/power_profile_test.xml and
+ * frameworks/base/core/tests/coretests/res/xml/power_profile_test_modem.xml
+ *
+ * Run with:
+ * atest com.android.internal.os.PowerProfileTest
*/
@SmallTest
public class PowerProfileTest extends TestCase {
+ static final String TAG_TEST_MODEM = "test-modem";
+ static final String ATTR_NAME = "name";
+
private PowerProfile mProfile;
+ private Context mContext;
@Before
public void setUp() {
- mProfile = new PowerProfile(InstrumentationRegistry.getContext(), true);
+ mContext = InstrumentationRegistry.getContext();
+ mProfile = new PowerProfile(mContext, true);
}
@Test
@@ -67,4 +85,396 @@
assertEquals(150.0, mProfile.getAveragePower(PowerProfile.POWER_VIDEO));
}
+ @Test
+ public void testModemPowerProfile_defaultRat() throws Exception {
+ final XmlResourceParser parser = getTestModemElement(R.xml.power_profile_test_modem,
+ "testModemPowerProfile_defaultRat");
+ ModemPowerProfile mpp = new ModemPowerProfile();
+ mpp.parseFromXml(parser);
+ assertEquals(10.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_SLEEP));
+ assertEquals(20.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_IDLE));
+
+ // Only default RAT was defined, all other RAT's should fallback to the default value.
+ assertEquals(30.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(30.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(30.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+
+ assertEquals(40.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(40.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(40.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+
+ assertEquals(50.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(50.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(50.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+
+ assertEquals(60.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(60.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(60.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+
+ assertEquals(70.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(70.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(70.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+
+ assertEquals(80.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+ assertEquals(80.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+ assertEquals(80.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+ }
+
+ @Test
+ public void testModemPowerProfile_partiallyDefined() throws Exception {
+ final XmlResourceParser parser = getTestModemElement(R.xml.power_profile_test_modem,
+ "testModemPowerProfile_partiallyDefined");
+ ModemPowerProfile mpp = new ModemPowerProfile();
+ mpp.parseFromXml(parser);
+ assertEquals(1.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_SLEEP));
+ assertEquals(2.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_IDLE));
+
+ assertEquals(3.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(4.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(5.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(6.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(7.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(8.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ // LTE RAT power constants were not defined, fallback to defaults
+ assertEquals(3.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(4.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(5.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(6.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(7.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(8.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(13.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(14.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(15.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(16.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(17.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(18.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ // Non-mmwave NR frequency power constants were not defined, fallback to defaults
+ assertEquals(13.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(14.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(15.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(16.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(17.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(18.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(13.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(14.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(15.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(16.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(17.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(18.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(13.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(14.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(15.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(16.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(17.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(18.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(53.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(54.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(55.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(56.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(57.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(58.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+ }
+
+ @Test
+ public void testModemPowerProfile_fullyDefined() throws Exception {
+ final XmlResourceParser parser = getTestModemElement(R.xml.power_profile_test_modem,
+ "testModemPowerProfile_fullyDefined");
+ ModemPowerProfile mpp = new ModemPowerProfile();
+ mpp.parseFromXml(parser);
+ assertEquals(1.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_SLEEP));
+ assertEquals(2.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_DRAIN_TYPE_IDLE));
+
+ // Only default RAT was defined, all other RAT's should fallback to the default value.
+ assertEquals(3.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(4.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(5.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(6.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(7.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(8.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_DEFAULT | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(10.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(20.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(30.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(40.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(50.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(60.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_LTE | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(13.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(14.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(15.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(16.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(17.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(18.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_DEFAULT
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(23.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(24.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(25.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(26.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(27.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(28.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_LOW
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(33.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(34.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(35.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(36.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(37.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(38.0, mpp.getAverageBatteryDrainMa(
+ ModemPowerProfile.MODEM_RAT_TYPE_NR | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MID
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX
+ | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(43.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(44.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(45.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(46.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(47.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(48.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_HIGH
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+
+ assertEquals(53.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_RX));
+ assertEquals(54.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_0));
+ assertEquals(55.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_1));
+ assertEquals(56.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_2));
+ assertEquals(57.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_3));
+ assertEquals(58.0, mpp.getAverageBatteryDrainMa(ModemPowerProfile.MODEM_RAT_TYPE_NR
+ | ModemPowerProfile.MODEM_NR_FREQUENCY_RANGE_MMWAVE
+ | ModemPowerProfile.MODEM_DRAIN_TYPE_TX | ModemPowerProfile.MODEM_TX_LEVEL_4));
+ }
+
+ private XmlResourceParser getTestModemElement(@XmlRes int xmlId, String elementName)
+ throws Exception {
+ final String element = TAG_TEST_MODEM;
+ final Resources resources = mContext.getResources();
+ XmlResourceParser parser = resources.getXml(xmlId);
+ while (true) {
+ XmlUtils.nextElement(parser);
+ final String e = parser.getName();
+ if (e == null) break;
+ if (!e.equals(element)) continue;
+
+ final String name = parser.getAttributeValue(null, ATTR_NAME);
+ if (!name.equals(elementName)) continue;
+
+ return parser;
+ }
+ fail("Unanable to find element " + element + " with name " + elementName);
+ return null;
+ }
}
diff --git a/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java b/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java
index a787357..a368399 100644
--- a/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/WifiPowerCalculatorTest.java
@@ -92,7 +92,10 @@
final BatteryStatsImpl batteryStats = setupTestNetworkNumbers();
final WifiActivityEnergyInfo energyInfo = setupPowerControllerBasedModelEnergyNumbersInfo();
- batteryStats.updateWifiState(energyInfo, POWER_DATA_UNAVAILABLE, 1000, 1000,
+ batteryStats.noteWifiScanStartedLocked(APP_UID, 500, 500);
+ batteryStats.noteWifiScanStoppedLocked(APP_UID, 1500, 1500);
+
+ batteryStats.updateWifiState(energyInfo, POWER_DATA_UNAVAILABLE, 2000, 2000,
mNetworkStatsManager);
WifiPowerCalculator calculator = new WifiPowerCalculator(mStatsRule.getPowerProfile());
@@ -100,15 +103,15 @@
UidBatteryConsumer uidConsumer = mStatsRule.getUidBatteryConsumer(APP_UID);
assertThat(uidConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WIFI))
- .isEqualTo(1423);
+ .isEqualTo(2473);
assertThat(uidConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI))
- .isWithin(PRECISION).of(0.2214666);
+ .isWithin(PRECISION).of(0.3964);
assertThat(uidConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI))
.isEqualTo(BatteryConsumer.POWER_MODEL_POWER_PROFILE);
BatteryConsumer deviceConsumer = mStatsRule.getDeviceBatteryConsumer();
assertThat(deviceConsumer.getUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_WIFI))
- .isEqualTo(4002);
+ .isEqualTo(4001);
assertThat(deviceConsumer.getConsumedPower(BatteryConsumer.POWER_COMPONENT_WIFI))
.isWithin(PRECISION).of(0.86666);
assertThat(deviceConsumer.getPowerModel(BatteryConsumer.POWER_COMPONENT_WIFI))
diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml
index 3fdb0da..ddcab6e 100644
--- a/data/etc/com.android.settings.xml
+++ b/data/etc/com.android.settings.xml
@@ -30,6 +30,7 @@
<permission name="android.permission.MANAGE_DEBUGGING"/>
<permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
<permission name="android.permission.MANAGE_FINGERPRINT"/>
+ <permission name="android.permission.MANAGE_GAME_MODE" />
<permission name="android.permission.MANAGE_USB"/>
<permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
@@ -59,5 +60,6 @@
<permission name="android.permission.READ_DREAM_STATE"/>
<permission name="android.permission.READ_DREAM_SUPPRESSION"/>
<permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/>
+ <permission name="android.permission.READ_SAFETY_CENTER_STATUS" />
</privapp-permissions>
</permissions>
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index f2a33de..d95644a 100644
--- a/data/etc/com.android.systemui.xml
+++ b/data/etc/com.android.systemui.xml
@@ -30,6 +30,7 @@
<permission name="android.permission.GET_APP_OPS_STATS"/>
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.MANAGE_DEBUGGING"/>
+ <permission name="android.permission.MANAGE_GAME_MODE" />
<permission name="android.permission.MANAGE_SENSOR_PRIVACY"/>
<permission name="android.permission.MANAGE_USB"/>
<permission name="android.permission.MANAGE_USERS"/>
@@ -50,6 +51,7 @@
<permission name="android.permission.REAL_GET_TASKS"/>
<permission name="android.permission.REQUEST_NETWORK_SCORES"/>
<permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/>
+ <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
<permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
<permission name="android.permission.START_ACTIVITY_AS_CALLER"/>
<permission name="android.permission.START_TASKS_FROM_RECENTS"/>
@@ -71,5 +73,6 @@
<permission name="android.permission.USE_BACKGROUND_BLUR" />
<permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
<permission name="android.permission.FORCE_STOP_PACKAGES" />
+ <permission name="android.permission.ACCESS_FPS_COUNTER" />
</privapp-permissions>
</permissions>
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 6f5951b..de086df 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -333,6 +333,7 @@
<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_GAME_MODE"/>
<permission name="android.permission.MANAGE_ROLLBACKS"/>
<permission name="android.permission.MANAGE_USB"/>
<permission name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/>
@@ -394,6 +395,9 @@
<permission name="android.permission.SET_WALLPAPER_COMPONENT" />
<permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT" />
<permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" />
+ <!-- Permission required for CTS test - TrustTestCases -->
+ <permission name="android.permission.PROVIDE_TRUST_AGENT" />
+ <permission name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
<!-- Permissions required for Incremental CTS tests -->
<permission name="com.android.permission.USE_INSTALLER_V2"/>
<permission name="android.permission.LOADER_USAGE_STATS"/>
@@ -571,6 +575,7 @@
<privapp-permissions package="com.android.settings">
<permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
<permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>
+ <permission name="android.permission.READ_SAFETY_CENTER_STATUS" />
</privapp-permissions>
<privapp-permissions package="com.android.bips">
diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json
index 535d656..0752329 100644
--- a/data/etc/services.core.protolog.json
+++ b/data/etc/services.core.protolog.json
@@ -103,18 +103,6 @@
"group": "WM_DEBUG_STATES",
"at": "com\/android\/server\/wm\/TaskFragment.java"
},
- "-2002500255": {
- "message": "Defer removing snapshot surface in %dms",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
- "-1991255017": {
- "message": "Drawing snapshot surface sizeMismatch=%b",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
"-1980468143": {
"message": "DisplayArea appeared name=%s",
"level": "VERBOSE",
@@ -505,12 +493,6 @@
"group": "WM_DEBUG_STATES",
"at": "com\/android\/server\/wm\/ActivityRecord.java"
},
- "-1556507536": {
- "message": "Passing transform hint %d for window %s%s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ORIENTATION",
- "at": "com\/android\/server\/wm\/WindowManagerService.java"
- },
"-1554521902": {
"message": "showInsets(ime) was requested by different window: %s ",
"level": "WARN",
@@ -745,6 +727,12 @@
"group": "WM_DEBUG_BOOT",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
+ "-1343787701": {
+ "message": "startBackNavigation task=%s, topRunningActivity=%s",
+ "level": "DEBUG",
+ "group": "WM_DEBUG_BACK_PREVIEW",
+ "at": "com\/android\/server\/wm\/BackNavigationController.java"
+ },
"-1340540100": {
"message": "Creating SnapshotStartingData",
"level": "VERBOSE",
@@ -1597,12 +1585,6 @@
"group": "WM_DEBUG_FOCUS_LIGHT",
"at": "com\/android\/server\/wm\/DisplayContent.java"
},
- "-405536909": {
- "message": "Removing snapshot surface",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/TaskSnapshotSurface.java"
- },
"-401282500": {
"message": "destroyIfPossible: r=%s destroy returned removed=%s",
"level": "DEBUG",
@@ -1867,6 +1849,12 @@
"group": "WM_DEBUG_STATES",
"at": "com\/android\/server\/wm\/Task.java"
},
+ "-134091882": {
+ "message": "Screenshotting Activity %s",
+ "level": "VERBOSE",
+ "group": "WM_DEBUG_BACK_PREVIEW",
+ "at": "com\/android\/server\/wm\/TaskFragment.java"
+ },
"-124316973": {
"message": "Translucent=%s Floating=%s ShowWallpaper=%s Disable=%s",
"level": "VERBOSE",
@@ -1951,6 +1939,12 @@
"group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
"at": "com\/android\/server\/wm\/WindowContainer.java"
},
+ "-23020844": {
+ "message": "Back: Reset surfaces",
+ "level": "DEBUG",
+ "group": "WM_DEBUG_BACK_PREVIEW",
+ "at": "com\/android\/server\/wm\/BackNavigationController.java"
+ },
"-21399771": {
"message": "activity %s already destroying, skipping request with reason:%s",
"level": "VERBOSE",
@@ -2005,12 +1999,6 @@
"group": "WM_ERROR",
"at": "com\/android\/server\/wm\/WindowManagerService.java"
},
- "44438983": {
- "message": "performLayout: Activity exiting now removed %s",
- "level": "VERBOSE",
- "group": "WM_DEBUG_ADD_REMOVE",
- "at": "com\/android\/server\/wm\/DisplayContent.java"
- },
"45285419": {
"message": "startingWindow was set but startingSurface==null, couldn't remove",
"level": "VERBOSE",
@@ -2767,6 +2755,12 @@
"group": "WM_SHOW_SURFACE_ALLOC",
"at": "com\/android\/server\/wm\/WindowStateAnimator.java"
},
+ "751854538": {
+ "message": "DisplayArea keep clear rects changed name =%s",
+ "level": "VERBOSE",
+ "group": "WM_DEBUG_WINDOW_ORGANIZER",
+ "at": "com\/android\/server\/wm\/DisplayAreaOrganizerController.java"
+ },
"765395228": {
"message": "onAnimationFinished(): controller=%s reorderMode=%d",
"level": "DEBUG",
@@ -3271,12 +3265,6 @@
"group": "WM_DEBUG_LAYER_MIRRORING",
"at": "com\/android\/server\/wm\/DisplayContent.java"
},
- "1417601133": {
- "message": "Enqueueing ADD_STARTING",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STARTING_WINDOW",
- "at": "com\/android\/server\/wm\/ActivityRecord.java"
- },
"1422781269": {
"message": "Resuming rotation after re-position",
"level": "DEBUG",
@@ -3397,6 +3385,12 @@
"group": "WM_DEBUG_APP_TRANSITIONS",
"at": "com\/android\/server\/wm\/ActivityRecord.java"
},
+ "1554795024": {
+ "message": "Previous Activity is %s",
+ "level": "DEBUG",
+ "group": "WM_DEBUG_BACK_PREVIEW",
+ "at": "com\/android\/server\/wm\/BackNavigationController.java"
+ },
"1557732761": {
"message": "For Intent %s bringing to top: %s",
"level": "DEBUG",
@@ -3697,12 +3691,6 @@
"group": "WM_DEBUG_WINDOW_ORGANIZER",
"at": "com\/android\/server\/wm\/DisplayAreaPolicyBuilder.java"
},
- "1884961873": {
- "message": "Sleep still need to stop %d activities",
- "level": "VERBOSE",
- "group": "WM_DEBUG_STATES",
- "at": "com\/android\/server\/wm\/Task.java"
- },
"1891501279": {
"message": "cancelAnimation(): reason=%s",
"level": "DEBUG",
@@ -3924,6 +3912,9 @@
"WM_DEBUG_APP_TRANSITIONS_ANIM": {
"tag": "WindowManager"
},
+ "WM_DEBUG_BACK_PREVIEW": {
+ "tag": "CoreBackPreview"
+ },
"WM_DEBUG_BOOT": {
"tag": "WindowManager"
},
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index a954344..8811a7f 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -20,7 +20,6 @@
import android.os.Build;
import android.os.UserHandle;
import android.security.maintenance.UserState;
-import android.system.keystore2.Domain;
/**
* @hide This should not be made public in its present form because it
@@ -120,15 +119,6 @@
}
/**
- * Forwards the request to clear a UID to Keystore 2.0.
- * @hide
- */
- public boolean clearUid(int uid) {
- return AndroidKeyStoreMaintenance.clearNamespace(Domain.APP, uid) == 0;
- }
-
-
- /**
* Add an authentication record to the keystore authorization table.
*
* @param authToken The packed bytes of a hw_auth_token_t to be provided to keymaster.
diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml
index 0cdaa20..1b8032b 100644
--- a/libs/WindowManager/Shell/res/values/config.xml
+++ b/libs/WindowManager/Shell/res/values/config.xml
@@ -43,6 +43,9 @@
<!-- PiP minimum size, which is a % based off the shorter side of display width and height -->
<fraction name="config_pipShortestEdgePercent">40%</fraction>
+ <!-- Show PiP enter split icon, which allows apps to directly enter splitscreen from PiP. -->
+ <bool name="config_pipEnableEnterSplitButton">false</bool>
+
<!-- Animation duration when using long press on recents to dock -->
<integer name="long_press_dock_anim_duration">250</integer>
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
new file mode 100644
index 0000000..b310dd6
--- /dev/null
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.wm.shell.back;
+
+import android.view.MotionEvent;
+
+/**
+ * Interface for SysUI to get access to the Back animation related methods.
+ */
+public interface BackAnimation {
+
+ /**
+ * Called when a {@link MotionEvent} is generated by a back gesture.
+ */
+ void onBackMotion(MotionEvent event);
+
+ /**
+ * Sets whether the back gesture is past the trigger threshold or not.
+ */
+ void setTriggerBack(boolean triggerBack);
+}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
new file mode 100644
index 0000000..229e8ee0
--- /dev/null
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2021 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.wm.shell.back;
+
+import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityTaskManager;
+import android.app.IActivityTaskManager;
+import android.app.WindowConfiguration;
+import android.graphics.Point;
+import android.graphics.PointF;
+import android.hardware.HardwareBuffer;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.SurfaceControl;
+import android.window.BackNavigationInfo;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.protolog.common.ProtoLog;
+import com.android.wm.shell.common.ShellExecutor;
+import com.android.wm.shell.common.annotations.ShellMainThread;
+
+/**
+ * Controls the window animation run when a user initiates a back gesture.
+ */
+public class BackAnimationController {
+
+ private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";
+ public static final boolean IS_ENABLED = SystemProperties
+ .getInt(BACK_PREDICTABILITY_PROP, 0) > 0;
+ private static final String TAG = "BackAnimationController";
+
+ /**
+ * Location of the initial touch event of the back gesture.
+ */
+ private final PointF mInitTouchLocation = new PointF();
+
+ /**
+ * Raw delta between {@link #mInitTouchLocation} and the last touch location.
+ */
+ private final Point mTouchEventDelta = new Point();
+ private final ShellExecutor mShellExecutor;
+
+ /** True when a back gesture is ongoing */
+ private boolean mBackGestureStarted = false;
+
+ /** @see #setTriggerBack(boolean) */
+ private boolean mTriggerBack;
+
+ @Nullable
+ private BackNavigationInfo mBackNavigationInfo;
+ private final SurfaceControl.Transaction mTransaction;
+ private final IActivityTaskManager mActivityTaskManager;
+
+ public BackAnimationController(@ShellMainThread ShellExecutor shellExecutor) {
+ this(shellExecutor, new SurfaceControl.Transaction(), ActivityTaskManager.getService());
+ }
+
+ @VisibleForTesting
+ BackAnimationController(@NonNull ShellExecutor shellExecutor,
+ @NonNull SurfaceControl.Transaction transaction,
+ @NonNull IActivityTaskManager activityTaskManager) {
+ mShellExecutor = shellExecutor;
+ mTransaction = transaction;
+ mActivityTaskManager = activityTaskManager;
+ }
+
+ public BackAnimation getBackAnimationImpl() {
+ return mBackAnimation;
+ }
+
+ private final BackAnimation mBackAnimation = new BackAnimationImpl();
+
+ private class BackAnimationImpl implements BackAnimation {
+
+ @Override
+ public void onBackMotion(MotionEvent event) {
+ mShellExecutor.execute(() -> onMotionEvent(event));
+ }
+
+ @Override
+ public void setTriggerBack(boolean triggerBack) {
+ mShellExecutor.execute(() -> BackAnimationController.this.setTriggerBack(triggerBack));
+ }
+ }
+
+ /**
+ * Called when a new motion event needs to be transferred to this
+ * {@link BackAnimationController}
+ */
+ public void onMotionEvent(MotionEvent event) {
+ int action = event.getActionMasked();
+ if (action == MotionEvent.ACTION_DOWN) {
+ initAnimation(event);
+ } else if (action == MotionEvent.ACTION_MOVE) {
+ onMove(event);
+ } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+ onGestureFinished();
+ }
+ }
+
+ private void initAnimation(MotionEvent event) {
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "initAnimation mMotionStarted=%b", mBackGestureStarted);
+ if (mBackGestureStarted) {
+ Log.e(TAG, "Animation is being initialized but is already started.");
+ return;
+ }
+
+ if (mBackNavigationInfo != null) {
+ finishAnimation();
+ }
+ mInitTouchLocation.set(event.getX(), event.getY());
+ mBackGestureStarted = true;
+
+ try {
+ mBackNavigationInfo = mActivityTaskManager.startBackNavigation();
+ onBackNavigationInfoReceived(mBackNavigationInfo);
+ } catch (RemoteException remoteException) {
+ Log.e(TAG, "Failed to initAnimation", remoteException);
+ finishAnimation();
+ }
+ }
+
+ private void onBackNavigationInfoReceived(@Nullable BackNavigationInfo backNavigationInfo) {
+ if (backNavigationInfo == null
+ || backNavigationInfo.getDepartingWindowContainer() == null) {
+ Log.e(TAG, "Received BackNavigationInfo is null.");
+ finishAnimation();
+ return;
+ }
+
+ HardwareBuffer hardwareBuffer = backNavigationInfo.getScreenshotHardwareBuffer();
+ if (hardwareBuffer != null) {
+ displayTargetScreenshot(hardwareBuffer,
+ backNavigationInfo.getTaskWindowConfiguration());
+ }
+ mTransaction.apply();
+ }
+
+ /**
+ * Display the screenshot of the activity beneath.
+ *
+ * @param hardwareBuffer The buffer containing the screenshot.
+ */
+ private void displayTargetScreenshot(@NonNull HardwareBuffer hardwareBuffer,
+ WindowConfiguration taskWindowConfiguration) {
+ SurfaceControl screenshotSurface =
+ mBackNavigationInfo == null ? null : mBackNavigationInfo.getScreenshotSurface();
+ if (screenshotSurface == null) {
+ Log.e(TAG, "BackNavigationInfo doesn't contain a surface for the screenshot. ");
+ return;
+ }
+
+ // Scale the buffer to fill the whole Task
+ float sx = 1;
+ float sy = 1;
+ float w = taskWindowConfiguration.getBounds().width();
+ float h = taskWindowConfiguration.getBounds().height();
+
+ if (w != hardwareBuffer.getWidth()) {
+ sx = w / hardwareBuffer.getWidth();
+ }
+
+ if (h != hardwareBuffer.getHeight()) {
+ sy = h / hardwareBuffer.getHeight();
+ }
+ mTransaction.setScale(screenshotSurface, sx, sy);
+ mTransaction.setBuffer(screenshotSurface, hardwareBuffer);
+ mTransaction.setVisibility(screenshotSurface, true);
+ }
+
+ private void onMove(MotionEvent event) {
+ if (!mBackGestureStarted || mBackNavigationInfo == null) {
+ return;
+ }
+ int deltaX = Math.round(event.getX() - mInitTouchLocation.x);
+ int deltaY = Math.round(event.getY() - mInitTouchLocation.y);
+ ProtoLog.v(WM_SHELL_BACK_PREVIEW, "Runner move: %d %d", deltaX, deltaY);
+ SurfaceControl topWindowLeash = mBackNavigationInfo.getDepartingWindowContainer();
+ mTransaction.setPosition(topWindowLeash, deltaX, deltaY);
+ mTouchEventDelta.set(deltaX, deltaY);
+ mTransaction.apply();
+ }
+
+ private void onGestureFinished() {
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "onGestureFinished() mTriggerBack == %s", mTriggerBack);
+ if (mBackGestureStarted) {
+ if (mTriggerBack) {
+ prepareTransition();
+ } else {
+ resetPositionAnimated();
+ }
+ }
+ mBackGestureStarted = false;
+ mTriggerBack = false;
+ }
+
+ /**
+ * Animate the top window leash to its initial position.
+ */
+ private void resetPositionAnimated() {
+ mBackGestureStarted = false;
+ // TODO(208786853) Handle overlap with a new coming gesture.
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Runner: Back not triggered, cancelling animation "
+ + "mLastPos=%s mInitTouch=%s", mTouchEventDelta, mInitTouchLocation);
+
+ // TODO(208427216) : Replace placeholder animation with an actual one.
+ ValueAnimator animation = ValueAnimator.ofFloat(0f, 1f).setDuration(200);
+ animation.addUpdateListener(animation1 -> {
+ if (mBackNavigationInfo == null) {
+ return;
+ }
+ float fraction = animation1.getAnimatedFraction();
+ int deltaX = Math.round(mTouchEventDelta.x - (mTouchEventDelta.x * fraction));
+ int deltaY = Math.round(mTouchEventDelta.y - (mTouchEventDelta.y * fraction));
+ mTransaction.setPosition(mBackNavigationInfo.getDepartingWindowContainer(),
+ deltaX, deltaY);
+ mTransaction.apply();
+ });
+
+ animation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "BackAnimationController: onAnimationEnd");
+ finishAnimation();
+ }
+ });
+ animation.start();
+ }
+
+ private void prepareTransition() {
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "prepareTransition()");
+ mTriggerBack = false;
+ mBackGestureStarted = false;
+ }
+
+ /**
+ * Sets to true when the back gesture has passed the triggering threshold, false otherwise.
+ */
+ public void setTriggerBack(boolean triggerBack) {
+ mTriggerBack = triggerBack;
+ }
+
+ private void finishAnimation() {
+ ProtoLog.d(WM_SHELL_BACK_PREVIEW, "BackAnimationController: finishAnimation()");
+ mBackGestureStarted = false;
+ mTouchEventDelta.set(0, 0);
+ mInitTouchLocation.set(0, 0);
+ BackNavigationInfo backNavigationInfo = mBackNavigationInfo;
+ mBackNavigationInfo = null;
+ if (backNavigationInfo == null) {
+ return;
+ }
+ SurfaceControl topWindowLeash = backNavigationInfo.getDepartingWindowContainer();
+ if (topWindowLeash != null && topWindowLeash.isValid()) {
+ mTransaction.remove(topWindowLeash);
+ }
+ SurfaceControl screenshotSurface = backNavigationInfo.getScreenshotSurface();
+ if (screenshotSurface != null && screenshotSurface.isValid()) {
+ mTransaction.remove(screenshotSurface);
+ }
+ mTransaction.apply();
+ backNavigationInfo.onBackNavigationFinished();
+ }
+}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackPreviewHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackPreviewHandler.java
deleted file mode 100644
index dc20f7b..0000000
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackPreviewHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 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.wm.shell.back;
-
-import android.os.SystemProperties;
-import android.view.IWindowManager;
-
-import javax.inject.Inject;
-
-/**
- * Handle the preview of what a back gesture will lead to.
- */
-public class BackPreviewHandler {
-
- private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";
-
- public static boolean isEnabled() {
- return SystemProperties.getInt(BACK_PREDICTABILITY_PROP, 0) > 0;
- }
-
- private final IWindowManager mWmService;
-
- @Inject
- public BackPreviewHandler(IWindowManager windowManagerService) {
- mWmService = windowManagerService;
- }
-}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java
index 7db49f0..e2bc360 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java
@@ -19,6 +19,7 @@
import android.annotation.Nullable;
import android.content.Context;
import android.content.res.Configuration;
+import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.RemoteException;
import android.util.Slog;
@@ -34,6 +35,7 @@
import com.android.wm.shell.common.annotations.ShellMainThread;
import java.util.ArrayList;
+import java.util.List;
/**
* This module deals with display rotations coming from WM. When WM starts a rotation: after it has
@@ -243,6 +245,19 @@
}
}
+ private void onKeepClearAreasChanged(int displayId, List<Rect> keepClearAreas) {
+ synchronized (mDisplays) {
+ if (mDisplays.get(displayId) == null || getDisplay(displayId) == null) {
+ Slog.w(TAG, "Skipping onKeepClearAreasChanged on unknown"
+ + " display, displayId=" + displayId);
+ return;
+ }
+ for (int i = mDisplayChangedListeners.size() - 1; i >= 0; --i) {
+ mDisplayChangedListeners.get(i).onKeepClearAreasChanged(displayId, keepClearAreas);
+ }
+ }
+ }
+
private static class DisplayRecord {
private int mDisplayId;
private Context mContext;
@@ -301,6 +316,13 @@
DisplayController.this.onFixedRotationFinished(displayId);
});
}
+
+ @Override
+ public void onKeepClearAreasChanged(int displayId, List<Rect> keepClearAreas) {
+ mMainExecutor.execute(() -> {
+ DisplayController.this.onKeepClearAreasChanged(displayId, keepClearAreas);
+ });
+ }
}
/**
@@ -335,5 +357,10 @@
* Called when fixed rotation on a display is finished.
*/
default void onFixedRotationFinished(int displayId) {}
+
+ /**
+ * Called when keep-clear areas on a display have changed.
+ */
+ default void onKeepClearAreasChanged(int displayId, List<Rect> keepClearAreas) {}
}
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
index 23d9b8b..f61e624 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
@@ -40,6 +40,8 @@
import com.android.wm.shell.WindowManagerShellWrapper;
import com.android.wm.shell.apppairs.AppPairs;
import com.android.wm.shell.apppairs.AppPairsController;
+import com.android.wm.shell.back.BackAnimation;
+import com.android.wm.shell.back.BackAnimationController;
import com.android.wm.shell.bubbles.BubbleController;
import com.android.wm.shell.bubbles.Bubbles;
import com.android.wm.shell.common.DisplayController;
@@ -238,6 +240,17 @@
}
//
+ // Back animation
+ //
+
+ @WMSingleton
+ @Provides
+ static Optional<BackAnimation> provideBackAnimation(
+ Optional<BackAnimationController> backAnimationController) {
+ return backAnimationController.map(BackAnimationController::getBackAnimationImpl);
+ }
+
+ //
// Bubbles (optional feature)
//
@@ -678,4 +691,16 @@
legacySplitScreenOptional, splitScreenOptional, pipOptional, oneHandedOptional,
hideDisplayCutout, appPairsOptional, recentTasksOptional, mainExecutor);
}
+
+ @WMSingleton
+ @Provides
+ static Optional<BackAnimationController> provideBackAnimationController(
+ @ShellMainThread ShellExecutor shellExecutor
+ ) {
+ if (BackAnimationController.IS_ENABLED) {
+ return Optional.of(
+ new BackAnimationController(shellExecutor));
+ }
+ return Optional.empty();
+ }
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
index 10aa8a0..225305b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
@@ -105,8 +105,6 @@
private static final float MENU_BACKGROUND_ALPHA = 0.3f;
private static final float DISABLED_ACTION_ALPHA = 0.54f;
- private static final boolean ENABLE_ENTER_SPLIT = true;
-
private int mMenuState;
private boolean mAllowMenuTimeout = true;
private boolean mAllowTouches = true;
@@ -281,6 +279,8 @@
boolean resizeMenuOnShow, boolean withDelay, boolean showResizeHandle) {
mAllowMenuTimeout = allowMenuTimeout;
mDidLastShowMenuResize = resizeMenuOnShow;
+ final boolean enableEnterSplit =
+ mContext.getResources().getBoolean(R.bool.config_pipEnableEnterSplitButton);
if (mMenuState != menuState) {
// Disallow touches if the menu needs to resize while showing, and we are transitioning
// to/from a full menu state.
@@ -301,7 +301,7 @@
mDismissButton.getAlpha(), 1f);
ObjectAnimator enterSplitAnim = ObjectAnimator.ofFloat(mEnterSplitButton, View.ALPHA,
mEnterSplitButton.getAlpha(),
- ENABLE_ENTER_SPLIT && mFocusedTaskAllowSplitScreen ? 1f : 0f);
+ enableEnterSplit && mFocusedTaskAllowSplitScreen ? 1f : 0f);
if (menuState == MENU_STATE_FULL) {
mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim,
enterSplitAnim);
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
index 79c1df2..20c4e21 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/protolog/ShellProtoLogGroup.java
@@ -34,6 +34,8 @@
Consts.TAG_WM_SHELL),
WM_SHELL_STARTING_WINDOW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
Consts.TAG_WM_STARTING_WINDOW),
+ WM_SHELL_BACK_PREVIEW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,
+ "ShellBackPreview"),
TEST_GROUP(true, true, false, "WindowManagerShellProtoLogTest");
private final boolean mEnabled;
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java
index 8664d9b..d30d0cc 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java
@@ -70,7 +70,8 @@
IBinder mPendingRecent = null;
private IBinder mAnimatingTransition = null;
- private OneShotRemoteHandler mRemoteHandler = null;
+ private OneShotRemoteHandler mPendingRemoteHandler = null;
+ private OneShotRemoteHandler mActiveRemoteHandler = null;
private final Transitions.TransitionFinishCallback mRemoteFinishCB = this::onFinish;
@@ -96,10 +97,11 @@
@NonNull WindowContainerToken mainRoot, @NonNull WindowContainerToken sideRoot) {
mFinishCallback = finishCallback;
mAnimatingTransition = transition;
- if (mRemoteHandler != null) {
- mRemoteHandler.startAnimation(transition, info, startTransaction, finishTransaction,
- mRemoteFinishCB);
- mRemoteHandler = null;
+ if (mPendingRemoteHandler != null) {
+ mPendingRemoteHandler.startAnimation(transition, info, startTransaction,
+ finishTransaction, mRemoteFinishCB);
+ mActiveRemoteHandler = mPendingRemoteHandler;
+ mPendingRemoteHandler = null;
return;
}
playInternalAnimation(transition, info, startTransaction, mainRoot, sideRoot);
@@ -172,15 +174,14 @@
IBinder startEnterTransition(@WindowManager.TransitionType int transitType,
@NonNull WindowContainerTransaction wct, @Nullable RemoteTransition remoteTransition,
@NonNull Transitions.TransitionHandler handler) {
- if (remoteTransition != null) {
- // Wrapping it for ease-of-use (OneShot handles all the binder linking/death stuff)
- mRemoteHandler = new OneShotRemoteHandler(
- mTransitions.getMainExecutor(), remoteTransition);
- }
final IBinder transition = mTransitions.startTransition(transitType, wct, handler);
mPendingEnter = transition;
- if (mRemoteHandler != null) {
- mRemoteHandler.setTransition(transition);
+
+ if (remoteTransition != null) {
+ // Wrapping it for ease-of-use (OneShot handles all the binder linking/death stuff)
+ mPendingRemoteHandler = new OneShotRemoteHandler(
+ mTransitions.getMainExecutor(), remoteTransition);
+ mPendingRemoteHandler.setTransition(transition);
}
return transition;
}
@@ -211,9 +212,9 @@
if (remoteTransition != null) {
// Wrapping it for ease-of-use (OneShot handles all the binder linking/death stuff)
- mRemoteHandler = new OneShotRemoteHandler(
+ mPendingRemoteHandler = new OneShotRemoteHandler(
mTransitions.getMainExecutor(), remoteTransition);
- mRemoteHandler.setTransition(transition);
+ mPendingRemoteHandler.setTransition(transition);
}
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " splitTransition "
@@ -221,6 +222,13 @@
return transition;
}
+ void mergeAnimation(IBinder transition, TransitionInfo info, SurfaceControl.Transaction t,
+ IBinder mergeTarget, Transitions.TransitionFinishCallback finishCallback) {
+ if (mergeTarget == mAnimatingTransition && mActiveRemoteHandler != null) {
+ mActiveRemoteHandler.mergeAnimation(transition, info, t, mergeTarget, finishCallback);
+ }
+ }
+
void onFinish(WindowContainerTransaction wct, WindowContainerTransactionCallback wctCB) {
if (!mAnimations.isEmpty()) return;
mOnFinish.run();
@@ -241,11 +249,13 @@
}
if (mAnimatingTransition == mPendingRecent) {
// If the wct is not null while finishing recent transition, it indicates it's not
- // returning to home and hence needing the wct to reorder tasks.
- final boolean toHome = wct == null;
- mStageCoordinator.finishRecentAnimation(toHome);
+ // dismissing split and thus need to reorder split task so they can be on top again.
+ final boolean dismissSplit = wct == null;
+ mStageCoordinator.finishRecentAnimation(dismissSplit);
mPendingRecent = null;
}
+ mPendingRemoteHandler = null;
+ mActiveRemoteHandler = null;
mAnimatingTransition = null;
}
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index c812050..e592101 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -166,17 +166,6 @@
@StageType
private int mTopStageAfterFoldDismiss = STAGE_TYPE_UNDEFINED;
- private final Runnable mOnTransitionAnimationComplete = () -> {
- // If still playing, let it finish.
- if (!isSplitScreenVisible()) {
- // Update divider state after animation so that it is still around and positioned
- // properly for the animation itself.
- mSplitLayout.release();
- mSplitLayout.resetDividerPosition();
- mTopStageAfterFoldDismiss = STAGE_TYPE_UNDEFINED;
- }
- };
-
private final SplitWindowManager.ParentContainerCallbacks mParentContainerCallbacks =
new SplitWindowManager.ParentContainerCallbacks() {
@Override
@@ -237,7 +226,7 @@
deviceStateManager.registerCallback(taskOrganizer.getExecutor(),
new DeviceStateManager.FoldStateListener(mContext, this::onFoldedStateChanged));
mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions,
- mOnTransitionAnimationComplete, this);
+ this::onTransitionAnimationComplete, this);
mDisplayController.addDisplayWindowListener(this);
mDisplayLayout = new DisplayLayout(displayController.getDisplayLayout(displayId));
transitions.addHandler(this);
@@ -267,7 +256,7 @@
mRootTDAOrganizer.registerListener(displayId, this);
mSplitLayout = splitLayout;
mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions,
- mOnTransitionAnimationComplete, this);
+ this::onTransitionAnimationComplete, this);
mMainUnfoldController = unfoldControllerProvider.get().orElse(null);
mSideUnfoldController = unfoldControllerProvider.get().orElse(null);
mLogger = logger;
@@ -1234,7 +1223,7 @@
final ActivityManager.RunningTaskInfo triggerTask = request.getTriggerTask();
if (triggerTask == null) {
// Still want to monitor everything while in split-screen, so return non-null.
- return isSplitScreenVisible() ? new WindowContainerTransaction() : null;
+ return mMainStage.isActive() ? new WindowContainerTransaction() : null;
} else if (triggerTask.displayId != mDisplayId) {
// Skip handling task on the other display.
return null;
@@ -1250,7 +1239,7 @@
mRecentTasks.ifPresent(recentTasks -> recentTasks.removeSplitPair(triggerTask.taskId));
}
- if (isSplitScreenVisible()) {
+ if (mMainStage.isActive()) {
// Try to handle everything while in split-screen, so return a WCT even if it's empty.
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " split is active so using split"
+ "Transition to handle request. triggerTask=%d type=%s mainChildren=%d"
@@ -1296,6 +1285,13 @@
}
@Override
+ public void mergeAnimation(IBinder transition, TransitionInfo info,
+ SurfaceControl.Transaction t, IBinder mergeTarget,
+ Transitions.TransitionFinishCallback finishCallback) {
+ mSplitTransitions.mergeAnimation(transition, info, t, mergeTarget, finishCallback);
+ }
+
+ @Override
public void onTransitionMerged(@NonNull IBinder transition) {
// Once the pending enter transition got merged, make sure to bring divider bar visible and
// clear the pending transition from cache to prevent mess-up the following state.
@@ -1375,6 +1371,17 @@
return true;
}
+ void onTransitionAnimationComplete() {
+ // If still playing, let it finish.
+ if (!mMainStage.isActive()) {
+ // Update divider state after animation so that it is still around and positioned
+ // properly for the animation itself.
+ mSplitLayout.release();
+ mSplitLayout.resetDividerPosition();
+ mTopStageAfterFoldDismiss = STAGE_TYPE_UNDEFINED;
+ }
+ }
+
private boolean startPendingEnterAnimation(@NonNull IBinder transition,
@NonNull TransitionInfo info, @NonNull SurfaceControl.Transaction t) {
// First, verify that we actually have opened apps in both splits.
@@ -1513,8 +1520,17 @@
return true;
}
- void finishRecentAnimation(boolean toHome) {
- if (toHome) {
+ void finishRecentAnimation(boolean dismissSplit) {
+ // Exclude the case that the split screen has been dismissed already.
+ if (!mMainStage.isActive()) {
+ // The latest split dismissing transition might be a no-op transition and thus won't
+ // callback startAnimation, update split visibility here to cover this kind of no-op
+ // transition case.
+ setSplitsVisible(false);
+ return;
+ }
+
+ if (dismissSplit) {
final WindowContainerTransaction wct = new WindowContainerTransaction();
prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, wct);
mSplitTransitions.startDismissTransition(null /* transition */, wct, this,
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/OWNERS b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/OWNERS
new file mode 100644
index 0000000..8446b37
--- /dev/null
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/OWNERS
@@ -0,0 +1,2 @@
+# window manager > wm shell > Split Screen
+# Bug component: 928697
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt
index af629cc..f8d14c6 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt
@@ -24,6 +24,9 @@
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.annotation.Group4
import com.android.server.wm.flicker.dsl.FlickerBuilder
+import com.android.wm.shell.flicker.helpers.BaseAppHelper
+import org.junit.Assume
+import org.junit.Before
import org.junit.runner.RunWith
import org.junit.Test
import org.junit.runners.Parameterized
@@ -59,6 +62,12 @@
}
}
+ @Before
+ fun setup() {
+ // This test doesn't work in shell transitions because of b/205288792
+ Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())
+ }
+
@Presubmit
@Test
fun testAppIsAlwaysVisible() {
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt
index add11c1..c93c5ad 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt
@@ -25,6 +25,9 @@
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.annotation.Group4
import com.android.server.wm.flicker.dsl.FlickerBuilder
+import com.android.wm.shell.flicker.helpers.BaseAppHelper
+import org.junit.Assume
+import org.junit.Before
import org.junit.runner.RunWith
import org.junit.Test
import org.junit.runners.Parameterized
@@ -67,6 +70,12 @@
}
}
+ @Before
+ fun setup() {
+ // This test doesn't work in shell transitions because of b/205288792
+ Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())
+ }
+
@Presubmit
@Test
fun testAppIsAlwaysVisible() {
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OWNERS b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OWNERS
new file mode 100644
index 0000000..566acc8
--- /dev/null
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OWNERS
@@ -0,0 +1,2 @@
+# window manager > wm shell > Bubbles
+# Bug component: 555586
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OWNERS b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OWNERS
new file mode 100644
index 0000000..8446b37
--- /dev/null
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OWNERS
@@ -0,0 +1,2 @@
+# window manager > wm shell > Split Screen
+# Bug component: 928697
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt
index 2c08b7f..3a9a070 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt
@@ -82,6 +82,11 @@
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
+ /** {@inheritDoc} */
+ @FlakyTest(bugId = 197726610)
+ @Test
+ override fun pipLayerExpands() = super.pipLayerExpands()
+
companion object {
/**
* Creates the test configurations.
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt
index e340f4c..03c8929f 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt
@@ -101,6 +101,11 @@
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
+ /** {@inheritDoc} */
+ @FlakyTest(bugId = 197726610)
+ @Test
+ override fun pipLayerExpands() = super.pipLayerExpands()
+
companion object {
/**
* Creates the test configurations.
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt
index 8adebb8..976b7c6 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt
@@ -90,6 +90,11 @@
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
+ /** {@inheritDoc} */
+ @FlakyTest(bugId = 215869110)
+ @Test
+ override fun focusDoesNotChange() = super.focusDoesNotChange()
+
companion object {
/**
* Creates the test configurations.
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/OWNERS b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/OWNERS
new file mode 100644
index 0000000..172e24bf
--- /dev/null
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/OWNERS
@@ -0,0 +1,2 @@
+# window manager > wm shell > Picture-In-Picture
+# Bug component: 316251
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
new file mode 100644
index 0000000..960c7ac
--- /dev/null
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 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.wm.shell.back;
+
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.app.IActivityTaskManager;
+import android.app.WindowConfiguration;
+import android.hardware.HardwareBuffer;
+import android.os.RemoteCallback;
+import android.os.RemoteException;
+import android.testing.AndroidTestingRunner;
+import android.view.MotionEvent;
+import android.view.SurfaceControl;
+import android.window.BackNavigationInfo;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.wm.shell.TestShellExecutor;
+import com.android.wm.shell.common.ShellExecutor;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * atest WMShellUnitTests:BackAnimationControllerTest
+ */
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+public class BackAnimationControllerTest {
+
+ private final ShellExecutor mShellExecutor = new TestShellExecutor();
+
+ @Mock
+ private SurfaceControl.Transaction mTransaction;
+
+ @Mock
+ private IActivityTaskManager mActivityTaskManager;
+
+ private BackAnimationController mController;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mController = new BackAnimationController(
+ mShellExecutor, mTransaction, mActivityTaskManager);
+ }
+
+ private void createNavigationInfo(SurfaceControl topWindowLeash,
+ SurfaceControl screenshotSurface,
+ HardwareBuffer hardwareBuffer) {
+ BackNavigationInfo navigationInfo = new BackNavigationInfo(
+ BackNavigationInfo.TYPE_RETURN_TO_HOME,
+ topWindowLeash,
+ screenshotSurface,
+ hardwareBuffer,
+ new WindowConfiguration(),
+ new RemoteCallback((bundle) -> {}));
+ try {
+ doReturn(navigationInfo).when(mActivityTaskManager).startBackNavigation();
+ } catch (RemoteException ex) {
+ ex.rethrowFromSystemServer();
+ }
+ }
+
+ @Test
+ public void screenshotAttachedAndVisible() {
+ SurfaceControl topWindowLeash = new SurfaceControl();
+ SurfaceControl screenshotSurface = new SurfaceControl();
+ HardwareBuffer hardwareBuffer = mock(HardwareBuffer.class);
+ createNavigationInfo(topWindowLeash, screenshotSurface, hardwareBuffer);
+ mController.onMotionEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0));
+ verify(mTransaction).setBuffer(screenshotSurface, hardwareBuffer);
+ verify(mTransaction).setVisibility(screenshotSurface, true);
+ verify(mTransaction).apply();
+ }
+
+ @Test
+ public void surfaceMovesWithGesture() {
+ SurfaceControl topWindowLeash = new SurfaceControl();
+ SurfaceControl screenshotSurface = new SurfaceControl();
+ HardwareBuffer hardwareBuffer = mock(HardwareBuffer.class);
+ createNavigationInfo(topWindowLeash, screenshotSurface, hardwareBuffer);
+ mController.onMotionEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0));
+ mController.onMotionEvent(MotionEvent.obtain(10, 0, MotionEvent.ACTION_MOVE, 100, 100, 0));
+ verify(mTransaction).setPosition(topWindowLeash, 100, 100);
+ verify(mTransaction, atLeastOnce()).apply();
+ }
+}
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropPolicyTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropPolicyTest.java
index fe66e22..35e4982 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropPolicyTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/draganddrop/DragAndDropPolicyTest.java
@@ -19,7 +19,6 @@
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.content.ClipDescription.MIMETYPE_APPLICATION_ACTIVITY;
import static android.content.ClipDescription.MIMETYPE_APPLICATION_SHORTCUT;
import static android.content.ClipDescription.MIMETYPE_APPLICATION_TASK;
@@ -111,7 +110,6 @@
private ActivityManager.RunningTaskInfo mHomeTask;
private ActivityManager.RunningTaskInfo mFullscreenAppTask;
private ActivityManager.RunningTaskInfo mNonResizeableFullscreenAppTask;
- private ActivityManager.RunningTaskInfo mSplitPrimaryAppTask;
@Before
public void setUp() throws RemoteException {
@@ -144,8 +142,6 @@
mNonResizeableFullscreenAppTask =
createTaskInfo(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
mNonResizeableFullscreenAppTask.isResizeable = false;
- mSplitPrimaryAppTask = createTaskInfo(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,
- ACTIVITY_TYPE_STANDARD);
setRunningTask(mFullscreenAppTask);
}
diff --git a/libs/androidfw/Locale.cpp b/libs/androidfw/Locale.cpp
index 3eedda8..d87a3ce 100644
--- a/libs/androidfw/Locale.cpp
+++ b/libs/androidfw/Locale.cpp
@@ -29,40 +29,33 @@
namespace android {
-void LocaleValue::set_language(const char* language_chars) {
+template <size_t N, class Transformer>
+static void safe_transform_copy(const char* source, char (&dest)[N], Transformer t) {
size_t i = 0;
- while ((*language_chars) != '\0') {
- language[i++] = ::tolower(*language_chars);
- language_chars++;
+ while (i < N && (*source) != '\0') {
+ dest[i++] = t(i, *source);
+ source++;
}
+ while (i < N) {
+ dest[i++] = '\0';
+ }
+}
+
+void LocaleValue::set_language(const char* language_chars) {
+ safe_transform_copy(language_chars, language, [](size_t, char c) { return ::tolower(c); });
}
void LocaleValue::set_region(const char* region_chars) {
- size_t i = 0;
- while ((*region_chars) != '\0') {
- region[i++] = ::toupper(*region_chars);
- region_chars++;
- }
+ safe_transform_copy(region_chars, region, [](size_t, char c) { return ::toupper(c); });
}
void LocaleValue::set_script(const char* script_chars) {
- size_t i = 0;
- while ((*script_chars) != '\0') {
- if (i == 0) {
- script[i++] = ::toupper(*script_chars);
- } else {
- script[i++] = ::tolower(*script_chars);
- }
- script_chars++;
- }
+ safe_transform_copy(script_chars, script,
+ [](size_t i, char c) { return i ? ::tolower(c) : ::toupper(c); });
}
void LocaleValue::set_variant(const char* variant_chars) {
- size_t i = 0;
- while ((*variant_chars) != '\0') {
- variant[i++] = *variant_chars;
- variant_chars++;
- }
+ safe_transform_copy(variant_chars, variant, [](size_t, char c) { return c; });
}
static inline bool is_alpha(const std::string& str) {
@@ -234,6 +227,10 @@
return static_cast<ssize_t>(iter - start_iter);
}
+// Make sure the following memcpy's are properly sized.
+static_assert(sizeof(ResTable_config::localeScript) == sizeof(LocaleValue::script));
+static_assert(sizeof(ResTable_config::localeVariant) == sizeof(LocaleValue::variant));
+
void LocaleValue::InitFromResTable(const ResTable_config& config) {
config.unpackLanguage(language);
config.unpackRegion(region);
diff --git a/media/aidl/android/media/audio/common/AudioOutputFlags.aidl b/media/aidl/android/media/audio/common/AudioOutputFlags.aidl
index a46229d..2556b68 100644
--- a/media/aidl/android/media/audio/common/AudioOutputFlags.aidl
+++ b/media/aidl/android/media/audio/common/AudioOutputFlags.aidl
@@ -26,7 +26,7 @@
*/
@VintfStability
@Backing(type="int")
-enum AudioOutputFlags {
+enum AudioOutputFlags{
/**
* Output must not be altered by the framework, it bypasses software mixers.
*/
@@ -98,7 +98,11 @@
*/
GAPLESS_OFFLOAD = 15,
/**
+ * Output is used for spatial audio.
+ */
+ SPATIALIZER = 16,
+ /**
* Output is used for transmitting ultrasound audio.
*/
- ULTRASOUND = 16,
+ ULTRASOUND = 17,
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl
index e2f286e..4a512a8 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl
@@ -51,5 +51,6 @@
VOIP_RX = 13,
INCALL_MUSIC = 14,
GAPLESS_OFFLOAD = 15,
- ULTRASOUND = 16,
+ SPATIALIZER = 16,
+ ULTRASOUND = 17,
}
diff --git a/media/java/android/media/ImageWriter.java b/media/java/android/media/ImageWriter.java
index 1fc2cf9..6168c22 100644
--- a/media/java/android/media/ImageWriter.java
+++ b/media/java/android/media/ImageWriter.java
@@ -18,12 +18,16 @@
import android.annotation.IntRange;
import android.annotation.NonNull;
+import android.annotation.SuppressLint;
import android.graphics.GraphicBuffer;
import android.graphics.ImageFormat;
import android.graphics.ImageFormat.Format;
import android.graphics.PixelFormat;
import android.graphics.Rect;
+import android.hardware.DataSpace;
+import android.hardware.DataSpace.NamedDataSpace;
import android.hardware.HardwareBuffer;
+import android.hardware.HardwareBuffer.Usage;
import android.hardware.camera2.params.StreamConfigurationMap;
import android.hardware.camera2.utils.SurfaceUtils;
import android.os.Handler;
@@ -95,10 +99,18 @@
private ListenerHandler mListenerHandler;
private long mNativeContext;
+ private int mWidth;
+ private int mHeight;
+ private final int mMaxImages;
+ private @Usage long mUsage = HardwareBuffer.USAGE_CPU_WRITE_OFTEN;
+ private @HardwareBuffer.Format int mHardwareBufferFormat;
+ private @NamedDataSpace long mDataSpace;
+ private boolean mUseLegacyImageFormat;
+ private boolean mUseSurfaceImageFormatInfo;
+
// Field below is used by native code, do not access or modify.
private int mWriterFormat;
- private final int mMaxImages;
// Keep track of the currently dequeued Image. This need to be thread safe as the images
// could be closed by different threads (e.g., application thread and GC thread).
private List<Image> mDequeuedImages = new CopyOnWriteArrayList<>();
@@ -131,7 +143,7 @@
*/
public static @NonNull ImageWriter newInstance(@NonNull Surface surface,
@IntRange(from = 1) int maxImages) {
- return new ImageWriter(surface, maxImages, ImageFormat.UNKNOWN, -1 /*width*/,
+ return new ImageWriter(surface, maxImages, true, ImageFormat.UNKNOWN, -1 /*width*/,
-1 /*height*/);
}
@@ -183,7 +195,7 @@
if (!ImageFormat.isPublicFormat(format) && !PixelFormat.isPublicFormat(format)) {
throw new IllegalArgumentException("Invalid format is specified: " + format);
}
- return new ImageWriter(surface, maxImages, format, width, height);
+ return new ImageWriter(surface, maxImages, false, format, width, height);
}
/**
@@ -232,48 +244,49 @@
if (!ImageFormat.isPublicFormat(format) && !PixelFormat.isPublicFormat(format)) {
throw new IllegalArgumentException("Invalid format is specified: " + format);
}
- return new ImageWriter(surface, maxImages, format, -1 /*width*/, -1 /*height*/);
+ return new ImageWriter(surface, maxImages, false, format, -1 /*width*/, -1 /*height*/);
}
- /**
- * @hide
- */
- protected ImageWriter(Surface surface, int maxImages, int format, int width, int height) {
+ private void initializeImageWriter(Surface surface, int maxImages,
+ boolean useSurfaceImageFormatInfo, boolean useLegacyImageFormat, int imageFormat,
+ int hardwareBufferFormat, long dataSpace, int width, int height, long usage) {
if (surface == null || maxImages < 1) {
throw new IllegalArgumentException("Illegal input argument: surface " + surface
- + ", maxImages: " + maxImages);
+ + ", maxImages: " + maxImages);
}
- mMaxImages = maxImages;
-
+ mUseSurfaceImageFormatInfo = useSurfaceImageFormatInfo;
+ mUseLegacyImageFormat = useLegacyImageFormat;
// Note that the underlying BufferQueue is working in synchronous mode
// to avoid dropping any buffers.
- mNativeContext = nativeInit(new WeakReference<>(this), surface, maxImages, format, width,
- height);
+ mNativeContext = nativeInit(new WeakReference<>(this), surface, maxImages, width, height,
+ useSurfaceImageFormatInfo, hardwareBufferFormat, dataSpace, usage);
- // nativeInit internally overrides UNKNOWN format. So does surface format query after
- // nativeInit and before getEstimatedNativeAllocBytes().
- if (format == ImageFormat.UNKNOWN) {
- format = SurfaceUtils.getSurfaceFormat(surface);
- }
- // Several public formats use the same native HAL_PIXEL_FORMAT_BLOB. The native
- // allocation estimation sequence depends on the public formats values. To avoid
- // possible errors, convert where necessary.
- if (format == StreamConfigurationMap.HAL_PIXEL_FORMAT_BLOB) {
- int surfaceDataspace = SurfaceUtils.getSurfaceDataspace(surface);
- switch (surfaceDataspace) {
- case StreamConfigurationMap.HAL_DATASPACE_DEPTH:
- format = ImageFormat.DEPTH_POINT_CLOUD;
- break;
- case StreamConfigurationMap.HAL_DATASPACE_DYNAMIC_DEPTH:
- format = ImageFormat.DEPTH_JPEG;
- break;
- case StreamConfigurationMap.HAL_DATASPACE_HEIF:
- format = ImageFormat.HEIC;
- break;
- default:
- format = ImageFormat.JPEG;
+ if (useSurfaceImageFormatInfo) {
+ // nativeInit internally overrides UNKNOWN format. So does surface format query after
+ // nativeInit and before getEstimatedNativeAllocBytes().
+ imageFormat = SurfaceUtils.getSurfaceFormat(surface);
+ // Several public formats use the same native HAL_PIXEL_FORMAT_BLOB. The native
+ // allocation estimation sequence depends on the public formats values. To avoid
+ // possible errors, convert where necessary.
+ if (imageFormat == StreamConfigurationMap.HAL_PIXEL_FORMAT_BLOB) {
+ int surfaceDataspace = SurfaceUtils.getSurfaceDataspace(surface);
+ switch (surfaceDataspace) {
+ case StreamConfigurationMap.HAL_DATASPACE_DEPTH:
+ imageFormat = ImageFormat.DEPTH_POINT_CLOUD;
+ break;
+ case StreamConfigurationMap.HAL_DATASPACE_DYNAMIC_DEPTH:
+ imageFormat = ImageFormat.DEPTH_JPEG;
+ break;
+ case StreamConfigurationMap.HAL_DATASPACE_HEIF:
+ imageFormat = ImageFormat.HEIC;
+ break;
+ default:
+ imageFormat = ImageFormat.JPEG;
+ }
}
+ mHardwareBufferFormat = PublicFormatUtils.getHalFormat(imageFormat);
+ mDataSpace = PublicFormatUtils.getHalDataspace(imageFormat);
}
// Estimate the native buffer allocation size and register it so it gets accounted for
// during GC. Note that this doesn't include the buffers required by the buffer queue
@@ -282,12 +295,49 @@
// complex, and 1 buffer is enough for the VM to treat the ImageWriter as being of some
// size.
Size surfSize = SurfaceUtils.getSurfaceSize(surface);
+ mWidth = width == -1 ? surfSize.getWidth() : width;
+ mHeight = height == -1 ? surfSize.getHeight() : height;
+
mEstimatedNativeAllocBytes =
- ImageUtils.getEstimatedNativeAllocBytes(surfSize.getWidth(),surfSize.getHeight(),
- format, /*buffer count*/ 1);
+ ImageUtils.getEstimatedNativeAllocBytes(mWidth, mHeight,
+ useLegacyImageFormat ? imageFormat : hardwareBufferFormat, /*buffer count*/ 1);
VMRuntime.getRuntime().registerNativeAllocation(mEstimatedNativeAllocBytes);
}
+ private ImageWriter(Surface surface, int maxImages, boolean useSurfaceImageFormatInfo,
+ int imageFormat, int width, int height) {
+ mMaxImages = maxImages;
+ // update hal format and dataspace only if image format is overridden by producer.
+ mHardwareBufferFormat = PublicFormatUtils.getHalFormat(imageFormat);
+ mDataSpace = PublicFormatUtils.getHalDataspace(imageFormat);
+
+ initializeImageWriter(surface, maxImages, useSurfaceImageFormatInfo, true,
+ imageFormat, mHardwareBufferFormat, mDataSpace, width, height, mUsage);
+ }
+
+ private ImageWriter(Surface surface, int maxImages, boolean useSurfaceImageFormatInfo,
+ int imageFormat, int width, int height, long usage) {
+ mMaxImages = maxImages;
+ mUsage = usage;
+ mHardwareBufferFormat = PublicFormatUtils.getHalFormat(imageFormat);
+ mDataSpace = PublicFormatUtils.getHalDataspace(imageFormat);
+
+ initializeImageWriter(surface, maxImages, useSurfaceImageFormatInfo, true,
+ imageFormat, mHardwareBufferFormat, mDataSpace, width, height, usage);
+ }
+
+ private ImageWriter(Surface surface, int maxImages, boolean useSurfaceImageFormatInfo,
+ int hardwareBufferFormat, long dataSpace, int width, int height, long usage) {
+ mMaxImages = maxImages;
+ mUsage = usage;
+ mHardwareBufferFormat = hardwareBufferFormat;
+ mDataSpace = dataSpace;
+ int publicFormat = PublicFormatUtils.getPublicFormat(hardwareBufferFormat, dataSpace);
+
+ initializeImageWriter(surface, maxImages, useSurfaceImageFormatInfo, false,
+ publicFormat, hardwareBufferFormat, dataSpace, width, height, usage);
+ }
+
/**
* <p>
* Maximum number of Images that can be dequeued from the ImageWriter
@@ -316,6 +366,30 @@
}
/**
+ * The width of {@link Image Images}, in pixels.
+ *
+ * <p>If {@link Builder#setWidthAndHeight} is not called, the default width of the Image
+ * depends on the Surface provided by customer end-point.</p>
+ *
+ * @return the expected actual width of an Image.
+ */
+ public int getWidth() {
+ return mWidth;
+ }
+
+ /**
+ * The height of {@link Image Images}, in pixels.
+ *
+ * <p>If {@link Builder#setWidthAndHeight} is not called, the default height of the Image
+ * depends on the Surface provided by customer end-point.</p>
+ *
+ * @return the expected height of an Image.
+ */
+ public int getHeight() {
+ return mHeight;
+ }
+
+ /**
* <p>
* Dequeue the next available input Image for the application to produce
* data into.
@@ -490,6 +564,41 @@
}
/**
+ * Get the ImageWriter usage flag.
+ *
+ * @return The ImageWriter usage flag.
+ */
+ public @Usage long getUsage() {
+ return mUsage;
+ }
+
+ /**
+ * Get the ImageWriter hardwareBuffer format.
+ *
+ * <p>Use this function if the ImageWriter instance is created by builder pattern
+ * {@code ImageWriter.Builder} and using {@link Builder#setHardwareBufferFormat} and
+ * {@link Builder#setDataSpace}.</p>
+ *
+ * @return The ImageWriter hardwareBuffer format.
+ */
+ public @HardwareBuffer.Format int getHardwareBufferFormat() {
+ return mHardwareBufferFormat;
+ }
+
+ /**
+ * Get the ImageWriter dataspace.
+ *
+ * <p>Use this function if the ImageWriter instance is created by builder pattern
+ * {@code ImageWriter.Builder} and {@link Builder#setDataSpace}.</p>
+ *
+ * @return The ImageWriter dataspace.
+ */
+ @SuppressLint("MethodNameUnits")
+ public @NamedDataSpace long getDataSpace() {
+ return mDataSpace;
+ }
+
+ /**
* ImageWriter callback interface, used to to asynchronously notify the
* application of various ImageWriter events.
*/
@@ -755,6 +864,155 @@
return true;
}
+ /**
+ * Builder class for {@link ImageWriter} objects.
+ */
+ public static final class Builder {
+ private Surface mSurface;
+ private int mWidth = -1;
+ private int mHeight = -1;
+ private int mMaxImages = 1;
+ private int mImageFormat = ImageFormat.UNKNOWN;
+ private @Usage long mUsage = HardwareBuffer.USAGE_CPU_WRITE_OFTEN;
+ private @HardwareBuffer.Format int mHardwareBufferFormat = HardwareBuffer.RGBA_8888;
+ private @NamedDataSpace long mDataSpace = DataSpace.DATASPACE_UNKNOWN;
+ private boolean mUseSurfaceImageFormatInfo = true;
+ // set this as true temporarily now as a workaround to get correct format
+ // when using surface format by default without overriding the image format
+ // in the builder pattern
+ private boolean mUseLegacyImageFormat = true;
+
+ /**
+ * Constructs a new builder for {@link ImageWriter}.
+ *
+ * @param surface The destination Surface this writer produces Image data into.
+ */
+ public Builder(@NonNull Surface surface) {
+ mSurface = surface;
+ }
+
+ /**
+ * Set the width and height of images. Default size is dependent on the Surface that is
+ * provided by the downstream end-point.
+ *
+ * @param width The width in pixels that will be passed to the producer.
+ * @param height The height in pixels that will be passed to the producer.
+ * @return the Builder instance with customized width and height.
+ */
+ @SuppressLint("MissingGetterMatchingBuilder")
+ public @NonNull Builder setWidthAndHeight(@IntRange(from = 1) int width,
+ @IntRange(from = 1) int height) {
+ mWidth = width;
+ mHeight = height;
+ return this;
+ }
+
+ /**
+ * Set the maximum number of images. Default value is 1.
+ *
+ * @param maxImages The maximum number of Images the user will want to access simultaneously
+ * for producing Image data.
+ * @return the Builder instance with customized usage value.
+ */
+ public @NonNull Builder setMaxImages(@IntRange(from = 1) int maxImages) {
+ mMaxImages = maxImages;
+ return this;
+ }
+
+ /**
+ * Set the image format of this ImageWriter.
+ * Default format depends on the Surface provided.
+ *
+ * @param imageFormat The format of the {@link ImageWriter}. It can be any valid specified
+ * by {@link ImageFormat} or {@link PixelFormat}.
+ * @return the Builder instance with customized image format.
+ */
+ @SuppressLint("MissingGetterMatchingBuilder")
+ public @NonNull Builder setImageFormat(@Format int imageFormat) {
+ if (!ImageFormat.isPublicFormat(imageFormat)
+ && !PixelFormat.isPublicFormat(imageFormat)) {
+ throw new IllegalArgumentException(
+ "Invalid imageFormat is specified: " + imageFormat);
+ }
+ mImageFormat = imageFormat;
+ mUseLegacyImageFormat = true;
+ mHardwareBufferFormat = HardwareBuffer.RGBA_8888;
+ mDataSpace = DataSpace.DATASPACE_UNKNOWN;
+ mUseSurfaceImageFormatInfo = false;
+ return this;
+ }
+
+ /**
+ * Set the hardwareBuffer format of this ImageWriter. The default value is
+ * {@link HardwareBuffer#RGBA_8888 HardwareBuffer.RGBA_8888}.
+ *
+ * <p>This function works together with {@link #setDataSpace} for an
+ * {@link ImageWriter} instance. Setting at least one of these two replaces
+ * {@link #setImageFormat} function.</p>
+ *
+ * @param hardwareBufferFormat The HardwareBuffer format of the image that this writer
+ * will produce.
+ * @return the Builder instance with customized buffer format.
+ *
+ * @see #setDataSpace
+ * @see #setImageFormat
+ */
+ public @NonNull Builder setHardwareBufferFormat(
+ @HardwareBuffer.Format int hardwareBufferFormat) {
+ mHardwareBufferFormat = hardwareBufferFormat;
+ mImageFormat = ImageFormat.UNKNOWN;
+ mUseLegacyImageFormat = false;
+ mUseSurfaceImageFormatInfo = false;
+ return this;
+ }
+
+ /**
+ * Set the dataspace of this ImageWriter.
+ * The default value is {@link DataSpace#DATASPACE_UNKNOWN}.
+ *
+ * @param dataSpace The dataspace of the image that this writer will produce.
+ * @return the builder instance with customized dataspace value.
+ *
+ * @see #setHardwareBufferFormat
+ */
+ public @NonNull Builder setDataSpace(@NamedDataSpace long dataSpace) {
+ mDataSpace = dataSpace;
+ mImageFormat = ImageFormat.UNKNOWN;
+ mUseLegacyImageFormat = false;
+ mUseSurfaceImageFormatInfo = false;
+ return this;
+ }
+
+ /**
+ * Set the usage flag of this ImageWriter.
+ * Default value is {@link HardwareBuffer#USAGE_CPU_WRITE_OFTEN}.
+ *
+ * @param usage The intended usage of the images produced by this ImageWriter.
+ * @return the Builder instance with customized usage flag.
+ *
+ * @see HardwareBuffer
+ */
+ public @NonNull Builder setUsage(@Usage long usage) {
+ mUsage = usage;
+ return this;
+ }
+
+ /**
+ * Builds a new ImageWriter object.
+ *
+ * @return The new ImageWriter object.
+ */
+ public @NonNull ImageWriter build() {
+ if (mUseLegacyImageFormat) {
+ return new ImageWriter(mSurface, mMaxImages, mUseSurfaceImageFormatInfo,
+ mImageFormat, mWidth, mHeight, mUsage);
+ } else {
+ return new ImageWriter(mSurface, mMaxImages, mUseSurfaceImageFormatInfo,
+ mHardwareBufferFormat, mDataSpace, mWidth, mHeight, mUsage);
+ }
+ }
+ }
+
private static class WriterSurfaceImage extends android.media.Image {
private ImageWriter mOwner;
// This field is used by native code, do not access or modify.
@@ -774,6 +1032,13 @@
public WriterSurfaceImage(ImageWriter writer) {
mOwner = writer;
+ mWidth = writer.mWidth;
+ mHeight = writer.mHeight;
+
+ if (!writer.mUseLegacyImageFormat) {
+ mFormat = PublicFormatUtils.getPublicFormat(
+ writer.mHardwareBufferFormat, writer.mDataSpace);
+ }
}
@Override
@@ -969,8 +1234,9 @@
}
// Native implemented ImageWriter methods.
- private synchronized native long nativeInit(Object weakSelf, Surface surface, int maxImgs,
- int format, int width, int height);
+ private synchronized native long nativeInit(Object weakSelf, Surface surface, int maxImages,
+ int width, int height, boolean useSurfaceImageFormatInfo, int hardwareBufferFormat,
+ long dataSpace, long usage);
private synchronized native void nativeClose(long nativeCtx);
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 3c152fb..e75df1d 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -603,6 +603,18 @@
public static final String FEATURE_QpBounds = "qp-bounds";
/**
+ * <b>video encoder only</b>: codec supports exporting encoding statistics.
+ * Encoders with this feature can provide the App clients with the encoding statistics
+ * information about the frame.
+ * The scope of encoding statistics is controlled by
+ * {@link MediaFormat#KEY_VIDEO_ENCODING_STATISTICS_LEVEL}.
+ *
+ * @see MediaFormat#KEY_VIDEO_ENCODING_STATISTICS_LEVEL
+ */
+ @SuppressLint("AllUpper") // for consistency with other FEATURE_* constants
+ public static final String FEATURE_EncodingStatistics = "encoding-statistics";
+
+ /**
* Query codec feature capabilities.
* <p>
* These features are supported to be used by the codec. These
@@ -641,6 +653,7 @@
new Feature(FEATURE_MultipleFrames, (1 << 1), false),
new Feature(FEATURE_DynamicTimestamp, (1 << 2), false),
new Feature(FEATURE_QpBounds, (1 << 3), false),
+ new Feature(FEATURE_EncodingStatistics, (1 << 4), false),
// feature to exclude codec from REGULAR codec list
new Feature(FEATURE_SpecialCodec, (1 << 30), false, true),
};
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 4891d74..4956dbe 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -1176,6 +1176,76 @@
public static final String KEY_VIDEO_QP_B_MIN = "video-qp-b-min";
/**
+ * A key describing the level of encoding statistics information emitted from video encoder.
+ *
+ * The associated value is an integer.
+ */
+ public static final String KEY_VIDEO_ENCODING_STATISTICS_LEVEL =
+ "video-encoding-statistics-level";
+
+ /**
+ * Encoding Statistics Level None.
+ * Encoder generates no information about Encoding statistics.
+ */
+ public static final int VIDEO_ENCODING_STATISTICS_LEVEL_NONE = 0;
+
+ /**
+ * Encoding Statistics Level 1.
+ * Encoder generates {@link MediaFormat#KEY_PICTURE_TYPE} and
+ * {@link MediaFormat#KEY_VIDEO_QP_AVERAGE} for each frame.
+ */
+ public static final int VIDEO_ENCODING_STATISTICS_LEVEL_1 = 1;
+
+ /** @hide */
+ @IntDef({
+ VIDEO_ENCODING_STATISTICS_LEVEL_NONE,
+ VIDEO_ENCODING_STATISTICS_LEVEL_1,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface VideoEncodingStatisticsLevel {}
+
+ /**
+ * A key describing the per-frame average block QP (Quantization Parameter).
+ * This is a part of a video 'Encoding Statistics' export feature.
+ * This value is emitted from video encoder for a video frame.
+ * The average value is rounded down (using floor()) to integer value.
+ *
+ * The associated value is an integer.
+ */
+ public static final String KEY_VIDEO_QP_AVERAGE = "video-qp-average";
+
+ /**
+ * A key describing the picture type of the encoded frame.
+ * This is a part of a video 'Encoding Statistics' export feature.
+ * This value is emitted from video encoder for a video frame.
+ *
+ * The associated value is an integer.
+ */
+ public static final String KEY_PICTURE_TYPE = "picture-type";
+
+ /** Picture Type is unknown. */
+ public static final int PICTURE_TYPE_UNKNOWN = 0;
+
+ /** Picture Type is I Frame. */
+ public static final int PICTURE_TYPE_I = 1;
+
+ /** Picture Type is P Frame. */
+ public static final int PICTURE_TYPE_P = 2;
+
+ /** Picture Type is B Frame. */
+ public static final int PICTURE_TYPE_B = 3;
+
+ /** @hide */
+ @IntDef({
+ PICTURE_TYPE_UNKNOWN,
+ PICTURE_TYPE_I,
+ PICTURE_TYPE_P,
+ PICTURE_TYPE_B,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface PictureType {}
+
+ /**
* A key describing the audio session ID of the AudioTrack associated
* to a tunneled video codec.
* The associated value is an integer.
diff --git a/media/java/android/media/midi/MidiDeviceInfo.java b/media/java/android/media/midi/MidiDeviceInfo.java
index b888fb0..48c50f0 100644
--- a/media/java/android/media/midi/MidiDeviceInfo.java
+++ b/media/java/android/media/midi/MidiDeviceInfo.java
@@ -159,7 +159,7 @@
PROTOCOL_UNKNOWN
})
@Retention(RetentionPolicy.SOURCE)
- public @interface DefaultProtocol {}
+ public @interface Protocol {}
/**
* Bundle key for the device's user visible name property.
@@ -429,7 +429,7 @@
*
* @return the device's default protocol.
*/
- @DefaultProtocol
+ @Protocol
public int getDefaultProtocol() {
return mDefaultProtocol;
}
diff --git a/media/java/android/media/midi/MidiManager.java b/media/java/android/media/midi/MidiManager.java
index a049a88..5348d4e 100644
--- a/media/java/android/media/midi/MidiManager.java
+++ b/media/java/android/media/midi/MidiManager.java
@@ -18,7 +18,6 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
-import android.annotation.Nullable;
import android.annotation.RequiresFeature;
import android.annotation.SystemService;
import android.bluetooth.BluetoothDevice;
@@ -29,13 +28,19 @@
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
+import android.util.ArraySet;
import android.util.Log;
+import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+
+// BLE-MIDI
/**
* This class is the public application interface to the MIDI service.
@@ -108,18 +113,30 @@
private class DeviceListener extends IMidiDeviceListener.Stub {
private final DeviceCallback mCallback;
private final Handler mHandler;
+ private final Executor mExecutor;
private final int mTransport;
DeviceListener(DeviceCallback callback, Handler handler, int transport) {
mCallback = callback;
mHandler = handler;
+ mExecutor = null;
+ mTransport = transport;
+ }
+
+ DeviceListener(DeviceCallback callback, Executor executor, int transport) {
+ mCallback = callback;
+ mHandler = null;
+ mExecutor = executor;
mTransport = transport;
}
@Override
public void onDeviceAdded(MidiDeviceInfo device) {
if (shouldInvokeCallback(device)) {
- if (mHandler != null) {
+ if (mExecutor != null) {
+ mExecutor.execute(() ->
+ mCallback.onDeviceAdded(device));
+ } else if (mHandler != null) {
final MidiDeviceInfo deviceF = device;
mHandler.post(new Runnable() {
@Override public void run() {
@@ -135,7 +152,10 @@
@Override
public void onDeviceRemoved(MidiDeviceInfo device) {
if (shouldInvokeCallback(device)) {
- if (mHandler != null) {
+ if (mExecutor != null) {
+ mExecutor.execute(() ->
+ mCallback.onDeviceRemoved(device));
+ } else if (mHandler != null) {
final MidiDeviceInfo deviceF = device;
mHandler.post(new Runnable() {
@Override public void run() {
@@ -150,7 +170,10 @@
@Override
public void onDeviceStatusChanged(MidiDeviceStatus status) {
- if (mHandler != null) {
+ if (mExecutor != null) {
+ mExecutor.execute(() ->
+ mCallback.onDeviceStatusChanged(status));
+ } else if (mHandler != null) {
final MidiDeviceStatus statusF = status;
mHandler.post(new Runnable() {
@Override public void run() {
@@ -234,7 +257,7 @@
/**
* Registers a callback to receive notifications when MIDI 1.0 devices are added and removed.
* These are devices that do not default to Universal MIDI Packets. To register for a callback
- * for those, call {@link #registerDeviceCallbackForTransport} instead.
+ * for those, call {@link #registerDeviceCallback} instead.
* The {@link DeviceCallback#onDeviceStatusChanged} method will be called immediately
* for any devices that have open ports. This allows applications to know which input
@@ -247,9 +270,19 @@
* @param handler The {@link android.os.Handler Handler} that will be used for delivering the
* device notifications. If handler is null, then the thread used for the
* callback is unspecified.
+ * @deprecated Use the {@link #registerDeviceCallback}
+ * method with Executor and transport instead.
*/
+ @Deprecated
public void registerDeviceCallback(DeviceCallback callback, Handler handler) {
- registerDeviceCallbackForTransport(callback, handler, TRANSPORT_MIDI_BYTE_STREAM);
+ DeviceListener deviceListener = new DeviceListener(callback, handler,
+ TRANSPORT_MIDI_BYTE_STREAM);
+ try {
+ mService.registerListener(mToken, deviceListener);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ mDeviceListeners.put(callback, deviceListener);
}
/**
@@ -263,16 +296,16 @@
* Applications should call {@link #getDevicesForTransport} before registering the callback
* to get a list of devices already added.
*
- * @param callback a {@link DeviceCallback} for MIDI device notifications
- * @param handler The {@link android.os.Handler Handler} that will be used for delivering the
- * device notifications. If handler is null, then the thread used for the
- * callback is unspecified.
* @param transport The transport to be used. This is either TRANSPORT_MIDI_BYTE_STREAM or
* TRANSPORT_UNIVERSAL_MIDI_PACKETS.
+ * @param executor The {@link Executor} that will be used for delivering the
+ * device notifications.
+ * @param callback a {@link DeviceCallback} for MIDI device notifications
*/
- public void registerDeviceCallbackForTransport(@NonNull DeviceCallback callback,
- @Nullable Handler handler, @Transport int transport) {
- DeviceListener deviceListener = new DeviceListener(callback, handler, transport);
+ public void registerDeviceCallback(@Transport int transport,
+ @NonNull Executor executor, @NonNull DeviceCallback callback) {
+ Objects.requireNonNull(executor);
+ DeviceListener deviceListener = new DeviceListener(callback, executor, transport);
try {
mService.registerListener(mToken, deviceListener);
} catch (RemoteException e) {
@@ -303,7 +336,9 @@
* {@link #getDevicesForTransport} instead.
*
* @return an array of MIDI devices
+ * @deprecated Use {@link #getDevicesForTransport} instead.
*/
+ @Deprecated
public MidiDeviceInfo[] getDevices() {
try {
return mService.getDevices();
@@ -322,14 +357,13 @@
* TRANSPORT_UNIVERSAL_MIDI_PACKETS.
* @return a collection of MIDI devices
*/
- public @NonNull Collection<MidiDeviceInfo> getDevicesForTransport(@Transport int transport) {
+ public @NonNull Set<MidiDeviceInfo> getDevicesForTransport(@Transport int transport) {
try {
MidiDeviceInfo[] devices = mService.getDevicesForTransport(transport);
- Collection<MidiDeviceInfo> out = new ArrayList<MidiDeviceInfo>(devices.length);
- for (int i = 0; i < devices.length; i++) {
- out.add(devices[i]);
+ if (devices == null) {
+ return Collections.emptySet();
}
- return out;
+ return new ArraySet<>(devices);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -399,9 +433,11 @@
final OnDeviceOpenedListener listenerF = listener;
final Handler handlerF = handler;
+ Log.d(TAG, "openBluetoothDevice() " + bluetoothDevice);
IMidiDeviceOpenCallback callback = new IMidiDeviceOpenCallback.Stub() {
@Override
public void onDeviceOpened(IMidiDeviceServer server, IBinder deviceToken) {
+ Log.d(TAG, "onDeviceOpened() server:" + server);
MidiDevice device = null;
if (server != null) {
try {
@@ -423,6 +459,15 @@
}
}
+ /** @hide */ // for now
+ public void closeBluetoothDevice(@NonNull MidiDevice midiDevice) {
+ try {
+ midiDevice.close();
+ } catch (IOException ex) {
+ Log.e(TAG, "Exception closing BLE-MIDI device" + ex);
+ }
+ }
+
/** @hide */
public MidiDeviceServer createDeviceServer(MidiReceiver[] inputPortReceivers,
int numOutputPorts, String[] inputPortNames, String[] outputPortNames,
diff --git a/media/java/android/media/tv/AitInfo.java b/media/java/android/media/tv/AitInfo.java
index ff4c625..71b1634 100644
--- a/media/java/android/media/tv/AitInfo.java
+++ b/media/java/android/media/tv/AitInfo.java
@@ -17,11 +17,12 @@
package android.media.tv;
import android.annotation.NonNull;
+import android.media.tv.interactive.TvInteractiveAppInfo;
import android.os.Parcel;
import android.os.Parcelable;
/**
- * AIT info.
+ * AIT (Application Information Table) info.
* @hide
*/
public final class AitInfo implements Parcelable {
@@ -50,14 +51,15 @@
/**
* Constructs AIT info.
*/
- public AitInfo(int type, int version) {
+ public AitInfo(@TvInteractiveAppInfo.InteractiveAppType int type, int version) {
mType = type;
mVersion = version;
}
/**
- * Gets type.
+ * Gets interactive app type.
*/
+ @TvInteractiveAppInfo.InteractiveAppType
public int getType() {
return mType;
}
diff --git a/media/java/android/media/tv/DsmccResponse.java b/media/java/android/media/tv/DsmccResponse.java
index 4d49620..3ca63e3 100644
--- a/media/java/android/media/tv/DsmccResponse.java
+++ b/media/java/android/media/tv/DsmccResponse.java
@@ -17,10 +17,13 @@
package android.media.tv;
import android.annotation.NonNull;
+import android.annotation.StringDef;
import android.os.Parcel;
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
@@ -29,6 +32,27 @@
public static final @TvInputManager.BroadcastInfoType int responseType =
TvInputManager.BROADCAST_INFO_TYPE_DSMCC;
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @StringDef(prefix = "BIOP_MESSAGE_TYPE_", value = {
+ BIOP_MESSAGE_TYPE_DIRECTORY,
+ BIOP_MESSAGE_TYPE_FILE,
+ BIOP_MESSAGE_TYPE_STREAM,
+ BIOP_MESSAGE_TYPE_SERVICE_GATEWAY,
+
+ })
+ public @interface BiopMessageType {}
+
+ /** Broadcast Inter-ORB Protocol (BIOP) message types */
+ /** BIOP directory message */
+ public static final String BIOP_MESSAGE_TYPE_DIRECTORY = "directory";
+ /** BIOP file message */
+ public static final String BIOP_MESSAGE_TYPE_FILE = "file";
+ /** BIOP stream message */
+ public static final String BIOP_MESSAGE_TYPE_STREAM = "stream";
+ /** BIOP service gateway message */
+ public static final String BIOP_MESSAGE_TYPE_SERVICE_GATEWAY = "service_gateway";
+
public static final @NonNull Parcelable.Creator<DsmccResponse> CREATOR =
new Parcelable.Creator<DsmccResponse>() {
@Override
@@ -43,39 +67,173 @@
}
};
+ private final @BiopMessageType String mBiopMessageType;
private final ParcelFileDescriptor mFileDescriptor;
- private final boolean mIsDirectory;
- private final List<String> mChildren;
+ private final List<String> mChildList;
+ private final int[] mEventIds;
+ private final String[] mEventNames;
public static DsmccResponse createFromParcelBody(Parcel in) {
return new DsmccResponse(in);
}
+ /**
+ * Constructs a BIOP file message response.
+ */
public DsmccResponse(int requestId, int sequence, @ResponseResult int responseResult,
- ParcelFileDescriptor file, boolean isDirectory, List<String> children) {
+ @NonNull ParcelFileDescriptor file) {
super(responseType, requestId, sequence, responseResult);
+ mBiopMessageType = BIOP_MESSAGE_TYPE_FILE;
mFileDescriptor = file;
- mIsDirectory = isDirectory;
- mChildren = children;
+ mChildList = null;
+ mEventIds = null;
+ mEventNames = null;
}
- protected DsmccResponse(Parcel source) {
+ /**
+ * Constructs a BIOP service gateway or directory message response.
+ */
+ public DsmccResponse(int requestId, int sequence, @ResponseResult int responseResult,
+ boolean isServiceGateway, @NonNull List<String> childList) {
+ super(responseType, requestId, sequence, responseResult);
+ if (isServiceGateway) {
+ mBiopMessageType = BIOP_MESSAGE_TYPE_SERVICE_GATEWAY;
+ } else {
+ mBiopMessageType = BIOP_MESSAGE_TYPE_DIRECTORY;
+ }
+ mFileDescriptor = null;
+ mChildList = childList;
+ mEventIds = null;
+ mEventNames = null;
+ }
+
+ /**
+ * Constructs a BIOP stream message response.
+ *
+ * <p>The current stream message response does not support other stream messages types than
+ * stream event message type.
+ */
+ public DsmccResponse(int requestId, int sequence, @ResponseResult int responseResult,
+ @NonNull int[] eventIds, @NonNull String[] eventNames) {
+ super(responseType, requestId, sequence, responseResult);
+ mBiopMessageType = BIOP_MESSAGE_TYPE_STREAM;
+ mFileDescriptor = null;
+ mChildList = null;
+ mEventIds = eventIds;
+ mEventNames = eventNames;
+ if (mEventIds.length != eventNames.length) {
+ throw new IllegalStateException("The size of eventIds and eventNames must be equal");
+ }
+ }
+
+ private DsmccResponse(@NonNull Parcel source) {
super(responseType, source);
- mFileDescriptor = source.readFileDescriptor();
- mIsDirectory = (source.readInt() == 1);
- mChildren = new ArrayList<>();
- source.readStringList(mChildren);
+
+ mBiopMessageType = source.readString();
+ switch (mBiopMessageType) {
+ case BIOP_MESSAGE_TYPE_SERVICE_GATEWAY:
+ case BIOP_MESSAGE_TYPE_DIRECTORY:
+ int childNum = source.readInt();
+ mChildList = new ArrayList<>();
+ for (int i = 0; i < childNum; i++) {
+ mChildList.add(source.readString());
+ }
+ mFileDescriptor = null;
+ mEventIds = null;
+ mEventNames = null;
+ break;
+ case BIOP_MESSAGE_TYPE_FILE:
+ mFileDescriptor = source.readFileDescriptor();
+ mChildList = null;
+ mEventIds = null;
+ mEventNames = null;
+ break;
+ case BIOP_MESSAGE_TYPE_STREAM:
+ int eventNum = source.readInt();
+ mEventIds = new int[eventNum];
+ mEventNames = new String[eventNum];
+ for (int i = 0; i < eventNum; i++) {
+ mEventIds[i] = source.readInt();
+ mEventNames[i] = source.readString();
+ }
+ mChildList = null;
+ mFileDescriptor = null;
+ break;
+ default:
+ throw new IllegalStateException("unexpected BIOP message type");
+ }
}
+ /** Returns the BIOP message type */
+ @NonNull
+ public @BiopMessageType String getBiopMessageType() {
+ return mBiopMessageType;
+ }
+
+ /** Returns the file descriptor for a given file message response */
+ @NonNull
public ParcelFileDescriptor getFile() {
+ if (!mBiopMessageType.equals(BIOP_MESSAGE_TYPE_FILE)) {
+ throw new IllegalStateException("Not file object");
+ }
return mFileDescriptor;
}
+ /**
+ * Returns a list of subobject names for the given service gateway or directory message
+ * response.
+ */
+ @NonNull
+ public List<String> getChildList() {
+ if (!mBiopMessageType.equals(BIOP_MESSAGE_TYPE_DIRECTORY)
+ && !mBiopMessageType.equals(BIOP_MESSAGE_TYPE_SERVICE_GATEWAY)) {
+ throw new IllegalStateException("Not directory object");
+ }
+ return new ArrayList<String>(mChildList);
+ }
+
+ /** Returns all event IDs carried in a given stream message response. */
+ @NonNull
+ public int[] getStreamEventIds() {
+ if (!mBiopMessageType.equals(BIOP_MESSAGE_TYPE_STREAM)) {
+ throw new IllegalStateException("Not stream event object");
+ }
+ return mEventIds;
+ }
+
+ /** Returns all event names carried in a given stream message response */
+ @NonNull
+ public String[] getStreamEventNames() {
+ if (!mBiopMessageType.equals(BIOP_MESSAGE_TYPE_STREAM)) {
+ throw new IllegalStateException("Not stream event object");
+ }
+ return mEventNames;
+ }
+
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
super.writeToParcel(dest, flags);
- mFileDescriptor.writeToParcel(dest, flags);
- dest.writeInt(mIsDirectory ? 1 : 0);
- dest.writeStringList(mChildren);
+ dest.writeString(mBiopMessageType);
+ switch (mBiopMessageType) {
+ case BIOP_MESSAGE_TYPE_SERVICE_GATEWAY:
+ case BIOP_MESSAGE_TYPE_DIRECTORY:
+ dest.writeInt(mChildList.size());
+ for (String child : mChildList) {
+ dest.writeString(child);
+ }
+ break;
+ case BIOP_MESSAGE_TYPE_FILE:
+ dest.writeFileDescriptor(mFileDescriptor.getFileDescriptor());
+ break;
+ case BIOP_MESSAGE_TYPE_STREAM:
+ dest.writeInt(mEventIds.length);
+ for (int i = 0; i < mEventIds.length; i++) {
+ dest.writeInt(mEventIds[i]);
+ dest.writeString(mEventNames[i]);
+ }
+ break;
+ default:
+ throw new IllegalStateException("unexpected BIOP message type");
+ }
}
}
diff --git a/media/java/android/media/tv/StreamEventResponse.java b/media/java/android/media/tv/StreamEventResponse.java
index fd75801..903fab5c2 100644
--- a/media/java/android/media/tv/StreamEventResponse.java
+++ b/media/java/android/media/tv/StreamEventResponse.java
@@ -39,54 +39,53 @@
}
};
- private final String mName;
- private final String mText;
- private final String mData;
- private final String mStatus;
+ private final int mEventId;
+ private final long mNpt;
+ private final byte[] mData;
public static StreamEventResponse createFromParcelBody(Parcel in) {
return new StreamEventResponse(in);
}
public StreamEventResponse(int requestId, int sequence, @ResponseResult int responseResult,
- String name, String text, String data, String status) {
+ int eventId, long npt, @NonNull byte[] data) {
super(responseType, requestId, sequence, responseResult);
- mName = name;
- mText = text;
+ mEventId = eventId;
+ mNpt = npt;
mData = data;
- mStatus = status;
}
- protected StreamEventResponse(Parcel source) {
+ private StreamEventResponse(@NonNull Parcel source) {
super(responseType, source);
- mName = source.readString();
- mText = source.readString();
- mData = source.readString();
- mStatus = source.readString();
+ mEventId = source.readInt();
+ mNpt = source.readLong();
+ int dataLength = source.readInt();
+ mData = new byte[dataLength];
+ source.readByteArray(mData);
}
- public String getName() {
- return mName;
+ /** Returns the event ID */
+ public int getEventId() {
+ return mEventId;
}
- public String getText() {
- return mText;
+ /** Returns the NPT(Normal Play Time) value when the event occurred or will occur */
+ public long getNpt() {
+ return mNpt;
}
- public String getData() {
+ /** Returns the application specific data */
+ @NonNull
+ public byte[] getData() {
return mData;
}
- public String getStatus() {
- return mStatus;
- }
-
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
super.writeToParcel(dest, flags);
- dest.writeString(mName);
- dest.writeString(mText);
- dest.writeString(mData);
- dest.writeString(mStatus);
+ dest.writeInt(mEventId);
+ dest.writeLong(mNpt);
+ dest.writeInt(mData.length);
+ dest.writeByteArray(mData);
}
}
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 98d1599..f438d29 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -31,7 +31,7 @@
import android.media.AudioDeviceInfo;
import android.media.AudioFormat.Encoding;
import android.media.PlaybackParams;
-import android.media.tv.interactive.TvIAppManager;
+import android.media.tv.interactive.TvInteractiveAppManager;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
@@ -2318,7 +2318,7 @@
// @GuardedBy("mMetadataLock")
private int mVideoHeight;
- private TvIAppManager.Session mIAppSession;
+ private TvInteractiveAppManager.Session mIAppSession;
private boolean mIAppNotificationEnabled = false;
private Session(IBinder token, InputChannel channel, ITvInputManager service, int userId,
@@ -2331,11 +2331,11 @@
mSessionCallbackRecordMap = sessionCallbackRecordMap;
}
- public TvIAppManager.Session getInteractiveAppSession() {
+ public TvInteractiveAppManager.Session getInteractiveAppSession() {
return mIAppSession;
}
- public void setInteractiveAppSession(TvIAppManager.Session iAppSession) {
+ public void setInteractiveAppSession(TvInteractiveAppManager.Session iAppSession) {
this.mIAppSession = iAppSession;
}
@@ -2593,9 +2593,9 @@
/**
* Enables interactive app notification.
+ *
* @param enabled {@code true} if you want to enable interactive app notifications.
* {@code false} otherwise.
- * @hide
*/
public void setInteractiveAppNotificationEnabled(boolean enabled) {
if (mToken == null) {
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 524ba34..9bc7367 100755
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -945,7 +945,13 @@
}
/**
- * Notifies AIT info updated.
+ * Informs the app that the AIT (Application Information Table) is updated.
+ *
+ * <p>This method should also be call when
+ * {@link #onSetInteractiveAppNotificationEnabled(boolean)} is called to send the first AIT
+ * info.
+ *
+ * @see #onSetInteractiveAppNotificationEnabled(boolean)
* @hide
*/
public void notifyAitInfoUpdated(@NonNull final AitInfo aitInfo) {
@@ -1198,7 +1204,16 @@
/**
* Enables or disables interactive app notification.
+ *
+ * <p>This method enables or disables the event detection from the corresponding TV input.
+ * When it's enabled, the TV input service detects events related to interactive app, such
+ * as AIT (Application Information Table) and sends to TvView or the linked TV interactive
+ * app service.
+ *
* @param enabled {@code true} to enable, {@code false} to disable.
+ *
+ * @see TvView#setInteractiveAppNotificationEnabled(boolean)
+ * @see Session#notifyAitInfoUpdated(android.media.tv.AitInfo)
* @hide
*/
public void onSetInteractiveAppNotificationEnabled(boolean enabled) {
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index 71f6ad6..d2086c5 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -481,9 +481,18 @@
}
/**
- * Enables interactive app notification.
+ * Enables or disables interactive app notification.
+ *
+ * <p>This method enables or disables the event detection from the corresponding TV input. When
+ * it's enabled, the TV input service detects events related to interactive app, such as
+ * AIT (Application Information Table) and sends to TvView or the linked TV interactive app
+ * service.
+ *
* @param enabled {@code true} if you want to enable interactive app notifications.
* {@code false} otherwise.
+ *
+ * @see TvInputService.Session#notifyAitInfoUpdated(android.media.tv.AitInfo)
+ * @see android.media.tv.interactive.TvInteractiveAppView#setTvView(TvView)
* @hide
*/
public void setInteractiveAppNotificationEnabled(boolean enabled) {
@@ -1062,12 +1071,12 @@
}
/**
- * This is called when the AIT info has been updated.
+ * This is called when the AIT (Application Information Table) info has been updated.
*
* @param aitInfo The current AIT info.
* @hide
*/
- public void onAitInfoUpdated(String inputId, AitInfo aitInfo) {
+ public void onAitInfoUpdated(@NonNull String inputId, @NonNull AitInfo aitInfo) {
}
/**
diff --git a/media/java/android/media/tv/interactive/AppLinkInfo.aidl b/media/java/android/media/tv/interactive/AppLinkInfo.aidl
new file mode 100644
index 0000000..7c52d01
--- /dev/null
+++ b/media/java/android/media/tv/interactive/AppLinkInfo.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2021 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.media.tv.interactive;
+
+parcelable AppLinkInfo;
\ No newline at end of file
diff --git a/media/java/android/media/tv/interactive/AppLinkInfo.java b/media/java/android/media/tv/interactive/AppLinkInfo.java
new file mode 100644
index 0000000..5cce443
--- /dev/null
+++ b/media/java/android/media/tv/interactive/AppLinkInfo.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2021 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.media.tv.interactive;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * App link information used by TV interactive app to launch Android apps.
+ * @hide
+ */
+public final class AppLinkInfo implements Parcelable {
+ private @NonNull String mPackageName;
+ private @NonNull String mClassName;
+ private @Nullable String mUriScheme;
+ private @Nullable String mUriHost;
+ private @Nullable String mUriPrefix;
+
+
+ /**
+ * Creates a new AppLinkInfo.
+ */
+ private AppLinkInfo(
+ @NonNull String packageName,
+ @NonNull String className,
+ @Nullable String uriScheme,
+ @Nullable String uriHost,
+ @Nullable String uriPrefix) {
+ this.mPackageName = packageName;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mPackageName);
+ this.mClassName = className;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mClassName);
+ this.mUriScheme = uriScheme;
+ this.mUriHost = uriHost;
+ this.mUriPrefix = uriPrefix;
+ }
+
+ /**
+ * Gets package name of the App link.
+ */
+ @NonNull
+ public String getPackageName() {
+ return mPackageName;
+ }
+
+ /**
+ * Gets package class of the App link.
+ */
+ @NonNull
+ public String getClassName() {
+ return mClassName;
+ }
+
+ /**
+ * Gets URI scheme of the App link.
+ */
+ @Nullable
+ public String getUriScheme() {
+ return mUriScheme;
+ }
+
+ /**
+ * Gets URI host of the App link.
+ */
+ @Nullable
+ public String getUriHost() {
+ return mUriHost;
+ }
+
+ /**
+ * Gets URI prefix of the App link.
+ */
+ @Nullable
+ public String getUriPrefix() {
+ return mUriPrefix;
+ }
+
+ @Override
+ public String toString() {
+ return "AppLinkInfo { "
+ + "packageName = " + mPackageName + ", "
+ + "className = " + mClassName + ", "
+ + "uriScheme = " + mUriScheme + ", "
+ + "uriHost = " + mUriHost + ", "
+ + "uriPrefix = " + mUriPrefix
+ + " }";
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeString(mPackageName);
+ dest.writeString(mClassName);
+ dest.writeString(mUriScheme);
+ dest.writeString(mUriHost);
+ dest.writeString(mUriPrefix);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /* package-private */ AppLinkInfo(@NonNull Parcel in) {
+ String packageName = in.readString();
+ String className = in.readString();
+ String uriScheme = in.readString();
+ String uriHost = in.readString();
+ String uriPrefix = in.readString();
+
+ this.mPackageName = packageName;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mPackageName);
+ this.mClassName = className;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mClassName);
+ this.mUriScheme = uriScheme;
+ this.mUriHost = uriHost;
+ this.mUriPrefix = uriPrefix;
+ }
+
+ @NonNull
+ public static final Parcelable.Creator<AppLinkInfo> CREATOR =
+ new Parcelable.Creator<AppLinkInfo>() {
+ @Override
+ public AppLinkInfo[] newArray(int size) {
+ return new AppLinkInfo[size];
+ }
+
+ @Override
+ public AppLinkInfo createFromParcel(@NonNull Parcel in) {
+ return new AppLinkInfo(in);
+ }
+ };
+
+ /**
+ * A builder for {@link AppLinkInfo}
+ */
+ public static final class Builder {
+ private @NonNull String mPackageName;
+ private @NonNull String mClassName;
+ private @Nullable String mUriScheme;
+ private @Nullable String mUriHost;
+ private @Nullable String mUriPrefix;
+
+ /**
+ * Creates a new Builder.
+ */
+ public Builder(
+ @NonNull String packageName,
+ @NonNull String className) {
+ mPackageName = packageName;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mPackageName);
+ mClassName = className;
+ com.android.internal.util.AnnotationValidations.validate(
+ NonNull.class, null, mClassName);
+ }
+
+ /**
+ * Sets package name of the App link.
+ */
+ @NonNull
+ public Builder setPackageName(@NonNull String value) {
+ mPackageName = value;
+ return this;
+ }
+
+ /**
+ * Sets app name of the App link.
+ */
+ @NonNull
+ public Builder setClassName(@NonNull String value) {
+ mClassName = value;
+ return this;
+ }
+
+ /**
+ * Sets URI scheme of the App link.
+ */
+ @NonNull
+ public Builder setUriScheme(@Nullable String value) {
+ mUriScheme = value;
+ return this;
+ }
+
+ /**
+ * Sets URI host of the App link.
+ */
+ @NonNull
+ public Builder setUriHost(@Nullable String value) {
+ mUriHost = value;
+ return this;
+ }
+
+ /**
+ * Sets URI prefix of the App link.
+ */
+ @NonNull
+ public Builder setUriPrefix(@Nullable String value) {
+ mUriPrefix = value;
+ return this;
+ }
+
+ /** Builds the instance. This builder should not be touched after calling this! */
+ @NonNull
+ public AppLinkInfo build() {
+ AppLinkInfo o = new AppLinkInfo(
+ mPackageName,
+ mClassName,
+ mUriScheme,
+ mUriHost,
+ mUriPrefix);
+ return o;
+ }
+ }
+}
diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl
index 1a8fc46..a3e58d1 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl
@@ -34,7 +34,7 @@
void onLayoutSurface(int left, int top, int right, int bottom, int seq);
void onBroadcastInfoRequest(in BroadcastInfoRequest request, int seq);
void onRemoveBroadcastInfo(int id, int seq);
- void onSessionStateChanged(int state, int seq);
+ void onSessionStateChanged(int state, int err, int seq);
void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId, int seq);
void onTeletextAppStateChanged(int state, int seq);
void onCommandRequest(in String cmdType, in Bundle parameters, int seq);
diff --git a/media/java/android/media/tv/interactive/ITvIAppManager.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppManager.aidl
similarity index 93%
rename from media/java/android/media/tv/interactive/ITvIAppManager.aidl
rename to media/java/android/media/tv/interactive/ITvInteractiveAppManager.aidl
index a19a2d2..aaabe34 100644
--- a/media/java/android/media/tv/interactive/ITvIAppManager.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppManager.aidl
@@ -20,6 +20,7 @@
import android.media.tv.AdResponse;
import android.media.tv.BroadcastInfoResponse;
import android.media.tv.TvTrackInfo;
+import android.media.tv.interactive.AppLinkInfo;
import android.media.tv.interactive.ITvInteractiveAppClient;
import android.media.tv.interactive.ITvInteractiveAppManagerCallback;
import android.media.tv.interactive.TvInteractiveAppInfo;
@@ -31,11 +32,11 @@
* Interface to the TV interactive app service.
* @hide
*/
-interface ITvIAppManager {
+interface ITvInteractiveAppManager {
List<TvInteractiveAppInfo> getTvInteractiveAppServiceList(int userId);
void prepare(String tiasId, int type, int userId);
- void registerAppLinkInfo(String tiasId, in Bundle info, int userId);
- void unregisterAppLinkInfo(String tiasId, in Bundle info, int userId);
+ void registerAppLinkInfo(String tiasId, in AppLinkInfo info, int userId);
+ void unregisterAppLinkInfo(String tiasId, in AppLinkInfo info, int userId);
void sendAppLinkCommand(String tiasId, in Bundle command, int userId);
void startInteractiveApp(in IBinder sessionToken, int userId);
void stopInteractiveApp(in IBinder sessionToken, int userId);
diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppManagerCallback.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppManagerCallback.aidl
index f4510f6..23be4c6 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppManagerCallback.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppManagerCallback.aidl
@@ -27,5 +27,5 @@
void onInteractiveAppServiceRemoved(in String iAppServiceId);
void onInteractiveAppServiceUpdated(in String iAppServiceId);
void onTvInteractiveAppInfoUpdated(in TvInteractiveAppInfo tvIAppInfo);
- void onStateChanged(in String iAppServiceId, int type, int state);
+ void onStateChanged(in String iAppServiceId, int type, int state, int err);
}
\ No newline at end of file
diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppService.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppService.aidl
index c1e6622..b6d518f 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppService.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppService.aidl
@@ -16,6 +16,7 @@
package android.media.tv.interactive;
+import android.media.tv.interactive.AppLinkInfo;
import android.media.tv.interactive.ITvInteractiveAppServiceCallback;
import android.media.tv.interactive.ITvInteractiveAppSessionCallback;
import android.os.Bundle;
@@ -23,7 +24,7 @@
/**
* Top-level interface to a TV Interactive App component (implemented in a Service). It's used for
- * TvIAppManagerService to communicate with TvIAppService.
+ * TvInteractiveAppManagerService to communicate with TvInteractiveAppService.
* @hide
*/
oneway interface ITvInteractiveAppService {
@@ -32,7 +33,7 @@
void createSession(in InputChannel channel, in ITvInteractiveAppSessionCallback callback,
in String iAppServiceId, int type);
void prepare(int type);
- void registerAppLinkInfo(in Bundle info);
- void unregisterAppLinkInfo(in Bundle info);
+ void registerAppLinkInfo(in AppLinkInfo info);
+ void unregisterAppLinkInfo(in AppLinkInfo info);
void sendAppLinkCommand(in Bundle command);
}
\ No newline at end of file
diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppServiceCallback.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppServiceCallback.aidl
index f56d3bd..970b943 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppServiceCallback.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppServiceCallback.aidl
@@ -17,10 +17,10 @@
package android.media.tv.interactive;
/**
- * Helper interface for ITvInteractiveAppService to allow the TvIAppService to notify the
- * TvIAppManagerService.
+ * Helper interface for ITvInteractiveAppService to allow the TvInteractiveAppService to notify the
+ * TvInteractiveAppManagerService.
* @hide
*/
oneway interface ITvInteractiveAppServiceCallback {
- void onStateChanged(int type, int state);
+ void onStateChanged(int type, int state, int error);
}
\ No newline at end of file
diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl
index c270424..385f0d4 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl
@@ -24,7 +24,7 @@
import android.os.Bundle;
/**
- * Helper interface for ITvInteractiveAppSession to allow TvIAppService to notify the
+ * Helper interface for ITvInteractiveAppSession to allow TvInteractiveAppService to notify the
* system service when there is a related event.
* @hide
*/
@@ -33,7 +33,7 @@
void onLayoutSurface(int left, int top, int right, int bottom);
void onBroadcastInfoRequest(in BroadcastInfoRequest request);
void onRemoveBroadcastInfo(int id);
- void onSessionStateChanged(int state);
+ void onSessionStateChanged(int state, int err);
void onBiInteractiveAppCreated(in Uri biIAppUri, in String biIAppId);
void onTeletextAppStateChanged(int state);
void onCommandRequest(in String cmdType, in Bundle parameters);
diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppInfo.java b/media/java/android/media/tv/interactive/TvInteractiveAppInfo.java
index 2f96552..e1f535c 100644
--- a/media/java/android/media/tv/interactive/TvInteractiveAppInfo.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppInfo.java
@@ -44,7 +44,6 @@
/**
* This class is used to specify meta information of a TV interactive app.
- * @hide
*/
public final class TvInteractiveAppInfo implements Parcelable {
private static final boolean DEBUG = false;
@@ -59,7 +58,7 @@
INTERACTIVE_APP_TYPE_ATSC,
INTERACTIVE_APP_TYPE_GINGA,
})
- @interface InteractiveAppType {}
+ public @interface InteractiveAppType {}
/** HbbTV interactive app type */
public static final int INTERACTIVE_APP_TYPE_HBBTV = 0x1;
@@ -77,7 +76,7 @@
throw new IllegalArgumentException("context cannot be null.");
}
Intent intent =
- new Intent(TvIAppService.SERVICE_INTERFACE).setComponent(component);
+ new Intent(TvInteractiveAppService.SERVICE_INTERFACE).setComponent(component);
ResolveInfo resolveInfo = context.getPackageManager().resolveService(intent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
if (resolveInfo == null) {
@@ -171,10 +170,10 @@
ServiceInfo si = resolveInfo.serviceInfo;
PackageManager pm = context.getPackageManager();
try (XmlResourceParser parser =
- si.loadXmlMetaData(pm, TvIAppService.SERVICE_META_DATA)) {
+ si.loadXmlMetaData(pm, TvInteractiveAppService.SERVICE_META_DATA)) {
if (parser == null) {
throw new IllegalStateException(
- "No " + TvIAppService.SERVICE_META_DATA
+ "No " + TvInteractiveAppService.SERVICE_META_DATA
+ " meta-data found for " + si.name);
}
@@ -194,9 +193,9 @@
}
TypedArray sa = res.obtainAttributes(attrs,
- com.android.internal.R.styleable.TvIAppService);
+ com.android.internal.R.styleable.TvInteractiveAppService);
CharSequence[] textArr = sa.getTextArray(
- com.android.internal.R.styleable.TvIAppService_supportedTypes);
+ com.android.internal.R.styleable.TvInteractiveAppService_supportedTypes);
for (CharSequence cs : textArr) {
types.add(cs.toString().toLowerCase());
}
diff --git a/media/java/android/media/tv/interactive/TvIAppManager.java b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java
similarity index 87%
rename from media/java/android/media/tv/interactive/TvIAppManager.java
rename to media/java/android/media/tv/interactive/TvInteractiveAppManager.java
index f819438..39be501 100755
--- a/media/java/android/media/tv/interactive/TvIAppManager.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java
@@ -16,6 +16,7 @@
package android.media.tv.interactive;
+import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -52,45 +53,128 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.Executor;
/**
* Central system API to the overall TV interactive application framework (TIAF) architecture, which
* arbitrates interaction between applications and interactive apps.
*/
-@SystemService(Context.TV_IAPP_SERVICE)
-public final class TvIAppManager {
+@SystemService(Context.TV_INTERACTIVE_APP_SERVICE)
+public final class TvInteractiveAppManager {
// TODO: cleanup and unhide public APIs
- private static final String TAG = "TvIAppManager";
+ private static final String TAG = "TvInteractiveAppManager";
/** @hide */
@Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = false, prefix = "TV_INTERACTIVE_APP_RTE_STATE_", value = {
- TV_INTERACTIVE_APP_RTE_STATE_UNREALIZED,
- TV_INTERACTIVE_APP_RTE_STATE_PREPARING,
- TV_INTERACTIVE_APP_RTE_STATE_READY,
- TV_INTERACTIVE_APP_RTE_STATE_ERROR})
- public @interface TvInteractiveAppRteState {}
+ @IntDef(flag = false, prefix = "SERVICE_STATE_", value = {
+ SERVICE_STATE_UNREALIZED,
+ SERVICE_STATE_PREPARING,
+ SERVICE_STATE_READY,
+ SERVICE_STATE_ERROR})
+ public @interface ServiceState {}
/**
- * Unrealized state of interactive app RTE.
+ * Unrealized state of interactive app service.
* @hide
*/
- public static final int TV_INTERACTIVE_APP_RTE_STATE_UNREALIZED = 1;
+ public static final int SERVICE_STATE_UNREALIZED = 1;
/**
- * Preparing state of interactive app RTE.
+ * Preparing state of interactive app service.
* @hide
*/
- public static final int TV_INTERACTIVE_APP_RTE_STATE_PREPARING = 2;
+ public static final int SERVICE_STATE_PREPARING = 2;
/**
- * Ready state of interactive app RTE.
+ * Ready state of interactive app service.
* @hide
*/
- public static final int TV_INTERACTIVE_APP_RTE_STATE_READY = 3;
+ public static final int SERVICE_STATE_READY = 3;
/**
- * Error state of interactive app RTE.
+ * Error state of interactive app service.
* @hide
*/
- public static final int TV_INTERACTIVE_APP_RTE_STATE_ERROR = 4;
+ public static final int SERVICE_STATE_ERROR = 4;
+
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(flag = false, prefix = "INTERACTIVE_APP_STATE_", value = {
+ INTERACTIVE_APP_STATE_STOPPED,
+ INTERACTIVE_APP_STATE_RUNNING,
+ INTERACTIVE_APP_STATE_ERROR})
+ public @interface InteractiveAppState {}
+
+ /**
+ * Stopped (or not started) state of interactive application.
+ * @hide
+ */
+ public static final int INTERACTIVE_APP_STATE_STOPPED = 1;
+ /**
+ * Running state of interactive application.
+ * @hide
+ */
+ public static final int INTERACTIVE_APP_STATE_RUNNING = 2;
+ /**
+ * Error state of interactive application.
+ * @hide
+ */
+ public static final int INTERACTIVE_APP_STATE_ERROR = 3;
+
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(flag = false, prefix = "ERROR_", value = {
+ ERROR_NONE,
+ ERROR_UNKNOWN,
+ ERROR_NOT_SUPPORTED,
+ ERROR_WEAK_SIGNAL,
+ ERROR_RESOURCE_UNAVAILABLE,
+ ERROR_BLOCKED,
+ ERROR_ENCRYPTED,
+ ERROR_UNKNOWN_CHANNEL,
+ })
+ public @interface ErrorCode {}
+
+ /**
+ * No error.
+ * @hide
+ */
+ public static final int ERROR_NONE = 0;
+ /**
+ * Unknown error code.
+ * @hide
+ */
+ public static final int ERROR_UNKNOWN = 1;
+ /**
+ * Error code for an unsupported channel.
+ * @hide
+ */
+ public static final int ERROR_NOT_SUPPORTED = 2;
+ /**
+ * Error code for weak signal.
+ * @hide
+ */
+ public static final int ERROR_WEAK_SIGNAL = 3;
+ /**
+ * Error code when resource (e.g. tuner) is unavailable.
+ * @hide
+ */
+ public static final int ERROR_RESOURCE_UNAVAILABLE = 4;
+ /**
+ * Error code for blocked contents.
+ * @hide
+ */
+ public static final int ERROR_BLOCKED = 5;
+ /**
+ * Error code when the key or module is missing for the encrypted channel.
+ * @hide
+ */
+ public static final int ERROR_ENCRYPTED = 6;
+ /**
+ * Error code when the current channel is an unknown channel.
+ * @hide
+ */
+ public static final int ERROR_UNKNOWN_CHANNEL = 7;
+
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@@ -190,7 +274,7 @@
*/
public static final String KEY_BACK_URI = "back_uri";
- private final ITvIAppManager mService;
+ private final ITvInteractiveAppManager mService;
private final int mUserId;
// A mapping from the sequence number of a session to its SessionCallbackRecord.
@@ -209,7 +293,7 @@
private final ITvInteractiveAppClient mClient;
/** @hide */
- public TvIAppManager(ITvIAppManager service, int userId) {
+ public TvInteractiveAppManager(ITvInteractiveAppManager service, int userId) {
mService = service;
mUserId = userId;
mClient = new ITvInteractiveAppClient.Stub() {
@@ -285,7 +369,7 @@
@Override
public void onCommandRequest(
- @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
Bundle parameters,
int seq) {
synchronized (mSessionCallbackRecordMap) {
@@ -383,14 +467,14 @@
}
@Override
- public void onSessionStateChanged(int state, int seq) {
+ public void onSessionStateChanged(int state, int err, int seq) {
synchronized (mSessionCallbackRecordMap) {
SessionCallbackRecord record = mSessionCallbackRecordMap.get(seq);
if (record == null) {
Log.e(TAG, "Callback not found for seq " + seq);
return;
}
- record.postSessionStateChanged(state);
+ record.postSessionStateChanged(state, err);
}
}
@@ -458,10 +542,10 @@
}
@Override
- public void onStateChanged(String iAppServiceId, int type, int state) {
+ public void onStateChanged(String iAppServiceId, int type, int state, int err) {
synchronized (mLock) {
for (TvInteractiveAppCallbackRecord record : mCallbackRecords) {
- record.postStateChanged(iAppServiceId, type, state);
+ record.postStateChanged(iAppServiceId, type, state, err);
}
}
}
@@ -484,9 +568,10 @@
* This is called when a TV Interactive App service is added to the system.
*
* <p>Normally it happens when the user installs a new TV Interactive App service package
- * that implements {@link TvIAppService} interface.
+ * that implements {@link TvInteractiveAppService} interface.
*
* @param iAppServiceId The ID of the TV Interactive App service.
+ * @hide
*/
public void onInteractiveAppServiceAdded(@NonNull String iAppServiceId) {
}
@@ -498,6 +583,7 @@
* App service package.
*
* @param iAppServiceId The ID of the TV Interactive App service.
+ * @hide
*/
public void onInteractiveAppServiceRemoved(@NonNull String iAppServiceId) {
}
@@ -509,6 +595,7 @@
* re-installed or a newer version of the package exists becomes available/unavailable.
*
* @param iAppServiceId The ID of the TV Interactive App service.
+ * @hide
*/
public void onInteractiveAppServiceUpdated(@NonNull String iAppServiceId) {
}
@@ -524,26 +611,34 @@
*
* @param iAppInfo The <code>TvInteractiveAppInfo</code> object that contains new
* information.
+ * @hide
*/
public void onTvInteractiveAppInfoUpdated(@NonNull TvInteractiveAppInfo iAppInfo) {
}
/**
* This is called when the state of the interactive app service is changed.
- * @hide
+ *
+ * @param type the interactive app type
+ * @param state the current state of the service of the given type
+ * @param err the error code for error state. {@link #ERROR_NONE} is used when the state is
+ * not {@link #SERVICE_STATE_ERROR}.
*/
public void onTvInteractiveAppServiceStateChanged(
- @NonNull String iAppServiceId, int type, @TvInteractiveAppRteState int state) {
+ @NonNull String iAppServiceId,
+ @TvInteractiveAppInfo.InteractiveAppType int type,
+ @ServiceState int state,
+ @ErrorCode int err) {
}
}
private static final class TvInteractiveAppCallbackRecord {
private final TvInteractiveAppCallback mCallback;
- private final Handler mHandler;
+ private final Executor mExecutor;
- TvInteractiveAppCallbackRecord(TvInteractiveAppCallback callback, Handler handler) {
+ TvInteractiveAppCallbackRecord(TvInteractiveAppCallback callback, Executor executor) {
mCallback = callback;
- mHandler = handler;
+ mExecutor = executor;
}
public TvInteractiveAppCallback getCallback() {
@@ -551,7 +646,7 @@
}
public void postInteractiveAppServiceAdded(final String iAppServiceId) {
- mHandler.post(new Runnable() {
+ mExecutor.execute(new Runnable() {
@Override
public void run() {
mCallback.onInteractiveAppServiceAdded(iAppServiceId);
@@ -560,7 +655,7 @@
}
public void postInteractiveAppServiceRemoved(final String iAppServiceId) {
- mHandler.post(new Runnable() {
+ mExecutor.execute(new Runnable() {
@Override
public void run() {
mCallback.onInteractiveAppServiceRemoved(iAppServiceId);
@@ -569,7 +664,7 @@
}
public void postInteractiveAppServiceUpdated(final String iAppServiceId) {
- mHandler.post(new Runnable() {
+ mExecutor.execute(new Runnable() {
@Override
public void run() {
mCallback.onInteractiveAppServiceUpdated(iAppServiceId);
@@ -578,7 +673,7 @@
}
public void postTvInteractiveAppInfoUpdated(final TvInteractiveAppInfo iAppInfo) {
- mHandler.post(new Runnable() {
+ mExecutor.execute(new Runnable() {
@Override
public void run() {
mCallback.onTvInteractiveAppInfoUpdated(iAppInfo);
@@ -586,11 +681,12 @@
});
}
- public void postStateChanged(String iAppServiceId, int type, int state) {
- mHandler.post(new Runnable() {
+ public void postStateChanged(String iAppServiceId, int type, int state, int err) {
+ mExecutor.execute(new Runnable() {
@Override
public void run() {
- mCallback.onTvInteractiveAppServiceStateChanged(iAppServiceId, type, state);
+ mCallback.onTvInteractiveAppServiceStateChanged(
+ iAppServiceId, type, state, err);
}
});
}
@@ -635,7 +731,6 @@
*
* @return List of {@link TvInteractiveAppInfo} for each TV Interactive App service that
* describes its meta information.
- * @hide
*/
@NonNull
public List<TvInteractiveAppInfo> getTvInteractiveAppServiceList() {
@@ -662,7 +757,8 @@
* Registers app link info.
* @hide
*/
- public void registerAppLinkInfo(@NonNull String tvIAppServiceId, @NonNull Bundle appLinkInfo) {
+ public void registerAppLinkInfo(
+ @NonNull String tvIAppServiceId, @NonNull AppLinkInfo appLinkInfo) {
try {
mService.registerAppLinkInfo(tvIAppServiceId, appLinkInfo, mUserId);
} catch (RemoteException e) {
@@ -675,7 +771,7 @@
* @hide
*/
public void unregisterAppLinkInfo(
- @NonNull String tvIAppServiceId, @NonNull Bundle appLinkInfo) {
+ @NonNull String tvIAppServiceId, @NonNull AppLinkInfo appLinkInfo) {
try {
mService.unregisterAppLinkInfo(tvIAppServiceId, appLinkInfo, mUserId);
} catch (RemoteException e) {
@@ -699,15 +795,16 @@
* Registers a {@link TvInteractiveAppCallback}.
*
* @param callback A callback used to monitor status of the TV Interactive App services.
- * @param handler A {@link Handler} that the status change will be delivered to.
+ * @param executor A {@link Executor} that the status change will be delivered to.
* @hide
*/
public void registerCallback(
- @NonNull TvInteractiveAppCallback callback, @NonNull Handler handler) {
+ @NonNull TvInteractiveAppCallback callback,
+ @CallbackExecutor @NonNull Executor executor) {
Preconditions.checkNotNull(callback);
- Preconditions.checkNotNull(handler);
+ Preconditions.checkNotNull(executor);
synchronized (mLock) {
- mCallbackRecords.add(new TvInteractiveAppCallbackRecord(callback, handler));
+ mCallbackRecords.add(new TvInteractiveAppCallbackRecord(callback, executor));
}
}
@@ -742,7 +839,7 @@
private static final long INPUT_SESSION_NOT_RESPONDING_TIMEOUT = 2500;
- private final ITvIAppManager mService;
+ private final ITvInteractiveAppManager mService;
private final int mUserId;
private final int mSeq;
private final SparseArray<SessionCallbackRecord> mSessionCallbackRecordMap;
@@ -759,7 +856,7 @@
private TvInputEventSender mSender;
private InputChannel mInputChannel;
- private Session(IBinder token, InputChannel channel, ITvIAppManager service,
+ private Session(IBinder token, InputChannel channel, ITvInteractiveAppManager service,
int userId, int seq, SparseArray<SessionCallbackRecord> sessionCallbackRecordMap) {
mToken = token;
mInputChannel = channel;
@@ -1142,7 +1239,7 @@
}
/**
- * Notifies IAPP session when video is available.
+ * Notifies Interactive APP session when video is available.
*/
public void notifyVideoAvailable() {
if (mToken == null) {
@@ -1157,7 +1254,7 @@
}
/**
- * Notifies IAPP session when video is unavailable.
+ * Notifies Interactive APP session when video is unavailable.
*/
public void notifyVideoUnavailable(int reason) {
if (mToken == null) {
@@ -1172,7 +1269,7 @@
}
/**
- * Notifies IAPP session when content is allowed.
+ * Notifies Interactive APP session when content is allowed.
*/
public void notifyContentAllowed() {
if (mToken == null) {
@@ -1187,7 +1284,7 @@
}
/**
- * Notifies IAPP session when content is blocked.
+ * Notifies Interactive APP session when content is blocked.
*/
public void notifyContentBlocked(TvContentRating rating) {
if (mToken == null) {
@@ -1478,7 +1575,7 @@
}
void postCommandRequest(
- final @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ final @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
final Bundle parameters) {
mHandler.post(new Runnable() {
@Override
@@ -1553,11 +1650,11 @@
});
}
- void postSessionStateChanged(int state) {
+ void postSessionStateChanged(int state, int err) {
mHandler.post(new Runnable() {
@Override
public void run() {
- mSessionCallback.onSessionStateChanged(mSession, state);
+ mSessionCallback.onSessionStateChanged(mSession, state, err);
}
});
}
@@ -1587,28 +1684,28 @@
*/
public abstract static class SessionCallback {
/**
- * This is called after {@link TvIAppManager#createSession} has been processed.
+ * This is called after {@link TvInteractiveAppManager#createSession} has been processed.
*
- * @param session A {@link TvIAppManager.Session} instance created. This can be
+ * @param session A {@link TvInteractiveAppManager.Session} instance created. This can be
* {@code null} if the creation request failed.
*/
public void onSessionCreated(@Nullable Session session) {
}
/**
- * This is called when {@link TvIAppManager.Session} is released.
+ * This is called when {@link TvInteractiveAppManager.Session} is released.
* This typically happens when the process hosting the session has crashed or been killed.
*
- * @param session the {@link TvIAppManager.Session} instance released.
+ * @param session the {@link TvInteractiveAppManager.Session} instance released.
*/
public void onSessionReleased(@NonNull Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#layoutSurface} is called to
+ * This is called when {@link TvInteractiveAppService.Session#layoutSurface} is called to
* change the layout of surface.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param left Left position.
* @param top Top position.
* @param right Right position.
@@ -1618,85 +1715,90 @@
}
/**
- * This is called when {@link TvIAppService.Session#requestCommand} is called.
+ * This is called when {@link TvInteractiveAppService.Session#requestCommand} is called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param cmdType type of the command.
* @param parameters parameters of the command.
*/
public void onCommandRequest(
Session session,
- @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
Bundle parameters) {
}
/**
- * This is called when {@link TvIAppService.Session#SetVideoBounds} is called.
+ * This is called when {@link TvInteractiveAppService.Session#SetVideoBounds} is called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
*/
public void onSetVideoBounds(Session session, Rect rect) {
}
/**
- * This is called when {@link TvIAppService.Session#RequestCurrentChannelUri} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestCurrentChannelUri} is
* called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
*/
public void onRequestCurrentChannelUri(Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#RequestCurrentChannelLcn} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestCurrentChannelLcn} is
* called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
*/
public void onRequestCurrentChannelLcn(Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#RequestStreamVolume} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestStreamVolume} is
* called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
*/
public void onRequestStreamVolume(Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#RequestTrackInfoList} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestTrackInfoList} is
* called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
*/
public void onRequestTrackInfoList(Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#RequestCurrentTvInputId} is called.
+ * This is called when {@link TvInteractiveAppService.Session#RequestCurrentTvInputId} is
+ * called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppService.Session} associated with this callback.
* @hide
*/
public void onRequestCurrentTvInputId(Session session) {
}
/**
- * This is called when {@link TvIAppService.Session#notifySessionStateChanged} is called.
+ * This is called when {@link TvInteractiveAppService.Session#notifySessionStateChanged} is
+ * called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param state the current state.
*/
- public void onSessionStateChanged(Session session, int state) {
+ public void onSessionStateChanged(
+ Session session,
+ @InteractiveAppState int state,
+ @ErrorCode int err) {
}
/**
- * This is called when {@link TvIAppService.Session#notifyBiInteractiveAppCreated}
+ * This is called when {@link TvInteractiveAppService.Session#notifyBiInteractiveAppCreated}
* is called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param biIAppUri URI associated this BI interactive app. This is the same URI in
* {@link Session#createBiInteractiveApp(Uri, Bundle)}
* @param biIAppId BI interactive app ID, which can be used to destroy the BI interactive
@@ -1709,11 +1811,11 @@
* This is called when {@link TvIAppService.Session#notifyTeletextAppStateChanged} is
* called.
*
- * @param session A {@link TvIAppManager.Session} associated with this callback.
+ * @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
* @param state the current state.
*/
public void onTeletextAppStateChanged(
- Session session, @TvIAppManager.TeletextAppState int state) {
+ Session session, @TvInteractiveAppManager.TeletextAppState int state) {
}
}
}
diff --git a/media/java/android/media/tv/interactive/TvIAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java
similarity index 92%
rename from media/java/android/media/tv/interactive/TvIAppService.java
rename to media/java/android/media/tv/interactive/TvInteractiveAppService.java
index c0ec76b..d599d0a 100755
--- a/media/java/android/media/tv/interactive/TvIAppService.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java
@@ -65,11 +65,11 @@
import java.util.List;
/**
- * The TvIAppService class represents a TV interactive applications RTE.
+ * The TvInteractiveAppService class represents a TV interactive applications RTE.
*/
-public abstract class TvIAppService extends Service {
+public abstract class TvInteractiveAppService extends Service {
private static final boolean DEBUG = false;
- private static final String TAG = "TvIAppService";
+ private static final String TAG = "TvInteractiveAppService";
private static final int DETACH_MEDIA_VIEW_TIMEOUT_MS = 5000;
@@ -83,12 +83,12 @@
* cannot abuse it.
*/
public static final String SERVICE_INTERFACE =
- "android.media.tv.interactive.TvIAppService";
+ "android.media.tv.interactive.TvInteractiveAppService";
/**
- * Name under which a TvIAppService component publishes information about itself. This
+ * Name under which a TvInteractiveAppService component publishes information about itself. This
* meta-data must reference an XML resource containing an
- * <code><{@link android.R.styleable#TvIAppService tv-interactive-app}></code>
+ * <code><{@link android.R.styleable#TvInteractiveAppService tv-interactive-app}></code>
* tag.
*/
public static final String SERVICE_META_DATA = "android.media.tv.interactive.app";
@@ -131,6 +131,13 @@
/** @hide */
public static final String COMMAND_PARAMETER_KEY_TRACK_SELECT_MODE =
"command_track_select_mode";
+ /**
+ * Command to quiet channel change. No channel banner or channel info is shown.
+ * <p>Refer to HbbTV Spec 2.0.4 chapter A.2.4.3.
+ * @hide
+ */
+ public static final String COMMAND_PARAMETER_KEY_CHANGE_CHANNEL_QUIETLY =
+ "command_change_channel_quietly";
private final Handler mServiceHandler = new ServiceHandler();
private final RemoteCallbackList<ITvInteractiveAppServiceCallback> mCallbacks =
@@ -175,12 +182,12 @@
}
@Override
- public void registerAppLinkInfo(Bundle appLinkInfo) {
+ public void registerAppLinkInfo(AppLinkInfo appLinkInfo) {
onRegisterAppLinkInfo(appLinkInfo);
}
@Override
- public void unregisterAppLinkInfo(Bundle appLinkInfo) {
+ public void unregisterAppLinkInfo(AppLinkInfo appLinkInfo) {
onUnregisterAppLinkInfo(appLinkInfo);
}
@@ -196,15 +203,14 @@
* Prepares TV Interactive App service for the given type.
* @hide
*/
- public void onPrepare(int type) {
- // TODO: make it abstract when unhide
+ public void onPrepare(@TvInteractiveAppInfo.InteractiveAppType int type) {
}
/**
* Registers App link info.
* @hide
*/
- public void onRegisterAppLinkInfo(Bundle appLinkInfo) {
+ public void onRegisterAppLinkInfo(AppLinkInfo appLinkInfo) {
// TODO: make it abstract when unhide
}
@@ -212,7 +218,7 @@
* Unregisters App link info.
* @hide
*/
- public void onUnregisterAppLinkInfo(Bundle appLinkInfo) {
+ public void onUnregisterAppLinkInfo(AppLinkInfo appLinkInfo) {
// TODO: make it abstract when unhide
}
@@ -236,20 +242,32 @@
* @hide
*/
@Nullable
- public Session onCreateSession(@NonNull String iAppServiceId, int type) {
- // TODO: make it abstract when unhide
+ public Session onCreateSession(
+ @NonNull String iAppServiceId,
+ @TvInteractiveAppInfo.InteractiveAppType int type) {
return null;
}
/**
- * Notifies the system when the state of the interactive app has been changed.
- * @param state the current state
+ * Notifies the system when the state of the interactive app RTE has been changed.
+ *
+ * @param type the interactive app type
+ * @param state the current state of the service of the given type
+ * @param error the error code for error state. {@link TvInteractiveAppManager#ERROR_NONE} is
+ * used when the state is not
+ * {@link TvInteractiveAppManager#SERVICE_STATE_ERROR}.
* @hide
*/
public final void notifyStateChanged(
- int type, @TvIAppManager.TvInteractiveAppRteState int state) {
- mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_RTE_STATE_CHANGED,
- type, state).sendToTarget();
+ @TvInteractiveAppInfo.InteractiveAppType int type,
+ @TvInteractiveAppManager.ServiceState int state,
+ @TvInteractiveAppManager.ErrorCode int error) {
+ SomeArgs args = SomeArgs.obtain();
+ args.arg1 = type;
+ args.arg2 = state;
+ args.arg3 = error;
+ mServiceHandler
+ .obtainMessage(ServiceHandler.DO_NOTIFY_RTE_STATE_CHANGED, args).sendToTarget();
}
/**
@@ -298,6 +316,7 @@
*
* @param enable {@code true} if you want to enable the media view. {@code false}
* otherwise.
+ * @hide
*/
public void setMediaViewEnabled(final boolean enable) {
mHandler.post(new Runnable() {
@@ -319,15 +338,13 @@
}
/**
- * Starts TvIAppService session.
- * @hide
+ * Starts TvInteractiveAppService session.
*/
public void onStartInteractiveApp() {
}
/**
- * Stops TvIAppService session.
- * @hide
+ * Stops TvInteractiveAppService session.
*/
public void onStopInteractiveApp() {
}
@@ -364,6 +381,7 @@
/**
* To toggle Digital Teletext Application if there is one in AIT app list.
* @param enable
+ * @hide
*/
public void onSetTeletextAppEnabled(boolean enable) {
}
@@ -438,6 +456,7 @@
*
* @param width The width of the media view.
* @param height The height of the media view.
+ * @hide
*/
public void onMediaViewSizeChanged(int width, int height) {
}
@@ -447,6 +466,7 @@
* implementation can override this method and return its own view.
*
* @return a view attached to the media window
+ * @hide
*/
@Nullable
public View onCreateMediaView() {
@@ -454,7 +474,7 @@
}
/**
- * Releases TvIAppService session.
+ * Releases TvInteractiveAppService session.
* @hide
*/
public void onRelease() {
@@ -620,6 +640,7 @@
/**
* Requests broadcast related information from the related TV input.
* @param request the request for broadcast info
+ * @hide
*/
public void requestBroadcastInfo(@NonNull final BroadcastInfoRequest request) {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -644,6 +665,7 @@
/**
* Remove broadcast information request from the related TV input.
* @param requestId the ID of the request
+ * @hide
*/
public void removeBroadcastInfo(final int requestId) {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -669,6 +691,7 @@
* requests a specific command to be processed by the related TV input.
* @param cmdType type of the specific command
* @param parameters parameters of the specific command
+ * @hide
*/
public void requestCommand(
@InteractiveAppServiceCommandType String cmdType, Bundle parameters) {
@@ -693,6 +716,7 @@
/**
* Sets broadcast video bounds.
+ * @hide
*/
public void setVideoBounds(Rect rect) {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -715,6 +739,7 @@
/**
* Requests the URI of the current channel.
+ * @hide
*/
public void requestCurrentChannelUri() {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -737,6 +762,7 @@
/**
* Requests the logic channel number (LCN) of the current channel.
+ * @hide
*/
public void requestCurrentChannelLcn() {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -759,6 +785,7 @@
/**
* Requests stream volume.
+ * @hide
*/
public void requestStreamVolume() {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -781,6 +808,7 @@
/**
* Requests the list of {@link TvTrackInfo}.
+ * @hide
*/
public void requestTrackInfoList() {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -829,6 +857,7 @@
/**
* requests an advertisement request to be processed by the related TV input.
* @param request advertisement request
+ * @hide
*/
public void requestAd(@NonNull final AdRequest request) {
executeOrPostRunnableOnMainThread(new Runnable() {
@@ -987,10 +1016,15 @@
/**
* Notifies when the session state is changed.
- * @param state the current state.
+ *
+ * @param state the current session state.
+ * @param err the error code for error state. {@link TvInteractiveAppManager#ERROR_NONE} is
+ * used when the state is not
+ * {@link TvInteractiveAppManager#INTERACTIVE_APP_STATE_ERROR}.
*/
public void notifySessionStateChanged(
- @TvIAppManager.TvInteractiveAppRteState int state) {
+ @TvInteractiveAppManager.InteractiveAppState int state,
+ @TvInteractiveAppManager.ErrorCode int err) {
executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread
@Override
@@ -998,10 +1032,10 @@
try {
if (DEBUG) {
Log.d(TAG, "notifySessionStateChanged (state="
- + state + ")");
+ + state + "; err=" + err + ")");
}
if (mSessionCallback != null) {
- mSessionCallback.onSessionStateChanged(state);
+ mSessionCallback.onSessionStateChanged(state, err);
}
} catch (RemoteException e) {
Log.w(TAG, "error in notifySessionStateChanged", e);
@@ -1039,8 +1073,10 @@
/**
* Notifies when the digital teletext app state is changed.
* @param state the current state.
+ * @hide
*/
- public final void notifyTeletextAppStateChanged(@TvIAppManager.TeletextAppState int state) {
+ public final void notifyTeletextAppStateChanged(
+ @TvInteractiveAppManager.TeletextAppState int state) {
executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread
@Override
@@ -1068,7 +1104,7 @@
if (event instanceof KeyEvent) {
KeyEvent keyEvent = (KeyEvent) event;
if (keyEvent.dispatch(this, mDispatcherState, this)) {
- return TvIAppManager.Session.DISPATCH_HANDLED;
+ return TvInteractiveAppManager.Session.DISPATCH_HANDLED;
}
// TODO: special handlings of navigation keys and media keys
@@ -1077,20 +1113,20 @@
final int source = motionEvent.getSource();
if (motionEvent.isTouchEvent()) {
if (onTouchEvent(motionEvent)) {
- return TvIAppManager.Session.DISPATCH_HANDLED;
+ return TvInteractiveAppManager.Session.DISPATCH_HANDLED;
}
} else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) {
if (onTrackballEvent(motionEvent)) {
- return TvIAppManager.Session.DISPATCH_HANDLED;
+ return TvInteractiveAppManager.Session.DISPATCH_HANDLED;
}
} else {
if (onGenericMotionEvent(motionEvent)) {
- return TvIAppManager.Session.DISPATCH_HANDLED;
+ return TvInteractiveAppManager.Session.DISPATCH_HANDLED;
}
}
}
// TODO: handle overlay view
- return TvIAppManager.Session.DISPATCH_NOT_HANDLED;
+ return TvInteractiveAppManager.Session.DISPATCH_NOT_HANDLED;
}
private void initialize(ITvInteractiveAppSessionCallback callback) {
@@ -1443,9 +1479,9 @@
}
int handled = mSessionImpl.dispatchInputEvent(event, this);
- if (handled != TvIAppManager.Session.DISPATCH_IN_PROGRESS) {
+ if (handled != TvInteractiveAppManager.Session.DISPATCH_IN_PROGRESS) {
finishInputEvent(
- event, handled == TvIAppManager.Session.DISPATCH_HANDLED);
+ event, handled == TvInteractiveAppManager.Session.DISPATCH_HANDLED);
}
}
}
@@ -1457,11 +1493,11 @@
private static final int DO_NOTIFY_SESSION_CREATED = 2;
private static final int DO_NOTIFY_RTE_STATE_CHANGED = 3;
- private void broadcastRteStateChanged(int type, int state) {
+ private void broadcastRteStateChanged(int type, int state, int error) {
int n = mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- mCallbacks.getBroadcastItem(i).onStateChanged(type, state);
+ mCallbacks.getBroadcastItem(i).onStateChanged(type, state, error);
} catch (RemoteException e) {
Log.e(TAG, "error in broadcastRteStateChanged", e);
}
@@ -1491,7 +1527,7 @@
return;
}
ITvInteractiveAppSession stub = new ITvInteractiveAppSessionWrapper(
- android.media.tv.interactive.TvIAppService.this, sessionImpl, channel);
+ TvInteractiveAppService.this, sessionImpl, channel);
SomeArgs someArgs = SomeArgs.obtain();
someArgs.arg1 = sessionImpl;
@@ -1519,9 +1555,11 @@
return;
}
case DO_NOTIFY_RTE_STATE_CHANGED: {
- int type = msg.arg1;
- int state = msg.arg2;
- broadcastRteStateChanged(type, state);
+ SomeArgs args = (SomeArgs) msg.obj;
+ int type = (int) args.arg1;
+ int state = (int) args.arg2;
+ int error = (int) args.arg3;
+ broadcastRteStateChanged(type, state, error);
return;
}
default: {
diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppView.java b/media/java/android/media/tv/interactive/TvInteractiveAppView.java
index 6f99d51..12e2199 100755
--- a/media/java/android/media/tv/interactive/TvInteractiveAppView.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppView.java
@@ -22,14 +22,15 @@
import android.content.Context;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.RectF;
import android.media.tv.TvInputManager;
import android.media.tv.TvTrackInfo;
import android.media.tv.TvView;
-import android.media.tv.interactive.TvIAppManager.Session;
-import android.media.tv.interactive.TvIAppManager.Session.FinishedInputEventCallback;
-import android.media.tv.interactive.TvIAppManager.SessionCallback;
+import android.media.tv.interactive.TvInteractiveAppManager.Session;
+import android.media.tv.interactive.TvInteractiveAppManager.Session.FinishedInputEventCallback;
+import android.media.tv.interactive.TvInteractiveAppManager.SessionCallback;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -50,7 +51,6 @@
/**
* Displays contents of interactive TV applications.
- * @hide
*/
public class TvInteractiveAppView extends ViewGroup {
private static final String TAG = "TvInteractiveAppView";
@@ -61,7 +61,7 @@
private static final int UNSET_TVVIEW_SUCCESS = 3;
private static final int UNSET_TVVIEW_FAIL = 4;
- private final TvIAppManager mTvInteractiveAppManager;
+ private final TvInteractiveAppManager mTvInteractiveAppManager;
private final Handler mHandler = new Handler();
private final Object mCallbackLock = new Object();
private Session mSession;
@@ -141,8 +141,8 @@
}
mDefStyleAttr = defStyleAttr;
resetSurfaceView();
- mTvInteractiveAppManager = (TvIAppManager) getContext().getSystemService(
- Context.TV_IAPP_SERVICE);
+ mTvInteractiveAppManager = (TvInteractiveAppManager) getContext().getSystemService(
+ Context.TV_INTERACTIVE_APP_SERVICE);
}
/**
@@ -152,8 +152,8 @@
* callback.
*/
public void setCallback(
- @NonNull TvInteractiveAppCallback callback,
- @NonNull @CallbackExecutor Executor executor) {
+ @NonNull @CallbackExecutor Executor executor,
+ @NonNull TvInteractiveAppCallback callback) {
synchronized (mCallbackLock) {
mCallbackExecutor = executor;
mCallback = callback;
@@ -238,6 +238,7 @@
// The surface view's content should be treated as secure all the time.
mSurfaceView.setSecure(true);
mSurfaceView.getHolder().addCallback(mSurfaceHolderCallback);
+ mSurfaceView.getHolder().setFormat(PixelFormat.TRANSLUCENT);
addView(mSurfaceView);
}
@@ -381,9 +382,16 @@
/**
* Prepares the interactive application.
+ *
+ * @param iAppServiceId the interactive app service ID, which can be found in
+ * {@link TvInteractiveAppInfo#getId()}.
+ *
+ * @see android.media.tv.interactive.TvInteractiveAppManager#getTvInteractiveAppServiceList()
* @hide
*/
- public void prepareInteractiveApp(@NonNull String iAppServiceId, int type) {
+ public void prepareInteractiveApp(
+ @NonNull String iAppServiceId,
+ @TvInteractiveAppInfo.InteractiveAppType int type) {
// TODO: document and handle the cases that this method is called multiple times.
if (DEBUG) {
Log.d(TAG, "prepareInteractiveApp");
@@ -552,10 +560,10 @@
/**
* Sets the TvInteractiveAppView to receive events from TIS. This method links the session of
- * TvIAppManager to TvInputManager session, so the TIAS can get the TIS events.
+ * TvInteractiveAppManager to TvInputManager session, so the TIAS can get the TIS events.
*
* @param tvView the TvView to be linked to this TvInteractiveAppView via linking of Sessions.
- * @return to be added
+ * @return The result of the operation.
* @hide
*/
public int setTvView(@Nullable TvView tvView) {
@@ -583,6 +591,7 @@
/**
* To toggle Digital Teletext Application if there is one in AIT app list.
* @param enable
+ * @hide
*/
public void setTeletextAppEnabled(boolean enable) {
if (DEBUG) {
@@ -609,7 +618,7 @@
*/
public void onCommandRequest(
@NonNull String iAppServiceId,
- @NonNull @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ @NonNull @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
@Nullable Bundle parameters) {
}
@@ -617,10 +626,16 @@
* This is called when the session state is changed.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
- * @param state current session state.
+ * @param state the current state.
+ * @param err the error code for error state. {@link TvInteractiveAppManager#ERROR_NONE}
+ * is used when the state is not
+ * {@link TvInteractiveAppManager#INTERACTIVE_APP_STATE_ERROR}.
* @hide
*/
- public void onSessionStateChanged(@NonNull String iAppServiceId, int state) {
+ public void onStateChanged(
+ @NonNull String iAppServiceId,
+ @TvInteractiveAppManager.InteractiveAppState int state,
+ @TvInteractiveAppManager.ErrorCode int err) {
}
/**
@@ -642,13 +657,15 @@
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
* @param state digital teletext app current state.
+ * @hide
*/
public void onTeletextAppStateChanged(
- @NonNull String iAppServiceId, @TvIAppManager.TeletextAppState int state) {
+ @NonNull String iAppServiceId,
+ @TvInteractiveAppManager.TeletextAppState int state) {
}
/**
- * This is called when {@link TvIAppService.Session#SetVideoBounds} is called.
+ * This is called when {@link TvInteractiveAppService.Session#SetVideoBounds} is called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
* @hide
@@ -657,7 +674,7 @@
}
/**
- * This is called when {@link TvIAppService.Session#RequestCurrentChannelUri} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestCurrentChannelUri} is
* called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
@@ -667,7 +684,7 @@
}
/**
- * This is called when {@link TvIAppService.Session#RequestCurrentChannelLcn} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestCurrentChannelLcn} is
* called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
@@ -677,7 +694,7 @@
}
/**
- * This is called when {@link TvIAppService.Session#RequestStreamVolume} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestStreamVolume} is
* called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
@@ -687,7 +704,7 @@
}
/**
- * This is called when {@link TvIAppService.Session#RequestTrackInfoList} is
+ * This is called when {@link TvInteractiveAppService.Session#RequestTrackInfoList} is
* called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
@@ -700,6 +717,7 @@
* This is called when {@link TvIAppService.Session#RequestCurrentTvInputId} is called.
*
* @param iAppServiceId The ID of the TV interactive app service bound to this view.
+ * @hide
*/
public void onRequestCurrentTvInputId(@NonNull String iAppServiceId) {
}
@@ -801,7 +819,7 @@
@Override
public void onCommandRequest(
Session session,
- @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
Bundle parameters) {
if (DEBUG) {
Log.d(TAG, "onCommandRequest (cmdType=" + cmdType + ", parameters="
@@ -825,9 +843,12 @@
}
@Override
- public void onSessionStateChanged(Session session, int state) {
+ public void onSessionStateChanged(
+ Session session,
+ @TvInteractiveAppManager.InteractiveAppState int state,
+ @TvInteractiveAppManager.ErrorCode int err) {
if (DEBUG) {
- Log.d(TAG, "onSessionStateChanged (state=" + state + ")");
+ Log.d(TAG, "onSessionStateChanged (state=" + state + "; err=" + err + ")");
}
if (this != mSessionCallback) {
Log.w(TAG, "onSessionStateChanged - session not created");
@@ -838,7 +859,7 @@
mCallbackExecutor.execute(() -> {
synchronized (mCallbackLock) {
if (mCallback != null) {
- mCallback.onSessionStateChanged(mIAppServiceId, state);
+ mCallback.onStateChanged(mIAppServiceId, state, err);
}
}
});
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 9c4a83a..3157375 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -1002,7 +1002,7 @@
private native String nativeGetFrontendHardwareInfo();
private native int nativeSetMaxNumberOfFrontends(int frontendType, int maxNumber);
private native int nativeGetMaxNumberOfFrontends(int frontendType);
-
+ private native int nativeRemoveOutputPid(int pid);
private native Lnb nativeOpenLnbByHandle(int handle);
private native Lnb nativeOpenLnbByName(String name);
@@ -1565,6 +1565,36 @@
}
/**
+ * Filter out unnecessary PID (packet identifier) from frontend output.
+ *
+ * <p>It is used by the client to remove some video or audio PIDs of other program to reduce the
+ * total amount of recorded TS.
+ *
+ * <p>This API is only supported by Tuner HAL 2.0 or higher. Unsupported version would cause
+ * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version.
+ *
+ * @return result status of the operation. Unsupported version or if current active frontend
+ * doesn’t support PID filtering out would return {@link #RESULT_UNAVAILABLE}.
+ * @throws IllegalStateException if there is no active frontend currently.
+ */
+ @Result
+ public int removeOutputPid(@IntRange(from = 0) int pid) {
+ mFrontendLock.lock();
+ try {
+ if (!TunerVersionChecker.checkHigherOrEqualVersionTo(
+ TunerVersionChecker.TUNER_VERSION_2_0, "Remove output PID")) {
+ return RESULT_UNAVAILABLE;
+ }
+ if (mFrontend == null) {
+ throw new IllegalStateException("frontend is not initialized");
+ }
+ return nativeRemoveOutputPid(pid);
+ } finally {
+ mFrontendLock.unlock();
+ }
+ }
+
+ /**
* Gets the currently initialized and activated frontend information. To get all the available
* frontend info on the device, use {@link getAvailableFrontendInfos()}.
*
diff --git a/media/java/android/media/tv/tuner/filter/SectionSettings.java b/media/java/android/media/tv/tuner/filter/SectionSettings.java
index f123675..83ed8e8 100644
--- a/media/java/android/media/tv/tuner/filter/SectionSettings.java
+++ b/media/java/android/media/tv/tuner/filter/SectionSettings.java
@@ -82,7 +82,7 @@
* The section filter uses this for CRC (Cyclic redundancy check) checking when
* {@link #isCrcEnabled()} is {@code true}.
*/
- public int getBitWidthOfLengthField() {
+ public int getLengthFieldBitWidth() {
return mBitWidthOfLengthField;
}
diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java
index 8cedd04..c1e9b38 100644
--- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java
+++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java
@@ -54,7 +54,7 @@
FRONTEND_STATUS_TYPE_IS_MISO_ENABLED, FRONTEND_STATUS_TYPE_IS_LINEAR,
FRONTEND_STATUS_TYPE_IS_SHORT_FRAMES_ENABLED, FRONTEND_STATUS_TYPE_ISDBT_MODE,
FRONTEND_STATUS_TYPE_ISDBT_PARTIAL_RECEPTION_FLAG, FRONTEND_STATUS_TYPE_STREAM_IDS,
- FRONTEND_STATUS_TYPE_DVBT_CELL_IDS})
+ FRONTEND_STATUS_TYPE_DVBT_CELL_IDS, FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO})
@Retention(RetentionPolicy.SOURCE)
public @interface FrontendStatusType {}
@@ -165,7 +165,7 @@
public static final int FRONTEND_STATUS_TYPE_RF_LOCK =
android.hardware.tv.tuner.FrontendStatusType.RF_LOCK;
/**
- * PLP information in a frequency band for ATSC-3.0 frontend.
+ * Current tuned PLP information in a frequency band for ATSC-3.0 frontend.
*/
public static final int FRONTEND_STATUS_TYPE_ATSC3_PLP_INFO =
android.hardware.tv.tuner.FrontendStatusType.ATSC3_PLP_INFO;
@@ -267,6 +267,13 @@
public static final int FRONTEND_STATUS_TYPE_DVBT_CELL_IDS =
android.hardware.tv.tuner.FrontendStatusType.DVBT_CELL_IDS;
+ /**
+ * All PLP information in a frequency band for ATSC-3.0 frontend, which includes both tuned and
+ * not tuned PLPs for currently watching service.
+ */
+ public static final int FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO =
+ android.hardware.tv.tuner.FrontendStatusType.ATSC3_ALL_PLP_INFO;
+
/** @hide */
@IntDef(value = {
AtscFrontendSettings.MODULATION_UNDEFINED,
@@ -508,6 +515,7 @@
private Integer mIsdbtPartialReceptionFlag;
private int[] mStreamIds;
private int[] mDvbtCellIds;
+ private Atsc3PlpInfo[] mAllPlpInfo;
// Constructed and fields set by JNI code.
private FrontendStatus() {
@@ -1078,6 +1086,25 @@
}
/**
+ * Gets an array of all PLPs information of ATSC3 frontend, which includes both tuned and not
+ * tuned PLPs for currently watching service.
+ *
+ * <p>This query is only supported by Tuner HAL 2.0 or higher. Unsupported version or if HAL
+ * doesn't return all PLPs information will throw IllegalStateException. Use
+ * {@link TunerVersionChecker#getTunerVersion()} to check the version.
+ */
+ @SuppressLint("ArrayReturn")
+ @NonNull
+ public Atsc3PlpInfo[] getAllAtsc3PlpInfo() {
+ TunerVersionChecker.checkHigherOrEqualVersionTo(
+ TunerVersionChecker.TUNER_VERSION_2_0, "Atsc3PlpInfo all status");
+ if (mAllPlpInfo == null) {
+ throw new IllegalStateException("Atsc3PlpInfo all status is empty");
+ }
+ return mAllPlpInfo;
+ }
+
+ /**
* Information of each tuning Physical Layer Pipes.
*/
public static class Atsc3PlpTuningInfo {
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index 0a5490d..2e419a6 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -375,7 +375,8 @@
}
static jlong ImageWriter_init(JNIEnv* env, jobject thiz, jobject weakThiz, jobject jsurface,
- jint maxImages, jint userFormat, jint userWidth, jint userHeight) {
+ jint maxImages, jint userWidth, jint userHeight, jboolean useSurfaceImageFormatInfo,
+ jint hardwareBufferFormat, jlong dataSpace, jlong ndkUsage) {
status_t res;
ALOGV("%s: maxImages:%d", __FUNCTION__, maxImages);
@@ -450,7 +451,7 @@
// Query surface format if no valid user format is specified, otherwise, override surface format
// with user format.
- if (userFormat == IMAGE_FORMAT_UNKNOWN) {
+ if (useSurfaceImageFormatInfo) {
if ((res = anw->query(anw.get(), NATIVE_WINDOW_FORMAT, &surfaceFormat)) != OK) {
ALOGE("%s: Query Surface format failed: %s (%d)", __FUNCTION__, strerror(-res), res);
jniThrowRuntimeException(env, "Failed to query Surface format");
@@ -458,13 +459,13 @@
}
} else {
// Set consumer buffer format to user specified format
- PublicFormat publicFormat = static_cast<PublicFormat>(userFormat);
- int nativeFormat = mapPublicFormatToHalFormat(publicFormat);
- android_dataspace nativeDataspace = mapPublicFormatToHalDataspace(publicFormat);
- res = native_window_set_buffers_format(anw.get(), nativeFormat);
+ android_dataspace nativeDataspace = static_cast<android_dataspace>(dataSpace);
+ int userFormat = static_cast<int>(mapHalFormatDataspaceToPublicFormat(
+ hardwareBufferFormat, nativeDataspace));
+ res = native_window_set_buffers_format(anw.get(), hardwareBufferFormat);
if (res != OK) {
ALOGE("%s: Unable to configure consumer native buffer format to %#x",
- __FUNCTION__, nativeFormat);
+ __FUNCTION__, hardwareBufferFormat);
jniThrowRuntimeException(env, "Failed to set Surface format");
return 0;
}
@@ -484,15 +485,13 @@
env->SetIntField(thiz,
gImageWriterClassInfo.mWriterFormat, reinterpret_cast<jint>(surfaceFormat));
- if (!isFormatOpaque(surfaceFormat)) {
- res = native_window_set_usage(anw.get(), GRALLOC_USAGE_SW_WRITE_OFTEN);
- if (res != OK) {
- ALOGE("%s: Configure usage %08x for format %08x failed: %s (%d)",
- __FUNCTION__, static_cast<unsigned int>(GRALLOC_USAGE_SW_WRITE_OFTEN),
- surfaceFormat, strerror(-res), res);
- jniThrowRuntimeException(env, "Failed to SW_WRITE_OFTEN configure usage");
- return 0;
- }
+ res = native_window_set_usage(anw.get(), ndkUsage);
+ if (res != OK) {
+ ALOGE("%s: Configure usage %08x for format %08x failed: %s (%d)",
+ __FUNCTION__, static_cast<unsigned int>(ndkUsage),
+ surfaceFormat, strerror(-res), res);
+ jniThrowRuntimeException(env, "Failed to SW_WRITE_OFTEN configure usage");
+ return 0;
}
int minUndequeuedBufferCount = 0;
@@ -1093,7 +1092,7 @@
static JNINativeMethod gImageWriterMethods[] = {
{"nativeClassInit", "()V", (void*)ImageWriter_classInit },
- {"nativeInit", "(Ljava/lang/Object;Landroid/view/Surface;IIII)J",
+ {"nativeInit", "(Ljava/lang/Object;Landroid/view/Surface;IIIZIJJ)J",
(void*)ImageWriter_init },
{"nativeClose", "(J)V", (void*)ImageWriter_close },
{"nativeAttachAndQueueImage",
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 1b41494..41f3a678 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -1622,6 +1622,15 @@
return mTunerClient->getMaxNumberOfFrontends(static_cast<FrontendType>(type));
}
+jint JTuner::removeOutputPid(int32_t pid) {
+ if (mFeClient == nullptr) {
+ ALOGE("frontend is not initialized");
+ return (jint)Result::INVALID_STATE;
+ }
+
+ return (jint)mFeClient->removeOutputPid(pid);
+}
+
jobject JTuner::openLnbByHandle(int handle) {
if (mTunerClient == nullptr) {
return nullptr;
@@ -2610,6 +2619,24 @@
env->SetObjectField(statusObj, field, valObj);
break;
}
+ case FrontendStatus::Tag::allPlpInfo: {
+ jfieldID field = env->GetFieldID(clazz, "mAllPlpInfo",
+ "[Landroid/media/tv/tuner/frontend/Atsc3PlpInfo;");
+ jclass plpClazz = env->FindClass("android/media/tv/tuner/frontend/Atsc3PlpInfo");
+ jmethodID initPlp = env->GetMethodID(plpClazz, "<init>", "(IZ)V");
+
+ vector<FrontendScanAtsc3PlpInfo> plpInfos =
+ s.get<FrontendStatus::Tag::allPlpInfo>();
+ jobjectArray valObj = env->NewObjectArray(plpInfos.size(), plpClazz, nullptr);
+ for (int i = 0; i < plpInfos.size(); i++) {
+ jobject plpObj = env->NewObject(plpClazz, initPlp, plpInfos[i].plpId,
+ plpInfos[i].bLlsFlag);
+ env->SetObjectArrayElement(valObj, i, plpObj);
+ }
+
+ env->SetObjectField(statusObj, field, valObj);
+ break;
+ }
}
}
return statusObj;
@@ -4357,6 +4384,11 @@
return tuner->getMaxNumberOfFrontends(type);
}
+static jint android_media_tv_Tuner_remove_output_pid(JNIEnv *env, jobject thiz, jint pid) {
+ sp<JTuner> tuner = getTuner(env, thiz);
+ return tuner->removeOutputPid(pid);
+}
+
static jint android_media_tv_Tuner_close_frontend(JNIEnv* env, jobject thiz, jint /* handle */) {
sp<JTuner> tuner = getTuner(env, thiz);
return tuner->closeFrontend();
@@ -4676,6 +4708,8 @@
(void *)android_media_tv_Tuner_set_maximum_frontends },
{ "nativeGetMaxNumberOfFrontends", "(I)I",
(void *)android_media_tv_Tuner_get_maximum_frontends },
+ { "nativeRemoveOutputPid", "(I)I",
+ (void *)android_media_tv_Tuner_remove_output_pid },
};
static const JNINativeMethod gFilterMethods[] = {
diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h
index 502bd6b..e9475dc 100644
--- a/media/jni/android_media_tv_Tuner.h
+++ b/media/jni/android_media_tv_Tuner.h
@@ -205,6 +205,7 @@
Result getFrontendHardwareInfo(string& info);
jint setMaxNumberOfFrontends(int32_t frontendType, int32_t maxNumber);
int32_t getMaxNumberOfFrontends(int32_t frontendType);
+ jint removeOutputPid(int32_t pid);
jweak getObject();
diff --git a/media/jni/tuner/FrontendClient.cpp b/media/jni/tuner/FrontendClient.cpp
index 0fdd8d8..bea0342 100644
--- a/media/jni/tuner/FrontendClient.cpp
+++ b/media/jni/tuner/FrontendClient.cpp
@@ -143,6 +143,15 @@
return Result::INVALID_STATE;
}
+Result FrontendClient::removeOutputPid(int32_t pid) {
+ if (mTunerFrontend != nullptr) {
+ Status s = mTunerFrontend->removeOutputPid(pid);
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
+
+ return Result::INVALID_STATE;
+}
+
shared_ptr<ITunerFrontend> FrontendClient::getAidlFrontend() {
return mTunerFrontend;
}
diff --git a/media/jni/tuner/FrontendClient.h b/media/jni/tuner/FrontendClient.h
index 77d9098..c6838c8 100644
--- a/media/jni/tuner/FrontendClient.h
+++ b/media/jni/tuner/FrontendClient.h
@@ -120,6 +120,11 @@
*/
Result getHardwareInfo(string& info);
+ /**
+ * Filter out unnecessary PID from frontend output.
+ */
+ Result removeOutputPid(int32_t pid);
+
int32_t getId();
shared_ptr<ITunerFrontend> getAidlFrontend();
diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
index 2dd9525..4c3b689 100644
--- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
+++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
@@ -24,6 +24,7 @@
import android.bluetooth.BluetoothGattService;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.media.midi.MidiDevice;
import android.media.midi.MidiDeviceInfo;
import android.media.midi.MidiDeviceServer;
import android.media.midi.MidiDeviceStatus;
@@ -63,6 +64,7 @@
"00002902-0000-1000-8000-00805f9b34fb");
private final BluetoothDevice mBluetoothDevice;
+ private final Context mContext;
private final BluetoothMidiService mService;
private final MidiManager mMidiManager;
private MidiReceiver mOutputReceiver;
@@ -136,6 +138,8 @@
// switch to receiving notifications
mBluetoothGatt.readCharacteristic(characteristic);
}
+
+ openBluetoothDevice(mBluetoothDevice);
}
} else {
Log.e(TAG, "onServicesDiscovered received: " + status);
@@ -249,6 +253,7 @@
mBluetoothGatt = mBluetoothDevice.connectGatt(context, false, mGattCallback);
+ mContext = context;
mMidiManager = (MidiManager)context.getSystemService(Context.MIDI_SERVICE);
Bundle properties = new Bundle();
@@ -310,6 +315,18 @@
}
}
+ void openBluetoothDevice(BluetoothDevice btDevice) {
+ Log.d(TAG, "openBluetoothDevice() device: " + btDevice);
+
+ MidiManager midiManager = mContext.getSystemService(MidiManager.class);
+ midiManager.openBluetoothDevice(btDevice,
+ new MidiManager.OnDeviceOpenedListener() {
+ @Override
+ public void onDeviceOpened(MidiDevice device) {
+ }
+ }, null);
+ }
+
public IBinder getBinder() {
return mDeviceServer.asBinder();
}
diff --git a/packages/CompanionDeviceManager/res/layout/data_transfer_confirmation.xml b/packages/CompanionDeviceManager/res/layout/data_transfer_confirmation.xml
new file mode 100644
index 0000000..a1855fd
--- /dev/null
+++ b/packages/CompanionDeviceManager/res/layout/data_transfer_confirmation.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2022 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.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/activity_confirmation"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/dialog_background"
+ android:elevation="16dp"
+ android:maxHeight="400dp"
+ android:orientation="vertical"
+ android:padding="18dp"
+ android:layout_gravity="center">
+
+ <!-- Do NOT change the ID of the root LinearLayout above: it's referenced in CTS tests. -->
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingHorizontal="12dp"
+ style="@*android:style/TextAppearance.Widget.Toolbar.Title"/>
+
+ <TextView
+ android:id="@+id/summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp"
+ android:gravity="center"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="14sp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="end">
+
+ <!-- Do NOT change the IDs of the buttons: they are referenced in CTS tests. -->
+
+ <Button
+ android:id="@+id/btn_negative"
+ style="@android:style/Widget.Material.Button.Borderless.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/consent_no"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ <Button
+ android:id="@+id/btn_positive"
+ style="@android:style/Widget.Material.Button.Borderless.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/consent_yes" />
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml
index cb8b616..25ec9606 100644
--- a/packages/CompanionDeviceManager/res/values/strings.xml
+++ b/packages/CompanionDeviceManager/res/values/strings.xml
@@ -73,4 +73,15 @@
<!-- Negative button for the device-app association consent dialog [CHAR LIMIT=30] -->
<string name="consent_no">Don\u2019t allow</string>
+
+ <!-- ================== System data transfer ==================== -->
+ <!-- Title of the permission sync confirmation dialog. [CHAR LIMIT=60] -->
+ <string name="permission_sync_confirmation_title">Transfer app permissions to your
+ watch</string>
+
+ <!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=400] -->
+ <string name="permission_sync_summary">To make it easier to set up your watch,
+ apps installed on your watch during setup will use the same permissions as your phone.\n\n
+ These permissions may include access to your watch\u2019s microphone and location.</string>
+
</resources>
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java
new file mode 100644
index 0000000..67efa03
--- /dev/null
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2022 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.companiondevicemanager;
+
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
+import static java.util.Objects.requireNonNull;
+
+import android.app.Activity;
+import android.companion.SystemDataTransferRequest;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.text.Html;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.TextView;
+
+/**
+ * This activity manages the UI of companion device data transfer.
+ */
+public class CompanionDeviceDataTransferActivity extends Activity {
+
+ private static final String LOG_TAG = CompanionDeviceDataTransferActivity.class.getSimpleName();
+
+ // UI -> SystemDataTransferProcessor
+ private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED = 0;
+ private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED = 1;
+ private static final String EXTRA_SYSTEM_DATA_TRANSFER_REQUEST = "system_data_transfer_request";
+ private static final String EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER =
+ "system_data_transfer_result_receiver";
+
+ private SystemDataTransferRequest mRequest;
+ private ResultReceiver mCdmServiceReceiver;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Log.i(LOG_TAG, "Creating UI for data transfer confirmation.");
+
+ getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+
+ setContentView(R.layout.data_transfer_confirmation);
+
+ TextView titleView = findViewById(R.id.title);
+ TextView summaryView = findViewById(R.id.summary);
+ ListView listView = findViewById(R.id.device_list);
+ listView.setVisibility(View.GONE);
+ Button allowButton = findViewById(R.id.btn_positive);
+ Button disallowButton = findViewById(R.id.btn_negative);
+
+ final Intent intent = getIntent();
+ mRequest = intent.getParcelableExtra(EXTRA_SYSTEM_DATA_TRANSFER_REQUEST);
+ mCdmServiceReceiver = intent.getParcelableExtra(EXTRA_SYSTEM_DATA_TRANSFER_RESULT_RECEIVER);
+
+ requireNonNull(mRequest);
+ requireNonNull(mCdmServiceReceiver);
+
+ if (mRequest.isPermissionSyncAllPackages()
+ || !mRequest.getPermissionSyncPackages().isEmpty()) {
+ titleView.setText(Html.fromHtml(getString(
+ R.string.permission_sync_confirmation_title), 0));
+ summaryView.setText(getString(R.string.permission_sync_summary));
+ allowButton.setOnClickListener(v -> allow());
+ disallowButton.setOnClickListener(v -> disallow());
+ }
+ }
+
+ private void allow() {
+ Log.i(LOG_TAG, "allow()");
+
+ sendDataToReceiver(RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED);
+
+ setResultAndFinish(RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED);
+ }
+
+ private void disallow() {
+ Log.i(LOG_TAG, "disallow()");
+
+ sendDataToReceiver(RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED);
+
+ setResultAndFinish(RESULT_CODE_SYSTEM_DATA_TRANSFER_DISALLOWED);
+ }
+
+ private void sendDataToReceiver(int cdmResultCode) {
+ Bundle data = new Bundle();
+ data.putParcelable(EXTRA_SYSTEM_DATA_TRANSFER_REQUEST, mRequest);
+ mCdmServiceReceiver.send(cdmResultCode, data);
+ }
+
+ private void setResultAndFinish(int cdmResultCode) {
+ setResult(cdmResultCode == RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED
+ ? RESULT_OK : RESULT_CANCELED);
+ finish();
+ }
+}
diff --git a/packages/ConnectivityT/framework-t/Android.bp b/packages/ConnectivityT/framework-t/Android.bp
index d3d8bba..223bdcdd 100644
--- a/packages/ConnectivityT/framework-t/Android.bp
+++ b/packages/ConnectivityT/framework-t/Android.bp
@@ -129,6 +129,11 @@
"src/android/net/EthernetNetworkSpecifier.java",
"src/android/net/IEthernetManager.aidl",
"src/android/net/IEthernetServiceListener.aidl",
+ "src/android/net/IInternalNetworkManagementListener.aidl",
+ "src/android/net/InternalNetworkUpdateRequest.java",
+ "src/android/net/InternalNetworkUpdateRequest.aidl",
+ "src/android/net/InternalNetworkManagementException.java",
+ "src/android/net/InternalNetworkManagementException.aidl",
"src/android/net/ITetheredInterfaceCallback.aidl",
],
path: "src",
diff --git a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java
index d33666d..2b6570a 100644
--- a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java
+++ b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStats.java
@@ -556,7 +556,7 @@
/**
* Collects history results for uid and resets history enumeration index.
*/
- void startHistoryEnumeration(int uid, int tag, int state) {
+ void startHistoryUidEnumeration(int uid, int tag, int state) {
mHistory = null;
try {
mHistory = mSession.getHistoryIntervalForUid(mTemplate, uid,
@@ -571,6 +571,20 @@
}
/**
+ * Collects history results for network and resets history enumeration index.
+ */
+ void startHistoryDeviceEnumeration() {
+ try {
+ mHistory = mSession.getHistoryIntervalForNetwork(
+ mTemplate, NetworkStatsHistory.FIELD_ALL, mStartTimeStamp, mEndTimeStamp);
+ } catch (RemoteException e) {
+ Log.w(TAG, e);
+ mHistory = null;
+ }
+ mEnumerationIndex = 0;
+ }
+
+ /**
* Starts uid enumeration for current user.
* @throws RemoteException
*/
diff --git a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java
index d00de36..8813f98 100644
--- a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java
+++ b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java
@@ -17,6 +17,8 @@
package android.app.usage;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import android.Manifest;
import android.annotation.NonNull;
@@ -55,7 +57,6 @@
import java.util.List;
import java.util.Objects;
-import java.util.Set;
/**
* Provides access to network usage history and statistics. Usage data is collected in
@@ -125,6 +126,19 @@
private final Context mContext;
private final INetworkStatsService mService;
+ /**
+ * Type constants for reading different types of Data Usage.
+ * @hide
+ */
+ // @SystemApi(client = MODULE_LIBRARIES)
+ public static final String PREFIX_DEV = "dev";
+ /** @hide */
+ public static final String PREFIX_XT = "xt";
+ /** @hide */
+ public static final String PREFIX_UID = "uid";
+ /** @hide */
+ public static final String PREFIX_UID_TAG = "uid_tag";
+
/** @hide */
public static final int FLAG_POLL_ON_OPEN = 1 << 0;
/** @hide */
@@ -143,6 +157,11 @@
setAugmentWithSubscriptionPlan(true);
}
+ /** @hide */
+ public INetworkStatsService getBinder() {
+ return mService;
+ }
+
/**
* Set poll on open flag to indicate the poll is needed before service gets statistics
* result. This is default enabled. However, for any non-privileged caller, the poll might
@@ -211,9 +230,10 @@
*/
@NonNull
@WorkerThread
- // @SystemApi(client = MODULE_LIBRARIES)
+ @SystemApi(client = MODULE_LIBRARIES)
public Bucket querySummaryForDevice(@NonNull NetworkTemplate template,
long startTime, long endTime) {
+ Objects.requireNonNull(template);
try {
NetworkStats stats =
new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -385,10 +405,11 @@
* @hide
*/
@NonNull
- // @SystemApi(client = MODULE_LIBRARIES)
+ @SystemApi(client = MODULE_LIBRARIES)
@WorkerThread
public NetworkStats querySummary(@NonNull NetworkTemplate template, long startTime,
long endTime) throws SecurityException {
+ Objects.requireNonNull(template);
try {
NetworkStats result =
new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -418,10 +439,11 @@
* @hide
*/
@NonNull
- // @SystemApi(client = MODULE_LIBRARIES)
+ @SystemApi(client = MODULE_LIBRARIES)
@WorkerThread
public NetworkStats queryTaggedSummary(@NonNull NetworkTemplate template, long startTime,
long endTime) throws SecurityException {
+ Objects.requireNonNull(template);
try {
NetworkStats result =
new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
@@ -434,6 +456,43 @@
}
/**
+ * Query usage statistics details for networks matching a given {@link NetworkTemplate}.
+ *
+ * Result is not aggregated over time. This means buckets' start and
+ * end timestamps will be between 'startTime' and 'endTime' parameters.
+ * <p>Only includes buckets whose entire time period is included between
+ * startTime and endTime. Doesn't interpolate or return partial buckets.
+ * Since bucket length is in the order of hours, this
+ * method cannot be used to measure data usage on a fine grained time scale.
+ * This may take a long time, and apps should avoid calling this on their main thread.
+ *
+ * @param template Template used to match networks. See {@link NetworkTemplate}.
+ * @param startTime Start of period, in milliseconds since the Unix epoch, see
+ * {@link java.lang.System#currentTimeMillis}.
+ * @param endTime End of period, in milliseconds since the Unix epoch, see
+ * {@link java.lang.System#currentTimeMillis}.
+ * @return Statistics which is described above.
+ * @hide
+ */
+ @NonNull
+ @SystemApi(client = MODULE_LIBRARIES)
+ @WorkerThread
+ public NetworkStats queryDetailsForDevice(@NonNull NetworkTemplate template,
+ long startTime, long endTime) {
+ Objects.requireNonNull(template);
+ try {
+ final NetworkStats result =
+ new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
+ result.startHistoryDeviceEnumeration();
+ return result;
+ } catch (RemoteException e) {
+ e.rethrowFromSystemServer();
+ }
+
+ return null; // To make the compiler happy.
+ }
+
+ /**
* Query network usage statistics details for a given uid.
* This may take a long time, and apps should avoid calling this on their main thread.
*
@@ -499,7 +558,8 @@
* @param endTime End of period. Defined in terms of "Unix time", see
* {@link java.lang.System#currentTimeMillis}.
* @param uid UID of app
- * @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for no tags.
+ * @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for aggregated data
+ * across all the tags.
* @param state state of interest. Use {@link NetworkStats.Bucket#STATE_ALL} to aggregate
* traffic from all states.
* @return Statistics object or null if an error happened during statistics collection.
@@ -514,21 +574,52 @@
return queryDetailsForUidTagState(template, startTime, endTime, uid, tag, state);
}
- /** @hide */
- public NetworkStats queryDetailsForUidTagState(NetworkTemplate template,
+ /**
+ * Query network usage statistics details for a given template, uid, tag, and state.
+ *
+ * Only usable for uids belonging to calling user. Result is not aggregated over time.
+ * This means buckets' start and end timestamps are going to be between 'startTime' and
+ * 'endTime' parameters. The uid is going to be the same as the 'uid' parameter, the tag
+ * the same as the 'tag' parameter, and the state the same as the 'state' parameter.
+ * defaultNetwork is going to be {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
+ * metered is going to be {@link NetworkStats.Bucket#METERED_ALL}, and
+ * roaming is going to be {@link NetworkStats.Bucket#ROAMING_ALL}.
+ * <p>Only includes buckets that atomically occur in the inclusive time range. Doesn't
+ * interpolate across partial buckets. Since bucket length is in the order of hours, this
+ * method cannot be used to measure data usage on a fine grained time scale.
+ * This may take a long time, and apps should avoid calling this on their main thread.
+ *
+ * @param template Template used to match networks. See {@link NetworkTemplate}.
+ * @param startTime Start of period, in milliseconds since the Unix epoch, see
+ * {@link java.lang.System#currentTimeMillis}.
+ * @param endTime End of period, in milliseconds since the Unix epoch, see
+ * {@link java.lang.System#currentTimeMillis}.
+ * @param uid UID of app
+ * @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for aggregated data
+ * across all the tags.
+ * @param state state of interest. Use {@link NetworkStats.Bucket#STATE_ALL} to aggregate
+ * traffic from all states.
+ * @return Statistics which is described above.
+ * @hide
+ */
+ @NonNull
+ @SystemApi(client = MODULE_LIBRARIES)
+ @WorkerThread
+ public NetworkStats queryDetailsForUidTagState(@NonNull NetworkTemplate template,
long startTime, long endTime, int uid, int tag, int state) throws SecurityException {
-
- NetworkStats result;
+ Objects.requireNonNull(template);
try {
- result = new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
- result.startHistoryEnumeration(uid, tag, state);
+ final NetworkStats result = new NetworkStats(
+ mContext, template, mFlags, startTime, endTime, mService);
+ result.startHistoryUidEnumeration(uid, tag, state);
+ return result;
} catch (RemoteException e) {
Log.e(TAG, "Error while querying stats for uid=" + uid + " tag=" + tag
+ " state=" + state, e);
- return null;
+ e.rethrowFromSystemServer();
}
- return result;
+ return null; // To make the compiler happy.
}
/**
@@ -585,26 +676,49 @@
}
/**
- * Query realtime network usage statistics details with interfaces constrains.
- * Return snapshot of current UID statistics, including any {@link TrafficStats#UID_TETHERING},
- * video calling data usage and count of network operations that set by
- * {@link TrafficStats#incrementOperationCount}. The returned data doesn't include any
- * statistics that is reported by {@link NetworkStatsProvider}.
+ * Query realtime mobile network usage statistics.
*
- * @param requiredIfaces A list of interfaces the stats should be restricted to, or
- * {@link NetworkStats#INTERFACES_ALL}.
+ * Return a snapshot of current UID network statistics, as it applies
+ * to the mobile radios of the device. The snapshot will include any
+ * tethering traffic, video calling data usage and count of
+ * network operations set by {@link TrafficStats#incrementOperationCount}
+ * made over a mobile radio.
+ * The snapshot will not include any statistics that cannot be seen by
+ * the kernel, e.g. statistics reported by {@link NetworkStatsProvider}s.
*
* @hide
*/
- //@SystemApi
+ @SystemApi
@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
- @NonNull public android.net.NetworkStats getDetailedUidStats(
- @NonNull Set<String> requiredIfaces) {
- Objects.requireNonNull(requiredIfaces, "requiredIfaces cannot be null");
+ @NonNull public android.net.NetworkStats getMobileUidStats() {
try {
- return mService.getDetailedUidStats(requiredIfaces.toArray(new String[0]));
+ return mService.getUidStatsForTransport(TRANSPORT_CELLULAR);
} catch (RemoteException e) {
- if (DBG) Log.d(TAG, "Remote exception when get detailed uid stats");
+ if (DBG) Log.d(TAG, "Remote exception when get Mobile uid stats");
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Query realtime Wi-Fi network usage statistics.
+ *
+ * Return a snapshot of current UID network statistics, as it applies
+ * to the Wi-Fi radios of the device. The snapshot will include any
+ * tethering traffic, video calling data usage and count of
+ * network operations set by {@link TrafficStats#incrementOperationCount}
+ * made over a Wi-Fi radio.
+ * The snapshot will not include any statistics that cannot be seen by
+ * the kernel, e.g. statistics reported by {@link NetworkStatsProvider}s.
+ *
+ * @hide
+ */
+ @SystemApi
+ @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
+ @NonNull public android.net.NetworkStats getWifiUidStats() {
+ try {
+ return mService.getUidStatsForTransport(TRANSPORT_WIFI);
+ } catch (RemoteException e) {
+ if (DBG) Log.d(TAG, "Remote exception when get WiFi uid stats");
throw e.rethrowFromSystemServer();
}
}
diff --git a/core/java/android/net/IInternalNetworkManagementListener.aidl b/packages/ConnectivityT/framework-t/src/android/net/IInternalNetworkManagementListener.aidl
similarity index 100%
rename from core/java/android/net/IInternalNetworkManagementListener.aidl
rename to packages/ConnectivityT/framework-t/src/android/net/IInternalNetworkManagementListener.aidl
diff --git a/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl
index a4babb5..da0aa99 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl
+++ b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsService.aidl
@@ -49,14 +49,8 @@
@UnsupportedAppUsage
NetworkStats getDataLayerSnapshotForUid(int uid);
- /** Get a detailed snapshot of stats since boot for all UIDs.
- *
- * <p>Results will not always be limited to stats on requiredIfaces when specified: stats for
- * interfaces stacked on the specified interfaces, or for interfaces on which the specified
- * interfaces are stacked on, will also be included.
- * @param requiredIfaces Interface names to get data for, or {@link NetworkStats#INTERFACES_ALL}.
- */
- NetworkStats getDetailedUidStats(in String[] requiredIfaces);
+ /** Get the transport NetworkStats for all UIDs since boot. */
+ NetworkStats getUidStatsForTransport(int transport);
/** Return set of any ifaces associated with mobile networks since boot. */
@UnsupportedAppUsage
diff --git a/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl
index babe0bf..ab70be8 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl
+++ b/packages/ConnectivityT/framework-t/src/android/net/INetworkStatsSession.aidl
@@ -32,6 +32,11 @@
/** Return historical network layer stats for traffic that matches template. */
@UnsupportedAppUsage
NetworkStatsHistory getHistoryForNetwork(in NetworkTemplate template, int fields);
+ /**
+ * Return historical network layer stats for traffic that matches template, start and end
+ * timestamp.
+ */
+ NetworkStatsHistory getHistoryIntervalForNetwork(in NetworkTemplate template, int fields, long start, long end);
/**
* Return network layer usage summary per UID for traffic that matches template.
diff --git a/core/java/android/net/InternalNetworkManagementException.aidl b/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.aidl
similarity index 100%
rename from core/java/android/net/InternalNetworkManagementException.aidl
rename to packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.aidl
diff --git a/core/java/android/net/InternalNetworkManagementException.java b/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.java
similarity index 100%
rename from core/java/android/net/InternalNetworkManagementException.java
rename to packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.java
diff --git a/core/java/android/net/InternalNetworkUpdateRequest.aidl b/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl
similarity index 100%
rename from core/java/android/net/InternalNetworkUpdateRequest.aidl
rename to packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl
diff --git a/core/java/android/net/InternalNetworkUpdateRequest.java b/packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.java
similarity index 100%
rename from core/java/android/net/InternalNetworkUpdateRequest.java
rename to packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.java
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
index 04d1d68..d3d5a08 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
@@ -16,18 +16,29 @@
package android.net;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.net.NetworkTemplate.NETWORK_TYPE_ALL;
+import android.annotation.IntDef;
+import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SuppressLint;
+import android.annotation.SystemApi;
import android.content.Context;
import android.net.wifi.WifiInfo;
import android.service.NetworkIdentityProto;
-import android.telephony.Annotation.NetworkType;
+import android.telephony.Annotation;
+import android.telephony.TelephonyManager;
import android.util.proto.ProtoOutputStream;
+import com.android.net.module.util.CollectionUtils;
import com.android.net.module.util.NetworkCapabilitiesUtils;
import com.android.net.module.util.NetworkIdentityUtils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Objects;
@@ -37,11 +48,24 @@
*
* @hide
*/
-public class NetworkIdentity implements Comparable<NetworkIdentity> {
+@SystemApi(client = MODULE_LIBRARIES)
+public class NetworkIdentity {
private static final String TAG = "NetworkIdentity";
+ /** @hide */
+ // TODO: Remove this after migrating all callers to use
+ // {@link NetworkTemplate#NETWORK_TYPE_ALL} instead.
public static final int SUBTYPE_COMBINED = -1;
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(prefix = { "OEM_MANAGED_" }, flag = true, value = {
+ NetworkTemplate.OEM_MANAGED_NO,
+ NetworkTemplate.OEM_MANAGED_PAID,
+ NetworkTemplate.OEM_MANAGED_PRIVATE
+ })
+ public @interface OemManaged{}
+
/**
* Network has no {@code NetworkCapabilities#NET_CAPABILITY_OEM_*}.
* @hide
@@ -51,29 +75,32 @@
* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PAID}.
* @hide
*/
- public static final int OEM_PAID = 0x1;
+ public static final int OEM_PAID = 1 << 0;
/**
* Network has {@link NetworkCapabilities#NET_CAPABILITY_OEM_PRIVATE}.
* @hide
*/
- public static final int OEM_PRIVATE = 0x2;
+ public static final int OEM_PRIVATE = 1 << 1;
+
+ private static final long SUPPORTED_OEM_MANAGED_TYPES = OEM_PAID | OEM_PRIVATE;
final int mType;
- final int mSubType;
+ final int mRatType;
final String mSubscriberId;
- final String mNetworkId;
+ final String mWifiNetworkKey;
final boolean mRoaming;
final boolean mMetered;
final boolean mDefaultNetwork;
final int mOemManaged;
+ /** @hide */
public NetworkIdentity(
- int type, int subType, String subscriberId, String networkId, boolean roaming,
- boolean metered, boolean defaultNetwork, int oemManaged) {
+ int type, int ratType, @Nullable String subscriberId, @Nullable String wifiNetworkKey,
+ boolean roaming, boolean metered, boolean defaultNetwork, int oemManaged) {
mType = type;
- mSubType = subType;
+ mRatType = ratType;
mSubscriberId = subscriberId;
- mNetworkId = networkId;
+ mWifiNetworkKey = wifiNetworkKey;
mRoaming = roaming;
mMetered = metered;
mDefaultNetwork = defaultNetwork;
@@ -82,7 +109,7 @@
@Override
public int hashCode() {
- return Objects.hash(mType, mSubType, mSubscriberId, mNetworkId, mRoaming, mMetered,
+ return Objects.hash(mType, mRatType, mSubscriberId, mWifiNetworkKey, mRoaming, mMetered,
mDefaultNetwork, mOemManaged);
}
@@ -90,9 +117,9 @@
public boolean equals(@Nullable Object obj) {
if (obj instanceof NetworkIdentity) {
final NetworkIdentity ident = (NetworkIdentity) obj;
- return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming
+ return mType == ident.mType && mRatType == ident.mRatType && mRoaming == ident.mRoaming
&& Objects.equals(mSubscriberId, ident.mSubscriberId)
- && Objects.equals(mNetworkId, ident.mNetworkId)
+ && Objects.equals(mWifiNetworkKey, ident.mWifiNetworkKey)
&& mMetered == ident.mMetered
&& mDefaultNetwork == ident.mDefaultNetwork
&& mOemManaged == ident.mOemManaged;
@@ -104,18 +131,18 @@
public String toString() {
final StringBuilder builder = new StringBuilder("{");
builder.append("type=").append(mType);
- builder.append(", subType=");
- if (mSubType == SUBTYPE_COMBINED) {
+ builder.append(", ratType=");
+ if (mRatType == NETWORK_TYPE_ALL) {
builder.append("COMBINED");
} else {
- builder.append(mSubType);
+ builder.append(mRatType);
}
if (mSubscriberId != null) {
builder.append(", subscriberId=")
.append(NetworkIdentityUtils.scrubSubscriberId(mSubscriberId));
}
- if (mNetworkId != null) {
- builder.append(", networkId=").append(mNetworkId);
+ if (mWifiNetworkKey != null) {
+ builder.append(", wifiNetworkKey=").append(mWifiNetworkKey);
}
if (mRoaming) {
builder.append(", ROAMING");
@@ -153,12 +180,13 @@
}
}
+ /** @hide */
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
proto.write(NetworkIdentityProto.TYPE, mType);
- // Not dumping mSubType, subtypes are no longer supported.
+ // TODO: dump mRatType as well.
proto.write(NetworkIdentityProto.ROAMING, mRoaming);
proto.write(NetworkIdentityProto.METERED, mMetered);
@@ -168,77 +196,99 @@
proto.end(start);
}
+ /** Get the network type of this instance. */
public int getType() {
return mType;
}
- public int getSubType() {
- return mSubType;
+ /** Get the Radio Access Technology(RAT) type of this instance. */
+ public int getRatType() {
+ return mRatType;
}
+ /** Get the Subscriber Id of this instance. */
+ @Nullable
public String getSubscriberId() {
return mSubscriberId;
}
- public String getNetworkId() {
- return mNetworkId;
+ /** Get the Wifi Network Key of this instance. See {@link WifiInfo#getNetworkKey()}. */
+ @Nullable
+ public String getWifiNetworkKey() {
+ return mWifiNetworkKey;
}
+ /** @hide */
+ // TODO: Remove this function after all callers are removed.
public boolean getRoaming() {
return mRoaming;
}
+ /** Return whether this network is roaming. */
+ public boolean isRoaming() {
+ return mRoaming;
+ }
+
+ /** @hide */
+ // TODO: Remove this function after all callers are removed.
public boolean getMetered() {
return mMetered;
}
+ /** Return whether this network is metered. */
+ public boolean isMetered() {
+ return mMetered;
+ }
+
+ /** @hide */
+ // TODO: Remove this function after all callers are removed.
public boolean getDefaultNetwork() {
return mDefaultNetwork;
}
+ /** Return whether this network is the default network. */
+ public boolean isDefaultNetwork() {
+ return mDefaultNetwork;
+ }
+
+ /** Get the OEM managed type of this instance. */
public int getOemManaged() {
return mOemManaged;
}
/**
- * Build a {@link NetworkIdentity} from the given {@link NetworkStateSnapshot} and
- * {@code subType}, assuming that any mobile networks are using the current IMSI.
- * The subType if applicable, should be set as one of the TelephonyManager.NETWORK_TYPE_*
- * constants, or {@link android.telephony.TelephonyManager#NETWORK_TYPE_UNKNOWN} if not.
+ * Assemble a {@link NetworkIdentity} from the passed arguments.
+ *
+ * This methods builds an identity based on the capabilities of the network in the
+ * snapshot and other passed arguments. The identity is used as a key to record data usage.
+ *
+ * @param snapshot the snapshot of network state. See {@link NetworkStateSnapshot}.
+ * @param defaultNetwork whether the network is a default network.
+ * @param ratType the Radio Access Technology(RAT) type of the network. Or
+ * {@link TelephonyManager#NETWORK_TYPE_UNKNOWN} if not applicable.
+ * See {@code TelephonyManager.NETWORK_TYPE_*}.
+ * @hide
+ * @deprecated See {@link NetworkIdentity.Builder}.
*/
+ // TODO: Remove this after all callers are migrated to use new Api.
+ @Deprecated
+ @NonNull
public static NetworkIdentity buildNetworkIdentity(Context context,
- NetworkStateSnapshot snapshot, boolean defaultNetwork, @NetworkType int subType) {
- final int legacyType = snapshot.getLegacyType();
-
- final String subscriberId = snapshot.getSubscriberId();
- String networkId = null;
- boolean roaming = !snapshot.getNetworkCapabilities().hasCapability(
- NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
- boolean metered = !(snapshot.getNetworkCapabilities().hasCapability(
- NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
- || snapshot.getNetworkCapabilities().hasCapability(
- NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED));
-
- final int oemManaged = getOemBitfield(snapshot.getNetworkCapabilities());
-
- if (legacyType == TYPE_WIFI) {
- final TransportInfo transportInfo = snapshot.getNetworkCapabilities()
- .getTransportInfo();
- if (transportInfo instanceof WifiInfo) {
- final WifiInfo info = (WifiInfo) transportInfo;
- networkId = info != null ? info.getCurrentNetworkKey() : null;
- }
+ @NonNull NetworkStateSnapshot snapshot,
+ boolean defaultNetwork, @Annotation.NetworkType int ratType) {
+ final NetworkIdentity.Builder builder = new NetworkIdentity.Builder()
+ .setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork);
+ if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) {
+ builder.setRatType(ratType);
}
-
- return new NetworkIdentity(legacyType, subType, subscriberId, networkId, roaming, metered,
- defaultNetwork, oemManaged);
+ return builder.build();
}
/**
* Builds a bitfield of {@code NetworkIdentity.OEM_*} based on {@link NetworkCapabilities}.
* @hide
*/
- public static int getOemBitfield(NetworkCapabilities nc) {
+ public static int getOemBitfield(@NonNull NetworkCapabilities nc) {
int oemManaged = OEM_NONE;
if (nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID)) {
@@ -251,30 +301,265 @@
return oemManaged;
}
- @Override
- public int compareTo(NetworkIdentity another) {
- int res = Integer.compare(mType, another.mType);
+ /** @hide */
+ public static int compare(@NonNull NetworkIdentity left, @NonNull NetworkIdentity right) {
+ Objects.requireNonNull(right);
+ int res = Integer.compare(left.mType, right.mType);
if (res == 0) {
- res = Integer.compare(mSubType, another.mSubType);
+ res = Integer.compare(left.mRatType, right.mRatType);
}
- if (res == 0 && mSubscriberId != null && another.mSubscriberId != null) {
- res = mSubscriberId.compareTo(another.mSubscriberId);
+ if (res == 0 && left.mSubscriberId != null && right.mSubscriberId != null) {
+ res = left.mSubscriberId.compareTo(right.mSubscriberId);
}
- if (res == 0 && mNetworkId != null && another.mNetworkId != null) {
- res = mNetworkId.compareTo(another.mNetworkId);
+ if (res == 0 && left.mWifiNetworkKey != null && right.mWifiNetworkKey != null) {
+ res = left.mWifiNetworkKey.compareTo(right.mWifiNetworkKey);
}
if (res == 0) {
- res = Boolean.compare(mRoaming, another.mRoaming);
+ res = Boolean.compare(left.mRoaming, right.mRoaming);
}
if (res == 0) {
- res = Boolean.compare(mMetered, another.mMetered);
+ res = Boolean.compare(left.mMetered, right.mMetered);
}
if (res == 0) {
- res = Boolean.compare(mDefaultNetwork, another.mDefaultNetwork);
+ res = Boolean.compare(left.mDefaultNetwork, right.mDefaultNetwork);
}
if (res == 0) {
- res = Integer.compare(mOemManaged, another.mOemManaged);
+ res = Integer.compare(left.mOemManaged, right.mOemManaged);
}
return res;
}
+
+ /**
+ * Builder class for {@link NetworkIdentity}.
+ */
+ public static final class Builder {
+ // Need to be synchronized with ConnectivityManager.
+ // TODO: Use {@link ConnectivityManager#MAX_NETWORK_TYPE} when this file is in the module.
+ private static final int MAX_NETWORK_TYPE = 18; // TYPE_TEST
+ private static final int MIN_NETWORK_TYPE = TYPE_MOBILE;
+
+ private int mType;
+ private int mRatType;
+ private String mSubscriberId;
+ private String mWifiNetworkKey;
+ private boolean mRoaming;
+ private boolean mMetered;
+ private boolean mDefaultNetwork;
+ private int mOemManaged;
+
+ /**
+ * Creates a new Builder.
+ */
+ public Builder() {
+ // Initialize with default values. Will be overwritten by setters.
+ mType = ConnectivityManager.TYPE_NONE;
+ mRatType = NetworkTemplate.NETWORK_TYPE_ALL;
+ mSubscriberId = null;
+ mWifiNetworkKey = null;
+ mRoaming = false;
+ mMetered = false;
+ mDefaultNetwork = false;
+ mOemManaged = NetworkTemplate.OEM_MANAGED_NO;
+ }
+
+ /**
+ * Add an {@link NetworkStateSnapshot} into the {@link NetworkIdentity} instance.
+ * This is a useful shorthand that will read from the snapshot and set the
+ * following fields, if they are set in the snapshot :
+ * - type
+ * - subscriberId
+ * - roaming
+ * - metered
+ * - oemManaged
+ * - wifiNetworkKey
+ *
+ * @param snapshot The target {@link NetworkStateSnapshot} object.
+ * @return The builder object.
+ */
+ @SuppressLint("MissingGetterMatchingBuilder")
+ @NonNull
+ public Builder setNetworkStateSnapshot(@NonNull NetworkStateSnapshot snapshot) {
+ setType(snapshot.getLegacyType());
+
+ setSubscriberId(snapshot.getSubscriberId());
+ setRoaming(!snapshot.getNetworkCapabilities().hasCapability(
+ NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING));
+ setMetered(!(snapshot.getNetworkCapabilities().hasCapability(
+ NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+ || snapshot.getNetworkCapabilities().hasCapability(
+ NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)));
+
+ setOemManaged(getOemBitfield(snapshot.getNetworkCapabilities()));
+
+ if (mType == TYPE_WIFI) {
+ final TransportInfo transportInfo = snapshot.getNetworkCapabilities()
+ .getTransportInfo();
+ if (transportInfo instanceof WifiInfo) {
+ final WifiInfo info = (WifiInfo) transportInfo;
+ setWifiNetworkKey(info.getNetworkKey());
+ }
+ }
+ return this;
+ }
+
+ /**
+ * Set the network type of the network.
+ *
+ * @param type the network type. See {@link ConnectivityManager#TYPE_*}.
+ *
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setType(int type) {
+ // Include TYPE_NONE for compatibility, type field might not be filled by some
+ // networks such as test networks.
+ if ((type < MIN_NETWORK_TYPE || MAX_NETWORK_TYPE < type)
+ && type != ConnectivityManager.TYPE_NONE) {
+ throw new IllegalArgumentException("Invalid network type: " + type);
+ }
+ mType = type;
+ return this;
+ }
+
+ /**
+ * Set the Radio Access Technology(RAT) type of the network.
+ *
+ * No RAT type is specified by default. Call clearRatType to reset.
+ *
+ * @param ratType the Radio Access Technology(RAT) type if applicable. See
+ * {@code TelephonyManager.NETWORK_TYPE_*}.
+ *
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setRatType(@Annotation.NetworkType int ratType) {
+ if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType)
+ && ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
+ throw new IllegalArgumentException("Invalid ratType " + ratType);
+ }
+ mRatType = ratType;
+ return this;
+ }
+
+ /**
+ * Clear the Radio Access Technology(RAT) type of the network.
+ *
+ * @return this builder.
+ */
+ @NonNull
+ public Builder clearRatType() {
+ mRatType = NetworkTemplate.NETWORK_TYPE_ALL;
+ return this;
+ }
+
+ /**
+ * Set the Subscriber Id.
+ *
+ * @param subscriberId the Subscriber Id of the network. Or null if not applicable.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setSubscriberId(@Nullable String subscriberId) {
+ mSubscriberId = subscriberId;
+ return this;
+ }
+
+ /**
+ * Set the Wifi Network Key.
+ *
+ * @param wifiNetworkKey Wifi Network Key of the network,
+ * see {@link WifiInfo#getNetworkKey()}.
+ * Or null if not applicable.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setWifiNetworkKey(@Nullable String wifiNetworkKey) {
+ mWifiNetworkKey = wifiNetworkKey;
+ return this;
+ }
+
+ /**
+ * Set whether this network is roaming.
+ *
+ * This field is false by default. Call with false to reset.
+ *
+ * @param roaming the roaming status of the network.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setRoaming(boolean roaming) {
+ mRoaming = roaming;
+ return this;
+ }
+
+ /**
+ * Set whether this network is metered.
+ *
+ * This field is false by default. Call with false to reset.
+ *
+ * @param metered the meteredness of the network.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setMetered(boolean metered) {
+ mMetered = metered;
+ return this;
+ }
+
+ /**
+ * Set whether this network is the default network.
+ *
+ * This field is false by default. Call with false to reset.
+ *
+ * @param defaultNetwork the default network status of the network.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setDefaultNetwork(boolean defaultNetwork) {
+ mDefaultNetwork = defaultNetwork;
+ return this;
+ }
+
+ /**
+ * Set the OEM managed type.
+ *
+ * @param oemManaged Type of OEM managed network or unmanaged networks.
+ * See {@code NetworkTemplate#OEM_MANAGED_*}.
+ * @return this builder.
+ */
+ @NonNull
+ public Builder setOemManaged(@OemManaged int oemManaged) {
+ // Assert input does not contain illegal oemManage bits.
+ if ((~SUPPORTED_OEM_MANAGED_TYPES & oemManaged) != 0) {
+ throw new IllegalArgumentException("Invalid value for OemManaged : " + oemManaged);
+ }
+ mOemManaged = oemManaged;
+ return this;
+ }
+
+ private void ensureValidParameters() {
+ // Assert non-mobile network cannot have a ratType.
+ if (mType != TYPE_MOBILE && mRatType != NetworkTemplate.NETWORK_TYPE_ALL) {
+ throw new IllegalArgumentException(
+ "Invalid ratType " + mRatType + " for type " + mType);
+ }
+
+ // Assert non-wifi network cannot have a wifi network key.
+ if (mType != TYPE_WIFI && mWifiNetworkKey != null) {
+ throw new IllegalArgumentException("Invalid wifi network key for type " + mType);
+ }
+ }
+
+ /**
+ * Builds the instance of the {@link NetworkIdentity}.
+ *
+ * @return the built instance of {@link NetworkIdentity}.
+ */
+ @NonNull
+ public NetworkIdentity build() {
+ ensureValidParameters();
+ return new NetworkIdentity(mType, mRatType, mSubscriberId, mWifiNetworkKey,
+ mRoaming, mMetered, mDefaultNetwork, mOemManaged);
+ }
+ }
}
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java
index abbebef..dfa347f 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java
@@ -18,6 +18,7 @@
import static android.net.ConnectivityManager.TYPE_MOBILE;
+import android.annotation.NonNull;
import android.service.NetworkIdentitySetProto;
import android.util.proto.ProtoOutputStream;
@@ -25,6 +26,8 @@
import java.io.DataOutput;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
/**
* Identity of a {@code iface}, defined by the set of {@link NetworkIdentity}
@@ -32,8 +35,7 @@
*
* @hide
*/
-public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements
- Comparable<NetworkIdentitySet> {
+public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
private static final int VERSION_INIT = 1;
private static final int VERSION_ADD_ROAMING = 2;
private static final int VERSION_ADD_NETWORK_ID = 3;
@@ -41,9 +43,19 @@
private static final int VERSION_ADD_DEFAULT_NETWORK = 5;
private static final int VERSION_ADD_OEM_MANAGED_NETWORK = 6;
+ /**
+ * Construct a {@link NetworkIdentitySet} object.
+ */
public NetworkIdentitySet() {
+ super();
}
+ /** @hide */
+ public NetworkIdentitySet(@NonNull Set<NetworkIdentity> ident) {
+ super(ident);
+ }
+
+ /** @hide */
public NetworkIdentitySet(DataInput in) throws IOException {
final int version = in.readInt();
final int size = in.readInt();
@@ -52,7 +64,7 @@
final int ignored = in.readInt();
}
final int type = in.readInt();
- final int subType = in.readInt();
+ final int ratType = in.readInt();
final String subscriberId = readOptionalString(in);
final String networkId;
if (version >= VERSION_ADD_NETWORK_ID) {
@@ -91,63 +103,73 @@
oemNetCapabilities = NetworkIdentity.OEM_NONE;
}
- add(new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered,
+ add(new NetworkIdentity(type, ratType, subscriberId, networkId, roaming, metered,
defaultNetwork, oemNetCapabilities));
}
}
/**
* Method to serialize this object into a {@code DataOutput}.
+ * @hide
*/
public void writeToStream(DataOutput out) throws IOException {
out.writeInt(VERSION_ADD_OEM_MANAGED_NETWORK);
out.writeInt(size());
for (NetworkIdentity ident : this) {
out.writeInt(ident.getType());
- out.writeInt(ident.getSubType());
+ out.writeInt(ident.getRatType());
writeOptionalString(out, ident.getSubscriberId());
- writeOptionalString(out, ident.getNetworkId());
- out.writeBoolean(ident.getRoaming());
- out.writeBoolean(ident.getMetered());
- out.writeBoolean(ident.getDefaultNetwork());
+ writeOptionalString(out, ident.getWifiNetworkKey());
+ out.writeBoolean(ident.isRoaming());
+ out.writeBoolean(ident.isMetered());
+ out.writeBoolean(ident.isDefaultNetwork());
out.writeInt(ident.getOemManaged());
}
}
- /** @return whether any {@link NetworkIdentity} in this set is considered metered. */
+ /**
+ * @return whether any {@link NetworkIdentity} in this set is considered metered.
+ * @hide
+ */
public boolean isAnyMemberMetered() {
if (isEmpty()) {
return false;
}
for (NetworkIdentity ident : this) {
- if (ident.getMetered()) {
+ if (ident.isMetered()) {
return true;
}
}
return false;
}
- /** @return whether any {@link NetworkIdentity} in this set is considered roaming. */
+ /**
+ * @return whether any {@link NetworkIdentity} in this set is considered roaming.
+ * @hide
+ */
public boolean isAnyMemberRoaming() {
if (isEmpty()) {
return false;
}
for (NetworkIdentity ident : this) {
- if (ident.getRoaming()) {
+ if (ident.isRoaming()) {
return true;
}
}
return false;
}
- /** @return whether any {@link NetworkIdentity} in this set is considered on the default
- network. */
+ /**
+ * @return whether any {@link NetworkIdentity} in this set is considered on the default
+ * network.
+ * @hide
+ */
public boolean areAllMembersOnDefaultNetwork() {
if (isEmpty()) {
return true;
}
for (NetworkIdentity ident : this) {
- if (!ident.getDefaultNetwork()) {
+ if (!ident.isDefaultNetwork()) {
return false;
}
}
@@ -171,18 +193,20 @@
}
}
- @Override
- public int compareTo(NetworkIdentitySet another) {
- if (isEmpty()) return -1;
- if (another.isEmpty()) return 1;
+ public static int compare(@NonNull NetworkIdentitySet left, @NonNull NetworkIdentitySet right) {
+ Objects.requireNonNull(left);
+ Objects.requireNonNull(right);
+ if (left.isEmpty()) return -1;
+ if (right.isEmpty()) return 1;
- final NetworkIdentity ident = iterator().next();
- final NetworkIdentity anotherIdent = another.iterator().next();
- return ident.compareTo(anotherIdent);
+ final NetworkIdentity leftIdent = left.iterator().next();
+ final NetworkIdentity rightIdent = right.iterator().next();
+ return NetworkIdentity.compare(leftIdent, rightIdent);
}
/**
* Method to dump this object into proto debug file.
+ * @hide
*/
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java
index 9f9d73f..58ca21f 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java
@@ -32,6 +32,8 @@
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.os.Binder;
import android.service.NetworkStatsCollectionKeyProto;
import android.service.NetworkStatsCollectionProto;
@@ -70,6 +72,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Objects;
+import java.util.Set;
/**
* Collection of {@link NetworkStatsHistory}, stored based on combined key of
@@ -77,6 +80,7 @@
*
* @hide
*/
+// @SystemApi(client = MODULE_LIBRARIES)
public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.Writer {
private static final String TAG = NetworkStatsCollection.class.getSimpleName();
/** File header magic number: "ANET" */
@@ -100,15 +104,23 @@
private long mTotalBytes;
private boolean mDirty;
+ /**
+ * Construct a {@link NetworkStatsCollection} object.
+ *
+ * @param bucketDuration duration of the buckets in this object, in milliseconds.
+ * @hide
+ */
public NetworkStatsCollection(long bucketDuration) {
mBucketDuration = bucketDuration;
reset();
}
+ /** @hide */
public void clear() {
reset();
}
+ /** @hide */
public void reset() {
mStats.clear();
mStartMillis = Long.MAX_VALUE;
@@ -117,6 +129,7 @@
mDirty = false;
}
+ /** @hide */
public long getStartMillis() {
return mStartMillis;
}
@@ -124,6 +137,7 @@
/**
* Return first atomic bucket in this collection, which is more conservative
* than {@link #mStartMillis}.
+ * @hide
*/
public long getFirstAtomicBucketMillis() {
if (mStartMillis == Long.MAX_VALUE) {
@@ -133,26 +147,32 @@
}
}
+ /** @hide */
public long getEndMillis() {
return mEndMillis;
}
+ /** @hide */
public long getTotalBytes() {
return mTotalBytes;
}
+ /** @hide */
public boolean isDirty() {
return mDirty;
}
+ /** @hide */
public void clearDirty() {
mDirty = false;
}
+ /** @hide */
public boolean isEmpty() {
return mStartMillis == Long.MAX_VALUE && mEndMillis == Long.MIN_VALUE;
}
+ /** @hide */
@VisibleForTesting
public long roundUp(long time) {
if (time == Long.MIN_VALUE || time == Long.MAX_VALUE
@@ -168,6 +188,7 @@
}
}
+ /** @hide */
@VisibleForTesting
public long roundDown(long time) {
if (time == Long.MIN_VALUE || time == Long.MAX_VALUE
@@ -182,10 +203,12 @@
}
}
+ /** @hide */
public int[] getRelevantUids(@NetworkStatsAccess.Level int accessLevel) {
return getRelevantUids(accessLevel, Binder.getCallingUid());
}
+ /** @hide */
public int[] getRelevantUids(@NetworkStatsAccess.Level int accessLevel,
final int callerUid) {
final ArrayList<Integer> uids = new ArrayList<>();
@@ -206,6 +229,7 @@
/**
* Combine all {@link NetworkStatsHistory} in this collection which match
* the requested parameters.
+ * @hide
*/
public NetworkStatsHistory getHistory(NetworkTemplate template, SubscriptionPlan augmentPlan,
int uid, int set, int tag, int fields, long start, long end,
@@ -331,6 +355,7 @@
* @param end - end of the range, timestamp in milliseconds since the epoch.
* @param accessLevel - caller access level.
* @param callerUid - caller UID.
+ * @hide
*/
public NetworkStats getSummary(NetworkTemplate template, long start, long end,
@NetworkStatsAccess.Level int accessLevel, int callerUid) {
@@ -377,6 +402,7 @@
/**
* Record given {@link android.net.NetworkStats.Entry} into this collection.
+ * @hide
*/
public void recordData(NetworkIdentitySet ident, int uid, int set, int tag, long start,
long end, NetworkStats.Entry entry) {
@@ -387,8 +413,12 @@
/**
* Record given {@link NetworkStatsHistory} into this collection.
+ *
+ * @hide
*/
- private void recordHistory(Key key, NetworkStatsHistory history) {
+ public void recordHistory(@NonNull Key key, @NonNull NetworkStatsHistory history) {
+ Objects.requireNonNull(key);
+ Objects.requireNonNull(history);
if (history.size() == 0) return;
noteRecordedHistory(history.getStart(), history.getEnd(), history.getTotalBytes());
@@ -403,8 +433,11 @@
/**
* Record all {@link NetworkStatsHistory} contained in the given collection
* into this collection.
+ *
+ * @hide
*/
- public void recordCollection(NetworkStatsCollection another) {
+ public void recordCollection(@NonNull NetworkStatsCollection another) {
+ Objects.requireNonNull(another);
for (int i = 0; i < another.mStats.size(); i++) {
final Key key = another.mStats.keyAt(i);
final NetworkStatsHistory value = another.mStats.valueAt(i);
@@ -433,6 +466,7 @@
}
}
+ /** @hide */
@Override
public void read(InputStream in) throws IOException {
read((DataInput) new DataInputStream(in));
@@ -472,6 +506,7 @@
}
}
+ /** @hide */
@Override
public void write(OutputStream out) throws IOException {
write((DataOutput) new DataOutputStream(out));
@@ -514,6 +549,7 @@
* See {@code NetworkStatsService#maybeUpgradeLegacyStatsLocked}.
*
* @deprecated
+ * @hide
*/
@Deprecated
public void readLegacyNetwork(File file) throws IOException {
@@ -559,6 +595,7 @@
* See {@code NetworkStatsService#maybeUpgradeLegacyStatsLocked}.
*
* @deprecated
+ * @hide
*/
@Deprecated
public void readLegacyUid(File file, boolean onlyTags) throws IOException {
@@ -629,6 +666,7 @@
* Remove any {@link NetworkStatsHistory} attributed to the requested UID,
* moving any {@link NetworkStats#TAG_NONE} series to
* {@link TrafficStats#UID_REMOVED}.
+ * @hide
*/
public void removeUids(int[] uids) {
final ArrayList<Key> knownKeys = new ArrayList<>();
@@ -665,10 +703,11 @@
private ArrayList<Key> getSortedKeys() {
final ArrayList<Key> keys = new ArrayList<>();
keys.addAll(mStats.keySet());
- Collections.sort(keys);
+ Collections.sort(keys, (left, right) -> Key.compare(left, right));
return keys;
}
+ /** @hide */
public void dump(IndentingPrintWriter pw) {
for (Key key : getSortedKeys()) {
pw.print("ident="); pw.print(key.ident.toString());
@@ -683,6 +722,7 @@
}
}
+ /** @hide */
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
@@ -706,6 +746,7 @@
proto.end(start);
}
+ /** @hide */
public void dumpCheckin(PrintWriter pw, long start, long end) {
dumpCheckin(pw, start, end, NetworkTemplate.buildTemplateMobileWildcard(), "cell");
dumpCheckin(pw, start, end, NetworkTemplate.buildTemplateWifiWildcard(), "wifi");
@@ -768,16 +809,37 @@
return false;
}
- private static class Key implements Comparable<Key> {
+ /**
+ * the identifier that associate with the {@link NetworkStatsHistory} object to identify
+ * a certain record in the {@link NetworkStatsCollection} object.
+ */
+ public static class Key {
+ /** @hide */
public final NetworkIdentitySet ident;
+ /** @hide */
public final int uid;
+ /** @hide */
public final int set;
+ /** @hide */
public final int tag;
private final int mHashCode;
- Key(NetworkIdentitySet ident, int uid, int set, int tag) {
- this.ident = ident;
+ /**
+ * Construct a {@link Key} object.
+ *
+ * @param ident a Set of {@link NetworkIdentity} that associated with the record.
+ * @param uid Uid of the record.
+ * @param set Set of the record, see {@code NetworkStats#SET_*}.
+ * @param tag Tag of the record, see {@link TrafficStats#setThreadStatsTag(int)}.
+ */
+ public Key(@NonNull Set<NetworkIdentity> ident, int uid, int set, int tag) {
+ this(new NetworkIdentitySet(Objects.requireNonNull(ident)), uid, set, tag);
+ }
+
+ /** @hide */
+ public Key(@NonNull NetworkIdentitySet ident, int uid, int set, int tag) {
+ this.ident = Objects.requireNonNull(ident);
this.uid = uid;
this.set = set;
this.tag = tag;
@@ -790,7 +852,7 @@
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(@Nullable Object obj) {
if (obj instanceof Key) {
final Key key = (Key) obj;
return uid == key.uid && set == key.set && tag == key.tag
@@ -799,20 +861,22 @@
return false;
}
- @Override
- public int compareTo(Key another) {
+ /** @hide */
+ public static int compare(@NonNull Key left, @NonNull Key right) {
+ Objects.requireNonNull(left);
+ Objects.requireNonNull(right);
int res = 0;
- if (ident != null && another.ident != null) {
- res = ident.compareTo(another.ident);
+ if (left.ident != null && right.ident != null) {
+ res = NetworkIdentitySet.compare(left.ident, right.ident);
}
if (res == 0) {
- res = Integer.compare(uid, another.uid);
+ res = Integer.compare(left.uid, right.uid);
}
if (res == 0) {
- res = Integer.compare(set, another.set);
+ res = Integer.compare(left.set, right.set);
}
if (res == 0) {
- res = Integer.compare(tag, another.tag);
+ res = Integer.compare(left.tag, right.tag);
}
return res;
}
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java
index 428bc6d..78c1370 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java
@@ -16,6 +16,7 @@
package android.net;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import static android.net.NetworkStats.IFACE_ALL;
import static android.net.NetworkStats.SET_DEFAULT;
import static android.net.NetworkStats.TAG_NONE;
@@ -30,6 +31,8 @@
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Parcel;
@@ -50,7 +53,9 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.ProtocolException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Random;
/**
@@ -64,18 +69,25 @@
*
* @hide
*/
-public class NetworkStatsHistory implements Parcelable {
+@SystemApi(client = MODULE_LIBRARIES)
+public final class NetworkStatsHistory implements Parcelable {
private static final int VERSION_INIT = 1;
private static final int VERSION_ADD_PACKETS = 2;
private static final int VERSION_ADD_ACTIVE = 3;
+ /** @hide */
public static final int FIELD_ACTIVE_TIME = 0x01;
+ /** @hide */
public static final int FIELD_RX_BYTES = 0x02;
+ /** @hide */
public static final int FIELD_RX_PACKETS = 0x04;
+ /** @hide */
public static final int FIELD_TX_BYTES = 0x08;
+ /** @hide */
public static final int FIELD_TX_PACKETS = 0x10;
+ /** @hide */
public static final int FIELD_OPERATIONS = 0x20;
-
+ /** @hide */
public static final int FIELD_ALL = 0xFFFFFFFF;
private long bucketDuration;
@@ -89,34 +101,171 @@
private long[] operations;
private long totalBytes;
- public static class Entry {
- public static final long UNKNOWN = -1;
-
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
- public long bucketDuration;
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
- public long bucketStart;
- public long activeTime;
- @UnsupportedAppUsage
- public long rxBytes;
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
- public long rxPackets;
- @UnsupportedAppUsage
- public long txBytes;
- @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
- public long txPackets;
- public long operations;
+ /** @hide */
+ public NetworkStatsHistory(long bucketDuration, long[] bucketStart, long[] activeTime,
+ long[] rxBytes, long[] rxPackets, long[] txBytes, long[] txPackets,
+ long[] operations, int bucketCount, long totalBytes) {
+ this.bucketDuration = bucketDuration;
+ this.bucketStart = bucketStart;
+ this.activeTime = activeTime;
+ this.rxBytes = rxBytes;
+ this.rxPackets = rxPackets;
+ this.txBytes = txBytes;
+ this.txPackets = txPackets;
+ this.operations = operations;
+ this.bucketCount = bucketCount;
+ this.totalBytes = totalBytes;
}
+ /**
+ * An instance to represent a single record in a {@link NetworkStatsHistory} object.
+ */
+ public static final class Entry {
+ /** @hide */
+ public static final long UNKNOWN = -1;
+
+ /** @hide */
+ // TODO: Migrate all callers to get duration from the history object and remove this field.
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+ public long bucketDuration;
+ /** @hide */
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+ public long bucketStart;
+ /** @hide */
+ public long activeTime;
+ /** @hide */
+ @UnsupportedAppUsage
+ public long rxBytes;
+ /** @hide */
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+ public long rxPackets;
+ /** @hide */
+ @UnsupportedAppUsage
+ public long txBytes;
+ /** @hide */
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+ public long txPackets;
+ /** @hide */
+ public long operations;
+ /** @hide */
+ Entry() {}
+
+ /**
+ * Construct a {@link Entry} instance to represent a single record in a
+ * {@link NetworkStatsHistory} object.
+ *
+ * @param bucketStart Start of period for this {@link Entry}, in milliseconds since the
+ * Unix epoch, see {@link java.lang.System#currentTimeMillis}.
+ * @param activeTime Active time for this {@link Entry}, in milliseconds.
+ * @param rxBytes Number of bytes received for this {@link Entry}. Statistics should
+ * represent the contents of IP packets, including IP headers.
+ * @param rxPackets Number of packets received for this {@link Entry}. Statistics should
+ * represent the contents of IP packets, including IP headers.
+ * @param txBytes Number of bytes transmitted for this {@link Entry}. Statistics should
+ * represent the contents of IP packets, including IP headers.
+ * @param txPackets Number of bytes transmitted for this {@link Entry}. Statistics should
+ * represent the contents of IP packets, including IP headers.
+ * @param operations count of network operations performed for this {@link Entry}. This can
+ * be used to derive bytes-per-operation.
+ */
+ public Entry(long bucketStart, long activeTime, long rxBytes,
+ long rxPackets, long txBytes, long txPackets, long operations) {
+ this.bucketStart = bucketStart;
+ this.activeTime = activeTime;
+ this.rxBytes = rxBytes;
+ this.rxPackets = rxPackets;
+ this.txBytes = txBytes;
+ this.txPackets = txPackets;
+ this.operations = operations;
+ }
+
+ /**
+ * Get start timestamp of the bucket's time interval, in milliseconds since the Unix epoch.
+ */
+ public long getBucketStart() {
+ return bucketStart;
+ }
+
+ /**
+ * Get active time of the bucket's time interval, in milliseconds.
+ */
+ public long getActiveTime() {
+ return activeTime;
+ }
+
+ /** Get number of bytes received for this {@link Entry}. */
+ public long getRxBytes() {
+ return rxBytes;
+ }
+
+ /** Get number of packets received for this {@link Entry}. */
+ public long getRxPackets() {
+ return rxPackets;
+ }
+
+ /** Get number of bytes transmitted for this {@link Entry}. */
+ public long getTxBytes() {
+ return txBytes;
+ }
+
+ /** Get number of packets transmitted for this {@link Entry}. */
+ public long getTxPackets() {
+ return txPackets;
+ }
+
+ /** Get count of network operations performed for this {@link Entry}. */
+ public long getOperations() {
+ return operations;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o.getClass() != getClass()) return false;
+ Entry entry = (Entry) o;
+ return bucketStart == entry.bucketStart
+ && activeTime == entry.activeTime && rxBytes == entry.rxBytes
+ && rxPackets == entry.rxPackets && txBytes == entry.txBytes
+ && txPackets == entry.txPackets && operations == entry.operations;
+ }
+
+ @Override
+ public int hashCode() {
+ return (int) (bucketStart * 2
+ + activeTime * 3
+ + rxBytes * 5
+ + rxPackets * 7
+ + txBytes * 11
+ + txPackets * 13
+ + operations * 17);
+ }
+
+ @Override
+ public String toString() {
+ return "Entry{"
+ + "bucketStart=" + bucketStart
+ + ", activeTime=" + activeTime
+ + ", rxBytes=" + rxBytes
+ + ", rxPackets=" + rxPackets
+ + ", txBytes=" + txBytes
+ + ", txPackets=" + txPackets
+ + ", operations=" + operations
+ + "}";
+ }
+ }
+
+ /** @hide */
@UnsupportedAppUsage
public NetworkStatsHistory(long bucketDuration) {
this(bucketDuration, 10, FIELD_ALL);
}
+ /** @hide */
public NetworkStatsHistory(long bucketDuration, int initialSize) {
this(bucketDuration, initialSize, FIELD_ALL);
}
+ /** @hide */
public NetworkStatsHistory(long bucketDuration, int initialSize, int fields) {
this.bucketDuration = bucketDuration;
bucketStart = new long[initialSize];
@@ -130,11 +279,13 @@
totalBytes = 0;
}
+ /** @hide */
public NetworkStatsHistory(NetworkStatsHistory existing, long bucketDuration) {
this(bucketDuration, existing.estimateResizeBuckets(bucketDuration));
recordEntireHistory(existing);
}
+ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public NetworkStatsHistory(Parcel in) {
bucketDuration = in.readLong();
@@ -150,7 +301,7 @@
}
@Override
- public void writeToParcel(Parcel out, int flags) {
+ public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeLong(bucketDuration);
writeLongArray(out, bucketStart, bucketCount);
writeLongArray(out, activeTime, bucketCount);
@@ -162,6 +313,7 @@
out.writeLong(totalBytes);
}
+ /** @hide */
public NetworkStatsHistory(DataInput in) throws IOException {
final int version = in.readInt();
switch (version) {
@@ -204,6 +356,7 @@
}
}
+ /** @hide */
public void writeToStream(DataOutput out) throws IOException {
out.writeInt(VERSION_ADD_ACTIVE);
out.writeLong(bucketDuration);
@@ -221,15 +374,18 @@
return 0;
}
+ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public int size() {
return bucketCount;
}
+ /** @hide */
public long getBucketDuration() {
return bucketDuration;
}
+ /** @hide */
@UnsupportedAppUsage
public long getStart() {
if (bucketCount > 0) {
@@ -239,6 +395,7 @@
}
}
+ /** @hide */
@UnsupportedAppUsage
public long getEnd() {
if (bucketCount > 0) {
@@ -250,6 +407,7 @@
/**
* Return total bytes represented by this history.
+ * @hide
*/
public long getTotalBytes() {
return totalBytes;
@@ -258,6 +416,7 @@
/**
* Return index of bucket that contains or is immediately before the
* requested time.
+ * @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public int getIndexBefore(long time) {
@@ -273,6 +432,7 @@
/**
* Return index of bucket that contains or is immediately after the
* requested time.
+ * @hide
*/
public int getIndexAfter(long time) {
int index = Arrays.binarySearch(bucketStart, 0, bucketCount, time);
@@ -286,6 +446,7 @@
/**
* Return specific stats entry.
+ * @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public Entry getValues(int i, Entry recycle) {
@@ -301,6 +462,23 @@
return entry;
}
+ /**
+ * Get List of {@link Entry} of the {@link NetworkStatsHistory} instance.
+ *
+ * @return
+ */
+ @NonNull
+ public List<Entry> getEntries() {
+ // TODO: Return a wrapper that uses this list instead, to prevent the returned result
+ // from being changed.
+ final ArrayList<Entry> ret = new ArrayList<>(size());
+ for (int i = 0; i < size(); i++) {
+ ret.add(getValues(i, null /* recycle */));
+ }
+ return ret;
+ }
+
+ /** @hide */
public void setValues(int i, Entry entry) {
// Unwind old values
if (rxBytes != null) totalBytes -= rxBytes[i];
@@ -322,6 +500,7 @@
/**
* Record that data traffic occurred in the given time range. Will
* distribute across internal buckets, creating new buckets as needed.
+ * @hide
*/
@Deprecated
public void recordData(long start, long end, long rxBytes, long txBytes) {
@@ -332,6 +511,7 @@
/**
* Record that data traffic occurred in the given time range. Will
* distribute across internal buckets, creating new buckets as needed.
+ * @hide
*/
public void recordData(long start, long end, NetworkStats.Entry entry) {
long rxBytes = entry.rxBytes;
@@ -392,6 +572,7 @@
/**
* Record an entire {@link NetworkStatsHistory} into this history. Usually
* for combining together stats for external reporting.
+ * @hide
*/
@UnsupportedAppUsage
public void recordEntireHistory(NetworkStatsHistory input) {
@@ -402,6 +583,7 @@
* Record given {@link NetworkStatsHistory} into this history, copying only
* buckets that atomically occur in the inclusive time range. Doesn't
* interpolate across partial buckets.
+ * @hide
*/
public void recordHistory(NetworkStatsHistory input, long start, long end) {
final NetworkStats.Entry entry = new NetworkStats.Entry(
@@ -483,6 +665,7 @@
/**
* Clear all data stored in this object.
+ * @hide
*/
public void clear() {
bucketStart = EmptyArray.LONG;
@@ -498,9 +681,10 @@
/**
* Remove buckets older than requested cutoff.
+ * @hide
*/
- @Deprecated
public void removeBucketsBefore(long cutoff) {
+ // TODO: Consider use getIndexBefore.
int i;
for (i = 0; i < bucketCount; i++) {
final long curStart = bucketStart[i];
@@ -522,7 +706,9 @@
if (operations != null) operations = Arrays.copyOfRange(operations, i, length);
bucketCount -= i;
- // TODO: subtract removed values from totalBytes
+ totalBytes = 0;
+ if (rxBytes != null) totalBytes += CollectionUtils.total(rxBytes);
+ if (txBytes != null) totalBytes += CollectionUtils.total(txBytes);
}
}
@@ -536,6 +722,7 @@
* @param start - start of the range, timestamp in milliseconds since the epoch.
* @param end - end of the range, timestamp in milliseconds since the epoch.
* @param recycle - entry instance for performance, could be null.
+ * @hide
*/
@UnsupportedAppUsage
public Entry getValues(long start, long end, Entry recycle) {
@@ -550,6 +737,7 @@
* @param end - end of the range, timestamp in milliseconds since the epoch.
* @param now - current timestamp in milliseconds since the epoch (wall clock).
* @param recycle - entry instance for performance, could be null.
+ * @hide
*/
@UnsupportedAppUsage
public Entry getValues(long start, long end, long now, Entry recycle) {
@@ -613,6 +801,7 @@
/**
* @deprecated only for temporary testing
+ * @hide
*/
@Deprecated
public void generateRandom(long start, long end, long bytes) {
@@ -631,6 +820,7 @@
/**
* @deprecated only for temporary testing
+ * @hide
*/
@Deprecated
public void generateRandom(long start, long end, long rxBytes, long rxPackets, long txBytes,
@@ -660,12 +850,14 @@
}
}
+ /** @hide */
public static long randomLong(Random r, long start, long end) {
return (long) (start + (r.nextFloat() * (end - start)));
}
/**
* Quickly determine if this history intersects with given window.
+ * @hide
*/
public boolean intersects(long start, long end) {
final long dataStart = getStart();
@@ -677,6 +869,7 @@
return false;
}
+ /** @hide */
public void dump(IndentingPrintWriter pw, boolean fullHistory) {
pw.print("NetworkStatsHistory: bucketDuration=");
pw.println(bucketDuration / SECOND_IN_MILLIS);
@@ -700,6 +893,7 @@
pw.decreaseIndent();
}
+ /** @hide */
public void dumpCheckin(PrintWriter pw) {
pw.print("d,");
pw.print(bucketDuration / SECOND_IN_MILLIS);
@@ -717,6 +911,7 @@
}
}
+ /** @hide */
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
@@ -776,6 +971,7 @@
if (array != null) array[i] += value;
}
+ /** @hide */
public int estimateResizeBuckets(long newBucketDuration) {
return (int) (size() * getBucketDuration() / newBucketDuration);
}
@@ -783,6 +979,7 @@
/**
* Utility methods for interacting with {@link DataInputStream} and
* {@link DataOutputStream}, mostly dealing with writing partial arrays.
+ * @hide
*/
public static class DataStreamUtils {
@Deprecated
@@ -857,6 +1054,7 @@
/**
* Utility methods for interacting with {@link Parcel} structures, mostly
* dealing with writing partial arrays.
+ * @hide
*/
public static class ParcelUtils {
public static long[] readLongArray(Parcel in) {
@@ -884,4 +1082,80 @@
}
}
+ /**
+ * Builder class for {@link NetworkStatsHistory}.
+ */
+ public static final class Builder {
+ private final long mBucketDuration;
+ private final List<Long> mBucketStart;
+ private final List<Long> mActiveTime;
+ private final List<Long> mRxBytes;
+ private final List<Long> mRxPackets;
+ private final List<Long> mTxBytes;
+ private final List<Long> mTxPackets;
+ private final List<Long> mOperations;
+
+ /**
+ * Creates a new Builder with given bucket duration and initial capacity to construct
+ * {@link NetworkStatsHistory} objects.
+ *
+ * @param bucketDuration Duration of the buckets of the object, in milliseconds.
+ * @param initialCapacity Estimated number of records.
+ */
+ public Builder(long bucketDuration, int initialCapacity) {
+ mBucketDuration = bucketDuration;
+ mBucketStart = new ArrayList<>(initialCapacity);
+ mActiveTime = new ArrayList<>(initialCapacity);
+ mRxBytes = new ArrayList<>(initialCapacity);
+ mRxPackets = new ArrayList<>(initialCapacity);
+ mTxBytes = new ArrayList<>(initialCapacity);
+ mTxPackets = new ArrayList<>(initialCapacity);
+ mOperations = new ArrayList<>(initialCapacity);
+ }
+
+ /**
+ * Add an {@link Entry} into the {@link NetworkStatsHistory} instance.
+ *
+ * @param entry The target {@link Entry} object.
+ * @return The builder object.
+ */
+ @NonNull
+ public Builder addEntry(@NonNull Entry entry) {
+ mBucketStart.add(entry.bucketStart);
+ mActiveTime.add(entry.activeTime);
+ mRxBytes.add(entry.rxBytes);
+ mRxPackets.add(entry.rxPackets);
+ mTxBytes.add(entry.txBytes);
+ mTxPackets.add(entry.txPackets);
+ mOperations.add(entry.operations);
+ return this;
+ }
+
+ private static long sum(@NonNull List<Long> list) {
+ long sum = 0;
+ for (long entry : list) {
+ sum += entry;
+ }
+ return sum;
+ }
+
+ /**
+ * Builds the instance of the {@link NetworkStatsHistory}.
+ *
+ * @return the built instance of {@link NetworkStatsHistory}.
+ */
+ @NonNull
+ public NetworkStatsHistory build() {
+ return new NetworkStatsHistory(mBucketDuration,
+ CollectionUtils.toLongArray(mBucketStart),
+ CollectionUtils.toLongArray(mActiveTime),
+ CollectionUtils.toLongArray(mRxBytes),
+ CollectionUtils.toLongArray(mRxPackets),
+ CollectionUtils.toLongArray(mTxBytes),
+ CollectionUtils.toLongArray(mTxPackets),
+ CollectionUtils.toLongArray(mOperations),
+ mBucketStart.size(),
+ sum(mRxBytes) + sum(mTxBytes));
+ }
+ }
}
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java
index e9084b0..cad8075 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java
@@ -263,7 +263,7 @@
* Template to match {@link ConnectivityManager#TYPE_WIFI} networks with the
* given key of the wifi network.
*
- * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()}
+ * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key.
* @hide
*/
@@ -283,7 +283,7 @@
* Call with {@link #WIFI_NETWORK_KEY_ALL} for {@code wifiNetworkKey} to get result regardless
* of key of the wifi network.
*
- * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()}
+ * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key.
* @param subscriberId the IMSI associated to this wifi network.
*
@@ -364,7 +364,7 @@
private final int mMetered;
private final int mRoaming;
private final int mDefaultNetwork;
- private final int mSubType;
+ private final int mRatType;
/**
* The subscriber Id match rule defines how the template should match networks with
* specific subscriberId(s). See NetworkTemplate#SUBSCRIBER_ID_MATCH_RULE_* for more detail.
@@ -413,18 +413,18 @@
/** @hide */
// TODO: Remove it after updating all of the caller.
public NetworkTemplate(int matchRule, String subscriberId, String[] matchSubscriberIds,
- String wifiNetworkKey, int metered, int roaming, int defaultNetwork, int subType,
+ String wifiNetworkKey, int metered, int roaming, int defaultNetwork, int ratType,
int oemManaged) {
this(matchRule, subscriberId, matchSubscriberIds,
wifiNetworkKey != null ? new String[] { wifiNetworkKey } : new String[0],
- metered, roaming, defaultNetwork, subType, oemManaged,
+ metered, roaming, defaultNetwork, ratType, oemManaged,
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
/** @hide */
public NetworkTemplate(int matchRule, String subscriberId, String[] matchSubscriberIds,
String[] matchWifiNetworkKeys, int metered, int roaming,
- int defaultNetwork, int subType, int oemManaged, int subscriberIdMatchRule) {
+ int defaultNetwork, int ratType, int oemManaged, int subscriberIdMatchRule) {
Objects.requireNonNull(matchWifiNetworkKeys);
mMatchRule = matchRule;
mSubscriberId = subscriberId;
@@ -435,7 +435,7 @@
mMetered = metered;
mRoaming = roaming;
mDefaultNetwork = defaultNetwork;
- mSubType = subType;
+ mRatType = ratType;
mOemManaged = oemManaged;
mSubscriberIdMatchRule = subscriberIdMatchRule;
checkValidSubscriberIdMatchRule(matchRule, subscriberIdMatchRule);
@@ -453,7 +453,7 @@
mMetered = in.readInt();
mRoaming = in.readInt();
mDefaultNetwork = in.readInt();
- mSubType = in.readInt();
+ mRatType = in.readInt();
mOemManaged = in.readInt();
mSubscriberIdMatchRule = in.readInt();
}
@@ -467,7 +467,7 @@
dest.writeInt(mMetered);
dest.writeInt(mRoaming);
dest.writeInt(mDefaultNetwork);
- dest.writeInt(mSubType);
+ dest.writeInt(mRatType);
dest.writeInt(mOemManaged);
dest.writeInt(mSubscriberIdMatchRule);
}
@@ -500,8 +500,8 @@
builder.append(", defaultNetwork=").append(NetworkStats.defaultNetworkToString(
mDefaultNetwork));
}
- if (mSubType != NETWORK_TYPE_ALL) {
- builder.append(", subType=").append(mSubType);
+ if (mRatType != NETWORK_TYPE_ALL) {
+ builder.append(", ratType=").append(mRatType);
}
if (mOemManaged != OEM_MANAGED_ALL) {
builder.append(", oemManaged=").append(getOemManagedNames(mOemManaged));
@@ -514,7 +514,7 @@
@Override
public int hashCode() {
return Objects.hash(mMatchRule, mSubscriberId, Arrays.hashCode(mMatchWifiNetworkKeys),
- mMetered, mRoaming, mDefaultNetwork, mSubType, mOemManaged, mSubscriberIdMatchRule);
+ mMetered, mRoaming, mDefaultNetwork, mRatType, mOemManaged, mSubscriberIdMatchRule);
}
@Override
@@ -526,7 +526,7 @@
&& mMetered == other.mMetered
&& mRoaming == other.mRoaming
&& mDefaultNetwork == other.mDefaultNetwork
- && mSubType == other.mSubType
+ && mRatType == other.mRatType
&& mOemManaged == other.mOemManaged
&& mSubscriberIdMatchRule == other.mSubscriberIdMatchRule
&& Arrays.equals(mMatchWifiNetworkKeys, other.mMatchWifiNetworkKeys);
@@ -593,7 +593,7 @@
/**
* Get the set of Wifi Network Keys of the template.
- * See {@link WifiInfo#getCurrentNetworkKey()}.
+ * See {@link WifiInfo#getNetworkKey()}.
*/
@NonNull
public Set<String> getWifiNetworkKeys() {
@@ -635,7 +635,7 @@
* Get the Radio Access Technology(RAT) type filter of the template.
*/
public int getRatType() {
- return mSubType;
+ return mRatType;
}
/**
@@ -708,8 +708,8 @@
}
private boolean matchesCollapsedRatType(NetworkIdentity ident) {
- return mSubType == NETWORK_TYPE_ALL
- || getCollapsedRatType(mSubType) == getCollapsedRatType(ident.mSubType);
+ return mRatType == NETWORK_TYPE_ALL
+ || getCollapsedRatType(mRatType) == getCollapsedRatType(ident.mRatType);
}
/**
@@ -729,7 +729,7 @@
* Returns true when the key matches, or when {@code mMatchWifiNetworkKeys} is
* empty.
*
- * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()}
+ * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key.
*/
private boolean matchesWifiNetworkKey(@NonNull String wifiNetworkKey) {
@@ -837,7 +837,7 @@
switch (ident.mType) {
case TYPE_WIFI:
return matchesSubscriberId(ident.mSubscriberId)
- && matchesWifiNetworkKey(ident.mNetworkId);
+ && matchesWifiNetworkKey(ident.mWifiNetworkKey);
default:
return false;
}
@@ -1059,9 +1059,9 @@
* the intention of matching any Wifi Network Key.
*
* @param wifiNetworkKeys the list of Wifi Network Key,
- * see {@link WifiInfo#getCurrentNetworkKey()}.
+ * see {@link WifiInfo#getNetworkKey()}.
* Or an empty list to match all networks.
- * Note that {@code getCurrentNetworkKey()} might get null key
+ * Note that {@code getNetworkKey()} might get null key
* when wifi disconnects. However, the caller should never invoke
* this function with a null Wifi Network Key since such statistics
* never exists.
diff --git a/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java b/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java
index 1af32bf..c803a72 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java
@@ -17,7 +17,6 @@
package android.net;
import android.annotation.NonNull;
-import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.TestApi;
@@ -27,8 +26,8 @@
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.media.MediaPlayer;
+import android.os.Binder;
import android.os.Build;
-import android.os.IBinder;
import android.os.RemoteException;
import com.android.server.NetworkManagementSocketTagger;
@@ -37,8 +36,6 @@
import java.io.FileDescriptor;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.DatagramSocket;
import java.net.Socket;
import java.net.SocketException;
@@ -177,25 +174,12 @@
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
private synchronized static INetworkStatsService getStatsService() {
if (sStatsService == null) {
- sStatsService = getStatsBinder();
+ throw new IllegalStateException("TrafficStats not initialized, uid="
+ + Binder.getCallingUid());
}
return sStatsService;
}
- @Nullable
- private static INetworkStatsService getStatsBinder() {
- try {
- final Method getServiceMethod = Class.forName("android.os.ServiceManager")
- .getDeclaredMethod("getService", new Class[]{String.class});
- final IBinder binder = (IBinder) getServiceMethod.invoke(
- null, Context.NETWORK_STATS_SERVICE);
- return INetworkStatsService.Stub.asInterface(binder);
- } catch (NoSuchMethodException | ClassNotFoundException | IllegalAccessException
- | InvocationTargetException e) {
- throw new NullPointerException("Cannot get INetworkStatsService: " + e);
- }
- }
-
/**
* Snapshot of {@link NetworkStats} when the currently active profiling
* session started, or {@code null} if no session active.
@@ -210,6 +194,26 @@
private static final String LOOPBACK_IFACE = "lo";
/**
+ * Initialization {@link TrafficStats} with the context, to
+ * allow {@link TrafficStats} to fetch the needed binder.
+ *
+ * @param context a long-lived context, such as the application context or system
+ * server context.
+ * @hide
+ */
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+ @SuppressLint("VisiblySynchronized")
+ public static synchronized void init(@NonNull final Context context) {
+ if (sStatsService != null) {
+ throw new IllegalStateException("TrafficStats is already initialized, uid="
+ + Binder.getCallingUid());
+ }
+ final NetworkStatsManager statsManager =
+ context.getSystemService(NetworkStatsManager.class);
+ sStatsService = statsManager.getBinder();
+ }
+
+ /**
* Set active tag to use when accounting {@link Socket} traffic originating
* from the current thread. Only one active tag per thread is supported.
* <p>
diff --git a/packages/ConnectivityT/service/Android.bp b/packages/ConnectivityT/service/Android.bp
index b261e16..36dd200 100644
--- a/packages/ConnectivityT/service/Android.bp
+++ b/packages/ConnectivityT/service/Android.bp
@@ -66,6 +66,7 @@
filegroup {
name: "services.connectivity-ethernet-sources",
srcs: [
+ "src/com/android/server/net/DelayedDiskWrite.java",
"src/com/android/server/net/IpConfigStore.java",
],
path: "src",
diff --git a/services/core/java/com/android/server/net/DelayedDiskWrite.java b/packages/ConnectivityT/service/src/com/android/server/net/DelayedDiskWrite.java
similarity index 82%
rename from services/core/java/com/android/server/net/DelayedDiskWrite.java
rename to packages/ConnectivityT/service/src/com/android/server/net/DelayedDiskWrite.java
index 8f09eb7..35dc455 100644
--- a/services/core/java/com/android/server/net/DelayedDiskWrite.java
+++ b/packages/ConnectivityT/service/src/com/android/server/net/DelayedDiskWrite.java
@@ -26,21 +26,37 @@
import java.io.FileOutputStream;
import java.io.IOException;
+/**
+ * This class provides APIs to do a delayed data write to a given {@link OutputStream}.
+ */
public class DelayedDiskWrite {
+ private static final String TAG = "DelayedDiskWrite";
+
private HandlerThread mDiskWriteHandlerThread;
private Handler mDiskWriteHandler;
/* Tracks multiple writes on the same thread */
private int mWriteSequence = 0;
- private final String TAG = "DelayedDiskWrite";
+ /**
+ * Used to do a delayed data write to a given {@link OutputStream}.
+ */
public interface Writer {
- public void onWriteCalled(DataOutputStream out) throws IOException;
+ /**
+ * write data to a given {@link OutputStream}.
+ */
+ void onWriteCalled(DataOutputStream out) throws IOException;
}
+ /**
+ * Do a delayed data write to a given output stream opened from filePath.
+ */
public void write(final String filePath, final Writer w) {
write(filePath, w, true);
}
+ /**
+ * Do a delayed data write to a given output stream opened from filePath.
+ */
public void write(final String filePath, final Writer w, final boolean open) {
if (TextUtils.isEmpty(filePath)) {
throw new IllegalArgumentException("empty file path");
@@ -77,7 +93,7 @@
if (out != null) {
try {
out.close();
- } catch (Exception e) {}
+ } catch (Exception e) { }
}
// Quit if no more writes sent
diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
index 0abc523..1105de3 100644
--- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
+++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
@@ -19,12 +19,16 @@
import static android.Manifest.permission.NETWORK_STATS_PROVIDER;
import static android.Manifest.permission.READ_NETWORK_USAGE_HISTORY;
import static android.Manifest.permission.UPDATE_DEVICE_STATS;
+import static android.app.usage.NetworkStatsManager.PREFIX_DEV;
+import static android.app.usage.NetworkStatsManager.PREFIX_UID;
+import static android.app.usage.NetworkStatsManager.PREFIX_UID_TAG;
+import static android.app.usage.NetworkStatsManager.PREFIX_XT;
import static android.content.Intent.ACTION_SHUTDOWN;
import static android.content.Intent.ACTION_UID_REMOVED;
import static android.content.Intent.ACTION_USER_REMOVED;
import static android.content.Intent.EXTRA_UID;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-import static android.net.NetworkIdentity.SUBTYPE_COMBINED;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
import static android.net.NetworkStats.IFACE_ALL;
import static android.net.NetworkStats.IFACE_VT;
@@ -47,23 +51,6 @@
import static android.net.TrafficStats.UID_TETHERING;
import static android.net.TrafficStats.UNSUPPORTED;
import static android.os.Trace.TRACE_TAG_NETWORK;
-import static android.provider.Settings.Global.NETSTATS_AUGMENT_ENABLED;
-import static android.provider.Settings.Global.NETSTATS_COMBINE_SUBTYPE_ENABLED;
-import static android.provider.Settings.Global.NETSTATS_DEV_BUCKET_DURATION;
-import static android.provider.Settings.Global.NETSTATS_DEV_DELETE_AGE;
-import static android.provider.Settings.Global.NETSTATS_DEV_PERSIST_BYTES;
-import static android.provider.Settings.Global.NETSTATS_DEV_ROTATE_AGE;
-import static android.provider.Settings.Global.NETSTATS_GLOBAL_ALERT_BYTES;
-import static android.provider.Settings.Global.NETSTATS_POLL_INTERVAL;
-import static android.provider.Settings.Global.NETSTATS_SAMPLE_ENABLED;
-import static android.provider.Settings.Global.NETSTATS_UID_BUCKET_DURATION;
-import static android.provider.Settings.Global.NETSTATS_UID_DELETE_AGE;
-import static android.provider.Settings.Global.NETSTATS_UID_PERSIST_BYTES;
-import static android.provider.Settings.Global.NETSTATS_UID_ROTATE_AGE;
-import static android.provider.Settings.Global.NETSTATS_UID_TAG_BUCKET_DURATION;
-import static android.provider.Settings.Global.NETSTATS_UID_TAG_DELETE_AGE;
-import static android.provider.Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES;
-import static android.provider.Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE;
import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
import static android.text.format.DateUtils.DAY_IN_MILLIS;
import static android.text.format.DateUtils.HOUR_IN_MILLIS;
@@ -119,7 +106,6 @@
import android.os.DropBoxManager;
import android.os.Environment;
import android.os.Handler;
-import android.os.HandlerExecutor;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.Looper;
@@ -154,6 +140,7 @@
import com.android.net.module.util.BestClock;
import com.android.net.module.util.BinderUtils;
import com.android.net.module.util.CollectionUtils;
+import com.android.net.module.util.LocationPermissionChecker;
import com.android.net.module.util.NetworkStatsUtils;
import com.android.net.module.util.PermissionUtils;
@@ -216,6 +203,10 @@
private static final int LOG_TAG_NETSTATS_MOBILE_SAMPLE = 51100;
private static final int LOG_TAG_NETSTATS_WIFI_SAMPLE = 51101;
+ // TODO: Replace the hardcoded string and move it into ConnectivitySettingsManager.
+ private static final String NETSTATS_COMBINE_SUBTYPE_ENABLED =
+ "netstats_combine_subtype_enabled";
+
private final Context mContext;
private final NetworkStatsFactory mStatsFactory;
private final AlarmManager mAlarmManager;
@@ -242,11 +233,6 @@
private PendingIntent mPollIntent;
- private static final String PREFIX_DEV = "dev";
- private static final String PREFIX_XT = "xt";
- private static final String PREFIX_UID = "uid";
- private static final String PREFIX_UID_TAG = "uid_tag";
-
/**
* Settings that can be changed externally.
*/
@@ -256,9 +242,9 @@
boolean getSampleEnabled();
boolean getAugmentEnabled();
/**
- * When enabled, all mobile data is reported under {@link NetworkIdentity#SUBTYPE_COMBINED}.
- * When disabled, mobile data is broken down by a granular subtype representative of the
- * actual subtype. {@see NetworkTemplate#getCollapsedRatType}.
+ * When enabled, all mobile data is reported under {@link NetworkTemplate#NETWORK_TYPE_ALL}.
+ * When disabled, mobile data is broken down by a granular ratType representative of the
+ * actual ratType. {@see NetworkTemplate#getCollapsedRatType}.
* Enabling this decreases the level of detail but saves performance, disk space and
* amount of data logged.
*/
@@ -305,6 +291,9 @@
/** Set of any ifaces associated with mobile networks since boot. */
private volatile String[] mMobileIfaces = new String[0];
+ /** Set of any ifaces associated with wifi networks since boot. */
+ private volatile String[] mWifiIfaces = new String[0];
+
/** Set of all ifaces currently used by traffic that does not explicitly specify a Network. */
@GuardedBy("mStatsLock")
private Network[] mDefaultNetworks = new Network[0];
@@ -365,6 +354,9 @@
@NonNull
private final NetworkStatsSubscriptionsMonitor mNetworkStatsSubscriptionsMonitor;
+ @NonNull
+ private final LocationPermissionChecker mLocationPermissionChecker;
+
private static @NonNull File getDefaultSystemDir() {
return new File(Environment.getDataDirectory(), "system");
}
@@ -427,7 +419,7 @@
final NetworkStatsService service = new NetworkStatsService(context,
INetd.Stub.asInterface((IBinder) context.getSystemService(Context.NETD_SERVICE)),
alarmManager, wakeLock, getDefaultClock(),
- new DefaultNetworkStatsSettings(context), new NetworkStatsFactory(netd),
+ new DefaultNetworkStatsSettings(), new NetworkStatsFactory(netd),
new NetworkStatsObservers(), getDefaultSystemDir(), getDefaultBaseDir(),
new Dependencies());
@@ -457,10 +449,11 @@
handlerThread.start();
mHandler = new NetworkStatsHandler(handlerThread.getLooper());
mNetworkStatsSubscriptionsMonitor = deps.makeSubscriptionsMonitor(mContext,
- new HandlerExecutor(mHandler), this);
+ (command) -> mHandler.post(command) , this);
mContentResolver = mContext.getContentResolver();
mContentObserver = mDeps.makeContentObserver(mHandler, mSettings,
mNetworkStatsSubscriptionsMonitor);
+ mLocationPermissionChecker = mDeps.makeLocationPermissionChecker(mContext);
}
/**
@@ -508,6 +501,13 @@
}
};
}
+
+ /**
+ * @see LocationPermissionChecker
+ */
+ public LocationPermissionChecker makeLocationPermissionChecker(final Context context) {
+ return new LocationPermissionChecker(context);
+ }
}
/**
@@ -556,7 +556,7 @@
// watch for tethering changes
final TetheringManager tetheringManager = mContext.getSystemService(TetheringManager.class);
tetheringManager.registerTetheringEventCallback(
- new HandlerExecutor(mHandler), mTetherListener);
+ (command) -> mHandler.post(command), mTetherListener);
// listen for periodic polling events
final IntentFilter pollFilter = new IntentFilter(ACTION_NETWORK_STATS_POLL);
@@ -590,13 +590,13 @@
mSettings.getPollInterval(), pollIntent);
mContentResolver.registerContentObserver(Settings.Global
- .getUriFor(Settings.Global.NETSTATS_COMBINE_SUBTYPE_ENABLED),
+ .getUriFor(NETSTATS_COMBINE_SUBTYPE_ENABLED),
false /* notifyForDescendants */, mContentObserver);
// Post a runnable on handler thread to call onChange(). It's for getting current value of
// NETSTATS_COMBINE_SUBTYPE_ENABLED to decide start or stop monitoring RAT type changes.
mHandler.post(() -> mContentObserver.onChange(false, Settings.Global
- .getUriFor(Settings.Global.NETSTATS_COMBINE_SUBTYPE_ENABLED)));
+ .getUriFor(NETSTATS_COMBINE_SUBTYPE_ENABLED)));
registerGlobalAlert();
}
@@ -773,6 +773,7 @@
@Override
public NetworkStats getDeviceSummaryForNetwork(
NetworkTemplate template, long start, long end) {
+ enforceTemplatePermissions(template, callingPackage);
return internalGetSummaryForNetwork(template, restrictedFlags, start, end,
mAccessLevel, mCallingUid);
}
@@ -780,19 +781,33 @@
@Override
public NetworkStats getSummaryForNetwork(
NetworkTemplate template, long start, long end) {
+ enforceTemplatePermissions(template, callingPackage);
return internalGetSummaryForNetwork(template, restrictedFlags, start, end,
mAccessLevel, mCallingUid);
}
+ // TODO: Remove this after all callers are removed.
@Override
public NetworkStatsHistory getHistoryForNetwork(NetworkTemplate template, int fields) {
+ enforceTemplatePermissions(template, callingPackage);
return internalGetHistoryForNetwork(template, restrictedFlags, fields,
- mAccessLevel, mCallingUid);
+ mAccessLevel, mCallingUid, Long.MIN_VALUE, Long.MAX_VALUE);
+ }
+
+ @Override
+ public NetworkStatsHistory getHistoryIntervalForNetwork(NetworkTemplate template,
+ int fields, long start, long end) {
+ enforceTemplatePermissions(template, callingPackage);
+ // TODO(b/200768422): Redact returned history if the template is location
+ // sensitive but the caller is not privileged.
+ return internalGetHistoryForNetwork(template, restrictedFlags, fields,
+ mAccessLevel, mCallingUid, start, end);
}
@Override
public NetworkStats getSummaryForAllUid(
NetworkTemplate template, long start, long end, boolean includeTags) {
+ enforceTemplatePermissions(template, callingPackage);
try {
final NetworkStats stats = getUidComplete()
.getSummary(template, start, end, mAccessLevel, mCallingUid);
@@ -810,6 +825,7 @@
@Override
public NetworkStats getTaggedSummaryForAllUid(
NetworkTemplate template, long start, long end) {
+ enforceTemplatePermissions(template, callingPackage);
try {
final NetworkStats tagStats = getUidTagComplete()
.getSummary(template, start, end, mAccessLevel, mCallingUid);
@@ -822,6 +838,7 @@
@Override
public NetworkStatsHistory getHistoryForUid(
NetworkTemplate template, int uid, int set, int tag, int fields) {
+ enforceTemplatePermissions(template, callingPackage);
// NOTE: We don't augment UID-level statistics
if (tag == TAG_NONE) {
return getUidComplete().getHistory(template, null, uid, set, tag, fields,
@@ -836,6 +853,9 @@
public NetworkStatsHistory getHistoryIntervalForUid(
NetworkTemplate template, int uid, int set, int tag, int fields,
long start, long end) {
+ enforceTemplatePermissions(template, callingPackage);
+ // TODO(b/200768422): Redact returned history if the template is location
+ // sensitive but the caller is not privileged.
// NOTE: We don't augment UID-level statistics
if (tag == TAG_NONE) {
return getUidComplete().getHistory(template, null, uid, set, tag, fields,
@@ -857,6 +877,26 @@
};
}
+ private void enforceTemplatePermissions(@NonNull NetworkTemplate template,
+ @NonNull String callingPackage) {
+ // For a template with wifi network keys, it is possible for a malicious
+ // client to track the user locations via querying data usage. Thus, enforce
+ // fine location permission check.
+ if (!template.getWifiNetworkKeys().isEmpty()) {
+ final boolean canAccessFineLocation = mLocationPermissionChecker
+ .checkCallersLocationPermission(callingPackage,
+ null /* featureId */,
+ Binder.getCallingUid(),
+ false /* coarseForTargetSdkLessThanQ */,
+ null /* message */);
+ if (!canAccessFineLocation) {
+ throw new SecurityException("Access fine location is required when querying"
+ + " with wifi network keys, make sure the app has the necessary"
+ + "permissions and the location toggle is on.");
+ }
+ }
+ }
+
private @NetworkStatsAccess.Level int checkAccessLevel(String callingPackage) {
return NetworkStatsAccess.checkAccessLevel(
mContext, Binder.getCallingPid(), Binder.getCallingUid(), callingPackage);
@@ -893,7 +933,7 @@
// We've been using pure XT stats long enough that we no longer need to
// splice DEV and XT together.
final NetworkStatsHistory history = internalGetHistoryForNetwork(template, flags, FIELD_ALL,
- accessLevel, callingUid);
+ accessLevel, callingUid, start, end);
final long now = System.currentTimeMillis();
final NetworkStatsHistory.Entry entry = history.getValues(start, end, now, null);
@@ -910,14 +950,14 @@
* appropriate.
*/
private NetworkStatsHistory internalGetHistoryForNetwork(NetworkTemplate template,
- int flags, int fields, @NetworkStatsAccess.Level int accessLevel, int callingUid) {
+ int flags, int fields, @NetworkStatsAccess.Level int accessLevel, int callingUid,
+ long start, long end) {
// We've been using pure XT stats long enough that we no longer need to
// splice DEV and XT together.
final SubscriptionPlan augmentPlan = resolveSubscriptionPlan(template, flags);
synchronized (mStatsLock) {
return mXtStatsCached.getHistory(template, augmentPlan,
- UID_ALL, SET_ALL, TAG_NONE, fields, Long.MIN_VALUE, Long.MAX_VALUE,
- accessLevel, callingUid);
+ UID_ALL, SET_ALL, TAG_NONE, fields, start, end, accessLevel, callingUid);
}
}
@@ -968,11 +1008,15 @@
}
@Override
- public NetworkStats getDetailedUidStats(String[] requiredIfaces) {
+ public NetworkStats getUidStatsForTransport(int transport) {
enforceAnyPermissionOf(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
try {
+ final String[] relevantIfaces =
+ transport == TRANSPORT_WIFI ? mWifiIfaces : mMobileIfaces;
+ // TODO(b/215633405) : mMobileIfaces and mWifiIfaces already contain the stacked
+ // interfaces, so this is not useful, remove it.
final String[] ifacesToQuery =
- mStatsFactory.augmentWithStackedInterfaces(requiredIfaces);
+ mStatsFactory.augmentWithStackedInterfaces(relevantIfaces);
return getNetworkStatsUidDetail(ifacesToQuery);
} catch (RemoteException e) {
Log.wtf(TAG, "Error compiling UID stats", e);
@@ -1331,16 +1375,18 @@
final boolean combineSubtypeEnabled = mSettings.getCombineSubtypeEnabled();
final ArraySet<String> mobileIfaces = new ArraySet<>();
+ final ArraySet<String> wifiIfaces = new ArraySet<>();
for (NetworkStateSnapshot snapshot : snapshots) {
final int displayTransport =
getDisplayTransport(snapshot.getNetworkCapabilities().getTransportTypes());
final boolean isMobile = (NetworkCapabilities.TRANSPORT_CELLULAR == displayTransport);
+ final boolean isWifi = (NetworkCapabilities.TRANSPORT_WIFI == displayTransport);
final boolean isDefault = CollectionUtils.contains(
mDefaultNetworks, snapshot.getNetwork());
- final int subType = combineSubtypeEnabled ? SUBTYPE_COMBINED
- : getSubTypeForStateSnapshot(snapshot);
+ final int ratType = combineSubtypeEnabled ? NetworkTemplate.NETWORK_TYPE_ALL
+ : getRatTypeForStateSnapshot(snapshot);
final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, snapshot,
- isDefault, subType);
+ isDefault, ratType);
// Traffic occurring on the base interface is always counted for
// both total usage and UID details.
@@ -1355,12 +1401,12 @@
// VT is considered always metered in framework's layer. If VT is not metered
// per carrier's policy, modem will report 0 usage for VT calls.
if (snapshot.getNetworkCapabilities().hasCapability(
- NetworkCapabilities.NET_CAPABILITY_IMS) && !ident.getMetered()) {
+ NetworkCapabilities.NET_CAPABILITY_IMS) && !ident.isMetered()) {
// Copy the identify from IMS one but mark it as metered.
NetworkIdentity vtIdent = new NetworkIdentity(ident.getType(),
- ident.getSubType(), ident.getSubscriberId(), ident.getNetworkId(),
- ident.getRoaming(), true /* metered */,
+ ident.getRatType(), ident.getSubscriberId(), ident.getWifiNetworkKey(),
+ ident.isRoaming(), true /* metered */,
true /* onDefaultNetwork */, ident.getOemManaged());
final String ifaceVt = IFACE_VT + getSubIdForMobile(snapshot);
findOrCreateNetworkIdentitySet(mActiveIfaces, ifaceVt).add(vtIdent);
@@ -1370,6 +1416,9 @@
if (isMobile) {
mobileIfaces.add(baseIface);
}
+ if (isWifi) {
+ wifiIfaces.add(baseIface);
+ }
}
// Traffic occurring on stacked interfaces is usually clatd.
@@ -1411,6 +1460,9 @@
if (isMobile) {
mobileIfaces.add(iface);
}
+ if (isWifi) {
+ wifiIfaces.add(iface);
+ }
mStatsFactory.noteStackedIface(iface, baseIface);
}
@@ -1418,11 +1470,16 @@
}
mMobileIfaces = mobileIfaces.toArray(new String[0]);
+ mWifiIfaces = wifiIfaces.toArray(new String[0]);
// TODO (b/192758557): Remove debug log.
if (CollectionUtils.contains(mMobileIfaces, null)) {
throw new NullPointerException(
"null element in mMobileIfaces: " + Arrays.toString(mMobileIfaces));
}
+ if (CollectionUtils.contains(mWifiIfaces, null)) {
+ throw new NullPointerException(
+ "null element in mWifiIfaces: " + Arrays.toString(mWifiIfaces));
+ }
}
private static int getSubIdForMobile(@NonNull NetworkStateSnapshot state) {
@@ -1440,11 +1497,11 @@
}
/**
- * For networks with {@code TRANSPORT_CELLULAR}, get subType that was obtained through
+ * For networks with {@code TRANSPORT_CELLULAR}, get ratType that was obtained through
* {@link PhoneStateListener}. Otherwise, return 0 given that other networks with different
* transport types do not actually fill this value.
*/
- private int getSubTypeForStateSnapshot(@NonNull NetworkStateSnapshot state) {
+ private int getRatTypeForStateSnapshot(@NonNull NetworkStateSnapshot state) {
if (!state.getNetworkCapabilities().hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
return 0;
}
@@ -2191,24 +2248,11 @@
* {@link android.provider.Settings.Global}.
*/
private static class DefaultNetworkStatsSettings implements NetworkStatsSettings {
- private final ContentResolver mResolver;
-
- public DefaultNetworkStatsSettings(Context context) {
- mResolver = Objects.requireNonNull(context.getContentResolver());
- // TODO: adjust these timings for production builds
- }
-
- private long getGlobalLong(String name, long def) {
- return Settings.Global.getLong(mResolver, name, def);
- }
- private boolean getGlobalBoolean(String name, boolean def) {
- final int defInt = def ? 1 : 0;
- return Settings.Global.getInt(mResolver, name, defInt) != 0;
- }
+ DefaultNetworkStatsSettings() {}
@Override
public long getPollInterval() {
- return getGlobalLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);
+ return 30 * MINUTE_IN_MILLIS;
}
@Override
public long getPollDelay() {
@@ -2216,25 +2260,23 @@
}
@Override
public long getGlobalAlertBytes(long def) {
- return getGlobalLong(NETSTATS_GLOBAL_ALERT_BYTES, def);
+ return def;
}
@Override
public boolean getSampleEnabled() {
- return getGlobalBoolean(NETSTATS_SAMPLE_ENABLED, true);
+ return true;
}
@Override
public boolean getAugmentEnabled() {
- return getGlobalBoolean(NETSTATS_AUGMENT_ENABLED, true);
+ return true;
}
@Override
public boolean getCombineSubtypeEnabled() {
- return getGlobalBoolean(NETSTATS_COMBINE_SUBTYPE_ENABLED, false);
+ return false;
}
@Override
public Config getDevConfig() {
- return new Config(getGlobalLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),
- getGlobalLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),
- getGlobalLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));
+ return new Config(HOUR_IN_MILLIS, 15 * DAY_IN_MILLIS, 90 * DAY_IN_MILLIS);
}
@Override
public Config getXtConfig() {
@@ -2242,31 +2284,27 @@
}
@Override
public Config getUidConfig() {
- return new Config(getGlobalLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
- getGlobalLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),
- getGlobalLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));
+ return new Config(2 * HOUR_IN_MILLIS, 15 * DAY_IN_MILLIS, 90 * DAY_IN_MILLIS);
}
@Override
public Config getUidTagConfig() {
- return new Config(getGlobalLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
- getGlobalLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),
- getGlobalLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));
+ return new Config(2 * HOUR_IN_MILLIS, 5 * DAY_IN_MILLIS, 15 * DAY_IN_MILLIS);
}
@Override
public long getDevPersistBytes(long def) {
- return getGlobalLong(NETSTATS_DEV_PERSIST_BYTES, def);
+ return def;
}
@Override
public long getXtPersistBytes(long def) {
- return getDevPersistBytes(def);
+ return def;
}
@Override
public long getUidPersistBytes(long def) {
- return getGlobalLong(NETSTATS_UID_PERSIST_BYTES, def);
+ return def;
}
@Override
public long getUidTagPersistBytes(long def) {
- return getGlobalLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);
+ return def;
}
}
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index a3eb0ecc..ce58ff6 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -236,7 +236,8 @@
root.flags |= Root.FLAG_REMOVABLE_USB;
}
- if (volume.getType() != VolumeInfo.TYPE_EMULATED) {
+ if (volume.getType() != VolumeInfo.TYPE_EMULATED
+ && volume.getType() != VolumeInfo.TYPE_STUB) {
root.flags |= Root.FLAG_SUPPORTS_EJECT;
}
diff --git a/packages/SettingsLib/res/values/config.xml b/packages/SettingsLib/res/values/config.xml
index 45253bb..b150e01 100644
--- a/packages/SettingsLib/res/values/config.xml
+++ b/packages/SettingsLib/res/values/config.xml
@@ -28,4 +28,9 @@
<!-- Control whether status bar should distinguish HSPA data icon form UMTS
data icon on devices -->
<bool name="config_hspa_data_distinguishable">false</bool>
+
+ <integer-array name="config_supportedDreamComplications">
+ </integer-array>
+ <integer-array name="config_dreamComplicationsEnabledByDefault">
+ </integer-array>
</resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java b/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java
index 5f2bef7..64a0781 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java
@@ -31,9 +31,8 @@
private int mLastDensity;
public InterestingConfigChanges() {
- this(ActivityInfo.CONFIG_LOCALE
- | ActivityInfo.CONFIG_UI_MODE | ActivityInfo.CONFIG_SCREEN_LAYOUT
- | ActivityInfo.CONFIG_ASSETS_PATHS);
+ this(ActivityInfo.CONFIG_LOCALE | ActivityInfo.CONFIG_LAYOUT_DIRECTION
+ | ActivityInfo.CONFIG_UI_MODE | ActivityInfo.CONFIG_ASSETS_PATHS);
}
public InterestingConfigChanges(int flags) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
index 2c862e685..389892e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
@@ -170,18 +170,6 @@
}
@VisibleForTesting
- void registerIntentReceiver() {
- mContext.registerReceiverAsUser(mBroadcastReceiver, mUserHandle, mAdapterIntentFilter,
- null, mReceiverHandler);
- }
-
- @VisibleForTesting
- void registerProfileIntentReceiverForTest() {
- mContext.registerReceiverAsUser(mProfileBroadcastReceiver, mUserHandle,
- mProfileIntentFilter, null, mReceiverHandler);
- }
-
- @VisibleForTesting
void addProfileHandler(String action, Handler handler) {
mHandlerMap.put(action, handler);
mProfileIntentFilter.addAction(action);
diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
index aed2ec1..3c444f2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
@@ -38,6 +38,8 @@
import android.util.Log;
import android.util.Xml;
+import com.android.settingslib.R;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -45,9 +47,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
public class DreamBackend {
private static final String TAG = "DreamBackend";
@@ -78,19 +83,41 @@
@Retention(RetentionPolicy.SOURCE)
@IntDef({WHILE_CHARGING, WHILE_DOCKED, EITHER, NEVER})
- public @interface WhenToDream{}
+ public @interface WhenToDream {}
public static final int WHILE_CHARGING = 0;
public static final int WHILE_DOCKED = 1;
public static final int EITHER = 2;
public static final int NEVER = 3;
+ /**
+ * The type of dream complications which can be provided by a
+ * {@link com.android.systemui.dreams.ComplicationProvider}.
+ */
+ @IntDef(prefix = {"COMPLICATION_TYPE_"}, value = {
+ COMPLICATION_TYPE_TIME,
+ COMPLICATION_TYPE_DATE,
+ COMPLICATION_TYPE_WEATHER,
+ COMPLICATION_TYPE_AIR_QUALITY,
+ COMPLICATION_TYPE_CAST_INFO
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface ComplicationType {}
+
+ public static final int COMPLICATION_TYPE_TIME = 1;
+ public static final int COMPLICATION_TYPE_DATE = 2;
+ public static final int COMPLICATION_TYPE_WEATHER = 3;
+ public static final int COMPLICATION_TYPE_AIR_QUALITY = 4;
+ public static final int COMPLICATION_TYPE_CAST_INFO = 5;
+
private final Context mContext;
private final IDreamManager mDreamManager;
private final DreamInfoComparator mComparator;
private final boolean mDreamsEnabledByDefault;
private final boolean mDreamsActivatedOnSleepByDefault;
private final boolean mDreamsActivatedOnDockByDefault;
+ private final Set<Integer> mSupportedComplications;
+ private final Set<Integer> mDefaultEnabledComplications;
private static DreamBackend sInstance;
@@ -103,17 +130,31 @@
public DreamBackend(Context context) {
mContext = context.getApplicationContext();
+ final Resources resources = mContext.getResources();
+
mDreamManager = IDreamManager.Stub.asInterface(
ServiceManager.getService(DreamService.DREAM_SERVICE));
mComparator = new DreamInfoComparator(getDefaultDream());
- mDreamsEnabledByDefault = mContext.getResources()
- .getBoolean(com.android.internal.R.bool.config_dreamsEnabledByDefault);
- mDreamsActivatedOnSleepByDefault = mContext.getResources()
- .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
- mDreamsActivatedOnDockByDefault = mContext.getResources()
- .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
- mDreamPreviewDefault = mContext.getResources().getDrawable(
+ mDreamsEnabledByDefault = resources.getBoolean(
+ com.android.internal.R.bool.config_dreamsEnabledByDefault);
+ mDreamsActivatedOnSleepByDefault = resources.getBoolean(
+ com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
+ mDreamsActivatedOnDockByDefault = resources.getBoolean(
+ com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
+ mDreamPreviewDefault = resources.getDrawable(
com.android.internal.R.drawable.default_dream_preview);
+
+ mSupportedComplications =
+ Arrays.stream(resources.getIntArray(R.array.config_supportedDreamComplications))
+ .boxed()
+ .collect(Collectors.toSet());
+
+ mDefaultEnabledComplications = Arrays.stream(
+ resources.getIntArray(R.array.config_dreamComplicationsEnabledByDefault))
+ .boxed()
+ // A complication can only be enabled by default if it is also supported.
+ .filter(mSupportedComplications::contains)
+ .collect(Collectors.toSet());
}
public List<DreamInfo> getDreamInfos() {
@@ -242,7 +283,57 @@
default:
break;
}
+ }
+ /** Gets all complications which have been enabled by the user. */
+ public Set<Integer> getEnabledComplications() {
+ final String enabledComplications = Settings.Secure.getString(
+ mContext.getContentResolver(),
+ Settings.Secure.SCREENSAVER_ENABLED_COMPLICATIONS);
+
+ if (enabledComplications == null) {
+ return mDefaultEnabledComplications;
+ }
+
+ return parseFromString(enabledComplications);
+ }
+
+ /** Gets all dream complications which are supported on this device. **/
+ public Set<Integer> getSupportedComplications() {
+ return mSupportedComplications;
+ }
+
+ /**
+ * Enables or disables a particular dream complication.
+ *
+ * @param complicationType The dream complication to be enabled/disabled.
+ * @param value If true, the complication is enabled. Otherwise it is disabled.
+ */
+ public void setComplicationEnabled(@ComplicationType int complicationType, boolean value) {
+ if (!mSupportedComplications.contains(complicationType)) return;
+
+ Set<Integer> enabledComplications = getEnabledComplications();
+ if (value) {
+ enabledComplications.add(complicationType);
+ } else {
+ enabledComplications.remove(complicationType);
+ }
+
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.SCREENSAVER_ENABLED_COMPLICATIONS,
+ convertToString(enabledComplications));
+ }
+
+ private static String convertToString(Set<Integer> set) {
+ return set.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ }
+
+ private static Set<Integer> parseFromString(String string) {
+ return Arrays.stream(string.split(","))
+ .map(Integer::parseInt)
+ .collect(Collectors.toSet());
}
public boolean isEnabled() {
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/NetworkCycleDataLoader.java b/packages/SettingsLib/src/com/android/settingslib/net/NetworkCycleDataLoader.java
index 3e95b01..5e9ac5a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/NetworkCycleDataLoader.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/NetworkCycleDataLoader.java
@@ -16,23 +16,16 @@
package com.android.settingslib.net;
-import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
-import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
-
+import android.annotation.NonNull;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStatsManager;
import android.content.Context;
-import android.net.INetworkStatsService;
-import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
-import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
-import android.net.TrafficStats;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.text.format.DateUtils;
import android.util.Pair;
+import android.util.Range;
import androidx.annotation.VisibleForTesting;
import androidx.loader.content.AsyncTaskLoader;
@@ -52,8 +45,6 @@
protected final NetworkTemplate mNetworkTemplate;
private final NetworkPolicy mPolicy;
private final ArrayList<Long> mCycles;
- @VisibleForTesting
- final INetworkStatsService mNetworkStatsService;
protected NetworkCycleDataLoader(Builder<?> builder) {
super(builder.mContext);
@@ -61,8 +52,6 @@
mCycles = builder.mCycles;
mNetworkStatsManager = (NetworkStatsManager)
builder.mContext.getSystemService(Context.NETWORK_STATS_SERVICE);
- mNetworkStatsService = INetworkStatsService.Stub.asInterface(
- ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
final NetworkPolicyEditor policyEditor =
new NetworkPolicyEditor(NetworkPolicyManager.from(builder.mContext));
policyEditor.read();
@@ -112,23 +101,20 @@
@VisibleForTesting
void loadFourWeeksData() {
+ if (mNetworkTemplate == null) return;
+ final NetworkStats stats = mNetworkStatsManager.queryDetailsForDevice(
+ mNetworkTemplate, Long.MIN_VALUE, Long.MAX_VALUE);
try {
- final INetworkStatsSession networkSession = mNetworkStatsService.openSession();
- final NetworkStatsHistory networkHistory = networkSession.getHistoryForNetwork(
- mNetworkTemplate, FIELD_RX_BYTES | FIELD_TX_BYTES);
- final long historyStart = networkHistory.getStart();
- final long historyEnd = networkHistory.getEnd();
+ final Range<Long> historyTimeRange = getTimeRangeOf(stats);
- long cycleEnd = historyEnd;
- while (cycleEnd > historyStart) {
+ long cycleEnd = historyTimeRange.getUpper();
+ while (cycleEnd > historyTimeRange.getLower()) {
final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4);
recordUsage(cycleStart, cycleEnd);
cycleEnd = cycleStart;
}
-
- TrafficStats.closeQuietly(networkSession);
- } catch (RemoteException e) {
- throw new RuntimeException(e);
+ } catch (IllegalArgumentException e) {
+ // Empty history, ignore.
}
}
@@ -169,6 +155,32 @@
return bytes;
}
+ @NonNull
+ @VisibleForTesting
+ Range getTimeRangeOf(@NonNull NetworkStats stats) {
+ long start = Long.MAX_VALUE;
+ long end = Long.MIN_VALUE;
+ while (hasNextBucket(stats)) {
+ final NetworkStats.Bucket bucket = getNextBucket(stats);
+ start = Math.min(start, bucket.getStartTimeStamp());
+ end = Math.max(end, bucket.getEndTimeStamp());
+ }
+ return new Range(start, end);
+ }
+
+ @VisibleForTesting
+ boolean hasNextBucket(@NonNull NetworkStats stats) {
+ return stats.hasNextBucket();
+ }
+
+ @NonNull
+ @VisibleForTesting
+ NetworkStats.Bucket getNextBucket(@NonNull NetworkStats stats) {
+ NetworkStats.Bucket bucket = new NetworkStats.Bucket();
+ stats.getNextBucket(bucket);
+ return bucket;
+ }
+
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
public ArrayList<Long> getCycles() {
return mCycles;
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
index 1edb7d1..10ccd22 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
@@ -64,7 +64,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -436,7 +435,6 @@
}
@Test
- @Ignore
public void noAppRemoved_noWorkprofile_doResumeIfNeededLocked_shouldNotClearEntries()
throws RemoteException {
// scenario: only owner user
@@ -630,7 +628,6 @@
}
@Test
- @Ignore
public void noAppRemoved_workprofileExists_doResumeIfNeededLocked_shouldNotClearEntries()
throws RemoteException {
if (!MU_ENABLED) {
@@ -711,11 +708,11 @@
throws RemoteException {
if (ownerApps != null) {
- when(mApplicationsState.mIpm.getInstalledApplications(anyInt(), eq(0)))
+ when(mApplicationsState.mIpm.getInstalledApplications(anyLong(), eq(0)))
.thenReturn(new ParceledListSlice<>(ownerApps));
}
if (profileApps != null) {
- when(mApplicationsState.mIpm.getInstalledApplications(anyInt(), eq(PROFILE_USERID)))
+ when(mApplicationsState.mIpm.getInstalledApplications(anyLong(), eq(PROFILE_USERID)))
.thenReturn(new ParceledListSlice<>(profileApps));
}
final InterestingConfigChanges configChanges = mock(InterestingConfigChanges.class);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
index bee466d..852ac5c 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java
@@ -129,7 +129,6 @@
@Test
public void intentWithExtraState_audioStateChangedShouldDispatchToRegisterCallback() {
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED);
mContext.sendBroadcast(mIntent);
@@ -143,7 +142,6 @@
@Test
public void intentWithExtraState_phoneStateChangedShouldDispatchToRegisterCallback() {
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
mContext.sendBroadcast(mIntent);
@@ -169,7 +167,6 @@
@Test
public void dispatchAclConnectionStateChanged_aclDisconnected_shouldDispatchCallback() {
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_ACL_DISCONNECTED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
@@ -182,7 +179,6 @@
@Test
public void dispatchAclConnectionStateChanged_aclConnected_shouldDispatchCallback() {
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_ACL_CONNECTED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
@@ -196,7 +192,6 @@
public void dispatchAclConnectionStateChanged_aclDisconnected_shouldNotCallbackSubDevice() {
when(mCachedDeviceManager.isSubDevice(mBluetoothDevice)).thenReturn(true);
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_ACL_DISCONNECTED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
@@ -210,7 +205,6 @@
public void dispatchAclConnectionStateChanged_aclConnected_shouldNotCallbackSubDevice() {
when(mCachedDeviceManager.isSubDevice(mBluetoothDevice)).thenReturn(true);
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_ACL_CONNECTED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
@@ -224,7 +218,6 @@
public void dispatchAclConnectionStateChanged_findDeviceReturnNull_shouldNotDispatchCallback() {
when(mCachedDeviceManager.findDevice(mBluetoothDevice)).thenReturn(null);
mBluetoothEventManager.registerCallback(mBluetoothCallback);
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_ACL_CONNECTED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
@@ -361,7 +354,6 @@
@Test
public void showUnbondMessage_reasonAuthTimeout_showCorrectedErrorCode() {
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
mIntent.putExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
@@ -377,7 +369,6 @@
@Test
public void showUnbondMessage_reasonRemoteDeviceDown_showCorrectedErrorCode() {
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
mIntent.putExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
@@ -394,7 +385,6 @@
@Test
public void showUnbondMessage_reasonAuthRejected_showCorrectedErrorCode() {
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
mIntent.putExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
@@ -410,7 +400,6 @@
@Test
public void showUnbondMessage_reasonAuthFailed_showCorrectedErrorCode() {
- mBluetoothEventManager.registerIntentReceiver();
mIntent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
mIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
mIntent.putExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_NONE);
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
index 09540d1..4f8fa2f 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java
@@ -40,7 +40,6 @@
import com.android.settingslib.testutils.shadow.ShadowBluetoothAdapter;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -85,7 +84,6 @@
when(mCachedBluetoothDevice.getDevice()).thenReturn(mDevice);
mProfileManager = new LocalBluetoothProfileManager(mContext, mLocalBluetoothAdapter,
mDeviceManager, mEventManager);
- mEventManager.registerProfileIntentReceiverForTest();
}
/**
@@ -152,7 +150,6 @@
* profile connection state changed callback
*/
@Test
- @Ignore
public void stateChangedHandler_receiveA2dpConnectionStateChanged_shouldDispatchCallback() {
mShadowBluetoothAdapter.setSupportedProfiles(generateList(
new int[] {BluetoothProfile.A2DP}));
@@ -174,7 +171,6 @@
* profile connection state changed callback
*/
@Test
- @Ignore
public void stateChangedHandler_receiveHeadsetConnectionStateChanged_shouldDispatchCallback() {
mShadowBluetoothAdapter.setSupportedProfiles(generateList(
new int[] {BluetoothProfile.HEADSET}));
@@ -196,7 +192,6 @@
* CachedBluetoothDeviceManager method
*/
@Test
- @Ignore
public void stateChangedHandler_receiveHAPConnectionStateChanged_shouldDispatchDeviceManager() {
mShadowBluetoothAdapter.setSupportedProfiles(generateList(
new int[] {BluetoothProfile.HEARING_AID}));
@@ -219,7 +214,6 @@
* profile connection state changed callback
*/
@Test
- @Ignore
public void stateChangedHandler_receivePanConnectionStateChanged_shouldNotDispatchCallback() {
mShadowBluetoothAdapter.setSupportedProfiles(generateList(
new int[] {BluetoothProfile.PAN}));
@@ -261,7 +255,6 @@
* handler and refresh CachedBluetoothDevice
*/
@Test
- @Ignore
public void stateChangedHandler_receivePanConnectionStateChangedWithProfile_shouldRefresh() {
mShadowBluetoothAdapter.setSupportedProfiles(generateList(
new int[] {BluetoothProfile.PAN}));
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java
new file mode 100644
index 0000000..53d4653
--- /dev/null
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/dream/DreamBackendTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2022 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.settingslib.dream;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import com.android.settingslib.R;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowSettings;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowSettings.ShadowSecure.class})
+public final class DreamBackendTest {
+ private static final int[] SUPPORTED_DREAM_COMPLICATIONS = {1, 2, 3};
+ private static final int[] DEFAULT_DREAM_COMPLICATIONS = {1, 3, 4};
+
+ @Mock
+ private Context mContext;
+ private DreamBackend mBackend;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+
+ final Resources res = mock(Resources.class);
+ when(mContext.getResources()).thenReturn(res);
+ when(res.getIntArray(R.array.config_supportedDreamComplications)).thenReturn(
+ SUPPORTED_DREAM_COMPLICATIONS);
+ when(res.getIntArray(R.array.config_dreamComplicationsEnabledByDefault)).thenReturn(
+ DEFAULT_DREAM_COMPLICATIONS);
+ mBackend = new DreamBackend(mContext);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowSettings.ShadowSecure.reset();
+ }
+
+ @Test
+ public void testSupportedComplications() {
+ assertThat(mBackend.getSupportedComplications()).containsExactly(1, 2, 3);
+ }
+
+ @Test
+ public void testGetEnabledDreamComplications_default() {
+ assertThat(mBackend.getEnabledComplications()).containsExactly(1, 3);
+ }
+
+ @Test
+ public void testEnableComplication() {
+ mBackend.setComplicationEnabled(/* complicationType= */ 2, true);
+ assertThat(mBackend.getEnabledComplications()).containsExactly(1, 2, 3);
+ }
+
+ @Test
+ public void testEnableComplication_notSupported() {
+ mBackend.setComplicationEnabled(/* complicationType= */ 5, true);
+ assertThat(mBackend.getEnabledComplications()).containsExactly(1, 3);
+ }
+
+ @Test
+ public void testDisableComplication() {
+ mBackend.setComplicationEnabled(/* complicationType= */ 1, false);
+ assertThat(mBackend.getEnabledComplications()).containsExactly(3);
+ }
+}
+
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java
index aa11952..06b6fc8 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java
@@ -22,7 +22,6 @@
import static junit.framework.Assert.assertNotNull;
import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertSame;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -37,7 +36,6 @@
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -67,9 +65,8 @@
}
@Test
- @Ignore
public void buttonClicked() {
- ComponentName componentName = mock(ComponentName.class);
+ ComponentName componentName = new ComponentName("com.android.test", "AThing");
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin(
componentName, new UserHandle(UserHandle.myUserId()));
@@ -85,6 +82,6 @@
assertEquals(Settings.SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS,
intentCaptor.getValue().getStringExtra(
Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY));
- assertSame(componentName, intentCaptor.getValue().getComponent());
+ assertEquals(componentName.getPackageName(), intentCaptor.getValue().getPackage());
}
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/NetworkCycleDataLoaderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/NetworkCycleDataLoaderTest.java
index 74b9151..c79440e 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/NetworkCycleDataLoaderTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/NetworkCycleDataLoaderTest.java
@@ -16,24 +16,24 @@
package com.android.settingslib.net;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.nullable;
+import static android.app.usage.NetworkStats.Bucket.UID_ALL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.annotation.NonNull;
+import android.app.usage.NetworkStats;
import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.INetworkStatsService;
-import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
-import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
-import android.os.RemoteException;
import android.text.format.DateUtils;
import android.util.Range;
@@ -49,6 +49,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
@RunWith(RobolectricTestRunner.class)
public class NetworkCycleDataLoaderTest {
@@ -63,8 +65,6 @@
private NetworkPolicy mPolicy;
@Mock
private Iterator<Range<ZonedDateTime>> mIterator;
- @Mock
- private INetworkStatsService mNetworkStatsService;
private NetworkCycleDataTestLoader mLoader;
@@ -132,20 +132,24 @@
verify(mLoader).recordUsage(nowInMs, nowInMs);
}
+ private NetworkStats.Bucket makeMockBucket(int uid, long rxBytes, long txBytes,
+ long start, long end) {
+ NetworkStats.Bucket ret = mock(NetworkStats.Bucket.class);
+ when(ret.getUid()).thenReturn(uid);
+ when(ret.getRxBytes()).thenReturn(rxBytes);
+ when(ret.getTxBytes()).thenReturn(txBytes);
+ when(ret.getStartTimeStamp()).thenReturn(start);
+ when(ret.getEndTimeStamp()).thenReturn(end);
+ return ret;
+ }
+
@Test
- public void loadFourWeeksData_shouldRecordUsageForLast4Weeks() throws RemoteException {
+ public void loadFourWeeksData_shouldRecordUsageForLast4Weeks() {
mLoader = spy(new NetworkCycleDataTestLoader(mContext));
- ReflectionHelpers.setField(mLoader, "mNetworkStatsService", mNetworkStatsService);
- final INetworkStatsSession networkSession = mock(INetworkStatsSession.class);
- when(mNetworkStatsService.openSession()).thenReturn(networkSession);
- final NetworkStatsHistory networkHistory = mock(NetworkStatsHistory.class);
- when(networkSession.getHistoryForNetwork(nullable(NetworkTemplate.class), anyInt()))
- .thenReturn(networkHistory);
final long now = System.currentTimeMillis();
final long fourWeeksAgo = now - (DateUtils.WEEK_IN_MILLIS * 4);
final long twoDaysAgo = now - (DateUtils.DAY_IN_MILLIS * 2);
- when(networkHistory.getStart()).thenReturn(twoDaysAgo);
- when(networkHistory.getEnd()).thenReturn(now);
+ mLoader.addBucket(makeMockBucket(UID_ALL, 123, 456, twoDaysAgo, now));
mLoader.loadFourWeeksData();
@@ -173,10 +177,31 @@
verify(mLoader).recordUsage(thirtyDaysAgo, twentyDaysAgo);
}
+ @Test
+ public void getTimeRangeOf() {
+ mLoader = spy(new NetworkCycleDataTestLoader(mContext));
+ // If empty, new Range(MAX_VALUE, MIN_VALUE) will be constructed. Hence, the function
+ // should throw.
+ assertThrows(IllegalArgumentException.class,
+ () -> mLoader.getTimeRangeOf(mock(NetworkStats.class)));
+
+ mLoader.addBucket(makeMockBucket(UID_ALL, 123, 456, 0, 10));
+ // Feed the function with unused NetworkStats. The actual data injection is
+ // done by addBucket.
+ assertEquals(new Range(0L, 10L), mLoader.getTimeRangeOf(mock(NetworkStats.class)));
+
+ mLoader.addBucket(makeMockBucket(UID_ALL, 123, 456, 0, 10));
+ mLoader.addBucket(makeMockBucket(UID_ALL, 123, 456, 30, 40));
+ mLoader.addBucket(makeMockBucket(UID_ALL, 123, 456, 10, 25));
+ assertEquals(new Range(0L, 40L), mLoader.getTimeRangeOf(mock(NetworkStats.class)));
+ }
+
public class NetworkCycleDataTestLoader extends NetworkCycleDataLoader<List<NetworkCycleData>> {
+ private final Queue<NetworkStats.Bucket> mMockedBuckets = new LinkedBlockingQueue<>();
private NetworkCycleDataTestLoader(Context context) {
- super(NetworkCycleDataLoader.builder(mContext));
+ super(NetworkCycleDataLoader.builder(mContext)
+ .setNetworkTemplate(mock(NetworkTemplate.class)));
mContext = context;
}
@@ -188,5 +213,19 @@
List<NetworkCycleData> getCycleUsage() {
return null;
}
+
+ public void addBucket(NetworkStats.Bucket bucket) {
+ mMockedBuckets.add(bucket);
+ }
+
+ @Override
+ public boolean hasNextBucket(@NonNull NetworkStats unused) {
+ return !mMockedBuckets.isEmpty();
+ }
+
+ @Override
+ public NetworkStats.Bucket getNextBucket(@NonNull NetworkStats unused) {
+ return mMockedBuckets.remove();
+ }
}
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
index a31f24a..30267f7 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
@@ -19,14 +19,17 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
+import android.net.wifi.WifiManager;
+
+import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -37,7 +40,7 @@
@RunWith(RobolectricTestRunner.class)
public class AccessPointPreferenceTest {
- private Context mContext = RuntimeEnvironment.application;
+ private Context mContext;
@Mock
private AccessPoint mockAccessPoint;
@@ -54,12 +57,13 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mock(WifiManager.class));
when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
}
@Test
- @Ignore
public void refresh_openNetwork_updateContentDescription() {
final String ssid = "ssid";
final String summary = "connected";
@@ -90,7 +94,6 @@
}
@Test
- @Ignore
public void refresh_setTitle_shouldUseSsidString() {
final String ssid = "ssid";
final String summary = "connected";
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
index 5d7f8ba..e7b3fe9 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java
@@ -20,6 +20,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,6 +33,7 @@
import android.net.WifiKey;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkScoreCache;
import android.os.Bundle;
import android.os.Parcelable;
@@ -44,7 +46,6 @@
import com.android.settingslib.R;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -75,10 +76,10 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mock(WifiManager.class));
}
@Test
- @Ignore
public void testVerboseSummaryString_showsScanResultSpeedLabel() {
WifiTracker.sVerboseLogging = true;
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
index 2312525..5f549fd 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
@@ -296,6 +296,7 @@
VALIDATORS.put(Secure.CLIPBOARD_SHOW_ACCESS_NOTIFICATIONS, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.NOTIFICATION_BUBBLES, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED, BOOLEAN_VALIDATOR);
+ VALIDATORS.put(Secure.LOCATION_SHOW_SYSTEM_OPS, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.DEVICE_STATE_ROTATION_LOCK, value -> {
if (TextUtils.isEmpty(value)) {
return true;
@@ -324,6 +325,7 @@
return true;
});
VALIDATORS.put(Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED, BOOLEAN_VALIDATOR);
+ VALIDATORS.put(Secure.FAST_PAIR_SCAN_ENABLED, BOOLEAN_VALIDATOR);
}
}
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index c5f027b..7381e05 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -1378,9 +1378,6 @@
Settings.Global.SYS_STORAGE_CACHE_PERCENTAGE,
GlobalSettingsProto.Sys.STORAGE_CACHE_PERCENTAGE);
dumpSetting(s, p,
- Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,
- GlobalSettingsProto.Sys.STORAGE_CACHE_MAX_BYTES);
- dumpSetting(s, p,
Settings.Global.SYS_UIDCPUPOWER,
GlobalSettingsProto.Sys.UIDCPUPOWER);
p.end(sysToken);
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index a3f3995..720fb6c 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -462,7 +462,6 @@
Settings.Global.SYNC_MANAGER_CONSTANTS,
Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS,
Settings.Global.SYS_FREE_STORAGE_LOG_INTERVAL,
- Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,
Settings.Global.SYS_STORAGE_CACHE_PERCENTAGE,
Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,
Settings.Global.SYS_STORAGE_THRESHOLD_MAX_BYTES,
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index c16cae0..46e24fa 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -250,6 +250,7 @@
<uses-permission android:name="android.permission.MANAGE_APP_PREDICTIONS" />
<uses-permission android:name="android.permission.MANAGE_SEARCH_UI" />
<uses-permission android:name="android.permission.MANAGE_SMARTSPACE" />
+ <uses-permission android:name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION" />
<uses-permission android:name="android.permission.MANAGE_UI_TRANSLATION" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -548,6 +549,10 @@
<!-- Permission required for CTS test - PeopleManagerTest -->
<uses-permission android:name="android.permission.READ_PEOPLE_DATA" />
+ <!-- Permissions required for CTS test - TrustTestCases -->
+ <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
+ <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
+
<!-- Permission required for CTS test - CtsGameManagerTestCases -->
<uses-permission android:name="android.permission.MANAGE_GAME_MODE" />
diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
index dfc3e63..ecb3cb3 100644
--- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml
+++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
@@ -22,21 +22,6 @@
android:layout_height="48dp"
android:gravity="center_vertical">
- <com.android.systemui.statusbar.AlphaOptimizedImageView
- android:id="@android:id/edit"
- android:layout_width="0dp"
- android:layout_height="@dimen/qs_footer_action_button_size"
- android:layout_marginEnd="@dimen/qs_tile_margin_horizontal"
- android:layout_weight="1"
- android:background="@drawable/qs_footer_action_chip_background"
- android:clickable="true"
- android:clipToPadding="false"
- android:contentDescription="@string/accessibility_quick_settings_edit"
- android:focusable="true"
- android:padding="@dimen/qs_footer_icon_padding"
- android:src="@*android:drawable/ic_mode_edit"
- android:tint="?android:attr/textColorPrimary" />
-
<com.android.systemui.statusbar.phone.MultiUserSwitch
android:id="@+id/multi_user_switch"
android:layout_width="0dp"
diff --git a/packages/SystemUI/res-keyguard/values/bools.xml b/packages/SystemUI/res-keyguard/values/bools.xml
index c5bf4ce..2b83787 100644
--- a/packages/SystemUI/res-keyguard/values/bools.xml
+++ b/packages/SystemUI/res-keyguard/values/bools.xml
@@ -17,5 +17,4 @@
<resources>
<bool name="kg_show_ime_at_screen_on">true</bool>
<bool name="kg_use_all_caps">true</bool>
- <bool name="flag_active_unlock">false</bool>
</resources>
diff --git a/packages/SystemUI/res/drawable/qs_customizer_background_transition.xml b/packages/SystemUI/res/drawable/qs_customizer_background_transition.xml
index ed8f61a..6fa9eac 100644
--- a/packages/SystemUI/res/drawable/qs_customizer_background_transition.xml
+++ b/packages/SystemUI/res/drawable/qs_customizer_background_transition.xml
@@ -15,7 +15,7 @@
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android">
<shape>
- <solid android:color="@color/qs_detail_transition"/>
+ <solid android:color="@android:color/transparent"/>
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
</inset>
diff --git a/packages/SystemUI/res/drawable/qs_detail_background.xml b/packages/SystemUI/res/drawable/qs_detail_background.xml
index e5c7352..c23649d 100644
--- a/packages/SystemUI/res/drawable/qs_detail_background.xml
+++ b/packages/SystemUI/res/drawable/qs_detail_background.xml
@@ -17,7 +17,7 @@
<item>
<inset>
<shape>
- <solid android:color="@color/qs_detail_transition"/>
+ <solid android:color="@android:color/transparent"/>
<corners android:radius="@dimen/qs_footer_action_corner_radius" />
</shape>
</inset>
diff --git a/packages/SystemUI/res/layout/qs_footer_impl.xml b/packages/SystemUI/res/layout/qs_footer_impl.xml
index e70084b..5cd9e94 100644
--- a/packages/SystemUI/res/layout/qs_footer_impl.xml
+++ b/packages/SystemUI/res/layout/qs_footer_impl.xml
@@ -43,7 +43,6 @@
android:id="@+id/build"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:paddingStart="@dimen/qs_tile_margin_horizontal"
android:paddingEnd="4dp"
android:layout_weight="1"
android:clickable="true"
@@ -61,10 +60,23 @@
android:layout_gravity="center_vertical"
android:visibility="gone" />
- <View
+ <FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1" />
+ android:layout_weight="1">
+ <com.android.systemui.statusbar.AlphaOptimizedImageView
+ android:id="@android:id/edit"
+ android:layout_width="@dimen/qs_footer_action_button_size"
+ android:layout_height="@dimen/qs_footer_action_button_size"
+ android:layout_gravity="center_vertical|end"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_quick_settings_edit"
+ android:focusable="true"
+ android:padding="@dimen/qs_footer_icon_padding"
+ android:src="@*android:drawable/ic_mode_edit"
+ android:tint="?android:attr/textColorPrimary" />
+ </FrameLayout>
</LinearLayout>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index fc28f09..461a598 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -23,7 +23,6 @@
<color name="system_bar_background_transparent">#00000000</color>
<color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
<color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white -->
- <color name="qs_detail_transition">#66FFFFFF</color>
<color name="status_bar_clock_color">#FFFFFFFF</color>
<color name="qs_tile_disabled_color">#9E9E9E</color> <!-- 38% black -->
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 65f22b8..fc2756e 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -716,22 +716,6 @@
<!-- Flag to enable privacy dot views, it shall be true for normal case -->
<bool name="config_enablePrivacyDot">true</bool>
- <!-- The positions widgets can be in defined as View.Gravity constants -->
- <integer-array name="config_dreamComplicationPositions">
- </integer-array>
-
- <!-- Widget components to show as dream complications -->
- <string-array name="config_dreamAppWidgetComplications" translatable="false">
- </string-array>
-
- <!-- Width percentage of dream complications -->
- <item name="config_dreamComplicationWidthPercent" translatable="false" format="float"
- type="dimen">0.33</item>
-
- <!-- Height percentage of dream complications -->
- <item name="config_dreamComplicationHeightPercent" translatable="false" format="float"
- type="dimen">0.25</item>
-
<!-- Flag to enable dream overlay service and its registration -->
<bool name="config_dreamOverlayServiceEnabled">false</bool>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 08fb2c6..b22ad66 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -670,6 +670,10 @@
<string name="quick_settings_dark_mode_secondary_label_on_at">On at <xliff:g id="time" example="10 pm">%s</xliff:g></string>
<!-- QuickSettings: Secondary text for when the Dark theme or some other tile will be on until some user-selected time. [CHAR LIMIT=20] -->
<string name="quick_settings_dark_mode_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>
+ <!-- QuickSettings: Secondary text for when the Dark theme will be enabled at bedtime. [CHAR LIMIT=40] -->
+ <string name="quick_settings_dark_mode_secondary_label_on_at_bedtime">On at bedtime</string>
+ <!-- QuickSettings: Secondary text for when the Dark theme or some other tile will be on until bedtime ends. [CHAR LIMIT=40] -->
+ <string name="quick_settings_dark_mode_secondary_label_until_bedtime_ends">Until bedtime ends</string>
<!-- QuickSettings: NFC tile [CHAR LIMIT=NONE] -->
<string name="quick_settings_nfc_label">NFC</string>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java
index 1d2caf9..6345d11 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/navigationbar/RegionSamplingHelper.java
@@ -275,23 +275,27 @@
}
public void dump(PrintWriter pw) {
- pw.println("RegionSamplingHelper:");
- pw.println(" sampleView isAttached: " + mSampledView.isAttachedToWindow());
- pw.println(" sampleView isScValid: " + (mSampledView.isAttachedToWindow()
+ dump("", pw);
+ }
+
+ public void dump(String prefix, PrintWriter pw) {
+ pw.println(prefix + "RegionSamplingHelper:");
+ pw.println(prefix + "\tsampleView isAttached: " + mSampledView.isAttachedToWindow());
+ pw.println(prefix + "\tsampleView isScValid: " + (mSampledView.isAttachedToWindow()
? mSampledView.getViewRootImpl().getSurfaceControl().isValid()
: "notAttached"));
- pw.println(" mSamplingEnabled: " + mSamplingEnabled);
- pw.println(" mSamplingListenerRegistered: " + mSamplingListenerRegistered);
- pw.println(" mSamplingRequestBounds: " + mSamplingRequestBounds);
- pw.println(" mRegisteredSamplingBounds: " + mRegisteredSamplingBounds);
- pw.println(" mLastMedianLuma: " + mLastMedianLuma);
- pw.println(" mCurrentMedianLuma: " + mCurrentMedianLuma);
- pw.println(" mWindowVisible: " + mWindowVisible);
- pw.println(" mWindowHasBlurs: " + mWindowHasBlurs);
- pw.println(" mWaitingOnDraw: " + mWaitingOnDraw);
- pw.println(" mRegisteredStopLayer: " + mRegisteredStopLayer);
- pw.println(" mWrappedStopLayer: " + mWrappedStopLayer);
- pw.println(" mIsDestroyed: " + mIsDestroyed);
+ pw.println(prefix + "\tmSamplingEnabled: " + mSamplingEnabled);
+ pw.println(prefix + "\tmSamplingListenerRegistered: " + mSamplingListenerRegistered);
+ pw.println(prefix + "\tmSamplingRequestBounds: " + mSamplingRequestBounds);
+ pw.println(prefix + "\tmRegisteredSamplingBounds: " + mRegisteredSamplingBounds);
+ pw.println(prefix + "\tmLastMedianLuma: " + mLastMedianLuma);
+ pw.println(prefix + "\tmCurrentMedianLuma: " + mCurrentMedianLuma);
+ pw.println(prefix + "\tmWindowVisible: " + mWindowVisible);
+ pw.println(prefix + "\tmWindowHasBlurs: " + mWindowHasBlurs);
+ pw.println(prefix + "\tmWaitingOnDraw: " + mWaitingOnDraw);
+ pw.println(prefix + "\tmRegisteredStopLayer: " + mRegisteredStopLayer);
+ pw.println(prefix + "\tmWrappedStopLayer: " + mWrappedStopLayer);
+ pw.println(prefix + "\tmIsDestroyed: " + mIsDestroyed);
}
public interface SamplingCallback {
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
index d518cb5..bb7a0a71 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
@@ -52,13 +52,14 @@
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.view.RotationPolicy;
-import com.android.systemui.shared.rotation.RotationButton.RotationButtonUpdatesCallback;
import com.android.systemui.shared.recents.utilities.Utilities;
import com.android.systemui.shared.recents.utilities.ViewRippler;
+import com.android.systemui.shared.rotation.RotationButton.RotationButtonUpdatesCallback;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.shared.system.TaskStackChangeListeners;
+import java.io.PrintWriter;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -450,6 +451,30 @@
return mDarkIconColor;
}
+ public void dumpLogs(String prefix, PrintWriter pw) {
+ pw.println(prefix + "RotationButtonController:");
+
+ pw.println(String.format(
+ "%s\tmIsRecentsAnimationRunning=%b", prefix, mIsRecentsAnimationRunning));
+ pw.println(String.format("%s\tmHomeRotationEnabled=%b", prefix, mHomeRotationEnabled));
+ pw.println(String.format(
+ "%s\tmLastRotationSuggestion=%d", prefix, mLastRotationSuggestion));
+ pw.println(String.format(
+ "%s\tmPendingRotationSuggestion=%b", prefix, mPendingRotationSuggestion));
+ pw.println(String.format(
+ "%s\tmHoveringRotationSuggestion=%b", prefix, mHoveringRotationSuggestion));
+ pw.println(String.format("%s\tmListenersRegistered=%b", prefix, mListenersRegistered));
+ pw.println(String.format(
+ "%s\tmIsNavigationBarShowing=%b", prefix, mIsNavigationBarShowing));
+ pw.println(String.format("%s\tmBehavior=%d", prefix, mBehavior));
+ pw.println(String.format(
+ "%s\tmSkipOverrideUserLockPrefsOnce=%b", prefix, mSkipOverrideUserLockPrefsOnce));
+ pw.println(String.format(
+ "%s\tmLightIconColor=0x%s", prefix, Integer.toHexString(mLightIconColor)));
+ pw.println(String.format(
+ "%s\tmDarkIconColor=0x%s", prefix, Integer.toHexString(mDarkIconColor)));
+ }
+
public RotationButton getRotationButton() {
return mRotationButton;
}
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
index 2ae32c7..f2f382d 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
@@ -25,6 +25,8 @@
import static android.view.WindowManager.TRANSIT_TO_FRONT;
import static android.window.TransitionFilter.CONTAINER_ORDER_TOP;
+import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_RECENTS;
+
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
@@ -145,6 +147,11 @@
&& taskInfo.pictureInPictureParams.isAutoEnterEnabled()) {
pipTask = taskInfo.token;
}
+ } else if (change.getTaskInfo() != null
+ && change.getTaskInfo().topActivityType == ACTIVITY_TYPE_RECENTS) {
+ // This task is for recents, keep it on top.
+ t.setLayer(leashMap.get(change.getLeash()),
+ info.getChanges().size() * 3 - i);
}
}
// Also make all the wallpapers opaque since we want the visible from the start
@@ -310,53 +317,48 @@
return;
}
if (mWrapped != null) mWrapped.finish(toHome, sendUserLeaveHint);
- try {
- if (!toHome && mPausingTasks != null && mOpeningLeashes == null) {
- // The gesture went back to opening the app rather than continuing with
- // recents, so end the transition by moving the app back to the top (and also
- // re-showing it's task).
- final WindowContainerTransaction wct = new WindowContainerTransaction();
- final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
- for (int i = mPausingTasks.size() - 1; i >= 0; --i) {
- // reverse order so that index 0 ends up on top
- wct.reorder(mPausingTasks.get(i), true /* onTop */);
- t.show(mInfo.getChange(mPausingTasks.get(i)).getLeash());
- }
- mFinishCB.onTransitionFinished(wct, t);
- } else {
- if (mOpeningLeashes != null) {
- // TODO: the launcher animation should handle this
- final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
- for (int i = 0; i < mOpeningLeashes.size(); ++i) {
- t.show(mOpeningLeashes.get(i));
- t.setAlpha(mOpeningLeashes.get(i), 1.f);
- }
- t.apply();
- }
- if (mPipTask != null && mPipTransaction != null) {
- final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
- t.show(mInfo.getChange(mPipTask).getLeash());
- PictureInPictureSurfaceTransaction.apply(mPipTransaction,
- mInfo.getChange(mPipTask).getLeash(), t);
- mPipTask = null;
- mPipTransaction = null;
- mFinishCB.onTransitionFinished(null /* wct */, t);
- } else {
- mFinishCB.onTransitionFinished(null /* wct */, null /* sct */);
- }
+ final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+ final WindowContainerTransaction wct;
+ if (!toHome && mPausingTasks != null && mOpeningLeashes == null) {
+ // The gesture went back to opening the app rather than continuing with
+ // recents, so end the transition by moving the app back to the top (and also
+ // re-showing it's task).
+ wct = new WindowContainerTransaction();
+ for (int i = mPausingTasks.size() - 1; i >= 0; --i) {
+ // reverse order so that index 0 ends up on top
+ wct.reorder(mPausingTasks.get(i), true /* onTop */);
+ t.show(mInfo.getChange(mPausingTasks.get(i)).getLeash());
}
- } catch (RemoteException e) {
- Log.e("RemoteTransitionCompat", "Failed to call animation finish callback", e);
+ } else {
+ wct = null;
+ if (mOpeningLeashes != null) {
+ // TODO: the launcher animation should handle this
+ for (int i = 0; i < mOpeningLeashes.size(); ++i) {
+ t.show(mOpeningLeashes.get(i));
+ t.setAlpha(mOpeningLeashes.get(i), 1.f);
+ }
+ }
+ if (mPipTask != null && mPipTransaction != null) {
+ t.show(mInfo.getChange(mPipTask).getLeash());
+ PictureInPictureSurfaceTransaction.apply(mPipTransaction,
+ mInfo.getChange(mPipTask).getLeash(), t);
+ mPipTask = null;
+ mPipTransaction = null;
+ }
}
// Release surface references now. This is apparently to free GPU
// memory while doing quick operations (eg. during CTS).
- SurfaceControl.Transaction t = new SurfaceControl.Transaction();
for (int i = 0; i < mLeashMap.size(); ++i) {
if (mLeashMap.keyAt(i) == mLeashMap.valueAt(i)) continue;
t.remove(mLeashMap.valueAt(i));
}
- t.apply();
+ try {
+ mFinishCB.onTransitionFinished(wct, t);
+ } catch (RemoteException e) {
+ Log.e("RemoteTransitionCompat", "Failed to call animation finish callback", e);
+ t.apply();
+ }
for (int i = 0; i < mInfo.getChanges().size(); ++i) {
mInfo.getChanges().get(i).getLeash().release();
}
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java b/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
index 0340904..b2658c9 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
@@ -16,6 +16,8 @@
package com.android.keyguard;
+import android.util.Log;
+
/**
* Defines constants for the Keyguard.
*/
@@ -25,7 +27,7 @@
* Turns on debugging information for the whole Keyguard. This is very verbose and should only
* be used temporarily for debugging.
*/
- public static final boolean DEBUG = false;
+ public static final boolean DEBUG = Log.isLoggable("Keyguard", Log.DEBUG);
public static final boolean DEBUG_SIM_STATES = true;
public static final boolean DEBUG_BIOMETRIC_WAKELOCK = true;
}
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index a348b42..f2d0427 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -37,8 +37,6 @@
import android.app.ActivityTaskManager;
import android.app.ActivityTaskManager.RootTaskInfo;
import android.app.AlarmManager;
-import android.app.Notification;
-import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.UserSwitchObserver;
import android.app.admin.DevicePolicyManager;
@@ -104,8 +102,6 @@
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dump.DumpManager;
-import com.android.systemui.flags.FeatureFlags;
-import com.android.systemui.flags.Flags;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.shared.system.TaskStackChangeListener;
import com.android.systemui.shared.system.TaskStackChangeListeners;
@@ -113,7 +109,6 @@
import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.telephony.TelephonyListenerManager;
import com.android.systemui.util.Assert;
-import com.android.systemui.util.NotificationChannels;
import com.android.systemui.util.RingerModeTracker;
import com.google.android.collect.Lists;
@@ -338,7 +333,6 @@
private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private final Executor mBackgroundExecutor;
private SensorPrivacyManager mSensorPrivacyManager;
- private FeatureFlags mFeatureFlags;
private int mFaceAuthUserId;
/**
@@ -443,7 +437,8 @@
}
@Override
- public void onTrustChanged(boolean enabled, int userId, int flags) {
+ public void onTrustChanged(boolean enabled, int userId, int flags,
+ List<String> trustGrantedMessages) {
Assert.isMainThread();
boolean wasTrusted = mUserHasTrust.get(userId, false);
mUserHasTrust.put(userId, enabled);
@@ -465,6 +460,19 @@
}
}
}
+
+ if (KeyguardUpdateMonitor.getCurrentUser() == userId && getUserHasTrust(userId)) {
+ CharSequence message = null;
+ if (trustGrantedMessages != null && trustGrantedMessages.size() > 0) {
+ message = trustGrantedMessages.get(0); // for now only shows the first in the list
+ }
+ for (int i = 0; i < mCallbacks.size(); i++) {
+ KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
+ if (cb != null) {
+ cb.showTrustGrantedMessage(message);
+ }
+ }
+ }
}
@Override
@@ -1790,8 +1798,7 @@
AuthController authController,
TelephonyListenerManager telephonyListenerManager,
InteractionJankMonitor interactionJankMonitor,
- LatencyTracker latencyTracker,
- FeatureFlags featureFlags) {
+ LatencyTracker latencyTracker) {
mContext = context;
mSubscriptionManager = SubscriptionManager.from(context);
mTelephonyListenerManager = telephonyListenerManager;
@@ -1809,7 +1816,6 @@
mAuthController = authController;
dumpManager.registerDumpable(getClass().getName(), this);
mSensorPrivacyManager = context.getSystemService(SensorPrivacyManager.class);
- mFeatureFlags = featureFlags;
mHandler = new Handler(mainLooper) {
@Override
@@ -2253,34 +2259,12 @@
return;
}
- if (shouldTriggerActiveUnlock() && mFeatureFlags.isEnabled(Flags.ACTIVE_UNLOCK)) {
- // TODO (b/192405661): call new TrustManager API
- mNumActiveUnlockTriggers++;
- Log.d("ActiveUnlock", "would have triggered times=" + mNumActiveUnlockTriggers);
- showActiveUnlockNotification(mNumActiveUnlockTriggers);
+ if (shouldTriggerActiveUnlock()) {
+ mTrustManager.reportUserRequestedUnlock(KeyguardUpdateMonitor.getCurrentUser());
}
}
- /**
- * TODO (b/192405661): Only for testing. Remove before release.
- */
- private void showActiveUnlockNotification(int times) {
- final String message = "Active unlock triggered " + times + " times.";
- final Notification.Builder nb =
- new Notification.Builder(mContext, NotificationChannels.GENERAL)
- .setSmallIcon(R.drawable.ic_volume_ringer)
- .setContentTitle(message)
- .setStyle(new Notification.BigTextStyle().bigText(message));
- mContext.getSystemService(NotificationManager.class).notifyAsUser(
- "active_unlock",
- 0,
- nb.build(),
- UserHandle.ALL);
- }
-
private boolean shouldTriggerActiveUnlock() {
- // TODO: check if active unlock is ENABLED / AVAILABLE
-
// Triggers:
final boolean triggerActiveUnlockForAssistant = shouldTriggerActiveUnlockForAssistant();
final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep
@@ -2294,7 +2278,7 @@
final boolean userCanDismissLockScreen = getUserCanSkipBouncer(user)
|| !mLockPatternUtils.isSecure(user);
- // Don't trigger active unlock if fp is locked out TODO: confirm this one
+ // Don't trigger active unlock if fp is locked out
final boolean fpLockedout = mFingerprintLockedOut || mFingerprintLockedOutPermanent;
// Don't trigger active unlock if primary auth is required
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
index a74fd15..47e1035 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
@@ -23,6 +23,8 @@
import android.telephony.TelephonyManager;
import android.view.WindowManagerPolicyConstants;
+import androidx.annotation.Nullable;
+
import com.android.settingslib.fuelgauge.BatteryStatus;
import com.android.systemui.statusbar.KeyguardIndicationController;
@@ -216,6 +218,11 @@
public void onTrustGrantedWithFlags(int flags, int userId) { }
/**
+ * Called when setting the trust granted message.
+ */
+ public void showTrustGrantedMessage(@Nullable CharSequence message) { }
+
+ /**
* Called when a biometric has been acquired.
* <p>
* It is guaranteed that either {@link #onBiometricAuthenticated} or
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
index 2767904..b3be877 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
@@ -122,7 +122,8 @@
.setTaskSurfaceHelper(mWMComponent.getTaskSurfaceHelper())
.setRecentTasks(mWMComponent.getRecentTasks())
.setCompatUI(Optional.of(mWMComponent.getCompatUI()))
- .setDragAndDrop(Optional.of(mWMComponent.getDragAndDrop()));
+ .setDragAndDrop(Optional.of(mWMComponent.getDragAndDrop()))
+ .setBackAnimation(mWMComponent.getBackAnimation());
} else {
// TODO: Call on prepareSysUIComponentBuilder but not with real components. Other option
// is separating this logic into newly creating SystemUITestsFactory.
@@ -142,7 +143,8 @@
.setTaskSurfaceHelper(Optional.ofNullable(null))
.setRecentTasks(Optional.ofNullable(null))
.setCompatUI(Optional.ofNullable(null))
- .setDragAndDrop(Optional.ofNullable(null));
+ .setDragAndDrop(Optional.ofNullable(null))
+ .setBackAnimation(Optional.ofNullable(null));
}
mSysUIComponent = builder.build();
if (mInitializeComponents) {
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java
index 052ec86..dbd215d 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java
@@ -22,8 +22,10 @@
import android.annotation.NonNull;
import android.annotation.UiContext;
+import android.content.ComponentCallbacks;
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
import android.graphics.Insets;
import android.graphics.PixelFormat;
import android.graphics.Rect;
@@ -54,7 +56,8 @@
* The button icon is movable by dragging and it would not overlap navigation bar window.
* And the button UI would automatically be dismissed after displaying for a period of time.
*/
-class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureListener {
+class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureListener,
+ ComponentCallbacks {
@VisibleForTesting
static final long FADING_ANIMATION_DURATION_MS = 300;
@@ -75,6 +78,7 @@
private int mMagnificationMode = ACCESSIBILITY_MAGNIFICATION_MODE_NONE;
private final LayoutParams mParams;
private final SwitchListener mSwitchListener;
+ private final Configuration mConfiguration;
@VisibleForTesting
final Rect mDraggableWindowBounds = new Rect();
private boolean mIsVisible = false;
@@ -101,6 +105,7 @@
MagnificationModeSwitch(Context context, @NonNull ImageView imageView,
SfVsyncFrameCallbackProvider sfVsyncFrameProvider, SwitchListener switchListener) {
mContext = context;
+ mConfiguration = new Configuration(context.getResources().getConfiguration());
mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class);
mWindowManager = mContext.getSystemService(WindowManager.class);
mSfVsyncFrameProvider = sfVsyncFrameProvider;
@@ -270,6 +275,7 @@
mIsFadeOutAnimating = false;
mImageView.setAlpha(0f);
mWindowManager.removeView(mImageView);
+ mContext.unregisterComponentCallbacks(this);
mIsVisible = false;
}
@@ -291,6 +297,8 @@
mImageView.setImageResource(getIconResId(mode));
}
if (!mIsVisible) {
+ onConfigurationChanged(mContext.getResources().getConfiguration());
+ mContext.registerComponentCallbacks(this);
if (resetPosition) {
mDraggableWindowBounds.set(getDraggableWindowBounds());
mParams.x = mDraggableWindowBounds.right;
@@ -321,7 +329,21 @@
}
}
+ @Override
+ public void onConfigurationChanged(@NonNull Configuration newConfig) {
+ final int configDiff = newConfig.diff(mConfiguration);
+ mConfiguration.setTo(newConfig);
+ onConfigurationChanged(configDiff);
+ }
+
+ @Override
+ public void onLowMemory() {
+ }
+
void onConfigurationChanged(int configDiff) {
+ if (configDiff == 0) {
+ return;
+ }
if ((configDiff & (ActivityInfo.CONFIG_ORIENTATION | ActivityInfo.CONFIG_SCREEN_SIZE))
!= 0) {
final Rect previousDraggableBounds = new Rect(mDraggableWindowBounds);
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java
index 4784bc1..885a177 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java
@@ -23,7 +23,6 @@
import android.annotation.MainThread;
import android.annotation.Nullable;
import android.content.Context;
-import android.content.res.Configuration;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.Handler;
@@ -65,7 +64,6 @@
private final OverviewProxyService mOverviewProxyService;
private WindowMagnificationConnectionImpl mWindowMagnificationConnectionImpl;
- private Configuration mLastConfiguration;
private SysUiState mSysUiState;
private static class ControllerSupplier extends
@@ -107,7 +105,6 @@
SysUiState sysUiState, OverviewProxyService overviewProxyService) {
super(context);
mHandler = mainHandler;
- mLastConfiguration = new Configuration(context.getResources().getConfiguration());
mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class);
mCommandQueue = commandQueue;
mModeSwitchesController = modeSwitchesController;
@@ -118,18 +115,6 @@
}
@Override
- public void onConfigurationChanged(Configuration newConfig) {
- final int configDiff = newConfig.diff(mLastConfiguration);
- mLastConfiguration.setTo(newConfig);
- mMagnificationControllerSupplier.forEach(
- magnificationController -> magnificationController.onConfigurationChanged(
- configDiff));
- if (mModeSwitchesController != null) {
- mModeSwitchesController.onConfigurationChanged(configDiff);
- }
- }
-
- @Override
public void start() {
mCommandQueue.addCallback(this);
mOverviewProxyService.addCallback(new OverviewProxyService.OverviewProxyListener() {
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
index aa1a433..0d20403 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
@@ -26,6 +26,7 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UiContext;
+import android.content.ComponentCallbacks;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
@@ -76,7 +77,8 @@
* Class to handle adding and removing a window magnification.
*/
class WindowMagnificationController implements View.OnTouchListener, SurfaceHolder.Callback,
- MirrorWindowControl.MirrorWindowDelegate, MagnificationGestureDetector.OnGestureListener {
+ MirrorWindowControl.MirrorWindowDelegate, MagnificationGestureDetector.OnGestureListener,
+ ComponentCallbacks {
private static final String TAG = "WindowMagnificationController";
@SuppressWarnings("isloggabletaglength")
@@ -143,6 +145,7 @@
private View mTopDrag;
private View mRightDrag;
private View mBottomDrag;
+ private final Configuration mConfiguration;
@NonNull
private final WindowMagnifierCallback mWindowMagnifierCallback;
@@ -191,6 +194,7 @@
mSfVsyncFrameProvider = sfVsyncFrameProvider;
mWindowMagnifierCallback = callback;
mSysUiState = sysUiState;
+ mConfiguration = new Configuration(context.getResources().getConfiguration());
final Display display = mContext.getDisplay();
mDisplayId = mContext.getDisplayId();
@@ -339,6 +343,18 @@
}
mMirrorViewBounds.setEmpty();
updateSystemUIStateIfNeeded();
+ mContext.unregisterComponentCallbacks(this);
+ }
+
+ @Override
+ public void onConfigurationChanged(@NonNull Configuration newConfig) {
+ final int configDiff = newConfig.diff(mConfiguration);
+ mConfiguration.setTo(newConfig);
+ onConfigurationChanged(configDiff);
+ }
+
+ @Override
+ public void onLowMemory() {
}
/**
@@ -351,6 +367,9 @@
Log.d(TAG, "onConfigurationChanged = " + Configuration.configurationDiffToString(
configDiff));
}
+ if (configDiff == 0) {
+ return;
+ }
if ((configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0) {
onRotate();
}
@@ -390,7 +409,7 @@
if (currentWindowBounds.equals(oldWindowBounds)) {
if (DEBUG) {
- Log.d(TAG, "updateMagnificationFrame -- window bounds is not changed");
+ Log.d(TAG, "handleScreenSizeChanged -- window bounds is not changed");
}
return false;
}
@@ -851,6 +870,10 @@
deleteWindowMagnification();
return;
}
+ if (!isWindowVisible()) {
+ onConfigurationChanged(mResources.getConfiguration());
+ mContext.registerComponentCallbacks(this);
+ }
mMagnificationFrameOffsetX = Float.isNaN(magnificationFrameOffsetRatioX)
? mMagnificationFrameOffsetX
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
index 8b7aa09..3ece3cc 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
@@ -224,7 +224,8 @@
if (mUdfpsRequested && !getNotificationShadeVisible()
&& (!mIsBouncerVisible
- || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)) {
+ || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)
+ && mKeyguardStateController.isShowing()) {
return false;
}
diff --git a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt
index 2598518..8367e11 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt
@@ -244,7 +244,8 @@
restoreFinishedReceiver,
IntentFilter(BackupHelper.ACTION_RESTORE_FINISHED),
PERMISSION_SELF,
- null
+ null,
+ Context.RECEIVER_NOT_EXPORTED
)
listingController.addCallback(listingCallback)
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
index b235692..bda8e3c 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
@@ -36,6 +36,7 @@
import com.android.wm.shell.ShellCommandHandler;
import com.android.wm.shell.TaskViewFactory;
import com.android.wm.shell.apppairs.AppPairs;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.bubbles.Bubbles;
import com.android.wm.shell.compatui.CompatUI;
import com.android.wm.shell.displayareahelper.DisplayAreaHelper;
@@ -121,6 +122,9 @@
@BindsInstance
Builder setDragAndDrop(Optional<DragAndDrop> d);
+ @BindsInstance
+ Builder setBackAnimation(Optional<BackAnimation> b);
+
SysUIComponent build();
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
index 154f6fa..bbe9dbd 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java
@@ -26,7 +26,6 @@
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.clipboardoverlay.ClipboardListener;
import com.android.systemui.dreams.DreamOverlayRegistrant;
-import com.android.systemui.dreams.appwidgets.ComplicationPrimer;
import com.android.systemui.globalactions.GlobalActionsComponent;
import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.keyguard.dagger.KeyguardModule;
@@ -212,11 +211,4 @@
@ClassKey(DreamOverlayRegistrant.class)
public abstract CoreStartable bindDreamOverlayRegistrant(
DreamOverlayRegistrant dreamOverlayRegistrant);
-
- /** Inject into AppWidgetOverlayPrimer. */
- @Binds
- @IntoMap
- @ClassKey(ComplicationPrimer.class)
- public abstract CoreStartable bindAppWidgetOverlayPrimer(
- ComplicationPrimer complicationPrimer);
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java
index b815d4e..b926692 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java
@@ -24,6 +24,7 @@
import com.android.wm.shell.ShellInit;
import com.android.wm.shell.TaskViewFactory;
import com.android.wm.shell.apppairs.AppPairs;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.bubbles.Bubbles;
import com.android.wm.shell.compatui.CompatUI;
import com.android.wm.shell.dagger.TvWMShellModule;
@@ -123,4 +124,7 @@
@WMSingleton
DragAndDrop getDragAndDrop();
+
+ @WMSingleton
+ Optional<BackAnimation> getBackAnimation();
}
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
index 3631938..63d4d6b 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
@@ -163,16 +163,12 @@
// Delay screen state transitions even longer while animations are running.
boolean shouldDelayTransitionEnteringDoze = newState == DOZE_AOD
- && mParameters.shouldControlScreenOff() && !turningOn;
+ && mParameters.shouldDelayDisplayDozeTransition() && !turningOn;
// Delay screen state transition longer if UDFPS is actively authenticating a fp
boolean shouldDelayTransitionForUDFPS = newState == DOZE_AOD
&& mUdfpsController != null && mUdfpsController.isFingerDown();
- if (shouldDelayTransitionEnteringDoze || shouldDelayTransitionForUDFPS) {
- mWakeLock.setAcquired(true);
- }
-
if (!messagePending) {
if (DEBUG) {
Log.d(TAG, "Display state changed to " + screenState + " delayed by "
@@ -180,6 +176,18 @@
}
if (shouldDelayTransitionEnteringDoze) {
+ if (justInitialized) {
+ // If we are delaying transitioning to doze and the display was not
+ // turned on we set it to 'on' first to make sure that the animation
+ // is visible before eventually moving it to doze state.
+ // The display might be off at this point for example on foldable devices
+ // when we switch displays and go to doze at the same time.
+ applyScreenState(Display.STATE_ON);
+
+ // Restore pending screen state as it gets cleared by 'applyScreenState'
+ mPendingScreenState = screenState;
+ }
+
mHandler.postDelayed(mApplyPendingScreenState, ENTER_DOZE_DELAY);
} else if (shouldDelayTransitionForUDFPS) {
mDozeLog.traceDisplayStateDelayedByUdfps(mPendingScreenState);
@@ -190,6 +198,10 @@
} else if (DEBUG) {
Log.d(TAG, "Pending display state change to " + screenState);
}
+
+ if (shouldDelayTransitionEnteringDoze || shouldDelayTransitionForUDFPS) {
+ mWakeLock.setAcquired(true);
+ }
} else if (turningOff) {
mDozeHost.prepareForGentleSleep(() -> applyScreenState(screenState));
} else {
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/AppWidgetProvider.java b/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/AppWidgetProvider.java
deleted file mode 100644
index 687f7a2..0000000
--- a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/AppWidgetProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2021 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.dreams.appwidgets;
-
-import android.appwidget.AppWidgetHost;
-import android.appwidget.AppWidgetHostView;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.Log;
-
-import com.android.systemui.dagger.SysUISingleton;
-import com.android.systemui.dagger.qualifiers.Main;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-/**
- * {@link AppWidgetProvider} is a singleton for accessing app widgets within SystemUI. This
- * consolidates resources such as the {@link AppWidgetHost} across potentially multiple
- * {@link ComplicationProvider} instances and other usages.
- */
-@SysUISingleton
-public class AppWidgetProvider {
- private static final String TAG = "AppWidgetProvider";
- public static final int APP_WIDGET_HOST_ID = 1025;
-
- private final Context mContext;
- private final AppWidgetManager mAppWidgetManager;
- private final AppWidgetHost mAppWidgetHost;
- private final Resources mResources;
-
- @Inject
- public AppWidgetProvider(Context context, @Main Resources resources) {
- mContext = context;
- mResources = resources;
- mAppWidgetManager = android.appwidget.AppWidgetManager.getInstance(context);
- mAppWidgetHost = new AppWidgetHost(context, APP_WIDGET_HOST_ID);
- mAppWidgetHost.startListening();
- }
-
- /**
- * Returns an {@link AppWidgetHostView} associated with a given {@link ComponentName}.
- * @param component The {@link ComponentName} of the target {@link AppWidgetHostView}.
- * @return The {@link AppWidgetHostView} or {@code null} on error.
- */
- public AppWidgetHostView getWidget(ComponentName component) {
- final List<AppWidgetProviderInfo> appWidgetInfos =
- mAppWidgetManager.getInstalledProviders();
-
- for (AppWidgetProviderInfo widgetInfo : appWidgetInfos) {
- if (widgetInfo.provider.equals(component)) {
- final int widgetId = mAppWidgetHost.allocateAppWidgetId();
-
- boolean success = mAppWidgetManager.bindAppWidgetIdIfAllowed(widgetId,
- widgetInfo.provider);
-
- if (!success) {
- Log.e(TAG, "could not bind to app widget:" + component);
- break;
- }
-
- final AppWidgetHostView appWidgetView =
- mAppWidgetHost.createView(mContext, widgetId, widgetInfo);
-
- if (appWidgetView != null) {
- // Register a layout change listener to update the widget on any sizing changes.
- appWidgetView.addOnLayoutChangeListener(
- (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
- final float density = mResources.getDisplayMetrics().density;
- final int height = Math.round((bottom - top) / density);
- final int width = Math.round((right - left) / density);
- appWidgetView.updateAppWidgetSize(null, width, height,
- width, height);
- });
- }
-
- return appWidgetView;
- }
- }
-
- return null;
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationPrimer.java b/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationPrimer.java
deleted file mode 100644
index 7d30faf..0000000
--- a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationPrimer.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2021 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.dreams.appwidgets;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Resources;
-import android.view.Gravity;
-
-import androidx.constraintlayout.widget.ConstraintSet;
-
-import com.android.systemui.CoreStartable;
-import com.android.systemui.R;
-import com.android.systemui.dagger.qualifiers.Main;
-import com.android.systemui.dreams.ComplicationHostView;
-import com.android.systemui.dreams.DreamOverlayStateController;
-import com.android.systemui.dreams.appwidgets.dagger.AppWidgetComponent;
-
-import javax.inject.Inject;
-
-/**
- * {@link ComplicationPrimer} reads the configured AppWidget Complications from resources on start
- * and populates them into the {@link DreamOverlayStateController}.
- */
-public class ComplicationPrimer extends CoreStartable {
- private final Resources mResources;
- private final DreamOverlayStateController mDreamOverlayStateController;
- private final AppWidgetComponent.Factory mComponentFactory;
-
- @Inject
- public ComplicationPrimer(Context context, @Main Resources resources,
- DreamOverlayStateController overlayStateController,
- AppWidgetComponent.Factory appWidgetOverlayFactory) {
- super(context);
- mResources = resources;
- mDreamOverlayStateController = overlayStateController;
- mComponentFactory = appWidgetOverlayFactory;
- }
-
- @Override
- public void start() {
- }
-
- @Override
- protected void onBootCompleted() {
- super.onBootCompleted();
- loadDefaultWidgets();
- }
-
- /**
- * Generates the {@link ComplicationHostView.LayoutParams} for a given gravity. Default
- * dimension constraints are also included in the params.
- * @param gravity The gravity for the layout as defined by {@link Gravity}.
- * @param resources The resourcs from which default dimensions will be extracted from.
- * @return {@link ComplicationHostView.LayoutParams} representing the provided gravity and
- * default parameters.
- */
- private static ComplicationHostView.LayoutParams getLayoutParams(int gravity,
- Resources resources) {
- final ComplicationHostView.LayoutParams params = new ComplicationHostView.LayoutParams(
- ComplicationHostView.LayoutParams.MATCH_CONSTRAINT,
- ComplicationHostView.LayoutParams.MATCH_CONSTRAINT);
-
- if ((gravity & Gravity.BOTTOM) == Gravity.BOTTOM) {
- params.bottomToBottom = ConstraintSet.PARENT_ID;
- }
-
- if ((gravity & Gravity.TOP) == Gravity.TOP) {
- params.topToTop = ConstraintSet.PARENT_ID;
- }
-
- if ((gravity & Gravity.END) == Gravity.END) {
- params.endToEnd = ConstraintSet.PARENT_ID;
- }
-
- if ((gravity & Gravity.START) == Gravity.START) {
- params.startToStart = ConstraintSet.PARENT_ID;
- }
-
- // For now, apply the same sizing constraints on every widget.
- params.matchConstraintPercentHeight =
- resources.getFloat(R.dimen.config_dreamComplicationHeightPercent);
- params.matchConstraintPercentWidth =
- resources.getFloat(R.dimen.config_dreamComplicationWidthPercent);
-
- return params;
- }
-
- /**
- * Helper method for loading widgets based on configuration.
- */
- private void loadDefaultWidgets() {
- final int[] positions = mResources.getIntArray(R.array.config_dreamComplicationPositions);
- final String[] components =
- mResources.getStringArray(R.array.config_dreamAppWidgetComplications);
-
- for (int i = 0; i < Math.min(positions.length, components.length); i++) {
- final AppWidgetComponent component = mComponentFactory.build(
- ComponentName.unflattenFromString(components[i]),
- getLayoutParams(positions[i], mResources));
-
- mDreamOverlayStateController.addComplication(
- component.getAppWidgetComplicationProvider());
- }
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationProvider.java b/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationProvider.java
deleted file mode 100644
index 9188ee5..0000000
--- a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/ComplicationProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2021 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.dreams.appwidgets;
-
-import android.appwidget.AppWidgetHostView;
-import android.content.ComponentName;
-import android.content.Context;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import com.android.systemui.dreams.ComplicationHost;
-import com.android.systemui.dreams.ComplicationHostView;
-import com.android.systemui.plugins.ActivityStarter;
-
-import javax.inject.Inject;
-
-/**
- * {@link ComplicationProvider} is an implementation of
- * {@link com.android.systemui.dreams.ComplicationProvider} for providing app widget-based
- * complications.
- */
-public class ComplicationProvider implements com.android.systemui.dreams.ComplicationProvider {
- private static final String TAG = "AppWidgetCompProvider";
- private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
- private final ActivityStarter mActivityStarter;
- private final AppWidgetProvider mAppWidgetProvider;
- private final ComponentName mComponentName;
- private final ComplicationHostView.LayoutParams mLayoutParams;
-
- @Inject
- public ComplicationProvider(ActivityStarter activityStarter,
- ComponentName componentName, AppWidgetProvider widgetProvider,
- ComplicationHostView.LayoutParams layoutParams) {
- mActivityStarter = activityStarter;
- mComponentName = componentName;
- mAppWidgetProvider = widgetProvider;
- mLayoutParams = layoutParams;
- }
-
- @Override
- public void onCreateComplication(Context context,
- ComplicationHost.CreationCallback creationCallback,
- ComplicationHost.InteractionCallback interactionCallback) {
- final AppWidgetHostView widget = mAppWidgetProvider.getWidget(mComponentName);
-
- if (widget == null) {
- Log.e(TAG, "could not create widget");
- return;
- }
-
- widget.setInteractionHandler((view, pendingIntent, response) -> {
- if (pendingIntent.isActivity()) {
- if (DEBUG) {
- Log.d(TAG, "launching pending intent from app widget:" + mComponentName);
- }
- interactionCallback.onExit();
- mActivityStarter.startPendingIntentDismissingKeyguard(pendingIntent,
- null /*intentSentUiThreadCallback*/, view);
- return true;
- } else {
- return RemoteViews.startPendingIntent(view, pendingIntent,
- response.getLaunchOptions(view));
- }
- });
-
- creationCallback.onCreated(widget, mLayoutParams);
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/dagger/AppWidgetComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/dagger/AppWidgetComponent.java
deleted file mode 100644
index 7beed17..0000000
--- a/packages/SystemUI/src/com/android/systemui/dreams/appwidgets/dagger/AppWidgetComponent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 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.dreams.appwidgets.dagger;
-
-import android.content.ComponentName;
-
-import com.android.systemui.dreams.ComplicationHostView;
-import com.android.systemui.dreams.appwidgets.ComplicationProvider;
-
-import dagger.BindsInstance;
-import dagger.Subcomponent;
-
-/** */
-@Subcomponent
-public interface AppWidgetComponent {
- /** */
- @Subcomponent.Factory
- interface Factory {
- AppWidgetComponent build(@BindsInstance ComponentName component,
- @BindsInstance ComplicationHostView.LayoutParams layoutParams);
- }
-
- /** Builds a {@link ComplicationProvider}. */
- ComplicationProvider getAppWidgetComplicationProvider();
-}
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java
index 0d4688e..072f50d 100644
--- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java
@@ -16,15 +16,12 @@
package com.android.systemui.dreams.dagger;
-import com.android.systemui.dreams.appwidgets.dagger.AppWidgetComponent;
-
import dagger.Module;
/**
* Dagger Module providing Communal-related functionality.
*/
@Module(subcomponents = {
- AppWidgetComponent.class,
DreamOverlayComponent.class})
public interface DreamModule {
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java
index 5d6c2a2..4be819a 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java
@@ -74,9 +74,6 @@
public static final ResourceBooleanFlag BOUNCER_USER_SWITCHER =
new ResourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher);
- public static final ResourceBooleanFlag ACTIVE_UNLOCK =
- new ResourceBooleanFlag(205, R.bool.flag_active_unlock);
-
/***************************************/
// 300 - power menu
public static final BooleanFlag POWER_MENU_LITE =
diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
index b24d08d..3ae11ff 100644
--- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
+++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java
@@ -54,7 +54,7 @@
private final View mRootView;
private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(
ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE
- | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS);
+ | ActivityInfo.CONFIG_LAYOUT_DIRECTION | ActivityInfo.CONFIG_ASSETS_PATHS);
private final FragmentService mManager;
private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager();
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
index d190dcb..1bef32a 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
@@ -141,6 +141,7 @@
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBar;
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;
import com.android.wm.shell.pip.Pip;
@@ -190,6 +191,7 @@
private final Optional<Pip> mPipOptional;
private final Optional<LegacySplitScreen> mSplitScreenOptional;
private final Optional<Recents> mRecentsOptional;
+ private final Optional<BackAnimation> mBackAnimation;
private final SystemActions mSystemActions;
private final Handler mHandler;
private final NavigationBarOverlayController mNavbarOverlayController;
@@ -504,7 +506,8 @@
AutoHideController mainAutoHideController,
AutoHideController.Factory autoHideControllerFactory,
Optional<TelecomManager> telecomManagerOptional,
- InputMethodManager inputMethodManager) {
+ InputMethodManager inputMethodManager,
+ Optional<BackAnimation> backAnimation) {
mContext = context;
mWindowManager = windowManager;
mAccessibilityManager = accessibilityManager;
@@ -524,6 +527,7 @@
mPipOptional = pipOptional;
mSplitScreenOptional = splitScreenOptional;
mRecentsOptional = recentsOptional;
+ mBackAnimation = backAnimation;
mSystemActions = systemActions;
mHandler = mainHandler;
mNavbarOverlayController = navbarOverlayController;
@@ -629,6 +633,7 @@
mSplitScreenOptional.ifPresent(mNavigationBarView::registerDockedListener);
mPipOptional.ifPresent(mNavigationBarView::addPipExclusionBoundsChangeListener);
+ mBackAnimation.ifPresent(mNavigationBarView::registerBackAnimation);
prepareNavigationBarView();
checkNavBarModes();
@@ -1680,6 +1685,7 @@
private final AutoHideController.Factory mAutoHideControllerFactory;
private final Optional<TelecomManager> mTelecomManagerOptional;
private final InputMethodManager mInputMethodManager;
+ private final Optional<BackAnimation> mBackAnimation;
@Inject
public Factory(
@@ -1712,7 +1718,8 @@
AutoHideController mainAutoHideController,
AutoHideController.Factory autoHideControllerFactory,
Optional<TelecomManager> telecomManagerOptional,
- InputMethodManager inputMethodManager) {
+ InputMethodManager inputMethodManager,
+ Optional<BackAnimation> backAnimation) {
mAssistManagerLazy = assistManagerLazy;
mAccessibilityManager = accessibilityManager;
mDeviceProvisionedController = deviceProvisionedController;
@@ -1743,6 +1750,7 @@
mAutoHideControllerFactory = autoHideControllerFactory;
mTelecomManagerOptional = telecomManagerOptional;
mInputMethodManager = inputMethodManager;
+ mBackAnimation = backAnimation;
}
/** Construct a {@link NavigationBar} */
@@ -1759,7 +1767,7 @@
mNavbarOverlayController, mUiEventLogger, mNavBarHelper,
mUserTracker, mMainLightBarController, mLightBarControllerFactory,
mMainAutoHideController, mAutoHideControllerFactory, mTelecomManagerOptional,
- mInputMethodManager);
+ mInputMethodManager, mBackAnimation);
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
index a984974..98b49b1 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
@@ -59,6 +59,7 @@
import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;
import com.android.systemui.statusbar.phone.LightBarController;
import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.pip.Pip;
import java.io.FileDescriptor;
@@ -109,7 +110,8 @@
DumpManager dumpManager,
AutoHideController autoHideController,
LightBarController lightBarController,
- Optional<Pip> pipOptional) {
+ Optional<Pip> pipOptional,
+ Optional<BackAnimation> backAnimation) {
mContext = context;
mHandler = mainHandler;
mNavigationBarFactory = navigationBarFactory;
@@ -121,7 +123,8 @@
mTaskbarDelegate = taskbarDelegate;
mTaskbarDelegate.setDependencies(commandQueue, overviewProxyService,
navBarHelper, navigationModeController, sysUiFlagsContainer,
- dumpManager, autoHideController, lightBarController, pipOptional);
+ dumpManager, autoHideController, lightBarController, pipOptional,
+ backAnimation.orElse(null));
mIsTablet = isTablet(mContext);
dumpManager.registerDumpable(this);
}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
index ac816ba..2dd89f3 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
@@ -91,6 +91,7 @@
import com.android.systemui.statusbar.phone.LightBarTransitionsController;
import com.android.systemui.statusbar.phone.NotificationPanelViewController;
import com.android.systemui.statusbar.phone.StatusBar;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;
import com.android.wm.shell.pip.Pip;
@@ -1417,6 +1418,10 @@
pip.removePipExclusionBoundsChangeListener(mPipListener);
}
+ void registerBackAnimation(BackAnimation backAnimation) {
+ mEdgeBackGestureHandler.setBackAnimation(backAnimation);
+ }
+
private static void dumpButton(PrintWriter pw, String caption, ButtonDispatcher button) {
pw.print(" " + caption + ": ");
if (button == null) {
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
index 002dd10..441e79a 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java
@@ -69,6 +69,7 @@
import com.android.systemui.statusbar.phone.BarTransitions;
import com.android.systemui.statusbar.phone.LightBarController;
import com.android.systemui.statusbar.phone.LightBarTransitionsController;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.pip.Pip;
import java.io.FileDescriptor;
@@ -150,6 +151,7 @@
mAutoHideController.touchAutoHide();
}
};
+ private BackAnimation mBackAnimation;
@Inject
public TaskbarDelegate(Context context) {
@@ -172,7 +174,8 @@
SysUiState sysUiState, DumpManager dumpManager,
AutoHideController autoHideController,
LightBarController lightBarController,
- Optional<Pip> pipOptional) {
+ Optional<Pip> pipOptional,
+ BackAnimation backAnimation) {
// TODO: adding this in the ctor results in a dagger dependency cycle :(
mCommandQueue = commandQueue;
mOverviewProxyService = overviewProxyService;
@@ -184,6 +187,7 @@
mLightBarController = lightBarController;
mLightBarTransitionsController = createLightBarTransitionsController();
mPipOptional = pipOptional;
+ mBackAnimation = backAnimation;
}
// Separated into a method to keep setDependencies() clean/readable.
@@ -233,6 +237,7 @@
mAutoHideController.setNavigationBar(mAutoHideUiElement);
mLightBarController.setNavigationBar(mLightBarTransitionsController);
mPipOptional.ifPresent(this::addPipExclusionBoundsChangeListener);
+ mEdgeBackGestureHandler.setBackAnimation(mBackAnimation);
mInitialized = true;
}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index ab48a28..4f4bd1e 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -36,6 +36,7 @@
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.SystemProperties;
+import android.os.Trace;
import android.provider.DeviceConfig;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -79,6 +80,7 @@
import com.android.systemui.tracing.ProtoTracer;
import com.android.systemui.tracing.nano.EdgeBackGestureHandlerProto;
import com.android.systemui.tracing.nano.SystemUiTraceProto;
+import com.android.wm.shell.back.BackAnimation;
import java.io.PrintWriter;
import java.util.ArrayDeque;
@@ -231,6 +233,7 @@
private InputChannelCompat.InputEventReceiver mInputEventReceiver;
private NavigationEdgeBackPlugin mEdgeBackPlugin;
+ private BackAnimation mBackAnimation;
private int mLeftInset;
private int mRightInset;
private int mSysUiFlags;
@@ -494,7 +497,7 @@
Choreographer.getInstance(), this::onInputEvent);
// Add a nav bar panel window
- setEdgeBackPlugin(new NavigationBarEdgePanel(mContext));
+ setEdgeBackPlugin(new NavigationBarEdgePanel(mContext, mBackAnimation));
mPluginManager.addPluginListener(
this, NavigationEdgeBackPlugin.class, /*allowMultiple=*/ false);
}
@@ -509,7 +512,7 @@
@Override
public void onPluginDisconnected(NavigationEdgeBackPlugin plugin) {
- setEdgeBackPlugin(new NavigationBarEdgePanel(mContext));
+ setEdgeBackPlugin(new NavigationBarEdgePanel(mContext, mBackAnimation));
}
private void setEdgeBackPlugin(NavigationEdgeBackPlugin edgeBackPlugin) {
@@ -576,7 +579,9 @@
mMLModelThreshold = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.BACK_GESTURE_ML_MODEL_THRESHOLD, 0.9f);
if (mBackGestureTfClassifierProvider.isActive()) {
+ Trace.beginSection("EdgeBackGestureHandler#loadVocab");
mVocab = mBackGestureTfClassifierProvider.loadVocab(mContext.getAssets());
+ Trace.endSection();
mUseMLModel = true;
return;
}
@@ -930,6 +935,10 @@
proto.edgeBackGestureHandler.allowGesture = mAllowGesture;
}
+ public void setBackAnimation(BackAnimation backAnimation) {
+ mBackAnimation = backAnimation;
+ }
+
/**
* Injectable instance to create a new EdgeBackGestureHandler.
*
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
index 8d1dfc8..c18209d 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
@@ -57,6 +57,7 @@
import com.android.systemui.plugins.NavigationEdgeBackPlugin;
import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
import com.android.systemui.statusbar.VibratorHelper;
+import com.android.wm.shell.back.BackAnimation;
import java.io.PrintWriter;
import java.util.concurrent.Executor;
@@ -277,11 +278,14 @@
}
};
private BackCallback mBackCallback;
+ private final BackAnimation mBackAnimation;
- public NavigationBarEdgePanel(Context context) {
+ public NavigationBarEdgePanel(Context context,
+ BackAnimation backAnimation) {
super(context);
mWindowManager = context.getSystemService(WindowManager.class);
+ mBackAnimation = backAnimation;
mVibratorHelper = Dependency.get(VibratorHelper.class);
mDensity = context.getResources().getDisplayMetrics().density;
@@ -459,6 +463,9 @@
@Override
public void onMotionEvent(MotionEvent event) {
+ if (mBackAnimation != null) {
+ mBackAnimation.onBackMotion(event);
+ }
if (mVelocityTracker == null) {
mVelocityTracker = VelocityTracker.obtain();
}
@@ -866,6 +873,9 @@
// Whenever the trigger back state changes the existing translation animation should be
// cancelled
mTranslationAnimation.cancel();
+ if (mBackAnimation != null) {
+ mBackAnimation.setTriggerBack(triggerBack);
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
index c8e2ca7..e26c768 100644
--- a/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
+++ b/packages/SystemUI/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerController.java
@@ -93,6 +93,7 @@
private final DeviceConfigProxy mDeviceConfigProxy;
private final ArrayList<Callback> mCallbacks = new ArrayList<>();
private final UserTracker mUserTracker;
+ private final boolean mConfigEnableLockScreenButton;
private HashMap<Integer, ContentObserver> mQRCodeScannerPreferenceObserver = new HashMap<>();
private DeviceConfig.OnPropertiesChangedListener mOnDefaultQRCodeScannerChangedListener = null;
@@ -118,6 +119,9 @@
mSecureSettings = secureSettings;
mDeviceConfigProxy = proxy;
mUserTracker = userTracker;
+
+ mConfigEnableLockScreenButton = mContext.getResources().getBoolean(
+ android.R.bool.config_enableQrCodeScannerOnLockScreen);
}
/**
@@ -156,7 +160,7 @@
* Returns true if lock screen entry point for QR Code Scanner is to be enabled.
*/
public boolean isEnabledForLockScreenButton() {
- return mQRCodeScannerEnabled && mIntent != null;
+ return mQRCodeScannerEnabled && mIntent != null && mConfigEnableLockScreenButton;
}
/**
@@ -235,6 +239,11 @@
}
private void updateQRCodeScannerPreferenceDetails(boolean updateSettings) {
+ if (!mConfigEnableLockScreenButton) {
+ // Settings only apply to lock screen entry point.
+ return;
+ }
+
boolean prevQRCodeScannerEnabled = mQRCodeScannerEnabled;
mQRCodeScannerEnabled = mSecureSettings.getIntForUser(LOCK_SCREEN_SHOW_QR_CODE_SCANNER, 0,
mUserTracker.getUserId()) != 0;
@@ -251,8 +260,15 @@
private void updateQRCodeScannerActivityDetails() {
String qrCodeScannerActivity = mDeviceConfigProxy.getString(
DeviceConfig.NAMESPACE_SYSTEMUI,
- SystemUiDeviceConfigFlags.DEFAULT_QR_CODE_SCANNER,
- mContext.getResources().getString(R.string.def_qr_code_component));
+ SystemUiDeviceConfigFlags.DEFAULT_QR_CODE_SCANNER, "");
+
+ // "" means either the flags is not available or is set to "", and in both the cases we
+ // want to use R.string.def_qr_code_component
+ if (Objects.equals(qrCodeScannerActivity, "")) {
+ qrCodeScannerActivity =
+ mContext.getResources().getString(R.string.def_qr_code_component);
+ }
+
String prevQrCodeScannerActivity = mQRCodeScannerActivity;
ComponentName componentName = null;
Intent intent = new Intent();
@@ -281,8 +297,12 @@
// Our intent should always be explicit and should have a component set
if (intent.getComponent() == null) return false;
- int flags = PackageManager.MATCH_DEFAULT_ONLY | PackageManager.MATCH_DIRECT_BOOT_AWARE
- | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
+ int flags = PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_UNINSTALLED_PACKAGES
+ | PackageManager.MATCH_DISABLED_COMPONENTS
+ | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
+ | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS;
return !mContext.getPackageManager().queryIntentActivities(intent,
flags).isEmpty();
}
@@ -296,6 +316,11 @@
}
private void unregisterQRCodePreferenceObserver() {
+ if (!mConfigEnableLockScreenButton) {
+ // Settings only apply to lock screen entry point.
+ return;
+ }
+
mQRCodeScannerPreferenceObserver.forEach((key, value) -> {
mSecureSettings.unregisterContentObserver(value);
});
@@ -357,6 +382,11 @@
}
private void registerQRCodePreferenceObserver() {
+ if (!mConfigEnableLockScreenButton) {
+ // Settings only apply to lock screen entry point.
+ return;
+ }
+
int userId = mUserTracker.getUserId();
if (mQRCodeScannerPreferenceObserver.getOrDefault(userId, null) != null) return;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt
index e10e4d8..7ac9205 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsController.kt
@@ -56,7 +56,6 @@
*/
class FooterActionsController @Inject constructor(
view: FooterActionsView,
- private val qsPanelController: QSPanelController,
private val activityStarter: ActivityStarter,
private val userManager: UserManager,
private val userTracker: UserTracker,
@@ -82,7 +81,6 @@
private val settingsButton: SettingsButton = view.findViewById(R.id.settings_button)
private val settingsButtonContainer: View? = view.findViewById(R.id.settings_button_container)
- private val editButton: View = view.findViewById(android.R.id.edit)
private val powerMenuLite: View = view.findViewById(R.id.pm_lite)
private val onUserInfoChangedListener = OnUserInfoChangedListener { _, picture, _ ->
@@ -176,13 +174,6 @@
powerMenuLite.visibility = View.GONE
}
settingsButton.setOnClickListener(onClickListener)
- editButton.setOnClickListener(View.OnClickListener { view: View? ->
- if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
- return@OnClickListener
- }
- activityStarter.postQSRunnableDismissingKeyguard { qsPanelController.showEdit(view) }
- })
-
updateView()
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt
index dd4dc87..7694be5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsControllerBuilder.kt
@@ -36,7 +36,6 @@
import javax.inject.Named
class FooterActionsControllerBuilder @Inject constructor(
- private val qsPanelController: QSPanelController,
private val activityStarter: ActivityStarter,
private val userManager: UserManager,
private val userTracker: UserTracker,
@@ -66,7 +65,7 @@
}
fun build(): FooterActionsController {
- return FooterActionsController(view, qsPanelController, activityStarter, userManager,
+ return FooterActionsController(view, activityStarter, userManager,
userTracker, userInfoController, multiUserSwitchControllerFactory.create(view),
deviceProvisionedController, falsingManager, metricsLogger, tunerService,
globalActionsDialog, uiEventLogger, showPMLiteButton, buttonsVisibleState,
diff --git a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt
index f81f7bf..e6fa2ae 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt
@@ -43,7 +43,6 @@
private lateinit var multiUserSwitch: MultiUserSwitch
private lateinit var multiUserAvatar: ImageView
private lateinit var tunerIcon: View
- private lateinit var editTilesButton: View
private var settingsCogAnimator: TouchAnimator? = null
@@ -52,7 +51,6 @@
override fun onFinishInflate() {
super.onFinishInflate()
- editTilesButton = requireViewById(android.R.id.edit)
settingsButton = findViewById(R.id.settings_button)
settingsContainer = findViewById(R.id.settings_button_container)
multiUserSwitch = findViewById(R.id.multi_user_switch)
@@ -130,7 +128,6 @@
private fun updateClickabilities() {
multiUserSwitch.isClickable = multiUserSwitch.visibility == VISIBLE
- editTilesButton.isClickable = editTilesButton.visibility == VISIBLE
settingsButton.isClickable = settingsButton.visibility == VISIBLE
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
index 066a286..4622660 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
@@ -47,6 +47,7 @@
private PageIndicator mPageIndicator;
private TextView mBuildText;
private View mActionsContainer;
+ private View mEditButton;
@Nullable
protected TouchAnimator mFooterAnimator;
@@ -79,6 +80,7 @@
mPageIndicator = findViewById(R.id.footer_page_indicator);
mActionsContainer = requireViewById(R.id.qs_footer_actions);
mBuildText = findViewById(R.id.build);
+ mEditButton = findViewById(android.R.id.edit);
updateResources();
setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
@@ -130,6 +132,7 @@
.addFloat(mActionsContainer, "alpha", 0, 1)
.addFloat(mPageIndicator, "alpha", 0, 1)
.addFloat(mBuildText, "alpha", 0, 1)
+ .addFloat(mEditButton, "alpha", 0, 1)
.setStartDelay(0.9f);
return builder.build();
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java
index e7c06e3..5327b7e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java
@@ -26,6 +26,8 @@
import android.widget.Toast;
import com.android.systemui.R;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.qs.dagger.QSScope;
import com.android.systemui.settings.UserTracker;
import com.android.systemui.util.ViewController;
@@ -45,10 +47,15 @@
private final FooterActionsController mFooterActionsController;
private final TextView mBuildText;
private final PageIndicator mPageIndicator;
+ private final View mEditButton;
+ private final FalsingManager mFalsingManager;
+ private final ActivityStarter mActivityStarter;
@Inject
QSFooterViewController(QSFooterView view,
UserTracker userTracker,
+ FalsingManager falsingManager,
+ ActivityStarter activityStarter,
QSPanelController qsPanelController,
QuickQSPanelController quickQSPanelController,
@Named(QS_FOOTER) FooterActionsController footerActionsController) {
@@ -57,9 +64,12 @@
mQsPanelController = qsPanelController;
mQuickQSPanelController = quickQSPanelController;
mFooterActionsController = footerActionsController;
+ mFalsingManager = falsingManager;
+ mActivityStarter = activityStarter;
mBuildText = mView.findViewById(R.id.build);
mPageIndicator = mView.findViewById(R.id.footer_page_indicator);
+ mEditButton = mView.findViewById(android.R.id.edit);
}
@Override
@@ -91,6 +101,14 @@
}
return false;
});
+
+ mEditButton.setOnClickListener(view -> {
+ if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
+ return;
+ }
+ mActivityStarter
+ .postQSRunnableDismissingKeyguard(() -> mQsPanelController.showEdit(view));
+ });
mQsPanelController.setFooterPageIndicator(mPageIndicator);
mView.updateEverything();
}
@@ -103,6 +121,7 @@
@Override
public void setVisibility(int visibility) {
mView.setVisibility(visibility);
+ mEditButton.setClickable(visibility == View.VISIBLE);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java
index 596d8f0..e2964ea 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java
@@ -129,17 +129,27 @@
? R.string.quick_settings_dark_mode_secondary_label_until_sunrise
: R.string.quick_settings_dark_mode_secondary_label_on_at_sunset);
} else if (uiMode == UiModeManager.MODE_NIGHT_CUSTOM) {
- final boolean use24HourFormat = android.text.format.DateFormat.is24HourFormat(mContext);
- final LocalTime time;
- if (nightMode) {
- time = mUiModeManager.getCustomNightModeEnd();
+ int nightModeCustomType = mUiModeManager.getNightModeCustomType();
+ if (nightModeCustomType == UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE) {
+ final boolean use24HourFormat = android.text.format.DateFormat.is24HourFormat(
+ mContext);
+ final LocalTime time;
+ if (nightMode) {
+ time = mUiModeManager.getCustomNightModeEnd();
+ } else {
+ time = mUiModeManager.getCustomNightModeStart();
+ }
+ state.secondaryLabel = mContext.getResources().getString(nightMode
+ ? R.string.quick_settings_dark_mode_secondary_label_until
+ : R.string.quick_settings_dark_mode_secondary_label_on_at,
+ use24HourFormat ? time.toString() : formatter.format(time));
+ } else if (nightModeCustomType == UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {
+ state.secondaryLabel = mContext.getResources().getString(nightMode
+ ? R.string.quick_settings_dark_mode_secondary_label_until_bedtime_ends
+ : R.string.quick_settings_dark_mode_secondary_label_on_at_bedtime);
} else {
- time = mUiModeManager.getCustomNightModeStart();
+ state.secondaryLabel = null;
}
- state.secondaryLabel = mContext.getResources().getString(nightMode
- ? R.string.quick_settings_dark_mode_secondary_label_until
- : R.string.quick_settings_dark_mode_secondary_label_on_at,
- use24HourFormat ? time.toString() : formatter.format(time));
} else {
state.secondaryLabel = null;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt
index c8115e2..9a932ba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LightRevealScrim.kt
@@ -355,7 +355,8 @@
}
override fun onDraw(canvas: Canvas?) {
- if (canvas == null || revealGradientWidth <= 0 || revealGradientHeight <= 0) {
+ if (canvas == null || revealGradientWidth <= 0 || revealGradientHeight <= 0
+ || revealAmount == 0f) {
if (revealAmount < 1f) {
canvas?.drawColor(revealGradientEndColor)
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt
index 3449bd8..5aeab84 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt
@@ -23,7 +23,6 @@
import android.os.Handler
import android.service.notification.NotificationListenerService.Ranking
import android.service.notification.NotificationListenerService.RankingMap
-import com.android.internal.statusbar.NotificationVisibility
import com.android.internal.widget.ConversationLayout
import com.android.internal.widget.MessagingImageMessage
import com.android.internal.widget.MessagingLayout
@@ -31,6 +30,7 @@
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.plugins.statusbar.StatusBarStateController
import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager
import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy
import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
@@ -72,7 +72,8 @@
*/
@SysUISingleton
class AnimatedImageNotificationManager @Inject constructor(
- private val notificationEntryManager: NotificationEntryManager,
+ private val notifCollection: CommonNotifCollection,
+ private val bindEventManager: BindEventManager,
private val headsUpManager: HeadsUpManager,
private val statusBarStateController: StatusBarStateController
) {
@@ -83,33 +84,23 @@
fun bind() {
headsUpManager.addListener(object : OnHeadsUpChangedListener {
override fun onHeadsUpStateChanged(entry: NotificationEntry, isHeadsUp: Boolean) {
- entry.row?.let { row ->
- updateAnimatedImageDrawables(row, animating = isHeadsUp || isStatusBarExpanded)
- }
+ updateAnimatedImageDrawables(entry)
}
})
statusBarStateController.addCallback(object : StatusBarStateController.StateListener {
override fun onExpandedChanged(isExpanded: Boolean) {
isStatusBarExpanded = isExpanded
- notificationEntryManager.activeNotificationsForCurrentUser.forEach { entry ->
- entry.row?.let { row ->
- updateAnimatedImageDrawables(row, animating = isExpanded || row.isHeadsUp)
- }
- }
+ notifCollection.allNotifs.forEach(::updateAnimatedImageDrawables)
}
})
- notificationEntryManager.addNotificationEntryListener(object : NotificationEntryListener {
- override fun onEntryInflated(entry: NotificationEntry) {
- entry.row?.let { row ->
- updateAnimatedImageDrawables(
- row,
- animating = isStatusBarExpanded || row.isHeadsUp)
- }
- }
- override fun onEntryReinflated(entry: NotificationEntry) = onEntryInflated(entry)
- })
+ bindEventManager.addListener(::updateAnimatedImageDrawables)
}
+ private fun updateAnimatedImageDrawables(entry: NotificationEntry) =
+ entry.row?.let { row ->
+ updateAnimatedImageDrawables(row, animating = row.isHeadsUp || isStatusBarExpanded)
+ }
+
private fun updateAnimatedImageDrawables(row: ExpandableNotificationRow, animating: Boolean) =
(row.layouts?.asSequence() ?: emptySequence())
.flatMap { layout -> layout.allViews.asSequence() }
@@ -138,7 +129,7 @@
*/
@SysUISingleton
class ConversationNotificationManager @Inject constructor(
- private val notificationEntryManager: NotificationEntryManager,
+ private val bindEventManager: BindEventManager,
private val notificationGroupManager: NotificationGroupManagerLegacy,
private val context: Context,
private val notifCollection: CommonNotifCollection,
@@ -151,35 +142,12 @@
private var notifPanelCollapsed = true
- private val entryManagerListener = object : NotificationEntryListener {
- override fun onNotificationRankingUpdated(rankingMap: RankingMap) =
- updateNotificationRanking(rankingMap)
- override fun onEntryInflated(entry: NotificationEntry) =
- onEntryViewBound(entry)
- override fun onEntryReinflated(entry: NotificationEntry) = onEntryInflated(entry)
- override fun onEntryRemoved(
- entry: NotificationEntry,
- visibility: NotificationVisibility?,
- removedByUser: Boolean,
- reason: Int
- ) = removeTrackedEntry(entry)
- }
-
- private val notifCollectionListener = object : NotifCollectionListener {
- override fun onRankingUpdate(ranking: RankingMap) =
- updateNotificationRanking(ranking)
-
- override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {
- removeTrackedEntry(entry)
- }
- }
-
private fun updateNotificationRanking(rankingMap: RankingMap) {
fun getLayouts(view: NotificationContentView) =
sequenceOf(view.contractedChild, view.expandedChild, view.headsUpChild)
val ranking = Ranking()
val activeConversationEntries = states.keys.asSequence()
- .mapNotNull { notificationEntryManager.getActiveNotificationUnfiltered(it) }
+ .mapNotNull { notifCollection.getEntry(it) }
for (entry in activeConversationEntries) {
if (rankingMap.getRanking(entry.sbn.key, ranking) && ranking.isConversation) {
val important = ranking.channel.isImportantConversation
@@ -204,7 +172,7 @@
layout.setIsImportantConversation(important, false)
}
}
- if (changed) {
+ if (changed && !featureFlags.isNewPipelineEnabled()) {
notificationGroupManager.updateIsolation(entry)
}
}
@@ -233,11 +201,14 @@
}
init {
- if (featureFlags.isNewPipelineEnabled()) {
- notifCollection.addCollectionListener(notifCollectionListener)
- } else {
- notificationEntryManager.addNotificationEntryListener(entryManagerListener)
- }
+ notifCollection.addCollectionListener(object : NotifCollectionListener {
+ override fun onRankingUpdate(ranking: RankingMap) =
+ updateNotificationRanking(ranking)
+
+ override fun onEntryRemoved(entry: NotificationEntry, reason: Int) =
+ removeTrackedEntry(entry)
+ })
+ bindEventManager.addListener(::onEntryViewBound)
}
private fun ConversationState.shouldIncrementUnread(newBuilder: Notification.Builder) =
@@ -265,11 +236,10 @@
val expanded = states
.asSequence()
.mapNotNull { (key, _) ->
- notificationEntryManager.getActiveNotificationUnfiltered(key)
- ?.let { entry ->
- if (entry.row?.isExpanded == true) key to entry
- else null
- }
+ notifCollection.getEntry(key)?.let { entry ->
+ if (entry.row?.isExpanded == true) key to entry
+ else null
+ }
}
.toMap()
states.replaceAll { key, state ->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/SectionHeaderVisibilityProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/SectionHeaderVisibilityProvider.kt
new file mode 100644
index 0000000..03b978e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/SectionHeaderVisibilityProvider.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 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
+
+import com.android.systemui.dagger.SysUISingleton
+import javax.inject.Inject
+
+/**
+ * A class which keeps track of whether section headers should be shown in the notification shade.
+ *
+ * (In an ideal world, this would directly monitor the state of the keyguard and invalidate the
+ * pipeline to show/hide headers, but the KeyguardController already invalidates the pipeline when
+ * the keyguard's state changes. Instead of having both classes monitor for state changes and ending
+ * up with duplicate runs of the pipeline, we let the KeyguardController update the header
+ * visibility when it invalidates, and we just store that state here.)
+ */
+@SysUISingleton
+class SectionHeaderVisibilityProvider @Inject constructor() {
+ var sectionHeadersVisible = true
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java
index 09ae7eb..87e531c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescer.java
@@ -260,7 +260,8 @@
}
events.sort(mEventComparator);
- mLogger.logEmitBatch(batch.mGroupKey);
+ long batchAge = mClock.uptimeMillis() - batch.mCreatedTimestamp;
+ mLogger.logEmitBatch(batch.mGroupKey, batch.mMembers.size(), batchAge);
mHandler.onNotificationBatchPosted(events);
}
@@ -337,6 +338,6 @@
void onNotificationBatchPosted(List<CoalescedEvent> events);
}
- private static final int MIN_GROUP_LINGER_DURATION = 50;
+ private static final int MIN_GROUP_LINGER_DURATION = 200;
private static final int MAX_GROUP_LINGER_DURATION = 500;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt
index d4d5b64..211e374 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coalescer/GroupCoalescerLogger.kt
@@ -32,11 +32,13 @@
})
}
- fun logEmitBatch(groupKey: String) {
+ fun logEmitBatch(groupKey: String, batchSize: Int, batchAgeMs: Long) {
buffer.log(TAG, LogLevel.DEBUG, {
str1 = groupKey
+ int1 = batchSize
+ long1 = batchAgeMs
}, {
- "Emitting event batch for group $str1"
+ "Emitting batch for group $str1 size=$int1 age=${long1}ms"
})
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java
index 3a39c39..f04b24e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinator.java
@@ -101,7 +101,7 @@
};
/**
- * Puts foreground service notifications into its own section.
+ * Puts colorized foreground service and call notifications into its own section.
*/
private final NotifSectioner mNotifSectioner = new NotifSectioner("ForegroundService",
NotificationPriorityBucketKt.BUCKET_FOREGROUND_SERVICE) {
@@ -109,12 +109,22 @@
public boolean isInSection(ListEntry entry) {
NotificationEntry notificationEntry = entry.getRepresentativeEntry();
if (notificationEntry != null) {
- Notification notification = notificationEntry.getSbn().getNotification();
- return notification.isForegroundService()
- && notification.isColorized()
- && entry.getRepresentativeEntry().getImportance() > IMPORTANCE_MIN;
+ return isColorizedForegroundService(notificationEntry) || isCall(notificationEntry);
}
return false;
}
+
+ private boolean isColorizedForegroundService(NotificationEntry entry) {
+ Notification notification = entry.getSbn().getNotification();
+ return notification.isForegroundService()
+ && notification.isColorized()
+ && entry.getImportance() > IMPORTANCE_MIN;
+ }
+
+ private boolean isCall(NotificationEntry entry) {
+ Notification notification = entry.getSbn().getNotification();
+ return entry.getImportance() > IMPORTANCE_MIN
+ && notification.isStyle(Notification.CallStyle.class);
+ }
};
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt
index e59f4a6..ba88ad7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt
@@ -20,11 +20,13 @@
import com.android.systemui.statusbar.notification.collection.NotifPipeline
import com.android.systemui.statusbar.notification.collection.NotificationEntry
import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner
import com.android.systemui.statusbar.notification.collection.render.NodeController
import com.android.systemui.statusbar.notification.dagger.PeopleHeader
import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier
+import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.PeopleNotificationType
import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_NON_PERSON
import com.android.systemui.statusbar.notification.stack.BUCKET_PEOPLE
import javax.inject.Inject
@@ -48,18 +50,36 @@
val sectioner = object : NotifSectioner("People", BUCKET_PEOPLE) {
override fun isInSection(entry: ListEntry): Boolean =
- isConversation(entry.representativeEntry!!)
+ isConversation(entry)
override fun getHeaderNodeController() =
// TODO: remove SHOW_ALL_SECTIONS, this redundant method, and peopleHeaderController
if (RankingCoordinator.SHOW_ALL_SECTIONS) peopleHeaderController else null
}
+ val comparator = object : NotifComparator("People") {
+ override fun compare(entry1: ListEntry, entry2: ListEntry): Int {
+ assert(entry1.section === entry2.section)
+ if (entry1.section?.sectioner !== sectioner) {
+ return 0
+ }
+ val type1 = getPeopleType(entry1)
+ val type2 = getPeopleType(entry2)
+ return type2.compareTo(type1)
+ }
+ }
+
override fun attach(pipeline: NotifPipeline) {
pipeline.addPromoter(notificationPromoter)
}
- private fun isConversation(entry: NotificationEntry): Boolean =
- peopleNotificationIdentifier.getPeopleNotificationType(entry) != TYPE_NON_PERSON
+ private fun isConversation(entry: ListEntry): Boolean =
+ getPeopleType(entry) != TYPE_NON_PERSON
+
+ @PeopleNotificationType
+ private fun getPeopleType(entry: ListEntry): Int =
+ entry.representativeEntry?.let {
+ peopleNotificationIdentifier.getPeopleNotificationType(it)
+ } ?: TYPE_NON_PERSON
companion object {
private const val TAG = "ConversationCoordinator"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java
deleted file mode 100644
index 7410912..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * 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.NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY;
-import static com.android.systemui.statusbar.notification.interruption.HeadsUpController.alertAgain;
-
-import android.util.ArraySet;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.systemui.dagger.qualifiers.Main;
-import com.android.systemui.statusbar.NotificationRemoteInputManager;
-import com.android.systemui.statusbar.notification.collection.ListEntry;
-import com.android.systemui.statusbar.notification.collection.NotifPipeline;
-import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope;
-import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
-import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner;
-import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;
-import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender;
-import com.android.systemui.statusbar.notification.collection.render.NodeController;
-import com.android.systemui.statusbar.notification.dagger.IncomingHeader;
-import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder;
-import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;
-import com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
-import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;
-import com.android.systemui.util.concurrency.DelayableExecutor;
-
-import javax.inject.Inject;
-
-/**
- * Coordinates heads up notification (HUN) interactions with the notification pipeline based on
- * the HUN state reported by the {@link HeadsUpManager}. In this class we only consider one
- * notification, in particular the {@link HeadsUpManager#getTopEntry()}, to be HeadsUpping at a
- * time even though other notifications may be queued to heads up next.
- *
- * The current HUN, but not HUNs that are queued to heads up, will be:
- * - Lifetime extended until it's no longer heads upping.
- * - Promoted out of its group if it's a child of a group.
- * - In the HeadsUpCoordinatorSection. Ordering is configured in {@link NotifCoordinators}.
- * - Removed from HeadsUpManager if it's removed from the NotificationCollection.
- *
- * Note: The inflation callback in {@link PreparationCoordinator} handles showing HUNs.
- */
-@CoordinatorScope
-public class HeadsUpCoordinator implements Coordinator {
- private static final String TAG = "HeadsUpCoordinator";
-
- private final HeadsUpManager mHeadsUpManager;
- private final HeadsUpViewBinder mHeadsUpViewBinder;
- private final NotificationInterruptStateProvider mNotificationInterruptStateProvider;
- private final NotificationRemoteInputManager mRemoteInputManager;
- private final NodeController mIncomingHeaderController;
- private final DelayableExecutor mExecutor;
-
- private NotifLifetimeExtender.OnEndLifetimeExtensionCallback mEndLifetimeExtension;
- // notifs we've extended the lifetime for
- private final ArraySet<NotificationEntry> mNotifsExtendingLifetime = new ArraySet<>();
-
- @Inject
- public HeadsUpCoordinator(
- HeadsUpManager headsUpManager,
- HeadsUpViewBinder headsUpViewBinder,
- NotificationInterruptStateProvider notificationInterruptStateProvider,
- NotificationRemoteInputManager remoteInputManager,
- @IncomingHeader NodeController incomingHeaderController,
- @Main DelayableExecutor executor) {
- mHeadsUpManager = headsUpManager;
- mHeadsUpViewBinder = headsUpViewBinder;
- mNotificationInterruptStateProvider = notificationInterruptStateProvider;
- mRemoteInputManager = remoteInputManager;
- mIncomingHeaderController = incomingHeaderController;
- mExecutor = executor;
- }
-
- @Override
- public void attach(NotifPipeline pipeline) {
- mHeadsUpManager.addListener(mOnHeadsUpChangedListener);
- pipeline.addCollectionListener(mNotifCollectionListener);
- pipeline.addPromoter(mNotifPromoter);
- pipeline.addNotificationLifetimeExtender(mLifetimeExtender);
- }
-
- public NotifSectioner getSectioner() {
- return mNotifSectioner;
- }
-
- private void onHeadsUpViewBound(NotificationEntry entry) {
- mHeadsUpManager.showNotification(entry);
- }
-
- private final NotifCollectionListener mNotifCollectionListener = new NotifCollectionListener() {
- /**
- * Notification was just added and if it should heads up, bind the view and then show it.
- */
- @Override
- public void onEntryAdded(NotificationEntry entry) {
- if (mNotificationInterruptStateProvider.shouldHeadsUp(entry)) {
- mHeadsUpViewBinder.bindHeadsUpView(
- entry,
- HeadsUpCoordinator.this::onHeadsUpViewBound);
- }
- }
-
- /**
- * Notification could've updated to be heads up or not heads up. Even if it did update to
- * heads up, if the notification specified that it only wants to alert once, don't heads
- * up again.
- */
- @Override
- public void onEntryUpdated(NotificationEntry entry) {
- boolean hunAgain = alertAgain(entry, entry.getSbn().getNotification());
- // includes check for whether this notification should be filtered:
- boolean shouldHeadsUp = mNotificationInterruptStateProvider.shouldHeadsUp(entry);
- final boolean wasHeadsUp = mHeadsUpManager.isAlerting(entry.getKey());
- if (wasHeadsUp) {
- if (shouldHeadsUp) {
- mHeadsUpManager.updateNotification(entry.getKey(), hunAgain);
- } else if (!mHeadsUpManager.isEntryAutoHeadsUpped(entry.getKey())) {
- // We don't want this to be interrupting anymore, let's remove it
- mHeadsUpManager.removeNotification(
- entry.getKey(), false /* removeImmediately */);
- }
- } else if (shouldHeadsUp && hunAgain) {
- // This notification was updated to be heads up, show it!
- mHeadsUpViewBinder.bindHeadsUpView(
- entry,
- HeadsUpCoordinator.this::onHeadsUpViewBound);
- }
- }
-
- /**
- * Stop alerting HUNs that are removed from the notification collection
- */
- @Override
- public void onEntryRemoved(NotificationEntry entry, int reason) {
- final String entryKey = entry.getKey();
- if (mHeadsUpManager.isAlerting(entryKey)) {
- boolean removeImmediatelyForRemoteInput =
- mRemoteInputManager.isSpinning(entryKey)
- && !FORCE_REMOTE_INPUT_HISTORY;
- mHeadsUpManager.removeNotification(entry.getKey(), removeImmediatelyForRemoteInput);
- }
- }
-
- @Override
- public void onEntryCleanUp(NotificationEntry entry) {
- mHeadsUpViewBinder.abortBindCallback(entry);
- }
- };
-
- private final NotifLifetimeExtender mLifetimeExtender = new NotifLifetimeExtender() {
- @Override
- public @NonNull String getName() {
- return TAG;
- }
-
- @Override
- public void setCallback(@NonNull OnEndLifetimeExtensionCallback callback) {
- mEndLifetimeExtension = callback;
- }
-
- @Override
- public boolean maybeExtendLifetime(@NonNull NotificationEntry entry, int reason) {
- boolean extend = !mHeadsUpManager.canRemoveImmediately(entry.getKey());
- if (extend) {
- if (isSticky(entry)) {
- long removeAfterMillis = mHeadsUpManager.getEarliestRemovalTime(entry.getKey());
- mExecutor.executeDelayed(() -> {
- if (mNotifsExtendingLifetime.contains(entry)
- && mHeadsUpManager.canRemoveImmediately(entry.getKey())) {
- mHeadsUpManager.removeNotification(
- entry.getKey(), /* releaseImmediately */ true);
- }
- }, removeAfterMillis);
- } else {
- // remove as early as possible
- mExecutor.execute(
- () -> mHeadsUpManager.removeNotification(
- entry.getKey(), /* releaseImmediately */ false));
- }
- mNotifsExtendingLifetime.add(entry);
- }
- return extend;
- }
-
- @Override
- public void cancelLifetimeExtension(@NonNull NotificationEntry entry) {
- mNotifsExtendingLifetime.remove(entry);
- }
- };
-
- private final NotifPromoter mNotifPromoter = new NotifPromoter(TAG) {
- @Override
- public boolean shouldPromoteToTopLevel(NotificationEntry entry) {
- return isCurrentlyShowingHun(entry);
- }
- };
-
- private final NotifSectioner mNotifSectioner = new NotifSectioner("HeadsUp",
- NotificationPriorityBucketKt.BUCKET_HEADS_UP) {
- @Override
- public boolean isInSection(ListEntry entry) {
- return isCurrentlyShowingHun(entry);
- }
-
- @Nullable
- @Override
- public NodeController getHeaderNodeController() {
- // TODO: remove SHOW_ALL_SECTIONS, this redundant method, and mIncomingHeaderController
- if (RankingCoordinator.SHOW_ALL_SECTIONS) {
- return mIncomingHeaderController;
- }
- return null;
- }
- };
-
- private final OnHeadsUpChangedListener mOnHeadsUpChangedListener =
- new OnHeadsUpChangedListener() {
- @Override
- public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {
- if (!isHeadsUp) {
- mHeadsUpViewBinder.unbindHeadsUpView(entry);
- endNotifLifetimeExtensionIfExtended(entry);
- }
- }
- };
-
- private boolean isSticky(NotificationEntry entry) {
- return mHeadsUpManager.isSticky(entry.getKey());
- }
-
- private boolean isCurrentlyShowingHun(ListEntry entry) {
- return mHeadsUpManager.isAlerting(entry.getKey());
- }
-
- private void endNotifLifetimeExtensionIfExtended(NotificationEntry entry) {
- if (mNotifsExtendingLifetime.remove(entry)) {
- mEndLifetimeExtension.onEndLifetimeExtension(mLifetimeExtender, entry);
- }
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt
new file mode 100644
index 0000000..b84b382
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinator.kt
@@ -0,0 +1,200 @@
+/*
+ * 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 android.util.ArraySet
+import com.android.systemui.dagger.qualifiers.Main
+import com.android.systemui.statusbar.NotificationRemoteInputManager
+import com.android.systemui.statusbar.notification.collection.ListEntry
+import com.android.systemui.statusbar.notification.collection.NotifPipeline
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender.OnEndLifetimeExtensionCallback
+import com.android.systemui.statusbar.notification.collection.render.NodeController
+import com.android.systemui.statusbar.notification.dagger.IncomingHeader
+import com.android.systemui.statusbar.notification.interruption.HeadsUpController
+import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder
+import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider
+import com.android.systemui.statusbar.notification.stack.BUCKET_HEADS_UP
+import com.android.systemui.statusbar.policy.HeadsUpManager
+import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener
+import com.android.systemui.util.concurrency.DelayableExecutor
+import javax.inject.Inject
+
+/**
+ * Coordinates heads up notification (HUN) interactions with the notification pipeline based on
+ * the HUN state reported by the [HeadsUpManager]. In this class we only consider one
+ * notification, in particular the [HeadsUpManager.getTopEntry], to be HeadsUpping at a
+ * time even though other notifications may be queued to heads up next.
+ *
+ * The current HUN, but not HUNs that are queued to heads up, will be:
+ * - Lifetime extended until it's no longer heads upping.
+ * - Promoted out of its group if it's a child of a group.
+ * - In the HeadsUpCoordinatorSection. Ordering is configured in [NotifCoordinators].
+ * - Removed from HeadsUpManager if it's removed from the NotificationCollection.
+ *
+ * Note: The inflation callback in [PreparationCoordinator] handles showing HUNs.
+ */
+@CoordinatorScope
+class HeadsUpCoordinator @Inject constructor(
+ private val mHeadsUpManager: HeadsUpManager,
+ private val mHeadsUpViewBinder: HeadsUpViewBinder,
+ private val mNotificationInterruptStateProvider: NotificationInterruptStateProvider,
+ private val mRemoteInputManager: NotificationRemoteInputManager,
+ @IncomingHeader private val mIncomingHeaderController: NodeController,
+ @Main private val mExecutor: DelayableExecutor
+) : Coordinator {
+ private var mEndLifetimeExtension: OnEndLifetimeExtensionCallback? = null
+
+ // notifs we've extended the lifetime for
+ private val mNotifsExtendingLifetime = ArraySet<NotificationEntry>()
+
+ override fun attach(pipeline: NotifPipeline) {
+ mHeadsUpManager.addListener(mOnHeadsUpChangedListener)
+ pipeline.addCollectionListener(mNotifCollectionListener)
+ pipeline.addPromoter(mNotifPromoter)
+ pipeline.addNotificationLifetimeExtender(mLifetimeExtender)
+ }
+
+ private fun onHeadsUpViewBound(entry: NotificationEntry) {
+ mHeadsUpManager.showNotification(entry)
+ }
+
+ private val mNotifCollectionListener = object : NotifCollectionListener {
+ /**
+ * Notification was just added and if it should heads up, bind the view and then show it.
+ */
+ override fun onEntryAdded(entry: NotificationEntry) {
+ if (mNotificationInterruptStateProvider.shouldHeadsUp(entry)) {
+ mHeadsUpViewBinder.bindHeadsUpView(entry) { entry -> onHeadsUpViewBound(entry) }
+ }
+ }
+
+ /**
+ * Notification could've updated to be heads up or not heads up. Even if it did update to
+ * heads up, if the notification specified that it only wants to alert once, don't heads
+ * up again.
+ */
+ override fun onEntryUpdated(entry: NotificationEntry) {
+ val hunAgain = HeadsUpController.alertAgain(entry, entry.sbn.notification)
+ // includes check for whether this notification should be filtered:
+ val shouldHeadsUp = mNotificationInterruptStateProvider.shouldHeadsUp(entry)
+ val wasHeadsUp = mHeadsUpManager.isAlerting(entry.key)
+ if (wasHeadsUp) {
+ if (shouldHeadsUp) {
+ mHeadsUpManager.updateNotification(entry.key, hunAgain)
+ } else if (!mHeadsUpManager.isEntryAutoHeadsUpped(entry.key)) {
+ // We don't want this to be interrupting anymore, let's remove it
+ mHeadsUpManager.removeNotification(
+ entry.key, false /* removeImmediately */
+ )
+ }
+ } else if (shouldHeadsUp && hunAgain) {
+ // This notification was updated to be heads up, show it!
+ mHeadsUpViewBinder.bindHeadsUpView(entry) { entry -> onHeadsUpViewBound(entry) }
+ }
+ }
+
+ /**
+ * Stop alerting HUNs that are removed from the notification collection
+ */
+ override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {
+ val entryKey = entry.key
+ if (mHeadsUpManager.isAlerting(entryKey)) {
+ val removeImmediatelyForRemoteInput = (mRemoteInputManager.isSpinning(entryKey) &&
+ !NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY)
+ mHeadsUpManager.removeNotification(entry.key, removeImmediatelyForRemoteInput)
+ }
+ }
+
+ override fun onEntryCleanUp(entry: NotificationEntry) {
+ mHeadsUpViewBinder.abortBindCallback(entry)
+ }
+ }
+
+ private val mLifetimeExtender = object : NotifLifetimeExtender {
+ override fun getName() = TAG
+
+ override fun setCallback(callback: OnEndLifetimeExtensionCallback) {
+ mEndLifetimeExtension = callback
+ }
+
+ override fun maybeExtendLifetime(entry: NotificationEntry, reason: Int): Boolean {
+ if (mHeadsUpManager.canRemoveImmediately(entry.key)) {
+ return false
+ }
+ if (isSticky(entry)) {
+ val removeAfterMillis = mHeadsUpManager.getEarliestRemovalTime(entry.key)
+ mExecutor.executeDelayed({
+ val canStillRemove = mHeadsUpManager.canRemoveImmediately(entry.key)
+ if (mNotifsExtendingLifetime.contains(entry) && canStillRemove) {
+ mHeadsUpManager.removeNotification(entry.key, /* releaseImmediately */ true)
+ }
+ }, removeAfterMillis)
+ } else {
+ mExecutor.execute {
+ mHeadsUpManager.removeNotification(entry.key, /* releaseImmediately */ false)
+ }
+ }
+ mNotifsExtendingLifetime.add(entry)
+ return true
+ }
+
+ override fun cancelLifetimeExtension(entry: NotificationEntry) {
+ mNotifsExtendingLifetime.remove(entry)
+ }
+ }
+
+ private val mNotifPromoter = object : NotifPromoter(TAG) {
+ override fun shouldPromoteToTopLevel(entry: NotificationEntry): Boolean =
+ isCurrentlyShowingHun(entry)
+ }
+
+ val sectioner = object : NotifSectioner("HeadsUp", BUCKET_HEADS_UP) {
+ override fun isInSection(entry: ListEntry): Boolean = isCurrentlyShowingHun(entry)
+
+ override fun getHeaderNodeController(): NodeController? =
+ // TODO: remove SHOW_ALL_SECTIONS, this redundant method, and mIncomingHeaderController
+ if (RankingCoordinator.SHOW_ALL_SECTIONS) mIncomingHeaderController else null
+ }
+
+ private val mOnHeadsUpChangedListener = object : OnHeadsUpChangedListener {
+ override fun onHeadsUpStateChanged(entry: NotificationEntry, isHeadsUp: Boolean) {
+ if (!isHeadsUp) {
+ mHeadsUpViewBinder.unbindHeadsUpView(entry)
+ endNotifLifetimeExtensionIfExtended(entry)
+ }
+ }
+ }
+
+ private fun isSticky(entry: NotificationEntry) = mHeadsUpManager.isSticky(entry.key)
+
+ private fun isCurrentlyShowingHun(entry: ListEntry) = mHeadsUpManager.isAlerting(entry.key)
+
+ private fun endNotifLifetimeExtensionIfExtended(entry: NotificationEntry) {
+ if (mNotifsExtendingLifetime.remove(entry)) {
+ mEndLifetimeExtension?.onEndLifetimeExtension(mLifetimeExtender, entry)
+ }
+ }
+
+ companion object {
+ private const val TAG = "HeadsUpCoordinator"
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java
index 33005b3..733be9c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java
@@ -36,6 +36,8 @@
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
+import com.android.systemui.statusbar.StatusBarState;
+import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider;
import com.android.systemui.statusbar.notification.collection.GroupEntry;
import com.android.systemui.statusbar.notification.collection.ListEntry;
import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -48,7 +50,8 @@
import javax.inject.Inject;
/**
- * Filters low priority and privacy-sensitive notifications from the lockscreen.
+ * Filters low priority and privacy-sensitive notifications from the lockscreen, and hides section
+ * headers on the lockscreen.
*/
@CoordinatorScope
public class KeyguardCoordinator implements Coordinator {
@@ -62,6 +65,7 @@
private final StatusBarStateController mStatusBarStateController;
private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
private final HighPriorityProvider mHighPriorityProvider;
+ private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;
private boolean mHideSilentNotificationsOnLockscreen;
@@ -74,7 +78,8 @@
BroadcastDispatcher broadcastDispatcher,
StatusBarStateController statusBarStateController,
KeyguardUpdateMonitor keyguardUpdateMonitor,
- HighPriorityProvider highPriorityProvider) {
+ HighPriorityProvider highPriorityProvider,
+ SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider) {
mContext = context;
mMainHandler = mainThreadHandler;
mKeyguardStateController = keyguardStateController;
@@ -83,6 +88,7 @@
mStatusBarStateController = statusBarStateController;
mKeyguardUpdateMonitor = keyguardUpdateMonitor;
mHighPriorityProvider = highPriorityProvider;
+ mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;
}
@Override
@@ -214,6 +220,8 @@
}
private void invalidateListFromFilter(String reason) {
+ mSectionHeaderVisibilityProvider.setSectionHeadersVisible(
+ mStatusBarStateController.getState() != StatusBarState.KEYGUARD);
mNotifFilter.invalidateList();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
index 757fb5a..850cb4b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt
@@ -20,6 +20,7 @@
import com.android.systemui.statusbar.notification.NotifPipelineFlags
import com.android.systemui.statusbar.notification.collection.NotifPipeline
import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner
import java.io.FileDescriptor
import java.io.PrintWriter
@@ -63,6 +64,7 @@
private val mCoordinators: MutableList<Coordinator> = ArrayList()
private val mOrderedSections: MutableList<NotifSectioner> = ArrayList()
+ private val mOrderedComparators: MutableList<NotifComparator> = ArrayList()
/**
* Creates all the coordinators.
@@ -117,6 +119,9 @@
mOrderedSections.add(rankingCoordinator.alertingSectioner) // Alerting
mOrderedSections.add(rankingCoordinator.silentSectioner) // Silent
mOrderedSections.add(rankingCoordinator.minimizedSectioner) // Minimized
+
+ // Manually add ordered comparators
+ mOrderedComparators.add(conversationCoordinator.comparator)
}
/**
@@ -128,6 +133,7 @@
c.attach(pipeline)
}
pipeline.setSections(mOrderedSections)
+ pipeline.setComparators(mOrderedComparators)
}
override fun dump(fd: FileDescriptor, pw: PrintWriter, args: Array<String>) {
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 195f367..35fe0ee 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
@@ -31,13 +31,13 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.statusbar.IStatusBarService;
-import com.android.systemui.statusbar.notification.ConversationNotificationManager;
import com.android.systemui.statusbar.notification.collection.GroupEntry;
import com.android.systemui.statusbar.notification.collection.ListEntry;
import com.android.systemui.statusbar.notification.collection.NotifPipeline;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.collection.ShadeListBuilder;
import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope;
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl;
import com.android.systemui.statusbar.notification.collection.inflation.NotifInflater;
import com.android.systemui.statusbar.notification.collection.inflation.NotifUiAdjustment;
import com.android.systemui.statusbar.notification.collection.inflation.NotifUiAdjustmentProvider;
@@ -99,7 +99,7 @@
/** How long we can delay a group while waiting for all children to inflate */
private final long mMaxGroupInflationDelay;
- private final ConversationNotificationManager mConversationManager;
+ private final BindEventManagerImpl mBindEventManager;
@Inject
public PreparationCoordinator(
@@ -109,7 +109,7 @@
NotifViewBarn viewBarn,
NotifUiAdjustmentProvider adjustmentProvider,
IStatusBarService service,
- ConversationNotificationManager conversationManager) {
+ BindEventManagerImpl bindEventManager) {
this(
logger,
notifInflater,
@@ -117,7 +117,7 @@
viewBarn,
adjustmentProvider,
service,
- conversationManager,
+ bindEventManager,
CHILD_BIND_CUTOFF,
MAX_GROUP_INFLATION_DELAY);
}
@@ -130,7 +130,7 @@
NotifViewBarn viewBarn,
NotifUiAdjustmentProvider adjustmentProvider,
IStatusBarService service,
- ConversationNotificationManager conversationManager,
+ BindEventManagerImpl bindEventManager,
int childBindCutoff,
long maxGroupInflationDelay) {
mLogger = logger;
@@ -141,7 +141,7 @@
mStatusBarService = service;
mChildBindCutoff = childBindCutoff;
mMaxGroupInflationDelay = maxGroupInflationDelay;
- mConversationManager = conversationManager;
+ mBindEventManager = bindEventManager;
}
@Override
@@ -369,9 +369,7 @@
mInflatingNotifs.remove(entry);
mViewBarn.registerViewForEntry(entry, controller);
mInflationStates.put(entry, STATE_INFLATED);
- // NOTE: under the new pipeline there's no way to register for an inflation callback,
- // so this one method is called by the PreparationCoordinator directly.
- mConversationManager.onEntryViewBound(entry);
+ mBindEventManager.notifyViewBound(entry);
mNotifInflatingFilter.invalidateList();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManager.kt
new file mode 100644
index 0000000..51bdd00
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManager.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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.inflation
+
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.util.ListenerSet
+
+/**
+ * Helper class that allows distributing bind events regardless of the pipeline.
+ *
+ * NOTE: This class isn't ideal; this exposes the concept of view inflation as something that can be
+ * globally registered for. This is built as it is to provide compatibility with patterns developed
+ * for the legacy pipeline. Ideally we'd have functionality that needs to know this information be
+ * handled by events that go through the ViewController itself.
+ */
+open class BindEventManager {
+ protected val listeners = ListenerSet<Listener>()
+
+ /** Register a listener */
+ fun addListener(listener: Listener) =
+ listeners.addIfAbsent(listener)
+
+ /** Deregister a listener */
+ fun removeListener(listener: Listener) =
+ listeners.remove(listener)
+
+ /** Listener interface for view bind events */
+ fun interface Listener {
+ fun onViewBound(entry: NotificationEntry)
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManagerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManagerImpl.kt
new file mode 100644
index 0000000..9d5b859
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/BindEventManagerImpl.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 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.inflation
+
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.notification.NotificationEntryListener
+import com.android.systemui.statusbar.notification.NotificationEntryManager
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager.Listener
+import javax.inject.Inject
+
+/**
+ * Helper class that allows distributing bind events regardless of the pipeline.
+ */
+@SysUISingleton
+class BindEventManagerImpl @Inject constructor() : BindEventManager() {
+ /** Emit the [Listener.onViewBound] event to all registered listeners. */
+ fun notifyViewBound(entry: NotificationEntry) =
+ listeners.forEach { listener -> listener.onViewBound(entry) }
+
+ /** Initialize this for the legacy pipeline. */
+ fun attachToLegacyPipeline(notificationEntryManager: NotificationEntryManager) {
+ notificationEntryManager.addNotificationEntryListener(object : NotificationEntryListener {
+ override fun onEntryInflated(entry: NotificationEntry) = notifyViewBound(entry)
+ override fun onEntryReinflated(entry: NotificationEntry) = notifyViewBound(entry)
+ })
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java
index 0d150ed..f7bbd28 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/pluggable/NotifComparator.java
@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.notification.collection.listbuilder.pluggable;
+import androidx.annotation.NonNull;
+
import com.android.systemui.statusbar.notification.collection.ListEntry;
import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -39,5 +41,5 @@
* @return a negative integer, zero, or a positive integer as the first argument is less than
* equal to, or greater than the second (same as standard Comparator<> interface).
*/
- public abstract int compare(ListEntry o1, ListEntry o2);
+ public abstract int compare(@NonNull ListEntry o1, @NonNull ListEntry o2);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/DebugModeFilterProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/DebugModeFilterProvider.kt
index d16d76a..ab777de 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/DebugModeFilterProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/DebugModeFilterProvider.kt
@@ -77,7 +77,7 @@
if (needsInitialization) {
val filter = IntentFilter().apply { addAction(ACTION_SET_NOTIF_DEBUG_MODE) }
val permission = NOTIF_DEBUG_MODE_PERMISSION
- context.registerReceiver(mReceiver, filter, permission, null)
+ context.registerReceiver(mReceiver, filter, permission, null, Context.RECEIVER_EXPORTED)
Log.d(TAG, "Registered: $mReceiver")
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt
index f13470e..607500e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt
@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.notification.collection.render
+import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider
import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager
import com.android.systemui.statusbar.notification.collection.GroupEntry
import com.android.systemui.statusbar.notification.collection.ListEntry
@@ -35,6 +36,7 @@
class NodeSpecBuilder(
private val mediaContainerController: MediaContainerController,
private val sectionsFeatureManager: NotificationSectionsFeatureManager,
+ private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider,
private val viewBarn: NotifViewBarn
) {
fun buildNodeSpec(
@@ -51,6 +53,7 @@
var currentSection: NotifSection? = null
val prevSections = mutableSetOf<NotifSection?>()
+ val showHeaders = sectionHeaderVisibilityProvider.sectionHeadersVisible
for (entry in notifList) {
val section = entry.section!!
@@ -61,7 +64,7 @@
// If this notif begins a new section, first add the section's header view
if (section != currentSection) {
- if (section.headerController != currentSection?.headerController) {
+ if (section.headerController != currentSection?.headerController && showHeaders) {
section.headerController?.let { headerController ->
root.children.add(NodeSpecImpl(root, headerController))
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt
index a1800ed..4de8e7a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/RootNodeController.kt
@@ -40,6 +40,7 @@
override fun addChildAt(child: NodeController, index: Int) {
listContainer.addContainerViewAt(child.view, index)
+ listContainer.onNotificationViewUpdateFinished()
}
override fun moveChildTo(child: NodeController, index: Int) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt
index ad97392..4847072 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt
@@ -19,6 +19,7 @@
import android.content.Context
import android.view.View
import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager
+import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider
import com.android.systemui.statusbar.notification.collection.GroupEntry
import com.android.systemui.statusbar.notification.collection.ListEntry
import com.android.systemui.statusbar.notification.collection.NotificationEntry
@@ -38,13 +39,15 @@
@Assisted private val stackController: NotifStackController,
mediaContainerController: MediaContainerController,
featureManager: NotificationSectionsFeatureManager,
+ sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider,
logger: ShadeViewDifferLogger,
private val viewBarn: NotifViewBarn
) {
// We pass a shim view here because the listContainer may not actually have a view associated
// with it and the differ never actually cares about the root node's view.
private val rootController = RootNodeController(listContainer, View(context))
- private val specBuilder = NodeSpecBuilder(mediaContainerController, featureManager, viewBarn)
+ private val specBuilder = NodeSpecBuilder(mediaContainerController, featureManager,
+ sectionHeaderVisibilityProvider, viewBarn)
private val viewDiffer = ShadeViewDiffer(rootController, logger)
/** Method for attaching this manager to the pipeline. */
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java
index f1cba34..05c40b2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java
@@ -50,6 +50,8 @@
import com.android.systemui.statusbar.notification.collection.coordinator.ShadeEventCoordinator;
import com.android.systemui.statusbar.notification.collection.coordinator.VisualStabilityCoordinator;
import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorsModule;
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager;
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl;
import com.android.systemui.statusbar.notification.collection.inflation.NotifInflater;
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
import com.android.systemui.statusbar.notification.collection.inflation.OnUserInteractionCallbackImpl;
@@ -358,5 +360,9 @@
/** */
@Binds
+ BindEventManager bindBindEventManagerImpl(BindEventManagerImpl bindEventManagerImpl);
+
+ /** */
+ @Binds
NotifLiveDataStore bindNotifLiveDataStore(NotifLiveDataStoreImpl notifLiveDataStoreImpl);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt
index 38f3c39..48f2daf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt
@@ -32,6 +32,7 @@
import com.android.systemui.statusbar.notification.collection.NotifPipeline
import com.android.systemui.statusbar.notification.collection.NotificationRankingManager
import com.android.systemui.statusbar.notification.collection.TargetSdkResolver
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl
import com.android.systemui.statusbar.notification.collection.init.NotifPipelineInitializer
import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy
@@ -76,6 +77,7 @@
private val notifBindPipelineInitializer: NotifBindPipelineInitializer,
private val deviceProvisionedController: DeviceProvisionedController,
private val notificationRowBinder: NotificationRowBinderImpl,
+ private val bindEventManagerImpl: BindEventManagerImpl,
private val remoteInputUriController: RemoteInputUriController,
private val groupManagerLegacy: Lazy<NotificationGroupManagerLegacy>,
private val groupAlertTransferHelper: NotificationGroupAlertTransferHelper,
@@ -131,6 +133,7 @@
targetSdkResolver.initialize(entryManager)
remoteInputUriController.attach(entryManager)
groupAlertTransferHelper.bind(entryManager, groupManagerLegacy.get())
+ bindEventManagerImpl.attachToLegacyPipeline(entryManager)
headsUpManager.addListener(groupManagerLegacy.get())
headsUpManager.addListener(groupAlertTransferHelper)
headsUpController.attach(entryManager, headsUpManager)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
index 1b42b58..d610b37 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -305,6 +305,14 @@
}
/**
+ * When this method returns true then moving display state to power save mode will be
+ * delayed for a few seconds. This might be useful to play animations without reducing FPS.
+ */
+ public boolean shouldDelayDisplayDozeTransition() {
+ return mScreenOffAnimationController.shouldDelayDisplayDozeTransition();
+ }
+
+ /**
* Whether we're capable of controlling the screen off animation if we want to. This isn't
* possible if AOD isn't even enabled or if the flag is disabled.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
index 5d6e807..aff73e4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
@@ -349,6 +349,9 @@
}
private void updateShelfIcons() {
+ if (mShelfIcons == null) {
+ return;
+ }
updateIconsForLayout(entry -> entry.getIcons().getShelfIcon(), mShelfIcons,
true /* showAmbient */,
true /* showLowPriority */,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 0bc633c..016b953 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -46,6 +46,7 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
+import android.annotation.NonNull;
import android.app.ActivityManager;
import android.app.Fragment;
import android.app.StatusBarManager;
@@ -211,8 +212,10 @@
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
@@ -4596,7 +4599,14 @@
// Can affect multi-user switcher visibility as it depends on screen size by default:
// it is enabled only for devices with large screens (see config_keyguardUserSwitcher)
- reInflateViews();
+ boolean prevKeyguardUserSwitcherEnabled = mKeyguardUserSwitcherEnabled;
+ boolean prevKeyguardQsUserSwitchEnabled = mKeyguardQsUserSwitchEnabled;
+ updateUserSwitcherFlags();
+ if (prevKeyguardUserSwitcherEnabled != mKeyguardUserSwitcherEnabled
+ || prevKeyguardQsUserSwitchEnabled != mKeyguardQsUserSwitchEnabled) {
+ reInflateViews();
+ }
+
Trace.endSection();
}
@@ -4913,33 +4923,53 @@
private class DebugDrawable extends Drawable {
+ private final Set<Integer> mDebugTextUsedYPositions = new HashSet<>();
+ private final Paint mDebugPaint = new Paint();
+
@Override
- public void draw(Canvas canvas) {
- Paint p = new Paint();
- p.setColor(Color.RED);
- p.setStrokeWidth(2);
- p.setStyle(Paint.Style.STROKE);
- canvas.drawLine(0, getMaxPanelHeight(), mView.getWidth(), getMaxPanelHeight(), p);
- p.setTextSize(24);
- if (mHeaderDebugInfo != null) canvas.drawText(mHeaderDebugInfo, 50, 100, p);
- p.setColor(Color.BLUE);
- canvas.drawLine(0, getExpandedHeight(), mView.getWidth(), getExpandedHeight(), p);
- p.setColor(Color.GREEN);
- canvas.drawLine(0, calculatePanelHeightQsExpanded(), mView.getWidth(),
- calculatePanelHeightQsExpanded(), p);
- p.setColor(Color.YELLOW);
- canvas.drawLine(0, calculatePanelHeightShade(), mView.getWidth(),
- calculatePanelHeightShade(), p);
- p.setColor(Color.MAGENTA);
- canvas.drawLine(
- 0, calculateNotificationsTopPadding(), mView.getWidth(),
- calculateNotificationsTopPadding(), p);
- p.setColor(Color.CYAN);
+ public void draw(@NonNull Canvas canvas) {
+ mDebugTextUsedYPositions.clear();
+
+ mDebugPaint.setColor(Color.RED);
+ mDebugPaint.setStrokeWidth(2);
+ mDebugPaint.setStyle(Paint.Style.STROKE);
+ mDebugPaint.setTextSize(24);
+ if (mHeaderDebugInfo != null) canvas.drawText(mHeaderDebugInfo, 50, 100, mDebugPaint);
+
+ drawDebugInfo(canvas, getMaxPanelHeight(), Color.RED, "getMaxPanelHeight()");
+ drawDebugInfo(canvas, (int) getExpandedHeight(), Color.BLUE, "getExpandedHeight()");
+ drawDebugInfo(canvas, calculatePanelHeightQsExpanded(), Color.GREEN,
+ "calculatePanelHeightQsExpanded()");
+ drawDebugInfo(canvas, calculatePanelHeightShade(), Color.YELLOW,
+ "calculatePanelHeightShade()");
+ drawDebugInfo(canvas, (int) calculateNotificationsTopPadding(), Color.MAGENTA,
+ "calculateNotificationsTopPadding()");
+ drawDebugInfo(canvas, mClockPositionResult.clockY, Color.GRAY,
+ "mClockPositionResult.clockY");
+
+ mDebugPaint.setColor(Color.CYAN);
canvas.drawLine(0, mClockPositionResult.stackScrollerPadding, mView.getWidth(),
- mNotificationStackScrollLayoutController.getTopPadding(), p);
- p.setColor(Color.GRAY);
- canvas.drawLine(0, mClockPositionResult.clockY, mView.getWidth(),
- mClockPositionResult.clockY, p);
+ mNotificationStackScrollLayoutController.getTopPadding(), mDebugPaint);
+ }
+
+ private void drawDebugInfo(Canvas canvas, int y, int color, String label) {
+ mDebugPaint.setColor(color);
+ canvas.drawLine(/* startX= */ 0, /* startY= */ y, /* stopX= */ mView.getWidth(),
+ /* stopY= */ y, mDebugPaint);
+ canvas.drawText(label, /* x= */ 0, /* y= */ computeDebugYTextPosition(y), mDebugPaint);
+ }
+
+ private int computeDebugYTextPosition(int lineY) {
+ if (lineY - mDebugPaint.getTextSize() < 0) {
+ // Avoiding drawing out of bounds
+ lineY += mDebugPaint.getTextSize();
+ }
+ int textY = lineY;
+ while (mDebugTextUsedYPositions.contains(textY)) {
+ textY = (int) (textY + mDebugPaint.getTextSize());
+ }
+ mDebugTextUsedYPositions.add(textY);
+ return textY;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt
index e806ca0..091831f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScreenOffAnimationController.kt
@@ -180,6 +180,14 @@
animations.all { it.shouldAnimateDozingChange() }
/**
+ * Returns true when moving display state to power save mode should be
+ * delayed for a few seconds. This might be useful to play animations in full quality,
+ * without reducing FPS.
+ */
+ fun shouldDelayDisplayDozeTransition(): Boolean =
+ animations.any { it.shouldDelayDisplayDozeTransition() }
+
+ /**
* Return true to animate large <-> small clock transition
*/
fun shouldAnimateClockChange(): Boolean =
@@ -207,6 +215,7 @@
fun shouldHideScrimOnWakeUp(): Boolean = false
fun overrideNotificationsDozeAmount(): Boolean = false
fun shouldShowAodIconsWhenShade(): Boolean = false
+ fun shouldDelayDisplayDozeTransition(): Boolean = false
fun shouldAnimateAodIcons(): Boolean = true
fun shouldAnimateDozingChange(): Boolean = true
fun shouldAnimateClockChange(): Boolean = true
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 4249d76..5d83cc6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -707,7 +707,10 @@
mNotificationsAlpha = behindFraction * mDefaultScrimAlpha;
} else {
mBehindAlpha = behindFraction * mDefaultScrimAlpha;
- mNotificationsAlpha = mBehindAlpha;
+ // Delay fade-in of notification scrim a bit further, to coincide with the
+ // view fade in. Otherwise the empty panel can be quite jarring.
+ mNotificationsAlpha = MathUtils.constrainedMap(0f, 1f, 0.3f, 0.75f,
+ mPanelExpansionFraction);
}
mInFrontAlpha = 0;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index 8afa637..d2e1650 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -153,7 +153,7 @@
// to make sure correct color is returned before "prepare" is called
@Override
public int getBehindTint() {
- return Color.BLACK;
+ return DEBUG_MODE ? DEBUG_BEHIND_TINT : Color.BLACK;
}
},
@@ -264,6 +264,12 @@
}
};
+ private static final boolean DEBUG_MODE = false;
+
+ private static final int DEBUG_NOTIFICATIONS_TINT = Color.RED;
+ private static final int DEBUG_FRONT_TINT = Color.GREEN;
+ private static final int DEBUG_BEHIND_TINT = Color.BLUE;
+
boolean mBlankScreen = false;
long mAnimationDuration = ScrimController.ANIMATION_DURATION;
int mFrontTint = Color.TRANSPARENT;
@@ -323,15 +329,15 @@
}
public int getFrontTint() {
- return mFrontTint;
+ return DEBUG_MODE ? DEBUG_FRONT_TINT : mFrontTint;
}
public int getBehindTint() {
- return mBehindTint;
+ return DEBUG_MODE ? DEBUG_BEHIND_TINT : mBehindTint;
}
public int getNotifTint() {
- return mNotifTint;
+ return DEBUG_MODE ? DEBUG_NOTIFICATIONS_TINT : mNotifTint;
}
public long getAnimationDuration() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java
index f8b0535..72237b1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ShadeControllerImpl.java
@@ -123,7 +123,8 @@
+ " canPanelBeCollapsed(): "
+ getNotificationPanelViewController().canPanelBeCollapsed());
if (getNotificationShadeWindowView() != null
- && getNotificationPanelViewController().canPanelBeCollapsed()) {
+ && getNotificationPanelViewController().canPanelBeCollapsed()
+ && (flags & CommandQueue.FLAG_EXCLUDE_NOTIFICATION_PANEL) == 0) {
// release focus immediately to kick off focus change transition
mNotificationShadeWindowController.setNotificationShadeFocusable(false);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index fdced64..07ae33c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -268,6 +268,7 @@
// Should match the values in PhoneWindowManager
public static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps";
+ public static final String SYSTEM_DIALOG_REASON_DREAM = "dream";
static public final String SYSTEM_DIALOG_REASON_SCREENSHOT = "screenshot";
private static final String BANNER_ACTION_CANCEL =
@@ -2635,8 +2636,17 @@
if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {
int flags = CommandQueue.FLAG_EXCLUDE_NONE;
String reason = intent.getStringExtra("reason");
- if (reason != null && reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) {
- flags |= CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL;
+ if (reason != null) {
+ if (reason.equals(SYSTEM_DIALOG_REASON_RECENT_APPS)) {
+ flags |= CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL;
+ }
+ // Do not collapse notifications when starting dreaming if the notifications
+ // shade is used for the screen off animation. It might require expanded
+ // state for the scrims to be visible
+ if (reason.equals(SYSTEM_DIALOG_REASON_DREAM)
+ && mScreenOffAnimationController.shouldExpandNotifications()) {
+ flags |= CommandQueue.FLAG_EXCLUDE_NOTIFICATION_PANEL;
+ }
}
mShadeController.animateCollapsePanels(flags);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
index ea0dd72..6746b3e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
@@ -290,6 +290,9 @@
return true
}
+ override fun shouldDelayDisplayDozeTransition(): Boolean =
+ dozeParameters.get().shouldControlUnlockedScreenOff()
+
fun addCallback(callback: Callback) {
callbacks.add(callback)
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java
index 1030bfd..33f2140 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java
@@ -127,10 +127,12 @@
int rotationLockSetting =
mDeviceStateRotationLockSettingsManager.getRotationLockSetting(state);
if (rotationLockSetting == DEVICE_STATE_ROTATION_LOCK_IGNORED) {
+ // This should not happen. Device states that have an ignored setting, should also
+ // specify a fallback device state which is not ignored.
// We won't handle this device state. The same rotation lock setting as before should
// apply and any changes to the rotation lock setting will be written for the previous
// valid device state.
- Log.v(TAG, "Ignoring new device state: " + state);
+ Log.w(TAG, "Missing fallback. Ignoring new device state: " + state);
return;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java
index a418c74..bec5fc8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java
@@ -52,12 +52,14 @@
private final Handler mMainHandler = Handler.getMain();
private final Set<DeviceStateRotationLockSettingsListener> mListeners = new HashSet<>();
private SparseIntArray mDeviceStateRotationLockSettings;
+ private SparseIntArray mDeviceStateRotationLockFallbackSettings;
private DeviceStateRotationLockSettingsManager(Context context) {
mContentResolver = context.getContentResolver();
mDeviceStateRotationLockDefaults =
context.getResources()
.getStringArray(R.array.config_perDeviceStateRotationLockDefaults);
+ loadDefaults();
initializeInMemoryMap();
listenForSettingsChange(context);
}
@@ -114,6 +116,11 @@
/** Updates the rotation lock setting for a specified device state. */
public void updateSetting(int deviceState, boolean rotationLocked) {
+ if (mDeviceStateRotationLockFallbackSettings.indexOfKey(deviceState) >= 0) {
+ // The setting for this device state is IGNORED, and has a fallback device state.
+ // The setting for that fallback device state should be the changed in this case.
+ deviceState = mDeviceStateRotationLockFallbackSettings.get(deviceState);
+ }
mDeviceStateRotationLockSettings.put(
deviceState,
rotationLocked
@@ -123,16 +130,37 @@
}
/**
- * Returns the {@link DeviceStateRotationLockSetting} for the given device state. If no setting
- * is specified for this device state, it will return {@link
+ * Returns the {@link Settings.Secure.DeviceStateRotationLockSetting} for the given device
+ * state.
+ *
+ * <p>If the setting for this device state is {@link DEVICE_STATE_ROTATION_LOCK_IGNORED}, it
+ * will return the setting for the fallback device state.
+ *
+ * <p>If no fallback is specified for this device state, it will return {@link
* DEVICE_STATE_ROTATION_LOCK_IGNORED}.
*/
@Settings.Secure.DeviceStateRotationLockSetting
public int getRotationLockSetting(int deviceState) {
- return mDeviceStateRotationLockSettings.get(
- deviceState, DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ int rotationLockSetting = mDeviceStateRotationLockSettings.get(
+ deviceState, /* valueIfKeyNotFound= */ DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ if (rotationLockSetting == DEVICE_STATE_ROTATION_LOCK_IGNORED) {
+ rotationLockSetting = getFallbackRotationLockSetting(deviceState);
+ }
+ return rotationLockSetting;
}
+ private int getFallbackRotationLockSetting(int deviceState) {
+ int indexOfFallbackState = mDeviceStateRotationLockFallbackSettings.indexOfKey(deviceState);
+ if (indexOfFallbackState < 0) {
+ Log.w(TAG, "Setting is ignored, but no fallback was specified.");
+ return DEVICE_STATE_ROTATION_LOCK_IGNORED;
+ }
+ int fallbackState = mDeviceStateRotationLockFallbackSettings.valueAt(indexOfFallbackState);
+ return mDeviceStateRotationLockSettings.get(fallbackState,
+ /* valueIfKeyNotFound= */ DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ }
+
+
/** Returns true if the rotation is locked for the current device state */
public boolean isRotationLocked(int deviceState) {
return getRotationLockSetting(deviceState) == DEVICE_STATE_ROTATION_LOCK_LOCKED;
@@ -223,21 +251,30 @@
}
private void loadDefaults() {
- if (mDeviceStateRotationLockDefaults.length == 0) {
- Log.w(TAG, "Empty default settings");
- mDeviceStateRotationLockSettings = new SparseIntArray(/* initialCapacity= */ 0);
- return;
- }
- mDeviceStateRotationLockSettings =
- new SparseIntArray(mDeviceStateRotationLockDefaults.length);
- for (String serializedDefault : mDeviceStateRotationLockDefaults) {
- String[] entry = serializedDefault.split(SEPARATOR_REGEX);
+ mDeviceStateRotationLockSettings = new SparseIntArray(
+ mDeviceStateRotationLockDefaults.length);
+ mDeviceStateRotationLockFallbackSettings = new SparseIntArray(1);
+ for (String entry : mDeviceStateRotationLockDefaults) {
+ String[] values = entry.split(SEPARATOR_REGEX);
try {
- int key = Integer.parseInt(entry[0]);
- int value = Integer.parseInt(entry[1]);
- mDeviceStateRotationLockSettings.put(key, value);
+ int deviceState = Integer.parseInt(values[0]);
+ int rotationLockSetting = Integer.parseInt(values[1]);
+ if (rotationLockSetting == DEVICE_STATE_ROTATION_LOCK_IGNORED) {
+ if (values.length == 3) {
+ int fallbackDeviceState = Integer.parseInt(values[2]);
+ mDeviceStateRotationLockFallbackSettings.put(deviceState,
+ fallbackDeviceState);
+ } else {
+ Log.w(TAG,
+ "Rotation lock setting is IGNORED, but values have unexpected "
+ + "size of "
+ + values.length);
+ }
+ }
+ mDeviceStateRotationLockSettings.put(deviceState, rotationLockSetting);
} catch (NumberFormatException e) {
- Log.wtf(TAG, "Error deserializing default settings", e);
+ Log.wtf(TAG, "Error parsing settings entry. Entry was: " + entry, e);
+ return;
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
index 3831857..59969c0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java
@@ -22,10 +22,14 @@
import static com.android.settingslib.Utils.updateLocationEnabled;
+import android.app.AppOpsManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.PermissionChecker;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
import android.location.LocationManager;
import android.os.Handler;
import android.os.Looper;
@@ -68,31 +72,37 @@
private final BootCompleteCache mBootCompleteCache;
private final UserTracker mUserTracker;
private final H mHandler;
-
+ private final Handler mBackgroundHandler;
+ private final PackageManager mPackageManager;
private boolean mAreActiveLocationRequests;
private boolean mShouldDisplayAllAccesses;
+ private boolean mShowSystemAccesses;
@Inject
public LocationControllerImpl(Context context, AppOpsController appOpsController,
DeviceConfigProxy deviceConfigProxy,
@Main Looper mainLooper, @Background Handler backgroundHandler,
BroadcastDispatcher broadcastDispatcher, BootCompleteCache bootCompleteCache,
- UserTracker userTracker) {
+ UserTracker userTracker, PackageManager packageManager) {
mContext = context;
mAppOpsController = appOpsController;
mDeviceConfigProxy = deviceConfigProxy;
mBootCompleteCache = bootCompleteCache;
mHandler = new H(mainLooper);
mUserTracker = userTracker;
- mShouldDisplayAllAccesses = getDeviceConfigSetting();
+ mBackgroundHandler = backgroundHandler;
+ mPackageManager = packageManager;
+ mShouldDisplayAllAccesses = getAllAccessesSetting();
+ mShowSystemAccesses = getShowSystemSetting();
// Register to listen for changes in DeviceConfig settings.
mDeviceConfigProxy.addOnPropertiesChangedListener(
DeviceConfig.NAMESPACE_PRIVACY,
backgroundHandler::post,
properties -> {
- mShouldDisplayAllAccesses = getDeviceConfigSetting();
+ mShouldDisplayAllAccesses = getAllAccessesSetting();
+ mShowSystemAccesses = getShowSystemSetting();
updateActiveLocationRequests();
});
@@ -176,11 +186,15 @@
UserHandle.of(userId));
}
- private boolean getDeviceConfigSetting() {
+ private boolean getAllAccessesSetting() {
return mDeviceConfigProxy.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED, false);
}
+ private boolean getShowSystemSetting() {
+ return mDeviceConfigProxy.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
+ SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SHOW_SYSTEM, false);
+ }
/**
* Returns true if there currently exist active high power location requests.
*/
@@ -202,35 +216,74 @@
* Returns true if there currently exist active location requests.
*/
@VisibleForTesting
- protected boolean areActiveLocationRequests() {
+ protected void areActiveLocationRequests() {
if (!mShouldDisplayAllAccesses) {
- return false;
+ return;
}
- List<AppOpItem> appOpsItems = mAppOpsController.getActiveAppOps();
+ boolean hadActiveLocationRequests = mAreActiveLocationRequests;
+ boolean shouldDisplay = false;
+ List<AppOpItem> appOpsItems = mAppOpsController.getActiveAppOps();
+ final List<UserInfo> profiles = mUserTracker.getUserProfiles();
final int numItems = appOpsItems.size();
for (int i = 0; i < numItems; i++) {
if (appOpsItems.get(i).getCode() == OP_FINE_LOCATION
|| appOpsItems.get(i).getCode() == OP_COARSE_LOCATION) {
- return true;
+ if (mShowSystemAccesses) {
+ shouldDisplay = true;
+ } else {
+ shouldDisplay |= !isSystemApp(profiles, appOpsItems.get(i));
+ }
}
}
- return false;
+ mAreActiveLocationRequests = areActiveHighPowerLocationRequests() || shouldDisplay;
+ if (mAreActiveLocationRequests != hadActiveLocationRequests) {
+ mHandler.sendEmptyMessage(H.MSG_LOCATION_ACTIVE_CHANGED);
+ }
+ }
+
+ private boolean isSystemApp(List<UserInfo> profiles, AppOpItem item) {
+ final String permission = AppOpsManager.opToPermission(item.getCode());
+ UserHandle user = UserHandle.getUserHandleForUid(item.getUid());
+
+ // Don't show apps belonging to background users except managed users.
+ boolean foundUser = false;
+ final int numProfiles = profiles.size();
+ for (int i = 0; i < numProfiles; i++) {
+ if (profiles.get(i).getUserHandle().equals(user)) {
+ foundUser = true;
+ }
+ }
+ if (!foundUser) {
+ return true;
+ }
+
+ final int permissionFlags = mPackageManager.getPermissionFlags(
+ permission, item.getPackageName(), user);
+ if (PermissionChecker.checkPermissionForPreflight(mContext, permission,
+ PermissionChecker.PID_UNKNOWN, item.getUid(), item.getPackageName())
+ == PermissionChecker.PERMISSION_GRANTED) {
+ return (permissionFlags
+ & PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED)
+ == 0;
+ } else {
+ return (permissionFlags
+ & PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED) == 0;
+ }
}
// Reads the active location requests from either OP_MONITOR_HIGH_POWER_LOCATION,
// OP_FINE_LOCATION, or OP_COARSE_LOCATION and updates the status view if necessary.
private void updateActiveLocationRequests() {
- boolean hadActiveLocationRequests = mAreActiveLocationRequests;
if (mShouldDisplayAllAccesses) {
- mAreActiveLocationRequests =
- areActiveHighPowerLocationRequests() || areActiveLocationRequests();
+ mBackgroundHandler.post(this::areActiveLocationRequests);
} else {
+ boolean hadActiveLocationRequests = mAreActiveLocationRequests;
mAreActiveLocationRequests = areActiveHighPowerLocationRequests();
- }
- if (mAreActiveLocationRequests != hadActiveLocationRequests) {
- mHandler.sendEmptyMessage(H.MSG_LOCATION_ACTIVE_CHANGED);
+ if (mAreActiveLocationRequests != hadActiveLocationRequests) {
+ mHandler.sendEmptyMessage(H.MSG_LOCATION_ACTIVE_CHANGED);
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index 46fa20d..48949f92 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -51,6 +51,7 @@
import android.view.ViewGroup;
import android.view.WindowInsets;
import android.view.WindowInsetsAnimation;
+import android.view.WindowInsetsController;
import android.view.accessibility.AccessibilityEvent;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.EditorInfo;
@@ -665,8 +666,7 @@
}
// Hide soft-keyboard when the input view became invisible
// (i.e. The notification shade collapsed by pressing the home key)
- if (visibility != VISIBLE && !mEditText.isVisibleToUser()
- && !mController.isRemoteInputActive()) {
+ if (visibility != VISIBLE && !mController.isRemoteInputActive()) {
mEditText.hideIme();
}
}
@@ -779,8 +779,9 @@
}
private void hideIme() {
- if (mInputMethodManager != null) {
- mInputMethodManager.hideSoftInputFromWindow(getWindowToken(), 0);
+ final WindowInsetsController insetsController = getWindowInsetsController();
+ if (insetsController != null) {
+ insetsController.hide(WindowInsets.Type.ime());
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt
index 4f037a0..aaf35af 100644
--- a/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt
@@ -136,6 +136,8 @@
override fun shouldAnimateClockChange(): Boolean = !isAnimationPlaying()
+ override fun shouldDelayDisplayDozeTransition(): Boolean = shouldPlayAnimation()
+
/** Called when AOD status is changed */
override fun onAlwaysOnChanged(alwaysOn: Boolean) {
alwaysOnEnabled = alwaysOn
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
index 7266e41..08d881f 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
@@ -88,7 +88,6 @@
import com.android.systemui.biometrics.AuthController;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dump.DumpManager;
-import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.StatusBarState;
import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -108,6 +107,7 @@
import org.mockito.MockitoSession;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -174,10 +174,10 @@
private InteractionJankMonitor mInteractionJankMonitor;
@Mock
private LatencyTracker mLatencyTracker;
- @Mock
- private FeatureFlags mFeatureFlags;
@Captor
private ArgumentCaptor<StatusBarStateController.StateListener> mStatusBarStateListenerCaptor;
+ @Mock
+ private KeyguardUpdateMonitorCallback mTestCallback;
// Direct executor
private Executor mBackgroundExecutor = Runnable::run;
private Executor mMainExecutor = Runnable::run;
@@ -255,11 +255,13 @@
verify(mStatusBarStateController).addCallback(mStatusBarStateListenerCaptor.capture());
mStatusBarStateListener = mStatusBarStateListenerCaptor.getValue();
+ mKeyguardUpdateMonitor.registerCallback(mTestCallback);
}
@After
public void tearDown() {
mMockitoSession.finishMocking();
+ mKeyguardUpdateMonitor.removeCallback(mTestCallback);
mKeyguardUpdateMonitor.destroy();
}
@@ -599,7 +601,8 @@
mTestableLooper.processAllMessages();
when(mKeyguardBypassController.canBypass()).thenReturn(true);
mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,
- KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */);
+ KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */,
+ new ArrayList<>());
mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);
verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean());
}
@@ -609,7 +612,7 @@
mKeyguardUpdateMonitor.dispatchStartedWakingUp();
mTestableLooper.processAllMessages();
mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,
- KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */);
+ KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */, new ArrayList<>());
mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true);
verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(),
anyBoolean());
@@ -754,7 +757,8 @@
@Test
public void testGetUserCanSkipBouncer_whenTrust() {
int user = KeyguardUpdateMonitor.getCurrentUser();
- mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */, user, 0 /* flags */);
+ mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */, user, 0 /* flags */,
+ new ArrayList<>());
assertThat(mKeyguardUpdateMonitor.getUserCanSkipBouncer(user)).isTrue();
}
@@ -985,7 +989,7 @@
// WHEN trust is enabled (ie: via smartlock)
mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,
- KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */);
+ KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */, new ArrayList<>());
// THEN we shouldn't listen for udfps
assertThat(mKeyguardUpdateMonitor.shouldListenForFingerprint(true)).isEqualTo(false);
@@ -1069,6 +1073,17 @@
anyBoolean());
}
+ @Test
+ public void testShowTrustGrantedMessage_onTrustGranted() {
+ // WHEN trust is enabled (ie: via some trust agent) with a trustGranted string
+ mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */,
+ KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */,
+ Arrays.asList("Unlocked by wearable"));
+
+ // THEN the showTrustGrantedMessage should be called with the first message
+ verify(mTestCallback).showTrustGrantedMessage("Unlocked by wearable");
+ }
+
private void setKeyguardBouncerVisibility(boolean isVisible) {
mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(isVisible);
mTestableLooper.processAllMessages();
@@ -1108,7 +1123,7 @@
mRingerModeTracker, mBackgroundExecutor, mMainExecutor,
mStatusBarStateController, mLockPatternUtils,
mAuthController, mTelephonyListenerManager,
- mInteractionJankMonitor, mLatencyTracker, mFeatureFlags);
+ mInteractionJankMonitor, mLatencyTracker);
setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
index 6ddfbb2..bc89da7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
@@ -111,6 +111,7 @@
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ mContext = Mockito.spy(getContext());
final WindowManager wm = mContext.getSystemService(WindowManager.class);
mSwitchListener = new SwitchListenerStub();
mWindowManager = spy(new TestableWindowManager(wm));
@@ -139,16 +140,18 @@
public void tearDown() {
mFadeOutAnimation = null;
mMotionEventHelper.recycleEvents();
+ mMagnificationModeSwitch.removeButton();
}
@Test
- public void removeButton_buttonIsShowing_removeView() {
+ public void removeButton_buttonIsShowing_removeViewAndUnregisterComponentCallbacks() {
mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
mMagnificationModeSwitch.removeButton();
verify(mWindowManager).removeView(mSpyImageView);
verify(mViewPropertyAnimator).cancel();
+ verify(mContext).unregisterComponentCallbacks(mMagnificationModeSwitch);
}
@Test
@@ -464,6 +467,13 @@
}
@Test
+ public void showButton_registerComponentCallbacks() {
+ mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
+
+ verify(mContext).registerComponentCallbacks(mMagnificationModeSwitch);
+ }
+
+ @Test
public void onLocaleChanged_buttonIsShowing_updateA11yWindowTitle() {
final String newA11yWindowTitle = "new a11y window title";
mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/ModeSwitchesControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/ModeSwitchesControllerTest.java
index 216f63f..a56218b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/ModeSwitchesControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/ModeSwitchesControllerTest.java
@@ -91,7 +91,6 @@
verify(mModeSwitch).onConfigurationChanged(ActivityInfo.CONFIG_DENSITY);
}
-
@Test
public void testOnSwitchClick_showWindowModeButton_invokeListener() {
mModeSwitchesController.showButton(Display.DEFAULT_DISPLAY,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
index 5ad6517..1dd5e22 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
@@ -16,6 +16,8 @@
package com.android.systemui.accessibility;
+import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
+import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.view.Choreographer.FrameCallback;
import static android.view.WindowInsets.Type.systemGestures;
import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
@@ -32,7 +34,6 @@
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
@@ -42,9 +43,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.animation.ValueAnimator;
import android.app.Instrumentation;
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Insets;
import android.graphics.PointF;
@@ -52,6 +55,7 @@
import android.os.Handler;
import android.os.SystemClock;
import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
import android.testing.TestableResources;
import android.text.TextUtils;
import android.view.Display;
@@ -71,6 +75,7 @@
import com.android.systemui.SysuiTestCase;
import com.android.systemui.model.SysUiState;
import com.android.systemui.util.leak.ReferenceTestUtils;
+import com.android.systemui.utils.os.FakeHandler;
import org.junit.After;
import org.junit.Before;
@@ -85,13 +90,12 @@
import java.util.List;
@LargeTest
+@TestableLooper.RunWithLooper
@RunWith(AndroidTestingRunner.class)
public class WindowMagnificationControllerTest extends SysuiTestCase {
private static final int LAYOUT_CHANGE_TIMEOUT_MS = 5000;
@Mock
- private Handler mHandler;
- @Mock
private SfVsyncFrameCallbackProvider mSfVsyncFrameProvider;
@Mock
private MirrorWindowControl mMirrorWindowControl;
@@ -99,17 +103,21 @@
private WindowMagnifierCallback mWindowMagnifierCallback;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();
+
+ private Handler mHandler;
private TestableWindowManager mWindowManager;
private SysUiState mSysUiState = new SysUiState();
private Resources mResources;
private WindowMagnificationAnimationController mWindowMagnificationAnimationController;
private WindowMagnificationController mWindowMagnificationController;
private Instrumentation mInstrumentation;
+ private final ValueAnimator mValueAnimator = ValueAnimator.ofFloat(0, 1.0f).setDuration(0);
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = Mockito.spy(getContext());
+ mHandler = new FakeHandler(TestableLooper.get(this).getLooper());
mInstrumentation = InstrumentationRegistry.getInstrumentation();
final WindowManager wm = mContext.getSystemService(WindowManager.class);
mWindowManager = spy(new TestableWindowManager(wm));
@@ -121,17 +129,11 @@
return null;
}).when(mSfVsyncFrameProvider).postFrameCallback(
any(FrameCallback.class));
- doAnswer(invocation -> {
- final Runnable runnable = invocation.getArgument(0);
- runnable.run();
- return null;
- }).when(mHandler).post(
- any(Runnable.class));
mSysUiState.addCallback(Mockito.mock(SysUiState.SysUiStateCallback.class));
mResources = getContext().getOrCreateTestableResources().getResources();
mWindowMagnificationAnimationController = new WindowMagnificationAnimationController(
- mContext);
+ mContext, mValueAnimator);
mWindowMagnificationController = new WindowMagnificationController(mContext,
mHandler, mWindowMagnificationAnimationController, mSfVsyncFrameProvider,
mMirrorWindowControl, mTransaction, mWindowMagnifierCallback, mSysUiState);
@@ -144,6 +146,7 @@
public void tearDown() {
mInstrumentation.runOnMainSync(
() -> mWindowMagnificationController.deleteWindowMagnification());
+ mValueAnimator.cancel();
}
@Test
@@ -223,13 +226,9 @@
final int screenSize = mContext.getResources().getDimensionPixelSize(
R.dimen.magnification_max_frame_size) * 10;
mWindowManager.setWindowBounds(new Rect(0, 0, screenSize, screenSize));
- //We need to initialize new one because the window size is determined when initialization.
- final WindowMagnificationController controller = new WindowMagnificationController(mContext,
- mHandler, mWindowMagnificationAnimationController, mSfVsyncFrameProvider,
- mMirrorWindowControl, mTransaction, mWindowMagnifierCallback, mSysUiState);
mInstrumentation.runOnMainSync(() -> {
- controller.enableWindowMagnificationInternal(Float.NaN, Float.NaN,
+ mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN,
Float.NaN);
});
@@ -242,17 +241,17 @@
}
@Test
- public void deleteWindowMagnification_destroyControl() {
- mInstrumentation.runOnMainSync(() -> {
- mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN, Float.NaN,
- Float.NaN);
- });
+ public void deleteWindowMagnification_destroyControlAndUnregisterComponentCallback() {
+ mInstrumentation.runOnMainSync(
+ () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN,
+ Float.NaN,
+ Float.NaN));
- mInstrumentation.runOnMainSync(() -> {
- mWindowMagnificationController.deleteWindowMagnification();
- });
+ mInstrumentation.runOnMainSync(
+ () -> mWindowMagnificationController.deleteWindowMagnification());
verify(mMirrorWindowControl).destroyControl();
+ verify(mContext).unregisterComponentCallbacks(mWindowMagnificationController);
}
@Test
@@ -288,12 +287,6 @@
@Test
public void setScale_enabled_expectedValueAndUpdateStateDescription() {
- doAnswer(invocation -> {
- final Runnable runnable = invocation.getArgument(0);
- runnable.run();
- return null;
- }).when(mHandler).postDelayed(any(Runnable.class), anyLong());
-
mInstrumentation.runOnMainSync(
() -> mWindowMagnificationController.enableWindowMagnificationInternal(2.0f,
Float.NaN, Float.NaN));
@@ -322,11 +315,7 @@
@Test
public void onOrientationChanged_enabled_updateDisplayRotationAndCenterStayAtSamePosition() {
- final Display display = Mockito.spy(mContext.getDisplay());
- final int currentRotation = display.getRotation();
- final int newRotation = (currentRotation + 1) % 4;
- when(display.getRotation()).thenReturn(newRotation);
- when(mContext.getDisplay()).thenReturn(display);
+ final int newRotation = simulateRotateTheDevice();
final Rect windowBounds = new Rect(mWindowManager.getCurrentWindowMetrics().getBounds());
final float center = Math.min(windowBounds.exactCenterX(), windowBounds.exactCenterY());
final float displayWidth = windowBounds.width();
@@ -535,6 +524,30 @@
}
@Test
+ public void enableWindowMagnification_rotationIsChanged_updateRotationValue() {
+ final Configuration config = mContext.getResources().getConfiguration();
+ config.orientation = config.orientation == ORIENTATION_LANDSCAPE ? ORIENTATION_PORTRAIT
+ : ORIENTATION_LANDSCAPE;
+ final int newRotation = simulateRotateTheDevice();
+
+ mInstrumentation.runOnMainSync(
+ () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN,
+ Float.NaN, Float.NaN));
+
+ assertEquals(newRotation, mWindowMagnificationController.mRotation);
+ }
+
+ @Test
+ public void enableWindowMagnification_registerComponentCallback() {
+ mInstrumentation.runOnMainSync(
+ () -> mWindowMagnificationController.enableWindowMagnificationInternal(Float.NaN,
+ Float.NaN,
+ Float.NaN));
+
+ verify(mContext).registerComponentCallbacks(mWindowMagnificationController);
+ }
+
+ @Test
public void onLocaleChanged_enabled_updateA11yWindowTitle() {
final String newA11yWindowTitle = "new a11y window title";
mInstrumentation.runOnMainSync(() -> {
@@ -610,4 +623,14 @@
.build();
mWindowManager.setWindowInsets(testInsets);
}
+
+ @Surface.Rotation
+ private int simulateRotateTheDevice() {
+ final Display display = Mockito.spy(mContext.getDisplay());
+ final int currentRotation = display.getRotation();
+ final int newRotation = (currentRotation + 1) % 4;
+ when(display.getRotation()).thenReturn(newRotation);
+ when(mContext.getDisplay()).thenReturn(display);
+ return newRotation;
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java
index 343658d..d3f30c50 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java
@@ -30,7 +30,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.content.res.Configuration;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.RemoteException;
@@ -159,15 +158,6 @@
}
@Test
- public void onConfigurationChanged_updateModeSwitches() {
- final Configuration config = new Configuration();
- config.densityDpi = Configuration.DENSITY_DPI_ANY;
- mWindowMagnification.onConfigurationChanged(config);
-
- verify(mModeSwitchesController).onConfigurationChanged(anyInt());
- }
-
- @Test
public void overviewProxyIsConnected_noController_resetFlag() {
mOverviewProxyListener.onConnectionChanged(true);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
index 3e19cc4..cdffaec 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java
@@ -192,7 +192,7 @@
public void test_holdsWakeLockWhenGoingToLowPowerDelayed() {
// Transition to low power mode will be delayed to let
// animations play at 60 fps.
- when(mDozeParameters.shouldControlScreenOff()).thenReturn(true);
+ when(mDozeParameters.shouldDelayDisplayDozeTransition()).thenReturn(true);
mHandlerFake.setMode(QUEUEING);
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
@@ -209,7 +209,7 @@
public void test_releasesWakeLock_abortingLowPowerDelayed() {
// Transition to low power mode will be delayed to let
// animations play at 60 fps.
- when(mDozeParameters.shouldControlScreenOff()).thenReturn(true);
+ when(mDozeParameters.shouldDelayDisplayDozeTransition()).thenReturn(true);
mHandlerFake.setMode(QUEUEING);
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationPrimerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationPrimerTest.java
deleted file mode 100644
index adf110b..0000000
--- a/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationPrimerTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2021 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.dreams.appwidgets;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.res.Resources;
-import android.testing.AndroidTestingRunner;
-import android.view.Gravity;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-
-import com.android.systemui.R;
-import com.android.systemui.SysuiTestCase;
-import com.android.systemui.SysuiTestableContext;
-import com.android.systemui.dreams.DreamOverlayStateController;
-import com.android.systemui.dreams.appwidgets.dagger.AppWidgetComponent;
-import com.android.systemui.utils.leaks.LeakCheckedTest;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@SmallTest
-@RunWith(AndroidTestingRunner.class)
-public class ComplicationPrimerTest extends SysuiTestCase {
- @Rule
- public final LeakCheckedTest.SysuiLeakCheck mLeakCheck = new LeakCheckedTest.SysuiLeakCheck();
-
- @Rule
- public SysuiTestableContext mContext = new SysuiTestableContext(
- InstrumentationRegistry.getContext(), mLeakCheck);
-
- @Mock
- Resources mResources;
-
- @Mock
- AppWidgetComponent mAppWidgetComplicationComponent1;
- @Mock
- AppWidgetComponent mAppWidgetComplicationComponent2;
-
- @Mock
- ComplicationProvider mComplicationProvider1;
-
- @Mock
- ComplicationProvider mComplicationProvider2;
-
- final ComponentName mAppComplicationComponent1 =
- ComponentName.unflattenFromString("com.foo.bar/.Baz");
- final ComponentName mAppComplicationComponent2 =
- ComponentName.unflattenFromString("com.foo.bar/.Baz2");
-
- final int mAppComplicationGravity1 = Gravity.BOTTOM | Gravity.START;
- final int mAppComplicationGravity2 = Gravity.BOTTOM | Gravity.END;
-
- final String[] mComponents = new String[]{mAppComplicationComponent1.flattenToString(),
- mAppComplicationComponent2.flattenToString() };
- final int[] mPositions = new int[]{mAppComplicationGravity1, mAppComplicationGravity2};
-
- @Mock
- DreamOverlayStateController mDreamOverlayStateController;
-
- @Mock
- AppWidgetComponent.Factory mAppWidgetComplicationProviderFactory;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mAppWidgetComplicationProviderFactory.build(eq(mAppComplicationComponent1), any()))
- .thenReturn(mAppWidgetComplicationComponent1);
- when(mAppWidgetComplicationComponent1.getAppWidgetComplicationProvider())
- .thenReturn(mComplicationProvider1);
- when(mAppWidgetComplicationProviderFactory.build(eq(mAppComplicationComponent2), any()))
- .thenReturn(mAppWidgetComplicationComponent2);
- when(mAppWidgetComplicationComponent2.getAppWidgetComplicationProvider())
- .thenReturn(mComplicationProvider2);
- when(mResources.getIntArray(R.array.config_dreamComplicationPositions))
- .thenReturn(mPositions);
- when(mResources.getStringArray(R.array.config_dreamAppWidgetComplications))
- .thenReturn(mComponents);
- }
-
- @Test
- public void testLoading() {
- final ComplicationPrimer primer = new ComplicationPrimer(mContext,
- mResources,
- mDreamOverlayStateController,
- mAppWidgetComplicationProviderFactory);
-
- // Inform primer to begin.
- primer.onBootCompleted();
-
- // Verify the first component is added to the state controller with the proper position.
- {
- final ArgumentCaptor<ConstraintLayout.LayoutParams> layoutParamsArgumentCaptor =
- ArgumentCaptor.forClass(ConstraintLayout.LayoutParams.class);
- verify(mAppWidgetComplicationProviderFactory, times(1))
- .build(eq(mAppComplicationComponent1),
- layoutParamsArgumentCaptor.capture());
-
- assertEquals(layoutParamsArgumentCaptor.getValue().startToStart,
- ConstraintLayout.LayoutParams.PARENT_ID);
- assertEquals(layoutParamsArgumentCaptor.getValue().bottomToBottom,
- ConstraintLayout.LayoutParams.PARENT_ID);
-
- verify(mDreamOverlayStateController, times(1))
- .addComplication(eq(mComplicationProvider1));
- }
-
- // Verify the second component is added to the state controller with the proper position.
- {
- final ArgumentCaptor<ConstraintLayout.LayoutParams> layoutParamsArgumentCaptor =
- ArgumentCaptor.forClass(ConstraintLayout.LayoutParams.class);
- verify(mAppWidgetComplicationProviderFactory, times(1))
- .build(eq(mAppComplicationComponent2),
- layoutParamsArgumentCaptor.capture());
-
- assertEquals(layoutParamsArgumentCaptor.getValue().endToEnd,
- ConstraintLayout.LayoutParams.PARENT_ID);
- assertEquals(layoutParamsArgumentCaptor.getValue().bottomToBottom,
- ConstraintLayout.LayoutParams.PARENT_ID);
- verify(mDreamOverlayStateController, times(1))
- .addComplication(eq(mComplicationProvider1));
- }
- }
-
- @Test
- public void testNoComponents() {
- when(mResources.getStringArray(R.array.config_dreamAppWidgetComplications))
- .thenReturn(new String[]{});
-
- final ComplicationPrimer primer = new ComplicationPrimer(mContext,
- mResources,
- mDreamOverlayStateController,
- mAppWidgetComplicationProviderFactory);
-
- // Inform primer to begin.
- primer.onBootCompleted();
-
-
- // Make sure there is no request to add a widget if no components are specified by the
- // product.
- verify(mAppWidgetComplicationProviderFactory, never()).build(any(), any());
- verify(mDreamOverlayStateController, never()).addComplication(any());
- }
-
- @Test
- public void testNoPositions() {
- when(mResources.getIntArray(R.array.config_dreamComplicationPositions))
- .thenReturn(new int[]{});
-
- final ComplicationPrimer primer = new ComplicationPrimer(mContext,
- mResources,
- mDreamOverlayStateController,
- mAppWidgetComplicationProviderFactory);
-
- primer.onBootCompleted();
-
- // Make sure there is no request to add a widget if no positions are specified by the
- // product.
- verify(mAppWidgetComplicationProviderFactory, never()).build(any(), any());
- verify(mDreamOverlayStateController, never()).addComplication(any());
- }
-}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationProviderTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationProviderTest.java
deleted file mode 100644
index f538112..0000000
--- a/packages/SystemUI/tests/src/com/android/systemui/dreams/appwidgets/ComplicationProviderTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2022 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.dreams.appwidgets;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.isNull;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetHostView;
-import android.content.ComponentName;
-import android.testing.AndroidTestingRunner;
-import android.widget.RemoteViews;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-
-import com.android.systemui.SysuiTestCase;
-import com.android.systemui.SysuiTestableContext;
-import com.android.systemui.dreams.ComplicationHost;
-import com.android.systemui.dreams.ComplicationHostView;
-import com.android.systemui.plugins.ActivityStarter;
-import com.android.systemui.utils.leaks.LeakCheckedTest;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@SmallTest
-@RunWith(AndroidTestingRunner.class)
-public class ComplicationProviderTest extends SysuiTestCase {
- @Mock
- ActivityStarter mActivityStarter;
-
- @Mock
- ComponentName mComponentName;
-
- @Mock
- AppWidgetProvider mAppWidgetProvider;
-
- @Mock
- AppWidgetHostView mAppWidgetHostView;
-
- @Mock
- ComplicationHost.CreationCallback mCreationCallback;
-
- @Mock
- ComplicationHost.InteractionCallback mInteractionCallback;
-
- @Mock
- PendingIntent mPendingIntent;
-
- @Mock
- RemoteViews.RemoteResponse mRemoteResponse;
-
- ComplicationProvider mComplicationProvider;
-
- RemoteViews.InteractionHandler mInteractionHandler;
-
- @Rule
- public final LeakCheckedTest.SysuiLeakCheck mLeakCheck = new LeakCheckedTest.SysuiLeakCheck();
-
- @Rule
- public SysuiTestableContext mContext = new SysuiTestableContext(
- InstrumentationRegistry.getContext(), mLeakCheck);
-
- ComplicationHostView.LayoutParams mLayoutParams = new ComplicationHostView.LayoutParams(
- ComplicationHostView.LayoutParams.MATCH_PARENT,
- ComplicationHostView.LayoutParams.MATCH_PARENT);
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- when(mPendingIntent.isActivity()).thenReturn(true);
- when(mAppWidgetProvider.getWidget(mComponentName)).thenReturn(mAppWidgetHostView);
-
- mComplicationProvider = new ComplicationProvider(
- mActivityStarter,
- mComponentName,
- mAppWidgetProvider,
- mLayoutParams
- );
-
- final ArgumentCaptor<RemoteViews.InteractionHandler> creationCallbackCapture =
- ArgumentCaptor.forClass(RemoteViews.InteractionHandler.class);
-
- mComplicationProvider.onCreateComplication(mContext, mCreationCallback,
- mInteractionCallback);
- verify(mAppWidgetHostView, times(1))
- .setInteractionHandler(creationCallbackCapture.capture());
- mInteractionHandler = creationCallbackCapture.getValue();
- }
-
- @Test
- public void testWidgetBringup() {
- // Make sure widget was requested.
- verify(mAppWidgetProvider, times(1)).getWidget(eq(mComponentName));
-
- // Make sure widget was returned to callback.
- verify(mCreationCallback, times(1)).onCreated(eq(mAppWidgetHostView),
- eq(mLayoutParams));
- }
-
- @Test
- public void testWidgetInteraction() {
- // Trigger interaction.
- mInteractionHandler.onInteraction(mAppWidgetHostView, mPendingIntent,
- mRemoteResponse);
-
- // Ensure activity is started.
- verify(mActivityStarter, times(1))
- .startPendingIntentDismissingKeyguard(eq(mPendingIntent), isNull(),
- eq(mAppWidgetHostView));
- // Verify exit is requested.
- verify(mInteractionCallback, times(1)).onExit();
- }
-}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java
index 3e8e874..73d2b0b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java
@@ -47,6 +47,7 @@
import com.android.systemui.statusbar.phone.AutoHideController;
import com.android.systemui.statusbar.phone.LightBarController;
import com.android.systemui.statusbar.policy.ConfigurationController;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.pip.Pip;
import org.junit.After;
@@ -92,7 +93,8 @@
mock(DumpManager.class),
mock(AutoHideController.class),
mock(LightBarController.class),
- Optional.of(mock(Pip.class))));
+ Optional.of(mock(Pip.class)),
+ Optional.of(mock(BackAnimation.class))));
initializeNavigationBars();
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
index 5003013..9ca898b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
@@ -95,6 +95,7 @@
import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.utils.leaks.LeakCheckedTest;
+import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;
import com.android.wm.shell.pip.Pip;
@@ -105,7 +106,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
import java.util.Optional;
@@ -383,7 +383,8 @@
mAutoHideController,
mAutoHideControllerFactory,
Optional.of(mTelecomManager),
- mInputMethodManager);
+ mInputMethodManager,
+ Optional.of(mock(BackAnimation.class)));
return spy(factory.create(context));
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java
index 03a0da7..4a6bbbc 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qrcodescanner/controller/QRCodeScannerControllerTest.java
@@ -24,6 +24,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -73,7 +74,7 @@
private DeviceConfigProxyFake mProxyFake;
private void setUpLocal(String deviceConfigActivity, String defaultActivity,
- boolean validateActivity, boolean enableSetting) {
+ boolean validateActivity, boolean enableSetting, boolean enableOnLockScreen) {
MockitoAnnotations.initMocks(this);
int enableSettingInt = enableSetting ? 1 : 0;
@@ -91,6 +92,8 @@
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)).thenReturn(true);
mContext.getOrCreateTestableResources().addOverride(R.string.def_qr_code_component,
defaultActivity);
+ mContext.getOrCreateTestableResources().addOverride(
+ android.R.bool.config_enableQrCodeScannerOnLockScreen, enableOnLockScreen);
mProxyFake = new DeviceConfigProxyFake();
mProxyFake.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
@@ -126,7 +129,8 @@
@Test
public void qrCodeScannerInit_withoutDefaultValue() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "", /* validateActivity */ true, /* enableSetting */true);
+ "", /* validateActivity */ true, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails(null);
assertThat(mController.isEnabledForLockScreenButton()).isFalse();
assertThat(mController.isEnabledForQuickSettings()).isFalse();
@@ -135,7 +139,8 @@
@Test
public void qrCodeScannerInit_withIncorrectDefaultValue() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ false, /* enableSetting */ true);
+ "abc/.def", /* validateActivity */ false, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails(null);
assertThat(mController.isEnabledForLockScreenButton()).isFalse();
}
@@ -143,7 +148,8 @@
@Test
public void qrCodeScannerInit_withCorrectDefaultValue() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ true, /* enableSetting */true);
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -152,7 +158,8 @@
@Test
public void qrCodeScannerInit_withCorrectDeviceConfig() {
setUpLocal(/* deviceConfigActivity */ "abc/.def", /* defaultActivity */
- "", /* validateActivity */ true, /* enableSetting */true);
+ "", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -161,7 +168,8 @@
@Test
public void qrCodeScannerInit_withCorrectDeviceConfig_withCorrectDefaultValue() {
setUpLocal(/* deviceConfigActivity */ "abc/.def", /* defaultActivity */
- "xyz/.qrs", /* validateActivity */true, /* enableSetting */ true);
+ "xyz/.qrs", /* validateActivity */true, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -170,7 +178,8 @@
@Test
public void qrCodeScannerInit_withCorrectDeviceConfig_fullActivity() {
setUpLocal(/* deviceConfigActivity */ "abc/abc.def", /* defaultActivity */
- "", /* validateActivity */ true, /* enableSetting */ true);
+ "", /* validateActivity */ true, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/abc.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -179,7 +188,8 @@
@Test
public void qrCodeScannerInit_withIncorrectDeviceConfig() {
setUpLocal(/* deviceConfigActivity */ "def/.efg", /* defaultActivity */
- "", /* validateActivity */ false, /* enableSetting */ true);
+ "", /* validateActivity */ false, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails(null);
assertThat(mController.isEnabledForLockScreenButton()).isFalse();
assertThat(mController.isEnabledForQuickSettings()).isFalse();
@@ -188,7 +198,8 @@
@Test
public void verifyDeviceConfigChange_withDefaultActivity() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ true, /* enableSetting */true);
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -214,7 +225,8 @@
@Test
public void verifyDeviceConfigChange_withoutDefaultActivity() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "", /* validateActivity */ true, /* enableSetting */ true);
+ "", /* validateActivity */ true, /* enableSetting */ true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails(null);
assertThat(mController.isEnabledForLockScreenButton()).isFalse();
assertThat(mController.isEnabledForQuickSettings()).isFalse();
@@ -239,7 +251,8 @@
@Test
public void verifyDeviceConfigChangeToSameValue() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "", /* validateActivity */ true, /* enableSetting */true);
+ "", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
mProxyFake.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.DEFAULT_QR_CODE_SCANNER,
@@ -261,7 +274,8 @@
@Test
public void verifyPreferenceChange() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ true, /* enableSetting */true);
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
mSecureSettings.putStringForUser(LOCK_SCREEN_SHOW_QR_CODE_SCANNER, "0",
UserHandle.USER_CURRENT);
mSecureSettings.putStringForUser(LOCK_SCREEN_SHOW_QR_CODE_SCANNER, "0",
@@ -278,7 +292,8 @@
@Test
public void verifyPreferenceChangeToSameValue() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ true, /* enableSetting */true);
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -301,7 +316,8 @@
@Test
public void verifyUnregisterRegisterChangeObservers() {
setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
- "abc/.def", /* validateActivity */ true, /* enableSetting */true);
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ true);
verifyActivityDetails("abc/.def");
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
@@ -312,7 +328,7 @@
assertThat(mController.isEnabledForLockScreenButton()).isFalse();
assertThat(mController.isEnabledForQuickSettings()).isFalse();
- // Unregister once again and make sure, it affect affect the next register event
+ // Unregister once again and make sure it affects the next register event
mController.unregisterQRCodeScannerChangeObservers(DEFAULT_QR_CODE_SCANNER_CHANGE,
QR_CODE_SCANNER_PREFERENCE_CHANGE);
mController.registerQRCodeScannerChangeObservers(DEFAULT_QR_CODE_SCANNER_CHANGE,
@@ -321,4 +337,15 @@
assertThat(mController.isEnabledForLockScreenButton()).isTrue();
assertThat(mController.isEnabledForQuickSettings()).isTrue();
}
+
+ @Test
+ public void verifyDisableLockscreenButton() {
+ setUpLocal(/* deviceConfigActivity */ null, /* defaultActivity */
+ "abc/.def", /* validateActivity */ true, /* enableSetting */true,
+ /* enableOnLockScreen */ false);
+ assertThat(mController.getIntent()).isNotNull();
+ assertThat(mController.isEnabledForLockScreenButton()).isFalse();
+ assertThat(mController.isEnabledForQuickSettings()).isTrue();
+ assertThat(getSettingsQRCodeDefaultComponent()).isNull();
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt
index 26f04fc..354bb51 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/FooterActionsControllerTest.kt
@@ -54,8 +54,6 @@
@Mock
private lateinit var userInfoController: UserInfoController
@Mock
- private lateinit var qsPanelController: QSPanelController
- @Mock
private lateinit var multiUserSwitchController: MultiUserSwitchController
@Mock
private lateinit var globalActionsDialog: GlobalActionsDialogLite
@@ -81,7 +79,7 @@
view = LayoutInflater.from(context)
.inflate(R.layout.footer_actions, null) as FooterActionsView
- controller = FooterActionsController(view, qsPanelController, activityStarter,
+ controller = FooterActionsController(view, activityStarter,
userManager, userTracker, userInfoController, multiUserSwitchController,
deviceProvisionedController, falsingManager, metricsLogger, fakeTunerService,
globalActionsDialog, uiEventLogger, showPMLiteButton = true,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
index 8b19c50..f43e68f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
@@ -18,7 +18,11 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.content.ClipData;
@@ -31,6 +35,8 @@
import androidx.test.filters.SmallTest;
import com.android.systemui.R;
+import com.android.systemui.plugins.ActivityStarter;
+import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.settings.UserTracker;
import com.android.systemui.utils.leaks.LeakCheckedTest;
@@ -60,13 +66,20 @@
private TextView mBuildText;
@Mock
private FooterActionsController mFooterActionsController;
+ @Mock
+ private FalsingManager mFalsingManager;
+ @Mock
+ private ActivityStarter mActivityStarter;
private QSFooterViewController mController;
+ private View mEditButton;
@Before
public void setup() throws Exception {
MockitoAnnotations.initMocks(this);
+ mEditButton = new View(mContext);
+
injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES);
mContext.addMockSystemService(ClipboardManager.class, mClipboardManager);
@@ -77,9 +90,11 @@
when(mView.isAttachedToWindow()).thenReturn(true);
when(mView.findViewById(R.id.build)).thenReturn(mBuildText);
+ when(mView.findViewById(android.R.id.edit)).thenReturn(mEditButton);
- mController = new QSFooterViewController(mView, mUserTracker, mQSPanelController,
- mQuickQSPanelController, mFooterActionsController);
+ mController = new QSFooterViewController(mView, mUserTracker, mFalsingManager,
+ mActivityStarter, mQSPanelController, mQuickQSPanelController,
+ mFooterActionsController);
mController.init();
}
@@ -99,4 +114,27 @@
verify(mClipboardManager).setPrimaryClip(captor.capture());
assertThat(captor.getValue().getItemAt(0).getText()).isEqualTo(text);
}
+
+ @Test
+ public void testEditButton_falseTap() {
+ when(mFalsingManager.isFalseTap(anyInt())).thenReturn(true);
+
+ mEditButton.performClick();
+
+ verify(mQSPanelController, never()).showEdit(any());
+ verifyZeroInteractions(mActivityStarter);
+ }
+
+ @Test
+ public void testEditButton_realTap() {
+ when(mFalsingManager.isFalseTap(anyInt())).thenReturn(false);
+
+ mEditButton.performClick();
+
+ ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
+
+ verify(mActivityStarter).postQSRunnableDismissingKeyguard(captor.capture());
+ captor.getValue().run();
+ verify(mQSPanelController).showEdit(mEditButton);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java
index b832577..25dd23a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilderTest.java
@@ -1968,7 +1968,7 @@
}
@Override
- public int compare(ListEntry o1, ListEntry o2) {
+ public int compare(@NonNull ListEntry o1, @NonNull ListEntry o2) {
boolean contains1 = mPreferredPackages.contains(
o1.getRepresentativeEntry().getSbn().getPackageName());
boolean contains2 = mPreferredPackages.contains(
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java
index f2e7081..bc32759 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/AppOpsCoordinatorTest.java
@@ -28,6 +28,10 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Person;
+import android.content.Intent;
import android.graphics.Color;
import android.os.UserHandle;
import android.service.notification.StatusBarNotification;
@@ -151,4 +155,35 @@
// THEN the entry is NOT in the fgs section
assertFalse(mFgsSection.isInSection(mEntryBuilder.build()));
}
+
+ @Test
+ public void testIncludeCallInSection_importanceDefault() {
+ // GIVEN the notification represents a call with > min importance
+ mEntryBuilder
+ .setImportance(IMPORTANCE_DEFAULT)
+ .modifyNotification(mContext)
+ .setStyle(makeCallStyle());
+
+ // THEN the entry is in the fgs section
+ assertTrue(mFgsSection.isInSection(mEntryBuilder.build()));
+ }
+
+ @Test
+ public void testDiscludeCallInSection_importanceMin() {
+ // GIVEN the notification represents a call with min importance
+ mEntryBuilder
+ .setImportance(IMPORTANCE_MIN)
+ .modifyNotification(mContext)
+ .setStyle(makeCallStyle());
+
+ // THEN the entry is NOT in the fgs section
+ assertFalse(mFgsSection.isInSection(mEntryBuilder.build()));
+ }
+
+ private Notification.CallStyle makeCallStyle() {
+ final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0,
+ new Intent("action"), PendingIntent.FLAG_IMMUTABLE);
+ final Person person = new Person.Builder().setName("person").build();
+ return Notification.CallStyle.forIncomingCall(person, pendingIntent, pendingIntent);
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt
index a46b440..8deac94 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinatorTest.kt
@@ -24,18 +24,24 @@
import com.android.systemui.statusbar.notification.collection.NotifPipeline
import com.android.systemui.statusbar.notification.collection.NotificationEntry
import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder
+import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifComparator
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner
import com.android.systemui.statusbar.notification.collection.render.NodeController
import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier
+import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_IMPORTANT_PERSON
import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_PERSON
+import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.withArgCaptor
+import com.google.common.truth.Truth.assertThat
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
+import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
import org.mockito.Mockito.`when` as whenever
@@ -47,12 +53,15 @@
// captured listeners and pluggables:
private lateinit var promoter: NotifPromoter
private lateinit var peopleSectioner: NotifSectioner
+ private lateinit var peopleComparator: NotifComparator
@Mock private lateinit var pipeline: NotifPipeline
@Mock private lateinit var peopleNotificationIdentifier: PeopleNotificationIdentifier
@Mock private lateinit var channel: NotificationChannel
@Mock private lateinit var headerController: NodeController
private lateinit var entry: NotificationEntry
+ private lateinit var entryA: NotificationEntry
+ private lateinit var entryB: NotificationEntry
private lateinit var coordinator: ConversationCoordinator
@@ -70,8 +79,15 @@
}
peopleSectioner = coordinator.sectioner
+ peopleComparator = coordinator.comparator
entry = NotificationEntryBuilder().setChannel(channel).build()
+
+ val section = NotifSection(peopleSectioner, 0)
+ entryA = NotificationEntryBuilder().setChannel(channel)
+ .setSection(section).setTag("A").build()
+ entryB = NotificationEntryBuilder().setChannel(channel)
+ .setSection(section).setTag("B").build()
}
@Test
@@ -90,4 +106,36 @@
assertTrue(peopleSectioner.isInSection(entry))
assertFalse(peopleSectioner.isInSection(NotificationEntryBuilder().build()))
}
+
+ @Test
+ fun testComparatorIgnoresFromOtherSection() {
+ val e1 = NotificationEntryBuilder().setId(1).setChannel(channel).build()
+ val e2 = NotificationEntryBuilder().setId(2).setChannel(channel).build()
+
+ // wrong section -- never classify
+ assertThat(peopleComparator.compare(e1, e2)).isEqualTo(0)
+ verify(peopleNotificationIdentifier, never()).getPeopleNotificationType(any())
+ }
+
+ @Test
+ fun testComparatorPutsImportantPeopleFirst() {
+ whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryA))
+ .thenReturn(TYPE_IMPORTANT_PERSON)
+ whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryB))
+ .thenReturn(TYPE_PERSON)
+
+ // only put people notifications in this section
+ assertThat(peopleComparator.compare(entryA, entryB)).isEqualTo(-1)
+ }
+
+ @Test
+ fun testComparatorEquatesPeopleWithSameType() {
+ whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryA))
+ .thenReturn(TYPE_PERSON)
+ whenever(peopleNotificationIdentifier.getPeopleNotificationType(entryB))
+ .thenReturn(TYPE_PERSON)
+
+ // only put people notifications in this section
+ assertThat(peopleComparator.compare(entryA, entryB)).isEqualTo(0)
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.java
deleted file mode 100644
index 8ee892c..0000000
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * 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 org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.testing.AndroidTestingRunner;
-import android.testing.TestableLooper;
-
-import androidx.test.filters.SmallTest;
-
-import com.android.systemui.SysuiTestCase;
-import com.android.systemui.statusbar.NotificationRemoteInputManager;
-import com.android.systemui.statusbar.notification.collection.NotifPipeline;
-import com.android.systemui.statusbar.notification.collection.NotificationEntry;
-import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;
-import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter;
-import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner;
-import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;
-import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender;
-import com.android.systemui.statusbar.notification.collection.render.NodeController;
-import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder;
-import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider;
-import com.android.systemui.statusbar.notification.row.NotifBindPipeline.BindCallback;
-import com.android.systemui.statusbar.policy.HeadsUpManager;
-import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener;
-import com.android.systemui.util.concurrency.FakeExecutor;
-import com.android.systemui.util.time.FakeSystemClock;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-
-@SmallTest
-@RunWith(AndroidTestingRunner.class)
-@TestableLooper.RunWithLooper
-public class HeadsUpCoordinatorTest extends SysuiTestCase {
-
- private HeadsUpCoordinator mCoordinator;
-
- // captured listeners and pluggables:
- private NotifCollectionListener mCollectionListener;
- private NotifPromoter mNotifPromoter;
- private NotifLifetimeExtender mNotifLifetimeExtender;
- private OnHeadsUpChangedListener mOnHeadsUpChangedListener;
- private NotifSectioner mNotifSectioner;
-
- @Mock private NotifPipeline mNotifPipeline;
- @Mock private HeadsUpManager mHeadsUpManager;
- @Mock private HeadsUpViewBinder mHeadsUpViewBinder;
- @Mock private NotificationInterruptStateProvider mNotificationInterruptStateProvider;
- @Mock private NotificationRemoteInputManager mRemoteInputManager;
- @Mock private NotifLifetimeExtender.OnEndLifetimeExtensionCallback mEndLifetimeExtension;
- @Mock private NodeController mHeaderController;
-
- private NotificationEntry mEntry;
- private final FakeSystemClock mClock = new FakeSystemClock();
- private final FakeExecutor mExecutor = new FakeExecutor(mClock);
- private final ArrayList<NotificationEntry> mHuns = new ArrayList();
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- mCoordinator = new HeadsUpCoordinator(
- mHeadsUpManager,
- mHeadsUpViewBinder,
- mNotificationInterruptStateProvider,
- mRemoteInputManager,
- mHeaderController,
- mExecutor);
-
- mCoordinator.attach(mNotifPipeline);
-
- // capture arguments:
- ArgumentCaptor<NotifCollectionListener> notifCollectionCaptor =
- ArgumentCaptor.forClass(NotifCollectionListener.class);
- ArgumentCaptor<NotifPromoter> notifPromoterCaptor =
- ArgumentCaptor.forClass(NotifPromoter.class);
- ArgumentCaptor<NotifLifetimeExtender> notifLifetimeExtenderCaptor =
- ArgumentCaptor.forClass(NotifLifetimeExtender.class);
- ArgumentCaptor<OnHeadsUpChangedListener> headsUpChangedListenerCaptor =
- ArgumentCaptor.forClass(OnHeadsUpChangedListener.class);
-
- verify(mNotifPipeline).addCollectionListener(notifCollectionCaptor.capture());
- verify(mNotifPipeline).addPromoter(notifPromoterCaptor.capture());
- verify(mNotifPipeline).addNotificationLifetimeExtender(
- notifLifetimeExtenderCaptor.capture());
- verify(mHeadsUpManager).addListener(headsUpChangedListenerCaptor.capture());
-
- given(mHeadsUpManager.getAllEntries()).willAnswer(i -> mHuns.stream());
- given(mHeadsUpManager.isAlerting(anyString())).willAnswer(i -> {
- String key = i.getArgument(0);
- for (NotificationEntry entry : mHuns) {
- if (entry.getKey().equals(key)) return true;
- }
- return false;
- });
- when(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L);
-
- mCollectionListener = notifCollectionCaptor.getValue();
- mNotifPromoter = notifPromoterCaptor.getValue();
- mNotifLifetimeExtender = notifLifetimeExtenderCaptor.getValue();
- mOnHeadsUpChangedListener = headsUpChangedListenerCaptor.getValue();
-
- mNotifSectioner = mCoordinator.getSectioner();
- mNotifLifetimeExtender.setCallback(mEndLifetimeExtension);
- mEntry = new NotificationEntryBuilder().build();
- }
-
- @Test
- public void testCancelStickyNotification() {
- when(mHeadsUpManager.isSticky(anyString())).thenReturn(true);
- addHUN(mEntry);
- when(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true);
- when(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 0L);
- assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0));
- mClock.advanceTime(1000L);
- mExecutor.runAllReady();
- verify(mHeadsUpManager, times(0))
- .removeNotification(anyString(), eq(false));
- verify(mHeadsUpManager, times(1))
- .removeNotification(anyString(), eq(true));
- }
-
- @Test
- public void testCancelUpdatedStickyNotification() {
- when(mHeadsUpManager.isSticky(anyString())).thenReturn(true);
- addHUN(mEntry);
- when(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L);
- assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0));
- mClock.advanceTime(1000L);
- mExecutor.runAllReady();
- verify(mHeadsUpManager, times(0))
- .removeNotification(anyString(), eq(false));
- verify(mHeadsUpManager, times(0))
- .removeNotification(anyString(), eq(true));
- }
-
- @Test
- public void testCancelNotification() {
- when(mHeadsUpManager.isSticky(anyString())).thenReturn(false);
- addHUN(mEntry);
- when(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L);
- assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0));
- mClock.advanceTime(1000L);
- mExecutor.runAllReady();
- verify(mHeadsUpManager, times(1))
- .removeNotification(anyString(), eq(false));
- verify(mHeadsUpManager, times(0))
- .removeNotification(anyString(), eq(true));
- }
-
- @Test
- public void testPromotesCurrentHUN() {
- // GIVEN the current HUN is set to mEntry
- addHUN(mEntry);
-
- // THEN only promote the current HUN, mEntry
- assertTrue(mNotifPromoter.shouldPromoteToTopLevel(mEntry));
- assertFalse(mNotifPromoter.shouldPromoteToTopLevel(new NotificationEntryBuilder()
- .setPkg("test-package2")
- .build()));
- }
-
- @Test
- public void testIncludeInSectionCurrentHUN() {
- // GIVEN the current HUN is set to mEntry
- addHUN(mEntry);
-
- // THEN only section the current HUN, mEntry
- assertTrue(mNotifSectioner.isInSection(mEntry));
- assertFalse(mNotifSectioner.isInSection(new NotificationEntryBuilder()
- .setPkg("test-package")
- .build()));
- }
-
- @Test
- public void testLifetimeExtendsCurrentHUN() {
- // GIVEN there is a HUN, mEntry
- addHUN(mEntry);
-
- given(mHeadsUpManager.canRemoveImmediately(anyString())).willAnswer(i -> {
- String key = i.getArgument(0);
- for (NotificationEntry entry : mHuns) {
- if (entry.getKey().equals(key)) return false;
- }
- return true;
- });
- // THEN only the current HUN, mEntry, should be lifetimeExtended
- assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, /* cancellationReason */ 0));
- assertFalse(mNotifLifetimeExtender.maybeExtendLifetime(
- new NotificationEntryBuilder()
- .setPkg("test-package")
- .build(), /* cancellationReason */ 0));
- }
-
- @Test
- public void testShowHUNOnInflationFinished() {
- // WHEN a notification should HUN and its inflation is finished
- when(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(true);
-
- ArgumentCaptor<BindCallback> bindCallbackCaptor =
- ArgumentCaptor.forClass(BindCallback.class);
- mCollectionListener.onEntryAdded(mEntry);
- verify(mHeadsUpViewBinder).bindHeadsUpView(eq(mEntry), bindCallbackCaptor.capture());
-
- bindCallbackCaptor.getValue().onBindFinished(mEntry);
-
- // THEN we tell the HeadsUpManager to show the notification
- verify(mHeadsUpManager).showNotification(mEntry);
- }
-
- @Test
- public void testNoHUNOnInflationFinished() {
- // WHEN a notification shouldn't HUN and its inflation is finished
- when(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(false);
- ArgumentCaptor<BindCallback> bindCallbackCaptor =
- ArgumentCaptor.forClass(BindCallback.class);
- mCollectionListener.onEntryAdded(mEntry);
-
- // THEN we never bind the heads up view or tell HeadsUpManager to show the notification
- verify(mHeadsUpViewBinder, never()).bindHeadsUpView(
- eq(mEntry), bindCallbackCaptor.capture());
- verify(mHeadsUpManager, never()).showNotification(mEntry);
- }
-
- @Test
- public void testOnEntryRemovedRemovesHeadsUpNotification() {
- // GIVEN the current HUN is mEntry
- addHUN(mEntry);
-
- // WHEN mEntry is removed from the notification collection
- mCollectionListener.onEntryRemoved(mEntry, /* cancellation reason */ 0);
- when(mRemoteInputManager.isSpinning(any())).thenReturn(false);
-
- // THEN heads up manager should remove the entry
- verify(mHeadsUpManager).removeNotification(mEntry.getKey(), false);
- }
-
- private void addHUN(NotificationEntry entry) {
- mHuns.add(entry);
- when(mHeadsUpManager.getTopEntry()).thenReturn(entry);
- mOnHeadsUpChangedListener.onHeadsUpStateChanged(entry, entry != null);
- }
-}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt
new file mode 100644
index 0000000..c67a233
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt
@@ -0,0 +1,238 @@
+/*
+ * 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 android.testing.AndroidTestingRunner
+import android.testing.TestableLooper.RunWithLooper
+import androidx.test.filters.SmallTest
+import com.android.systemui.SysuiTestCase
+import com.android.systemui.statusbar.NotificationRemoteInputManager
+import com.android.systemui.statusbar.notification.collection.NotifPipeline
+import com.android.systemui.statusbar.notification.collection.NotificationEntry
+import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter
+import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender
+import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender.OnEndLifetimeExtensionCallback
+import com.android.systemui.statusbar.notification.collection.render.NodeController
+import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder
+import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider
+import com.android.systemui.statusbar.notification.row.NotifBindPipeline.BindCallback
+import com.android.systemui.statusbar.policy.HeadsUpManager
+import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener
+import com.android.systemui.util.concurrency.FakeExecutor
+import com.android.systemui.util.mockito.any
+import com.android.systemui.util.mockito.eq
+import com.android.systemui.util.mockito.mock
+import com.android.systemui.util.mockito.withArgCaptor
+import com.android.systemui.util.time.FakeSystemClock
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.BDDMockito.given
+import org.mockito.Mockito.never
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import java.util.ArrayList
+import org.mockito.Mockito.`when` as whenever
+
+@SmallTest
+@RunWith(AndroidTestingRunner::class)
+@RunWithLooper
+class HeadsUpCoordinatorTest : SysuiTestCase() {
+ private lateinit var mCoordinator: HeadsUpCoordinator
+
+ // captured listeners and pluggables:
+ private lateinit var mCollectionListener: NotifCollectionListener
+ private lateinit var mNotifPromoter: NotifPromoter
+ private lateinit var mNotifLifetimeExtender: NotifLifetimeExtender
+ private lateinit var mOnHeadsUpChangedListener: OnHeadsUpChangedListener
+ private lateinit var mNotifSectioner: NotifSectioner
+
+ private val mNotifPipeline: NotifPipeline = mock()
+ private val mHeadsUpManager: HeadsUpManager = mock()
+ private val mHeadsUpViewBinder: HeadsUpViewBinder = mock()
+ private val mNotificationInterruptStateProvider: NotificationInterruptStateProvider = mock()
+ private val mRemoteInputManager: NotificationRemoteInputManager = mock()
+ private val mEndLifetimeExtension: OnEndLifetimeExtensionCallback = mock()
+ private val mHeaderController: NodeController = mock()
+
+ private lateinit var mEntry: NotificationEntry
+ private val mExecutor = FakeExecutor(FakeSystemClock())
+ private val mHuns: ArrayList<NotificationEntry> = ArrayList()
+ @Before
+ fun setUp() {
+ MockitoAnnotations.initMocks(this)
+ mCoordinator = HeadsUpCoordinator(
+ mHeadsUpManager,
+ mHeadsUpViewBinder,
+ mNotificationInterruptStateProvider,
+ mRemoteInputManager,
+ mHeaderController,
+ mExecutor)
+ mCoordinator.attach(mNotifPipeline)
+
+ // capture arguments:
+ mCollectionListener = withArgCaptor {
+ verify(mNotifPipeline).addCollectionListener(capture())
+ }
+ mNotifPromoter = withArgCaptor {
+ verify(mNotifPipeline).addPromoter(capture())
+ }
+ mNotifLifetimeExtender = withArgCaptor {
+ verify(mNotifPipeline).addNotificationLifetimeExtender(capture())
+ }
+ mOnHeadsUpChangedListener = withArgCaptor {
+ verify(mHeadsUpManager).addListener(capture())
+ }
+ given(mHeadsUpManager.allEntries).willAnswer { mHuns.stream() }
+ given(mHeadsUpManager.isAlerting(anyString())).willAnswer { invocation ->
+ val key = invocation.getArgument<String>(0)
+ mHuns.any { entry -> entry.key == key }
+ }
+ given(mHeadsUpManager.canRemoveImmediately(anyString())).willAnswer { invocation ->
+ val key = invocation.getArgument<String>(0)
+ !mHuns.any { entry -> entry.key == key }
+ }
+ whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L)
+ mNotifSectioner = mCoordinator.sectioner
+ mNotifLifetimeExtender.setCallback(mEndLifetimeExtension)
+ mEntry = NotificationEntryBuilder().build()
+ }
+
+ @Test
+ fun testCancelStickyNotification() {
+ whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true)
+ addHUN(mEntry)
+ whenever(mHeadsUpManager.canRemoveImmediately(anyString())).thenReturn(false, true)
+ whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 0L)
+ assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0))
+ mExecutor.advanceClockToLast()
+ mExecutor.runAllReady()
+ verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(false))
+ verify(mHeadsUpManager, times(1)).removeNotification(anyString(), eq(true))
+ }
+
+ @Test
+ fun testCancelUpdatedStickyNotification() {
+ whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(true)
+ addHUN(mEntry)
+ whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L)
+ assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0))
+ mExecutor.advanceClockToLast()
+ mExecutor.runAllReady()
+ verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(false))
+ verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(true))
+ }
+
+ @Test
+ fun testCancelNotification() {
+ whenever(mHeadsUpManager.isSticky(anyString())).thenReturn(false)
+ addHUN(mEntry)
+ whenever(mHeadsUpManager.getEarliestRemovalTime(anyString())).thenReturn(1000L, 500L)
+ assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, 0))
+ mExecutor.advanceClockToLast()
+ mExecutor.runAllReady()
+ verify(mHeadsUpManager, times(1)).removeNotification(anyString(), eq(false))
+ verify(mHeadsUpManager, times(0)).removeNotification(anyString(), eq(true))
+ }
+
+ @Test
+ fun testPromotesCurrentHUN() {
+ // GIVEN the current HUN is set to mEntry
+ addHUN(mEntry)
+
+ // THEN only promote the current HUN, mEntry
+ assertTrue(mNotifPromoter.shouldPromoteToTopLevel(mEntry))
+ assertFalse(mNotifPromoter.shouldPromoteToTopLevel(NotificationEntryBuilder()
+ .setPkg("test-package2")
+ .build()))
+ }
+
+ @Test
+ fun testIncludeInSectionCurrentHUN() {
+ // GIVEN the current HUN is set to mEntry
+ addHUN(mEntry)
+
+ // THEN only section the current HUN, mEntry
+ assertTrue(mNotifSectioner.isInSection(mEntry))
+ assertFalse(mNotifSectioner.isInSection(NotificationEntryBuilder()
+ .setPkg("test-package")
+ .build()))
+ }
+
+ @Test
+ fun testLifetimeExtendsCurrentHUN() {
+ // GIVEN there is a HUN, mEntry
+ addHUN(mEntry)
+
+ // THEN only the current HUN, mEntry, should be lifetimeExtended
+ assertTrue(mNotifLifetimeExtender.maybeExtendLifetime(mEntry, /* cancellationReason */ 0))
+ assertFalse(mNotifLifetimeExtender.maybeExtendLifetime(
+ NotificationEntryBuilder()
+ .setPkg("test-package")
+ .build(), /* cancellationReason */ 0))
+ }
+
+ @Test
+ fun testShowHUNOnInflationFinished() {
+ // WHEN a notification should HUN and its inflation is finished
+ whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(true)
+
+ mCollectionListener.onEntryAdded(mEntry)
+ withArgCaptor<BindCallback> {
+ verify(mHeadsUpViewBinder).bindHeadsUpView(eq(mEntry), capture())
+ }.onBindFinished(mEntry)
+
+ // THEN we tell the HeadsUpManager to show the notification
+ verify(mHeadsUpManager).showNotification(mEntry)
+ }
+
+ @Test
+ fun testNoHUNOnInflationFinished() {
+ // WHEN a notification shouldn't HUN and its inflation is finished
+ whenever(mNotificationInterruptStateProvider.shouldHeadsUp(mEntry)).thenReturn(false)
+ mCollectionListener.onEntryAdded(mEntry)
+
+ // THEN we never bind the heads up view or tell HeadsUpManager to show the notification
+ verify(mHeadsUpViewBinder, never()).bindHeadsUpView(eq(mEntry), any())
+ verify(mHeadsUpManager, never()).showNotification(mEntry)
+ }
+
+ @Test
+ fun testOnEntryRemovedRemovesHeadsUpNotification() {
+ // GIVEN the current HUN is mEntry
+ addHUN(mEntry)
+
+ // WHEN mEntry is removed from the notification collection
+ mCollectionListener.onEntryRemoved(mEntry, /* cancellation reason */ 0)
+ whenever(mRemoteInputManager.isSpinning(any())).thenReturn(false)
+
+ // THEN heads up manager should remove the entry
+ verify(mHeadsUpManager).removeNotification(mEntry.key, false)
+ }
+
+ private fun addHUN(entry: NotificationEntry) {
+ mHuns.add(entry)
+ whenever(mHeadsUpManager.topEntry).thenReturn(entry)
+ mOnHeadsUpChangedListener.onHeadsUpStateChanged(entry, true)
+ }
+}
\ No newline at end of file
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
index 917c049..d094749 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
@@ -41,6 +41,7 @@
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.NotificationLockscreenUserManager;
import com.android.systemui.statusbar.RankingBuilder;
+import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider;
import com.android.systemui.statusbar.notification.collection.GroupEntry;
import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder;
import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -70,6 +71,7 @@
@Mock private StatusBarStateController mStatusBarStateController;
@Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor;
@Mock private HighPriorityProvider mHighPriorityProvider;
+ @Mock private SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;
@Mock private NotifPipeline mNotifPipeline;
private NotificationEntry mEntry;
@@ -81,7 +83,7 @@
KeyguardCoordinator keyguardCoordinator = new KeyguardCoordinator(
mContext, mMainHandler, mKeyguardStateController, mLockscreenUserManager,
mBroadcastDispatcher, mStatusBarStateController,
- mKeyguardUpdateMonitor, mHighPriorityProvider);
+ mKeyguardUpdateMonitor, mHighPriorityProvider, mSectionHeaderVisibilityProvider);
mEntry = new NotificationEntryBuilder()
.setUser(new UserHandle(NOTIF_USER_ID))
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java
index bde6734..3b034f7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static java.util.Objects.requireNonNull;
@@ -40,7 +41,6 @@
import com.android.internal.statusbar.IStatusBarService;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.RankingBuilder;
-import com.android.systemui.statusbar.notification.ConversationNotificationManager;
import com.android.systemui.statusbar.notification.SectionClassifier;
import com.android.systemui.statusbar.notification.collection.GroupEntry;
import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder;
@@ -48,6 +48,7 @@
import com.android.systemui.statusbar.notification.collection.NotifPipeline;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;
+import com.android.systemui.statusbar.notification.collection.inflation.BindEventManagerImpl;
import com.android.systemui.statusbar.notification.collection.inflation.NotifInflater;
import com.android.systemui.statusbar.notification.collection.inflation.NotifUiAdjustmentProvider;
import com.android.systemui.statusbar.notification.collection.listbuilder.NotifSection;
@@ -93,7 +94,7 @@
@Mock private NotifSection mNotifSection;
@Mock private NotifPipeline mNotifPipeline;
@Mock private IStatusBarService mService;
- @Mock private ConversationNotificationManager mConvoManager;
+ @Mock private BindEventManagerImpl mBindEventManagerImpl;
@Spy private FakeNotifInflater mNotifInflater = new FakeNotifInflater();
private final SectionClassifier mSectionClassifier = new SectionClassifier();
private final NotifUiAdjustmentProvider mAdjustmentProvider =
@@ -121,7 +122,7 @@
mock(NotifViewBarn.class),
mAdjustmentProvider,
mService,
- mConvoManager,
+ mBindEventManagerImpl,
TEST_CHILD_BIND_CUTOFF,
TEST_MAX_GROUP_DELAY);
@@ -411,7 +412,8 @@
public void testCallConversationManagerBindWhenInflated() {
mBeforeFilterListener.onBeforeFinalizeFilter(List.of(mEntry));
mNotifInflater.getInflateCallback(mEntry).onInflationFinished(mEntry, null);
- verify(mConvoManager, times(1)).onEntryViewBound(eq(mEntry));
+ verify(mBindEventManagerImpl, times(1)).notifyViewBound(eq(mEntry));
+ verifyNoMoreInteractions(mBindEventManagerImpl);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt
index f773810..4e309d4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilderTest.kt
@@ -19,6 +19,7 @@
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager
+import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider
import com.android.systemui.statusbar.notification.collection.GroupEntry
import com.android.systemui.statusbar.notification.collection.GroupEntryBuilder
import com.android.systemui.statusbar.notification.collection.ListEntry
@@ -43,6 +44,7 @@
private val mediaContainerController: MediaContainerController = mock()
private val sectionsFeatureManager: NotificationSectionsFeatureManager = mock()
+ private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider = mock()
private val viewBarn: NotifViewBarn = mock()
private var rootController: NodeController = buildFakeController("rootController")
@@ -72,11 +74,13 @@
fakeViewBarn.getViewByEntry(it.getArgument(0))
}
- specBuilder = NodeSpecBuilder(mediaContainerController, sectionsFeatureManager, viewBarn)
+ specBuilder = NodeSpecBuilder(mediaContainerController, sectionsFeatureManager,
+ sectionHeaderVisibilityProvider, viewBarn)
}
@Test
fun testMultipleSectionsWithSameController() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
listOf(
notif(0, section0),
@@ -95,6 +99,7 @@
@Test(expected = RuntimeException::class)
fun testMultipleSectionsWithSameControllerNonConsecutive() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
listOf(
notif(0, section0),
@@ -108,6 +113,7 @@
@Test
fun testSimpleMapping() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
// GIVEN a simple flat list of notifications all in the same headerless section
listOf(
@@ -129,6 +135,7 @@
@Test
fun testSimpleMappingWithMedia() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
// WHEN media controls are enabled
whenever(sectionsFeatureManager.isMediaControlsEnabled()).thenReturn(true)
@@ -154,6 +161,8 @@
@Test
fun testHeaderInjection() {
+ // WHEN section headers are supposed to be visible
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
// GIVEN a flat list of notifications, spread across three sections
listOf(
@@ -177,7 +186,31 @@
}
@Test
+ fun testHeaderSuppression() {
+ // WHEN section headers are supposed to be hidden
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(false)
+ checkOutput(
+ // GIVEN a flat list of notifications, spread across three sections
+ listOf(
+ notif(0, section0),
+ notif(1, section0),
+ notif(2, section1),
+ notif(3, section2)
+ ),
+
+ // THEN each section has its header injected
+ tree(
+ notifNode(0),
+ notifNode(1),
+ notifNode(2),
+ notifNode(3)
+ )
+ )
+ }
+
+ @Test
fun testGroups() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
// GIVEN a mixed list of top-level notifications and groups
listOf(
@@ -218,6 +251,7 @@
@Test
fun testSecondSectionWithNoHeader() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
// GIVEN a middle section with no associated header view
listOf(
@@ -247,6 +281,7 @@
@Test(expected = RuntimeException::class)
fun testRepeatedSectionsThrow() {
+ whenever(sectionHeaderVisibilityProvider.sectionHeadersVisible).thenReturn(true)
checkOutput(
// GIVEN a malformed list where sections are not contiguous
listOf(
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
index f21fca2..10f4435 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
@@ -647,8 +647,15 @@
mScrimController.setRawPanelExpansionFraction(0.3f);
assertScrimAlpha(Map.of(
mScrimInFront, TRANSPARENT,
- mNotificationsScrim, SEMI_TRANSPARENT,
+ mNotificationsScrim, TRANSPARENT,
mScrimBehind, SEMI_TRANSPARENT));
+
+ // Then, notification scrim should fade in
+ mScrimController.setRawPanelExpansionFraction(0.7f);
+ assertScrimAlpha(Map.of(
+ mScrimInFront, TRANSPARENT,
+ mNotificationsScrim, SEMI_TRANSPARENT,
+ mScrimBehind, OPAQUE));
}
@@ -1132,6 +1139,7 @@
@Test
public void testScrimsVisible_whenShadeVisible() {
+ mScrimController.setClipsQsScrim(true);
mScrimController.transitionTo(ScrimState.UNLOCKED);
mScrimController.setRawPanelExpansionFraction(0.3f);
// notifications scrim alpha change require calling setQsPosition
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java
index a8522c7..6364d2f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java
@@ -52,13 +52,14 @@
@SmallTest
public class DeviceStateRotationLockSettingControllerTest extends SysuiTestCase {
- private static final String[] DEFAULT_SETTINGS = new String[] {"0:0", "1:2"};
+ private static final String[] DEFAULT_SETTINGS = new String[]{"0:1", "2:0:1", "1:2"};
private final FakeSystemClock mFakeSystemClock = new FakeSystemClock();
private final FakeExecutor mFakeExecutor = new FakeExecutor(mFakeSystemClock);
- @Mock DeviceStateManager mDeviceStateManager;
- RotationPolicyWrapper mFakeRotationPolicy = new FakeRotationPolicy();
- DeviceStateRotationLockSettingController mDeviceStateRotationLockSettingController;
+ @Mock
+ private DeviceStateManager mDeviceStateManager;
+ private final RotationPolicyWrapper mFakeRotationPolicy = new FakeRotationPolicy();
+ private DeviceStateRotationLockSettingController mDeviceStateRotationLockSettingController;
private DeviceStateManager.DeviceStateCallback mDeviceStateCallback;
private DeviceStateRotationLockSettingsManager mSettingsManager;
private TestableContentResolver mContentResolver;
@@ -93,7 +94,7 @@
mContentResolver,
Settings.Secure.DEVICE_STATE_ROTATION_LOCK,
UserHandle.USER_CURRENT))
- .isEqualTo("0:0:1:2");
+ .isEqualTo("0:1:1:2:2:0");
}
@Test
@@ -125,6 +126,31 @@
}
@Test
+ public void whenDeviceStateSwitched_settingIsIgnored_loadsDefaultFallbackSetting() {
+ initializeSettingsWith();
+ mFakeRotationPolicy.setRotationLock(true);
+
+ // State 2 -> Ignored -> Fall back to state 1 which is unlocked
+ mDeviceStateCallback.onStateChanged(2);
+
+ assertThat(mFakeRotationPolicy.isRotationLocked()).isFalse();
+ }
+
+ @Test
+ public void whenDeviceStateSwitched_ignoredSetting_fallbackValueChanges_usesFallbackValue() {
+ initializeSettingsWith(
+ 0, DEVICE_STATE_ROTATION_LOCK_UNLOCKED,
+ 1, DEVICE_STATE_ROTATION_LOCK_LOCKED,
+ 2, DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ mFakeRotationPolicy.setRotationLock(false);
+
+ // State 2 -> Ignored -> Fall back to state 1 which is locked
+ mDeviceStateCallback.onStateChanged(2);
+
+ assertThat(mFakeRotationPolicy.isRotationLocked()).isTrue();
+ }
+
+ @Test
public void whenUserChangesSetting_saveSettingForCurrentState() {
initializeSettingsWith(
0, DEVICE_STATE_ROTATION_LOCK_LOCKED, 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED);
@@ -159,15 +185,15 @@
}
@Test
- public void whenDeviceStateSwitchedToIgnoredState_newSettingsSaveForPreviousState() {
+ public void whenDeviceStateSwitchedToIgnoredState_noFallback_newSettingsSaveForPreviousState() {
initializeSettingsWith(
- 0, DEVICE_STATE_ROTATION_LOCK_IGNORED, 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED);
+ 8, DEVICE_STATE_ROTATION_LOCK_IGNORED, 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED);
mFakeRotationPolicy.setRotationLock(true);
mDeviceStateCallback.onStateChanged(1);
assertThat(mFakeRotationPolicy.isRotationLocked()).isFalse();
- mDeviceStateCallback.onStateChanged(0);
+ mDeviceStateCallback.onStateChanged(8);
assertThat(mFakeRotationPolicy.isRotationLocked()).isFalse();
mDeviceStateRotationLockSettingController.onRotationLockStateChanged(
@@ -178,7 +204,7 @@
mContentResolver,
Settings.Secure.DEVICE_STATE_ROTATION_LOCK,
UserHandle.USER_CURRENT))
- .isEqualTo("0:0:1:1");
+ .isEqualTo("1:1:8:0");
}
@Test
@@ -198,12 +224,78 @@
assertThat(mFakeRotationPolicy.isRotationLocked()).isTrue();
}
+ @Test
+ public void onRotationLockStateChanged_newSettingIsPersisted() {
+ initializeSettingsWith(
+ 0, DEVICE_STATE_ROTATION_LOCK_LOCKED,
+ 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED);
+ mDeviceStateCallback.onStateChanged(0);
+
+ mDeviceStateRotationLockSettingController.onRotationLockStateChanged(
+ /* rotationLocked= */ false,
+ /* affordanceVisible= */ true
+ );
+
+ assertThat(
+ Settings.Secure.getStringForUser(
+ mContentResolver,
+ Settings.Secure.DEVICE_STATE_ROTATION_LOCK,
+ UserHandle.USER_CURRENT))
+ .isEqualTo("0:2:1:2");
+ }
+
+ @Test
+ public void onRotationLockStateChanged_deviceStateIsIgnored_newSettingIsPersistedToFallback() {
+ initializeSettingsWith(
+ 0, DEVICE_STATE_ROTATION_LOCK_LOCKED,
+ 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED,
+ 2, DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ mDeviceStateCallback.onStateChanged(2);
+
+ mDeviceStateRotationLockSettingController.onRotationLockStateChanged(
+ /* rotationLocked= */ true,
+ /* affordanceVisible= */ true
+ );
+
+ assertThat(
+ Settings.Secure.getStringForUser(
+ mContentResolver,
+ Settings.Secure.DEVICE_STATE_ROTATION_LOCK,
+ UserHandle.USER_CURRENT))
+ .isEqualTo("0:1:1:1:2:0");
+ }
+
+ @Test
+ public void onRotationLockStateChange_stateIgnored_noFallback_settingIsPersistedToPrevious() {
+ initializeSettingsWith(
+ 0, DEVICE_STATE_ROTATION_LOCK_LOCKED,
+ 1, DEVICE_STATE_ROTATION_LOCK_UNLOCKED,
+ 8, DEVICE_STATE_ROTATION_LOCK_IGNORED);
+ mDeviceStateCallback.onStateChanged(1);
+ mDeviceStateCallback.onStateChanged(8);
+
+ mDeviceStateRotationLockSettingController.onRotationLockStateChanged(
+ /* rotationLocked= */ true,
+ /* affordanceVisible= */ true
+ );
+
+ assertThat(
+ Settings.Secure.getStringForUser(
+ mContentResolver,
+ Settings.Secure.DEVICE_STATE_ROTATION_LOCK,
+ UserHandle.USER_CURRENT))
+ .isEqualTo("0:1:1:1:8:0");
+ }
+
private void initializeSettingsWith(int... values) {
if (values.length % 2 != 0) {
throw new IllegalArgumentException("Expecting key-value pairs");
}
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < values.length; sb.append(":")) {
+ for (int i = 0; i < values.length; ) {
+ if (i > 0) {
+ sb.append(":");
+ }
sb.append(values[i++]).append(":").append(values[i++]);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java
index 087f2e6..2126dda 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/LocationControllerImplTest.java
@@ -22,6 +22,7 @@
import android.app.AppOpsManager;
import android.content.Intent;
+import android.content.pm.UserInfo;
import android.location.LocationManager;
import android.os.Handler;
import android.os.UserHandle;
@@ -68,6 +69,8 @@
MockitoAnnotations.initMocks(this);
when(mUserTracker.getUserId()).thenReturn(UserHandle.USER_SYSTEM);
when(mUserTracker.getUserHandle()).thenReturn(UserHandle.SYSTEM);
+ when(mUserTracker.getUserProfiles())
+ .thenReturn(ImmutableList.of(new UserInfo(0, "name", 0)));
mDeviceConfigProxy = new DeviceConfigProxyFake();
mTestableLooper = TestableLooper.get(this);
@@ -78,7 +81,8 @@
new Handler(mTestableLooper.getLooper()),
mock(BroadcastDispatcher.class),
mock(BootCompleteCache.class),
- mUserTracker);
+ mUserTracker,
+ mContext.getPackageManager());
mTestableLooper.processAllMessages();
}
@@ -161,17 +165,7 @@
@Test
public void testCallbackNotified_additionalOps() {
LocationChangeCallback callback = mock(LocationChangeCallback.class);
-
mLocationController.addCallback(callback);
-
- mTestableLooper.processAllMessages();
-
- mLocationController.onReceive(mContext, new Intent(LocationManager.MODE_CHANGED_ACTION));
-
- mTestableLooper.processAllMessages();
-
- verify(callback, times(2)).onLocationSettingsChanged(anyBoolean());
-
mDeviceConfigProxy.setProperty(
DeviceConfig.NAMESPACE_PRIVACY,
SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,
@@ -181,10 +175,11 @@
when(mAppOpsController.getActiveAppOps())
.thenReturn(ImmutableList.of(
- new AppOpItem(AppOpsManager.OP_FINE_LOCATION, 0, "",
+ new AppOpItem(AppOpsManager.OP_FINE_LOCATION, 0,
+ "com.google.android.googlequicksearchbox",
System.currentTimeMillis())));
mLocationController.onActiveStateChanged(AppOpsManager.OP_FINE_LOCATION, 0,
- "", true);
+ "com.google.android.googlequicksearchbox", true);
mTestableLooper.processAllMessages();
@@ -192,7 +187,67 @@
when(mAppOpsController.getActiveAppOps()).thenReturn(ImmutableList.of());
mLocationController.onActiveStateChanged(AppOpsManager.OP_FINE_LOCATION, 0,
- "", false);
+ "com.google.android.googlequicksearchbox", false);
+ mTestableLooper.processAllMessages();
+
+ verify(callback, times(1)).onLocationActiveChanged(false);
+ }
+
+ @Test
+ public void testCallbackNotified_additionalOps_shouldShowSystem() {
+ LocationChangeCallback callback = mock(LocationChangeCallback.class);
+ mLocationController.addCallback(callback);
+ mDeviceConfigProxy.setProperty(
+ DeviceConfig.NAMESPACE_PRIVACY,
+ SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,
+ "true",
+ true);
+ mTestableLooper.processAllMessages();
+
+ when(mAppOpsController.getActiveAppOps())
+ .thenReturn(ImmutableList.of(
+ new AppOpItem(AppOpsManager.OP_FINE_LOCATION, 0,
+ "com.google.android.gms",
+ System.currentTimeMillis())));
+ mLocationController.onActiveStateChanged(AppOpsManager.OP_FINE_LOCATION, 0,
+ "com.google.android.gms", true);
+
+ mTestableLooper.processAllMessages();
+
+ verify(callback, times(0)).onLocationActiveChanged(true);
+ }
+
+
+ @Test
+ public void testCallbackNotified_additionalOps_shouldNotShowSystem() {
+ LocationChangeCallback callback = mock(LocationChangeCallback.class);
+ mLocationController.addCallback(callback);
+ mDeviceConfigProxy.setProperty(
+ DeviceConfig.NAMESPACE_PRIVACY,
+ SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SMALL_ENABLED,
+ "true",
+ true);
+ mDeviceConfigProxy.setProperty(
+ DeviceConfig.NAMESPACE_PRIVACY,
+ SystemUiDeviceConfigFlags.PROPERTY_LOCATION_INDICATORS_SHOW_SYSTEM,
+ "true",
+ true);
+ mTestableLooper.processAllMessages();
+
+ when(mAppOpsController.getActiveAppOps())
+ .thenReturn(ImmutableList.of(
+ new AppOpItem(AppOpsManager.OP_FINE_LOCATION, 0, "com.google.android.gms",
+ System.currentTimeMillis())));
+ mLocationController.onActiveStateChanged(AppOpsManager.OP_FINE_LOCATION, 0,
+ "com.google.android.gms", true);
+
+ mTestableLooper.processAllMessages();
+
+ verify(callback, times(1)).onLocationActiveChanged(true);
+
+ when(mAppOpsController.getActiveAppOps()).thenReturn(ImmutableList.of());
+ mLocationController.onActiveStateChanged(AppOpsManager.OP_FINE_LOCATION, 0,
+ "com.google.android.gms", false);
mTestableLooper.processAllMessages();
verify(callback, times(1)).onLocationActiveChanged(false);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt
index f600b12..4e2736c7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt
@@ -68,7 +68,7 @@
context.mainExecutor,
context,
screenLifecycle
- )
+ ).apply { init() }
deviceStates = FoldableTestUtils.findDeviceStates(context)
verify(deviceStateManager).registerCallback(any(), foldStateListenerCaptor.capture())
diff --git a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
index 93fc0e72..2b7b977 100644
--- a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
+++ b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
@@ -254,9 +254,14 @@
private AssociationInfo createAssociationAndNotifyApplication(
@NonNull AssociationRequest request, @NonNull String packageName, @UserIdInt int userId,
@Nullable MacAddress macAddress, @NonNull IAssociationRequestCallback callback) {
- final AssociationInfo association = mService.createAssociation(userId, packageName,
- macAddress, request.getDisplayName(), request.getDeviceProfile(),
- request.isSelfManaged());
+ final AssociationInfo association;
+ final long callingIdentity = Binder.clearCallingIdentity();
+ try {
+ association = mService.createAssociation(userId, packageName, macAddress,
+ request.getDisplayName(), request.getDeviceProfile(), request.isSelfManaged());
+ } finally {
+ Binder.restoreCallingIdentity(callingIdentity);
+ }
try {
callback.onAssociationCreated(association);
diff --git a/services/companion/java/com/android/server/companion/AssociationStore.java b/services/companion/java/com/android/server/companion/AssociationStore.java
index 58fc8f7..01905bb 100644
--- a/services/companion/java/com/android/server/companion/AssociationStore.java
+++ b/services/companion/java/com/android/server/companion/AssociationStore.java
@@ -49,7 +49,25 @@
/** Listener for any changes to {@link AssociationInfo}-s. */
interface OnChangeListener {
default void onAssociationChanged(
- @ChangeType int changeType, AssociationInfo association) {}
+ @ChangeType int changeType, AssociationInfo association) {
+ switch (changeType) {
+ case CHANGE_TYPE_ADDED:
+ onAssociationAdded(association);
+ break;
+
+ case CHANGE_TYPE_REMOVED:
+ onAssociationRemoved(association);
+ break;
+
+ case CHANGE_TYPE_UPDATED_ADDRESS_CHANGED:
+ onAssociationUpdated(association, true);
+ break;
+
+ case CHANGE_TYPE_UPDATED_ADDRESS_UNCHANGED:
+ onAssociationUpdated(association, false);
+ break;
+ }
+ }
default void onAssociationAdded(AssociationInfo association) {}
diff --git a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
index dbcdd0f..cda554e 100644
--- a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
+++ b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java
@@ -125,8 +125,7 @@
// Update the MacAddress-to-List<Association> map if needed.
final MacAddress updatedAddress = updated.getDeviceMacAddress();
final MacAddress currentAddress = current.getDeviceMacAddress();
- macAddressChanged = Objects.equals(
- current.getDeviceMacAddress(), updated.getDeviceMacAddress());
+ macAddressChanged = Objects.equals(currentAddress, updatedAddress);
if (macAddressChanged) {
if (currentAddress != null) {
mAddressMap.get(currentAddress).remove(id);
@@ -213,11 +212,9 @@
final Set<Integer> ids = mAddressMap.get(address);
if (ids == null) return Collections.emptyList();
- final List<AssociationInfo> associations = new ArrayList<>();
- for (AssociationInfo association : mIdMap.values()) {
- if (address.equals(association.getDeviceMacAddress())) {
- associations.add(association);
- }
+ final List<AssociationInfo> associations = new ArrayList<>(ids.size());
+ for (Integer id : ids) {
+ associations.add(mIdMap.get(id));
}
return Collections.unmodifiableList(associations);
@@ -263,24 +260,6 @@
synchronized (mListeners) {
for (OnChangeListener listener : mListeners) {
listener.onAssociationChanged(changeType, association);
-
- switch (changeType) {
- case CHANGE_TYPE_ADDED:
- listener.onAssociationAdded(association);
- break;
-
- case CHANGE_TYPE_REMOVED:
- listener.onAssociationRemoved(association);
- break;
-
- case CHANGE_TYPE_UPDATED_ADDRESS_CHANGED:
- listener.onAssociationUpdated(association, true);
- break;
-
- case CHANGE_TYPE_UPDATED_ADDRESS_UNCHANGED:
- listener.onAssociationUpdated(association, false);
- break;
- }
}
}
}
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 1e50c80..cfd3798 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -77,11 +77,13 @@
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal;
+import android.content.pm.UserInfo;
import android.net.MacAddress;
import android.net.NetworkPolicyManager;
import android.os.Binder;
import android.os.Environment;
import android.os.Handler;
+import android.os.Message;
import android.os.Parcel;
import android.os.PowerWhitelistManager;
import android.os.RemoteCallbackList;
@@ -185,6 +187,7 @@
private final CompanionDeviceManagerServiceInternal mLocalService = new LocalService(this);
final Handler mMainHandler = Handler.getMain();
+ private final PersistUserStateHandler mUserPersistenceHandler = new PersistUserStateHandler();
private CompanionDevicePresenceController mCompanionDevicePresenceController;
/**
@@ -366,9 +369,8 @@
final List<AssociationInfo> updatedAssociations =
mAssociationStore.getAssociationsForUser(userId);
- final Map<String, Set<Integer>> usedIdsForUser = getPreviouslyUsedIdsForUser(userId);
- BackgroundThread.getHandler().post(() ->
- mPersistentStore.persistStateForUser(userId, updatedAssociations, usedIdsForUser));
+
+ mUserPersistenceHandler.postPersistUserState(userId);
// Notify listeners if ADDED, REMOVED or UPDATED_ADDRESS_CHANGED.
// Do NOT notify when UPDATED_ADDRESS_UNCHANGED, which means a minor tweak in association's
@@ -381,6 +383,13 @@
restartBleScan();
}
+ private void persistStateForUser(@UserIdInt int userId) {
+ final List<AssociationInfo> updatedAssociations =
+ mAssociationStore.getAssociationsForUser(userId);
+ final Map<String, Set<Integer>> usedIdsForUser = getPreviouslyUsedIdsForUser(userId);
+ mPersistentStore.persistStateForUser(userId, updatedAssociations, usedIdsForUser);
+ }
+
private void notifyListeners(
@UserIdInt int userId, @NonNull List<AssociationInfo> associations) {
mListeners.broadcast((listener, callbackUserId) -> {
@@ -778,6 +787,12 @@
Slog.i(LOG_TAG, "New CDM association created=" + association);
mAssociationStore.addAssociation(association);
+ // If the "Device Profile" is specified, make the companion application a holder of the
+ // corresponding role.
+ if (deviceProfile != null) {
+ addRoleHolderForAssociation(getContext(), association);
+ }
+
updateSpecialAccessPermissionForAssociatedPackage(association);
return association;
@@ -921,14 +936,8 @@
exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);
- if (!association.isSelfManaged()) {
- if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddressAsString())) {
- addRoleHolderForAssociation(getContext(), association);
- }
-
- if (association.isNotifyOnDeviceNearby()) {
- restartBleScan();
- }
+ if (association.isNotifyOnDeviceNearby()) {
+ restartBleScan();
}
}
@@ -974,19 +983,7 @@
void onDeviceConnected(String address) {
Slog.d(LOG_TAG, "onDeviceConnected(address = " + address + ")");
-
mCurrentlyConnectedDevices.add(address);
-
- for (AssociationInfo association : mAssociationStore.getAssociationsByAddress(address)) {
- if (association.getDeviceProfile() != null) {
- Slog.i(LOG_TAG, "Granting role " + association.getDeviceProfile()
- + " to " + association.getPackageName()
- + " due to device connected: " + association.getDeviceMacAddress());
-
- addRoleHolderForAssociation(getContext(), association);
- }
- }
-
onDeviceNearby(address);
}
@@ -1349,4 +1346,47 @@
mService.associationCleanUp(profile);
}
}
+
+ /**
+ * This method must only be called from {@link CompanionDeviceShellCommand} for testing
+ * purposes only!
+ */
+ void persistState() {
+ mUserPersistenceHandler.clearMessages();
+ for (UserInfo user : mUserManager.getAliveUsers()) {
+ persistStateForUser(user.id);
+ }
+ }
+
+ /**
+ * This class is dedicated to handling requests to persist user state.
+ */
+ @SuppressLint("HandlerLeak")
+ private class PersistUserStateHandler extends Handler {
+ PersistUserStateHandler() {
+ super(BackgroundThread.get().getLooper());
+ }
+
+ /**
+ * Persists user state unless there is already an outstanding request for the given user.
+ */
+ synchronized void postPersistUserState(@UserIdInt int userId) {
+ if (!hasMessages(userId)) {
+ sendMessage(obtainMessage(userId));
+ }
+ }
+
+ /**
+ * Clears *ALL* outstanding persist requests for *ALL* users.
+ */
+ synchronized void clearMessages() {
+ removeCallbacksAndMessages(null);
+ }
+
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ final int userId = msg.what;
+ persistStateForUser(userId);
+ }
+ }
}
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java
index 5f46d5c..f2e66077 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java
@@ -73,19 +73,12 @@
}
break;
- case "simulate_connect": {
- mService.onDeviceConnected(getNextArgRequired());
- }
- break;
-
- case "simulate_disconnect": {
- mService.onDeviceDisconnected(getNextArgRequired());
- }
- break;
case "clear-association-memory-cache": {
+ mService.persistState();
mService.loadAssociationsFromDisk();
}
break;
+
default:
return handleDefaultCommands(cmd);
}
diff --git a/services/companion/java/com/android/server/companion/DataStoreUtils.java b/services/companion/java/com/android/server/companion/DataStoreUtils.java
new file mode 100644
index 0000000..6055a81
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/DataStoreUtils.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 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.companion;
+
+import static org.xmlpull.v1.XmlPullParser.END_TAG;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
+
+import android.annotation.NonNull;
+import android.annotation.UserIdInt;
+import android.os.Environment;
+import android.util.AtomicFile;
+import android.util.Slog;
+
+import com.android.internal.util.FunctionalUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+final class DataStoreUtils {
+
+ private static final String LOG_TAG = DataStoreUtils.class.getSimpleName();
+
+ static boolean isStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag)
+ throws XmlPullParserException {
+ return parser.getEventType() == START_TAG && tag.equals(parser.getName());
+ }
+
+ static boolean isEndOfTag(@NonNull XmlPullParser parser, @NonNull String tag)
+ throws XmlPullParserException {
+ return parser.getEventType() == END_TAG && tag.equals(parser.getName());
+ }
+
+ /**
+ * Creates {@link AtomicFile} object that represents the back-up for the given user.
+ *
+ * IMPORTANT: the method will ALWAYS return the same {@link AtomicFile} object, which makes it
+ * possible to synchronize reads and writes to the file using the returned object.
+ *
+ * @param userId the userId to retrieve the storage file
+ * @param fileName the storage file name
+ * @return an AtomicFile for the user
+ */
+ @NonNull
+ static AtomicFile createStorageFileForUser(@UserIdInt int userId, String fileName) {
+ return new AtomicFile(getBaseStorageFileForUser(userId, fileName));
+ }
+
+ @NonNull
+ private static File getBaseStorageFileForUser(@UserIdInt int userId, String fileName) {
+ return new File(Environment.getDataSystemDeDirectory(userId), fileName);
+ }
+
+ /**
+ * Writing to file could fail, for example, if the user has been recently removed and so was
+ * their DE (/data/system_de/<user-id>/) directory.
+ */
+ static void writeToFileSafely(@NonNull AtomicFile file,
+ @NonNull FunctionalUtils.ThrowingConsumer<FileOutputStream> consumer) {
+ try {
+ file.write(consumer);
+ } catch (Exception e) {
+ Slog.e(LOG_TAG, "Error while writing to file " + file, e);
+ }
+ }
+
+ private DataStoreUtils() {
+ }
+}
diff --git a/services/companion/java/com/android/server/companion/PersistentDataStore.java b/services/companion/java/com/android/server/companion/PersistentDataStore.java
index 3c8c3cb..da33b44 100644
--- a/services/companion/java/com/android/server/companion/PersistentDataStore.java
+++ b/services/companion/java/com/android/server/companion/PersistentDataStore.java
@@ -25,9 +25,10 @@
import static com.android.internal.util.XmlUtils.writeIntAttribute;
import static com.android.internal.util.XmlUtils.writeLongAttribute;
import static com.android.internal.util.XmlUtils.writeStringAttribute;
-
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
+import static com.android.server.companion.DataStoreUtils.createStorageFileForUser;
+import static com.android.server.companion.DataStoreUtils.isEndOfTag;
+import static com.android.server.companion.DataStoreUtils.isStartOfTag;
+import static com.android.server.companion.DataStoreUtils.writeToFileSafely;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -44,7 +45,6 @@
import android.util.TypedXmlSerializer;
import android.util.Xml;
-import com.android.internal.util.FunctionalUtils.ThrowingConsumer;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -53,7 +53,6 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
@@ -210,6 +209,7 @@
@NonNull Collection<AssociationInfo> associationsOut,
@NonNull Map<String, Set<Integer>> previouslyUsedIdsPerPackageOut) {
Slog.i(LOG_TAG, "Reading associations for user " + userId + " from disk");
+
final AtomicFile file = getStorageFileForUser(userId);
if (DEBUG) Slog.d(LOG_TAG, " > File=" + file.getBaseFile().getPath());
@@ -349,11 +349,7 @@
*/
private @NonNull AtomicFile getStorageFileForUser(@UserIdInt int userId) {
return mUserIdToStorageFile.computeIfAbsent(userId,
- u -> new AtomicFile(getBaseStorageFileForUser(userId)));
- }
-
- private static @NonNull File getBaseStorageFileForUser(@UserIdInt int userId) {
- return new File(Environment.getDataSystemDeDirectory(userId), FILE_NAME);
+ u -> createStorageFileForUser(userId, FILE_NAME));
}
private static @NonNull File getBaseLegacyStorageFileForUser(@UserIdInt int userId) {
@@ -512,16 +508,6 @@
serializer.endTag(null, XML_TAG_PACKAGE);
}
- private static boolean isStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag)
- throws XmlPullParserException {
- return parser.getEventType() == START_TAG && tag.equals(parser.getName());
- }
-
- private static boolean isEndOfTag(@NonNull XmlPullParser parser, @NonNull String tag)
- throws XmlPullParserException {
- return parser.getEventType() == END_TAG && tag.equals(parser.getName());
- }
-
private static void requireStartOfTag(@NonNull XmlPullParser parser, @NonNull String tag)
throws XmlPullParserException {
if (isStartOfTag(parser, tag)) return;
@@ -546,13 +532,4 @@
}
return associationInfo;
}
-
- private static void writeToFileSafely(@NonNull AtomicFile file,
- @NonNull ThrowingConsumer<FileOutputStream> consumer) {
- try {
- file.write(consumer);
- } catch (Exception e) {
- Slog.e(LOG_TAG, "Error while writing to file " + file, e);
- }
- }
}
diff --git a/services/companion/java/com/android/server/companion/SystemDataTransferRequestDataStore.java b/services/companion/java/com/android/server/companion/SystemDataTransferRequestDataStore.java
new file mode 100644
index 0000000..38e5d16
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/SystemDataTransferRequestDataStore.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2022 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.companion;
+
+import static com.android.internal.util.XmlUtils.readBooleanAttribute;
+import static com.android.internal.util.XmlUtils.readIntAttribute;
+import static com.android.internal.util.XmlUtils.readThisListXml;
+import static com.android.internal.util.XmlUtils.writeBooleanAttribute;
+import static com.android.internal.util.XmlUtils.writeIntAttribute;
+import static com.android.internal.util.XmlUtils.writeListXml;
+import static com.android.server.companion.DataStoreUtils.createStorageFileForUser;
+import static com.android.server.companion.DataStoreUtils.isEndOfTag;
+import static com.android.server.companion.DataStoreUtils.isStartOfTag;
+import static com.android.server.companion.DataStoreUtils.writeToFileSafely;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.UserIdInt;
+import android.companion.SystemDataTransferRequest;
+import android.util.AtomicFile;
+import android.util.Slog;
+import android.util.TypedXmlPullParser;
+import android.util.TypedXmlSerializer;
+import android.util.Xml;
+
+import com.android.internal.util.XmlUtils;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * The class is responsible for reading/writing SystemDataTransferRequest records from/to the disk.
+ *
+ * The following snippet is a sample XML file stored in the disk.
+ * <pre>{@code
+ * <requests>
+ * <request
+ * association_id="1"
+ * is_permission_sync_all_packages="false">
+ * <list name="permission_sync_packages">
+ * <string>com.sample.app1</string>
+ * <string>com.sample.app2</string>
+ * </list>
+ * </request>
+ * </requests>
+ * }</pre>
+ */
+public class SystemDataTransferRequestDataStore {
+
+ private static final String LOG_TAG = SystemDataTransferRequestDataStore.class.getSimpleName();
+
+ private static final String FILE_NAME = "companion_device_system_data_transfer_requests.xml";
+
+ private static final String XML_TAG_REQUESTS = "requests";
+ private static final String XML_TAG_REQUEST = "request";
+ private static final String XML_TAG_LIST = "list";
+
+ private static final String XML_ATTR_ASSOCIATION_ID = "association_id";
+ private static final String XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES =
+ "is_permission_sync_all_packages";
+ private static final String XML_ATTR_PERMISSION_SYNC_PACKAGES = "permission_sync_packages";
+
+ private final ConcurrentMap<Integer, AtomicFile> mUserIdToStorageFile =
+ new ConcurrentHashMap<>();
+
+ /**
+ * Reads previously persisted data for the given user
+ *
+ * @param userId Android UserID
+ * @return a list of SystemDataTransferRequest
+ */
+ @NonNull
+ List<SystemDataTransferRequest> readRequestsForUser(@UserIdInt int userId) {
+ final AtomicFile file = getStorageFileForUser(userId);
+ Slog.i(LOG_TAG, "Reading SystemDataTransferRequests for user " + userId + " from "
+ + "file=" + file.getBaseFile().getPath());
+
+ // getStorageFileForUser() ALWAYS returns the SAME OBJECT, which allows us to synchronize
+ // accesses to the file on the file system using this AtomicFile object.
+ synchronized (file) {
+ if (!file.getBaseFile().exists()) {
+ Slog.d(LOG_TAG, "File does not exist -> Abort");
+ return Collections.emptyList();
+ }
+ try (FileInputStream in = file.openRead()) {
+ final TypedXmlPullParser parser = Xml.resolvePullParser(in);
+ XmlUtils.beginDocument(parser, XML_TAG_REQUESTS);
+
+ return readRequests(parser);
+ } catch (XmlPullParserException | IOException e) {
+ Slog.e(LOG_TAG, "Error while reading requests file", e);
+ return Collections.emptyList();
+ }
+ }
+ }
+
+ @NonNull
+ private List<SystemDataTransferRequest> readRequests(@NonNull TypedXmlPullParser parser)
+ throws XmlPullParserException, IOException {
+ if (!isStartOfTag(parser, XML_TAG_REQUESTS)) {
+ throw new XmlPullParserException("The XML doesn't have start tag: " + XML_TAG_REQUESTS);
+ }
+
+ List<SystemDataTransferRequest> requests = new ArrayList<>();
+
+ while (true) {
+ parser.nextTag();
+ if (isEndOfTag(parser, XML_TAG_REQUESTS)) break;
+ if (isStartOfTag(parser, XML_TAG_REQUEST)) {
+ requests.add(readRequest(parser));
+ }
+ }
+
+ return requests;
+ }
+
+ private SystemDataTransferRequest readRequest(@NonNull TypedXmlPullParser parser)
+ throws XmlPullParserException, IOException {
+ if (!isStartOfTag(parser, XML_TAG_REQUEST)) {
+ throw new XmlPullParserException("XML doesn't have start tag: " + XML_TAG_REQUEST);
+ }
+
+ final int associationId = readIntAttribute(parser, XML_ATTR_ASSOCIATION_ID);
+ final boolean isPermissionSyncAllPackages = readBooleanAttribute(parser,
+ XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES);
+ parser.nextTag();
+ List<String> permissionSyncPackages = new ArrayList<>();
+ if (isStartOfTag(parser, XML_TAG_LIST)) {
+ parser.nextTag();
+ permissionSyncPackages = readThisListXml(parser, XML_TAG_LIST,
+ new String[1]);
+ }
+
+ return new SystemDataTransferRequest(associationId, isPermissionSyncAllPackages,
+ permissionSyncPackages);
+ }
+
+ /**
+ * Persisted user's SystemDataTransferRequest data to the disk.
+ *
+ * @param userId Android UserID
+ * @param requests a list of user's SystemDataTransferRequest.
+ */
+ void writeRequestsForUser(@UserIdInt int userId,
+ @NonNull List<SystemDataTransferRequest> requests) {
+ final AtomicFile file = getStorageFileForUser(userId);
+ Slog.i(LOG_TAG, "Writing SystemDataTransferRequests for user " + userId + " to file="
+ + file.getBaseFile().getPath());
+
+ // getStorageFileForUser() ALWAYS returns the SAME OBJECT, which allows us to synchronize
+ // accesses to the file on the file system using this AtomicFile object.
+ synchronized (file) {
+ writeToFileSafely(file, out -> {
+ final TypedXmlSerializer serializer = Xml.resolveSerializer(out);
+ serializer.setFeature(
+ "http://xmlpull.org/v1/doc/features.html#indent-output", true);
+ serializer.startDocument(null, true);
+ writeRequests(serializer, requests);
+ serializer.endDocument();
+ });
+ }
+ }
+
+ private void writeRequests(@NonNull TypedXmlSerializer serializer,
+ @Nullable Collection<SystemDataTransferRequest> requests) throws IOException {
+ serializer.startTag(null, XML_TAG_REQUESTS);
+
+ for (SystemDataTransferRequest request : requests) {
+ writeRequest(serializer, request);
+ }
+
+ serializer.endTag(null, XML_TAG_REQUESTS);
+ }
+
+ private void writeRequest(@NonNull TypedXmlSerializer serializer,
+ @NonNull SystemDataTransferRequest request) throws IOException {
+ serializer.startTag(null, XML_TAG_REQUEST);
+
+ writeIntAttribute(serializer, XML_ATTR_ASSOCIATION_ID, request.getAssociationId());
+ writeBooleanAttribute(serializer, XML_ATTR_IS_PERMISSION_SYNC_ALL_PACKAGES,
+ request.isPermissionSyncAllPackages());
+ try {
+ writeListXml(request.getPermissionSyncPackages(), XML_ATTR_PERMISSION_SYNC_PACKAGES,
+ serializer);
+ } catch (XmlPullParserException e) {
+ Slog.e(LOG_TAG, "Error writing permission sync packages into XML. "
+ + request.getPermissionSyncPackages().toString());
+ }
+
+ serializer.endTag(null, XML_TAG_REQUEST);
+ }
+
+ /**
+ * Creates and caches {@link AtomicFile} object that represents the back-up file for the given
+ * user.
+ *
+ * IMPORTANT: the method will ALWAYS return the same {@link AtomicFile} object, which makes it
+ * possible to synchronize reads and writes to the file using the returned object.
+ */
+ private @NonNull AtomicFile getStorageFileForUser(@UserIdInt int userId) {
+ return mUserIdToStorageFile.computeIfAbsent(userId,
+ u -> createStorageFileForUser(userId, FILE_NAME));
+ }
+}
diff --git a/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java
new file mode 100644
index 0000000..0eb6b8d
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (C) 2022 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.companion.presence;
+
+import static android.bluetooth.BluetoothAdapter.ACTION_BLE_STATE_CHANGED;
+import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
+import static android.bluetooth.BluetoothAdapter.EXTRA_PREVIOUS_STATE;
+import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
+import static android.bluetooth.BluetoothAdapter.STATE_BLE_ON;
+import static android.bluetooth.BluetoothAdapter.STATE_ON;
+import static android.bluetooth.BluetoothAdapter.nameForState;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_ALREADY_STARTED;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_APPLICATION_REGISTRATION_FAILED;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_FEATURE_UNSUPPORTED;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_INTERNAL_ERROR;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_OUT_OF_HARDWARE_RESOURCES;
+import static android.bluetooth.le.ScanCallback.SCAN_FAILED_SCANNING_TOO_FREQUENTLY;
+import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_ALL_MATCHES;
+import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_FIRST_MATCH;
+import static android.bluetooth.le.ScanSettings.CALLBACK_TYPE_MATCH_LOST;
+import static android.bluetooth.le.ScanSettings.SCAN_MODE_LOW_POWER;
+
+import static com.android.server.companion.presence.Utils.btDeviceToString;
+
+import static java.util.Objects.requireNonNull;
+
+import android.annotation.MainThread;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.SuppressLint;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanFilter;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.companion.AssociationInfo;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.server.companion.AssociationStore;
+import com.android.server.companion.AssociationStore.ChangeType;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@SuppressLint("LongLogTag")
+class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener {
+ private static final boolean DEBUG = false;
+ private static final String TAG = "CompanionDevice_PresenceMonitor_BLE";
+
+ /**
+ * When using {@link ScanSettings#SCAN_MODE_LOW_POWER}, it usually takes from 20 seconds to
+ * 2 minutes for the BLE scanner to find advertisements sent from the same device.
+ * On the other hand, {@link android.bluetooth.BluetoothAdapter.LeScanCallback} will report
+ * {@link ScanSettings#CALLBACK_TYPE_MATCH_LOST MATCH_LOST} 10 sec after it finds the
+ * advertisement for the first time (add reports
+ * {@link ScanSettings#CALLBACK_TYPE_FIRST_MATCH FIRST_MATCH}).
+ * To avoid constantly reporting {@link Callback#onBleCompanionDeviceFound(int) onDeviceFound()}
+ * and {@link Callback#onBleCompanionDeviceLost(int) onDeviceLost()} (while the device is
+ * actually present) to its clients, {@link BleCompanionDeviceScanner}, will add 1-minute delay
+ * after it receives {@link ScanSettings#CALLBACK_TYPE_MATCH_LOST MATCH_LOST}.
+ */
+ private static final int NOTIFY_DEVICE_LOST_DELAY = 2 * 60 * 1000; // 2 Min.
+
+ interface Callback {
+ void onBleCompanionDeviceFound(int associationId);
+
+ void onBleCompanionDeviceLost(int associationId);
+ }
+
+ private final @NonNull AssociationStore mAssociationStore;
+ private final @NonNull Callback mCallback;
+ private final @NonNull MainThreadHandler mMainThreadHandler;
+
+ // Non-null after init().
+ private @Nullable BluetoothAdapter mBtAdapter;
+ // Non-null after init() and when BLE is available. Otherwise - null.
+ private @Nullable BluetoothLeScanner mBleScanner;
+ // Only accessed from the Main thread.
+ private boolean mScanning = false;
+
+ BleCompanionDeviceScanner(
+ @NonNull AssociationStore associationStore, @NonNull Callback callback) {
+ mAssociationStore = associationStore;
+ mCallback = callback;
+ mMainThreadHandler = new MainThreadHandler();
+ }
+
+ @MainThread
+ void init(@NonNull Context context, @NonNull BluetoothAdapter btAdapter) {
+ if (DEBUG) Log.i(TAG, "init()");
+
+ if (mBtAdapter != null) {
+ throw new IllegalStateException(getClass().getSimpleName() + " is already initialized");
+ }
+ mBtAdapter = requireNonNull(btAdapter);
+
+ checkBleState();
+ registerBluetoothStateBroadcastReceiver(context);
+
+ mAssociationStore.registerListener(this);
+ }
+
+ @MainThread
+ final void restartScan() {
+ enforceInitialized();
+
+ if (DEBUG) Log.i(TAG , "restartScan()");
+ if (mBleScanner == null) {
+ if (DEBUG) Log.d(TAG, " > BLE is not available");
+ return;
+ }
+
+ stopScanIfNeeded();
+ startScan();
+ }
+
+ @Override
+ public void onAssociationChanged(@ChangeType int changeType, AssociationInfo association) {
+ // Simply restart scanning.
+ if (Looper.getMainLooper().isCurrentThread()) {
+ restartScan();
+ } else {
+ mMainThreadHandler.post(this::restartScan);
+ }
+ }
+
+ @MainThread
+ private void checkBleState() {
+ enforceInitialized();
+
+ final boolean bleAvailable = isBleAvailable();
+ if (DEBUG) {
+ Log.i(TAG, "checkBleState() bleAvailable=" + bleAvailable);
+ }
+ if ((bleAvailable && mBleScanner != null) || (!bleAvailable && mBleScanner == null)) {
+ // Nothing changed.
+ if (DEBUG) Log.i(TAG, " > BLE status did not change");
+ return;
+ }
+
+ if (bleAvailable) {
+ mBleScanner = mBtAdapter.getBluetoothLeScanner();
+ if (mBleScanner == null) {
+ // Oops, that's a race condition. Can return.
+ return;
+ }
+ if (DEBUG) Log.i(TAG, " > BLE is now available");
+
+ startScan();
+ } else {
+ if (DEBUG) Log.i(TAG, " > BLE is now unavailable");
+
+ stopScanIfNeeded();
+ mBleScanner = null;
+ }
+ }
+
+ /**
+ * A duplicate of {@code BluetoothAdapter.getLeAccess()} method which has the package-private
+ * access level, so it's not accessible from here.
+ */
+ private boolean isBleAvailable() {
+ final int state = mBtAdapter.getLeState();
+ if (DEBUG) Log.d(TAG, "getLeAccess() state=" + nameForBtState(state));
+ return state == STATE_ON || state == STATE_BLE_ON;
+ }
+
+ @MainThread
+ private void startScan() {
+ enforceInitialized();
+ // This method should not be called if scan is already in progress.
+ if (mScanning) throw new IllegalStateException("Scan is already in progress.");
+ // Neither should this method be called if the adapter is not available.
+ if (mBleScanner == null) throw new IllegalStateException("BLE is not available.");
+
+ if (DEBUG) Log.i(TAG, "startScan()");
+
+ // Collect MAC addresses from all associations.
+ final Set<String> macAddresses = new HashSet<>();
+ for (AssociationInfo association : mAssociationStore.getAssociations()) {
+ // Beware that BT stack does not consider low-case MAC addresses valid, while
+ // MacAddress.toString() return a low-case String.
+ final String macAddress = association.getDeviceMacAddressAsString();
+ if (macAddress != null) {
+ macAddresses.add(macAddress);
+ }
+ }
+ if (macAddresses.isEmpty()) {
+ if (DEBUG) Log.i(TAG, " > there are no (associated) devices to Scan for.");
+ return;
+ } else {
+ if (DEBUG) {
+ Log.d(TAG, " > addresses=(n=" + macAddresses.size() + ")"
+ + "[" + String.join(", ", macAddresses) + "]");
+ }
+ }
+
+ final List<ScanFilter> filters = new ArrayList<>(macAddresses.size());
+ for (String macAddress : macAddresses) {
+ final ScanFilter filter = new ScanFilter.Builder()
+ .setDeviceAddress(macAddress)
+ .build();
+ filters.add(filter);
+ }
+
+ mBleScanner.startScan(filters, SCAN_SETTINGS, mScanCallback);
+ mScanning = true;
+ }
+
+ private void stopScanIfNeeded() {
+ enforceInitialized();
+
+ if (DEBUG) Log.i(TAG, "stopScan()");
+ if (!mScanning) {
+ Log.d(TAG, " > not scanning.");
+ return;
+ }
+
+ mBleScanner.stopScan(mScanCallback);
+ mScanning = false;
+ }
+
+ @MainThread
+ private void notifyDeviceFound(@NonNull BluetoothDevice device) {
+ if (DEBUG) Log.i(TAG, "notifyDevice_Found()" + btDeviceToString(device));
+
+ final List<AssociationInfo> associations =
+ mAssociationStore.getAssociationsByAddress(device.getAddress());
+ if (DEBUG) Log.d(TAG, " > associations=" + Arrays.toString(associations.toArray()));
+
+ for (AssociationInfo association : associations) {
+ mCallback.onBleCompanionDeviceFound(association.getId());
+ }
+ }
+
+ @MainThread
+ private void notifyDeviceLost(@NonNull BluetoothDevice device) {
+ if (DEBUG) Log.i(TAG, "notifyDevice_Lost()" + btDeviceToString(device));
+
+ final List<AssociationInfo> associations =
+ mAssociationStore.getAssociationsByAddress(device.getAddress());
+ if (DEBUG) Log.d(TAG, " > associations=" + Arrays.toString(associations.toArray()));
+
+ for (AssociationInfo association : associations) {
+ mCallback.onBleCompanionDeviceLost(association.getId());
+ }
+ }
+
+ private void registerBluetoothStateBroadcastReceiver(Context context) {
+ final BroadcastReceiver receiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final int prevState = intent.getIntExtra(EXTRA_PREVIOUS_STATE, -1);
+ final int state = intent.getIntExtra(EXTRA_STATE, -1);
+
+ if (DEBUG) {
+ // The action is either STATE_CHANGED or BLE_STATE_CHANGED.
+ final String action =
+ intent.getAction().replace("android.bluetooth.adapter.", "bt.");
+ Log.d(TAG, "on(Broadcast)Receive() " + action + ": "
+ + nameForBtState(prevState) + "->" + nameForBtState(state));
+ }
+
+ checkBleState();
+ }
+ };
+
+ final IntentFilter filter = new IntentFilter();
+ filter.addAction(ACTION_STATE_CHANGED);
+ filter.addAction(ACTION_BLE_STATE_CHANGED);
+
+ context.registerReceiver(receiver, filter);
+ }
+
+ private void enforceInitialized() {
+ if (mBtAdapter != null) return;
+ throw new IllegalStateException(getClass().getSimpleName() + " is not initialized");
+ }
+
+ private final ScanCallback mScanCallback = new ScanCallback() {
+ @MainThread
+ @Override
+ public void onScanResult(int callbackType, ScanResult result) {
+ final BluetoothDevice device = result.getDevice();
+
+ if (DEBUG) {
+ Log.d(TAG, "onScanResult() " + nameForBleScanCallbackType(callbackType)
+ + " device=" + btDeviceToString(device));
+ Log.v(TAG, " > scanResult=" + result);
+
+ final List<AssociationInfo> associations =
+ mAssociationStore.getAssociationsByAddress(device.getAddress());
+ Log.v(TAG, " > associations=" + Arrays.toString(associations.toArray()));
+ }
+
+ switch (callbackType) {
+ case CALLBACK_TYPE_FIRST_MATCH:
+ if (mMainThreadHandler.hasNotifyDeviceLostMessages(device)) {
+ mMainThreadHandler.removeNotifyDeviceLostMessages(device);
+ return;
+ }
+
+ notifyDeviceFound(device);
+ break;
+
+ case CALLBACK_TYPE_MATCH_LOST:
+ mMainThreadHandler.sendNotifyDeviceLostDelayedMessage(device);
+ break;
+
+ default:
+ Slog.wtf(TAG, "Unexpected callback "
+ + nameForBleScanCallbackType(callbackType));
+ break;
+ }
+ }
+
+ @MainThread
+ @Override
+ public void onScanFailed(int errorCode) {
+ if (DEBUG) Log.w(TAG, "onScanFailed() " + nameForBleScanErrorCode(errorCode));
+ mScanning = false;
+ }
+ };
+
+ @SuppressLint("HandlerLeak")
+ private class MainThreadHandler extends Handler {
+ private static final int NOTIFY_DEVICE_LOST = 1;
+
+ MainThreadHandler() {
+ super(Looper.getMainLooper());
+ }
+
+ @Override
+ public void handleMessage(@NonNull Message message) {
+ if (message.what != NOTIFY_DEVICE_LOST) return;
+
+ final BluetoothDevice device = (BluetoothDevice) message.obj;
+ notifyDeviceLost(device);
+ }
+
+ void sendNotifyDeviceLostDelayedMessage(BluetoothDevice device) {
+ final Message message = obtainMessage(NOTIFY_DEVICE_LOST, device);
+ sendMessageDelayed(message, NOTIFY_DEVICE_LOST_DELAY);
+ }
+
+ boolean hasNotifyDeviceLostMessages(BluetoothDevice device) {
+ return hasEqualMessages(NOTIFY_DEVICE_LOST, device);
+ }
+
+ void removeNotifyDeviceLostMessages(BluetoothDevice device) {
+ removeEqualMessages(NOTIFY_DEVICE_LOST, device);
+ }
+ }
+
+ private static String nameForBtState(int state) {
+ return nameForState(state) + "(" + state + ")";
+ }
+
+ private static String nameForBleScanCallbackType(int callbackType) {
+ final String name;
+ switch (callbackType) {
+ case CALLBACK_TYPE_ALL_MATCHES:
+ name = "ALL_MATCHES";
+ break;
+ case CALLBACK_TYPE_FIRST_MATCH:
+ name = "FIRST_MATCH";
+ break;
+ case CALLBACK_TYPE_MATCH_LOST:
+ name = "MATCH_LOST";
+ break;
+ default:
+ name = "Unknown";
+ }
+ return name + "(" + callbackType + ")";
+ }
+
+ private static String nameForBleScanErrorCode(int errorCode) {
+ final String name;
+ switch (errorCode) {
+ case SCAN_FAILED_ALREADY_STARTED:
+ name = "ALREADY_STARTED";
+ break;
+ case SCAN_FAILED_APPLICATION_REGISTRATION_FAILED:
+ name = "APPLICATION_REGISTRATION_FAILED";
+ break;
+ case SCAN_FAILED_INTERNAL_ERROR:
+ name = "INTERNAL_ERROR";
+ break;
+ case SCAN_FAILED_FEATURE_UNSUPPORTED:
+ name = "FEATURE_UNSUPPORTED";
+ break;
+ case SCAN_FAILED_OUT_OF_HARDWARE_RESOURCES:
+ name = "OUT_OF_HARDWARE_RESOURCES";
+ break;
+ case SCAN_FAILED_SCANNING_TOO_FREQUENTLY:
+ name = "SCANNING_TOO_FREQUENTLY";
+ break;
+ default:
+ name = "Unknown";
+ }
+ return name + "(" + errorCode + ")";
+ }
+
+ private static final ScanSettings SCAN_SETTINGS = new ScanSettings.Builder()
+ .setCallbackType(CALLBACK_TYPE_FIRST_MATCH | CALLBACK_TYPE_MATCH_LOST)
+ .setScanMode(SCAN_MODE_LOW_POWER)
+ .build();
+}
diff --git a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java
index a4fa1c1..dbe866b 100644
--- a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java
+++ b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java
@@ -16,6 +16,8 @@
package com.android.server.companion.presence;
+import static com.android.server.companion.presence.Utils.btDeviceToString;
+
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.bluetooth.BluetoothAdapter;
@@ -71,11 +73,11 @@
*/
@Override
public void onDeviceConnected(@NonNull BluetoothDevice device) {
- if (DEBUG) Log.i(TAG, "onDevice_Connected() " + toString(device));
+ if (DEBUG) Log.i(TAG, "onDevice_Connected() " + btDeviceToString(device));
final MacAddress macAddress = MacAddress.fromString(device.getAddress());
if (mAllConnectedDevices.put(macAddress, device) != null) {
- if (DEBUG) Log.w(TAG, "Device " + toString(device) + " is already connected.");
+ if (DEBUG) Log.w(TAG, "Device " + btDeviceToString(device) + " is already connected.");
return;
}
@@ -91,13 +93,15 @@
public void onDeviceDisconnected(@NonNull BluetoothDevice device,
@DisconnectReason int reason) {
if (DEBUG) {
- Log.i(TAG, "onDevice_Disconnected() " + toString(device));
+ Log.i(TAG, "onDevice_Disconnected() " + btDeviceToString(device));
Log.d(TAG, " reason=" + disconnectReasonText(reason));
}
final MacAddress macAddress = MacAddress.fromString(device.getAddress());
if (mAllConnectedDevices.remove(macAddress) == null) {
- if (DEBUG) Log.w(TAG, "The device wasn't tracked as connected " + toString(device));
+ if (DEBUG) {
+ Log.w(TAG, "The device wasn't tracked as connected " + btDeviceToString(device));
+ }
return;
}
@@ -109,7 +113,7 @@
mAssociationStore.getAssociationsByAddress(device.getAddress());
if (DEBUG) {
- Log.d(TAG, "onDevice_ConnectivityChanged() " + toString(device)
+ Log.d(TAG, "onDevice_ConnectivityChanged() " + btDeviceToString(device)
+ " connected=" + connected);
if (associations.isEmpty()) {
Log.d(TAG, " > No CDM associations");
@@ -138,6 +142,12 @@
}
@Override
+ public void onAssociationRemoved(AssociationInfo association) {
+ // Intentionally do nothing: CompanionDevicePresenceMonitor will do all the bookkeeping
+ // required.
+ }
+
+ @Override
public void onAssociationUpdated(AssociationInfo association, boolean addressChanged) {
if (DEBUG) {
Log.d(TAG, "onAssociation_Updated() addrChange=" + addressChanged
@@ -153,23 +163,4 @@
// This will be implemented when CDM support updating addresses.
throw new IllegalArgumentException("Address changes are not supported.");
}
-
- private static String toString(@NonNull BluetoothDevice btDevice) {
- final StringBuilder sb = new StringBuilder(btDevice.getAddress());
-
- sb.append(" [name=");
- final String name = btDevice.getName();
- if (name != null) {
- sb.append('\'').append(name).append('\'');
- } else {
- sb.append("null");
- }
-
- final String alias = btDevice.getAlias();
- if (alias != null) {
- sb.append(", alias='").append(alias).append("'");
- }
-
- return sb.append(']').toString();
- }
}
diff --git a/services/companion/java/com/android/server/companion/presence/Utils.java b/services/companion/java/com/android/server/companion/presence/Utils.java
new file mode 100644
index 0000000..583b443
--- /dev/null
+++ b/services/companion/java/com/android/server/companion/presence/Utils.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 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.companion.presence;
+
+import android.annotation.NonNull;
+import android.bluetooth.BluetoothDevice;
+
+/** Utilities for working with Bluetooth and BLE devices. */
+class Utils {
+
+ /**
+ * @return short String representation of {@link BluetoothDevice}.
+ */
+ static String btDeviceToString(@NonNull BluetoothDevice btDevice) {
+ final StringBuilder sb = new StringBuilder(btDevice.getAddress());
+
+ sb.append(" [name=");
+ final String name = btDevice.getName();
+ if (name != null) {
+ sb.append('\'').append(name).append('\'');
+ } else {
+ sb.append("null");
+ }
+
+ final String alias = btDevice.getAlias();
+ if (alias != null) {
+ sb.append(", alias='").append(alias).append("'");
+ }
+
+ return sb.append(']').toString();
+ }
+
+ private Utils() {
+ }
+}
diff --git a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
index 734e5c3..0fd2967 100644
--- a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
+++ b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
@@ -21,6 +21,7 @@
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince;
@@ -33,6 +34,7 @@
import android.window.DisplayWindowPolicyController;
import java.util.List;
+import java.util.Set;
/**
@@ -49,13 +51,23 @@
@ChangeId
@EnabledSince(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)
public static final long ALLOW_SECURE_ACTIVITY_DISPLAY_ON_REMOTE_DEVICE = 201712607L;
- @NonNull private final ArraySet<UserHandle> mAllowedUsers;
+ @NonNull
+ private final ArraySet<UserHandle> mAllowedUsers;
+ @Nullable
+ private final ArraySet<ComponentName> mAllowedActivities;
+ @Nullable
+ private final ArraySet<ComponentName> mBlockedActivities;
- @NonNull final ArraySet<Integer> mRunningUids = new ArraySet<>();
+ @NonNull
+ final ArraySet<Integer> mRunningUids = new ArraySet<>();
GenericWindowPolicyController(int windowFlags, int systemWindowFlags,
- @NonNull ArraySet<UserHandle> allowedUsers) {
+ @NonNull ArraySet<UserHandle> allowedUsers,
+ @Nullable Set<ComponentName> allowedActivities,
+ @Nullable Set<ComponentName> blockedActivities) {
mAllowedUsers = allowedUsers;
+ mAllowedActivities = allowedActivities == null ? null : new ArraySet<>(allowedActivities);
+ mBlockedActivities = blockedActivities == null ? null : new ArraySet<>(blockedActivities);
setInterestedWindowFlags(windowFlags, systemWindowFlags);
}
@@ -108,6 +120,18 @@
Slog.d(TAG, "Virtual device activity not allowed from user " + activityUser);
return false;
}
+ if (mBlockedActivities != null
+ && mBlockedActivities.contains(activityInfo.getComponentName())) {
+ Slog.d(TAG,
+ "Virtual device blocking launch of " + activityInfo.getComponentName());
+ return false;
+ }
+ if (mAllowedActivities != null
+ && !mAllowedActivities.contains(activityInfo.getComponentName())) {
+ Slog.d(TAG,
+ activityInfo.getComponentName() + " is not in the allowed list.");
+ return false;
+ }
if (!CompatChanges.isChangeEnabled(ALLOW_SECURE_ACTIVITY_DISPLAY_ON_REMOTE_DEVICE,
activityInfo.packageName, activityUser)) {
// TODO(b/201712607): Add checks for the apps that use SurfaceView#setSecure.
diff --git a/services/companion/java/com/android/server/companion/virtual/InputController.java b/services/companion/java/com/android/server/companion/virtual/InputController.java
index 067edcc..ae39d7e 100644
--- a/services/companion/java/com/android/server/companion/virtual/InputController.java
+++ b/services/companion/java/com/android/server/companion/virtual/InputController.java
@@ -16,8 +16,11 @@
package com.android.server.companion.virtual;
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.graphics.Point;
+import android.graphics.PointF;
+import android.hardware.input.InputManagerInternal;
import android.hardware.input.VirtualKeyEvent;
import android.hardware.input.VirtualMouseButtonEvent;
import android.hardware.input.VirtualMouseRelativeEvent;
@@ -26,25 +29,40 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.util.ArrayMap;
+import android.util.Slog;
+import android.view.Display;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.LocalServices;
import java.io.PrintWriter;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
/** Controls virtual input devices, including device lifecycle and event dispatch. */
class InputController {
+ private static final String TAG = "VirtualInputController";
+
private final Object mLock;
/* Token -> file descriptor associations. */
@VisibleForTesting
@GuardedBy("mLock")
- final Map<IBinder, Integer> mInputDeviceFds = new ArrayMap<>();
+ final Map<IBinder, InputDeviceDescriptor> mInputDeviceDescriptors = new ArrayMap<>();
private final NativeWrapper mNativeWrapper;
+ /**
+ * Because the pointer is a singleton, it can only be targeted at one display at a time. Because
+ * multiple mice could be concurrently registered, mice that are associated with a different
+ * display than the current target display should not be allowed to affect the current target.
+ */
+ @VisibleForTesting int mActivePointerDisplayId;
+
InputController(@NonNull Object lock) {
this(lock, new NativeWrapper());
}
@@ -53,32 +71,39 @@
InputController(@NonNull Object lock, @NonNull NativeWrapper nativeWrapper) {
mLock = lock;
mNativeWrapper = nativeWrapper;
+ mActivePointerDisplayId = Display.INVALID_DISPLAY;
}
void close() {
synchronized (mLock) {
- for (int fd : mInputDeviceFds.values()) {
- mNativeWrapper.closeUinput(fd);
+ for (InputDeviceDescriptor inputDeviceDescriptor : mInputDeviceDescriptors.values()) {
+ mNativeWrapper.closeUinput(inputDeviceDescriptor.getFileDescriptor());
}
- mInputDeviceFds.clear();
+ mInputDeviceDescriptors.clear();
+ resetMouseValuesLocked();
}
}
void createKeyboard(@NonNull String deviceName,
int vendorId,
int productId,
- @NonNull IBinder deviceToken) {
+ @NonNull IBinder deviceToken,
+ int displayId) {
final int fd = mNativeWrapper.openUinputKeyboard(deviceName, vendorId, productId);
if (fd < 0) {
throw new RuntimeException(
"A native error occurred when creating keyboard: " + -fd);
}
+ final BinderDeathRecipient binderDeathRecipient = new BinderDeathRecipient(deviceToken);
synchronized (mLock) {
- mInputDeviceFds.put(deviceToken, fd);
+ mInputDeviceDescriptors.put(deviceToken,
+ new InputDeviceDescriptor(fd, binderDeathRecipient,
+ InputDeviceDescriptor.TYPE_KEYBOARD, displayId));
}
try {
- deviceToken.linkToDeath(new BinderDeathRecipient(deviceToken), /* flags= */ 0);
+ deviceToken.linkToDeath(binderDeathRecipient, /* flags= */ 0);
} catch (RemoteException e) {
+ // TODO(b/215608394): remove and close InputDeviceDescriptor
throw new RuntimeException("Could not create virtual keyboard", e);
}
}
@@ -86,18 +111,27 @@
void createMouse(@NonNull String deviceName,
int vendorId,
int productId,
- @NonNull IBinder deviceToken) {
+ @NonNull IBinder deviceToken,
+ int displayId) {
final int fd = mNativeWrapper.openUinputMouse(deviceName, vendorId, productId);
if (fd < 0) {
throw new RuntimeException(
"A native error occurred when creating mouse: " + -fd);
}
+ final BinderDeathRecipient binderDeathRecipient = new BinderDeathRecipient(deviceToken);
synchronized (mLock) {
- mInputDeviceFds.put(deviceToken, fd);
+ mInputDeviceDescriptors.put(deviceToken,
+ new InputDeviceDescriptor(fd, binderDeathRecipient,
+ InputDeviceDescriptor.TYPE_MOUSE, displayId));
+ final InputManagerInternal inputManagerInternal =
+ LocalServices.getService(InputManagerInternal.class);
+ inputManagerInternal.setVirtualMousePointerDisplayId(displayId);
+ mActivePointerDisplayId = displayId;
}
try {
- deviceToken.linkToDeath(new BinderDeathRecipient(deviceToken), /* flags= */ 0);
+ deviceToken.linkToDeath(binderDeathRecipient, /* flags= */ 0);
} catch (RemoteException e) {
+ // TODO(b/215608394): remove and close InputDeviceDescriptor
throw new RuntimeException("Could not create virtual mouse", e);
}
}
@@ -106,6 +140,7 @@
int vendorId,
int productId,
@NonNull IBinder deviceToken,
+ int displayId,
@NonNull Point screenSize) {
final int fd = mNativeWrapper.openUinputTouchscreen(deviceName, vendorId, productId,
screenSize.y, screenSize.x);
@@ -113,93 +148,177 @@
throw new RuntimeException(
"A native error occurred when creating touchscreen: " + -fd);
}
+ final BinderDeathRecipient binderDeathRecipient = new BinderDeathRecipient(deviceToken);
synchronized (mLock) {
- mInputDeviceFds.put(deviceToken, fd);
+ mInputDeviceDescriptors.put(deviceToken,
+ new InputDeviceDescriptor(fd, binderDeathRecipient,
+ InputDeviceDescriptor.TYPE_TOUCHSCREEN, displayId));
}
try {
- deviceToken.linkToDeath(new BinderDeathRecipient(deviceToken), /* flags= */ 0);
+ deviceToken.linkToDeath(binderDeathRecipient, /* flags= */ 0);
} catch (RemoteException e) {
+ // TODO(b/215608394): remove and close InputDeviceDescriptor
throw new RuntimeException("Could not create virtual touchscreen", e);
}
}
void unregisterInputDevice(@NonNull IBinder token) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.remove(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.remove(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not unregister input device for given token");
}
- mNativeWrapper.closeUinput(fd);
+ token.unlinkToDeath(inputDeviceDescriptor.getDeathRecipient(), /* flags= */ 0);
+ mNativeWrapper.closeUinput(inputDeviceDescriptor.getFileDescriptor());
+
+ // Reset values to the default if all virtual mice are unregistered, or set display
+ // id if there's another mouse (choose the most recent).
+ if (inputDeviceDescriptor.isMouse()) {
+ updateMouseValuesLocked();
+ }
}
}
+ @GuardedBy("mLock")
+ private void updateMouseValuesLocked() {
+ InputDeviceDescriptor mostRecentlyCreatedMouse = null;
+ for (InputDeviceDescriptor otherInputDeviceDescriptor :
+ mInputDeviceDescriptors.values()) {
+ if (otherInputDeviceDescriptor.isMouse()) {
+ if (mostRecentlyCreatedMouse == null
+ || (otherInputDeviceDescriptor.getCreationOrderNumber()
+ > mostRecentlyCreatedMouse.getCreationOrderNumber())) {
+ mostRecentlyCreatedMouse = otherInputDeviceDescriptor;
+ }
+ }
+ }
+ if (mostRecentlyCreatedMouse != null) {
+ final InputManagerInternal inputManagerInternal =
+ LocalServices.getService(InputManagerInternal.class);
+ inputManagerInternal.setVirtualMousePointerDisplayId(
+ mostRecentlyCreatedMouse.getDisplayId());
+ mActivePointerDisplayId = mostRecentlyCreatedMouse.getDisplayId();
+ } else {
+ // All mice have been unregistered; reset all values.
+ resetMouseValuesLocked();
+ }
+ }
+
+ private void resetMouseValuesLocked() {
+ final InputManagerInternal inputManagerInternal =
+ LocalServices.getService(InputManagerInternal.class);
+ inputManagerInternal.setVirtualMousePointerDisplayId(Display.INVALID_DISPLAY);
+ mActivePointerDisplayId = Display.INVALID_DISPLAY;
+ }
+
boolean sendKeyEvent(@NonNull IBinder token, @NonNull VirtualKeyEvent event) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.get(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not send key event to input device for given token");
}
- return mNativeWrapper.writeKeyEvent(fd, event.getKeyCode(), event.getAction());
+ return mNativeWrapper.writeKeyEvent(inputDeviceDescriptor.getFileDescriptor(),
+ event.getKeyCode(), event.getAction());
}
}
boolean sendButtonEvent(@NonNull IBinder token, @NonNull VirtualMouseButtonEvent event) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.get(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not send button event to input device for given token");
}
- return mNativeWrapper.writeButtonEvent(fd, event.getButtonCode(), event.getAction());
+ if (inputDeviceDescriptor.getDisplayId() != mActivePointerDisplayId) {
+ throw new IllegalStateException(
+ "Display id associated with this mouse is not currently targetable");
+ }
+ return mNativeWrapper.writeButtonEvent(inputDeviceDescriptor.getFileDescriptor(),
+ event.getButtonCode(), event.getAction());
}
}
boolean sendTouchEvent(@NonNull IBinder token, @NonNull VirtualTouchEvent event) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.get(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not send touch event to input device for given token");
}
- return mNativeWrapper.writeTouchEvent(fd, event.getPointerId(), event.getToolType(),
- event.getAction(), event.getX(), event.getY(), event.getPressure(),
- event.getMajorAxisSize());
+ return mNativeWrapper.writeTouchEvent(inputDeviceDescriptor.getFileDescriptor(),
+ event.getPointerId(), event.getToolType(), event.getAction(), event.getX(),
+ event.getY(), event.getPressure(), event.getMajorAxisSize());
}
}
boolean sendRelativeEvent(@NonNull IBinder token, @NonNull VirtualMouseRelativeEvent event) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.get(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not send relative event to input device for given token");
}
- return mNativeWrapper.writeRelativeEvent(fd, event.getRelativeX(),
- event.getRelativeY());
+ if (inputDeviceDescriptor.getDisplayId() != mActivePointerDisplayId) {
+ throw new IllegalStateException(
+ "Display id associated with this mouse is not currently targetable");
+ }
+ return mNativeWrapper.writeRelativeEvent(inputDeviceDescriptor.getFileDescriptor(),
+ event.getRelativeX(), event.getRelativeY());
}
}
boolean sendScrollEvent(@NonNull IBinder token, @NonNull VirtualMouseScrollEvent event) {
synchronized (mLock) {
- final Integer fd = mInputDeviceFds.get(token);
- if (fd == null) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
throw new IllegalArgumentException(
"Could not send scroll event to input device for given token");
}
- return mNativeWrapper.writeScrollEvent(fd, event.getXAxisMovement(),
- event.getYAxisMovement());
+ if (inputDeviceDescriptor.getDisplayId() != mActivePointerDisplayId) {
+ throw new IllegalStateException(
+ "Display id associated with this mouse is not currently targetable");
+ }
+ return mNativeWrapper.writeScrollEvent(inputDeviceDescriptor.getFileDescriptor(),
+ event.getXAxisMovement(), event.getYAxisMovement());
+ }
+ }
+
+ public PointF getCursorPosition(@NonNull IBinder token) {
+ synchronized (mLock) {
+ final InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.get(
+ token);
+ if (inputDeviceDescriptor == null) {
+ throw new IllegalArgumentException(
+ "Could not get cursor position for input device for given token");
+ }
+ if (inputDeviceDescriptor.getDisplayId() != mActivePointerDisplayId) {
+ throw new IllegalStateException(
+ "Display id associated with this mouse is not currently targetable");
+ }
+ return LocalServices.getService(InputManagerInternal.class).getCursorPosition();
}
}
public void dump(@NonNull PrintWriter fout) {
fout.println(" InputController: ");
synchronized (mLock) {
- fout.println(" Active file descriptors: ");
- for (int inputDeviceFd : mInputDeviceFds.values()) {
- fout.println(inputDeviceFd);
+ fout.println(" Active descriptors: ");
+ for (InputDeviceDescriptor inputDeviceDescriptor : mInputDeviceDescriptors.values()) {
+ fout.println(" fd: " + inputDeviceDescriptor.getFileDescriptor());
+ fout.println(" displayId: " + inputDeviceDescriptor.getDisplayId());
+ fout.println(" creationOrder: "
+ + inputDeviceDescriptor.getCreationOrderNumber());
+ fout.println(" type: " + inputDeviceDescriptor.getType());
}
+ fout.println(" Active mouse display id: " + mActivePointerDisplayId);
}
}
@@ -267,6 +386,63 @@
}
}
+ @VisibleForTesting static final class InputDeviceDescriptor {
+
+ static final int TYPE_KEYBOARD = 1;
+ static final int TYPE_MOUSE = 2;
+ static final int TYPE_TOUCHSCREEN = 3;
+ @IntDef(prefix = { "TYPE_" }, value = {
+ TYPE_KEYBOARD,
+ TYPE_MOUSE,
+ TYPE_TOUCHSCREEN,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface Type {
+ }
+
+ private static final AtomicLong sNextCreationOrderNumber = new AtomicLong(1);
+
+ private final int mFd;
+ private final IBinder.DeathRecipient mDeathRecipient;
+ private final @Type int mType;
+ private final int mDisplayId;
+ // Monotonically increasing number; devices with lower numbers were created earlier.
+ private final long mCreationOrderNumber;
+
+ InputDeviceDescriptor(int fd, IBinder.DeathRecipient deathRecipient,
+ @Type int type, int displayId) {
+ mFd = fd;
+ mDeathRecipient = deathRecipient;
+ mType = type;
+ mDisplayId = displayId;
+ mCreationOrderNumber = sNextCreationOrderNumber.getAndIncrement();
+ }
+
+ public int getFileDescriptor() {
+ return mFd;
+ }
+
+ public int getType() {
+ return mType;
+ }
+
+ public boolean isMouse() {
+ return mType == TYPE_MOUSE;
+ }
+
+ public IBinder.DeathRecipient getDeathRecipient() {
+ return mDeathRecipient;
+ }
+
+ public int getDisplayId() {
+ return mDisplayId;
+ }
+
+ public long getCreationOrderNumber() {
+ return mCreationOrderNumber;
+ }
+ }
+
private final class BinderDeathRecipient implements IBinder.DeathRecipient {
private final IBinder mDeviceToken;
@@ -277,6 +453,10 @@
@Override
public void binderDied() {
+ // All callers are expected to call {@link VirtualDevice#unregisterInputDevice} before
+ // quitting, which removes this death recipient. If this is invoked, the remote end
+ // died, or they disposed of the object without properly unregistering.
+ Slog.e(TAG, "Virtual input controller binder died");
unregisterInputDevice(mDeviceToken);
}
}
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
index 0c0ee52..6ab8e75 100644
--- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
+++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
@@ -32,7 +32,9 @@
import android.companion.virtual.VirtualDeviceParams;
import android.content.Context;
import android.graphics.Point;
+import android.graphics.PointF;
import android.hardware.display.DisplayManager;
+import android.hardware.input.InputManagerInternal;
import android.hardware.input.VirtualKeyEvent;
import android.hardware.input.VirtualMouseButtonEvent;
import android.hardware.input.VirtualMouseRelativeEvent;
@@ -50,11 +52,11 @@
import android.window.DisplayWindowPolicyController;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.LocalServices;
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
final class VirtualDeviceImpl extends IVirtualDevice.Stub
@@ -69,7 +71,7 @@
private final int mOwnerUid;
private final InputController mInputController;
@VisibleForTesting
- final List<Integer> mVirtualDisplayIds = new ArrayList<>();
+ final Set<Integer> mVirtualDisplayIds = new ArraySet<>();
private final OnDeviceCloseListener mListener;
private final IBinder mAppToken;
private final VirtualDeviceParams mParams;
@@ -202,7 +204,8 @@
}
final long token = Binder.clearCallingIdentity();
try {
- mInputController.createKeyboard(deviceName, vendorId, productId, deviceToken);
+ mInputController.createKeyboard(deviceName, vendorId, productId, deviceToken,
+ displayId);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -227,7 +230,7 @@
}
final long token = Binder.clearCallingIdentity();
try {
- mInputController.createMouse(deviceName, vendorId, productId, deviceToken);
+ mInputController.createMouse(deviceName, vendorId, productId, deviceToken, displayId);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -254,7 +257,7 @@
final long token = Binder.clearCallingIdentity();
try {
mInputController.createTouchscreen(deviceName, vendorId, productId,
- deviceToken, screenSize);
+ deviceToken, displayId, screenSize);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -324,10 +327,21 @@
}
}
+ @Override // Binder call
+ public PointF getCursorPosition(IBinder token) {
+ final long binderToken = Binder.clearCallingIdentity();
+ try {
+ return mInputController.getCursorPosition(token);
+ } finally {
+ Binder.restoreCallingIdentity(binderToken);
+ }
+ }
+
@Override
protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
fout.println(" VirtualDevice: ");
fout.println(" mAssociationId: " + mAssociationInfo.getId());
+ fout.println(" mParams: " + mParams);
fout.println(" mVirtualDisplayIds: ");
synchronized (mVirtualDeviceLock) {
for (int id : mVirtualDisplayIds) {
@@ -343,9 +357,13 @@
"Virtual device already have a virtual display with ID " + displayId);
}
mVirtualDisplayIds.add(displayId);
+ LocalServices.getService(InputManagerInternal.class).setDisplayEligibilityForPointerCapture(
+ displayId, false);
final GenericWindowPolicyController dwpc =
new GenericWindowPolicyController(FLAG_SECURE,
- SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS, getAllowedUserHandles());
+ SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS, getAllowedUserHandles(),
+ mParams.getAllowedActivities(),
+ mParams.getBlockedActivities());
mWindowPolicyControllers.put(displayId, dwpc);
return dwpc;
}
@@ -374,6 +392,8 @@
"Virtual device doesn't have a virtual display with ID " + displayId);
}
mVirtualDisplayIds.remove(displayId);
+ LocalServices.getService(InputManagerInternal.class).setDisplayEligibilityForPointerCapture(
+ displayId, true);
mWindowPolicyControllers.remove(displayId);
}
diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java
index 60cae4d..f56bfab 100644
--- a/services/core/java/android/content/pm/PackageManagerInternal.java
+++ b/services/core/java/android/content/pm/PackageManagerInternal.java
@@ -70,6 +70,7 @@
PACKAGE_SYSTEM,
PACKAGE_SETUP_WIZARD,
PACKAGE_INSTALLER,
+ PACKAGE_UNINSTALLER,
PACKAGE_VERIFIER,
PACKAGE_BROWSER,
PACKAGE_SYSTEM_TEXT_CLASSIFIER,
@@ -89,23 +90,25 @@
public static final int PACKAGE_SYSTEM = 0;
public static final int PACKAGE_SETUP_WIZARD = 1;
public static final int PACKAGE_INSTALLER = 2;
- public static final int PACKAGE_VERIFIER = 3;
- public static final int PACKAGE_BROWSER = 4;
- public static final int PACKAGE_SYSTEM_TEXT_CLASSIFIER = 5;
- public static final int PACKAGE_PERMISSION_CONTROLLER = 6;
- public static final int PACKAGE_WELLBEING = 7;
- public static final int PACKAGE_DOCUMENTER = 8;
- public static final int PACKAGE_CONFIGURATOR = 9;
- public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 10;
- public static final int PACKAGE_APP_PREDICTOR = 11;
- public static final int PACKAGE_OVERLAY_CONFIG_SIGNATURE = 12;
- public static final int PACKAGE_WIFI = 13;
- public static final int PACKAGE_COMPANION = 14;
- public static final int PACKAGE_RETAIL_DEMO = 15;
- public static final int PACKAGE_RECENTS = 16;
+ public static final int PACKAGE_UNINSTALLER = 3;
+ public static final int PACKAGE_VERIFIER = 4;
+ public static final int PACKAGE_BROWSER = 5;
+ public static final int PACKAGE_SYSTEM_TEXT_CLASSIFIER = 6;
+ public static final int PACKAGE_PERMISSION_CONTROLLER = 7;
+ public static final int PACKAGE_WELLBEING = 8;
+ public static final int PACKAGE_DOCUMENTER = 9;
+ public static final int PACKAGE_CONFIGURATOR = 10;
+ public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 11;
+ public static final int PACKAGE_APP_PREDICTOR = 12;
+ public static final int PACKAGE_OVERLAY_CONFIG_SIGNATURE = 13;
+ public static final int PACKAGE_WIFI = 14;
+ public static final int PACKAGE_COMPANION = 15;
+ public static final int PACKAGE_RETAIL_DEMO = 16;
+ public static final int PACKAGE_RECENTS = 17;
+ public static final int PACKAGE_AMBIENT_CONTEXT_DETECTION = 18;
// Integer value of the last known package ID. Increases as new ID is added to KnownPackage.
// Please note the numbers should be continuous.
- public static final int LAST_KNOWN_PACKAGE = PACKAGE_RECENTS;
+ public static final int LAST_KNOWN_PACKAGE = PACKAGE_AMBIENT_CONTEXT_DETECTION;
@LongDef(flag = true, prefix = "RESOLVE_", value = {
RESOLVE_NON_BROWSER_ONLY,
@@ -1141,6 +1144,8 @@
return "Setup Wizard";
case PACKAGE_INSTALLER:
return "Installer";
+ case PACKAGE_UNINSTALLER:
+ return "Uninstaller";
case PACKAGE_VERIFIER:
return "Verifier";
case PACKAGE_BROWSER:
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index 844ac86..5d48d78 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -853,7 +853,9 @@
pw.println("Battery service (battery) commands:");
pw.println(" help");
pw.println(" Print this help text.");
- pw.println(" set [-f] [ac|usb|wireless|status|level|temp|present|invalid] <value>");
+ pw.println(" get [-f] [ac|usb|wireless|status|level|temp|present|counter|invalid]");
+ pw.println(
+ " set [-f] [ac|usb|wireless|status|level|temp|present|counter|invalid] <value>");
pw.println(" Force a battery property value, freezing battery state.");
pw.println(" -f: force a battery change broadcast be sent, prints new sequence.");
pw.println(" unplug [-f]");
@@ -863,7 +865,7 @@
pw.println(" Unfreeze battery state, returning to current hardware values.");
pw.println(" -f: force a battery change broadcast be sent, prints new sequence.");
if (Build.IS_DEBUGGABLE) {
- pw.println(" disable_charge");
+ pw.println(" suspend_input");
pw.println(" Suspend charging even if plugged in. ");
}
}
@@ -893,6 +895,46 @@
android.Manifest.permission.DEVICE_POWER, null);
unplugBattery(/* forceUpdate= */ (opts & OPTION_FORCE_UPDATE) != 0, pw);
} break;
+ case "get": {
+ final String key = shell.getNextArg();
+ if (key == null) {
+ pw.println("No property specified");
+ return -1;
+
+ }
+ switch (key) {
+ case "present":
+ pw.println(mHealthInfo.batteryPresent);
+ break;
+ case "ac":
+ pw.println(mHealthInfo.chargerAcOnline);
+ break;
+ case "usb":
+ pw.println(mHealthInfo.chargerUsbOnline);
+ break;
+ case "wireless":
+ pw.println(mHealthInfo.chargerWirelessOnline);
+ break;
+ case "status":
+ pw.println(mHealthInfo.batteryStatus);
+ break;
+ case "level":
+ pw.println(mHealthInfo.batteryLevel);
+ break;
+ case "counter":
+ pw.println(mHealthInfo.batteryChargeCounterUah);
+ break;
+ case "temp":
+ pw.println(mHealthInfo.batteryTemperatureTenthsCelsius);
+ break;
+ case "invalid":
+ pw.println(mInvalidCharger);
+ break;
+ default:
+ pw.println("Unknown get option: " + key);
+ break;
+ }
+ } break;
case "set": {
int opts = parseOptions(shell);
getContext().enforceCallingOrSelfPermission(
diff --git a/services/core/java/com/android/server/MasterClearReceiver.java b/services/core/java/com/android/server/MasterClearReceiver.java
index 62dc2733..be2b7f7 100644
--- a/services/core/java/com/android/server/MasterClearReceiver.java
+++ b/services/core/java/com/android/server/MasterClearReceiver.java
@@ -16,11 +16,14 @@
package com.android.server;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_TITLE;
+
import android.annotation.UserIdInt;
import android.app.ActivityManager;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.ProgressDialog;
+import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -155,7 +158,7 @@
final Notification notification =
new Notification.Builder(context, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(android.R.drawable.stat_sys_warning)
- .setContentTitle(context.getString(R.string.work_profile_deleted))
+ .setContentTitle(getWorkProfileDeletedTitle(context))
.setContentText(wipeReason)
.setColor(context.getColor(R.color.system_notification_accent_color))
.setStyle(new Notification.BigTextStyle().bigText(wipeReason))
@@ -164,6 +167,12 @@
SystemMessageProto.SystemMessage.NOTE_PROFILE_WIPED, notification);
}
+ private String getWorkProfileDeletedTitle(Context context) {
+ final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(WORK_PROFILE_DELETED_TITLE,
+ () -> context.getString(R.string.work_profile_deleted));
+ }
+
private @UserIdInt int getCurrentForegroundUserId() {
try {
return ActivityManager.getCurrentUser();
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 98764e0..f71f02a 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -160,8 +160,6 @@
import com.android.server.wm.ActivityTaskManagerInternal;
import com.android.server.wm.ActivityTaskManagerInternal.ScreenObserver;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import libcore.io.IoUtils;
import libcore.util.EmptyArray;
@@ -173,6 +171,8 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.PrintWriter;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
@@ -3698,16 +3698,29 @@
@Nullable
public PendingIntent getManageSpaceActivityIntent(
@NonNull String packageName, int requestCode) {
- // Only Apps with MANAGE_EXTERNAL_STORAGE permission should be able to call this API.
- enforcePermission(android.Manifest.permission.MANAGE_EXTERNAL_STORAGE);
-
- // We want to call the manageSpaceActivity as a SystemService and clear identity
- // of the calling App
+ // Only Apps with MANAGE_EXTERNAL_STORAGE permission which have package visibility for
+ // packageName should be able to call this API.
int originalUid = Binder.getCallingUidOrThrow();
- final long token = Binder.clearCallingIdentity();
-
try {
- ApplicationInfo appInfo = mIPackageManager.getApplicationInfo(packageName, 0,
+ // Get package name for calling app and verify it has MANAGE_EXTERNAL_STORAGE permission
+ final String[] packagesFromUid = mIPackageManager.getPackagesForUid(originalUid);
+ if (packagesFromUid == null) {
+ throw new SecurityException("Unknown uid " + originalUid);
+ }
+ // Checking first entry in packagesFromUid is enough as using "sharedUserId"
+ // mechanism is rare and discouraged. Also, Apps that share same UID share the same
+ // permissions.
+ if (!mStorageManagerInternal.hasExternalStorageAccess(originalUid,
+ packagesFromUid[0])) {
+ throw new SecurityException("Only File Manager Apps permitted");
+ }
+ } catch (RemoteException re) {
+ throw new SecurityException("Unknown uid " + originalUid, re);
+ }
+
+ ApplicationInfo appInfo;
+ try {
+ appInfo = mIPackageManager.getApplicationInfo(packageName, 0,
UserHandle.getUserId(originalUid));
if (appInfo == null) {
throw new IllegalArgumentException(
@@ -3717,8 +3730,15 @@
Log.i(TAG, packageName + " doesn't have a manageSpaceActivity");
return null;
}
- Context targetAppContext = mContext.createPackageContext(packageName, 0);
+ } catch (RemoteException e) {
+ throw new SecurityException("Only File Manager Apps permitted");
+ }
+ // We want to call the manageSpaceActivity as a SystemService and clear identity
+ // of the calling App
+ final long token = Binder.clearCallingIdentity();
+ try {
+ Context targetAppContext = mContext.createPackageContext(packageName, 0);
Intent intent = new Intent(Intent.ACTION_DEFAULT);
intent.setClassName(packageName,
appInfo.manageSpaceActivityName);
@@ -3728,8 +3748,6 @@
intent,
FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
return activity;
- } catch (RemoteException e) {
- throw e.rethrowAsRuntimeException();
} catch (PackageManager.NameNotFoundException e) {
throw new IllegalArgumentException(
"packageName not found");
@@ -4955,19 +4973,17 @@
@Override
public boolean hasExternalStorageAccess(int uid, String packageName) {
try {
- if (mIPackageManager.checkUidPermission(
- MANAGE_EXTERNAL_STORAGE, uid) == PERMISSION_GRANTED) {
- return true;
+ final int opMode = mIAppOpsService.checkOperation(
+ OP_MANAGE_EXTERNAL_STORAGE, uid, packageName);
+ if (opMode == AppOpsManager.MODE_DEFAULT) {
+ return mIPackageManager.checkUidPermission(
+ MANAGE_EXTERNAL_STORAGE, uid) == PERMISSION_GRANTED;
}
- if (mIAppOpsService.checkOperation(
- OP_MANAGE_EXTERNAL_STORAGE, uid, packageName) == MODE_ALLOWED) {
- return true;
- }
+ return opMode == AppOpsManager.MODE_ALLOWED;
} catch (RemoteException e) {
Slog.w("Failed to check MANAGE_EXTERNAL_STORAGE access for " + packageName, e);
}
-
return false;
}
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index e040319..8887108 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -4138,7 +4138,7 @@
// for a previous process to come up. To deal with this, we store
// in the service any current isolated process it is running in or
// waiting to have come up.
- app = r.isolatedProc;
+ app = r.isolationHostProc;
if (WebViewZygote.isMultiprocessEnabled()
&& r.serviceInfo.packageName.equals(WebViewZygote.getPackageName())) {
hostingRecord = HostingRecord.byWebviewZygote(r.instanceName);
@@ -4165,7 +4165,7 @@
return msg;
}
if (isolated) {
- r.isolatedProc = app;
+ r.isolationHostProc = app;
}
}
@@ -4976,7 +4976,7 @@
try {
for (int i=0; i<mPendingServices.size(); i++) {
sr = mPendingServices.get(i);
- if (proc != sr.isolatedProc && (proc.uid != sr.appInfo.uid
+ if (proc != sr.isolationHostProc && (proc.uid != sr.appInfo.uid
|| !processName.equals(sr.processName))) {
continue;
}
@@ -5016,7 +5016,7 @@
boolean didImmediateRestart = false;
for (int i=0; i<mRestartingServices.size(); i++) {
sr = mRestartingServices.get(i);
- if (proc != sr.isolatedProc && (proc.uid != sr.appInfo.uid
+ if (proc != sr.isolationHostProc && (proc.uid != sr.appInfo.uid
|| !processName.equals(sr.processName))) {
continue;
}
@@ -5048,9 +5048,9 @@
ServiceRecord sr = mPendingServices.get(i);
if ((proc.uid == sr.appInfo.uid
&& proc.processName.equals(sr.processName))
- || sr.isolatedProc == proc) {
+ || sr.isolationHostProc == proc) {
Slog.w(TAG, "Forcing bringing down service: " + sr);
- sr.isolatedProc = null;
+ sr.isolationHostProc = null;
mPendingServices.remove(i);
size = mPendingServices.size();
i--;
@@ -5083,7 +5083,7 @@
stopServiceAndUpdateAllowlistManagerLocked(service);
}
service.setProcess(null, null, 0, null);
- service.isolatedProc = null;
+ service.isolationHostProc = null;
if (mTmpCollectionResults == null) {
mTmpCollectionResults = new ArrayList<>();
}
@@ -5321,7 +5321,7 @@
sr.app.mServices.updateBoundClientUids();
}
sr.setProcess(null, null, 0, null);
- sr.isolatedProc = null;
+ sr.isolationHostProc = null;
sr.executeNesting = 0;
synchronized (mAm.mProcessStats.mLock) {
sr.forceClearTracker();
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f67e732..b1b4c44 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2871,13 +2871,51 @@
return mode == AppOpsManager.MODE_ALLOWED;
}
- @Override
- public int getPackageProcessState(String packageName, String callingPackage) {
- if (!hasUsageStatsPermission(callingPackage)) {
- enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
- "getPackageProcessState");
+ /**
+ * Checks whether the calling package is trusted.
+ *
+ * The calling package is trusted if it's from system or the supposed package name matches the
+ * UID making the call.
+ *
+ * @throws SecurityException if the package name and UID don't match.
+ */
+ private void verifyCallingPackage(String callingPackage) {
+ final int callingUid = Binder.getCallingUid();
+ // The caller is System or Shell.
+ if (callingUid == SYSTEM_UID || isCallerShell()) {
+ return;
}
+ // Handle the special UIDs that don't have real package (audioserver, cameraserver, etc).
+ final String resolvedPackage = AppOpsManager.resolvePackageName(callingUid,
+ null /* packageName */);
+ if (resolvedPackage != null && resolvedPackage.equals(callingPackage)) {
+ return;
+ }
+
+ final int claimedUid = getPackageManagerInternal().getPackageUid(callingPackage,
+ 0 /* flags */, UserHandle.getUserId(callingUid));
+ if (callingUid == claimedUid) {
+ return;
+ }
+
+ throw new SecurityException(
+ "Claimed calling package " + callingPackage + " does not match the calling UID "
+ + Binder.getCallingUid());
+ }
+
+ private void enforceUsageStatsPermission(String callingPackage, String func) {
+ verifyCallingPackage(callingPackage);
+ // Since the protection level of PACKAGE_USAGE_STATS has 'appop', apps may grant this
+ // permission via that way. We need to check both app-ops and permission.
+ if (!hasUsageStatsPermission(callingPackage)) {
+ enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS, func);
+ }
+ }
+
+ @Override
+ public int getPackageProcessState(String packageName, String callingPackage) {
+ enforceUsageStatsPermission(callingPackage, "getPackageProcessState");
final int[] procState = {PROCESS_STATE_NONEXISTENT};
synchronized (mProcLock) {
mProcessList.forEachLruProcessesLOSP(false, proc -> {
@@ -6938,11 +6976,7 @@
@Override
public int getUidProcessState(int uid, String callingPackage) {
- if (!hasUsageStatsPermission(callingPackage)) {
- enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
- "getUidProcessState");
- }
-
+ enforceUsageStatsPermission(callingPackage, "getUidProcessState");
synchronized (mProcLock) {
return mProcessList.getUidProcStateLOSP(uid);
}
@@ -6950,11 +6984,7 @@
@Override
public @ProcessCapability int getUidProcessCapabilities(int uid, String callingPackage) {
- if (!hasUsageStatsPermission(callingPackage)) {
- enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
- "getUidProcessState");
- }
-
+ enforceUsageStatsPermission(callingPackage, "getUidProcessCapabilities");
synchronized (mProcLock) {
return mProcessList.getUidProcessCapabilityLOSP(uid);
}
@@ -6963,10 +6993,7 @@
@Override
public void registerUidObserver(IUidObserver observer, int which, int cutpoint,
String callingPackage) {
- if (!hasUsageStatsPermission(callingPackage)) {
- enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
- "registerUidObserver");
- }
+ enforceUsageStatsPermission(callingPackage, "registerUidObserver");
mUidObserverController.register(observer, which, cutpoint, callingPackage,
Binder.getCallingUid());
}
@@ -6978,10 +7005,7 @@
@Override
public boolean isUidActive(int uid, String callingPackage) {
- if (!hasUsageStatsPermission(callingPackage)) {
- enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
- "isUidActive");
- }
+ enforceUsageStatsPermission(callingPackage, "isUidActive");
synchronized (mProcLock) {
if (isUidActiveLOSP(uid)) {
return true;
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index 9ffafe25..0b92954 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -42,6 +42,7 @@
import android.os.BatteryUsageStats;
import android.os.BatteryUsageStatsQuery;
import android.os.Binder;
+import android.os.BluetoothBatteryStats;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
@@ -2233,6 +2234,7 @@
pw.println(" --read-daily: read-load last written daily stats.");
pw.println(" --settings: dump the settings key/values related to batterystats");
pw.println(" --cpu: dump cpu stats for debugging purpose");
+ pw.println(" --power-profile: dump the power profile constants");
pw.println(" <package.name>: optional name of package to filter output by.");
pw.println(" -h: print this help text.");
pw.println("Battery stats (batterystats) commands:");
@@ -2270,6 +2272,12 @@
}
}
+ private void dumpPowerProfile(PrintWriter pw) {
+ synchronized (mStats) {
+ mStats.dumpPowerProfileLocked(pw);
+ }
+ }
+
private int doEnableOrDisable(PrintWriter pw, int i, String[] args, boolean enable) {
i++;
if (i >= args.length) {
@@ -2412,6 +2420,9 @@
} else if ("--measured-energy".equals(arg)) {
dumpMeasuredEnergyStats(pw);
return;
+ } else if ("--power-profile".equals(arg)) {
+ dumpPowerProfile(pw);
+ return;
} else if ("-a".equals(arg)) {
flags |= BatteryStats.DUMP_VERBOSE;
} else if (arg.length() > 0 && arg.charAt(0) == '-'){
@@ -2617,6 +2628,20 @@
}
/**
+ * Gets a snapshot of Bluetooth stats
+ * @hide
+ */
+ public BluetoothBatteryStats getBluetoothBatteryStats() {
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BATTERY_STATS, null);
+
+ // Wait for the completion of pending works if there is any
+ awaitCompletion();
+ synchronized (mStats) {
+ return mStats.getBluetoothBatteryStats();
+ }
+ }
+
+ /**
* Gets a snapshot of the system health for a particular uid.
*/
@Override
diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index c08cf64..6f22c61 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -962,7 +962,7 @@
}
opt.setFreezerOverride(false);
- if (!opt.isFrozen()) {
+ if (pid == 0 || !opt.isFrozen()) {
return;
}
diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index 625dd63..3c5b872 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -15,6 +15,7 @@
*/
package com.android.server.am;
+import static android.content.ContentProvider.isAuthorityRedirectedForCloneProfile;
import static android.os.Process.PROC_CHAR;
import static android.os.Process.PROC_OUT_LONG;
import static android.os.Process.PROC_PARENS;
@@ -46,6 +47,7 @@
import android.content.pm.PackageManagerInternal;
import android.content.pm.PathPermission;
import android.content.pm.ProviderInfo;
+import android.content.pm.UserInfo;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Binder;
@@ -72,6 +74,7 @@
import com.android.internal.util.ArrayUtils;
import com.android.server.LocalServices;
import com.android.server.RescueParty;
+import com.android.server.pm.UserManagerInternal;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.io.FileDescriptor;
@@ -177,12 +180,22 @@
cpr = mProviderMap.getProviderByName(name, UserHandle.USER_SYSTEM);
if (cpr != null) {
cpi = cpr.info;
+
if (mService.isSingleton(
cpi.processName, cpi.applicationInfo, cpi.name, cpi.flags)
&& mService.isValidSingletonCall(
r == null ? callingUid : r.uid, cpi.applicationInfo.uid)) {
userId = UserHandle.USER_SYSTEM;
checkCrossUser = false;
+ } else if (isAuthorityRedirectedForCloneProfile(name)) {
+ UserManagerInternal umInternal = LocalServices.getService(
+ UserManagerInternal.class);
+ UserInfo userInfo = umInternal.getUserInfo(userId);
+
+ if (userInfo != null && userInfo.isCloneProfile()) {
+ userId = umInternal.getProfileParentId(userId);
+ checkCrossUser = false;
+ }
} else {
cpr = null;
cpi = null;
@@ -1026,6 +1039,7 @@
* at the given authority and user.
*/
String checkContentProviderAccess(String authority, int userId) {
+ boolean checkUser = true;
if (userId == UserHandle.USER_ALL) {
mService.mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, TAG);
@@ -1041,6 +1055,17 @@
| PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId);
+ if (cpi == null && isAuthorityRedirectedForCloneProfile(authority)) {
+ // This might be a provider that's running only in the system user that's
+ // also serving clone profiles
+ cpi = AppGlobals.getPackageManager().resolveContentProvider(authority,
+ ActivityManagerService.STOCK_PM_FLAGS
+ | PackageManager.GET_URI_PERMISSION_PATTERNS
+ | PackageManager.MATCH_DISABLED_COMPONENTS
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
+ }
} catch (RemoteException ignored) {
}
if (cpi == null) {
@@ -1048,6 +1073,16 @@
+ "; expected to find a valid ContentProvider for this authority";
}
+ if (isAuthorityRedirectedForCloneProfile(authority)) {
+ UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);
+ UserInfo userInfo = umInternal.getUserInfo(userId);
+
+ if (userInfo != null && userInfo.isCloneProfile()) {
+ userId = umInternal.getProfileParentId(userId);
+ checkUser = false;
+ }
+ }
+
final int callingPid = Binder.getCallingPid();
ProcessRecord r;
final String appName;
@@ -1060,7 +1095,7 @@
}
return checkContentProviderPermission(cpi, callingPid, Binder.getCallingUid(),
- userId, true, appName);
+ userId, checkUser, appName);
}
int checkContentProviderUriPermission(Uri uri, int userId, int callingUid, int modeFlags) {
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index b123496..bdfd02e 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -598,7 +598,7 @@
for (int i = psr.numberOfConnections() - 1; i >= 0; i--) {
ConnectionRecord cr = psr.getConnectionAt(i);
ProcessRecord service = (cr.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0
- ? cr.binding.service.isolatedProc : cr.binding.service.app;
+ ? cr.binding.service.isolationHostProc : cr.binding.service.app;
if (service == null || service == pr) {
continue;
}
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index c830554..be187e2 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -513,7 +513,7 @@
}
}
processInfo = procInfo;
- isolated = _info.uid != _uid;
+ isolated = Process.isIsolated(_uid);
appZygote = (UserHandle.getAppId(_uid) >= Process.FIRST_APP_ZYGOTE_ISOLATED_UID
&& UserHandle.getAppId(_uid) <= Process.LAST_APP_ZYGOTE_ISOLATED_UID);
uid = _uid;
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index 9b32e61..24e7ba4 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -102,7 +102,8 @@
// IBinder -> ConnectionRecord of all bound clients
ProcessRecord app; // where this service is running or null.
- ProcessRecord isolatedProc; // keep track of isolated process, if requested
+ ProcessRecord isolationHostProc; // process which we've started for this service (used for
+ // isolated and supplemental processes)
ServiceState tracker; // tracking service execution, may be null
ServiceState restartTracker; // tracking service restart
boolean allowlistManager; // any bindings to this service have BIND_ALLOW_WHITELIST_MANAGEMENT?
@@ -352,8 +353,8 @@
if (app != null) {
app.dumpDebug(proto, ServiceRecordProto.APP);
}
- if (isolatedProc != null) {
- isolatedProc.dumpDebug(proto, ServiceRecordProto.ISOLATED_PROC);
+ if (isolationHostProc != null) {
+ isolationHostProc.dumpDebug(proto, ServiceRecordProto.ISOLATED_PROC);
}
proto.write(ServiceRecordProto.WHITELIST_MANAGER, allowlistManager);
proto.write(ServiceRecordProto.DELAYED, delayed);
@@ -455,8 +456,8 @@
pw.print(prefix); pw.print("dataDir="); pw.println(appInfo.dataDir);
}
pw.print(prefix); pw.print("app="); pw.println(app);
- if (isolatedProc != null) {
- pw.print(prefix); pw.print("isolatedProc="); pw.println(isolatedProc);
+ if (isolationHostProc != null) {
+ pw.print(prefix); pw.print("isolationHostProc="); pw.println(isolationHostProc);
}
if (allowlistManager) {
pw.print(prefix); pw.print("allowlistManager="); pw.println(allowlistManager);
diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java
new file mode 100644
index 0000000..6982513
--- /dev/null
+++ b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerPerUserService.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2021 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.ambientcontext;
+
+import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.UserIdInt;
+import android.app.AppGlobals;
+import android.app.BroadcastOptions;
+import android.app.PendingIntent;
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextEventResponse;
+import android.app.ambientcontext.AmbientContextManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.os.Binder;
+import android.os.RemoteCallback;
+import android.os.RemoteException;
+import android.service.ambientcontext.AmbientContextDetectionService;
+import android.util.IndentingPrintWriter;
+import android.util.Slog;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.infra.AbstractPerUserSystemService;
+
+import java.io.PrintWriter;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Per-user manager service for {@link AmbientContextEvent}s.
+ */
+final class AmbientContextManagerPerUserService extends
+ AbstractPerUserSystemService<AmbientContextManagerPerUserService,
+ AmbientContextManagerService> {
+ private static final String TAG = AmbientContextManagerPerUserService.class.getSimpleName();
+
+ @Nullable
+ @VisibleForTesting
+ RemoteAmbientContextDetectionService mRemoteService;
+
+ private ComponentName mComponentName;
+ private Context mContext;
+ private Set<PendingIntent> mExistingPendingIntents;
+
+ AmbientContextManagerPerUserService(
+ @NonNull AmbientContextManagerService master, Object lock, @UserIdInt int userId) {
+ super(master, lock, userId);
+ mContext = master.getContext();
+ mExistingPendingIntents = new HashSet<>();
+ }
+
+ void destroyLocked() {
+ if (isVerbose()) {
+ Slog.v(TAG, "destroyLocked()");
+ }
+
+ Slog.d(TAG, "Trying to cancel the remote request. Reason: Service destroyed.");
+ if (mRemoteService != null) {
+ synchronized (mLock) {
+ mRemoteService.unbind();
+ mRemoteService = null;
+ }
+ }
+ }
+
+ @GuardedBy("mLock")
+ private void ensureRemoteServiceInitiated() {
+ if (mRemoteService == null) {
+ mRemoteService = new RemoteAmbientContextDetectionService(
+ getContext(), mComponentName, getUserId());
+ }
+ }
+
+ /**
+ * get the currently bound component name.
+ */
+ @VisibleForTesting
+ ComponentName getComponentName() {
+ return mComponentName;
+ }
+
+
+ /**
+ * Resolves and sets up the service if it had not been done yet. Returns true if the service
+ * is available.
+ */
+ @GuardedBy("mLock")
+ @VisibleForTesting
+ boolean setUpServiceIfNeeded() {
+ if (mComponentName == null) {
+ mComponentName = updateServiceInfoLocked();
+ }
+ return mComponentName != null;
+ }
+
+ @Override
+ protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)
+ throws PackageManager.NameNotFoundException {
+ ServiceInfo serviceInfo;
+ try {
+ serviceInfo = AppGlobals.getPackageManager().getServiceInfo(serviceComponent,
+ 0, mUserId);
+ if (serviceInfo != null) {
+ final String permission = serviceInfo.permission;
+ if (!Manifest.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE.equals(
+ permission)) {
+ throw new SecurityException(String.format(
+ "Service %s requires %s permission. Found %s permission",
+ serviceInfo.getComponentName(),
+ Manifest.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE,
+ serviceInfo.permission));
+ }
+ }
+ } catch (RemoteException e) {
+ throw new PackageManager.NameNotFoundException(
+ "Could not get service for " + serviceComponent);
+ }
+ return serviceInfo;
+ }
+
+ @Override
+ protected void dumpLocked(@NonNull String prefix, @NonNull PrintWriter pw) {
+ synchronized (super.mLock) {
+ super.dumpLocked(prefix, pw);
+ }
+ if (mRemoteService != null) {
+ mRemoteService.dump("", new IndentingPrintWriter(pw, " "));
+ }
+ }
+
+ /**
+ * Handles client registering as an observer. Only one registration is supported per app
+ * package. A new registration from the same package will overwrite the previous registration.
+ */
+ public void onRegisterObserver(AmbientContextEventRequest request,
+ PendingIntent pendingIntent) {
+ synchronized (mLock) {
+ if (!setUpServiceIfNeeded()) {
+ Slog.w(TAG, "Service is not available at this moment.");
+ sendStatusUpdateIntent(
+ pendingIntent, AmbientContextEventResponse.STATUS_SERVICE_UNAVAILABLE);
+ return;
+ }
+
+ // Remove any existing intent and unregister for this package before adding a new one.
+ String callingPackage = pendingIntent.getCreatorPackage();
+ PendingIntent duplicatePendingIntent = findExistingRequestByPackage(callingPackage);
+ if (duplicatePendingIntent != null) {
+ Slog.d(TAG, "Unregister duplicate request from " + callingPackage);
+ onUnregisterObserver(callingPackage);
+ mExistingPendingIntents.remove(duplicatePendingIntent);
+ }
+
+ // Register new package and add request to mExistingRequests
+ startDetection(request, callingPackage, createRemoteCallback());
+ mExistingPendingIntents.add(pendingIntent);
+ }
+ }
+
+ @VisibleForTesting
+ void startDetection(AmbientContextEventRequest request, String callingPackage,
+ RemoteCallback callback) {
+ Slog.d(TAG, "Requested detection of " + request.getEventTypes());
+ synchronized (mLock) {
+ ensureRemoteServiceInitiated();
+ mRemoteService.startDetection(request, callingPackage, callback);
+ }
+ }
+
+ /**
+ * Sends an intent with a status code and empty events.
+ */
+ void sendStatusUpdateIntent(PendingIntent pendingIntent, int statusCode) {
+ AmbientContextEventResponse response = new AmbientContextEventResponse.Builder()
+ .setStatusCode(statusCode)
+ .build();
+ sendResponseIntent(pendingIntent, response);
+ }
+
+ /**
+ * Unregisters the client from all previously registered events by removing from the
+ * mExistingRequests map, and unregister events from the service if those events are not
+ * requested by other apps.
+ */
+ public void onUnregisterObserver(String callingPackage) {
+ synchronized (mLock) {
+ PendingIntent pendingIntent = findExistingRequestByPackage(callingPackage);
+ if (pendingIntent == null) {
+ Slog.d(TAG, "No registration found for " + callingPackage);
+ return;
+ }
+
+ // Remove from existing requests
+ mExistingPendingIntents.remove(pendingIntent);
+ stopDetection(pendingIntent.getCreatorPackage());
+ }
+ }
+
+ @VisibleForTesting
+ void stopDetection(String packageName) {
+ Slog.d(TAG, "Stop detection for " + packageName);
+ synchronized (mLock) {
+ ensureRemoteServiceInitiated();
+ mRemoteService.stopDetection(packageName);
+ }
+ }
+
+ @Nullable
+ private PendingIntent findExistingRequestByPackage(String callingPackage) {
+ for (PendingIntent pendingIntent : mExistingPendingIntents) {
+ if (pendingIntent.getCreatorPackage().equals(callingPackage)) {
+ return pendingIntent;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Sends out the Intent to the client after the event is detected.
+ *
+ * @param pendingIntent Client's PendingIntent for callback
+ * @param response Response with status code and detection result
+ */
+ private void sendResponseIntent(PendingIntent pendingIntent,
+ AmbientContextEventResponse response) {
+ Intent intent = new Intent();
+ intent.putExtra(AmbientContextManager.EXTRA_AMBIENT_CONTEXT_EVENT_RESPONSE, response);
+ // Explicitly disallow the receiver from starting activities, to prevent apps from utilizing
+ // the PendingIntent as a backdoor to do this.
+ BroadcastOptions options = BroadcastOptions.makeBasic();
+ options.setPendingIntentBackgroundActivityLaunchAllowed(false);
+ try {
+ pendingIntent.send(getContext(), 0, intent, null, null, null,
+ options.toBundle());
+ Slog.i(TAG, "Sending PendingIntent to " + pendingIntent.getCreatorPackage() + ": "
+ + response);
+ } catch (PendingIntent.CanceledException e) {
+ Slog.w(TAG, "Couldn't deliver pendingIntent:" + pendingIntent);
+ }
+ }
+
+ @NonNull
+ private RemoteCallback createRemoteCallback() {
+ return new RemoteCallback(result -> {
+ AmbientContextEventResponse response = (AmbientContextEventResponse) result.get(
+ AmbientContextDetectionService.RESPONSE_BUNDLE_KEY);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ Set<PendingIntent> pendingIntentForFailedRequests = new HashSet<>();
+ for (PendingIntent pendingIntent : mExistingPendingIntents) {
+ // Send PendingIntent if a requesting package matches the response packages.
+ if (response.getPackageName().equals(pendingIntent.getCreatorPackage())) {
+ sendResponseIntent(pendingIntent, response);
+
+ int statusCode = response.getStatusCode();
+ if (statusCode != AmbientContextEventResponse.STATUS_SUCCESS) {
+ pendingIntentForFailedRequests.add(pendingIntent);
+ }
+ Slog.i(TAG, "Got response of " + response.getEvents() + " for "
+ + pendingIntent.getCreatorPackage() + ". Status: " + statusCode);
+ }
+ }
+
+ // Removes the failed requests from the existing requests.
+ for (PendingIntent pendingIntent : pendingIntentForFailedRequests) {
+ mExistingPendingIntents.remove(pendingIntent);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ });
+ }
+}
diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
new file mode 100644
index 0000000..33905f2
--- /dev/null
+++ b/services/core/java/com/android/server/ambientcontext/AmbientContextManagerService.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2021 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.ambientcontext;
+
+import static android.provider.DeviceConfig.NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE;
+
+import android.Manifest;
+import android.annotation.NonNull;
+import android.annotation.UserIdInt;
+import android.app.PendingIntent;
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextEventResponse;
+import android.app.ambientcontext.IAmbientContextEventObserver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManagerInternal;
+import android.os.RemoteCallback;
+import android.os.ResultReceiver;
+import android.os.ShellCallback;
+import android.os.UserHandle;
+import android.provider.DeviceConfig;
+import android.util.Slog;
+
+import com.android.internal.R;
+import com.android.internal.util.DumpUtils;
+import com.android.server.LocalServices;
+import com.android.server.SystemService;
+import com.android.server.infra.AbstractMasterSystemService;
+import com.android.server.infra.FrameworkResourcesServiceNameResolver;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * System service for managing {@link AmbientContextEvent}s.
+ */
+public class AmbientContextManagerService extends
+ AbstractMasterSystemService<AmbientContextManagerService,
+ AmbientContextManagerPerUserService> {
+ private static final String TAG = AmbientContextManagerService.class.getSimpleName();
+ private static final String KEY_SERVICE_ENABLED = "service_enabled";
+
+ /** Default value in absence of {@link DeviceConfig} override. */
+ private static final boolean DEFAULT_SERVICE_ENABLED = true;
+
+ private final Context mContext;
+ boolean mIsServiceEnabled;
+
+ public AmbientContextManagerService(Context context) {
+ super(context,
+ new FrameworkResourcesServiceNameResolver(
+ context,
+ R.string.config_defaultAmbientContextDetectionService),
+ /*disallowProperty=*/null,
+ PACKAGE_UPDATE_POLICY_REFRESH_EAGER
+ | /*To avoid high latency*/ PACKAGE_RESTART_POLICY_REFRESH_EAGER);
+ mContext = context;
+ }
+
+ @Override
+ public void onStart() {
+ publishBinderService(Context.AMBIENT_CONTEXT_SERVICE, new AmbientContextEventObserver());
+ }
+
+ @Override
+ public void onBootPhase(int phase) {
+ if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
+ DeviceConfig.addOnPropertiesChangedListener(
+ NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE,
+ getContext().getMainExecutor(),
+ (properties) -> onDeviceConfigChange(properties.getKeyset()));
+
+ mIsServiceEnabled = DeviceConfig.getBoolean(
+ NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE,
+ KEY_SERVICE_ENABLED, DEFAULT_SERVICE_ENABLED);
+ }
+ }
+
+ private void onDeviceConfigChange(@NonNull Set<String> keys) {
+ if (keys.contains(KEY_SERVICE_ENABLED)) {
+ mIsServiceEnabled = DeviceConfig.getBoolean(
+ NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE,
+ KEY_SERVICE_ENABLED, DEFAULT_SERVICE_ENABLED);
+ }
+ }
+
+ @Override
+ protected AmbientContextManagerPerUserService newServiceLocked(int resolvedUserId,
+ boolean disabled) {
+ return new AmbientContextManagerPerUserService(this, mLock, resolvedUserId);
+ }
+
+ @Override
+ protected void onServiceRemoved(
+ AmbientContextManagerPerUserService service, @UserIdInt int userId) {
+ service.destroyLocked();
+ }
+
+ /** Returns {@code true} if the detection service is configured on this device. */
+ public static boolean isDetectionServiceConfigured() {
+ final PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);
+ final String[] packageNames = pmi.getKnownPackageNames(
+ PackageManagerInternal.PACKAGE_AMBIENT_CONTEXT_DETECTION, UserHandle.USER_SYSTEM);
+ boolean isServiceConfigured = (packageNames.length != 0);
+ Slog.i(TAG, "Detection service configured: " + isServiceConfigured);
+ return isServiceConfigured;
+ }
+
+ /**
+ * Send request to the remote AmbientContextDetectionService impl to start detecting the
+ * specified events. Intended for use by shell command for testing.
+ * Requires ACCESS_AMBIENT_CONTEXT_EVENT permission.
+ */
+ void startAmbientContextEvent(@UserIdInt int userId, AmbientContextEventRequest request,
+ String packageName, RemoteCallback callback) {
+ mContext.enforceCallingOrSelfPermission(
+ Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
+ synchronized (mLock) {
+ final AmbientContextManagerPerUserService service = getServiceForUserLocked(userId);
+ if (service != null) {
+ service.startDetection(request, packageName, callback);
+ } else {
+ Slog.i(TAG, "service not available for user_id: " + userId);
+ }
+ }
+ }
+
+ /**
+ * Send request to the remote AmbientContextDetectionService impl to stop detecting the
+ * specified events. Intended for use by shell command for testing.
+ * Requires ACCESS_AMBIENT_CONTEXT_EVENT permission.
+ */
+ void stopAmbientContextEvent(@UserIdInt int userId, String packageName) {
+ mContext.enforceCallingOrSelfPermission(
+ Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
+ synchronized (mLock) {
+ final AmbientContextManagerPerUserService service = getServiceForUserLocked(userId);
+ if (service != null) {
+ service.stopDetection(packageName);
+ } else {
+ Slog.i(TAG, "service not available for user_id: " + userId);
+ }
+ }
+ }
+
+ /**
+ * Returns the AmbientContextManagerPerUserService component for this user.
+ */
+ public ComponentName getComponentName(@UserIdInt int userId) {
+ synchronized (mLock) {
+ final AmbientContextManagerPerUserService service = getServiceForUserLocked(userId);
+ if (service != null) {
+ return service.getComponentName();
+ }
+ }
+ return null;
+ }
+
+ private final class AmbientContextEventObserver extends IAmbientContextEventObserver.Stub {
+ final AmbientContextManagerPerUserService mService = getServiceForUserLocked(
+ UserHandle.getCallingUserId());
+
+ @Override
+ public void registerObserver(
+ AmbientContextEventRequest request, PendingIntent pendingIntent) {
+ Objects.requireNonNull(request);
+ Objects.requireNonNull(pendingIntent);
+ mContext.enforceCallingOrSelfPermission(
+ Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
+ if (!mIsServiceEnabled) {
+ Slog.w(TAG, "Service not available.");
+ mService.sendStatusUpdateIntent(pendingIntent,
+ AmbientContextEventResponse.STATUS_SERVICE_UNAVAILABLE);
+ return;
+ }
+ mService.onRegisterObserver(request, pendingIntent);
+ }
+
+ @Override
+ public void unregisterObserver(String callingPackage) {
+ mContext.enforceCallingOrSelfPermission(
+ Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT, TAG);
+ mService.onUnregisterObserver(callingPackage);
+ }
+
+ @Override
+ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) {
+ return;
+ }
+ synchronized (mLock) {
+ dumpLocked("", pw);
+ }
+ }
+
+ @Override
+ public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
+ String[] args, ShellCallback callback, ResultReceiver resultReceiver) {
+ new AmbientContextShellCommand(AmbientContextManagerService.this).exec(
+ this, in, out, err, args, callback, resultReceiver);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/ambientcontext/AmbientContextShellCommand.java b/services/core/java/com/android/server/ambientcontext/AmbientContextShellCommand.java
new file mode 100644
index 0000000..b5cd985
--- /dev/null
+++ b/services/core/java/com/android/server/ambientcontext/AmbientContextShellCommand.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2021 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.ambientcontext;
+
+import static java.lang.System.out;
+
+import android.annotation.NonNull;
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextEventResponse;
+import android.content.ComponentName;
+import android.os.Binder;
+import android.os.RemoteCallback;
+import android.os.ShellCommand;
+import android.service.ambientcontext.AmbientContextDetectionService;
+
+import java.io.PrintWriter;
+
+/**
+ * Shell command for {@link AmbientContextManagerService}.
+ */
+final class AmbientContextShellCommand extends ShellCommand {
+
+ @NonNull
+ private final AmbientContextManagerService mService;
+
+ AmbientContextShellCommand(@NonNull AmbientContextManagerService service) {
+ mService = service;
+ }
+
+ /** Callbacks for AmbientContextEventService results used internally for testing. */
+ static class TestableCallbackInternal {
+ private AmbientContextEventResponse mLastResponse;
+
+ public AmbientContextEventResponse getLastResponse() {
+ return mLastResponse;
+ }
+
+ @NonNull
+ private RemoteCallback createRemoteCallback() {
+ return new RemoteCallback(result -> {
+ AmbientContextEventResponse response =
+ (AmbientContextEventResponse) result.get(
+ AmbientContextDetectionService.RESPONSE_BUNDLE_KEY);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ mLastResponse = response;
+ out.println("Response available: " + response);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ });
+ }
+ }
+
+ static final TestableCallbackInternal sTestableCallbackInternal =
+ new TestableCallbackInternal();
+
+ @Override
+ public int onCommand(String cmd) {
+ if (cmd == null) {
+ return handleDefaultCommands(cmd);
+ }
+
+ switch (cmd) {
+ case "start-detection":
+ return runStartDetection();
+ case "stop-detection":
+ return runStopDetection();
+ case "get-last-status-code":
+ return getLastStatusCode();
+ case "get-bound-package":
+ return getBoundPackageName();
+ case "set-temporary-service":
+ return setTemporaryService();
+ default:
+ return handleDefaultCommands(cmd);
+ }
+ }
+
+ private int runStartDetection() {
+ final int userId = Integer.parseInt(getNextArgRequired());
+ final String packageName = getNextArgRequired();
+ AmbientContextEventRequest request = new AmbientContextEventRequest.Builder()
+ .addEventType(AmbientContextEvent.EVENT_COUGH)
+ .addEventType(AmbientContextEvent.EVENT_SNORE)
+ .build();
+
+ mService.startAmbientContextEvent(userId, request, packageName,
+ sTestableCallbackInternal.createRemoteCallback());
+ return 0;
+ }
+
+ private int runStopDetection() {
+ final int userId = Integer.parseInt(getNextArgRequired());
+ final String packageName = getNextArgRequired();
+ mService.stopAmbientContextEvent(userId, packageName);
+ return 0;
+ }
+
+ private int getLastStatusCode() {
+ AmbientContextEventResponse lastResponse = sTestableCallbackInternal.getLastResponse();
+ if (lastResponse == null) {
+ return -1;
+ }
+ return lastResponse.getStatusCode();
+ }
+
+ @Override
+ public void onHelp() {
+ PrintWriter pw = getOutPrintWriter();
+ pw.println("AmbientContextEvent commands: ");
+ pw.println(" help");
+ pw.println(" Print this help text.");
+ pw.println();
+ pw.println(" start-detection USER_ID PACKAGE_NAME: Starts AmbientContextEvent detection.");
+ pw.println(" stop-detection USER_ID: Stops AmbientContextEvent detection.");
+ pw.println(" get-last-status-code: Prints the latest request status code.");
+ pw.println(" get-bound-package USER_ID:"
+ + " Print the bound package that implements the service.");
+ pw.println(" set-temporary-service USER_ID [COMPONENT_NAME DURATION]");
+ pw.println(" Temporarily (for DURATION ms) changes the service implementation.");
+ pw.println(" To reset, call with just the USER_ID argument.");
+ }
+
+ private int getBoundPackageName() {
+ final PrintWriter out = getOutPrintWriter();
+ final int userId = Integer.parseInt(getNextArgRequired());
+ final ComponentName componentName = mService.getComponentName(userId);
+ out.println(componentName == null ? "" : componentName.getPackageName());
+ return 0;
+ }
+
+ private int setTemporaryService() {
+ final PrintWriter out = getOutPrintWriter();
+ final int userId = Integer.parseInt(getNextArgRequired());
+ final String serviceName = getNextArg();
+ if (serviceName == null) {
+ mService.resetTemporaryService(userId);
+ out.println("AmbientContextDetectionService temporary reset. ");
+ return 0;
+ }
+
+ final int duration = Integer.parseInt(getNextArgRequired());
+ mService.setTemporaryService(userId, serviceName, duration);
+ out.println("AmbientContextDetectionService temporarily set to " + serviceName
+ + " for " + duration + "ms");
+ return 0;
+ }
+}
diff --git a/services/core/java/com/android/server/ambientcontext/OWNERS b/services/core/java/com/android/server/ambientcontext/OWNERS
new file mode 100644
index 0000000..a863297
--- /dev/null
+++ b/services/core/java/com/android/server/ambientcontext/OWNERS
@@ -0,0 +1,3 @@
+enxun@google.com
+kxchen@google.com
+tgadh@google.com
diff --git a/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java b/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java
new file mode 100644
index 0000000..5cc29b3
--- /dev/null
+++ b/services/core/java/com/android/server/ambientcontext/RemoteAmbientContextDetectionService.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 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.ambientcontext;
+
+import static android.content.Context.BIND_FOREGROUND_SERVICE;
+import static android.content.Context.BIND_INCLUDE_CAPABILITIES;
+
+import android.annotation.NonNull;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteCallback;
+import android.service.ambientcontext.AmbientContextDetectionService;
+import android.service.ambientcontext.IAmbientContextDetectionService;
+import android.util.Slog;
+
+import com.android.internal.infra.ServiceConnector;
+
+/** Manages the connection to the remote service. */
+final class RemoteAmbientContextDetectionService
+ extends ServiceConnector.Impl<IAmbientContextDetectionService> {
+ private static final String TAG =
+ RemoteAmbientContextDetectionService.class.getSimpleName();
+
+ RemoteAmbientContextDetectionService(Context context, ComponentName serviceName,
+ int userId) {
+ super(context, new Intent(
+ AmbientContextDetectionService.SERVICE_INTERFACE).setComponent(serviceName),
+ BIND_FOREGROUND_SERVICE | BIND_INCLUDE_CAPABILITIES, userId,
+ IAmbientContextDetectionService.Stub::asInterface);
+
+ // Bind right away
+ connect();
+ }
+
+ /**
+ * Asks the implementation to start detection.
+ *
+ * @param request The request with events to detect, and optional detection options.
+ * @param packageName The app package that requested the detection
+ * @param callback callback for detection results
+ */
+ public void startDetection(
+ @NonNull AmbientContextEventRequest request, String packageName,
+ RemoteCallback callback) {
+ Slog.i(TAG, "Start detection for " + request.getEventTypes());
+ post(service -> service.startDetection(request, packageName, callback));
+ }
+
+ /**
+ * Asks the implementation to stop detection.
+ *
+ * @param packageName stop detection for the given package
+ */
+ public void stopDetection(String packageName) {
+ Slog.i(TAG, "Stop detection for " + packageName);
+ post(service -> service.stopDetection(packageName));
+ }
+}
diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java
index 53f651b..f5f7bb3 100644
--- a/services/core/java/com/android/server/app/GameManagerService.java
+++ b/services/core/java/com/android/server/app/GameManagerService.java
@@ -43,6 +43,7 @@
import android.app.ActivityManager;
import android.app.GameManager;
import android.app.GameManager.GameMode;
+import android.app.GameModeInfo;
import android.app.GameState;
import android.app.IGameManagerService;
import android.app.compat.PackageOverride;
@@ -694,6 +695,32 @@
}
}
+ private @GameMode int[] getAvailableGameModesUnchecked(String packageName) {
+ GamePackageConfiguration config = null;
+ synchronized (mOverrideConfigLock) {
+ config = mOverrideConfigs.get(packageName);
+ }
+ if (config == null) {
+ synchronized (mDeviceConfigLock) {
+ config = mConfigs.get(packageName);
+ }
+ }
+ if (config == null) {
+ return new int[]{};
+ }
+ return config.getAvailableGameModes();
+ }
+
+ private boolean isPackageGame(String packageName, @UserIdInt int userId) {
+ try {
+ final ApplicationInfo applicationInfo = mPackageManager
+ .getApplicationInfoAsUser(packageName, PackageManager.MATCH_ALL, userId);
+ return applicationInfo.category == ApplicationInfo.CATEGORY_GAME;
+ } catch (PackageManager.NameNotFoundException e) {
+ return false;
+ }
+ }
+
/**
* Get an array of game modes available for a given package.
* Checks that the caller has {@link android.Manifest.permission#MANAGE_GAME_MODE}.
@@ -702,19 +729,7 @@
@RequiresPermission(Manifest.permission.MANAGE_GAME_MODE)
public @GameMode int[] getAvailableGameModes(String packageName) throws SecurityException {
checkPermission(Manifest.permission.MANAGE_GAME_MODE);
- GamePackageConfiguration config = null;
- synchronized (mOverrideConfigLock) {
- config = mOverrideConfigs.get(packageName);
- }
- if (config == null) {
- synchronized (mDeviceConfigLock) {
- config = mConfigs.get(packageName);
- }
- }
- if (config == null) {
- return new int[]{GameManager.GAME_MODE_UNSUPPORTED};
- }
- return config.getAvailableGameModes();
+ return getAvailableGameModesUnchecked(packageName);
}
private @GameMode int getGameModeFromSettings(String packageName, @UserIdInt int userId) {
@@ -735,28 +750,22 @@
* {@link android.Manifest.permission#MANAGE_GAME_MODE}.
*/
@Override
- public @GameMode int getGameMode(String packageName, int userId)
+ public @GameMode int getGameMode(@NonNull String packageName, @UserIdInt int userId)
throws SecurityException {
userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
Binder.getCallingUid(), userId, false, true, "getGameMode",
"com.android.server.app.GameManagerService");
// Restrict to games only.
- try {
- final ApplicationInfo applicationInfo = mPackageManager
- .getApplicationInfoAsUser(packageName, PackageManager.MATCH_ALL, userId);
- if (applicationInfo.category != ApplicationInfo.CATEGORY_GAME) {
- // The game mode for applications that are not identified as game is always
- // UNSUPPORTED. See {@link PackageManager#setApplicationCategoryHint(String, int)}
- return GameManager.GAME_MODE_UNSUPPORTED;
- }
- } catch (PackageManager.NameNotFoundException e) {
+ if (!isPackageGame(packageName, userId)) {
+ // The game mode for applications that are not identified as game is always
+ // UNSUPPORTED. See {@link PackageManager#setApplicationCategoryHint(String, int)}
return GameManager.GAME_MODE_UNSUPPORTED;
}
// This function handles two types of queries:
- // 1.) A normal, non-privileged app querying its own Game Mode.
- // 2.) A privileged system service querying the Game Mode of another package.
+ // 1) A normal, non-privileged app querying its own Game Mode.
+ // 2) A privileged system service querying the Game Mode of another package.
// The least privileged case is a normal app performing a query, so check that first and
// return a value if the package name is valid. Next, check if the caller has the necessary
// permission and return a value. Do this check last, since it can throw an exception.
@@ -769,14 +778,32 @@
return getGameModeFromSettings(packageName, userId);
}
- private boolean isPackageGame(String packageName, int userId) {
- try {
- final ApplicationInfo applicationInfo = mPackageManager
- .getApplicationInfoAsUser(packageName, PackageManager.MATCH_ALL, userId);
- return applicationInfo.category == ApplicationInfo.CATEGORY_GAME;
- } catch (PackageManager.NameNotFoundException e) {
- return false;
+ /**
+ * Get the GameModeInfo for the package name.
+ * Verifies that the calling process is for the matching package UID or has
+ * {@link android.Manifest.permission#MANAGE_GAME_MODE}. If the package is not a game,
+ * null is always returned.
+ */
+ @Override
+ @RequiresPermission(Manifest.permission.MANAGE_GAME_MODE)
+ @Nullable
+ public GameModeInfo getGameModeInfo(@NonNull String packageName, @UserIdInt int userId) {
+ userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
+ Binder.getCallingUid(), userId, false, true, "getGameModeInfo",
+ "com.android.server.app.GameManagerService");
+
+ // Check the caller has the necessary permission.
+ checkPermission(Manifest.permission.MANAGE_GAME_MODE);
+
+ // Restrict to games only.
+ if (!isPackageGame(packageName, userId)) {
+ return null;
}
+
+ final @GameMode int activeGameMode = getGameModeFromSettings(packageName, userId);
+ final @GameMode int[] availableGameModes = getAvailableGameModesUnchecked(packageName);
+
+ return new GameModeInfo(activeGameMode, availableGameModes);
}
/**
diff --git a/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java b/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java
index d5ac03a..b4c43f6 100644
--- a/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java
+++ b/services/core/java/com/android/server/app/GameServiceProviderInstanceFactoryImpl.java
@@ -20,6 +20,7 @@
import android.app.ActivityTaskManager;
import android.content.Context;
import android.content.Intent;
+import android.os.ServiceManager;
import android.service.games.GameService;
import android.service.games.GameSessionService;
import android.service.games.IGameService;
@@ -27,6 +28,9 @@
import com.android.internal.infra.ServiceConnector;
import com.android.internal.os.BackgroundThread;
+import com.android.server.LocalServices;
+import com.android.server.wm.WindowManagerInternal;
+import com.android.server.wm.WindowManagerService;
final class GameServiceProviderInstanceFactoryImpl implements GameServiceProviderInstanceFactory {
private final Context mContext;
@@ -44,6 +48,8 @@
BackgroundThread.getExecutor(),
new GameClassifierImpl(mContext.getPackageManager()),
ActivityTaskManager.getService(),
+ (WindowManagerService) ServiceManager.getService(Context.WINDOW_SERVICE),
+ LocalServices.getService(WindowManagerInternal.class),
new GameServiceConnector(mContext, gameServiceProviderConfiguration),
new GameSessionServiceConnector(mContext, gameServiceProviderConfiguration));
}
diff --git a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java
index cc060e9..43c9839 100644
--- a/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java
+++ b/services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java
@@ -17,24 +17,37 @@
package com.android.server.app;
import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.app.ActivityTaskManager;
import android.app.IActivityTaskManager;
import android.app.TaskStackListener;
import android.content.ComponentName;
-import android.os.IBinder;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
import android.os.RemoteException;
import android.os.UserHandle;
import android.service.games.CreateGameSessionRequest;
+import android.service.games.CreateGameSessionResult;
+import android.service.games.GameScreenshotResult;
+import android.service.games.GameSessionViewHostConfiguration;
import android.service.games.GameStartedEvent;
import android.service.games.IGameService;
import android.service.games.IGameServiceController;
import android.service.games.IGameSession;
+import android.service.games.IGameSessionController;
import android.service.games.IGameSessionService;
import android.util.Slog;
+import android.view.SurfaceControlViewHost.SurfacePackage;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.infra.AndroidFuture;
import com.android.internal.infra.ServiceConnector;
+import com.android.server.wm.WindowManagerInternal;
+import com.android.server.wm.WindowManagerService;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
@@ -62,6 +75,19 @@
GameServiceProviderInstanceImpl.this.onTaskRemoved(taskId);
});
}
+
+ @Override
+ public void onTaskFocusChanged(int taskId, boolean focused) {
+ mBackgroundExecutor.execute(() -> {
+ GameServiceProviderInstanceImpl.this.onTaskFocusChanged(taskId, focused);
+ });
+ }
+
+ // TODO(b/204503192): Limit the lifespan of the game session in the Game Service provider
+ // to only when the associated task is running. Right now it is possible for a task to
+ // move into the background and for all associated processes to die and for the Game Session
+ // provider's GameSessionService to continue to be running. Ideally we could unbind the
+ // service when this happens.
};
private final IGameServiceController mGameServiceController =
@@ -74,11 +100,25 @@
}
};
+ private final IGameSessionController mGameSessionController =
+ new IGameSessionController.Stub() {
+ @Override
+ public void takeScreenshot(int taskId,
+ @NonNull AndroidFuture gameScreenshotResultFuture) {
+ mBackgroundExecutor.execute(() -> {
+ GameServiceProviderInstanceImpl.this.takeScreenshot(taskId,
+ gameScreenshotResultFuture);
+ });
+ }
+ };
+
private final Object mLock = new Object();
private final UserHandle mUserHandle;
private final Executor mBackgroundExecutor;
private final GameClassifier mGameClassifier;
private final IActivityTaskManager mActivityTaskManager;
+ private final WindowManagerService mWindowManagerService;
+ private final WindowManagerInternal mWindowManagerInternal;
private final ServiceConnector<IGameService> mGameServiceConnector;
private final ServiceConnector<IGameSessionService> mGameSessionServiceConnector;
@@ -89,16 +129,20 @@
private volatile boolean mIsRunning;
GameServiceProviderInstanceImpl(
- UserHandle userHandle,
+ @NonNull UserHandle userHandle,
@NonNull Executor backgroundExecutor,
@NonNull GameClassifier gameClassifier,
@NonNull IActivityTaskManager activityTaskManager,
+ @NonNull WindowManagerService windowManagerService,
+ @NonNull WindowManagerInternal windowManagerInternal,
@NonNull ServiceConnector<IGameService> gameServiceConnector,
@NonNull ServiceConnector<IGameSessionService> gameSessionServiceConnector) {
mUserHandle = userHandle;
mBackgroundExecutor = backgroundExecutor;
mGameClassifier = gameClassifier;
mActivityTaskManager = activityTaskManager;
+ mWindowManagerService = windowManagerService;
+ mWindowManagerInternal = windowManagerInternal;
mGameServiceConnector = gameServiceConnector;
mGameSessionServiceConnector = gameSessionServiceConnector;
}
@@ -151,16 +195,7 @@
}
for (GameSessionRecord gameSessionRecord : mGameSessions.values()) {
- IGameSession gameSession = gameSessionRecord.getGameSession();
- if (gameSession == null) {
- continue;
- }
-
- try {
- gameSession.destroy();
- } catch (RemoteException ex) {
- Slog.w(TAG, "Failed to destroy session: " + gameSessionRecord, ex);
- }
+ destroyGameSessionFromRecord(gameSessionRecord);
}
mGameSessions.clear();
@@ -185,31 +220,55 @@
}
}
+ private void onTaskFocusChanged(int taskId, boolean focused) {
+ synchronized (mLock) {
+ onTaskFocusChangedLocked(taskId, focused);
+ }
+ }
+
@GuardedBy("mLock")
- private void gameTaskStartedLocked(int sessionId, @NonNull ComponentName componentName) {
+ private void onTaskFocusChangedLocked(int taskId, boolean focused) {
if (DEBUG) {
- Slog.i(TAG, "gameStartedLocked() id: " + sessionId + " component: " + componentName);
+ Slog.d(TAG, "onTaskFocusChangedLocked() id: " + taskId + " focused: " + focused);
+ }
+
+ final GameSessionRecord gameSessionRecord = mGameSessions.get(taskId);
+ if (gameSessionRecord == null || gameSessionRecord.getGameSession() == null) {
+ return;
+ }
+
+ try {
+ gameSessionRecord.getGameSession().onTaskFocusChanged(focused);
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to notify session of task focus change: " + gameSessionRecord);
+ }
+ }
+
+ @GuardedBy("mLock")
+ private void gameTaskStartedLocked(int taskId, @NonNull ComponentName componentName) {
+ if (DEBUG) {
+ Slog.i(TAG, "gameStartedLocked() id: " + taskId + " component: " + componentName);
}
if (!mIsRunning) {
return;
}
- GameSessionRecord existingGameSessionRecord = mGameSessions.get(sessionId);
+ GameSessionRecord existingGameSessionRecord = mGameSessions.get(taskId);
if (existingGameSessionRecord != null) {
- Slog.w(TAG, "Existing game session found for task (id: " + sessionId
+ Slog.w(TAG, "Existing game session found for task (id: " + taskId
+ ") creation. Ignoring.");
return;
}
GameSessionRecord gameSessionRecord = GameSessionRecord.awaitingGameSessionRequest(
- sessionId, componentName);
- mGameSessions.put(sessionId, gameSessionRecord);
+ taskId, componentName);
+ mGameSessions.put(taskId, gameSessionRecord);
AndroidFuture<Void> unusedPostGameStartedFuture = mGameServiceConnector.post(
gameService -> {
gameService.gameStarted(
- new GameStartedEvent(sessionId, componentName.getPackageName()));
+ new GameStartedEvent(taskId, componentName.getPackageName()));
});
}
@@ -220,7 +279,7 @@
return;
}
- destroyGameSessionIfNecessaryLocked(taskId);
+ removeAndDestroyGameSessionIfNecessaryLocked(taskId);
}
}
@@ -231,112 +290,175 @@
}
@GuardedBy("mLock")
- private void createGameSessionLocked(int sessionId) {
+ private void createGameSessionLocked(int taskId) {
if (DEBUG) {
- Slog.i(TAG, "createGameSessionLocked() id: " + sessionId);
+ Slog.i(TAG, "createGameSessionLocked() id: " + taskId);
}
if (!mIsRunning) {
return;
}
- GameSessionRecord existingGameSessionRecord = mGameSessions.get(sessionId);
+ GameSessionRecord existingGameSessionRecord = mGameSessions.get(taskId);
if (existingGameSessionRecord == null) {
- Slog.w(TAG, "No existing game session record found for task (id: " + sessionId
+ Slog.w(TAG, "No existing game session record found for task (id: " + taskId
+ ") creation. Ignoring.");
return;
}
if (!existingGameSessionRecord.isAwaitingGameSessionRequest()) {
- Slog.w(TAG, "Existing game session for task (id: " + sessionId
+ Slog.w(TAG, "Existing game session for task (id: " + taskId
+ ") is not awaiting game session request. Ignoring.");
return;
}
- mGameSessions.put(sessionId, existingGameSessionRecord.withGameSessionRequested());
- ComponentName componentName = existingGameSessionRecord.getComponentName();
+ GameSessionViewHostConfiguration gameSessionViewHostConfiguration =
+ createViewHostConfigurationForTask(taskId);
+ if (gameSessionViewHostConfiguration == null) {
+ Slog.w(TAG, "Failed to create view host configuration for task (id" + taskId
+ + ") creation. Ignoring.");
+ return;
+ }
- // TODO(b/207035150): Allow the game service provider to determine if a game session
- // should be created. For now we will assume all games should have a session.
- AndroidFuture<IBinder> gameSessionFuture = new AndroidFuture<IBinder>()
- .orTimeout(CREATE_GAME_SESSION_TIMEOUT_MS, TimeUnit.MILLISECONDS)
- .whenCompleteAsync((gameSessionIBinder, exception) -> {
- IGameSession gameSession = IGameSession.Stub.asInterface(gameSessionIBinder);
- if (exception != null || gameSession == null) {
- Slog.w(TAG, "Failed to create GameSession: " + existingGameSessionRecord,
- exception);
- synchronized (mLock) {
- destroyGameSessionIfNecessaryLocked(sessionId);
- }
- return;
- }
+ if (DEBUG) {
+ Slog.d(TAG, "Determined initial view host configuration for task (id: " + taskId + "): "
+ + gameSessionViewHostConfiguration);
+ }
- synchronized (mLock) {
- attachGameSessionLocked(sessionId, gameSession);
- }
- }, mBackgroundExecutor);
+ mGameSessions.put(taskId, existingGameSessionRecord.withGameSessionRequested());
+
+ AndroidFuture<CreateGameSessionResult> createGameSessionResultFuture =
+ new AndroidFuture<CreateGameSessionResult>()
+ .orTimeout(CREATE_GAME_SESSION_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+ .whenCompleteAsync((createGameSessionResult, exception) -> {
+ if (exception != null || createGameSessionResult == null) {
+ Slog.w(TAG, "Failed to create GameSession: "
+ + existingGameSessionRecord,
+ exception);
+ synchronized (mLock) {
+ removeAndDestroyGameSessionIfNecessaryLocked(taskId);
+ }
+ return;
+ }
+
+ synchronized (mLock) {
+ attachGameSessionLocked(taskId, createGameSessionResult);
+ }
+
+ // The TaskStackListener may have made its task focused call for the
+ // game session's task before the game session was created, so check if
+ // the task is already focused so that the game session can be notified.
+ setGameSessionFocusedIfNecessary(taskId,
+ createGameSessionResult.getGameSession());
+ }, mBackgroundExecutor);
AndroidFuture<Void> unusedPostCreateGameSessionFuture =
mGameSessionServiceConnector.post(gameService -> {
CreateGameSessionRequest createGameSessionRequest =
- new CreateGameSessionRequest(sessionId, componentName.getPackageName());
- gameService.create(createGameSessionRequest, gameSessionFuture);
+ new CreateGameSessionRequest(
+ taskId,
+ existingGameSessionRecord.getComponentName().getPackageName());
+ gameService.create(
+ mGameSessionController,
+ createGameSessionRequest,
+ gameSessionViewHostConfiguration,
+ createGameSessionResultFuture);
});
}
- @GuardedBy("mLock")
- private void attachGameSessionLocked(int sessionId, @NonNull IGameSession gameSession) {
- if (DEBUG) {
- Slog.i(TAG, "attachGameSession() id: " + sessionId);
- }
-
- GameSessionRecord gameSessionRecord = mGameSessions.get(sessionId);
- boolean isValidAttachRequest = true;
- if (gameSessionRecord == null) {
- Slog.w(TAG, "No associated game session record. Destroying id: " + sessionId);
- isValidAttachRequest = false;
- }
- if (gameSessionRecord != null && !gameSessionRecord.isGameSessionRequested()) {
- Slog.w(TAG,
- "Game session not requested for existing game session record. Destroying id: "
- + sessionId);
- isValidAttachRequest = false;
- }
-
- if (!isValidAttachRequest) {
- try {
- gameSession.destroy();
- } catch (RemoteException ex) {
- Slog.w(TAG, "Failed to destroy session: " + gameSessionRecord, ex);
+ private void setGameSessionFocusedIfNecessary(int taskId, IGameSession gameSession) {
+ try {
+ final ActivityTaskManager.RootTaskInfo rootTaskInfo =
+ mActivityTaskManager.getFocusedRootTaskInfo();
+ if (rootTaskInfo != null && rootTaskInfo.taskId == taskId) {
+ gameSession.onTaskFocusChanged(true);
}
- return;
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to set task focused for ID: " + taskId);
}
-
- mGameSessions.put(sessionId, gameSessionRecord.withGameSession(gameSession));
}
@GuardedBy("mLock")
- private void destroyGameSessionIfNecessaryLocked(int sessionId) {
- // TODO(b/204503192): Limit the lifespan of the game session in the Game Service provider
- // to only when the associated task is running. Right now it is possible for a task to
- // move into the background and for all associated processes to die and for the Game Session
- // provider's GameSessionService to continue to be running. Ideally we could unbind the
- // service when this happens.
+ private void attachGameSessionLocked(
+ int taskId,
+ @NonNull CreateGameSessionResult createGameSessionResult) {
if (DEBUG) {
- Slog.i(TAG, "destroyGameSession() id: " + sessionId);
+ Slog.d(TAG, "attachGameSession() id: " + taskId);
}
- GameSessionRecord gameSessionRecord = mGameSessions.remove(sessionId);
+ GameSessionRecord gameSessionRecord = mGameSessions.get(taskId);
+
+ if (gameSessionRecord == null) {
+ Slog.w(TAG, "No associated game session record. Destroying id: " + taskId);
+ destroyGameSessionDuringAttach(taskId, createGameSessionResult);
+ return;
+ }
+
+ if (!gameSessionRecord.isGameSessionRequested()) {
+ destroyGameSessionDuringAttach(taskId, createGameSessionResult);
+ return;
+ }
+
+ try {
+ mWindowManagerInternal.addTaskOverlay(
+ taskId,
+ createGameSessionResult.getSurfacePackage());
+ } catch (IllegalArgumentException ex) {
+ Slog.w(TAG, "Failed to add task overlay. Destroying id: " + taskId);
+ destroyGameSessionDuringAttach(taskId, createGameSessionResult);
+ return;
+ }
+
+ mGameSessions.put(taskId,
+ gameSessionRecord.withGameSession(
+ createGameSessionResult.getGameSession(),
+ createGameSessionResult.getSurfacePackage()));
+ }
+
+ private void destroyGameSessionDuringAttach(
+ int taskId,
+ CreateGameSessionResult createGameSessionResult) {
+ try {
+ createGameSessionResult.getGameSession().onDestroyed();
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to destroy session: " + taskId);
+ }
+ }
+
+ @GuardedBy("mLock")
+ private void removeAndDestroyGameSessionIfNecessaryLocked(int taskId) {
+ if (DEBUG) {
+ Slog.d(TAG, "destroyGameSession() id: " + taskId);
+ }
+
+ GameSessionRecord gameSessionRecord = mGameSessions.remove(taskId);
if (gameSessionRecord == null) {
if (DEBUG) {
- Slog.w(TAG, "No game session found for id: " + sessionId);
+ Slog.w(TAG, "No game session found for id: " + taskId);
}
return;
}
+ destroyGameSessionFromRecord(gameSessionRecord);
+ }
+
+ private void destroyGameSessionFromRecord(@NonNull GameSessionRecord gameSessionRecord) {
+ SurfacePackage surfacePackage = gameSessionRecord.getSurfacePackage();
+ if (surfacePackage != null) {
+ try {
+ mWindowManagerInternal.removeTaskOverlay(
+ gameSessionRecord.getTaskId(),
+ surfacePackage);
+ } catch (IllegalArgumentException ex) {
+ Slog.i(TAG,
+ "Failed to remove task overlay. This is expected if the task is already "
+ + "destroyed: "
+ + gameSessionRecord);
+ }
+ }
IGameSession gameSession = gameSessionRecord.getGameSession();
if (gameSession != null) {
try {
- gameSession.destroy();
+ gameSession.onDestroyed();
} catch (RemoteException ex) {
Slog.w(TAG, "Failed to destroy session: " + gameSessionRecord, ex);
}
@@ -344,7 +466,7 @@
if (mGameSessions.isEmpty()) {
if (DEBUG) {
- Slog.i(TAG, "No active game sessions. Disconnecting GameSessionService");
+ Slog.d(TAG, "No active game sessions. Disconnecting GameSessionService");
}
if (mGameSessionServiceConnector != null) {
@@ -352,4 +474,62 @@
}
}
}
+
+ @Nullable
+ private GameSessionViewHostConfiguration createViewHostConfigurationForTask(int taskId) {
+ RunningTaskInfo runningTaskInfo = getRunningTaskInfoForTask(taskId);
+ if (runningTaskInfo == null) {
+ return null;
+ }
+
+ Rect bounds = runningTaskInfo.configuration.windowConfiguration.getBounds();
+ return new GameSessionViewHostConfiguration(
+ runningTaskInfo.displayId,
+ bounds.width(),
+ bounds.height());
+ }
+
+ @Nullable
+ private RunningTaskInfo getRunningTaskInfoForTask(int taskId) {
+ List<RunningTaskInfo> runningTaskInfos;
+ try {
+ runningTaskInfos = mActivityTaskManager.getTasks(
+ /* maxNum= */ Integer.MAX_VALUE,
+ /* filterOnlyVisibleRecents= */ true,
+ /* keepIntentExtra= */ false);
+ } catch (RemoteException ex) {
+ Slog.w(TAG, "Failed to fetch running tasks");
+ return null;
+ }
+
+ for (RunningTaskInfo taskInfo : runningTaskInfos) {
+ if (taskInfo.taskId == taskId) {
+ return taskInfo;
+ }
+ }
+
+ return null;
+ }
+
+ @VisibleForTesting
+ void takeScreenshot(int taskId, @NonNull AndroidFuture callback) {
+ synchronized (mLock) {
+ boolean isTaskAssociatedWithGameSession = mGameSessions.containsKey(taskId);
+ if (!isTaskAssociatedWithGameSession) {
+ Slog.w(TAG, "No game session found for id: " + taskId);
+ callback.complete(GameScreenshotResult.createInternalErrorResult());
+ return;
+ }
+ }
+
+ mBackgroundExecutor.execute(() -> {
+ final Bitmap bitmap = mWindowManagerService.captureTaskBitmap(taskId);
+ if (bitmap == null) {
+ Slog.w(TAG, "Could not get bitmap for id: " + taskId);
+ callback.complete(GameScreenshotResult.createInternalErrorResult());
+ } else {
+ callback.complete(GameScreenshotResult.createSuccessResult(bitmap));
+ }
+ });
+ }
}
diff --git a/services/core/java/com/android/server/app/GameSessionRecord.java b/services/core/java/com/android/server/app/GameSessionRecord.java
index e9daceb..a241812 100644
--- a/services/core/java/com/android/server/app/GameSessionRecord.java
+++ b/services/core/java/com/android/server/app/GameSessionRecord.java
@@ -20,6 +20,7 @@
import android.annotation.Nullable;
import android.content.ComponentName;
import android.service.games.IGameSession;
+import android.view.SurfaceControlViewHost.SurfacePackage;
import java.util.Objects;
@@ -37,26 +38,34 @@
}
private final int mTaskId;
+ private final State mState;
private final ComponentName mRootComponentName;
@Nullable
private final IGameSession mIGameSession;
- private final State mState;
+ @Nullable
+ private final SurfacePackage mSurfacePackage;
static GameSessionRecord awaitingGameSessionRequest(int taskId,
ComponentName rootComponentName) {
- return new GameSessionRecord(taskId, rootComponentName, /* gameSession= */ null,
- State.NO_GAME_SESSION_REQUESTED);
+ return new GameSessionRecord(
+ taskId,
+ State.NO_GAME_SESSION_REQUESTED,
+ rootComponentName,
+ /* gameSession= */ null,
+ /* surfacePackage= */ null);
}
private GameSessionRecord(
int taskId,
+ @NonNull State state,
@NonNull ComponentName rootComponentName,
@Nullable IGameSession gameSession,
- @NonNull State state) {
+ @Nullable SurfacePackage surfacePackage) {
this.mTaskId = taskId;
+ this.mState = state;
this.mRootComponentName = rootComponentName;
this.mIGameSession = gameSession;
- this.mState = state;
+ this.mSurfacePackage = surfacePackage;
}
public boolean isAwaitingGameSessionRequest() {
@@ -65,8 +74,12 @@
@NonNull
public GameSessionRecord withGameSessionRequested() {
- return new GameSessionRecord(mTaskId, mRootComponentName, /* gameSession=*/ null,
- State.GAME_SESSION_REQUESTED);
+ return new GameSessionRecord(
+ mTaskId,
+ State.GAME_SESSION_REQUESTED,
+ mRootComponentName,
+ /* gameSession=*/ null,
+ /* surfacePackage=*/ null);
}
public boolean isGameSessionRequested() {
@@ -74,15 +87,20 @@
}
@NonNull
- public GameSessionRecord withGameSession(@NonNull IGameSession gameSession) {
+ public GameSessionRecord withGameSession(
+ @NonNull IGameSession gameSession,
+ @NonNull SurfacePackage surfacePackage) {
Objects.requireNonNull(gameSession);
- return new GameSessionRecord(mTaskId, mRootComponentName, gameSession,
- State.GAME_SESSION_ATTACHED);
+ return new GameSessionRecord(mTaskId,
+ State.GAME_SESSION_ATTACHED,
+ mRootComponentName,
+ gameSession,
+ surfacePackage);
}
- @Nullable
- public IGameSession getGameSession() {
- return mIGameSession;
+ @NonNull
+ public int getTaskId() {
+ return mTaskId;
}
@NonNull
@@ -90,17 +108,29 @@
return mRootComponentName;
}
+ @Nullable
+ public IGameSession getGameSession() {
+ return mIGameSession;
+ }
+
+ @Nullable
+ public SurfacePackage getSurfacePackage() {
+ return mSurfacePackage;
+ }
+
@Override
public String toString() {
return "GameSessionRecord{"
+ "mTaskId="
+ mTaskId
+ + ", mState="
+ + mState
+ ", mRootComponentName="
+ mRootComponentName
+ ", mIGameSession="
+ mIGameSession
- + ", mState="
- + mState
+ + ", mSurfacePackage="
+ + mSurfacePackage
+ '}';
}
@@ -115,12 +145,16 @@
}
GameSessionRecord that = (GameSessionRecord) o;
- return mTaskId == that.mTaskId && mRootComponentName.equals(that.mRootComponentName)
- && Objects.equals(mIGameSession, that.mIGameSession) && mState == that.mState;
+ return mTaskId == that.mTaskId
+ && mState == that.mState
+ && mRootComponentName.equals(that.mRootComponentName)
+ && Objects.equals(mIGameSession, that.mIGameSession)
+ && Objects.equals(mSurfacePackage, that.mSurfacePackage);
}
@Override
public int hashCode() {
- return Objects.hash(mTaskId, mRootComponentName, mIGameSession, mState);
+ return Objects.hash(
+ mTaskId, mState, mRootComponentName, mIGameSession, mState, mSurfacePackage);
}
}
diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java
index 0961fcb3..2dd6bf5 100644
--- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java
@@ -1360,6 +1360,9 @@
case AudioSystem.DEVICE_OUT_USB_HEADSET:
connType = AudioRoutesInfo.MAIN_USB;
break;
+ case AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET:
+ connType = AudioRoutesInfo.MAIN_DOCK_SPEAKERS;
+ break;
}
synchronized (mCurAudioRoutes) {
diff --git a/services/core/java/com/android/server/biometrics/log/CallbackWithProbe.java b/services/core/java/com/android/server/biometrics/log/CallbackWithProbe.java
index c985d5d..f7b73688 100644
--- a/services/core/java/com/android/server/biometrics/log/CallbackWithProbe.java
+++ b/services/core/java/com/android/server/biometrics/log/CallbackWithProbe.java
@@ -19,6 +19,7 @@
import android.annotation.NonNull;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
/**
* Client monitor callback that exposes a probe.
@@ -27,7 +28,7 @@
*
* @param <T> probe type
*/
-public class CallbackWithProbe<T extends Probe> implements BaseClientMonitor.Callback {
+public class CallbackWithProbe<T extends Probe> implements ClientMonitorCallback {
private final boolean mStartWithClient;
private final T mProbe;
diff --git a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java
index e29caa8..86d72ba 100644
--- a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java
@@ -138,7 +138,7 @@
}
@Override
- public void cancelWithoutStarting(@NonNull Callback callback) {
+ public void cancelWithoutStarting(@NonNull ClientMonitorCallback callback) {
Slog.d(TAG, "cancelWithoutStarting: " + this);
final int errorCode = BiometricConstants.BIOMETRIC_ERROR_CANCELED;
diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
index 0eb5aaf..35a0f57 100644
--- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
@@ -91,7 +91,7 @@
/**
* Handles lifecycle, e.g. {@link BiometricScheduler},
- * {@link com.android.server.biometrics.sensors.BaseClientMonitor.Callback} after authentication
+ * {@link ClientMonitorCallback} after authentication
* results are known. Note that this happens asynchronously from (but shortly after)
* {@link #onAuthenticated(BiometricAuthenticator.Identifier, boolean, ArrayList)} and allows
* {@link CoexCoordinator} a chance to invoke/delay this event.
@@ -440,7 +440,7 @@
* Start authentication
*/
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
final @LockoutTracker.LockoutMode int lockoutMode =
diff --git a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java
index 1248c8b..e1f7e2a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java
@@ -29,8 +29,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.biometrics.log.BiometricLogger;
-import java.util.ArrayList;
-import java.util.List;
import java.util.NoSuchElementException;
/**
@@ -46,63 +44,6 @@
// Counter used to distinguish between ClientMonitor instances to help debugging.
private static int sCount = 0;
- /**
- * Interface that ClientMonitor holders should use to receive callbacks.
- */
- public interface Callback {
- /**
- * Invoked when the ClientMonitor operation has been started (e.g. reached the head of
- * the queue and becomes the current operation).
- *
- * @param clientMonitor Reference of the ClientMonitor that is starting.
- */
- default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
- }
-
- /**
- * Invoked when the ClientMonitor operation is complete. This abstracts away asynchronous
- * (i.e. Authenticate, Enroll, Enumerate, Remove) and synchronous (i.e. generateChallenge,
- * revokeChallenge) so that a scheduler can process ClientMonitors regardless of their
- * implementation.
- *
- * @param clientMonitor Reference of the ClientMonitor that finished.
- * @param success True if the operation completed successfully.
- */
- default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {
- }
- }
-
- /** Holder for wrapping multiple handlers into a single Callback. */
- public static class CompositeCallback implements Callback {
- @NonNull
- private final List<Callback> mCallbacks;
-
- public CompositeCallback(@NonNull Callback... callbacks) {
- mCallbacks = new ArrayList<>();
-
- for (Callback callback : callbacks) {
- if (callback != null) {
- mCallbacks.add(callback);
- }
- }
- }
-
- @Override
- public final void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
- for (int i = 0; i < mCallbacks.size(); i++) {
- mCallbacks.get(i).onClientStarted(clientMonitor);
- }
- }
-
- @Override
- public final void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
- boolean success) {
- for (int i = mCallbacks.size() - 1; i >= 0; i--) {
- mCallbacks.get(i).onClientFinished(clientMonitor, success);
- }
- }
- }
-
private final int mSequentialId;
@NonNull private final Context mContext;
private final int mTargetUserId;
@@ -120,7 +61,7 @@
// Use an empty callback by default since delayed operations can receive events
// before they are started and cause NPE in subclasses that access this field directly.
- @NonNull protected Callback mCallback = new Callback() {
+ @NonNull protected ClientMonitorCallback mCallback = new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
Slog.e(TAG, "mCallback onClientStarted: called before set (should not happen)");
@@ -134,18 +75,6 @@
};
/**
- * @return A ClientMonitorEnum constant defined in biometrics.proto
- */
- public abstract int getProtoEnum();
-
- /**
- * @return True if the ClientMonitor should cancel any current and pending interruptable clients
- */
- public boolean interruptsPrecedingClients() {
- return false;
- }
-
- /**
* @param context system_server context
* @param token a unique token for the client
* @param listener recipient of related events (e.g. authentication)
@@ -189,11 +118,19 @@
}
}
+ /** A ClientMonitorEnum constant defined in biometrics.proto */
+ public abstract int getProtoEnum();
+
+ /** True if the ClientMonitor should cancel any current and pending interruptable clients. */
+ public boolean interruptsPrecedingClients() {
+ return false;
+ }
+
/**
* Starts the ClientMonitor's lifecycle.
* @param callback invoked when the operation is complete (succeeds, fails, etc)
*/
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
mCallback = wrapCallbackForStart(callback);
mCallback.onClientStarted(this);
}
@@ -204,7 +141,7 @@
* Returns the original callback unless overridden.
*/
@NonNull
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
return callback;
}
@@ -329,7 +266,7 @@
}
@VisibleForTesting
- public Callback getCallback() {
+ public ClientMonitorCallback getCallback() {
return mCallback;
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
index 39c5944..1a6da94 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
@@ -160,7 +160,7 @@
// Internal callback, notified when an operation is complete. Notifies the requester
// that the operation is complete, before performing internal scheduler work (such as
// starting the next client).
- private final BaseClientMonitor.Callback mInternalCallback = new BaseClientMonitor.Callback() {
+ private final ClientMonitorCallback mInternalCallback = new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
Slog.d(getTag(), "[Started] " + clientMonitor);
@@ -247,7 +247,7 @@
}
@VisibleForTesting
- public BaseClientMonitor.Callback getInternalCallback() {
+ public ClientMonitorCallback getInternalCallback() {
return mInternalCallback;
}
@@ -368,7 +368,7 @@
* @param clientCallback optional callback, invoked when the client state changes.
*/
public void scheduleClientMonitor(@NonNull BaseClientMonitor clientMonitor,
- @Nullable BaseClientMonitor.Callback clientCallback) {
+ @Nullable ClientMonitorCallback clientCallback) {
// If the incoming operation should interrupt preceding clients, mark any interruptable
// pending clients as canceling. Once they reach the head of the queue, the scheduler will
// send ERROR_CANCELED and skip the operation.
diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricSchedulerOperation.java b/services/core/java/com/android/server/biometrics/sensors/BiometricSchedulerOperation.java
index e8b50d9..812ca8a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BiometricSchedulerOperation.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BiometricSchedulerOperation.java
@@ -65,7 +65,7 @@
protected static final int STATE_WAITING_FOR_COOKIE = 4;
/**
- * The {@link BaseClientMonitor.Callback} has been invoked and the client is finished.
+ * The {@link ClientMonitorCallback} has been invoked and the client is finished.
*/
protected static final int STATE_FINISHED = 5;
@@ -83,7 +83,7 @@
@NonNull
private final BaseClientMonitor mClientMonitor;
@Nullable
- private final BaseClientMonitor.Callback mClientCallback;
+ private final ClientMonitorCallback mClientCallback;
@OperationState
private int mState;
@VisibleForTesting
@@ -92,14 +92,14 @@
BiometricSchedulerOperation(
@NonNull BaseClientMonitor clientMonitor,
- @Nullable BaseClientMonitor.Callback callback
+ @Nullable ClientMonitorCallback callback
) {
this(clientMonitor, callback, STATE_WAITING_IN_QUEUE);
}
protected BiometricSchedulerOperation(
@NonNull BaseClientMonitor clientMonitor,
- @Nullable BaseClientMonitor.Callback callback,
+ @Nullable ClientMonitorCallback callback,
@OperationState int state
) {
mClientMonitor = clientMonitor;
@@ -139,7 +139,7 @@
* @param callback lifecycle callback
* @return if this operation started
*/
- public boolean start(@NonNull BaseClientMonitor.Callback callback) {
+ public boolean start(@NonNull ClientMonitorCallback callback) {
checkInState("start",
STATE_WAITING_IN_QUEUE,
STATE_WAITING_FOR_COOKIE,
@@ -159,7 +159,7 @@
* @param cookie cookie indicting the operation should begin
* @return if this operation started
*/
- public boolean startWithCookie(@NonNull BaseClientMonitor.Callback callback, int cookie) {
+ public boolean startWithCookie(@NonNull ClientMonitorCallback callback, int cookie) {
checkInState("start",
STATE_WAITING_IN_QUEUE,
STATE_WAITING_FOR_COOKIE,
@@ -173,8 +173,8 @@
return doStart(callback);
}
- private boolean doStart(@NonNull BaseClientMonitor.Callback callback) {
- final BaseClientMonitor.Callback cb = getWrappedCallback(callback);
+ private boolean doStart(@NonNull ClientMonitorCallback callback) {
+ final ClientMonitorCallback cb = getWrappedCallback(callback);
if (mState == STATE_WAITING_IN_QUEUE_CANCELING) {
Slog.d(TAG, "Operation marked for cancellation, cancelling now: " + this);
@@ -239,9 +239,9 @@
*
* @param handler handler to use for the cancellation watchdog
* @param callback lifecycle callback (only used if this operation hasn't started, otherwise
- * the callback used from {@link #start(BaseClientMonitor.Callback)} is used)
+ * the callback used from {@link #start(ClientMonitorCallback)} is used)
*/
- public void cancel(@NonNull Handler handler, @NonNull BaseClientMonitor.Callback callback) {
+ public void cancel(@NonNull Handler handler, @NonNull ClientMonitorCallback callback) {
checkNotInState("cancel", STATE_FINISHED);
final int currentState = mState;
@@ -270,14 +270,14 @@
}
@NonNull
- private BaseClientMonitor.Callback getWrappedCallback() {
+ private ClientMonitorCallback getWrappedCallback() {
return getWrappedCallback(null);
}
@NonNull
- private BaseClientMonitor.Callback getWrappedCallback(
- @Nullable BaseClientMonitor.Callback callback) {
- final BaseClientMonitor.Callback destroyCallback = new BaseClientMonitor.Callback() {
+ private ClientMonitorCallback getWrappedCallback(
+ @Nullable ClientMonitorCallback callback) {
+ final ClientMonitorCallback destroyCallback = new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
@@ -286,7 +286,7 @@
mState = STATE_FINISHED;
}
};
- return new BaseClientMonitor.CompositeCallback(destroyCallback, callback, mClientCallback);
+ return new ClientMonitorCompositeCallback(destroyCallback, callback, mClientCallback);
}
/** {@link BaseClientMonitor#getSensorId()}. */
diff --git a/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallback.java b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallback.java
new file mode 100644
index 0000000..8ea4ee9
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCallback.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 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.biometrics.sensors;
+
+import android.annotation.NonNull;
+
+/**
+ * Interface that ClientMonitor holders should use to receive callbacks.
+ */
+public interface ClientMonitorCallback {
+ /**
+ * Invoked when the ClientMonitor operation has been started (e.g. reached the head of
+ * the queue and becomes the current operation).
+ *
+ * @param clientMonitor Reference of the ClientMonitor that is starting.
+ */
+ default void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {}
+
+ /**
+ * Invoked when the ClientMonitor operation is complete. This abstracts away asynchronous
+ * (i.e. Authenticate, Enroll, Enumerate, Remove) and synchronous (i.e. generateChallenge,
+ * revokeChallenge) so that a scheduler can process ClientMonitors regardless of their
+ * implementation.
+ *
+ * @param clientMonitor Reference of the ClientMonitor that finished.
+ * @param success True if the operation completed successfully.
+ */
+ default void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {}
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCompositeCallback.java b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCompositeCallback.java
new file mode 100644
index 0000000..b82f5fa
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/sensors/ClientMonitorCompositeCallback.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 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.biometrics.sensors;
+
+import android.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Holder for wrapping multiple handlers into a single Callback. */
+public class ClientMonitorCompositeCallback implements ClientMonitorCallback {
+ @NonNull
+ private final List<ClientMonitorCallback> mCallbacks;
+
+ public ClientMonitorCompositeCallback(@NonNull ClientMonitorCallback... callbacks) {
+ mCallbacks = new ArrayList<>();
+
+ for (ClientMonitorCallback callback : callbacks) {
+ if (callback != null) {
+ mCallbacks.add(callback);
+ }
+ }
+ }
+
+ @Override
+ public final void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
+ for (int i = 0; i < mCallbacks.size(); i++) {
+ mCallbacks.get(i).onClientStarted(clientMonitor);
+ }
+ }
+
+ @Override
+ public final void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
+ boolean success) {
+ for (int i = mCallbacks.size() - 1; i >= 0; i--) {
+ mCallbacks.get(i).onClientFinished(clientMonitor, success);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java
index c83323a..3b7adc1 100644
--- a/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/EnrollClient.java
@@ -98,7 +98,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
if (hasReachedEnrollmentLimit()) {
diff --git a/services/core/java/com/android/server/biometrics/sensors/EnrollmentModifier.java b/services/core/java/com/android/server/biometrics/sensors/EnrollmentModifier.java
index c2f909b..3060f30 100644
--- a/services/core/java/com/android/server/biometrics/sensors/EnrollmentModifier.java
+++ b/services/core/java/com/android/server/biometrics/sensors/EnrollmentModifier.java
@@ -23,7 +23,7 @@
/**
* Callers should typically check this after
- * {@link BaseClientMonitor.Callback#onClientFinished(BaseClientMonitor, boolean)}
+ * {@link ClientMonitorCallback#onClientFinished(BaseClientMonitor, boolean)}
*
* @return true if the user has gone from:
* 1) none-enrolled --> enrolled
diff --git a/services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java
index 3d74f36..6fb6d08 100644
--- a/services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java
@@ -47,7 +47,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
diff --git a/services/core/java/com/android/server/biometrics/sensors/HalClientMonitor.java b/services/core/java/com/android/server/biometrics/sensors/HalClientMonitor.java
index 63cd412..c8830f8 100644
--- a/services/core/java/com/android/server/biometrics/sensors/HalClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/sensors/HalClientMonitor.java
@@ -45,7 +45,7 @@
/**
* Invoked if the scheduler is unable to start the ClientMonitor (for example the HAL is null).
* If such a problem is detected, the scheduler will not invoke
- * {@link #start(Callback)}.
+ * {@link #start(ClientMonitorCallback)}.
*/
public abstract void unableToStart();
diff --git a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
index 82a8437..0636893 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
@@ -64,7 +64,7 @@
private final boolean mHasEnrollmentsBeforeStarting;
private BaseClientMonitor mCurrentTask;
- private final Callback mEnumerateCallback = new Callback() {
+ private final ClientMonitorCallback mEnumerateCallback = new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {
final List<BiometricAuthenticator.Identifier> unknownHALTemplates =
@@ -90,7 +90,7 @@
}
};
- private final Callback mRemoveCallback = new Callback() {
+ private final ClientMonitorCallback mRemoveCallback = new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {
Slog.d(TAG, "Remove onClientFinished: " + clientMonitor + ", success: " + success);
@@ -139,7 +139,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
// Start enumeration. Removal will start if necessary, when enumeration is completed.
diff --git a/services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java b/services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java
index ced464e..05ea19a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java
@@ -72,7 +72,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
// The biometric template ids will be removed when we get confirmation from the HAL
diff --git a/services/core/java/com/android/server/biometrics/sensors/Interruptable.java b/services/core/java/com/android/server/biometrics/sensors/Interruptable.java
index d5093c75..4f645ef 100644
--- a/services/core/java/com/android/server/biometrics/sensors/Interruptable.java
+++ b/services/core/java/com/android/server/biometrics/sensors/Interruptable.java
@@ -29,15 +29,15 @@
/**
* Notifies the client that it needs to finish before
- * {@link BaseClientMonitor#start(BaseClientMonitor.Callback)} was invoked. This usually happens
+ * {@link BaseClientMonitor#start(ClientMonitorCallback)} was invoked. This usually happens
* if the client is still waiting in the pending queue and got notified that a subsequent
* operation is preempting it.
*
* This method must invoke
- * {@link BaseClientMonitor.Callback#onClientFinished(BaseClientMonitor, boolean)} on the
+ * {@link ClientMonitorCallback#onClientFinished(BaseClientMonitor, boolean)} on the
* given callback (with success).
*
* @param callback invoked when the operation is completed.
*/
- void cancelWithoutStarting(@NonNull BaseClientMonitor.Callback callback);
+ void cancelWithoutStarting(@NonNull ClientMonitorCallback callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java
index cede4a7..ee6bb0f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InvalidationClient.java
@@ -62,7 +62,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
diff --git a/services/core/java/com/android/server/biometrics/sensors/InvalidationRequesterClient.java b/services/core/java/com/android/server/biometrics/sensors/InvalidationRequesterClient.java
index 5ba1b00..b2661a2 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InvalidationRequesterClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InvalidationRequesterClient.java
@@ -84,7 +84,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
mUtils.setInvalidationInProgress(getContext(), getTargetUserId(), true /* inProgress */);
diff --git a/services/core/java/com/android/server/biometrics/sensors/RemovalClient.java b/services/core/java/com/android/server/biometrics/sensors/RemovalClient.java
index 2a6677e..e79819b 100644
--- a/services/core/java/com/android/server/biometrics/sensors/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/RemovalClient.java
@@ -17,7 +17,6 @@
package com.android.server.biometrics.sensors;
import android.annotation.NonNull;
-import android.annotation.Nullable;
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricsProtoEnums;
@@ -59,7 +58,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
// The biometric template ids will be removed when we get confirmation from the HAL
diff --git a/services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java
index 1edf5af..21a6ddf 100644
--- a/services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java
@@ -38,7 +38,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
diff --git a/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java
index 603cc22..4f90020 100644
--- a/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java
+++ b/services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java
@@ -56,7 +56,7 @@
@NonNull private final UserSwitchCallback mUserSwitchCallback;
@Nullable private StopUserClient<?> mStopUserClient;
- private class ClientFinishedCallback implements BaseClientMonitor.Callback {
+ private class ClientFinishedCallback implements ClientMonitorCallback {
private final BaseClientMonitor mOwner;
ClientFinishedCallback(BaseClientMonitor owner) {
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
index 77e431c..1e9b72b 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java
@@ -29,7 +29,7 @@
import android.util.proto.ProtoOutputStream;
import android.view.Surface;
-import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.LockoutTracker;
@@ -137,7 +137,7 @@
void startPreparedClient(int sensorId, int cookie);
void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback);
+ @Nullable ClientMonitorCallback callback);
void dumpProtoState(int sensorId, @NonNull ProtoOutputStream proto,
boolean clearSchedulerBuffer);
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/BiometricTestSessionImpl.java
index 66b942b..8998269 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/BiometricTestSessionImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/BiometricTestSessionImpl.java
@@ -35,6 +35,7 @@
import com.android.server.biometrics.HardwareAuthTokenUtils;
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.face.FaceUtils;
import java.util.HashSet;
@@ -221,7 +222,7 @@
Utils.checkPermission(mContext, TEST_BIOMETRIC);
Slog.d(TAG, "cleanupInternalState: " + userId);
- mProvider.scheduleInternalCleanup(mSensorId, userId, new BaseClientMonitor.Callback() {
+ mProvider.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
try {
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
index 757a52cb..dc21a04f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java
@@ -39,7 +39,9 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.LockoutCache;
import com.android.server.biometrics.sensors.LockoutConsumer;
import com.android.server.biometrics.sensors.LockoutTracker;
@@ -97,15 +99,15 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
mState = STATE_STARTED;
}
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
index 2158dfe..72a20db07 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
@@ -30,6 +30,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.sensors.AcquisitionClient;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.DetectionConsumer;
@@ -58,7 +59,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java
index b5f89b4..5c57dbb 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java
@@ -41,7 +41,9 @@
import com.android.server.biometrics.sensors.BaseClientMonitor;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.EnrollClient;
import com.android.server.biometrics.sensors.face.FaceService;
import com.android.server.biometrics.sensors.face.FaceUtils;
@@ -67,8 +69,8 @@
private final int mMaxTemplatesPerUser;
private final boolean mDebugConsent;
- private final BaseClientMonitor.Callback mPreviewHandleDeleterCallback =
- new BaseClientMonitor.Callback() {
+ private final ClientMonitorCallback mPreviewHandleDeleterCallback =
+ new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
}
@@ -101,7 +103,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
BiometricNotificationUtils.cancelReEnrollNotification(getContext());
@@ -109,8 +111,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(mPreviewHandleDeleterCallback,
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(mPreviewHandleDeleterCallback,
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetAuthenticatorIdClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetAuthenticatorIdClient.java
index af826c2..584b58c 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetAuthenticatorIdClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetAuthenticatorIdClient.java
@@ -24,6 +24,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.HalClientMonitor;
import java.util.Map;
@@ -48,7 +49,7 @@
// Nothing to do here
}
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetFeatureClient.java
index 315ede8b..acf5720 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetFeatureClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGetFeatureClient.java
@@ -29,6 +29,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.ErrorConsumer;
import com.android.server.biometrics.sensors.HalClientMonitor;
@@ -60,7 +61,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
index ae507ab..9d7a552 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
@@ -49,6 +49,7 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.InvalidationRequesterClient;
import com.android.server.biometrics.sensors.LockoutResetDispatcher;
@@ -217,7 +218,7 @@
}
private void scheduleForSensor(int sensorId, @NonNull BaseClientMonitor client,
- BaseClientMonitor.Callback callback) {
+ ClientMonitorCallback callback) {
if (!mSensors.contains(sensorId)) {
throw new IllegalStateException("Unable to schedule client: " + client
+ " for sensor: " + sensorId);
@@ -341,7 +342,7 @@
opPackageName, id, FaceUtils.getInstance(sensorId), disabledFeatures,
ENROLL_TIMEOUT_SEC, previewSurface, sensorId, maxTemplatesPerUser,
debugConsent);
- scheduleForSensor(sensorId, client, new BaseClientMonitor.Callback() {
+ scheduleForSensor(sensorId, client, new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
@@ -511,7 +512,7 @@
@Override
public void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback) {
+ @Nullable ClientMonitorCallback callback) {
mHandler.post(() -> {
final List<Face> enrolledList = getEnrolledFaces(sensorId, userId);
final FaceInternalCleanupClient client =
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java
index 1e1b532..fd44c5c 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java
@@ -27,6 +27,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.HardwareAuthTokenUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ErrorConsumer;
import com.android.server.biometrics.sensors.HalClientMonitor;
import com.android.server.biometrics.sensors.LockoutCache;
@@ -64,7 +65,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceSetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceSetFeatureClient.java
index 4515d04..ee6982a 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceSetFeatureClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceSetFeatureClient.java
@@ -28,6 +28,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.HardwareAuthTokenUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.ErrorConsumer;
import com.android.server.biometrics.sensors.HalClientMonitor;
@@ -65,7 +66,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStartUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStartUserClient.java
index 2b5f495..4a3da0d 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStartUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStartUserClient.java
@@ -27,6 +27,7 @@
import android.os.RemoteException;
import android.util.Slog;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.StartUserClient;
public class FaceStartUserClient extends StartUserClient<IFace, ISession> {
@@ -43,7 +44,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java
index 06328e3..88b9235 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceStopUserClient.java
@@ -24,6 +24,7 @@
import android.os.RemoteException;
import android.util.Slog;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.StopUserClient;
public class FaceStopUserClient extends StopUserClient<ISession> {
@@ -36,7 +37,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/BiometricTestSessionImpl.java
index b45578b..e7483b3 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/BiometricTestSessionImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/BiometricTestSessionImpl.java
@@ -32,6 +32,7 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.face.FaceUtils;
import java.util.ArrayList;
@@ -197,7 +198,7 @@
public void cleanupInternalState(int userId) {
Utils.checkPermission(mContext, TEST_BIOMETRIC);
- mFace10.scheduleInternalCleanup(mSensorId, userId, new BaseClientMonitor.Callback() {
+ mFace10.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
try {
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
index e957794..9a52db1 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
@@ -60,6 +60,7 @@
import com.android.server.biometrics.sensors.BaseClientMonitor;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
import com.android.server.biometrics.sensors.BiometricScheduler;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.EnumerateConsumer;
import com.android.server.biometrics.sensors.ErrorConsumer;
@@ -534,7 +535,7 @@
mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), userId,
opPackageName, mSensorId, sSystemClock.millis());
mGeneratedChallengeCache = client;
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
if (client != clientMonitor) {
@@ -562,7 +563,7 @@
final FaceRevokeChallengeClient client = new FaceRevokeChallengeClient(mContext,
mLazyDaemon, token, userId, opPackageName, mSensorId);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
@@ -591,7 +592,7 @@
opPackageName, id, FaceUtils.getLegacyInstance(mSensorId), disabledFeatures,
ENROLL_TIMEOUT_SEC, previewSurface, mSensorId);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
@@ -742,7 +743,7 @@
final int faceId = faces.get(0).getBiometricId();
final FaceGetFeatureClient client = new FaceGetFeatureClient(mContext, mLazyDaemon,
token, listener, userId, opPackageName, mSensorId, feature, faceId);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientFinished(
@NonNull BaseClientMonitor clientMonitor, boolean success) {
@@ -760,7 +761,7 @@
}
private void scheduleInternalCleanup(int userId,
- @Nullable BaseClientMonitor.Callback callback) {
+ @Nullable ClientMonitorCallback callback) {
mHandler.post(() -> {
scheduleUpdateActiveUserWithoutHandler(userId);
@@ -774,7 +775,7 @@
@Override
public void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback) {
+ @Nullable ClientMonitorCallback callback) {
scheduleInternalCleanup(userId, callback);
}
@@ -890,7 +891,7 @@
final FaceUpdateActiveUserClient client = new FaceUpdateActiveUserClient(mContext,
mLazyDaemon, targetUserId, mContext.getOpPackageName(), mSensorId,
hasEnrolled, mAuthenticatorIds);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java
index 80faf3e..1e0e799 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java
@@ -34,7 +34,9 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.LockoutTracker;
import com.android.server.biometrics.sensors.face.UsageStats;
@@ -87,15 +89,15 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
mState = STATE_STARTED;
}
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java
index 5c69d6f..8068e14 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java
@@ -33,7 +33,9 @@
import com.android.internal.R;
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.EnrollClient;
import java.util.ArrayList;
@@ -69,8 +71,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java
index f418104..e29a192 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClient.java
@@ -25,6 +25,7 @@
import android.util.Slog;
import com.android.internal.util.Preconditions;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.GenerateChallengeClient;
@@ -39,7 +40,7 @@
private static final String TAG = "FaceGenerateChallengeClient";
static final int CHALLENGE_TIMEOUT_SEC = 600; // 10 minutes
- private static final Callback EMPTY_CALLBACK = new Callback() {
+ private static final ClientMonitorCallback EMPTY_CALLBACK = new ClientMonitorCallback() {
};
private final long mCreatedAt;
@@ -94,7 +95,7 @@
}
private void sendChallengeResult(@NonNull ClientMonitorCallbackConverter receiver,
- @NonNull Callback ownerCallback) {
+ @NonNull ClientMonitorCallback ownerCallback) {
Preconditions.checkState(mChallengeResult != null, "result not available");
try {
receiver.onChallengeGenerated(getSensorId(), getTargetUserId(), mChallengeResult);
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java
index 7821601..0a9d96d 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceGetFeatureClient.java
@@ -28,6 +28,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.HalClientMonitor;
@@ -66,7 +67,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java
index 9d977d6..ee01c43 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java
@@ -24,6 +24,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.HalClientMonitor;
import java.util.ArrayList;
@@ -57,7 +58,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java
index cc3d8f0..ee28f7b 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceSetFeatureClient.java
@@ -26,6 +26,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.HalClientMonitor;
@@ -71,7 +72,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceUpdateActiveUserClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceUpdateActiveUserClient.java
index 5343d0d..8ee8ce5 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceUpdateActiveUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceUpdateActiveUserClient.java
@@ -25,6 +25,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.HalClientMonitor;
import java.io.File;
@@ -49,7 +50,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintStateCallback.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintStateCallback.java
index be0e6ed..04fd534 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintStateCallback.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintStateCallback.java
@@ -31,6 +31,7 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.EnrollClient;
import com.android.server.biometrics.sensors.EnrollmentModifier;
@@ -39,7 +40,7 @@
/**
* A callback for receiving notifications about changes in fingerprint state.
*/
-public class FingerprintStateCallback implements BaseClientMonitor.Callback {
+public class FingerprintStateCallback implements ClientMonitorCallback {
@NonNull private final CopyOnWriteArrayList<IFingerprintStateListener>
mFingerprintStateListeners = new CopyOnWriteArrayList<>();
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/ServiceProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/ServiceProvider.java
index 535705c..0bdc4eb 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/ServiceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/ServiceProvider.java
@@ -30,7 +30,7 @@
import android.os.IBinder;
import android.util.proto.ProtoOutputStream;
-import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.LockoutTracker;
@@ -121,7 +121,7 @@
@NonNull String opPackageName);
void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback);
+ @Nullable ClientMonitorCallback callback);
boolean isHardwareDetected(int sensorId);
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/BiometricTestSessionImpl.java
index 2b50b96..b29fbb6 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/BiometricTestSessionImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/BiometricTestSessionImpl.java
@@ -32,6 +32,7 @@
import com.android.server.biometrics.HardwareAuthTokenUtils;
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.fingerprint.FingerprintStateCallback;
import com.android.server.biometrics.sensors.fingerprint.FingerprintUtils;
@@ -204,7 +205,7 @@
Utils.checkPermission(mContext, TEST_BIOMETRIC);
Slog.d(TAG, "cleanupInternalState: " + userId);
- mProvider.scheduleInternalCleanup(mSensorId, userId, new BaseClientMonitor.Callback() {
+ mProvider.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
try {
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
index 96f4853..f3d0121 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
@@ -37,7 +37,9 @@
import com.android.server.biometrics.log.Probe;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.LockoutCache;
import com.android.server.biometrics.sensors.LockoutConsumer;
import com.android.server.biometrics.sensors.LockoutTracker;
@@ -86,7 +88,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
if (mSensorProps.isAnyUdfpsType()) {
@@ -99,8 +101,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(mALSProbeCallback, callback);
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(mALSProbeCallback, callback);
}
@Override
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java
index ac3ce89..1f0482d 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintDetectClient.java
@@ -30,6 +30,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.sensors.AcquisitionClient;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.DetectionConsumer;
import com.android.server.biometrics.sensors.SensorOverlays;
@@ -61,7 +62,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java
index e3f26df..169c3eb 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java
@@ -37,7 +37,9 @@
import com.android.server.biometrics.HardwareAuthTokenUtils;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.EnrollClient;
import com.android.server.biometrics.sensors.SensorOverlays;
import com.android.server.biometrics.sensors.fingerprint.FingerprintUtils;
@@ -82,8 +84,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGetAuthenticatorIdClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGetAuthenticatorIdClient.java
index ed2345e..52bd234 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGetAuthenticatorIdClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGetAuthenticatorIdClient.java
@@ -24,6 +24,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.HalClientMonitor;
import java.util.Map;
@@ -48,7 +49,7 @@
// Nothing to do here
}
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
index eb16c76..efc9304 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
@@ -55,7 +55,9 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.InvalidationRequesterClient;
import com.android.server.biometrics.sensors.LockoutResetDispatcher;
import com.android.server.biometrics.sensors.PerformanceTracker;
@@ -248,7 +250,7 @@
}
private void scheduleForSensor(int sensorId, @NonNull BaseClientMonitor client,
- BaseClientMonitor.Callback callback) {
+ ClientMonitorCallback callback) {
if (!mSensors.contains(sensorId)) {
throw new IllegalStateException("Unable to schedule client: " + client
+ " for sensor: " + sensorId);
@@ -361,7 +363,7 @@
opPackageName, FingerprintUtils.getInstance(sensorId), sensorId,
mSensors.get(sensorId).getSensorProperties(),
mUdfpsOverlayController, mSidefpsController, maxTemplatesPerUser, enrollReason);
- scheduleForSensor(sensorId, client, new BaseClientMonitor.Callback() {
+ scheduleForSensor(sensorId, client, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
@@ -484,7 +486,7 @@
@Override
public void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback) {
+ @Nullable ClientMonitorCallback callback) {
mHandler.post(() -> {
final List<Fingerprint> enrolledList = getEnrolledFingerprints(sensorId, userId);
final FingerprintInternalCleanupClient client =
@@ -493,7 +495,7 @@
mContext.getOpPackageName(), sensorId, enrolledList,
FingerprintUtils.getInstance(sensorId),
mSensors.get(sensorId).getAuthenticatorIds());
- scheduleForSensor(sensorId, client, new BaseClientMonitor.CompositeCallback(callback,
+ scheduleForSensor(sensorId, client, new ClientMonitorCompositeCallback(callback,
mFingerprintStateCallback));
});
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
index 878ef46..ee8d170 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java
@@ -27,6 +27,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.HardwareAuthTokenUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ErrorConsumer;
import com.android.server.biometrics.sensors.HalClientMonitor;
import com.android.server.biometrics.sensors.LockoutCache;
@@ -64,7 +65,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStartUserClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStartUserClient.java
index ee81620..9f11df6 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStartUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStartUserClient.java
@@ -27,6 +27,7 @@
import android.os.RemoteException;
import android.util.Slog;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.StartUserClient;
public class FingerprintStartUserClient extends StartUserClient<IFingerprint, ISession> {
@@ -44,7 +45,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java
index 7055d65..9d38145 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintStopUserClient.java
@@ -24,6 +24,7 @@
import android.os.RemoteException;
import android.util.Slog;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.StopUserClient;
public class FingerprintStopUserClient extends StopUserClient<ISession> {
@@ -36,7 +37,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/BiometricTestSessionImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/BiometricTestSessionImpl.java
index 79c6b1b3..033855f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/BiometricTestSessionImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/BiometricTestSessionImpl.java
@@ -31,6 +31,7 @@
import com.android.server.biometrics.Utils;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.fingerprint.FingerprintStateCallback;
import com.android.server.biometrics.sensors.fingerprint.FingerprintUtils;
@@ -201,7 +202,7 @@
public void cleanupInternalState(int userId) {
Utils.checkPermission(mContext, TEST_BIOMETRIC);
- mFingerprint21.scheduleInternalCleanup(mSensorId, userId, new BaseClientMonitor.Callback() {
+ mFingerprint21.scheduleInternalCleanup(mSensorId, userId, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
try {
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
index 6feb5fa..f160dff 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
@@ -62,7 +62,9 @@
import com.android.server.biometrics.sensors.AuthenticationConsumer;
import com.android.server.biometrics.sensors.BaseClientMonitor;
import com.android.server.biometrics.sensors.BiometricScheduler;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.EnumerateConsumer;
import com.android.server.biometrics.sensors.ErrorConsumer;
import com.android.server.biometrics.sensors.HalClientMonitor;
@@ -492,7 +494,7 @@
new FingerprintUpdateActiveUserClient(mContext, mLazyDaemon, targetUserId,
mContext.getOpPackageName(), mSensorProperties.sensorId,
this::getCurrentUser, hasEnrolled, mAuthenticatorIds, force);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
boolean success) {
@@ -577,7 +579,7 @@
FingerprintUtils.getLegacyInstance(mSensorId), ENROLL_TIMEOUT_SEC,
mSensorProperties.sensorId, mUdfpsOverlayController, mSidefpsController,
enrollReason);
- mScheduler.scheduleClientMonitor(client, new BaseClientMonitor.Callback() {
+ mScheduler.scheduleClientMonitor(client, new ClientMonitorCallback() {
@Override
public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
mFingerprintStateCallback.onClientStarted(clientMonitor);
@@ -699,7 +701,7 @@
}
private void scheduleInternalCleanup(int userId,
- @Nullable BaseClientMonitor.Callback callback) {
+ @Nullable ClientMonitorCallback callback) {
mHandler.post(() -> {
scheduleUpdateActiveUserWithoutHandler(userId);
@@ -715,8 +717,8 @@
@Override
public void scheduleInternalCleanup(int sensorId, int userId,
- @Nullable BaseClientMonitor.Callback callback) {
- scheduleInternalCleanup(userId, new BaseClientMonitor.CompositeCallback(callback,
+ @Nullable ClientMonitorCallback callback) {
+ scheduleInternalCleanup(userId, new ClientMonitorCompositeCallback(callback,
mFingerprintStateCallback));
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21UdfpsMock.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21UdfpsMock.java
index 38fe73f..1694bd9 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21UdfpsMock.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21UdfpsMock.java
@@ -414,7 +414,8 @@
}
@Override
- public void onTrustChanged(boolean enabled, int userId, int flags) {
+ public void onTrustChanged(boolean enabled, int userId, int flags,
+ List<String> trustGrantedMessages) {
mUserHasTrust.put(userId, enabled);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java
index d9b290f..87d47c1 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java
@@ -36,7 +36,9 @@
import com.android.server.biometrics.log.Probe;
import com.android.server.biometrics.sensors.AuthenticationClient;
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.LockoutTracker;
import com.android.server.biometrics.sensors.SensorOverlays;
import com.android.server.biometrics.sensors.fingerprint.Udfps;
@@ -86,7 +88,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
if (mSensorProps.isAnyUdfpsType()) {
@@ -99,8 +101,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(mALSProbeCallback, callback);
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(mALSProbeCallback, callback);
}
@Override
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintDetectClient.java
index f1dec66..9137212 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintDetectClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintDetectClient.java
@@ -32,6 +32,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.sensors.AcquisitionClient;
import com.android.server.biometrics.sensors.AuthenticationConsumer;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import com.android.server.biometrics.sensors.PerformanceTracker;
import com.android.server.biometrics.sensors.SensorOverlays;
@@ -82,7 +83,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java
index dd92e3e..82b046d 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java
@@ -33,7 +33,9 @@
import com.android.server.biometrics.sensors.BiometricNotificationUtils;
import com.android.server.biometrics.sensors.BiometricUtils;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
+import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
import com.android.server.biometrics.sensors.EnrollClient;
import com.android.server.biometrics.sensors.SensorOverlays;
import com.android.server.biometrics.sensors.fingerprint.Udfps;
@@ -75,8 +77,8 @@
@NonNull
@Override
- protected Callback wrapCallbackForStart(@NonNull Callback callback) {
- return new CompositeCallback(
+ protected ClientMonitorCallback wrapCallbackForStart(@NonNull ClientMonitorCallback callback) {
+ return new ClientMonitorCompositeCallback(
getLogger().createALSCallback(true /* startWithClient */), callback);
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java
index a39f4f8..ed28e3f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java
@@ -22,6 +22,7 @@
import com.android.server.biometrics.BiometricsProto;
import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
/**
* Clears lockout, which is handled in the framework (and not the HAL) for the
@@ -40,7 +41,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
mLockoutTracker.resetFailedAttemptsForUser(true /* clearAttemptCounter */,
getTargetUserId());
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
index a2c1892..d317984 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
@@ -27,6 +27,7 @@
import android.util.Slog;
import com.android.server.biometrics.BiometricsProto;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.HalClientMonitor;
import java.io.File;
@@ -62,7 +63,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
if (mCurrentUserId.get() == getTargetUserId() && !mForceUpdateAuthenticatorId) {
diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java
index 33a26ba..1e00ea9 100644
--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
+++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
@@ -36,6 +36,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ParceledListSlice;
import android.content.res.Configuration;
+import android.graphics.Rect;
import android.hardware.CameraSessionStats;
import android.hardware.CameraStreamStats;
import android.hardware.ICameraService;
@@ -305,6 +306,9 @@
@Override
public void onFixedRotationFinished(int displayId) { }
+
+ @Override
+ public void onKeepClearAreasChanged(int displayId, List<Rect> keepClearArea) { }
}
diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 582dd7c..5b76695 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -81,6 +81,7 @@
import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.UiThread;
+import com.android.server.companion.virtual.VirtualDeviceManagerInternal;
import com.android.server.contentcapture.ContentCaptureManagerInternal;
import com.android.server.uri.UriGrantsManagerInternal;
import com.android.server.wm.WindowManagerInternal;
@@ -127,6 +128,7 @@
private final IUriGrantsManager mUgm;
private final UriGrantsManagerInternal mUgmInternal;
private final WindowManagerInternal mWm;
+ private final VirtualDeviceManagerInternal mVdm;
private final IUserManager mUm;
private final PackageManager mPm;
private final AppOpsManager mAppOps;
@@ -158,6 +160,8 @@
mUgm = UriGrantsManager.getService();
mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class);
mWm = LocalServices.getService(WindowManagerInternal.class);
+ // Can be null; not all products have CDM + VirtualDeviceManager
+ mVdm = LocalServices.getService(VirtualDeviceManagerInternal.class);
mPm = getContext().getPackageManager();
mUm = (IUserManager) ServiceManager.getService(Context.USER_SERVICE);
mAppOps = (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE);
@@ -973,6 +977,13 @@
// First, verify package ownership to ensure use below is safe.
mAppOps.checkPackage(uid, callingPackage);
+ // Nothing in a virtual session is permitted to touch clipboard contents
+ if (mVdm != null && mVdm.isAppRunningOnAnyVirtualDevice(uid)) {
+ Slog.w(TAG, "Clipboard access denied to " + uid + "/" + callingPackage
+ + " within a virtual device session");
+ return false;
+ }
+
// Shell can access the clipboard for testing purposes.
if (mPm.checkPermission(android.Manifest.permission.READ_CLIPBOARD_IN_BACKGROUND,
callingPackage) == PackageManager.PERMISSION_GRANTED) {
diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
index fd4cd8e..35e3db78 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java
@@ -358,6 +358,12 @@
public float brightnessMaximum;
public float brightnessDefault;
+ /**
+ * Install orientation of display panel relative to its natural orientation.
+ */
+ @Surface.Rotation
+ public int installOrientation = Surface.ROTATION_0;
+
public void setAssumedDensityForExternalDisplay(int width, int height) {
densityDpi = Math.min(width, height) * DisplayMetrics.DENSITY_XHIGH / 1080;
// Technically, these values should be smaller than the apparent density
@@ -417,7 +423,8 @@
|| !BrightnessSynchronizer.floatEquals(brightnessMaximum, other.brightnessMaximum)
|| !BrightnessSynchronizer.floatEquals(brightnessDefault,
other.brightnessDefault)
- || !Objects.equals(roundedCorners, other.roundedCorners)) {
+ || !Objects.equals(roundedCorners, other.roundedCorners)
+ || installOrientation != other.installOrientation) {
diff |= DIFF_OTHER;
}
return diff;
@@ -461,6 +468,7 @@
brightnessMaximum = other.brightnessMaximum;
brightnessDefault = other.brightnessDefault;
roundedCorners = other.roundedCorners;
+ installOrientation = other.installOrientation;
}
// For debugging purposes
@@ -508,6 +516,7 @@
sb.append(", roundedCorners ").append(roundedCorners);
}
sb.append(flagsToString(flags));
+ sb.append(", installOrientation ").append(installOrientation);
sb.append("}");
return sb.toString();
}
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 34f915e..c6d3829 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -50,8 +50,6 @@
import android.provider.Settings;
import android.util.Log;
import android.util.MathUtils;
-import android.util.MutableFloat;
-import android.util.MutableInt;
import android.util.Slog;
import android.util.TimeUtils;
import android.view.Display;
@@ -1382,7 +1380,6 @@
// Animate the screen brightness when the screen is on or dozing.
// Skip the animation when the screen is off or suspended or transition to/from VR.
- boolean brightnessAdjusted = false;
if (!mPendingScreenOff) {
if (mSkipScreenOnBrightnessRamp) {
if (state == Display.STATE_ON) {
@@ -1475,19 +1472,15 @@
// slider event so notify as if the system changed the brightness.
userInitiatedChange = false;
}
- notifyBrightnessTrackerChanged(brightnessState, userInitiatedChange,
+ notifyBrightnessChanged(brightnessState, userInitiatedChange,
hadUserBrightnessPoint);
}
// We save the brightness info *after* the brightness setting has been changed and
// adjustments made so that the brightness info reflects the latest value.
- brightnessAdjusted = saveBrightnessInfo(getScreenBrightnessSetting(), animateValue);
+ saveBrightnessInfo(getScreenBrightnessSetting(), animateValue);
} else {
- brightnessAdjusted = saveBrightnessInfo(getScreenBrightnessSetting());
- }
-
- if (brightnessAdjusted) {
- postBrightnessChangeRunnable();
+ saveBrightnessInfo(getScreenBrightnessSetting());
}
// Log any changes to what is currently driving the brightness setting.
@@ -1603,50 +1596,31 @@
public BrightnessInfo getBrightnessInfo() {
synchronized (mCachedBrightnessInfo) {
return new BrightnessInfo(
- mCachedBrightnessInfo.brightness.value,
- mCachedBrightnessInfo.adjustedBrightness.value,
- mCachedBrightnessInfo.brightnessMin.value,
- mCachedBrightnessInfo.brightnessMax.value,
- mCachedBrightnessInfo.hbmMode.value,
- mCachedBrightnessInfo.hbmTransitionPoint.value);
+ mCachedBrightnessInfo.brightness,
+ mCachedBrightnessInfo.adjustedBrightness,
+ mCachedBrightnessInfo.brightnessMin,
+ mCachedBrightnessInfo.brightnessMax,
+ mCachedBrightnessInfo.hbmMode,
+ mCachedBrightnessInfo.highBrightnessTransitionPoint);
}
}
- private boolean saveBrightnessInfo(float brightness) {
- return saveBrightnessInfo(brightness, brightness);
+ private void saveBrightnessInfo(float brightness) {
+ saveBrightnessInfo(brightness, brightness);
}
- private boolean saveBrightnessInfo(float brightness, float adjustedBrightness) {
+ private void saveBrightnessInfo(float brightness, float adjustedBrightness) {
synchronized (mCachedBrightnessInfo) {
- boolean changed = false;
-
- changed |=
- mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.brightness,
- brightness);
- changed |=
- mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.adjustedBrightness,
- adjustedBrightness);
- changed |=
- mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.brightnessMin,
- mHbmController.getCurrentBrightnessMin());
- changed |=
- mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.brightnessMax,
- mHbmController.getCurrentBrightnessMax());
- changed |=
- mCachedBrightnessInfo.checkAndSetInt(mCachedBrightnessInfo.hbmMode,
- mHbmController.getHighBrightnessMode());
- changed |=
- mCachedBrightnessInfo.checkAndSetFloat(mCachedBrightnessInfo.hbmTransitionPoint,
- mHbmController.getTransitionPoint());
-
- return changed;
+ mCachedBrightnessInfo.brightness = brightness;
+ mCachedBrightnessInfo.adjustedBrightness = adjustedBrightness;
+ mCachedBrightnessInfo.brightnessMin = mHbmController.getCurrentBrightnessMin();
+ mCachedBrightnessInfo.brightnessMax = mHbmController.getCurrentBrightnessMax();
+ mCachedBrightnessInfo.hbmMode = mHbmController.getHighBrightnessMode();
+ mCachedBrightnessInfo.highBrightnessTransitionPoint =
+ mHbmController.getTransitionPoint();
}
}
- void postBrightnessChangeRunnable() {
- mHandler.post(mOnBrightnessChangeRunnable);
- }
-
private HighBrightnessModeController createHbmControllerLocked() {
final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked();
final DisplayDeviceConfig ddConfig = device.getDisplayDeviceConfig();
@@ -1661,7 +1635,7 @@
displayUniqueId, PowerManager.BRIGHTNESS_MIN, PowerManager.BRIGHTNESS_MAX, hbmData,
() -> {
sendUpdatePowerStateLocked();
- postBrightnessChangeRunnable();
+ mHandler.post(mOnBrightnessChangeRunnable);
// TODO(b/192258832): Switch the HBMChangeCallback to a listener pattern.
if (mAutomaticBrightnessController != null) {
mAutomaticBrightnessController.update();
@@ -2163,7 +2137,7 @@
private void setCurrentScreenBrightness(float brightnessValue) {
if (brightnessValue != mCurrentScreenBrightnessSetting) {
mCurrentScreenBrightnessSetting = brightnessValue;
- postBrightnessChangeRunnable();
+ mHandler.post(mOnBrightnessChangeRunnable);
}
}
@@ -2215,7 +2189,7 @@
return true;
}
- private void notifyBrightnessTrackerChanged(float brightness, boolean userInitiated,
+ private void notifyBrightnessChanged(float brightness, boolean userInitiated,
boolean hadUserDataPoint) {
final float brightnessInNits = convertToNits(brightness);
if (mPowerRequest.useAutoBrightness && brightnessInNits >= 0.0f
@@ -2325,17 +2299,16 @@
pw.println(" mColorFadeFadesConfig=" + mColorFadeFadesConfig);
pw.println(" mColorFadeEnabled=" + mColorFadeEnabled);
synchronized (mCachedBrightnessInfo) {
- pw.println(" mCachedBrightnessInfo.brightness=" +
- mCachedBrightnessInfo.brightness.value);
+ pw.println(" mCachedBrightnessInfo.brightness=" + mCachedBrightnessInfo.brightness);
pw.println(" mCachedBrightnessInfo.adjustedBrightness=" +
- mCachedBrightnessInfo.adjustedBrightness.value);
+ mCachedBrightnessInfo.adjustedBrightness);
pw.println(" mCachedBrightnessInfo.brightnessMin=" +
- mCachedBrightnessInfo.brightnessMin.value);
+ mCachedBrightnessInfo.brightnessMin);
pw.println(" mCachedBrightnessInfo.brightnessMax=" +
- mCachedBrightnessInfo.brightnessMax.value);
- pw.println(" mCachedBrightnessInfo.hbmMode=" + mCachedBrightnessInfo.hbmMode.value);
- pw.println(" mCachedBrightnessInfo.hbmTransitionPoint=" +
- mCachedBrightnessInfo.hbmTransitionPoint.value);
+ mCachedBrightnessInfo.brightnessMax);
+ pw.println(" mCachedBrightnessInfo.hbmMode=" + mCachedBrightnessInfo.hbmMode);
+ pw.println(" mCachedBrightnessInfo.highBrightnessTransitionPoint=" +
+ mCachedBrightnessInfo.highBrightnessTransitionPoint);
}
pw.println(" mDisplayBlanksAfterDozeConfig=" + mDisplayBlanksAfterDozeConfig);
pw.println(" mBrightnessBucketsInDozeConfig=" + mBrightnessBucketsInDozeConfig);
@@ -2493,10 +2466,7 @@
private void reportStats(float brightness) {
float hbmTransitionPoint = PowerManager.BRIGHTNESS_MAX;
synchronized(mCachedBrightnessInfo) {
- if (mCachedBrightnessInfo.hbmTransitionPoint == null) {
- return;
- }
- hbmTransitionPoint = mCachedBrightnessInfo.hbmTransitionPoint.value;
+ hbmTransitionPoint = mCachedBrightnessInfo.highBrightnessTransitionPoint;
}
final boolean aboveTransition = brightness > hbmTransitionPoint;
@@ -2793,31 +2763,11 @@
}
static class CachedBrightnessInfo {
- public MutableFloat brightness = new MutableFloat(PowerManager.BRIGHTNESS_INVALID_FLOAT);
- public MutableFloat adjustedBrightness =
- new MutableFloat(PowerManager.BRIGHTNESS_INVALID_FLOAT);
- public MutableFloat brightnessMin =
- new MutableFloat(PowerManager.BRIGHTNESS_INVALID_FLOAT);
- public MutableFloat brightnessMax =
- new MutableFloat(PowerManager.BRIGHTNESS_INVALID_FLOAT);
- public MutableInt hbmMode = new MutableInt(BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF);
- public MutableFloat hbmTransitionPoint =
- new MutableFloat(HighBrightnessModeController.HBM_TRANSITION_POINT_INVALID);
-
- public boolean checkAndSetFloat(MutableFloat mf, float f) {
- if (mf.value != f) {
- mf.value = f;
- return true;
- }
- return false;
- }
-
- public boolean checkAndSetInt(MutableInt mi, int i) {
- if (mi.value != i) {
- mi.value = i;
- return true;
- }
- return false;
- }
+ public float brightness;
+ public float adjustedBrightness;
+ public float brightnessMin;
+ public float brightnessMax;
+ public int hbmMode;
+ public float highBrightnessTransitionPoint;
}
}
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 84de822..3a9ef0a 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -641,6 +641,7 @@
mInfo.roundedCorners = RoundedCorners.fromResources(
res, mInfo.uniqueId, mInfo.width, mInfo.height);
+ mInfo.installOrientation = mStaticDisplayInfo.installOrientation;
if (mStaticDisplayInfo.isInternal) {
mInfo.type = Display.TYPE_INTERNAL;
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index 4d1367a3..e3ecf49 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -429,6 +429,7 @@
mBaseDisplayInfo.brightnessMaximum = deviceInfo.brightnessMaximum;
mBaseDisplayInfo.brightnessDefault = deviceInfo.brightnessDefault;
mBaseDisplayInfo.roundedCorners = deviceInfo.roundedCorners;
+ mBaseDisplayInfo.installOrientation = deviceInfo.installOrientation;
mPrimaryDisplayDeviceInfo = deviceInfo;
mInfo.set(null);
}
diff --git a/services/core/java/com/android/server/display/LogicalDisplayMapper.java b/services/core/java/com/android/server/display/LogicalDisplayMapper.java
index 7719dfe..93c73be 100644
--- a/services/core/java/com/android/server/display/LogicalDisplayMapper.java
+++ b/services/core/java/com/android/server/display/LogicalDisplayMapper.java
@@ -397,12 +397,16 @@
// We already told the displays to turn off, now we need to wake the device as
// we transition to this new state. We do it here so that the waking happens
// between the transition from one layout to another.
- mPowerManager.wakeUp(SystemClock.uptimeMillis(),
- PowerManager.WAKE_REASON_UNFOLD_DEVICE, "server.display:unfold");
+ mHandler.post(() -> {
+ mPowerManager.wakeUp(SystemClock.uptimeMillis(),
+ PowerManager.WAKE_REASON_UNFOLD_DEVICE, "server.display:unfold");
+ });
} else if (sleepDevice) {
// Send the device to sleep when required.
- mPowerManager.goToSleep(SystemClock.uptimeMillis(),
- PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD, 0);
+ mHandler.post(() -> {
+ mPowerManager.goToSleep(SystemClock.uptimeMillis(),
+ PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD, 0);
+ });
}
}
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 261aa32..4de39bc 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -38,6 +38,7 @@
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.database.ContentObserver;
+import android.graphics.PointF;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayViewport;
@@ -269,6 +270,10 @@
private final Map<String, Integer> mRuntimeAssociations = new ArrayMap<String, Integer>();
@GuardedBy("mAssociationLock")
private final Map<String, String> mUniqueIdAssociations = new ArrayMap<>();
+ private final Object mPointerDisplayIdLock = new Object();
+ // Forces the MouseCursorController to target a specific display id.
+ @GuardedBy("mPointerDisplayIdLock")
+ private int mOverriddenPointerDisplayId = Display.INVALID_DISPLAY;
private static native long nativeInit(InputManagerService service,
Context context, MessageQueue messageQueue);
@@ -341,6 +346,9 @@
private static native boolean nativeCanDispatchToDisplay(long ptr, int deviceId, int displayId);
private static native void nativeNotifyPortAssociationsChanged(long ptr);
private static native void nativeChangeUniqueIdAssociation(long ptr);
+ private static native void nativeNotifyPointerDisplayIdChanged(long ptr);
+ private static native void nativeSetDisplayEligibilityForPointerCapture(long ptr, int displayId,
+ boolean enabled);
private static native void nativeSetMotionClassifierEnabled(long ptr, boolean enabled);
private static native InputSensorInfo[] nativeGetSensorList(long ptr, int deviceId);
private static native boolean nativeFlushSensor(long ptr, int deviceId, int sensorType);
@@ -1902,6 +1910,18 @@
return result;
}
+ private void setVirtualMousePointerDisplayId(int displayId) {
+ synchronized (mPointerDisplayIdLock) {
+ mOverriddenPointerDisplayId = displayId;
+ }
+ // TODO(b/215597605): trigger MousePositionTracker update
+ nativeNotifyPointerDisplayIdChanged(mPtr);
+ }
+
+ private void setDisplayEligibilityForPointerCapture(int displayId, boolean isEligible) {
+ nativeSetDisplayEligibilityForPointerCapture(mPtr, displayId, isEligible);
+ }
+
private static class VibrationInfo {
private final long[] mPattern;
private final int[] mAmplitudes;
@@ -2575,6 +2595,7 @@
synchronized (mInputFilterLock) { }
synchronized (mAssociationsLock) { /* Test if blocked by associations lock. */}
synchronized (mLidSwitchLock) { /* Test if blocked by lid switch lock. */ }
+ synchronized (mPointerDisplayIdLock) { /* Test if blocked by pointer display id lock */ }
nativeMonitor(mPtr);
}
@@ -2965,6 +2986,12 @@
// Native callback.
private int getPointerDisplayId() {
+ synchronized (mPointerDisplayIdLock) {
+ // Prefer the override to all other displays.
+ if (mOverriddenPointerDisplayId != Display.INVALID_DISPLAY) {
+ return mOverriddenPointerDisplayId;
+ }
+ }
return mWindowManagerCallbacks.getPointerDisplayId();
}
@@ -3109,6 +3136,9 @@
int getPointerDisplayId();
+ /** Gets the x and y coordinates of the cursor's current position. */
+ PointF getCursorPosition();
+
/**
* Notifies window manager that a {@link android.view.MotionEvent#ACTION_DOWN} pointer event
* occurred on a window that did not have focus.
@@ -3427,6 +3457,21 @@
}
@Override
+ public void setVirtualMousePointerDisplayId(int pointerDisplayId) {
+ InputManagerService.this.setVirtualMousePointerDisplayId(pointerDisplayId);
+ }
+
+ @Override
+ public PointF getCursorPosition() {
+ return mWindowManagerCallbacks.getCursorPosition();
+ }
+
+ @Override
+ public void setDisplayEligibilityForPointerCapture(int displayId, boolean isEligible) {
+ InputManagerService.this.setDisplayEligibilityForPointerCapture(displayId, isEligible);
+ }
+
+ @Override
public void registerLidSwitchCallback(LidSwitchCallback callbacks) {
registerLidSwitchCallbackInternal(callbacks);
}
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
index db13deb..784d058 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
@@ -309,8 +309,8 @@
if (DEBUG) Slog.v(TAG, "Initiating attach with token: " + mCurToken);
final InputMethodInfo info = mMethodMap.get(mSelectedMethodId);
mSupportsStylusHw = info.supportsStylusHandwriting();
- mService.executeOrSendInitializeIme(mCurMethod, mCurToken,
- info.getConfigChanges(), mSupportsStylusHw);
+ mService.initializeImeLocked(mCurMethod, mCurToken, info.getConfigChanges(),
+ mSupportsStylusHw);
mService.scheduleNotifyImeUidToAudioService(mCurMethodUid);
mService.reRequestCurrentClientSessionLocked();
}
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index ec49b47..2a24489 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -97,7 +97,6 @@
import android.os.Debug;
import android.os.Handler;
import android.os.IBinder;
-import android.os.IInterface;
import android.os.LocaleList;
import android.os.Message;
import android.os.Parcel;
@@ -220,22 +219,11 @@
}
private static final int MSG_SHOW_IM_SUBTYPE_PICKER = 1;
- private static final int MSG_SHOW_IM_SUBTYPE_ENABLER = 2;
- private static final int MSG_SHOW_IM_CONFIG = 3;
- private static final int MSG_UNBIND_INPUT = 1000;
- private static final int MSG_BIND_INPUT = 1010;
- private static final int MSG_SHOW_SOFT_INPUT = 1020;
- private static final int MSG_HIDE_SOFT_INPUT = 1030;
private static final int MSG_HIDE_CURRENT_INPUT_METHOD = 1035;
- private static final int MSG_INITIALIZE_IME = 1040;
- private static final int MSG_CREATE_SESSION = 1050;
private static final int MSG_REMOVE_IME_SURFACE = 1060;
private static final int MSG_REMOVE_IME_SURFACE_FROM_WINDOW = 1061;
private static final int MSG_UPDATE_IME_WINDOW_STATUS = 1070;
- private static final int MSG_START_HANDWRITING = 1100;
-
- private static final int MSG_START_INPUT = 2000;
private static final int MSG_UNBIND_CLIENT = 3000;
private static final int MSG_BIND_CLIENT = 3010;
@@ -248,8 +236,6 @@
private static final int MSG_SYSTEM_UNLOCK_USER = 5000;
private static final int MSG_DISPATCH_ON_INPUT_METHOD_LIST_UPDATED = 5010;
- private static final int MSG_INLINE_SUGGESTIONS_REQUEST = 6000;
-
private static final int MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE = 7000;
private static final int NOT_A_SUBTYPE_ID = InputMethodUtils.NOT_A_SUBTYPE_ID;
@@ -654,9 +640,9 @@
boolean mBoundToMethod;
/**
- * Currently enabled session. Only touched by service thread, not
- * protected by a lock.
+ * Currently enabled session.
*/
+ @GuardedBy("ImfLock.class")
SessionState mEnabledSession;
/**
@@ -705,11 +691,11 @@
new CopyOnWriteArrayList<>();
/**
- * Internal state snapshot when {@link #MSG_START_INPUT} message is about to be posted to the
- * internal message queue. Any subsequent state change inside {@link InputMethodManagerService}
- * will not affect those tasks that are already posted.
+ * Internal state snapshot when
+ * {@link IInputMethod#startInput(IBinder, IInputContext, EditorInfo, boolean)} is about to be
+ * called.
*
- * <p>Posting {@link #MSG_START_INPUT} message basically means that
+ * <p>Calling that IPC endpoint basically means that
* {@link InputMethodService#doStartInput(InputConnection, EditorInfo, boolean)} will be called
* back in the current IME process shortly, which will also affect what the current IME starts
* receiving from {@link InputMethodService#getCurrentInputConnection()}. In other words, this
@@ -785,7 +771,7 @@
final int mFocusedWindowSoftInputMode;
@SoftInputShowHideReason
final int mReason;
- // The timing of handling MSG_SHOW_SOFT_INPUT or MSG_HIDE_SOFT_INPUT.
+ // The timing of handling showCurrentInputLocked() or hideCurrentInputLocked().
final long mTimestamp;
final long mWallTime;
final boolean mInFullscreenMode;
@@ -1575,7 +1561,7 @@
mHandler.removeCallbacks(mUserSwitchHandlerTask);
}
// Hide soft input before user switch task since switch task may block main handler a while
- // and delayed the MSG_HIDE_SOFT_INPUT.
+ // and delayed the hideCurrentInputLocked().
hideCurrentInputLocked(
mCurFocusedWindow, 0, null, SoftInputShowHideReason.HIDE_SWITCH_USER);
final UserSwitchHandlerTask task = new UserSwitchHandlerTask(this, userId,
@@ -1782,8 +1768,8 @@
com.android.internal.R.bool.show_ongoing_ime_switcher);
if (mShowOngoingImeSwitcherForPhones) {
mWindowManagerInternal.setOnHardKeyboardStatusChangeListener(available -> {
- mHandler.obtainMessage(MSG_HARD_KEYBOARD_SWITCH_CHANGED, available ? 1 : 0)
- .sendToTarget();
+ mHandler.obtainMessage(MSG_HARD_KEYBOARD_SWITCH_CHANGED,
+ available ? 1 : 0, 0 /* unused */).sendToTarget();
});
}
@@ -1968,12 +1954,15 @@
IInputMethod curMethod = getCurMethodLocked();
if (userId == mSettings.getCurrentUserId() && imi != null
&& imi.isInlineSuggestionsEnabled() && curMethod != null) {
- executeOrSendMessage(curMethod,
- mCaller.obtainMessageOOO(MSG_INLINE_SUGGESTIONS_REQUEST, curMethod,
- requestInfo, new InlineSuggestionsRequestCallbackDecorator(callback,
- imi.getPackageName(), mCurTokenDisplayId,
- getCurTokenLocked(),
- this)));
+ final IInlineSuggestionsRequestCallback callbackImpl =
+ new InlineSuggestionsRequestCallbackDecorator(callback,
+ imi.getPackageName(), mCurTokenDisplayId, getCurTokenLocked(),
+ this);
+ try {
+ curMethod.onCreateInlineSuggestionsRequest(requestInfo, callbackImpl);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "RemoteException calling onCreateInlineSuggestionsRequest()", e);
+ }
} else {
callback.onInlineSuggestionsUnsupported();
}
@@ -2203,8 +2192,11 @@
mBoundToMethod = false;
IInputMethod curMethod = getCurMethodLocked();
if (curMethod != null) {
- executeOrSendMessage(curMethod, mCaller.obtainMessageO(
- MSG_UNBIND_INPUT, curMethod));
+ try {
+ curMethod.unbindInput();
+ } catch (RemoteException e) {
+ // There is nothing interesting about the method dying.
+ }
}
}
mCurClient = null;
@@ -2216,8 +2208,14 @@
}
}
- private void executeOrSendMessage(IInterface target, Message msg) {
+ private void executeOrSendMessage(IInputMethodClient target, Message msg) {
if (target.asBinder() instanceof Binder) {
+ // This is supposed to be emulating the one-way semantics when the IME client is
+ // system_server itself, which has not been explicitly prohibited so far while we have
+ // never ever officially supported such a use case...
+ // We probably should create a simple wrapper of IInputMethodClient as the first step
+ // to get rid of executeOrSendMessage() then should prohibit system_server to be the
+ // IME client for long term.
mCaller.sendMessage(msg);
} else {
handleMessage(msg);
@@ -2234,8 +2232,11 @@
mBoundToMethod = false;
IInputMethod curMethod = getCurMethodLocked();
if (curMethod != null) {
- executeOrSendMessage(curMethod, mCaller.obtainMessageO(
- MSG_UNBIND_INPUT, curMethod));
+ try {
+ curMethod.unbindInput();
+ } catch (RemoteException e) {
+ // There is nothing interesting about the method dying.
+ }
}
}
@@ -2285,15 +2286,18 @@
InputBindResult attachNewInputLocked(@StartInputReason int startInputReason, boolean initial) {
if (!mBoundToMethod) {
IInputMethod curMethod = getCurMethodLocked();
- executeOrSendMessage(curMethod, mCaller.obtainMessageOO(
- MSG_BIND_INPUT, curMethod, mCurClient.binding));
+ try {
+ curMethod.bindInput(mCurClient.binding);
+ } catch (RemoteException e) {
+ }
mBoundToMethod = true;
}
+ final boolean restarting = !initial;
final Binder startInputToken = new Binder();
final StartInputInfo info = new StartInputInfo(mSettings.getCurrentUserId(),
getCurTokenLocked(),
- mCurTokenDisplayId, getCurIdLocked(), startInputReason, !initial,
+ mCurTokenDisplayId, getCurIdLocked(), startInputReason, restarting,
UserHandle.getUserId(mCurClient.uid), mCurClient.selfReportedDisplayId,
mCurFocusedWindow, mCurAttribute, mCurFocusedWindowSoftInputMode,
getSequenceNumberLocked());
@@ -2312,9 +2316,12 @@
}
final SessionState session = mCurClient.curSession;
- executeOrSendMessage(session.method, mCaller.obtainMessageIIOOOO(
- MSG_START_INPUT, 0 /* unused */, initial ? 0 : 1 /* restarting */,
- startInputToken, session, mCurInputContext, mCurAttribute));
+ try {
+ setEnabledSessionLocked(session);
+ session.method.startInput(startInputToken, mCurInputContext, mCurAttribute, restarting);
+ } catch (RemoteException e) {
+ }
+
if (mShowRequested) {
if (DEBUG) Slog.v(TAG, "Attach new input asks to show input");
showCurrentInputLocked(mCurFocusedWindow, getAppShowFlagsLocked(), null,
@@ -2330,11 +2337,20 @@
curId, getSequenceNumberLocked(), suppressesSpellChecker);
}
+ /**
+ * Called by {@link #startInputOrWindowGainedFocusInternalLocked} to bind/unbind/attach the
+ * selected InputMethod to the given focused IME client.
+ *
+ * Note that this should be called after validating if the IME client has IME focus.
+ *
+ * @see WindowManagerInternal#hasInputMethodClientFocus(IBinder, int, int, int)
+ */
@GuardedBy("ImfLock.class")
@NonNull
- InputBindResult startInputUncheckedLocked(@NonNull ClientState cs, IInputContext inputContext,
- @NonNull EditorInfo attribute, @StartInputFlags int startInputFlags,
- @StartInputReason int startInputReason, int unverifiedTargetSdkVersion) {
+ private InputBindResult startInputUncheckedLocked(@NonNull ClientState cs,
+ IInputContext inputContext, @NonNull EditorInfo attribute,
+ @StartInputFlags int startInputFlags, @StartInputReason int startInputReason,
+ int unverifiedTargetSdkVersion) {
// If no method is currently selected, do nothing.
String selectedMethodId = getSelectedMethodIdLocked();
if (selectedMethodId == null) {
@@ -2356,10 +2372,6 @@
return InputBindResult.INVALID_PACKAGE_NAME;
}
- if (!mWindowManagerInternal.isUidAllowedOnDisplay(cs.selfReportedDisplayId, cs.uid)) {
- // Wait, the client no longer has access to the display.
- return InputBindResult.INVALID_DISPLAY_ID;
- }
// Compute the final shown display ID with validated cs.selfReportedDisplayId for this
// session & other conditions.
mDisplayIdToShowIme = computeImeDisplayIdForTarget(cs.selfReportedDisplayId,
@@ -2501,11 +2513,19 @@
}
}
- @AnyThread
- void executeOrSendInitializeIme(@NonNull IInputMethod inputMethod, @NonNull IBinder token,
+ @GuardedBy("ImfLock.class")
+ void initializeImeLocked(@NonNull IInputMethod inputMethod, @NonNull IBinder token,
@android.content.pm.ActivityInfo.Config int configChanges, boolean supportStylusHw) {
- executeOrSendMessage(inputMethod, mCaller.obtainMessageIOOO(MSG_INITIALIZE_IME,
- configChanges, inputMethod, token, supportStylusHw));
+ if (DEBUG) {
+ Slog.v(TAG, "Sending attach of token: " + token + " for display: "
+ + mCurTokenDisplayId);
+ }
+ try {
+ inputMethod.initializeInternal(token,
+ new InputMethodPrivilegedOperationsImpl(this, token), configChanges,
+ supportStylusHw);
+ } catch (RemoteException e) {
+ }
}
@AnyThread
@@ -2579,22 +2599,39 @@
void requestClientSessionLocked(ClientState cs) {
if (!cs.sessionRequested) {
if (DEBUG) Slog.v(TAG, "Creating new session for client " + cs);
- InputChannel[] channels = InputChannel.openInputChannelPair(cs.toString());
+ final InputChannel serverChannel;
+ final InputChannel clientChannel;
+ {
+ final InputChannel[] channels = InputChannel.openInputChannelPair(cs.toString());
+ serverChannel = channels[0];
+ clientChannel = channels[1];
+ }
+
cs.sessionRequested = true;
- IInputMethod curMethod = getCurMethodLocked();
- executeOrSendMessage(curMethod, mCaller.obtainMessageOOO(
- MSG_CREATE_SESSION, curMethod, channels[1],
- new IInputSessionCallback.Stub() {
- @Override
- public void sessionCreated(IInputMethodSession session) {
- final long ident = Binder.clearCallingIdentity();
- try {
- onSessionCreated(curMethod, session, channels[0]);
- } finally {
- Binder.restoreCallingIdentity(ident);
- }
- }
- }));
+
+ final IInputMethod curMethod = getCurMethodLocked();
+ final IInputSessionCallback.Stub callback = new IInputSessionCallback.Stub() {
+ @Override
+ public void sessionCreated(IInputMethodSession session) {
+ final long ident = Binder.clearCallingIdentity();
+ try {
+ onSessionCreated(curMethod, session, serverChannel);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+ };
+
+ try {
+ curMethod.createSession(clientChannel, callback);
+ } catch (RemoteException e) {
+ } finally {
+ // Dispose the channel because the remote proxy will get its own copy when
+ // unparceled.
+ if (clientChannel != null) {
+ clientChannel.dispose();
+ }
+ }
}
}
@@ -3059,9 +3096,13 @@
return;
}
if (DEBUG) Slog.v(TAG, "Client requesting Stylus Handwriting to be started");
- if (getCurMethodLocked() != null) {
- executeOrSendMessage(getCurMethodLocked(), mCaller.obtainMessageIO(
- MSG_START_HANDWRITING, ++mHwRequestId, getCurMethodLocked()));
+ final IInputMethod curMethod = getCurMethodLocked();
+ if (curMethod != null) {
+ try {
+ curMethod.canStartStylusHandwriting(++mHwRequestId);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "RemoteException calling canStartStylusHandwriting(): ", e);
+ }
}
} finally {
Binder.restoreCallingIdentity(ident);
@@ -3112,18 +3153,25 @@
}
mBindingController.setCurrentMethodVisible();
- if (getCurMethodLocked() != null) {
+ final IInputMethod curMethod = getCurMethodLocked();
+ if (curMethod != null) {
// create a placeholder token for IMS so that IMS cannot inject windows into client app.
Binder showInputToken = new Binder();
mShowRequestWindowMap.put(showInputToken, windowToken);
- IInputMethod curMethod = getCurMethodLocked();
- executeOrSendMessage(curMethod, mCaller.obtainMessageIIOOO(MSG_SHOW_SOFT_INPUT,
- getImeShowFlagsLocked(), reason, curMethod, resultReceiver,
- showInputToken));
+ final int showFlags = getImeShowFlagsLocked();
+ try {
+ if (DEBUG) {
+ Slog.v(TAG, "Calling " + curMethod + ".showSoftInput(" + showInputToken
+ + ", " + showFlags + ", " + resultReceiver + ") for reason: "
+ + InputMethodDebug.softInputDisplayReasonToString(reason));
+ }
+ curMethod.showSoftInput(showInputToken, showFlags, resultReceiver);
+ onShowHideSoftInputRequested(true /* show */, windowToken, reason);
+ } catch (RemoteException e) {
+ }
mInputShown = true;
return true;
}
-
return false;
}
@@ -3147,14 +3195,11 @@
// be made before input is started in it.
final ClientState cs = mClients.get(client.asBinder());
if (cs == null) {
- throw new IllegalArgumentException(
- "unknown client " + client.asBinder());
+ throw new IllegalArgumentException("unknown client " + client.asBinder());
}
- if (!mWindowManagerInternal.isInputMethodClientFocus(cs.uid, cs.pid,
- cs.selfReportedDisplayId)) {
+ if (!isImeClientFocused(windowToken, cs)) {
if (DEBUG) {
- Slog.w(TAG,
- "Ignoring hideSoftInput of uid " + uid + ": " + client);
+ Slog.w(TAG, "Ignoring hideSoftInput of uid " + uid + ": " + client);
}
return false;
}
@@ -3202,8 +3247,16 @@
// delivered to the IME process as an IPC. Hence the inconsistency between
// IMMS#mInputShown and IMMS#mImeWindowVis should be resolved spontaneously in
// the final state.
- executeOrSendMessage(curMethod, mCaller.obtainMessageIOOO(MSG_HIDE_SOFT_INPUT,
- reason, curMethod, resultReceiver, hideInputToken));
+ if (DEBUG) {
+ Slog.v(TAG, "Calling " + curMethod + ".hideSoftInput(0, " + hideInputToken
+ + ", " + resultReceiver + ") for reason: "
+ + InputMethodDebug.softInputDisplayReasonToString(reason));
+ }
+ try {
+ curMethod.hideSoftInput(hideInputToken, 0 /* flags */, resultReceiver);
+ onShowHideSoftInputRequested(false /* show */, windowToken, reason);
+ } catch (RemoteException e) {
+ }
res = true;
} else {
res = false;
@@ -3216,6 +3269,12 @@
return res;
}
+ private boolean isImeClientFocused(IBinder windowToken, ClientState cs) {
+ final int imeClientFocus = mWindowManagerInternal.hasInputMethodClientFocus(
+ windowToken, cs.uid, cs.pid, cs.selfReportedDisplayId);
+ return imeClientFocus == WindowManagerInternal.ImeClientFocusResult.HAS_IME_FOCUS;
+ }
+
@NonNull
@Override
public InputBindResult startInputOrWindowGainedFocus(
@@ -3309,31 +3368,30 @@
+ " unverifiedTargetSdkVersion=" + unverifiedTargetSdkVersion);
}
- final int windowDisplayId = mWindowManagerInternal.getDisplayIdForWindow(windowToken);
-
final ClientState cs = mClients.get(client.asBinder());
if (cs == null) {
throw new IllegalArgumentException("unknown client " + client.asBinder());
}
- if (cs.selfReportedDisplayId != windowDisplayId) {
- Slog.e(TAG, "startInputOrWindowGainedFocusInternal: display ID mismatch."
- + " from client:" + cs.selfReportedDisplayId
- + " from window:" + windowDisplayId);
- return InputBindResult.DISPLAY_ID_MISMATCH;
- }
- if (!mWindowManagerInternal.isInputMethodClientFocus(cs.uid, cs.pid,
- cs.selfReportedDisplayId)) {
- // Check with the window manager to make sure this client actually
- // has a window with focus. If not, reject. This is thread safe
- // because if the focus changes some time before or after, the
- // next client receiving focus that has any interest in input will
- // be calling through here after that change happens.
- if (DEBUG) {
- Slog.w(TAG, "Focus gain on non-focused client " + cs.client
- + " (uid=" + cs.uid + " pid=" + cs.pid + ")");
- }
- return InputBindResult.NOT_IME_TARGET_WINDOW;
+ final int imeClientFocus = mWindowManagerInternal.hasInputMethodClientFocus(
+ windowToken, cs.uid, cs.pid, cs.selfReportedDisplayId);
+ switch (imeClientFocus) {
+ case WindowManagerInternal.ImeClientFocusResult.DISPLAY_ID_MISMATCH:
+ Slog.e(TAG, "startInputOrWindowGainedFocusInternal: display ID mismatch.");
+ return InputBindResult.DISPLAY_ID_MISMATCH;
+ case WindowManagerInternal.ImeClientFocusResult.NOT_IME_TARGET_WINDOW:
+ // Check with the window manager to make sure this client actually
+ // has a window with focus. If not, reject. This is thread safe
+ // because if the focus changes some time before or after, the
+ // next client receiving focus that has any interest in input will
+ // be calling through here after that change happens.
+ if (DEBUG) {
+ Slog.w(TAG, "Focus gain on non-focused client " + cs.client
+ + " (uid=" + cs.uid + " pid=" + cs.pid + ")");
+ }
+ return InputBindResult.NOT_IME_TARGET_WINDOW;
+ case WindowManagerInternal.ImeClientFocusResult.INVALID_DISPLAY_ID:
+ return InputBindResult.INVALID_DISPLAY_ID;
}
if (mUserSwitchHandlerTask != null) {
@@ -3561,8 +3619,7 @@
if (cs == null) {
throw new IllegalArgumentException("unknown client " + client.asBinder());
}
- if (!mWindowManagerInternal.isInputMethodClientFocus(cs.uid, cs.pid,
- cs.selfReportedDisplayId)) {
+ if (!isImeClientFocused(mCurFocusedWindow, cs)) {
Slog.w(TAG, String.format("Ignoring %s of uid %d : %s", methodName, uid, client));
return false;
}
@@ -3679,8 +3736,7 @@
if (!calledFromValidUserLocked()) {
return;
}
- executeOrSendMessage(getCurMethodLocked(), mCaller.obtainMessageO(
- MSG_SHOW_IM_SUBTYPE_ENABLER, inputMethodId));
+ showInputMethodAndSubtypeEnabler(inputMethodId);
}
}
@@ -4155,7 +4211,8 @@
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
- void setEnabledSessionInHandlerThread(SessionState session) {
+ @GuardedBy("ImfLock.class")
+ void setEnabledSessionLocked(SessionState session) {
if (mEnabledSession != session) {
if (mEnabledSession != null && mEnabledSession.session != null) {
try {
@@ -4203,69 +4260,8 @@
mMenuController.showInputMethodMenu(showAuxSubtypes, displayId);
return true;
- case MSG_SHOW_IM_SUBTYPE_ENABLER:
- showInputMethodAndSubtypeEnabler((String)msg.obj);
- return true;
-
- case MSG_SHOW_IM_CONFIG:
- showConfigureInputMethods();
- return true;
-
// ---------------------------------------------------------
- case MSG_UNBIND_INPUT:
- try {
- ((IInputMethod)msg.obj).unbindInput();
- } catch (RemoteException e) {
- // There is nothing interesting about the method dying.
- }
- return true;
- case MSG_BIND_INPUT:
- args = (SomeArgs)msg.obj;
- try {
- ((IInputMethod)args.arg1).bindInput((InputBinding)args.arg2);
- } catch (RemoteException e) {
- }
- args.recycle();
- return true;
- case MSG_SHOW_SOFT_INPUT:
- args = (SomeArgs) msg.obj;
- try {
- final @SoftInputShowHideReason int reason = msg.arg2;
- if (DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".showSoftInput("
- + args.arg3 + ", " + msg.arg1 + ", " + args.arg2 + ") for reason: "
- + InputMethodDebug.softInputDisplayReasonToString(reason));
- final IBinder token = (IBinder) args.arg3;
- ((IInputMethod) args.arg1).showSoftInput(
- token, msg.arg1 /* flags */, (ResultReceiver) args.arg2);
- final IBinder requestToken;
- synchronized (ImfLock.class) {
- requestToken = mShowRequestWindowMap.get(token);
- onShowHideSoftInputRequested(true /* show */, requestToken, reason);
- }
- } catch (RemoteException e) {
- }
- args.recycle();
- return true;
- case MSG_HIDE_SOFT_INPUT:
- args = (SomeArgs) msg.obj;
- try {
- final @SoftInputShowHideReason int reason = msg.arg1;
- if (DEBUG) Slog.v(TAG, "Calling " + args.arg1 + ".hideSoftInput(0, "
- + args.arg3 + ", " + args.arg2 + ") for reason: "
- + InputMethodDebug.softInputDisplayReasonToString(reason));
- final IBinder token = (IBinder) args.arg3;
- ((IInputMethod)args.arg1).hideSoftInput(
- token, 0 /* flags */, (ResultReceiver) args.arg2);
- final IBinder requestToken;
- synchronized (ImfLock.class) {
- requestToken = mHideRequestWindowMap.get(token);
- onShowHideSoftInputRequested(false /* show */, requestToken, reason);
- }
- } catch (RemoteException e) {
- }
- args.recycle();
- return true;
case MSG_HIDE_CURRENT_INPUT_METHOD:
synchronized (ImfLock.class) {
final @SoftInputShowHideReason int reason = (int) msg.obj;
@@ -4273,40 +4269,6 @@
}
return true;
- case MSG_INITIALIZE_IME:
- args = (SomeArgs)msg.obj;
- try {
- if (DEBUG) {
- synchronized (ImfLock.class) {
- Slog.v(TAG, "Sending attach of token: " + args.arg2 + " for display: "
- + mCurTokenDisplayId);
- }
- }
- final IBinder token = (IBinder) args.arg2;
- ((IInputMethod) args.arg1).initializeInternal(token,
- new InputMethodPrivilegedOperationsImpl(this, token),
- msg.arg1, (boolean) args.arg3);
- } catch (RemoteException e) {
- }
- args.recycle();
- return true;
- case MSG_CREATE_SESSION: {
- args = (SomeArgs)msg.obj;
- IInputMethod method = (IInputMethod)args.arg1;
- InputChannel channel = (InputChannel)args.arg2;
- try {
- method.createSession(channel, (IInputSessionCallback)args.arg3);
- } catch (RemoteException e) {
- } finally {
- // Dispose the channel if the input method is not local to this process
- // because the remote proxy will get its own copy when unparceled.
- if (channel != null && Binder.isProxy(method)) {
- channel.dispose();
- }
- }
- args.recycle();
- return true;
- }
case MSG_REMOVE_IME_SURFACE: {
synchronized (ImfLock.class) {
try {
@@ -4338,25 +4300,6 @@
}
// ---------------------------------------------------------
- case MSG_START_INPUT: {
- final boolean restarting = msg.arg2 != 0;
- args = (SomeArgs) msg.obj;
- final IBinder startInputToken = (IBinder) args.arg1;
- final SessionState session = (SessionState) args.arg2;
- final IInputContext inputContext = (IInputContext) args.arg3;
- final EditorInfo editorInfo = (EditorInfo) args.arg4;
- try {
- setEnabledSessionInHandlerThread(session);
- session.method.startInput(startInputToken, inputContext, editorInfo,
- restarting);
- } catch (RemoteException e) {
- }
- args.recycle();
- return true;
- }
-
- // ---------------------------------------------------------
-
case MSG_UNBIND_CLIENT:
try {
((IInputMethodClient)msg.obj).onUnbindMethod(msg.arg1, msg.arg2);
@@ -4430,23 +4373,6 @@
}
// ---------------------------------------------------------------
- case MSG_INLINE_SUGGESTIONS_REQUEST: {
- args = (SomeArgs) msg.obj;
- final InlineSuggestionsRequestInfo requestInfo =
- (InlineSuggestionsRequestInfo) args.arg2;
- final IInlineSuggestionsRequestCallback callback =
- (IInlineSuggestionsRequestCallback) args.arg3;
- try {
- ((IInputMethod) args.arg1).onCreateInlineSuggestionsRequest(requestInfo,
- callback);
- } catch (RemoteException e) {
- Slog.w(TAG, "RemoteException calling onCreateInlineSuggestionsRequest(): " + e);
- }
- args.recycle();
- return true;
- }
-
- // ---------------------------------------------------------------
case MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE: {
if (mAudioManagerInternal == null) {
mAudioManagerInternal = LocalServices.getService(AudioManagerInternal.class);
@@ -4456,13 +4382,6 @@
}
return true;
}
- case MSG_START_HANDWRITING:
- try {
- (((IInputMethod) msg.obj)).canStartStylusHandwriting(msg.arg1);
- } catch (RemoteException e) {
- Slog.w(TAG, "RemoteException calling canStartStylusHandwriting(): ", e);
- }
- return true;
}
return false;
}
@@ -4741,14 +4660,6 @@
mContext.startActivityAsUser(intent, null, UserHandle.of(userId));
}
- private void showConfigureInputMethods() {
- Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
- | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);
- }
-
// ----------------------------------------------------------------------
/**
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 682a27a..8f05130 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -20,6 +20,9 @@
import static android.Manifest.permission.MANAGE_BIOMETRIC;
import static android.Manifest.permission.READ_CONTACTS;
import static android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_DETAIL;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PROFILE_ENCRYPTED_TITLE;
import static android.content.Context.KEYGUARD_SERVICE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.UserHandle.USER_ALL;
@@ -117,6 +120,7 @@
import android.util.Slog;
import android.util.SparseArray;
+import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
@@ -642,12 +646,9 @@
private void showEncryptionNotificationForProfile(UserHandle user) {
Resources r = mContext.getResources();
- CharSequence title = r.getText(
- com.android.internal.R.string.profile_encrypted_title);
- CharSequence message = r.getText(
- com.android.internal.R.string.profile_encrypted_message);
- CharSequence detail = r.getText(
- com.android.internal.R.string.profile_encrypted_detail);
+ CharSequence title = getEncryptionNotificationTitle();
+ CharSequence message = getEncryptionNotificationMessage();
+ CharSequence detail = getEncryptionNotificationDetail();
final KeyguardManager km = (KeyguardManager) mContext.getSystemService(KEYGUARD_SERVICE);
final Intent unlockIntent = km.createConfirmDeviceCredentialIntent(null, null,
@@ -663,6 +664,24 @@
showEncryptionNotification(user, title, message, detail, intent);
}
+ private String getEncryptionNotificationTitle() {
+ return mInjector.getDevicePolicyManager().getString(
+ PROFILE_ENCRYPTED_TITLE,
+ () -> mContext.getString(R.string.profile_encrypted_title));
+ }
+
+ private String getEncryptionNotificationDetail() {
+ return mInjector.getDevicePolicyManager().getString(
+ PROFILE_ENCRYPTED_DETAIL,
+ () -> mContext.getString(R.string.profile_encrypted_detail));
+ }
+
+ private String getEncryptionNotificationMessage() {
+ return mInjector.getDevicePolicyManager().getString(
+ PROFILE_ENCRYPTED_MESSAGE,
+ () -> mContext.getString(R.string.profile_encrypted_message));
+ }
+
private void showEncryptionNotification(UserHandle user, CharSequence title,
CharSequence message, CharSequence detail, PendingIntent intent) {
if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier());
diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
index ffc1aed..91de9e5 100644
--- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java
+++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
@@ -344,10 +344,19 @@
}
private void addActiveRoute(BluetoothRouteInfo btRoute) {
+ if (btRoute == null) {
+ if (DEBUG) {
+ Log.d(TAG, " btRoute is null");
+ }
+ return;
+ }
if (DEBUG) {
Log.d(TAG, "Adding active route: " + btRoute.route);
}
- if (btRoute == null || mActiveRoutes.contains(btRoute)) {
+ if (mActiveRoutes.contains(btRoute)) {
+ if (DEBUG) {
+ Log.d(TAG, " btRoute is already added.");
+ }
return;
}
setRouteConnectionState(btRoute, STATE_CONNECTED);
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index a8383b6..e555c13 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -63,7 +63,6 @@
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
-import static android.net.NetworkIdentity.OEM_NONE;
import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicy.SNOOZE_NEVER;
import static android.net.NetworkPolicy.WARNING_DISABLED;
@@ -1498,13 +1497,11 @@
for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {
final int subId = mSubIdToSubscriberId.keyAt(i);
final String subscriberId = mSubIdToSubscriberId.valueAt(i);
- final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,
- TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,
- true, OEM_NONE);
- /* While OEM_NONE indicates "any non OEM managed network", OEM_NONE is meant to be a
- * placeholder value here. The probeIdent is matched against a NetworkTemplate which
- * should have its OEM managed value set to OEM_MANAGED_ALL, which will cause the
- * template to match probeIdent without regard to OEM managed status. */
+ final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
+ .setType(TYPE_MOBILE)
+ .setSubscriberId(subscriberId)
+ .setMetered(true)
+ .setDefaultNetwork(true).build();
if (template.matches(probeIdent)) {
return subId;
}
@@ -1737,9 +1734,11 @@
// find and update the carrier NetworkPolicy for this subscriber id
boolean policyUpdated = false;
- final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,
- TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true,
- OEM_NONE);
+ final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
+ .setType(TYPE_MOBILE)
+ .setSubscriberId(subscriberId)
+ .setMetered(true)
+ .setDefaultNetwork(true).build();
for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {
final NetworkTemplate template = mNetworkPolicy.keyAt(i);
if (template.matches(probeIdent)) {
@@ -1967,10 +1966,11 @@
for (int i = 0; i < mSubIdToSubscriberId.size(); i++) {
final int subId = mSubIdToSubscriberId.keyAt(i);
final String subscriberId = mSubIdToSubscriberId.valueAt(i);
-
- final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,
- TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,
- true, OEM_NONE);
+ final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
+ .setType(TYPE_MOBILE)
+ .setSubscriberId(subscriberId)
+ .setMetered(true)
+ .setDefaultNetwork(true).build();
// Template is matched when subscriber id matches.
if (template.matches(probeIdent)) {
matchingSubIds.add(subId);
@@ -2074,11 +2074,9 @@
for (final NetworkStateSnapshot snapshot : snapshots) {
mNetIdToSubId.put(snapshot.getNetwork().getNetId(), parseSubId(snapshot));
- // Policies matched by NPMS only match by subscriber ID or by network ID. Thus subtype
- // in the object created here is never used and its value doesn't matter, so use
- // NETWORK_TYPE_UNKNOWN.
- final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, snapshot,
- true, TelephonyManager.NETWORK_TYPE_UNKNOWN /* subType */);
+ // Policies matched by NPMS only match by subscriber ID or by network ID.
+ final NetworkIdentity ident = new NetworkIdentity.Builder()
+ .setNetworkStateSnapshot(snapshot).setDefaultNetwork(true).build();
identified.put(snapshot, ident);
}
@@ -2275,9 +2273,11 @@
@GuardedBy("mNetworkPoliciesSecondLock")
private boolean ensureActiveCarrierPolicyAL(int subId, String subscriberId) {
// Poke around to see if we already have a policy
- final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,
- TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true,
- OEM_NONE);
+ final NetworkIdentity probeIdent = new NetworkIdentity.Builder()
+ .setType(TYPE_MOBILE)
+ .setSubscriberId(subscriberId)
+ .setMetered(true)
+ .setDefaultNetwork(true).build();
for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {
final NetworkTemplate template = mNetworkPolicy.keyAt(i);
if (template.matches(probeIdent)) {
@@ -2687,7 +2687,7 @@
final List<WifiConfiguration> configs = wm.getConfiguredNetworks();
for (int i = 0; i < configs.size(); ++i) {
final WifiConfiguration config = configs.get(i);
- for (String key : config.getAllPersistableNetworkKeys()) {
+ for (String key : config.getAllNetworkKeys()) {
final Boolean metered = wifiNetworkKeys.get(key);
if (metered != null) {
Slog.d(TAG, "Found network " + key + "; upgrading metered hint");
diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java
index 5e333da..05f000c 100644
--- a/services/core/java/com/android/server/notification/PreferencesHelper.java
+++ b/services/core/java/com/android/server/notification/PreferencesHelper.java
@@ -101,6 +101,8 @@
@VisibleForTesting
static final int NOTIFICATION_CHANNEL_COUNT_LIMIT = 50000;
+ @VisibleForTesting
+ static final int NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT = 50000;
private static final int NOTIFICATION_PREFERENCES_PULL_LIMIT = 1000;
private static final int NOTIFICATION_CHANNEL_PULL_LIMIT = 2000;
@@ -254,6 +256,7 @@
}
}
boolean skipWarningLogged = false;
+ boolean skipGroupWarningLogged = false;
boolean hasSAWPermission = false;
if (upgradeForBubbles && uid != UNKNOWN_UID) {
hasSAWPermission = mAppOps.noteOpNoThrow(
@@ -303,6 +306,14 @@
String tagName = parser.getName();
// Channel groups
if (TAG_GROUP.equals(tagName)) {
+ if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) {
+ if (!skipGroupWarningLogged) {
+ Slog.w(TAG, "Skipping further groups for " + r.pkg
+ + "; app has too many");
+ skipGroupWarningLogged = true;
+ }
+ continue;
+ }
String id = parser.getAttributeValue(null, ATT_ID);
CharSequence groupName = parser.getAttributeValue(null,
ATT_NAME);
@@ -867,6 +878,9 @@
}
if (fromTargetApp) {
group.setBlocked(false);
+ if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) {
+ throw new IllegalStateException("Limit exceed; cannot create more groups");
+ }
}
final NotificationChannelGroup oldGroup = r.groups.get(group.getId());
if (oldGroup != null) {
diff --git a/services/core/java/com/android/server/om/IdmapDaemon.java b/services/core/java/com/android/server/om/IdmapDaemon.java
index c9e564a..8e944b7 100644
--- a/services/core/java/com/android/server/om/IdmapDaemon.java
+++ b/services/core/java/com/android/server/om/IdmapDaemon.java
@@ -37,13 +37,14 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * To prevent idmap2d from continuously running, the idmap daemon will terminate after 10
- * seconds without a transaction.
+ * To prevent idmap2d from continuously running, the idmap daemon will terminate after 10 seconds
+ * without a transaction.
**/
class IdmapDaemon {
// The amount of time in milliseconds to wait after a transaction to the idmap service is made
@@ -67,11 +68,14 @@
* to the service is open.
**/
private class Connection implements AutoCloseable {
+ @Nullable
+ private final IIdmap2 mIdmap2;
private boolean mOpened = true;
- private Connection() {
+ private Connection(IIdmap2 idmap2) {
synchronized (mIdmapToken) {
mOpenedCount.incrementAndGet();
+ mIdmap2 = idmap2;
}
}
@@ -102,6 +106,11 @@
}, mIdmapToken, SERVICE_TIMEOUT_MS);
}
}
+
+ @Nullable
+ public IIdmap2 getIdmap2() {
+ return mIdmap2;
+ }
}
static IdmapDaemon getInstance() {
@@ -115,14 +124,29 @@
@Nullable String overlayName, int policies, boolean enforce, int userId)
throws TimeoutException, RemoteException {
try (Connection c = connect()) {
- return mService.createIdmap(targetPath, overlayPath, TextUtils.emptyIfNull(overlayName),
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for createIdmap(\"" + targetPath
+ + "\", \"" + overlayPath + "\", \"" + overlayName + "\", " + policies + ", "
+ + enforce + ", " + userId + ")");
+ return null;
+ }
+
+ return idmap2.createIdmap(targetPath, overlayPath, TextUtils.emptyIfNull(overlayName),
policies, enforce, userId);
}
}
boolean removeIdmap(String overlayPath, int userId) throws TimeoutException, RemoteException {
try (Connection c = connect()) {
- return mService.removeIdmap(overlayPath, userId);
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for removeIdmap(\"" + overlayPath
+ + "\", " + userId + ")");
+ return false;
+ }
+
+ return idmap2.removeIdmap(overlayPath, userId);
}
}
@@ -130,14 +154,29 @@
@Nullable String overlayName, int policies, boolean enforce, int userId)
throws Exception {
try (Connection c = connect()) {
- return mService.verifyIdmap(targetPath, overlayPath, TextUtils.emptyIfNull(overlayName),
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for verifyIdmap(\"" + targetPath
+ + "\", \"" + overlayPath + "\", \"" + overlayName + "\", " + policies + ", "
+ + enforce + ", " + userId + ")");
+ return false;
+ }
+
+ return idmap2.verifyIdmap(targetPath, overlayPath, TextUtils.emptyIfNull(overlayName),
policies, enforce, userId);
}
}
boolean idmapExists(String overlayPath, int userId) {
try (Connection c = connect()) {
- return new File(mService.getIdmapPath(overlayPath, userId)).isFile();
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for idmapExists(\"" + overlayPath
+ + "\", " + userId + ")");
+ return false;
+ }
+
+ return new File(idmap2.getIdmapPath(overlayPath, userId)).isFile();
} catch (Exception e) {
Slog.wtf(TAG, "failed to check if idmap exists for " + overlayPath, e);
return false;
@@ -146,7 +185,13 @@
FabricatedOverlayInfo createFabricatedOverlay(@NonNull FabricatedOverlayInternal overlay) {
try (Connection c = connect()) {
- return mService.createFabricatedOverlay(overlay);
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for createFabricatedOverlay()");
+ return null;
+ }
+
+ return idmap2.createFabricatedOverlay(overlay);
} catch (Exception e) {
Slog.wtf(TAG, "failed to fabricate overlay " + overlay, e);
return null;
@@ -155,7 +200,14 @@
boolean deleteFabricatedOverlay(@NonNull String path) {
try (Connection c = connect()) {
- return mService.deleteFabricatedOverlay(path);
+ final IIdmap2 idmap2 = c.getIdmap2();
+ if (idmap2 == null) {
+ Slog.w(TAG, "idmap2d service is not ready for deleteFabricatedOverlay(\"" + path
+ + "\")");
+ return false;
+ }
+
+ return idmap2.deleteFabricatedOverlay(path);
} catch (Exception e) {
Slog.wtf(TAG, "failed to delete fabricated overlay '" + path + "'", e);
return false;
@@ -164,10 +216,18 @@
synchronized List<FabricatedOverlayInfo> getFabricatedOverlayInfos() {
final ArrayList<FabricatedOverlayInfo> allInfos = new ArrayList<>();
- try (Connection c = connect()) {
- mService.acquireFabricatedOverlayIterator();
+ Connection c = null;
+ try {
+ c = connect();
+ final IIdmap2 service = c.getIdmap2();
+ if (service == null) {
+ Slog.w(TAG, "idmap2d service is not ready for getFabricatedOverlayInfos()");
+ return Collections.emptyList();
+ }
+
+ service.acquireFabricatedOverlayIterator();
List<FabricatedOverlayInfo> infos;
- while (!(infos = mService.nextFabricatedOverlayInfos()).isEmpty()) {
+ while (!(infos = service.nextFabricatedOverlayInfos()).isEmpty()) {
allInfos.addAll(infos);
}
return allInfos;
@@ -175,17 +235,26 @@
Slog.wtf(TAG, "failed to get all fabricated overlays", e);
} finally {
try {
- mService.releaseFabricatedOverlayIterator();
+ if (c.getIdmap2() != null) {
+ c.getIdmap2().releaseFabricatedOverlayIterator();
+ }
} catch (RemoteException e) {
// ignore
}
+ c.close();
}
return allInfos;
}
String dumpIdmap(@NonNull String overlayPath) {
try (Connection c = connect()) {
- String dump = mService.dumpIdmap(overlayPath);
+ final IIdmap2 service = c.getIdmap2();
+ if (service == null) {
+ final String dumpText = "idmap2d service is not ready for dumpIdmap()";
+ Slog.w(TAG, dumpText);
+ return dumpText;
+ }
+ String dump = service.dumpIdmap(overlayPath);
return TextUtils.nullIfEmpty(dump);
} catch (Exception e) {
Slog.wtf(TAG, "failed to dump idmap", e);
@@ -193,8 +262,16 @@
}
}
+ @Nullable
private IBinder getIdmapService() throws TimeoutException, RemoteException {
- SystemService.start(IDMAP_DAEMON);
+ try {
+ SystemService.start(IDMAP_DAEMON);
+ } catch (RuntimeException e) {
+ if (e.getMessage().contains("failed to set system property")) {
+ Slog.w(TAG, "Failed to enable idmap2 daemon", e);
+ return null;
+ }
+ }
final long endMillis = SystemClock.elapsedRealtime() + SERVICE_CONNECT_TIMEOUT_MS;
while (SystemClock.elapsedRealtime() <= endMillis) {
@@ -226,17 +303,23 @@
}
}
+ @NonNull
private Connection connect() throws TimeoutException, RemoteException {
synchronized (mIdmapToken) {
FgThread.getHandler().removeCallbacksAndMessages(mIdmapToken);
if (mService != null) {
// Not enough time has passed to stop the idmap service. Reuse the existing
// interface.
- return new Connection();
+ return new Connection(mService);
}
- mService = IIdmap2.Stub.asInterface(getIdmapService());
- return new Connection();
+ IBinder binder = getIdmapService();
+ if (binder == null) {
+ return new Connection(null);
+ }
+
+ mService = IIdmap2.Stub.asInterface(binder);
+ return new Connection(mService);
}
}
}
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 6f10a6b..2e9ad50 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -45,6 +45,7 @@
import android.sysprop.ApexProperties;
import android.util.ArrayMap;
import android.util.ArraySet;
+import android.util.PrintWriterPrinter;
import android.util.Singleton;
import android.util.Slog;
import android.util.SparseArray;
@@ -1164,6 +1165,10 @@
ipw.println("Path: " + pi.applicationInfo.sourceDir);
ipw.println("IsActive: " + isActive(pi));
ipw.println("IsFactory: " + isFactory(pi));
+ ipw.println("ApplicationInfo: ");
+ ipw.increaseIndent();
+ pi.applicationInfo.dump(new PrintWriterPrinter(ipw), "");
+ ipw.decreaseIndent();
ipw.decreaseIndent();
}
ipw.decreaseIndent();
diff --git a/services/core/java/com/android/server/pm/AppDataHelper.java b/services/core/java/com/android/server/pm/AppDataHelper.java
index a66af3c..4b999e9 100644
--- a/services/core/java/com/android/server/pm/AppDataHelper.java
+++ b/services/core/java/com/android/server/pm/AppDataHelper.java
@@ -24,7 +24,6 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.pm.PackageManager;
-import com.android.server.pm.pkg.SELinuxUtil;
import android.content.pm.UserInfo;
import android.os.CreateAppDataArgs;
import android.os.Environment;
@@ -35,6 +34,9 @@
import android.os.storage.StorageManager;
import android.os.storage.StorageManagerInternal;
import android.os.storage.VolumeInfo;
+import android.security.AndroidKeyStoreMaintenance;
+import android.system.keystore2.Domain;
+import android.system.keystore2.KeyDescriptor;
import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
@@ -46,6 +48,7 @@
import com.android.server.pm.dex.ArtManagerService;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
+import com.android.server.pm.pkg.SELinuxUtil;
import dalvik.system.VMRuntime;
@@ -156,8 +159,7 @@
* <ul>
* <li>If previousAppId < 0, app data will be migrated to the new app ID
* <li>If previousAppId == 0, no migration will happen and data will be wiped and recreated
- * <li>If previousAppId > 0, it will migrate all data owned by previousAppId
- * to the new app ID
+ * <li>If previousAppId > 0, app data owned by previousAppId will be migrated to the new app ID
* </ul>
*/
private @NonNull CompletableFuture<?> prepareAppData(@NonNull Installer.Batch batch,
@@ -476,13 +478,9 @@
} else if (!ps.getInstalled(userId)) {
throw new PackageManagerException(
"Package " + packageName + " not installed for user " + userId);
- } else if (ps.getPkg() == null) {
- throw new PackageManagerException("Package " + packageName + " is not parsed yet");
- } else {
- if (!shouldHaveAppStorage(ps.getPkg())) {
- throw new PackageManagerException(
- "Package " + packageName + " shouldn't have storage");
- }
+ } else if (ps.getPkg() != null && !shouldHaveAppStorage(ps.getPkg())) {
+ throw new PackageManagerException(
+ "Package " + packageName + " shouldn't have storage");
}
}
}
@@ -549,6 +547,22 @@
return prepareAppDataFuture;
}
+ public void migrateKeyStoreData(int previousAppId, int appId) {
+ for (int userId : mPm.resolveUserIds(UserHandle.USER_ALL)) {
+ int srcUid = UserHandle.getUid(userId, previousAppId);
+ int destUid = UserHandle.getUid(userId, appId);
+ final KeyDescriptor[] keys = AndroidKeyStoreMaintenance.listEntries(Domain.APP, srcUid);
+ if (keys == null) continue;
+ for (final KeyDescriptor key : keys) {
+ KeyDescriptor dest = new KeyDescriptor();
+ dest.domain = Domain.APP;
+ dest.nspace = destUid;
+ dest.alias = key.alias;
+ AndroidKeyStoreMaintenance.migrateKeyNamespace(key, dest);
+ }
+ }
+ }
+
void clearAppDataLIF(AndroidPackage pkg, int userId, int flags) {
if (pkg == null) {
return;
@@ -633,4 +647,18 @@
pkg.getProperties().get(PackageManager.PROPERTY_NO_APP_DATA_STORAGE);
return noAppDataProp == null || !noAppDataProp.getBoolean();
}
+
+ /**
+ * Remove entries from the keystore daemon. Will only remove if the {@code appId} is valid.
+ */
+ public void clearKeystoreData(int userId, int appId) {
+ if (appId < 0) {
+ return;
+ }
+
+ for (int realUserId : mPm.resolveUserIds(userId)) {
+ AndroidKeyStoreMaintenance.clearNamespace(
+ Domain.APP, UserHandle.getUid(realUserId, appId));
+ }
+ }
}
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index 2aa0e01..69c475a 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -20,6 +20,7 @@
import static android.Manifest.permission.INSTALL_PACKAGES;
import static android.Manifest.permission.REQUEST_DELETE_PACKAGES;
import static android.Manifest.permission.SET_HARMFUL_APP_WARNINGS;
+import static android.content.ContentProvider.isAuthorityRedirectedForCloneProfile;
import static android.content.Intent.ACTION_MAIN;
import static android.content.Intent.CATEGORY_DEFAULT;
import static android.content.Intent.CATEGORY_HOME;
@@ -92,14 +93,6 @@
import android.content.pm.SigningInfo;
import android.content.pm.UserInfo;
import android.content.pm.VersionedPackage;
-import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils;
-import com.android.server.pm.pkg.component.ParsedActivity;
-import com.android.server.pm.pkg.component.ParsedInstrumentation;
-import com.android.server.pm.pkg.component.ParsedIntentInfo;
-import com.android.server.pm.pkg.component.ParsedMainComponent;
-import com.android.server.pm.pkg.component.ParsedProvider;
-import com.android.server.pm.pkg.component.ParsedService;
-import com.android.server.pm.pkg.PackageUserStateUtils;
import android.os.Binder;
import android.os.Build;
import android.os.IBinder;
@@ -142,6 +135,14 @@
import com.android.server.pm.pkg.PackageStateUtils;
import com.android.server.pm.pkg.PackageUserState;
import com.android.server.pm.pkg.PackageUserStateInternal;
+import com.android.server.pm.pkg.PackageUserStateUtils;
+import com.android.server.pm.pkg.component.ParsedActivity;
+import com.android.server.pm.pkg.component.ParsedInstrumentation;
+import com.android.server.pm.pkg.component.ParsedIntentInfo;
+import com.android.server.pm.pkg.component.ParsedMainComponent;
+import com.android.server.pm.pkg.component.ParsedProvider;
+import com.android.server.pm.pkg.component.ParsedService;
+import com.android.server.pm.pkg.parsing.PackageInfoWithoutStateUtils;
import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import com.android.server.pm.verify.domain.DomainVerificationUtils;
import com.android.server.uri.UriGrantsManagerInternal;
@@ -350,7 +351,6 @@
private final CompilerStats mCompilerStats;
private final BackgroundDexOptService mBackgroundDexOptService;
private final PackageManagerInternal.ExternalSourcesPolicy mExternalSourcesPolicy;
- private final ProtectedPackages mProtectedPackages;
// PackageManagerService attributes that are primitives are referenced through the
// pms object directly. Primitives are the only attributes so referenced.
@@ -402,7 +402,6 @@
mCompilerStats = args.service.mCompilerStats;
mBackgroundDexOptService = args.service.mBackgroundDexOptService;
mExternalSourcesPolicy = args.service.mExternalSourcesPolicy;
- mProtectedPackages = args.service.mProtectedPackages;
// Used to reference PMS attributes that are primitives and which are not
// updated under control of the PMS lock.
@@ -4619,8 +4618,24 @@
}
}
if (!checkedGrants) {
- enforceCrossUserPermission(callingUid, userId, false, false, "resolveContentProvider");
+ boolean enforceCrossUser = true;
+
+ if (isAuthorityRedirectedForCloneProfile(name)) {
+ final UserManagerInternal umInternal = mInjector.getUserManagerInternal();
+
+ UserInfo userInfo = umInternal.getUserInfo(UserHandle.getUserId(callingUid));
+ if (userInfo != null && userInfo.isCloneProfile()
+ && userInfo.profileGroupId == userId) {
+ enforceCrossUser = false;
+ }
+ }
+
+ if (enforceCrossUser) {
+ enforceCrossUserPermission(callingUid, userId, false, false,
+ "resolveContentProvider");
+ }
}
+
if (providerInfo == null) {
return null;
}
diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java
index 9a80a4e..48689a8 100644
--- a/services/core/java/com/android/server/pm/DeletePackageHelper.java
+++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java
@@ -485,8 +485,7 @@
mAppDataHelper.destroyAppDataLIF(pkg, nextUserId,
FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL);
}
- PackageManagerService.removeKeystoreDataIfNeeded(mUserManagerInternal, nextUserId,
- ps.getAppId());
+ mAppDataHelper.clearKeystoreData(nextUserId, ps.getAppId());
preferredActivityHelper.clearPackagePreferredActivities(ps.getPackageName(),
nextUserId);
mPm.mDomainVerificationManager.clearPackageForUser(ps.getPackageName(), nextUserId);
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 6a5d76b..80699ac 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -2245,6 +2245,17 @@
if (reconciledPkg.mScanResult.needsNewAppId()) {
// Only set previousAppId if the app is migrating out of shared UID
previousAppId = reconciledPkg.mScanResult.mPreviousAppId;
+
+ if (pkg.shouldInheritKeyStoreKeys()) {
+ // Migrate keystore data
+ mAppDataHelper.migrateKeyStoreData(
+ previousAppId, reconciledPkg.mPkgSetting.getAppId());
+ }
+
+ if (reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId == previousAppId) {
+ // If the previous app ID is removed, clear the keys
+ mAppDataHelper.clearKeystoreData(UserHandle.USER_ALL, previousAppId);
+ }
}
mAppDataHelper.prepareAppDataPostCommitLIF(pkg, previousAppId);
if (reconciledPkg.mPrepareResult.mClearCodeCache) {
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 1f10d77..ccc375f 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -16,6 +16,8 @@
package com.android.server.pm;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_DELETED_BY_DO;
+
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.START_TAG;
@@ -29,6 +31,7 @@
import android.app.NotificationManager;
import android.app.PackageDeleteObserver;
import android.app.admin.DevicePolicyEventLogger;
+import android.app.admin.DevicePolicyManager;
import android.app.admin.DevicePolicyManagerInternal;
import android.content.Context;
import android.content.Intent;
@@ -1312,7 +1315,7 @@
mPackageName = packageName;
if (showNotification) {
mNotification = buildSuccessNotification(mContext,
- mContext.getResources().getString(R.string.package_deleted_device_owner),
+ getDeviceOwnerDeletedPackageMsg(),
packageName,
userId);
} else {
@@ -1320,6 +1323,12 @@
}
}
+ private String getDeviceOwnerDeletedPackageMsg() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(PACKAGE_DELETED_BY_DO,
+ () -> mContext.getString(R.string.package_updated_device_owner));
+ }
+
@Override
public void onUserActionRequired(Intent intent) {
if (mTarget == null) {
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index e0f1b0b..d9ade96 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -17,6 +17,8 @@
package com.android.server.pm;
import static android.app.AppOpsManager.MODE_DEFAULT;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_INSTALLED_BY_DO;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_UPDATED_BY_DO;
import static android.content.pm.DataLoaderType.INCREMENTAL;
import static android.content.pm.DataLoaderType.STREAMING;
import static android.content.pm.PackageInstaller.LOCATION_DATA_APP;
@@ -56,6 +58,7 @@
import android.app.Notification;
import android.app.NotificationManager;
import android.app.admin.DevicePolicyEventLogger;
+import android.app.admin.DevicePolicyManager;
import android.app.admin.DevicePolicyManagerInternal;
import android.content.ComponentName;
import android.content.Context;
@@ -91,7 +94,6 @@
import android.content.pm.parsing.ApkLite;
import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.PackageLite;
-import com.android.server.pm.pkg.parsing.ParsingPackageUtils;
import android.content.pm.parsing.result.ParseResult;
import android.content.pm.parsing.result.ParseTypeImpl;
import android.graphics.Bitmap;
@@ -156,6 +158,7 @@
import com.android.server.pm.dex.DexManager;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.pkg.PackageStateInternal;
+import com.android.server.pm.pkg.parsing.ParsingPackageUtils;
import libcore.io.IoUtils;
import libcore.util.EmptyArray;
@@ -4336,9 +4339,7 @@
if (INSTALL_SUCCEEDED == returnCode && showNotification) {
boolean update = (extras != null) && extras.getBoolean(Intent.EXTRA_REPLACING);
Notification notification = PackageInstallerService.buildSuccessNotification(context,
- context.getResources()
- .getString(update ? R.string.package_updated_device_owner :
- R.string.package_installed_device_owner),
+ getDeviceOwnerInstalledPackageMsg(context, update),
basePackageName,
userId);
if (notification != null) {
@@ -4370,6 +4371,15 @@
}
}
+ private static String getDeviceOwnerInstalledPackageMsg(Context context, boolean update) {
+ DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+ return update
+ ? dpm.getString(PACKAGE_UPDATED_BY_DO,
+ () -> context.getString(R.string.package_updated_device_owner))
+ : dpm.getString(PACKAGE_INSTALLED_BY_DO,
+ () -> context.getString(R.string.package_installed_device_owner));
+ }
+
/**
* This method doesn't change internal states and is safe to call outside the lock.
*/
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 13f91e0d..e00f4f5 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -167,7 +167,6 @@
import android.provider.DeviceConfig;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
-import android.security.KeyStore;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.ArrayMap;
@@ -234,8 +233,6 @@
import com.android.server.pm.pkg.PackageStateInternal;
import com.android.server.pm.pkg.PackageStateUtils;
import com.android.server.pm.pkg.PackageUserState;
-import com.android.server.pm.pkg.PackageUserStateInternal;
-import com.android.server.pm.pkg.SuspendParams;
import com.android.server.pm.pkg.component.ParsedInstrumentation;
import com.android.server.pm.pkg.component.ParsedMainComponent;
import com.android.server.pm.pkg.mutate.PackageStateMutator;
@@ -291,7 +288,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.Predicate;
/**
* Keep track of all those APKs everywhere.
@@ -954,6 +950,7 @@
final @Nullable String mRetailDemoPackage;
final @Nullable String mOverlayConfigSignaturePackage;
final @Nullable String mRecentsPackage;
+ final @Nullable String mAmbientContextDetectionPackage;
@GuardedBy("mLock")
private final PackageUsage mPackageUsage = new PackageUsage();
@@ -970,6 +967,7 @@
private final PreferredActivityHelper mPreferredActivityHelper;
private final ResolveIntentHelper mResolveIntentHelper;
private final DexOptHelper mDexOptHelper;
+ private final SuspendPackageHelper mSuspendPackageHelper;
/**
* Invalidate the package info cache, which includes updating the cached computer.
@@ -1671,6 +1669,7 @@
mSystemTextClassifierPackageName = testParams.systemTextClassifierPackage;
mRetailDemoPackage = testParams.retailDemoPackage;
mRecentsPackage = testParams.recentsPackage;
+ mAmbientContextDetectionPackage = testParams.ambientContextDetectionPackage;
mConfiguratorPackage = testParams.configuratorPackage;
mAppPredictionServicePackage = testParams.appPredictionServicePackage;
mIncidentReportApproverPackage = testParams.incidentReportApproverPackage;
@@ -1705,6 +1704,7 @@
mPreferredActivityHelper = testParams.preferredActivityHelper;
mResolveIntentHelper = testParams.resolveIntentHelper;
mDexOptHelper = testParams.dexOptHelper;
+ mSuspendPackageHelper = testParams.suspendPackageHelper;
mSharedLibraries.setDeletePackageHelper(mDeletePackageHelper);
invalidatePackageInfoCache();
@@ -1851,6 +1851,8 @@
mPreferredActivityHelper = new PreferredActivityHelper(this);
mResolveIntentHelper = new ResolveIntentHelper(this, mPreferredActivityHelper);
mDexOptHelper = new DexOptHelper(this);
+ mSuspendPackageHelper = new SuspendPackageHelper(this, mInjector, mBroadcastHelper,
+ mProtectedPackages);
synchronized (mLock) {
// Create the computer as soon as the state objects have been installed. The
@@ -1995,6 +1997,7 @@
mRetailDemoPackage = getRetailDemoPackageName();
mOverlayConfigSignaturePackage = getOverlayConfigSignaturePackageName();
mRecentsPackage = getRecentsPackageName();
+ mAmbientContextDetectionPackage = getAmbientContextDetectionPackageName();
// Now that we know all of the shared libraries, update all clients to have
// the correct library paths.
@@ -2682,7 +2685,7 @@
return mComputer.getPackageUid(packageName, flags, userId);
}
- private int getPackageUidInternal(String packageName,
+ int getPackageUidInternal(String packageName,
@PackageManager.PackageInfoFlagsBits long flags, int userId, int callingUid) {
return mComputer.getPackageUidInternal(packageName, flags, userId, callingUid);
}
@@ -4294,51 +4297,6 @@
info.sendPackageRemovedBroadcasts(true /*killApp*/, false /*removedBySystem*/);
}
- @VisibleForTesting(visibility = Visibility.PRIVATE)
- void sendPackagesSuspendedForUser(String intent, String[] pkgList, int[] uidList, int userId) {
- final List<List<String>> pkgsToSend = new ArrayList(pkgList.length);
- final List<IntArray> uidsToSend = new ArrayList(pkgList.length);
- final List<SparseArray<int[]>> allowListsToSend = new ArrayList(pkgList.length);
- final int[] userIds = new int[] {userId};
- // Get allow lists for the pkg in the pkgList. Merge into the existed pkgs and uids if
- // allow lists are the same.
- for (int i = 0; i < pkgList.length; i++) {
- final String pkgName = pkgList[i];
- final int uid = uidList[i];
- SparseArray<int[]> allowList = mAppsFilter.getVisibilityAllowList(
- getPackageStateInternal(pkgName, Process.SYSTEM_UID),
- userIds, getPackageStates());
- if (allowList == null) {
- allowList = new SparseArray<>(0);
- }
- boolean merged = false;
- for (int j = 0; j < allowListsToSend.size(); j++) {
- if (Arrays.equals(allowListsToSend.get(j).get(userId), allowList.get(userId))) {
- pkgsToSend.get(j).add(pkgName);
- uidsToSend.get(j).add(uid);
- merged = true;
- break;
- }
- }
- if (!merged) {
- pkgsToSend.add(new ArrayList<>(Arrays.asList(pkgName)));
- uidsToSend.add(IntArray.wrap(new int[] {uid}));
- allowListsToSend.add(allowList);
- }
- }
-
- for (int i = 0; i < pkgsToSend.size(); i++) {
- final Bundle extras = new Bundle(3);
- extras.putStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST,
- pkgsToSend.get(i).toArray(new String[pkgsToSend.get(i).size()]));
- extras.putIntArray(Intent.EXTRA_CHANGED_UID_LIST, uidsToSend.get(i).toArray());
- final SparseArray<int[]> allowList = allowListsToSend.get(i).size() == 0
- ? null : allowListsToSend.get(i);
- sendPackageBroadcast(intent, null, extras, Intent.FLAG_RECEIVER_REGISTERED_ONLY, null,
- null, userIds, null, allowList, null);
- }
- }
-
/**
* Returns true if application is not found or there was an error. Otherwise it returns
* the hidden state of the package for the given user.
@@ -4381,7 +4339,8 @@
+ userId);
}
Objects.requireNonNull(packageNames, "packageNames cannot be null");
- if (restrictionFlags != 0 && !isSuspendAllowedForUser(userId)) {
+ if (restrictionFlags != 0
+ && !mSuspendPackageHelper.isSuspendAllowedForUser(userId, callingUid)) {
Slog.w(TAG, "Cannot restrict packages due to restrictions on user " + userId);
return packageNames;
}
@@ -4389,8 +4348,9 @@
final List<String> changedPackagesList = new ArrayList<>(packageNames.length);
final IntArray changedUids = new IntArray(packageNames.length);
final List<String> unactionedPackages = new ArrayList<>(packageNames.length);
- final boolean[] canRestrict = (restrictionFlags != 0) ? canSuspendPackageForUserInternal(
- packageNames, userId) : null;
+ final boolean[] canRestrict = (restrictionFlags != 0)
+ ? mSuspendPackageHelper.canSuspendPackageForUser(packageNames, userId, callingUid)
+ : null;
for (int i = 0; i < packageNames.length; i++) {
final String packageName = packageNames[i];
@@ -4469,84 +4429,8 @@
final int callingUid = Binder.getCallingUid();
enforceCanSetPackagesSuspendedAsUser(callingPackage, callingUid, userId,
"setPackagesSuspendedAsUser");
-
- if (ArrayUtils.isEmpty(packageNames)) {
- return packageNames;
- }
- if (suspended && !isSuspendAllowedForUser(userId)) {
- Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId);
- return packageNames;
- }
-
- final List<String> changedPackagesList = new ArrayList<>(packageNames.length);
- final IntArray changedUids = new IntArray(packageNames.length);
- final List<String> modifiedPackagesList = new ArrayList<>(packageNames.length);
- final IntArray modifiedUids = new IntArray(packageNames.length);
- final List<String> unactionedPackages = new ArrayList<>(packageNames.length);
- final boolean[] canSuspend = suspended ? canSuspendPackageForUserInternal(packageNames,
- userId) : null;
-
- for (int i = 0; i < packageNames.length; i++) {
- final String packageName = packageNames[i];
- if (callingPackage.equals(packageName)) {
- Slog.w(TAG, "Calling package: " + callingPackage + " trying to "
- + (suspended ? "" : "un") + "suspend itself. Ignoring");
- unactionedPackages.add(packageName);
- continue;
- }
- final PackageSetting pkgSetting;
- synchronized (mLock) {
- pkgSetting = mSettings.getPackageLPr(packageName);
- if (pkgSetting == null
- || shouldFilterApplication(pkgSetting, callingUid, userId)) {
- Slog.w(TAG, "Could not find package setting for package: " + packageName
- + ". Skipping suspending/un-suspending.");
- unactionedPackages.add(packageName);
- continue;
- }
- }
- if (canSuspend != null && !canSuspend[i]) {
- unactionedPackages.add(packageName);
- continue;
- }
- final boolean packageUnsuspended;
- final boolean packageModified;
- synchronized (mLock) {
- if (suspended) {
- packageModified = pkgSetting.addOrUpdateSuspension(callingPackage,
- dialogInfo, appExtras, launcherExtras, userId);
- } else {
- packageModified = pkgSetting.removeSuspension(callingPackage, userId);
- }
- packageUnsuspended = !suspended && !pkgSetting.getSuspended(userId);
- }
- if (suspended || packageUnsuspended) {
- changedPackagesList.add(packageName);
- changedUids.add(UserHandle.getUid(userId, pkgSetting.getAppId()));
- }
- if (packageModified) {
- modifiedPackagesList.add(packageName);
- modifiedUids.add(UserHandle.getUid(userId, pkgSetting.getAppId()));
- }
- }
-
- if (!changedPackagesList.isEmpty()) {
- final String[] changedPackages = changedPackagesList.toArray(new String[0]);
- sendPackagesSuspendedForUser(
- suspended ? Intent.ACTION_PACKAGES_SUSPENDED
- : Intent.ACTION_PACKAGES_UNSUSPENDED,
- changedPackages, changedUids.toArray(), userId);
- sendMyPackageSuspendedOrUnsuspended(changedPackages, suspended, userId);
- synchronized (mLock) {
- scheduleWritePackageRestrictionsLocked(userId);
- }
- }
- // Send the suspension changed broadcast to ensure suspension state is not stale.
- if (!modifiedPackagesList.isEmpty()) {
- sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED,
- modifiedPackagesList.toArray(new String[0]), modifiedUids.toArray(), userId);
- }
- return unactionedPackages.toArray(new String[0]);
+ return mSuspendPackageHelper.setPackagesSuspended(packageNames, suspended, appExtras,
+ launcherExtras, dialogInfo, callingPackage, userId, callingUid);
}
@Override
@@ -4556,56 +4440,8 @@
throw new SecurityException("Calling package " + packageName
+ " does not belong to calling uid " + callingUid);
}
- return getSuspendedPackageAppExtrasInternal(packageName, userId);
- }
-
- private Bundle getSuspendedPackageAppExtrasInternal(String packageName, int userId) {
- final PackageStateInternal ps = getPackageStateInternal(packageName);
- if (ps == null) {
- return null;
- }
- final PackageUserStateInternal pus = ps.getUserStateOrDefault(userId);
- final Bundle allExtras = new Bundle();
- if (pus.isSuspended()) {
- for (int i = 0; i < pus.getSuspendParams().size(); i++) {
- final SuspendParams params = pus.getSuspendParams().valueAt(i);
- if (params != null && params.getAppExtras() != null) {
- allExtras.putAll(params.getAppExtras());
- }
- }
- }
- return (allExtras.size() > 0) ? allExtras : null;
- }
-
- private void sendMyPackageSuspendedOrUnsuspended(String[] affectedPackages, boolean suspended,
- int userId) {
- final String action = suspended
- ? Intent.ACTION_MY_PACKAGE_SUSPENDED
- : Intent.ACTION_MY_PACKAGE_UNSUSPENDED;
- mHandler.post(() -> {
- final IActivityManager am = ActivityManager.getService();
- if (am == null) {
- Slog.wtf(TAG, "IActivityManager null. Cannot send MY_PACKAGE_ "
- + (suspended ? "" : "UN") + "SUSPENDED broadcasts");
- return;
- }
- final int[] targetUserIds = new int[] {userId};
- for (String packageName : affectedPackages) {
- final Bundle appExtras = suspended
- ? getSuspendedPackageAppExtrasInternal(packageName, userId)
- : null;
- final Bundle intentExtras;
- if (appExtras != null) {
- intentExtras = new Bundle(1);
- intentExtras.putBundle(Intent.EXTRA_SUSPENDED_PACKAGE_EXTRAS, appExtras);
- } else {
- intentExtras = null;
- }
- mHandler.post(() -> mBroadcastHelper.doSendBroadcast(action, null, intentExtras,
- Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, packageName, null,
- targetUserIds, false, null, null));
- }
- });
+ return mSuspendPackageHelper.getSuspendedPackageAppExtras(
+ packageName, userId, callingUid);
}
@Override
@@ -4618,50 +4454,14 @@
synchronized (mLock) {
allPackages = mPackages.keySet().toArray(new String[mPackages.size()]);
}
- removeSuspensionsBySuspendingPackage(allPackages, suspendingPackage::equals, userId);
+ mSuspendPackageHelper.removeSuspensionsBySuspendingPackage(
+ allPackages, suspendingPackage::equals, userId);
}
private boolean isSuspendingAnyPackages(String suspendingPackage, int userId) {
return mComputer.isSuspendingAnyPackages(suspendingPackage, userId);
}
- /**
- * Removes any suspensions on given packages that were added by packages that pass the given
- * predicate.
- *
- * <p> Caller must flush package restrictions if it cares about immediate data consistency.
- *
- * @param packagesToChange The packages on which the suspension are to be removed.
- * @param suspendingPackagePredicate A predicate identifying the suspending packages whose
- * suspensions will be removed.
- * @param userId The user for which the changes are taking place.
- */
- private void removeSuspensionsBySuspendingPackage(String[] packagesToChange,
- Predicate<String> suspendingPackagePredicate, int userId) {
- final List<String> unsuspendedPackages = new ArrayList<>();
- final IntArray unsuspendedUids = new IntArray();
- synchronized (mLock) {
- for (String packageName : packagesToChange) {
- final PackageSetting ps = mSettings.getPackageLPr(packageName);
- if (ps != null && ps.getUserStateOrDefault(userId).isSuspended()) {
- ps.removeSuspension(suspendingPackagePredicate, userId);
- if (!ps.getUserStateOrDefault(userId).isSuspended()) {
- unsuspendedPackages.add(ps.getPackageName());
- unsuspendedUids.add(UserHandle.getUid(userId, ps.getAppId()));
- }
- }
- }
- scheduleWritePackageRestrictionsLocked(userId);
- }
- if (!unsuspendedPackages.isEmpty()) {
- final String[] packageArray = unsuspendedPackages.toArray(
- new String[unsuspendedPackages.size()]);
- sendMyPackageSuspendedOrUnsuspended(packageArray, false, userId);
- sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_UNSUSPENDED,
- packageArray, unsuspendedUids.toArray(), userId);
- }
- }
-
void removeAllDistractingPackageRestrictions(int userId) {
final String[] allPackages = mComputer.getAllAvailablePackageNames();
removeDistractingPackageRestrictions(allPackages, userId);
@@ -4698,24 +4498,6 @@
}
}
- private boolean isCallerDeviceOrProfileOwner(int userId) {
- final int callingUid = Binder.getCallingUid();
- if (callingUid == Process.SYSTEM_UID) {
- return true;
- }
- final String ownerPackage = mProtectedPackages.getDeviceOwnerOrProfileOwnerPackage(userId);
- if (ownerPackage != null) {
- return callingUid == getPackageUidInternal(ownerPackage, 0, userId, callingUid);
- }
- return false;
- }
-
- private boolean isSuspendAllowedForUser(int userId) {
- return isCallerDeviceOrProfileOwner(userId)
- || (!mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL, userId)
- && !mUserManager.hasUserRestriction(UserManager.DISALLOW_UNINSTALL_APPS, userId));
- }
-
@Override
public String[] getUnsuspendablePackagesForUser(String[] packageNames, int userId) {
Objects.requireNonNull(packageNames, "packageNames cannot be null");
@@ -4726,125 +4508,8 @@
throw new SecurityException("Calling uid " + callingUid
+ " cannot query getUnsuspendablePackagesForUser for user " + userId);
}
- if (!isSuspendAllowedForUser(userId)) {
- Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId);
- return packageNames;
- }
- final ArraySet<String> unactionablePackages = new ArraySet<>();
- final boolean[] canSuspend = canSuspendPackageForUserInternal(packageNames, userId);
- for (int i = 0; i < packageNames.length; i++) {
- if (!canSuspend[i]) {
- unactionablePackages.add(packageNames[i]);
- continue;
- }
- synchronized (mLock) {
- final PackageSetting ps = mSettings.getPackageLPr(packageNames[i]);
- if (ps == null || shouldFilterApplication(ps, callingUid, userId)) {
- Slog.w(TAG, "Could not find package setting for package: " + packageNames[i]);
- unactionablePackages.add(packageNames[i]);
- }
- }
- }
- return unactionablePackages.toArray(new String[unactionablePackages.size()]);
- }
-
- /**
- * Returns an array of booleans, such that the ith boolean denotes whether the ith package can
- * be suspended or not.
- *
- * @param packageNames The package names to check suspendability for.
- * @param userId The user to check in
- * @return An array containing results of the checks
- */
- @NonNull
- private boolean[] canSuspendPackageForUserInternal(@NonNull String[] packageNames, int userId) {
- final boolean[] canSuspend = new boolean[packageNames.length];
- final boolean isCallerOwner = isCallerDeviceOrProfileOwner(userId);
- final long callingId = Binder.clearCallingIdentity();
- try {
- final String activeLauncherPackageName = getActiveLauncherPackageName(userId);
- final String dialerPackageName = mDefaultAppProvider.getDefaultDialer(userId);
- for (int i = 0; i < packageNames.length; i++) {
- canSuspend[i] = false;
- final String packageName = packageNames[i];
-
- if (isPackageDeviceAdmin(packageName, userId)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": has an active device admin");
- continue;
- }
- if (packageName.equals(activeLauncherPackageName)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": contains the active launcher");
- continue;
- }
- if (packageName.equals(mRequiredInstallerPackage)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": required for package installation");
- continue;
- }
- if (packageName.equals(mRequiredUninstallerPackage)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": required for package uninstallation");
- continue;
- }
- if (packageName.equals(mRequiredVerifierPackage)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": required for package verification");
- continue;
- }
- if (packageName.equals(dialerPackageName)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": is the default dialer");
- continue;
- }
- if (packageName.equals(mRequiredPermissionControllerPackage)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": required for permissions management");
- continue;
- }
- synchronized (mLock) {
- if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": protected package");
- continue;
- }
- if (!isCallerOwner && mSettings.getBlockUninstallLPr(userId, packageName)) {
- Slog.w(TAG, "Cannot suspend package \"" + packageName
- + "\": blocked by admin");
- continue;
- }
-
- AndroidPackage pkg = mPackages.get(packageName);
- if (pkg != null) {
- // Cannot suspend SDK libs as they are controlled by SDK manager.
- if (pkg.isSdkLibrary()) {
- Slog.w(TAG, "Cannot suspend package: " + packageName
- + " providing SDK library: "
- + pkg.getSdkLibName());
- continue;
- }
- // Cannot suspend static shared libs as they are considered
- // a part of the using app (emulating static linking). Also
- // static libs are installed always on internal storage.
- if (pkg.isStaticSharedLibrary()) {
- Slog.w(TAG, "Cannot suspend package: " + packageName
- + " providing static shared library: "
- + pkg.getStaticSharedLibName());
- continue;
- }
- }
- }
- if (PLATFORM_PACKAGE_NAME.equals(packageName)) {
- Slog.w(TAG, "Cannot suspend the platform package: " + packageName);
- continue;
- }
- canSuspend[i] = true;
- }
- } finally {
- Binder.restoreCallingIdentity(callingId);
- }
- return canSuspend;
+ return mSuspendPackageHelper.getUnsuspendablePackagesForUser(
+ packageNames, userId, callingUid);
}
@Override
@@ -5445,7 +5110,7 @@
FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL);
final int appId = UserHandle.getAppId(pkg.getUid());
- removeKeystoreDataIfNeeded(mInjector.getUserManagerInternal(), userId, appId);
+ mAppDataHelper.clearKeystoreData(userId, appId);
UserManagerInternal umInternal = mInjector.getUserManagerInternal();
StorageManagerInternal smInternal = mInjector.getLocalService(StorageManagerInternal.class);
@@ -5518,30 +5183,6 @@
}
}
- /**
- * Remove entries from the keystore daemon. Will only remove it if the
- * {@code appId} is valid.
- */
- static void removeKeystoreDataIfNeeded(UserManagerInternal um, @UserIdInt int userId,
- @AppIdInt int appId) {
- if (appId < 0) {
- return;
- }
-
- final KeyStore keyStore = KeyStore.getInstance();
- if (keyStore != null) {
- if (userId == UserHandle.USER_ALL) {
- for (final int individual : um.getUserIds()) {
- keyStore.clearUid(UserHandle.getUid(individual, appId));
- }
- } else {
- keyStore.clearUid(UserHandle.getUid(userId, appId));
- }
- } else {
- Slog.w(TAG, "Could not contact keystore to clear entries for app id " + appId);
- }
- }
-
@Override
public void deleteApplicationCacheFiles(final String packageName,
final IPackageDataObserver observer) {
@@ -5980,6 +5621,11 @@
return mPmInternal.getSetupWizardPackageName();
}
+ public @Nullable String getAmbientContextDetectionPackageName() {
+ return ensureSystemPackageName(getPackageFromComponentString(
+ R.string.config_defaultAmbientContextDetectionService));
+ }
+
public String getIncidentReportApproverPackageName() {
return ensureSystemPackageName(mContext.getString(
R.string.config_incidentReportApproverPackage));
@@ -7420,41 +7066,27 @@
@Override
public Bundle getSuspendedPackageLauncherExtras(String packageName, int userId) {
- final PackageStateInternal packageState = getPackageStateInternal(packageName);
- if (packageState == null) {
- return null;
- }
- Bundle allExtras = new Bundle();
- PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
- if (userState.isSuspended()) {
- for (int i = 0; i < userState.getSuspendParams().size(); i++) {
- final SuspendParams params = userState.getSuspendParams().valueAt(i);
- if (params != null && params.getLauncherExtras() != null) {
- allExtras.putAll(params.getLauncherExtras());
- }
- }
- }
- return (allExtras.size() > 0) ? allExtras : null;
+ return mSuspendPackageHelper.getSuspendedPackageLauncherExtras(
+ packageName, userId, Binder.getCallingUid());
}
@Override
public boolean isPackageSuspended(String packageName, int userId) {
- final PackageStateInternal packageState = getPackageStateInternal(packageName);
- return packageState != null && packageState.getUserStateOrDefault(userId)
- .isSuspended();
+ return mSuspendPackageHelper.isPackageSuspended(
+ packageName, userId, Binder.getCallingUid());
}
@Override
public void removeAllNonSystemPackageSuspensions(int userId) {
final String[] allPackages = mComputer.getAllAvailablePackageNames();
- PackageManagerService.this.removeSuspensionsBySuspendingPackage(allPackages,
+ mSuspendPackageHelper.removeSuspensionsBySuspendingPackage(allPackages,
(suspendingPackage) -> !PLATFORM_PACKAGE_NAME.equals(suspendingPackage),
userId);
}
@Override
public void removeNonSystemPackageSuspensions(String packageName, int userId) {
- PackageManagerService.this.removeSuspensionsBySuspendingPackage(
+ mSuspendPackageHelper.removeSuspensionsBySuspendingPackage(
new String[]{packageName},
(suspendingPackage) -> !PLATFORM_PACKAGE_NAME.equals(suspendingPackage),
userId);
@@ -7480,46 +7112,15 @@
@Override
public String getSuspendingPackage(String suspendedPackage, int userId) {
- final PackageStateInternal packageState = getPackageStateInternal(suspendedPackage);
- if (packageState == null) {
- return null;
- }
-
- final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
- if (!userState.isSuspended()) {
- return null;
- }
-
- String suspendingPackage = null;
- for (int i = 0; i < userState.getSuspendParams().size(); i++) {
- suspendingPackage = userState.getSuspendParams().keyAt(i);
- if (PLATFORM_PACKAGE_NAME.equals(suspendingPackage)) {
- return suspendingPackage;
- }
- }
- return suspendingPackage;
+ return mSuspendPackageHelper.getSuspendingPackage(
+ suspendedPackage, userId, Binder.getCallingUid());
}
@Override
public SuspendDialogInfo getSuspendedDialogInfo(String suspendedPackage,
String suspendingPackage, int userId) {
- final PackageStateInternal packageState = getPackageStateInternal(suspendedPackage);
- if (packageState == null) {
- return null;
- }
-
- final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
- if (!userState.isSuspended()) {
- return null;
- }
-
- final ArrayMap<String, SuspendParams> suspendParamsMap = userState.getSuspendParams();
- if (suspendParamsMap == null) {
- return null;
- }
-
- final SuspendParams suspendParams = suspendParamsMap.get(suspendingPackage);
- return (suspendParams != null) ? suspendParams.getDialogInfo() : null;
+ return mSuspendPackageHelper.getSuspendedDialogInfo(
+ suspendedPackage, suspendingPackage, userId, Binder.getCallingUid());
}
@Override
@@ -9083,6 +8684,8 @@
return new String[] { mDefaultAppProvider.getDefaultBrowser(userId) };
case PackageManagerInternal.PACKAGE_INSTALLER:
return mComputer.filterOnlySystemPackages(mRequiredInstallerPackage);
+ case PackageManagerInternal.PACKAGE_UNINSTALLER:
+ return mComputer.filterOnlySystemPackages(mRequiredUninstallerPackage);
case PackageManagerInternal.PACKAGE_SETUP_WIZARD:
return mComputer.filterOnlySystemPackages(mSetupWizardPackage);
case PackageManagerInternal.PACKAGE_SYSTEM:
@@ -9098,6 +8701,8 @@
return mComputer.filterOnlySystemPackages(mConfiguratorPackage);
case PackageManagerInternal.PACKAGE_INCIDENT_REPORT_APPROVER:
return mComputer.filterOnlySystemPackages(mIncidentReportApproverPackage);
+ case PackageManagerInternal.PACKAGE_AMBIENT_CONTEXT_DETECTION:
+ return mComputer.filterOnlySystemPackages(mAmbientContextDetectionPackage);
case PackageManagerInternal.PACKAGE_APP_PREDICTOR:
return mComputer.filterOnlySystemPackages(mAppPredictionServicePackage);
case PackageManagerInternal.PACKAGE_COMPANION:
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java
index a1acc38..db60686 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceTestParams.java
@@ -91,6 +91,7 @@
public ViewCompiler viewCompiler;
public @Nullable String retailDemoPackage;
public @Nullable String recentsPackage;
+ public @Nullable String ambientContextDetectionPackage;
public ComponentName resolveComponentName;
public ArrayMap<String, AndroidPackage> packages;
public boolean enableFreeCacheV2;
@@ -111,4 +112,5 @@
public PreferredActivityHelper preferredActivityHelper;
public ResolveIntentHelper resolveIntentHelper;
public DexOptHelper dexOptHelper;
+ public SuspendPackageHelper suspendPackageHelper;
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index d8f0cc3..e03cf0a 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -51,7 +51,6 @@
import android.content.pm.SigningDetails;
import android.content.pm.parsing.ApkLiteParseUtils;
import android.content.pm.parsing.PackageLite;
-import com.android.server.pm.pkg.component.ParsedMainComponent;
import android.content.pm.parsing.result.ParseResult;
import android.content.pm.parsing.result.ParseTypeImpl;
import android.os.Binder;
@@ -92,6 +91,7 @@
import com.android.server.pm.dex.PackageDexUsage;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.pkg.PackageStateInternal;
+import com.android.server.pm.pkg.component.ParsedMainComponent;
import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import dalvik.system.VMRuntime;
@@ -560,8 +560,8 @@
if (!match) {
throw new PackageManagerException(INSTALL_FAILED_UPDATE_INCOMPATIBLE,
- "Package " + packageName +
- " signatures do not match previously installed version; ignoring!");
+ "Existing package " + packageName
+ + " signatures do not match newer version; ignoring!");
}
}
// Check for shared user signatures
diff --git a/services/core/java/com/android/server/pm/RemovePackageHelper.java b/services/core/java/com/android/server/pm/RemovePackageHelper.java
index b0e0340..7e898cb 100644
--- a/services/core/java/com/android/server/pm/RemovePackageHelper.java
+++ b/services/core/java/com/android/server/pm/RemovePackageHelper.java
@@ -29,7 +29,6 @@
import android.annotation.NonNull;
import android.content.pm.PackageManager;
-import com.android.server.pm.pkg.component.ParsedInstrumentation;
import android.os.UserHandle;
import android.os.incremental.IncrementalManager;
import android.util.Log;
@@ -43,6 +42,7 @@
import com.android.server.pm.parsing.pkg.PackageImpl;
import com.android.server.pm.permission.PermissionManagerServiceInternal;
import com.android.server.pm.pkg.PackageStateInternal;
+import com.android.server.pm.pkg.component.ParsedInstrumentation;
import java.io.File;
import java.util.Collections;
@@ -330,8 +330,7 @@
if (removedAppId != -1) {
// A user ID was deleted here. Go through all users and remove it
// from KeyStore.
- mPm.removeKeystoreDataIfNeeded(
- mUserManagerInternal, UserHandle.USER_ALL, removedAppId);
+ mAppDataHelper.clearKeystoreData(UserHandle.USER_ALL, removedAppId);
}
}
}
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index bf7ef1b..15e64df 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -146,8 +146,10 @@
private static final String ATTR_PERSON_IS_IMPORTANT = "is-important";
private static final String NAME_CATEGORIES = "categories";
+ private static final String NAME_CAPABILITY = "capability";
private static final String TAG_STRING_ARRAY_XMLUTILS = "string-array";
+ private static final String TAG_MAP_XMLUTILS = "map";
private static final String ATTR_NAME_XMLUTILS = "name";
private static final String KEY_DYNAMIC = "dynamic";
@@ -1829,6 +1831,12 @@
}
ShortcutService.writeTagExtra(out, TAG_EXTRAS, si.getExtras());
+
+ final Map<String, Map<String, List<String>>> capabilityBindings =
+ si.getCapabilityBindings();
+ if (capabilityBindings != null && !capabilityBindings.isEmpty()) {
+ XmlUtils.writeMapXml(si.getCapabilityBindings(), NAME_CAPABILITY, out);
+ }
}
out.endTag(null, TAG_SHORTCUT);
@@ -1961,6 +1969,7 @@
int backupVersionCode;
ArraySet<String> categories = null;
ArrayList<Person> persons = new ArrayList<>();
+ Map<String, Map<String, List<String>>> capabilityBindings = null;
id = ShortcutService.parseStringAttribute(parser, ATTR_ID);
activityComponent = ShortcutService.parseComponentNameAttribute(parser,
@@ -2029,6 +2038,13 @@
}
}
continue;
+ case TAG_MAP_XMLUTILS:
+ if (NAME_CAPABILITY.equals(ShortcutService.parseStringAttribute(parser,
+ ATTR_NAME_XMLUTILS))) {
+ capabilityBindings = (Map<String, Map<String, List<String>>>)
+ XmlUtils.readValueXml(parser, new String[1]);
+ }
+ continue;
}
throw ShortcutService.throwForInvalidTag(depth, tag);
}
@@ -2064,7 +2080,7 @@
rank, extras, lastChangedTimestamp, flags,
iconResId, iconResName, bitmapPath, iconUri,
disabledReason, persons.toArray(new Person[persons.size()]), locusId,
- splashScreenThemeResName);
+ splashScreenThemeResName, capabilityBindings);
}
private static Intent parseIntent(TypedXmlPullParser parser)
diff --git a/services/core/java/com/android/server/pm/ShortcutParser.java b/services/core/java/com/android/server/pm/ShortcutParser.java
index b86c50b..63f1f2d 100644
--- a/services/core/java/com/android/server/pm/ShortcutParser.java
+++ b/services/core/java/com/android/server/pm/ShortcutParser.java
@@ -459,7 +459,8 @@
disabledReason,
null /* persons */,
null /* locusId */,
- splashScreenThemeResName);
+ splashScreenThemeResName,
+ null /* capabilityBindings */);
}
private static String parseCategory(ShortcutService service, AttributeSet attrs) {
diff --git a/services/core/java/com/android/server/pm/SuspendPackageHelper.java b/services/core/java/com/android/server/pm/SuspendPackageHelper.java
new file mode 100644
index 0000000..f466ca7
--- /dev/null
+++ b/services/core/java/com/android/server/pm/SuspendPackageHelper.java
@@ -0,0 +1,611 @@
+/*
+ * Copyright (C) 2022 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.pm;
+
+import static android.content.pm.PackageManagerInternal.PACKAGE_INSTALLER;
+import static android.content.pm.PackageManagerInternal.PACKAGE_PERMISSION_CONTROLLER;
+import static android.content.pm.PackageManagerInternal.PACKAGE_UNINSTALLER;
+import static android.content.pm.PackageManagerInternal.PACKAGE_VERIFIER;
+import static android.os.Process.SYSTEM_UID;
+
+import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
+import static com.android.server.pm.PackageManagerService.TAG;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.app.IActivityManager;
+import android.content.Intent;
+import android.content.pm.PackageManagerInternal.KnownPackage;
+import android.content.pm.SuspendDialogInfo;
+import android.os.Binder;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.IntArray;
+import android.util.Slog;
+import android.util.SparseArray;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.ArrayUtils;
+import com.android.server.pm.parsing.pkg.AndroidPackage;
+import com.android.server.pm.pkg.PackageStateInternal;
+import com.android.server.pm.pkg.PackageUserStateInternal;
+import com.android.server.pm.pkg.SuspendParams;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+
+public final class SuspendPackageHelper {
+ // TODO(b/198166813): remove PMS dependency
+ private final PackageManagerService mPm;
+ private final PackageManagerServiceInjector mInjector;
+
+ private final BroadcastHelper mBroadcastHelper;
+ private final ProtectedPackages mProtectedPackages;
+
+ /**
+ * Constructor for {@link PackageManagerService}.
+ */
+ SuspendPackageHelper(PackageManagerService pm, PackageManagerServiceInjector injector,
+ BroadcastHelper broadcastHelper, ProtectedPackages protectedPackages) {
+ mPm = pm;
+ mInjector = injector;
+ mBroadcastHelper = broadcastHelper;
+ mProtectedPackages = protectedPackages;
+ }
+
+ /**
+ * Updates the package to the suspended or unsuspended state.
+ *
+ * @param packageNames The names of the packages to set the suspended status.
+ * @param suspended {@code true} to suspend packages, or {@code false} to unsuspend packages.
+ * @param appExtras An optional {@link PersistableBundle} that the suspending app can provide
+ * which will be shared with the apps being suspended. Ignored if
+ * {@code suspended} is false.
+ * @param launcherExtras An optional {@link PersistableBundle} that the suspending app can
+ * provide which will be shared with the launcher. Ignored if
+ * {@code suspended} is false.
+ * @param dialogInfo An optional {@link SuspendDialogInfo} object describing the dialog that
+ * should be shown to the user when they try to launch a suspended app.
+ * Ignored if {@code suspended} is false.
+ * @param callingPackage The caller's package name.
+ * @param userId The user where packages reside.
+ * @param callingUid The caller's uid.
+ * @return The names of failed packages.
+ */
+ @Nullable
+ String[] setPackagesSuspended(@Nullable String[] packageNames, boolean suspended,
+ @Nullable PersistableBundle appExtras, @Nullable PersistableBundle launcherExtras,
+ @Nullable SuspendDialogInfo dialogInfo, @NonNull String callingPackage,
+ int userId, int callingUid) {
+ if (ArrayUtils.isEmpty(packageNames)) {
+ return packageNames;
+ }
+ if (suspended && !isSuspendAllowedForUser(userId, callingUid)) {
+ Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId);
+ return packageNames;
+ }
+
+ final List<String> changedPackagesList = new ArrayList<>(packageNames.length);
+ final IntArray changedUids = new IntArray(packageNames.length);
+ final List<String> modifiedPackagesList = new ArrayList<>(packageNames.length);
+ final IntArray modifiedUids = new IntArray(packageNames.length);
+ final List<String> unactionedPackages = new ArrayList<>(packageNames.length);
+ final boolean[] canSuspend =
+ suspended ? canSuspendPackageForUser(packageNames, userId, callingUid) : null;
+
+ for (int i = 0; i < packageNames.length; i++) {
+ final String packageName = packageNames[i];
+ if (callingPackage.equals(packageName)) {
+ Slog.w(TAG, "Calling package: " + callingPackage + " trying to "
+ + (suspended ? "" : "un") + "suspend itself. Ignoring");
+ unactionedPackages.add(packageName);
+ continue;
+ }
+ final PackageSetting pkgSetting;
+ synchronized (mPm.mLock) {
+ pkgSetting = mPm.mSettings.getPackageLPr(packageName);
+ if (pkgSetting == null
+ || mPm.shouldFilterApplication(pkgSetting, callingUid, userId)) {
+ Slog.w(TAG, "Could not find package setting for package: " + packageName
+ + ". Skipping suspending/un-suspending.");
+ unactionedPackages.add(packageName);
+ continue;
+ }
+ }
+ if (canSuspend != null && !canSuspend[i]) {
+ unactionedPackages.add(packageName);
+ continue;
+ }
+ final boolean packageUnsuspended;
+ final boolean packageModified;
+ synchronized (mPm.mLock) {
+ if (suspended) {
+ packageModified = pkgSetting.addOrUpdateSuspension(callingPackage,
+ dialogInfo, appExtras, launcherExtras, userId);
+ } else {
+ packageModified = pkgSetting.removeSuspension(callingPackage, userId);
+ }
+ packageUnsuspended = !suspended && !pkgSetting.getSuspended(userId);
+ }
+ if (suspended || packageUnsuspended) {
+ changedPackagesList.add(packageName);
+ changedUids.add(UserHandle.getUid(userId, pkgSetting.getAppId()));
+ }
+ if (packageModified) {
+ modifiedPackagesList.add(packageName);
+ modifiedUids.add(UserHandle.getUid(userId, pkgSetting.getAppId()));
+ }
+ }
+
+ if (!changedPackagesList.isEmpty()) {
+ final String[] changedPackages = changedPackagesList.toArray(new String[0]);
+ sendPackagesSuspendedForUser(
+ suspended ? Intent.ACTION_PACKAGES_SUSPENDED
+ : Intent.ACTION_PACKAGES_UNSUSPENDED,
+ changedPackages, changedUids.toArray(), userId);
+ sendMyPackageSuspendedOrUnsuspended(changedPackages, suspended, userId);
+ synchronized (mPm.mLock) {
+ mPm.scheduleWritePackageRestrictionsLocked(userId);
+ }
+ }
+ // Send the suspension changed broadcast to ensure suspension state is not stale.
+ if (!modifiedPackagesList.isEmpty()) {
+ sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED,
+ modifiedPackagesList.toArray(new String[0]), modifiedUids.toArray(), userId);
+ }
+ return unactionedPackages.toArray(new String[0]);
+ }
+
+ /**
+ * Returns the names in the {@code packageNames} which can not be suspended by the caller.
+ *
+ * @param packageNames The names of packages to check.
+ * @param userId The user where packages reside.
+ * @param callingUid The caller's uid.
+ * @return The names of packages which are Unsuspendable.
+ */
+ @NonNull
+ String[] getUnsuspendablePackagesForUser(@NonNull String[] packageNames, int userId,
+ int callingUid) {
+ if (!isSuspendAllowedForUser(userId, callingUid)) {
+ Slog.w(TAG, "Cannot suspend due to restrictions on user " + userId);
+ return packageNames;
+ }
+ final ArraySet<String> unactionablePackages = new ArraySet<>();
+ final boolean[] canSuspend = canSuspendPackageForUser(packageNames, userId, callingUid);
+ for (int i = 0; i < packageNames.length; i++) {
+ if (!canSuspend[i]) {
+ unactionablePackages.add(packageNames[i]);
+ continue;
+ }
+ synchronized (mPm.mLock) {
+ final PackageSetting ps = mPm.mSettings.getPackageLPr(packageNames[i]);
+ if (ps == null || mPm.shouldFilterApplication(ps, callingUid, userId)) {
+ Slog.w(TAG, "Could not find package setting for package: " + packageNames[i]);
+ unactionablePackages.add(packageNames[i]);
+ }
+ }
+ }
+ return unactionablePackages.toArray(new String[unactionablePackages.size()]);
+ }
+
+ /**
+ * Returns the app extras of the given suspended package.
+ *
+ * @param packageName The suspended package name.
+ * @param userId The user where the package resides.
+ * @param callingUid The caller's uid.
+ * @return The app extras of the suspended package.
+ */
+ @Nullable
+ Bundle getSuspendedPackageAppExtras(@NonNull String packageName, int userId, int callingUid) {
+ final PackageStateInternal ps = mPm.getPackageStateInternal(packageName, callingUid);
+ if (ps == null) {
+ return null;
+ }
+ final PackageUserStateInternal pus = ps.getUserStateOrDefault(userId);
+ final Bundle allExtras = new Bundle();
+ if (pus.isSuspended()) {
+ for (int i = 0; i < pus.getSuspendParams().size(); i++) {
+ final SuspendParams params = pus.getSuspendParams().valueAt(i);
+ if (params != null && params.getAppExtras() != null) {
+ allExtras.putAll(params.getAppExtras());
+ }
+ }
+ }
+ return (allExtras.size() > 0) ? allExtras : null;
+ }
+
+ /**
+ * Removes any suspensions on given packages that were added by packages that pass the given
+ * predicate.
+ *
+ * <p> Caller must flush package restrictions if it cares about immediate data consistency.
+ *
+ * @param packagesToChange The packages on which the suspension are to be removed.
+ * @param suspendingPackagePredicate A predicate identifying the suspending packages whose
+ * suspensions will be removed.
+ * @param userId The user for which the changes are taking place.
+ */
+ void removeSuspensionsBySuspendingPackage(@NonNull String[] packagesToChange,
+ @NonNull Predicate<String> suspendingPackagePredicate, int userId) {
+ final List<String> unsuspendedPackages = new ArrayList<>();
+ final IntArray unsuspendedUids = new IntArray();
+ synchronized (mPm.mLock) {
+ for (String packageName : packagesToChange) {
+ final PackageSetting ps = mPm.mSettings.getPackageLPr(packageName);
+ if (ps != null && ps.getUserStateOrDefault(userId).isSuspended()) {
+ ps.removeSuspension(suspendingPackagePredicate, userId);
+ if (!ps.getUserStateOrDefault(userId).isSuspended()) {
+ unsuspendedPackages.add(ps.getPackageName());
+ unsuspendedUids.add(UserHandle.getUid(userId, ps.getAppId()));
+ }
+ }
+ }
+ mPm.scheduleWritePackageRestrictionsLocked(userId);
+ }
+ if (!unsuspendedPackages.isEmpty()) {
+ final String[] packageArray = unsuspendedPackages.toArray(
+ new String[unsuspendedPackages.size()]);
+ sendMyPackageSuspendedOrUnsuspended(packageArray, false, userId);
+ sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_UNSUSPENDED,
+ packageArray, unsuspendedUids.toArray(), userId);
+ }
+ }
+
+ /**
+ * Returns the launcher extras for the given suspended package.
+ *
+ * @param packageName The name of the suspended package.
+ * @param userId The user where the package resides.
+ * @param callingUid The caller's uid.
+ * @return The launcher extras.
+ */
+ @Nullable
+ Bundle getSuspendedPackageLauncherExtras(@NonNull String packageName, int userId,
+ int callingUid) {
+ final PackageStateInternal packageState = mPm.getPackageStateInternal(
+ packageName, callingUid);
+ if (packageState == null) {
+ return null;
+ }
+ Bundle allExtras = new Bundle();
+ PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
+ if (userState.isSuspended()) {
+ for (int i = 0; i < userState.getSuspendParams().size(); i++) {
+ final SuspendParams params = userState.getSuspendParams().valueAt(i);
+ if (params != null && params.getLauncherExtras() != null) {
+ allExtras.putAll(params.getLauncherExtras());
+ }
+ }
+ }
+ return (allExtras.size() > 0) ? allExtras : null;
+ }
+
+ /**
+ * Return {@code true}, if the given package is suspended.
+ *
+ * @param packageName The name of package to check.
+ * @param userId The user where the package resides.
+ * @param callingUid The caller's uid.
+ * @return {@code true}, if the given package is suspended.
+ */
+ boolean isPackageSuspended(@NonNull String packageName, int userId, int callingUid) {
+ final PackageStateInternal packageState = mPm.getPackageStateInternal(
+ packageName, callingUid);
+ return packageState != null && packageState.getUserStateOrDefault(userId)
+ .isSuspended();
+ }
+
+ /**
+ * Given a suspended package, returns the name of package which invokes suspending to it.
+ *
+ * @param suspendedPackage The suspended package to check.
+ * @param userId The user where the package resides.
+ * @param callingUid The caller's uid.
+ * @return The name of suspending package.
+ */
+ @Nullable
+ String getSuspendingPackage(@NonNull String suspendedPackage, int userId, int callingUid) {
+ final PackageStateInternal packageState = mPm.getPackageStateInternal(
+ suspendedPackage, callingUid);
+ if (packageState == null) {
+ return null;
+ }
+
+ final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
+ if (!userState.isSuspended()) {
+ return null;
+ }
+
+ String suspendingPackage = null;
+ for (int i = 0; i < userState.getSuspendParams().size(); i++) {
+ suspendingPackage = userState.getSuspendParams().keyAt(i);
+ if (PLATFORM_PACKAGE_NAME.equals(suspendingPackage)) {
+ return suspendingPackage;
+ }
+ }
+ return suspendingPackage;
+ }
+
+ /**
+ * Returns the dialog info of the given suspended package.
+ *
+ * @param suspendedPackage The name of the suspended package.
+ * @param suspendingPackage The name of the suspending package.
+ * @param userId The user where the package resides.
+ * @param callingUid The caller's uid.
+ * @return The dialog info.
+ */
+ @Nullable
+ SuspendDialogInfo getSuspendedDialogInfo(@NonNull String suspendedPackage,
+ @NonNull String suspendingPackage, int userId, int callingUid) {
+ final PackageStateInternal packageState = mPm.getPackageStateInternal(
+ suspendedPackage, callingUid);
+ if (packageState == null) {
+ return null;
+ }
+
+ final PackageUserStateInternal userState = packageState.getUserStateOrDefault(userId);
+ if (!userState.isSuspended()) {
+ return null;
+ }
+
+ final ArrayMap<String, SuspendParams> suspendParamsMap = userState.getSuspendParams();
+ if (suspendParamsMap == null) {
+ return null;
+ }
+
+ final SuspendParams suspendParams = suspendParamsMap.get(suspendingPackage);
+ return (suspendParams != null) ? suspendParams.getDialogInfo() : null;
+ }
+
+ /**
+ * Return {@code true} if the user is allowed to suspend packages by the caller.
+ *
+ * @param userId The user id to check.
+ * @param callingUid The caller's uid.
+ * @return {@code true} if the user is allowed to suspend packages by the caller.
+ */
+ boolean isSuspendAllowedForUser(int userId, int callingUid) {
+ final UserManagerService userManager = mInjector.getUserManagerService();
+ return isCallerDeviceOrProfileOwner(userId, callingUid)
+ || (!userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL, userId)
+ && !userManager.hasUserRestriction(UserManager.DISALLOW_UNINSTALL_APPS, userId));
+ }
+
+ /**
+ * Returns an array of booleans, such that the ith boolean denotes whether the ith package can
+ * be suspended or not.
+ *
+ * @param packageNames The package names to check suspendability for.
+ * @param userId The user to check in
+ * @param callingUid The caller's uid.
+ * @return An array containing results of the checks
+ */
+ @NonNull
+ boolean[] canSuspendPackageForUser(@NonNull String[] packageNames, int userId, int callingUid) {
+ final boolean[] canSuspend = new boolean[packageNames.length];
+ final boolean isCallerOwner = isCallerDeviceOrProfileOwner(userId, callingUid);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ final DefaultAppProvider defaultAppProvider = mInjector.getDefaultAppProvider();
+ final String activeLauncherPackageName = defaultAppProvider.getDefaultHome(userId);
+ final String dialerPackageName = defaultAppProvider.getDefaultDialer(userId);
+ final String requiredInstallerPackage = getKnownPackageName(PACKAGE_INSTALLER, userId);
+ final String requiredUninstallerPackage =
+ getKnownPackageName(PACKAGE_UNINSTALLER, userId);
+ final String requiredVerifierPackage = getKnownPackageName(PACKAGE_VERIFIER, userId);
+ final String requiredPermissionControllerPackage =
+ getKnownPackageName(PACKAGE_PERMISSION_CONTROLLER, userId);
+ for (int i = 0; i < packageNames.length; i++) {
+ canSuspend[i] = false;
+ final String packageName = packageNames[i];
+
+ if (mPm.isPackageDeviceAdmin(packageName, userId)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": has an active device admin");
+ continue;
+ }
+ if (packageName.equals(activeLauncherPackageName)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": contains the active launcher");
+ continue;
+ }
+ if (packageName.equals(requiredInstallerPackage)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": required for package installation");
+ continue;
+ }
+ if (packageName.equals(requiredUninstallerPackage)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": required for package uninstallation");
+ continue;
+ }
+ if (packageName.equals(requiredVerifierPackage)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": required for package verification");
+ continue;
+ }
+ if (packageName.equals(dialerPackageName)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": is the default dialer");
+ continue;
+ }
+ if (packageName.equals(requiredPermissionControllerPackage)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": required for permissions management");
+ continue;
+ }
+ synchronized (mPm.mLock) {
+ if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": protected package");
+ continue;
+ }
+ if (!isCallerOwner && mPm.mSettings.getBlockUninstallLPr(userId, packageName)) {
+ Slog.w(TAG, "Cannot suspend package \"" + packageName
+ + "\": blocked by admin");
+ continue;
+ }
+
+ AndroidPackage pkg = mPm.mPackages.get(packageName);
+ if (pkg != null) {
+ // Cannot suspend SDK libs as they are controlled by SDK manager.
+ if (pkg.isSdkLibrary()) {
+ Slog.w(TAG, "Cannot suspend package: " + packageName
+ + " providing SDK library: "
+ + pkg.getSdkLibName());
+ continue;
+ }
+ // Cannot suspend static shared libs as they are considered
+ // a part of the using app (emulating static linking). Also
+ // static libs are installed always on internal storage.
+ if (pkg.isStaticSharedLibrary()) {
+ Slog.w(TAG, "Cannot suspend package: " + packageName
+ + " providing static shared library: "
+ + pkg.getStaticSharedLibName());
+ continue;
+ }
+ }
+ }
+ if (PLATFORM_PACKAGE_NAME.equals(packageName)) {
+ Slog.w(TAG, "Cannot suspend the platform package: " + packageName);
+ continue;
+ }
+ canSuspend[i] = true;
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ return canSuspend;
+ }
+
+ /**
+ * Send broadcast intents for packages suspension changes.
+ *
+ * @param intent The action name of the suspension intent.
+ * @param pkgList The names of packages which have suspension changes.
+ * @param uidList The uids of packages which have suspension changes.
+ * @param userId The user where packages reside.
+ */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
+ void sendPackagesSuspendedForUser(@NonNull String intent, @NonNull String[] pkgList,
+ @NonNull int[] uidList, int userId) {
+ final List<List<String>> pkgsToSend = new ArrayList(pkgList.length);
+ final List<IntArray> uidsToSend = new ArrayList(pkgList.length);
+ final List<SparseArray<int[]>> allowListsToSend = new ArrayList(pkgList.length);
+ final int[] userIds = new int[] {userId};
+ // Get allow lists for the pkg in the pkgList. Merge into the existed pkgs and uids if
+ // allow lists are the same.
+ for (int i = 0; i < pkgList.length; i++) {
+ final String pkgName = pkgList[i];
+ final int uid = uidList[i];
+ SparseArray<int[]> allowList = mInjector.getAppsFilter().getVisibilityAllowList(
+ mPm.getPackageStateInternal(pkgName, SYSTEM_UID),
+ userIds, mPm.getPackageStates());
+ if (allowList == null) {
+ allowList = new SparseArray<>(0);
+ }
+ boolean merged = false;
+ for (int j = 0; j < allowListsToSend.size(); j++) {
+ if (Arrays.equals(allowListsToSend.get(j).get(userId), allowList.get(userId))) {
+ pkgsToSend.get(j).add(pkgName);
+ uidsToSend.get(j).add(uid);
+ merged = true;
+ break;
+ }
+ }
+ if (!merged) {
+ pkgsToSend.add(new ArrayList<>(Arrays.asList(pkgName)));
+ uidsToSend.add(IntArray.wrap(new int[] {uid}));
+ allowListsToSend.add(allowList);
+ }
+ }
+
+ final Handler handler = mInjector.getHandler();
+ for (int i = 0; i < pkgsToSend.size(); i++) {
+ final Bundle extras = new Bundle(3);
+ extras.putStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST,
+ pkgsToSend.get(i).toArray(new String[pkgsToSend.get(i).size()]));
+ extras.putIntArray(Intent.EXTRA_CHANGED_UID_LIST, uidsToSend.get(i).toArray());
+ final SparseArray<int[]> allowList = allowListsToSend.get(i).size() == 0
+ ? null : allowListsToSend.get(i);
+ handler.post(() -> mBroadcastHelper.sendPackageBroadcast(intent, null /* pkg */,
+ extras, Intent.FLAG_RECEIVER_REGISTERED_ONLY, null /* targetPkg */,
+ null /* finishedReceiver */, userIds, null /* instantUserIds */,
+ allowList, null /* bOptions */));
+ }
+ }
+
+ private String getKnownPackageName(@KnownPackage int knownPackage, int userId) {
+ final String[] knownPackages = mPm.getKnownPackageNamesInternal(knownPackage, userId);
+ return knownPackages.length > 0 ? knownPackages[0] : null;
+ }
+
+ private boolean isCallerDeviceOrProfileOwner(int userId, int callingUid) {
+ if (callingUid == SYSTEM_UID) {
+ return true;
+ }
+ final String ownerPackage = mProtectedPackages.getDeviceOwnerOrProfileOwnerPackage(userId);
+ if (ownerPackage != null) {
+ return callingUid == mPm.getPackageUidInternal(
+ ownerPackage, 0, userId, callingUid);
+ }
+ return false;
+ }
+
+ private void sendMyPackageSuspendedOrUnsuspended(String[] affectedPackages, boolean suspended,
+ int userId) {
+ final Handler handler = mInjector.getHandler();
+ final String action = suspended
+ ? Intent.ACTION_MY_PACKAGE_SUSPENDED
+ : Intent.ACTION_MY_PACKAGE_UNSUSPENDED;
+ handler.post(() -> {
+ final IActivityManager am = ActivityManager.getService();
+ if (am == null) {
+ Slog.wtf(TAG, "IActivityManager null. Cannot send MY_PACKAGE_ "
+ + (suspended ? "" : "UN") + "SUSPENDED broadcasts");
+ return;
+ }
+ final int[] targetUserIds = new int[] {userId};
+ for (String packageName : affectedPackages) {
+ final Bundle appExtras = suspended
+ ? getSuspendedPackageAppExtras(packageName, userId, SYSTEM_UID)
+ : null;
+ final Bundle intentExtras;
+ if (appExtras != null) {
+ intentExtras = new Bundle(1);
+ intentExtras.putBundle(Intent.EXTRA_SUSPENDED_PACKAGE_EXTRAS, appExtras);
+ } else {
+ intentExtras = null;
+ }
+ handler.post(() -> mBroadcastHelper.doSendBroadcast(action, null, intentExtras,
+ Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND, packageName, null,
+ targetUserIds, false, null, null));
+ }
+ });
+ }
+}
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index d29dbbc..d6e88f4 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -3675,9 +3675,18 @@
@UserInfoFlag int flags, @UserIdInt int parentId,
@Nullable String[] disallowedPackages)
throws UserManager.CheckedUserOperationException {
- String restriction = (UserManager.isUserTypeManagedProfile(userType))
- ? UserManager.DISALLOW_ADD_MANAGED_PROFILE
- : UserManager.DISALLOW_ADD_USER;
+
+ // Checking user restriction before creating new user,
+ // default check is for DISALLOW_ADD_USER
+ // If new user is of type CLONE, check if creation of clone profile is allowed
+ // If new user is of type MANAGED, check if creation of managed profile is allowed
+ String restriction = UserManager.DISALLOW_ADD_USER;
+ if (UserManager.isUserTypeCloneProfile(userType)) {
+ restriction = UserManager.DISALLOW_ADD_CLONE_PROFILE;
+ } else if (UserManager.isUserTypeManagedProfile(userType)) {
+ restriction = UserManager.DISALLOW_ADD_MANAGED_PROFILE;
+ }
+
enforceUserRestriction(restriction, UserHandle.getCallingUserId(),
"Cannot add user");
return createUserInternalUnchecked(name, userType, flags, parentId,
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index 0f3b4bc..1fa9013 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -101,6 +101,7 @@
UserManager.DISALLOW_FACTORY_RESET,
UserManager.DISALLOW_ADD_USER,
UserManager.DISALLOW_ADD_MANAGED_PROFILE,
+ UserManager.DISALLOW_ADD_CLONE_PROFILE,
UserManager.ENSURE_VERIFY_APPS,
UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,
UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
diff --git a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java
index 4bbe373..d455be7 100644
--- a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java
+++ b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java
@@ -162,7 +162,10 @@
* The delay to wait before revoking on the event an app is terminated. Recommended to be long
* enough so that apps don't lose permission on an immediate restart
*/
- private static long getKilledDelayMillis() {
+ private long getKilledDelayMillis(boolean isSelfRevokedPermissionSession) {
+ if (isSelfRevokedPermissionSession) {
+ return 0;
+ }
return DeviceConfig.getLong(DeviceConfig.NAMESPACE_PERMISSIONS,
PROPERTY_KILLED_DELAY_CONFIG_KEY, DEFAULT_KILLED_DELAY_MILLIS);
}
@@ -175,6 +178,18 @@
mContext.registerReceiver(mUninstallListener, new IntentFilter(Intent.ACTION_UID_REMOVED));
}
+ void setSelfRevokedPermissionSession(int uid) {
+ synchronized (mLock) {
+ PackageInactivityListener listener = mListeners.get(uid);
+ if (listener == null) {
+ Log.e(LOG_TAG, "Could not set session for uid " + uid
+ + " as self-revoke session: session not found");
+ return;
+ }
+ listener.setSelfRevokedPermissionSession();
+ }
+ }
+
/**
* A class which watches a package for inactivity and notifies the permission controller when
* the package becomes inactive
@@ -189,6 +204,7 @@
private final int mImportanceToResetTimer;
private final int mImportanceToKeepSessionAlive;
+ private boolean mIsSelfRevokedPermissionSession;
private boolean mIsAlarmSet;
private boolean mIsFinished;
@@ -255,7 +271,7 @@
}
onImportanceChanged(mUid, imp);
}
- }, mToken, getKilledDelayMillis());
+ }, mToken, getKilledDelayMillis(mIsSelfRevokedPermissionSession));
return;
}
if (importance > mImportanceToResetTimer) {
@@ -291,6 +307,14 @@
}
/**
+ * Marks the session as a self-revoke session, which does not delay the revocation when
+ * the app is restarting.
+ */
+ public void setSelfRevokedPermissionSession() {
+ mIsSelfRevokedPermissionSession = true;
+ }
+
+ /**
* Set the alarm which will callback when the package is inactive
*/
@GuardedBy("mInnerLock")
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 1cfcdf51..317730a 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -66,6 +66,7 @@
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.infra.AndroidFuture;
import com.android.internal.util.Preconditions;
import com.android.internal.util.function.TriFunction;
import com.android.server.LocalServices;
@@ -558,9 +559,18 @@
}
@Override
- public void selfRevokePermissions(@NonNull String packageName,
+ public void revokeOwnPermissionsOnKill(@NonNull String packageName,
@NonNull List<String> permissions) {
- mPermissionManagerServiceImpl.selfRevokePermissions(packageName, permissions);
+ final int callingUid = Binder.getCallingUid();
+ final int callingUserId = UserHandle.getUserId(callingUid);
+ AndroidFuture<Void> future = new AndroidFuture<>();
+ future.whenComplete((result, err) -> {
+ if (err == null) {
+ getOneTimePermissionUserManager(callingUserId)
+ .setSelfRevokedPermissionSession(callingUid);
+ }
+ });
+ mPermissionManagerServiceImpl.revokeOwnPermissionsOnKill(packageName, permissions, future);
}
@Override
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 981fd8e..9b3d6d6 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -113,6 +113,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.compat.IPlatformCompat;
+import com.android.internal.infra.AndroidFuture;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.os.RoSystemProperties;
@@ -1592,7 +1593,8 @@
}
@Override
- public void selfRevokePermissions(String packageName, List<String> permissions) {
+ public void revokeOwnPermissionsOnKill(String packageName, List<String> permissions,
+ AndroidFuture<Void> callback) {
final int callingUid = Binder.getCallingUid();
int callingUserId = UserHandle.getUserId(callingUid);
int targetPackageUid = mPackageManagerInt.getPackageUid(packageName, 0, callingUserId);
@@ -1607,7 +1609,8 @@
+ permName + " because it does not hold that permission");
}
}
- mPermissionControllerManager.selfRevokePermissions(packageName, permissions);
+ mPermissionControllerManager.revokeOwnPermissionsOnKill(packageName, permissions,
+ callback);
}
private boolean mayManageRolePermission(int uid) {
@@ -3181,9 +3184,13 @@
ps.updatePermissionFlags(bp, PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
| FLAG_PERMISSION_REVOKE_WHEN_REQUESTED,
PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED);
- // TODO(b/205888750): remove revoke once propagated through droidfood
- if (ps.isPermissionGranted(newPerm)) {
+ // TODO(b/205888750): remove if/else block once propagated through droidfood
+ if (ps.isPermissionGranted(newPerm)
+ && pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M) {
ps.revokePermission(bp);
+ } else if (!ps.isPermissionGranted(newPerm)
+ && pkg.getTargetSdkVersion() < Build.VERSION_CODES.M) {
+ ps.grantPermission(bp);
}
}
}
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInterface.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInterface.java
index c582f9e..91c558b 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInterface.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceInterface.java
@@ -27,6 +27,7 @@
import android.permission.IOnPermissionsChangeListener;
import android.permission.PermissionManagerInternal;
+import com.android.internal.infra.AndroidFuture;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.io.FileDescriptor;
@@ -343,8 +344,10 @@
*
* @param packageName The name of the package for which the permissions will be revoked.
* @param permissions List of permissions to be revoked.
+ * @param callback Callback called when the revocation request has been completed.
*/
- void selfRevokePermissions(String packageName, List<String> permissions);
+ void revokeOwnPermissionsOnKill(String packageName, List<String> permissions,
+ AndroidFuture<Void> callback);
/**
* Get whether you should show UI with rationale for requesting a permission. You should do this
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
index 18a6435..52d9b7a 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java
@@ -26,6 +26,10 @@
import android.content.pm.FeatureInfo;
import android.content.pm.PackageManager.Property;
import android.content.pm.SigningDetails;
+import android.os.Bundle;
+import android.util.SparseArray;
+import android.util.SparseIntArray;
+
import com.android.server.pm.pkg.component.ParsedActivity;
import com.android.server.pm.pkg.component.ParsedApexSystemService;
import com.android.server.pm.pkg.component.ParsedAttribution;
@@ -37,9 +41,6 @@
import com.android.server.pm.pkg.component.ParsedProvider;
import com.android.server.pm.pkg.component.ParsedService;
import com.android.server.pm.pkg.component.ParsedUsesPermission;
-import android.os.Bundle;
-import android.util.SparseArray;
-import android.util.SparseIntArray;
import java.security.PublicKey;
import java.util.Map;
@@ -286,6 +287,9 @@
ParsingPackage setInstallLocation(int installLocation);
+ /** @see R#styleable.AndroidManifest_inheritKeyStoreKeys */
+ ParsingPackage setInheritKeyStoreKeys(boolean inheritKeyStoreKeys);
+
ParsingPackage setLabelRes(int labelRes);
ParsingPackage setLargestWidthLimitDp(int largestWidthLimitDp);
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageImpl.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageImpl.java
index c4de862..1f21938 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageImpl.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageImpl.java
@@ -492,6 +492,10 @@
ENABLED,
DISALLOW_PROFILING,
REQUEST_FOREGROUND_SERVICE_EXEMPTION,
+ ATTRIBUTIONS_ARE_USER_VISIBLE,
+ RESET_ENABLED_SETTINGS_ON_APP_DATA_CLEARED,
+ SDK_LIBRARY,
+ INHERIT_KEYSTORE_KEYS,
})
public @interface Values {}
private static final long EXTERNAL_STORAGE = 1L;
@@ -544,6 +548,7 @@
private static final long ATTRIBUTIONS_ARE_USER_VISIBLE = 1L << 47;
private static final long RESET_ENABLED_SETTINGS_ON_APP_DATA_CLEARED = 1L << 48;
private static final long SDK_LIBRARY = 1L << 49;
+ private static final long INHERIT_KEYSTORE_KEYS = 1L << 50;
}
private ParsingPackageImpl setBoolean(@Booleans.Values long flag, boolean value) {
@@ -2371,6 +2376,11 @@
}
@Override
+ public boolean shouldInheritKeyStoreKeys() {
+ return getBoolean(Booleans.INHERIT_KEYSTORE_KEYS);
+ }
+
+ @Override
public ParsingPackageImpl setBaseRevisionCode(int value) {
baseRevisionCode = value;
return this;
@@ -2514,6 +2524,11 @@
}
@Override
+ public ParsingPackageImpl setInheritKeyStoreKeys(boolean value) {
+ return setBoolean(Booleans.INHERIT_KEYSTORE_KEYS, value);
+ }
+
+ @Override
public ParsingPackageImpl setLabelRes(int value) {
labelRes = value;
return this;
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageRead.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageRead.java
index 1497112..4b659a14 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageRead.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageRead.java
@@ -350,4 +350,9 @@
* @see R.styleable#AndroidManifestApplication_localeConfig
*/
int getLocaleConfigRes();
+
+ /**
+ * @see R.styleable#AndroidManifest_inheritKeyStoreKeys
+ */
+ boolean shouldInheritKeyStoreKeys();
}
diff --git a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
index 1ce01f6..bf7c55f 100644
--- a/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
@@ -868,7 +868,9 @@
.setTargetSandboxVersion(anInteger(PARSE_DEFAULT_TARGET_SANDBOX,
R.styleable.AndroidManifest_targetSandboxVersion, sa))
/* Set the global "on SD card" flag */
- .setExternalStorage((flags & PARSE_EXTERNAL_STORAGE) != 0);
+ .setExternalStorage((flags & PARSE_EXTERNAL_STORAGE) != 0)
+ .setInheritKeyStoreKeys(bool(false,
+ R.styleable.AndroidManifest_inheritKeyStoreKeys, sa));
boolean foundApp = false;
final int depth = parser.getDepth();
diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
index 16176f0..b7ca4de 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -121,7 +121,6 @@
import android.os.OutcomeReceiver;
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
-import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceSpecificException;
@@ -231,7 +230,6 @@
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -2332,11 +2330,7 @@
List<ProcessMemoryState> managedProcessList =
LocalServices.getService(ActivityManagerInternal.class)
.getMemoryStateForProcesses();
- managedProcessList.sort(Comparator.comparingInt(x -> x.oomScore));
for (ProcessMemoryState process : managedProcessList) {
- if (process.uid == Process.SYSTEM_UID) {
- continue;
- }
KernelAllocationStats.ProcessDmabuf proc =
KernelAllocationStats.getDmabufAllocations(process.pid);
if (proc == null || (proc.retainedBuffersCount <= 0 && proc.mappedBuffersCount <= 0)) {
@@ -2353,6 +2347,32 @@
proc.mappedSizeKb,
proc.mappedBuffersCount));
}
+ SparseArray<String> processCmdlines = getProcessCmdlines();
+ managedProcessList.forEach(managedProcess -> processCmdlines.delete(managedProcess.pid));
+ int size = processCmdlines.size();
+ for (int i = 0; i < size; ++i) {
+ int pid = processCmdlines.keyAt(i);
+ int uid = getUidForPid(pid);
+ // ignore root processes (unlikely to be interesting)
+ if (uid <= 0) {
+ continue;
+ }
+ KernelAllocationStats.ProcessDmabuf proc =
+ KernelAllocationStats.getDmabufAllocations(pid);
+ if (proc == null || (proc.retainedBuffersCount <= 0 && proc.mappedBuffersCount <= 0)) {
+ continue;
+ }
+ pulledData.add(
+ FrameworkStatsLog.buildStatsEvent(
+ atomTag,
+ uid,
+ processCmdlines.valueAt(i),
+ -1001 /*Placeholder for native processes, OOM_SCORE_ADJ_MIN - 1.*/,
+ proc.retainedSizeKb,
+ proc.retainedBuffersCount,
+ proc.mappedSizeKb,
+ proc.mappedBuffersCount));
+ }
return StatsManager.PULL_SUCCESS;
}
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 17f5566..0edd06a 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -22,6 +22,7 @@
import static android.app.StatusBarManager.NAV_BAR_MODE_OVERRIDE_NONE;
import static android.app.StatusBarManager.NavBarModeOverride;
import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
import android.Manifest;
import android.annotation.NonNull;
@@ -38,6 +39,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.om.IOverlayManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal;
import android.content.pm.ResolveInfo;
@@ -60,6 +62,7 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
+import android.os.ServiceManager;
import android.os.ShellCallback;
import android.os.UserHandle;
import android.provider.Settings;
@@ -79,6 +82,7 @@
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.inputmethod.SoftInputShowHideReason;
import com.android.internal.os.TransferPipe;
import com.android.internal.statusbar.IAddTileResultCallback;
@@ -154,6 +158,8 @@
private final ArrayMap<String, Long> mCurrentRequestAddTilePackages = new ArrayMap<>();
private static final long REQUEST_TIME_OUT = TimeUnit.MINUTES.toNanos(5);
+ private IOverlayManager mOverlayManager;
+
private class DeathRecipient implements IBinder.DeathRecipient {
public void binderDied() {
mBar.asBinder().unlinkToDeath(this,0);
@@ -256,6 +262,18 @@
mTileRequestTracker = new TileRequestTracker(mContext);
}
+ private IOverlayManager getOverlayManager() {
+ // No need to synchronize; worst-case scenario it will be fetched twice.
+ if (mOverlayManager == null) {
+ mOverlayManager = IOverlayManager.Stub.asInterface(
+ ServiceManager.getService(Context.OVERLAY_SERVICE));
+ if (mOverlayManager == null) {
+ Slog.w("StatusBarManager", "warning: no OVERLAY_SERVICE");
+ }
+ }
+ return mOverlayManager;
+ }
+
@Override
public void onDisplayAdded(int displayId) {}
@@ -1296,6 +1314,11 @@
});
}
+ @VisibleForTesting
+ void registerOverlayManager(IOverlayManager overlayManager) {
+ mOverlayManager = overlayManager;
+ }
+
/**
* @param clearNotificationEffects whether to consider notifications as "shown" and stop
* LED, vibration, and ringing
@@ -1869,6 +1892,14 @@
try {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.NAV_BAR_KIDS_MODE, navBarModeOverride, userId);
+
+ IOverlayManager overlayManager = getOverlayManager();
+ if (overlayManager != null && navBarModeOverride == NAV_BAR_MODE_OVERRIDE_KIDS
+ && isPackageSupported(NAV_BAR_MODE_3BUTTON_OVERLAY)) {
+ overlayManager.setEnabledExclusiveInCategory(NAV_BAR_MODE_3BUTTON_OVERLAY, userId);
+ }
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
} finally {
Binder.restoreCallingIdentity(userIdentity);
}
@@ -1896,6 +1927,21 @@
return navBarKidsMode;
}
+ private boolean isPackageSupported(String packageName) {
+ if (packageName == null) {
+ return false;
+ }
+ try {
+ return mContext.getPackageManager().getPackageInfo(packageName,
+ PackageManager.PackageInfoFlags.of(0)) != null;
+ } catch (PackageManager.NameNotFoundException ignored) {
+ if (SPEW) {
+ Slog.d(TAG, "Package not found: " + packageName);
+ }
+ }
+ return false;
+ }
+
/** @hide */
public void passThroughShellCommand(String[] args, FileDescriptor fd) {
enforceStatusBarOrShell();
diff --git a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
index 3093509..c0207f0 100644
--- a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
+++ b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java
@@ -37,6 +37,7 @@
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
+import android.provider.DeviceConfig;
import android.text.format.DateUtils;
import android.util.ArrayMap;
import android.util.DataUnit;
@@ -255,11 +256,14 @@
private void checkHigh() {
final StorageManager storage = getContext().getSystemService(StorageManager.class);
// Check every mounted private volume to see if they're under the high storage threshold
- // which is StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH of total space
+ // which is storageThresholdPercentHigh of total space
+ final int storageThresholdPercentHigh = DeviceConfig.getInt(
+ DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH_KEY,
+ StorageManager.DEFAULT_STORAGE_THRESHOLD_PERCENT_HIGH);
for (VolumeInfo vol : storage.getWritablePrivateVolumes()) {
final File file = vol.getPath();
- if (file.getUsableSpace() < file.getTotalSpace()
- * StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH / 100) {
+ if (file.getUsableSpace() < file.getTotalSpace() * storageThresholdPercentHigh / 100) {
final PackageManagerService pms = (PackageManagerService) ServiceManager
.getService("package");
try {
diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java
index 79231f7..06ce4a4 100644
--- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java
+++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java
@@ -16,6 +16,8 @@
package com.android.server.trust;
+import static android.service.trust.TrustAgentService.FLAG_GRANT_TRUST_DISPLAY_MESSAGE;
+
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.PendingIntent;
@@ -99,6 +101,7 @@
// Trust state
private boolean mTrusted;
private CharSequence mMessage;
+ private boolean mDisplayTrustGrantedMessage;
private boolean mTrustDisabledByDpm;
private boolean mManagingTrust;
private IBinder mSetTrustAgentFeaturesToken;
@@ -132,6 +135,7 @@
mTrusted = true;
mMessage = (CharSequence) msg.obj;
int flags = msg.arg1;
+ mDisplayTrustGrantedMessage = (flags & FLAG_GRANT_TRUST_DISPLAY_MESSAGE) != 0;
long durationMs = msg.getData().getLong(DATA_DURATION);
if (durationMs > 0) {
final long duration;
@@ -166,6 +170,7 @@
// Fall through.
case MSG_REVOKE_TRUST:
mTrusted = false;
+ mDisplayTrustGrantedMessage = false;
mMessage = null;
mHandler.removeMessages(MSG_TRUST_TIMEOUT);
if (msg.what == MSG_REVOKE_TRUST) {
@@ -199,6 +204,7 @@
mManagingTrust = msg.arg1 != 0;
if (!mManagingTrust) {
mTrusted = false;
+ mDisplayTrustGrantedMessage = false;
mMessage = null;
}
mTrustManagerService.mArchive.logManagingTrust(mUserId, mName, mManagingTrust);
@@ -271,12 +277,13 @@
private ITrustAgentServiceCallback mCallback = new ITrustAgentServiceCallback.Stub() {
@Override
- public void grantTrust(CharSequence userMessage, long durationMs, int flags) {
- if (DEBUG) Slog.d(TAG, "enableTrust(" + userMessage + ", durationMs = " + durationMs
+ public void grantTrust(CharSequence message, long durationMs, int flags) {
+ if (DEBUG) {
+ Slog.d(TAG, "enableTrust(" + message + ", durationMs = " + durationMs
+ ", flags = " + flags + ")");
+ }
- Message msg = mHandler.obtainMessage(
- MSG_GRANT_TRUST, flags, 0, userMessage);
+ Message msg = mHandler.obtainMessage(MSG_GRANT_TRUST, flags, 0, message);
msg.getData().putLong(DATA_DURATION, durationMs);
msg.sendToTarget();
}
@@ -461,6 +468,19 @@
}
/**
+ * @see android.service.trust.TrustAgentService#onUserRequestedUnlock()
+ */
+ public void onUserRequestedUnlock() {
+ try {
+ if (mTrustAgentService != null) {
+ mTrustAgentService.onUserRequestedUnlock();
+ }
+ } catch (RemoteException e) {
+ onError(e);
+ }
+ }
+
+ /**
* @see android.service.trust.TrustAgentService#onUnlockLockout(int)
*/
public void onUnlockLockout(int timeoutMs) {
@@ -579,6 +599,14 @@
return mMessage;
}
+ /**
+ * Whether the trust agent would like to display {@link #getMessage()} to the user when trust
+ * is granted.
+ */
+ public boolean shouldDisplayTrustGrantedMessage() {
+ return mDisplayTrustGrantedMessage;
+ }
+
public void destroy() {
mHandler.removeMessages(MSG_RESTART_TIMEOUT);
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index fc87253..9bed24d 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -75,7 +75,6 @@
import com.android.internal.util.DumpUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.server.SystemService;
-import com.android.server.SystemService.TargetUser;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -123,6 +122,7 @@
private static final int MSG_DISPATCH_UNLOCK_LOCKOUT = 13;
private static final int MSG_REFRESH_DEVICE_LOCKED_FOR_USER = 14;
private static final int MSG_SCHEDULE_TRUST_TIMEOUT = 15;
+ public static final int MSG_USER_REQUESTED_UNLOCK = 16;
private static final String REFRESH_DEVICE_LOCKED_EXCEPT_USER = "except";
@@ -391,7 +391,6 @@
}
}
-
public void updateTrust(int userId, int flags) {
updateTrust(userId, flags, false /* isFromUnlock */);
}
@@ -431,7 +430,7 @@
changed = mUserIsTrusted.get(userId) != trusted;
mUserIsTrusted.put(userId, trusted);
}
- dispatchOnTrustChanged(trusted, userId, flags);
+ dispatchOnTrustChanged(trusted, userId, flags, getTrustGrantedMessages(userId));
if (changed) {
refreshDeviceLockedForUser(userId);
if (!trusted) {
@@ -951,6 +950,24 @@
return false;
}
+ private List<String> getTrustGrantedMessages(int userId) {
+ if (!mStrongAuthTracker.isTrustAllowedForUser(userId)) {
+ return new ArrayList<>();
+ }
+
+ List<String> trustGrantedMessages = new ArrayList<>();
+ for (int i = 0; i < mActiveAgents.size(); i++) {
+ AgentInfo info = mActiveAgents.valueAt(i);
+ if (info.userId == userId
+ && info.agent.isTrusted()
+ && info.agent.shouldDisplayTrustGrantedMessage()
+ && !TextUtils.isEmpty(info.agent.getMessage())) {
+ trustGrantedMessages.add(info.agent.getMessage().toString());
+ }
+ }
+ return trustGrantedMessages;
+ }
+
private boolean aggregateIsTrustManaged(int userId) {
if (!mStrongAuthTracker.isTrustAllowedForUser(userId)) {
return false;
@@ -981,6 +998,15 @@
}
}
+ private void dispatchUserRequestedUnlock(int userId) {
+ for (int i = 0; i < mActiveAgents.size(); i++) {
+ AgentInfo info = mActiveAgents.valueAt(i);
+ if (info.userId == userId) {
+ info.agent.onUserRequestedUnlock();
+ }
+ }
+ }
+
private void dispatchUnlockLockout(int timeoutMs, int userId) {
for (int i = 0; i < mActiveAgents.size(); i++) {
AgentInfo info = mActiveAgents.valueAt(i);
@@ -1011,7 +1037,8 @@
}
}
- private void dispatchOnTrustChanged(boolean enabled, int userId, int flags) {
+ private void dispatchOnTrustChanged(boolean enabled, int userId, int flags,
+ @NonNull List<String> trustGrantedMessages) {
if (DEBUG) {
Log.i(TAG, "onTrustChanged(" + enabled + ", " + userId + ", 0x"
+ Integer.toHexString(flags) + ")");
@@ -1019,7 +1046,7 @@
if (!enabled) flags = 0;
for (int i = 0; i < mTrustListeners.size(); i++) {
try {
- mTrustListeners.get(i).onTrustChanged(enabled, userId, flags);
+ mTrustListeners.get(i).onTrustChanged(enabled, userId, flags, trustGrantedMessages);
} catch (DeadObjectException e) {
Slog.d(TAG, "Removing dead TrustListener.");
mTrustListeners.remove(i);
@@ -1110,6 +1137,12 @@
}
@Override
+ public void reportUserRequestedUnlock(int userId) throws RemoteException {
+ enforceReportPermission();
+ mHandler.obtainMessage(MSG_USER_REQUESTED_UNLOCK, userId).sendToTarget();
+ }
+
+ @Override
public void reportUnlockLockout(int timeoutMs, int userId) throws RemoteException {
enforceReportPermission();
mHandler.obtainMessage(MSG_DISPATCH_UNLOCK_LOCKOUT, timeoutMs, userId)
@@ -1389,6 +1422,9 @@
case MSG_DISPATCH_UNLOCK_ATTEMPT:
dispatchUnlockAttempt(msg.arg1 != 0, msg.arg2);
break;
+ case MSG_USER_REQUESTED_UNLOCK:
+ dispatchUserRequestedUnlock(msg.arg1);
+ break;
case MSG_DISPATCH_UNLOCK_LOCKOUT:
dispatchUnlockLockout(msg.arg1, msg.arg2);
break;
diff --git a/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java b/services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java
similarity index 97%
rename from services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java
rename to services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java
index 6058d88..b3649a7 100644
--- a/services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java
+++ b/services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java
@@ -34,15 +34,16 @@
import android.media.tv.BroadcastInfoRequest;
import android.media.tv.BroadcastInfoResponse;
import android.media.tv.TvTrackInfo;
-import android.media.tv.interactive.ITvIAppManager;
+import android.media.tv.interactive.AppLinkInfo;
import android.media.tv.interactive.ITvInteractiveAppClient;
+import android.media.tv.interactive.ITvInteractiveAppManager;
import android.media.tv.interactive.ITvInteractiveAppManagerCallback;
import android.media.tv.interactive.ITvInteractiveAppService;
import android.media.tv.interactive.ITvInteractiveAppServiceCallback;
import android.media.tv.interactive.ITvInteractiveAppSession;
import android.media.tv.interactive.ITvInteractiveAppSessionCallback;
-import android.media.tv.interactive.TvIAppService;
import android.media.tv.interactive.TvInteractiveAppInfo;
+import android.media.tv.interactive.TvInteractiveAppService;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
@@ -79,9 +80,9 @@
/**
* This class provides a system service that manages interactive TV applications.
*/
-public class TvIAppManagerService extends SystemService {
+public class TvInteractiveAppManagerService extends SystemService {
private static final boolean DEBUG = false;
- private static final String TAG = "TvIAppManagerService";
+ private static final String TAG = "TvInteractiveAppManagerService";
// A global lock.
private final Object mLock = new Object();
private final Context mContext;
@@ -95,6 +96,10 @@
@GuardedBy("mLock")
private final SparseArray<UserState> mUserStates = new SparseArray<>();
+ // TODO: remove mGetServiceListCalled if onBootPhrase work correctly
+ @GuardedBy("mLock")
+ private boolean mGetServiceListCalled = false;
+
private final UserManager mUserManager;
/**
@@ -106,7 +111,7 @@
*
* @param context The system server context.
*/
- public TvIAppManagerService(Context context) {
+ public TvInteractiveAppManagerService(Context context) {
super(context);
mContext = context;
mUserManager = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
@@ -122,7 +127,7 @@
}
PackageManager pm = mContext.getPackageManager();
List<ResolveInfo> services = pm.queryIntentServicesAsUser(
- new Intent(TvIAppService.SERVICE_INTERFACE),
+ new Intent(TvInteractiveAppService.SERVICE_INTERFACE),
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
userId);
List<TvInteractiveAppInfo> iAppList = new ArrayList<>();
@@ -256,15 +261,16 @@
@GuardedBy("mLock")
private void notifyStateChangedLocked(
- UserState userState, String iAppServiceId, int type, int state) {
+ UserState userState, String iAppServiceId, int type, int state, int err) {
if (DEBUG) {
Slog.d(TAG, "notifyRteStateChanged(iAppServiceId="
- + iAppServiceId + ", type=" + type + ", state=" + state + ")");
+ + iAppServiceId + ", type=" + type + ", state=" + state + ", err=" + err + ")");
}
int n = userState.mCallbacks.beginBroadcast();
for (int i = 0; i < n; ++i) {
try {
- userState.mCallbacks.getBroadcastItem(i).onStateChanged(iAppServiceId, type, state);
+ userState.mCallbacks.getBroadcastItem(i)
+ .onStateChanged(iAppServiceId, type, state, err);
} catch (RemoteException e) {
Slog.e(TAG, "failed to report RTE state changed", e);
}
@@ -287,7 +293,7 @@
if (DEBUG) {
Slogf.d(TAG, "onStart");
}
- publishBinderService(Context.TV_IAPP_SERVICE, new BinderService());
+ publishBinderService(Context.TV_INTERACTIVE_APP_SERVICE, new BinderService());
}
@Override
@@ -628,7 +634,7 @@
return session;
}
- private final class BinderService extends ITvIAppManager.Stub {
+ private final class BinderService extends ITvInteractiveAppManager.Stub {
@Override
public List<TvInteractiveAppInfo> getTvInteractiveAppServiceList(int userId) {
@@ -637,6 +643,10 @@
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
+ if (!mGetServiceListCalled) {
+ buildTvInteractiveAppServiceListLocked(userId, null);
+ mGetServiceListCalled = true;
+ }
UserState userState = getOrCreateUserStateLocked(resolvedUserId);
List<TvInteractiveAppInfo> iAppList = new ArrayList<>();
for (TvInteractiveAppState state : userState.mIAppMap.values()) {
@@ -686,9 +696,9 @@
}
@Override
- public void registerAppLinkInfo(String tiasId, Bundle appLinkInfo, int userId) {
+ public void registerAppLinkInfo(String tiasId, AppLinkInfo appLinkInfo, int userId) {
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
- Binder.getCallingUid(), userId, "registerAppLinkInfo");
+ Binder.getCallingUid(), userId, "registerAppLinkInfo: " + appLinkInfo);
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
@@ -722,9 +732,9 @@
}
@Override
- public void unregisterAppLinkInfo(String tiasId, Bundle appLinkInfo, int userId) {
+ public void unregisterAppLinkInfo(String tiasId, AppLinkInfo appLinkInfo, int userId) {
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
- Binder.getCallingUid(), userId, "unregisterAppLinkInfo");
+ Binder.getCallingUid(), userId, "unregisterAppLinkInfo: " + appLinkInfo);
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
@@ -1361,7 +1371,7 @@
}
} finally {
if (surface != null) {
- // surface is not used in TvIAppManagerService.
+ // surface is not used in TvInteractiveAppManagerService.
surface.release();
}
Binder.restoreCallingIdentity(identity);
@@ -1678,7 +1688,7 @@
}
Intent i =
- new Intent(TvIAppService.SERVICE_INTERFACE).setComponent(component);
+ new Intent(TvInteractiveAppService.SERVICE_INTERFACE).setComponent(component);
serviceState.mBound = mContext.bindServiceAsUser(
i, serviceState.mConnection,
Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,
@@ -1810,7 +1820,7 @@
private final ServiceConnection mConnection;
private final ComponentName mComponent;
private final String mIAppServiceId;
- private final List<Pair<Bundle, Boolean>> mPendingAppLinkInfo = new ArrayList<>();
+ private final List<Pair<AppLinkInfo, Boolean>> mPendingAppLinkInfo = new ArrayList<>();
private final List<Bundle> mPendingAppLinkCommand = new ArrayList<>();
private boolean mPendingPrepare = false;
@@ -1833,7 +1843,7 @@
mIAppServiceId = tias;
}
- private void addPendingAppLink(Bundle info, boolean register) {
+ private void addPendingAppLink(AppLinkInfo info, boolean register) {
mPendingAppLinkInfo.add(Pair.create(info, register));
}
@@ -1866,6 +1876,16 @@
ServiceState serviceState = userState.mServiceStateMap.get(mComponent);
serviceState.mService = ITvInteractiveAppService.Stub.asInterface(service);
+ // Register a callback, if we need to.
+ if (serviceState.mCallback == null) {
+ serviceState.mCallback = new ServiceCallback(mComponent, mUserId);
+ try {
+ serviceState.mService.registerCallback(serviceState.mCallback);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "error in registerCallback", e);
+ }
+ }
+
if (serviceState.mPendingPrepare) {
final long identity = Binder.clearCallingIdentity();
try {
@@ -1880,10 +1900,10 @@
}
if (!serviceState.mPendingAppLinkInfo.isEmpty()) {
- for (Iterator<Pair<Bundle, Boolean>> it =
+ for (Iterator<Pair<AppLinkInfo, Boolean>> it =
serviceState.mPendingAppLinkInfo.iterator();
it.hasNext(); ) {
- Pair<Bundle, Boolean> appLinkInfoPair = it.next();
+ Pair<AppLinkInfo, Boolean> appLinkInfoPair = it.next();
final long identity = Binder.clearCallingIdentity();
try {
if (appLinkInfoPair.second) {
@@ -1968,14 +1988,14 @@
}
@Override
- public void onStateChanged(int type, int state) {
+ public void onStateChanged(int type, int state, int error) {
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
ServiceState serviceState = getServiceStateLocked(mComponent, mUserId);
String iAppServiceId = serviceState.mIAppServiceId;
UserState userState = getUserStateLocked(mUserId);
- notifyStateChangedLocked(userState, iAppServiceId, type, state);
+ notifyStateChangedLocked(userState, iAppServiceId, type, state, error);
}
} finally {
Binder.restoreCallingIdentity(identity);
@@ -2072,7 +2092,7 @@
@Override
public void onCommandRequest(
- @TvIAppService.InteractiveAppServiceCommandType String cmdType,
+ @TvInteractiveAppService.InteractiveAppServiceCommandType String cmdType,
Bundle parameters) {
synchronized (mLock) {
if (DEBUG) {
@@ -2210,16 +2230,16 @@
}
@Override
- public void onSessionStateChanged(int state) {
+ public void onSessionStateChanged(int state, int err) {
synchronized (mLock) {
if (DEBUG) {
- Slogf.d(TAG, "onSessionStateChanged (state=" + state + ")");
+ Slogf.d(TAG, "onSessionStateChanged (state=" + state + ", err=" + err + ")");
}
if (mSessionState.mSession == null || mSessionState.mClient == null) {
return;
}
try {
- mSessionState.mClient.onSessionStateChanged(state, mSessionState.mSeq);
+ mSessionState.mClient.onSessionStateChanged(state, err, mSessionState.mSeq);
} catch (RemoteException e) {
Slogf.e(TAG, "error in onSessionStateChanged", e);
}
diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java
index 3442704..6aa06e8 100644
--- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java
+++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java
@@ -104,7 +104,8 @@
import java.util.Objects;
/** Manages uri grants. */
-public class UriGrantsManagerService extends IUriGrantsManager.Stub {
+public class UriGrantsManagerService extends IUriGrantsManager.Stub implements
+ UriMetricsHelper.PersistentUriGrantsProvider {
private static final boolean DEBUG = false;
private static final String TAG = "UriGrantsManagerService";
// Maximum number of persisted Uri grants a package is allowed
@@ -115,6 +116,7 @@
private final H mH;
ActivityManagerInternal mAmInternal;
PackageManagerInternal mPmInternal;
+ UriMetricsHelper mMetricsHelper;
/** File storing persisted {@link #mGrantedUriPermissions}. */
private final AtomicFile mGrantFile;
@@ -168,16 +170,19 @@
}
public static final class Lifecycle extends SystemService {
+ private final Context mContext;
private final UriGrantsManagerService mService;
public Lifecycle(Context context) {
super(context);
+ mContext = context;
mService = new UriGrantsManagerService();
}
@Override
public void onStart() {
publishBinderService(Context.URI_GRANTS_SERVICE, mService);
+ mService.mMetricsHelper = new UriMetricsHelper(mContext, mService);
mService.start();
}
@@ -186,6 +191,7 @@
if (phase == PHASE_SYSTEM_SERVICES_READY) {
mService.mAmInternal = LocalServices.getService(ActivityManagerInternal.class);
mService.mPmInternal = LocalServices.getService(PackageManagerInternal.class);
+ mService.mMetricsHelper.registerPuller();
}
}
@@ -1298,20 +1304,50 @@
return false;
}
+ @Override
+ public ArrayList<UriPermission> providePersistentUriGrants() {
+ final ArrayList<UriPermission> result = new ArrayList<>();
+
+ synchronized (mLock) {
+ final int size = mGrantedUriPermissions.size();
+ for (int i = 0; i < size; i++) {
+ final ArrayMap<GrantUri, UriPermission> perms = mGrantedUriPermissions.valueAt(i);
+
+ final int permissionsForPackageSize = perms.size();
+ for (int j = 0; j < permissionsForPackageSize; j++) {
+ final UriPermission permission = perms.valueAt(j);
+
+ if (permission.persistedModeFlags != 0) {
+ result.add(permission);
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
private void writeGrantedUriPermissions() {
if (DEBUG) Slog.v(TAG, "writeGrantedUriPermissions()");
final long startTime = SystemClock.uptimeMillis();
+ int persistentUriPermissionsCount = 0;
+
// Snapshot permissions so we can persist without lock
ArrayList<UriPermission.Snapshot> persist = Lists.newArrayList();
synchronized (mLock) {
final int size = mGrantedUriPermissions.size();
for (int i = 0; i < size; i++) {
final ArrayMap<GrantUri, UriPermission> perms = mGrantedUriPermissions.valueAt(i);
- for (UriPermission perm : perms.values()) {
- if (perm.persistedModeFlags != 0) {
- persist.add(perm.snapshot());
+
+ final int permissionsForPackageSize = perms.size();
+ for (int j = 0; j < permissionsForPackageSize; j++) {
+ final UriPermission permission = perms.valueAt(j);
+
+ if (permission.persistedModeFlags != 0) {
+ persistentUriPermissionsCount++;
+ persist.add(permission.snapshot());
}
}
}
@@ -1345,6 +1381,8 @@
mGrantFile.failWrite(fos);
}
}
+
+ mMetricsHelper.reportPersistentUriFlushed(persistentUriPermissionsCount);
}
final class H extends Handler {
diff --git a/services/core/java/com/android/server/uri/UriMetricsHelper.java b/services/core/java/com/android/server/uri/UriMetricsHelper.java
new file mode 100644
index 0000000..dbc9599
--- /dev/null
+++ b/services/core/java/com/android/server/uri/UriMetricsHelper.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2022 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.uri;
+
+import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;
+
+import android.app.StatsManager;
+import android.content.Context;
+import android.util.SparseArray;
+import android.util.StatsEvent;
+
+import com.android.internal.util.FrameworkStatsLog;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+final class UriMetricsHelper {
+
+ private static final StatsManager.PullAtomMetadata DAILY_PULL_METADATA =
+ new StatsManager.PullAtomMetadata.Builder()
+ .setCoolDownMillis(TimeUnit.DAYS.toMillis(1))
+ .build();
+
+
+ private final Context mContext;
+ private final PersistentUriGrantsProvider mPersistentUriGrantsProvider;
+
+ UriMetricsHelper(Context context, PersistentUriGrantsProvider provider) {
+ mContext = context;
+ mPersistentUriGrantsProvider = provider;
+ }
+
+ void registerPuller() {
+ final StatsManager statsManager = mContext.getSystemService(StatsManager.class);
+ statsManager.setPullAtomCallback(
+ FrameworkStatsLog.PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE,
+ DAILY_PULL_METADATA,
+ DIRECT_EXECUTOR,
+ (atomTag, data) -> {
+ reportPersistentUriPermissionsPerPackage(data);
+ return StatsManager.PULL_SUCCESS;
+ });
+ }
+
+ void reportPersistentUriFlushed(int amount) {
+ FrameworkStatsLog.write(
+ FrameworkStatsLog.PERSISTENT_URI_PERMISSIONS_FLUSHED,
+ amount
+ );
+ }
+
+ private void reportPersistentUriPermissionsPerPackage(List<StatsEvent> data) {
+ final ArrayList<UriPermission> persistentUriGrants =
+ mPersistentUriGrantsProvider.providePersistentUriGrants();
+
+ final SparseArray<Integer> perUidCount = new SparseArray<>();
+
+ final int persistentUriGrantsSize = persistentUriGrants.size();
+ for (int i = 0; i < persistentUriGrantsSize; i++) {
+ final UriPermission uriPermission = persistentUriGrants.get(i);
+
+ perUidCount.put(
+ uriPermission.targetUid,
+ perUidCount.get(uriPermission.targetUid, 0) + 1
+ );
+ }
+
+ final int perUidCountSize = perUidCount.size();
+ for (int i = 0; i < perUidCountSize; i++) {
+ final int uid = perUidCount.keyAt(i);
+ final int amount = perUidCount.valueAt(i);
+
+ data.add(
+ FrameworkStatsLog.buildStatsEvent(
+ FrameworkStatsLog.PERSISTENT_URI_PERMISSIONS_AMOUNT_PER_PACKAGE,
+ uid,
+ amount
+ )
+ );
+ }
+ }
+
+ interface PersistentUriGrantsProvider {
+ ArrayList<UriPermission> providePersistentUriGrants();
+ }
+}
diff --git a/services/core/java/com/android/server/vibrator/VibrationSettings.java b/services/core/java/com/android/server/vibrator/VibrationSettings.java
index c54d490..eafd9d7 100644
--- a/services/core/java/com/android/server/vibrator/VibrationSettings.java
+++ b/services/core/java/com/android/server/vibrator/VibrationSettings.java
@@ -97,6 +97,15 @@
USAGE_ALARM,
USAGE_COMMUNICATION_REQUEST));
+ /**
+ * Usage allowed for vibrations when {@link Settings.System#VIBRATE_ON} is disabled.
+ *
+ * <p>The only allowed usage is accessibility, which is applied when the user enables talkback.
+ * Other usages that must ignore this setting should use
+ * {@link VibrationAttributes#FLAG_BYPASS_USER_VIBRATION_INTENSITY_OFF}.
+ */
+ private static final int VIBRATE_ON_DISABLED_USAGE_ALLOWED = USAGE_ACCESSIBILITY;
+
/** Listener for changes on vibration settings. */
interface OnVibratorSettingsChanged {
/** Callback triggered when any of the vibrator settings change. */
@@ -127,6 +136,8 @@
private SparseIntArray mCurrentVibrationIntensities = new SparseIntArray();
@GuardedBy("mLock")
private boolean mBatterySaverMode;
+ @GuardedBy("mLock")
+ private boolean mVibrateOn;
VibrationSettings(Context context, Handler handler) {
this(context, handler, new VibrationConfig(context.getResources()));
@@ -168,7 +179,7 @@
try {
ActivityManager.getService().registerUidObserver(mUidObserver,
ActivityManager.UID_OBSERVER_PROCSTATE | ActivityManager.UID_OBSERVER_GONE,
- ActivityManager.PROCESS_STATE_UNKNOWN, null);
+ ActivityManager.PROCESS_STATE_UNKNOWN, mContext.getOpPackageName());
} catch (RemoteException e) {
// ignored; both services live in system_server
}
@@ -199,6 +210,7 @@
// Listen to all settings that might affect the result of Vibrator.getVibrationIntensity.
registerSettingsObserver(Settings.System.getUriFor(Settings.System.VIBRATE_INPUT_DEVICES));
+ registerSettingsObserver(Settings.System.getUriFor(Settings.System.VIBRATE_ON));
registerSettingsObserver(Settings.System.getUriFor(Settings.System.VIBRATE_WHEN_RINGING));
registerSettingsObserver(Settings.System.getUriFor(Settings.System.APPLY_RAMPING_RINGER));
registerSettingsObserver(Settings.System.getUriFor(
@@ -314,11 +326,14 @@
return Vibration.Status.IGNORED_FOR_POWER;
}
- int intensity = getCurrentIntensity(usage);
- if ((intensity == Vibrator.VIBRATION_INTENSITY_OFF)
- && !attrs.isFlagSet(
- VibrationAttributes.FLAG_BYPASS_USER_VIBRATION_INTENSITY_OFF)) {
- return Vibration.Status.IGNORED_FOR_SETTINGS;
+ if (!attrs.isFlagSet(VibrationAttributes.FLAG_BYPASS_USER_VIBRATION_INTENSITY_OFF)) {
+ if (!mVibrateOn && (VIBRATE_ON_DISABLED_USAGE_ALLOWED != usage)) {
+ return Vibration.Status.IGNORED_FOR_SETTINGS;
+ }
+
+ if (getCurrentIntensity(usage) == Vibrator.VIBRATION_INTENSITY_OFF) {
+ return Vibration.Status.IGNORED_FOR_SETTINGS;
+ }
}
if (!shouldVibrateForRingerModeLocked(usage)) {
@@ -357,6 +372,7 @@
void updateSettings() {
synchronized (mLock) {
mVibrateInputDevices = loadSystemSetting(Settings.System.VIBRATE_INPUT_DEVICES, 0) > 0;
+ mVibrateOn = loadSystemSetting(Settings.System.VIBRATE_ON, 1) > 0;
int alarmIntensity = toIntensity(
loadSystemSetting(Settings.System.ALARM_VIBRATION_INTENSITY, -1),
@@ -437,8 +453,9 @@
+ "mVibratorConfig=" + mVibrationConfig
+ ", mVibrateInputDevices=" + mVibrateInputDevices
+ ", mBatterySaverMode=" + mBatterySaverMode
- + ", mProcStatesCache=" + mUidObserver.mProcStatesCache
+ + ", mVibrateOn=" + mVibrateOn
+ ", mVibrationIntensities=" + vibrationIntensitiesString
+ + ", mProcStatesCache=" + mUidObserver.mProcStatesCache
+ '}';
}
}
@@ -446,6 +463,8 @@
/** Write current settings into given {@link ProtoOutputStream}. */
public void dumpProto(ProtoOutputStream proto) {
synchronized (mLock) {
+ proto.write(VibratorManagerServiceDumpProto.VIBRATE_ON, mVibrateOn);
+ proto.write(VibratorManagerServiceDumpProto.LOW_POWER_MODE, mBatterySaverMode);
proto.write(VibratorManagerServiceDumpProto.ALARM_INTENSITY,
getCurrentIntensity(USAGE_ALARM));
proto.write(VibratorManagerServiceDumpProto.ALARM_DEFAULT_INTENSITY,
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 86ef8d2..76434c7 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -7364,12 +7364,17 @@
@VisibleForTesting
void clearSizeCompatMode() {
+ final float lastSizeCompatScale = mSizeCompatScale;
mInSizeCompatModeForBounds = false;
mSizeCompatScale = 1f;
mSizeCompatBounds = null;
mCompatDisplayInsets = null;
+ if (mSizeCompatScale != lastSizeCompatScale) {
+ forAllWindows(WindowState::updateGlobalScale, false /* traverseTopToBottom */);
+ }
- onRequestedOverrideConfigurationChanged(getRequestedOverrideConfiguration());
+ // Clear config override in #updateCompatDisplayInsets().
+ onRequestedOverrideConfigurationChanged(EMPTY);
}
@Override
@@ -7924,6 +7929,7 @@
final int contentH = resolvedAppBounds.height();
final int viewportW = containerAppBounds.width();
final int viewportH = containerAppBounds.height();
+ final float lastSizeCompatScale = mSizeCompatScale;
// Only allow to scale down.
mSizeCompatScale = (contentW <= viewportW && contentH <= viewportH)
? 1f : Math.min((float) viewportW / contentW, (float) viewportH / contentH);
@@ -7942,6 +7948,9 @@
} else {
mSizeCompatBounds = null;
}
+ if (mSizeCompatScale != lastSizeCompatScale) {
+ forAllWindows(WindowState::updateGlobalScale, false /* traverseTopToBottom */);
+ }
// Vertically center within parent (bounds) - this is a UX choice and exclude the horizontal
// decor if needed. Horizontal position is adjusted in
diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
index 1681348..316bf20 100644
--- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
+++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
@@ -22,7 +22,6 @@
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
-import android.compat.annotation.Disabled;
import android.os.IBinder;
import android.os.InputConstants;
import android.os.Looper;
@@ -47,7 +46,6 @@
* Feature flag for making Activities consume all touches within their task bounds.
*/
@ChangeId
- @Disabled
static final long ENABLE_TOUCH_OPAQUE_ACTIVITIES = 194480991L;
private static final String TAG = "ActivityRecordInputSink";
@@ -116,8 +114,7 @@
private InputWindowHandle createInputWindowHandle() {
InputWindowHandle inputWindowHandle = new InputWindowHandle(null,
mActivityRecord.getDisplayId());
- inputWindowHandle.replaceTouchableRegionWithCrop(
- mActivityRecord.getParentSurfaceControl());
+ inputWindowHandle.replaceTouchableRegionWithCrop = true;
inputWindowHandle.name = mName;
inputWindowHandle.ownerUid = Process.myUid();
inputWindowHandle.ownerPid = Process.myPid();
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ddd624d..ed9dcef 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -221,10 +221,10 @@
import android.util.TimeUtils;
import android.util.proto.ProtoOutputStream;
import android.view.IRecentsAnimationRunner;
-import android.view.IRemoteAnimationRunner;
import android.view.RemoteAnimationAdapter;
import android.view.RemoteAnimationDefinition;
import android.view.WindowManager;
+import android.window.BackNavigationInfo;
import android.window.IWindowOrganizerController;
import android.window.SplashScreenView.SplashScreenViewParcelable;
import android.window.TaskSnapshot;
@@ -458,7 +458,7 @@
private final ClientLifecycleManager mLifecycleManager;
@Nullable
- private final BackGestureController mBackGestureController;
+ private final BackNavigationController mBackNavigationController;
private TaskChangeNotificationController mTaskChangeNotificationController;
/** The controller for all operations related to locktask. */
@@ -836,8 +836,6 @@
mSystemThread = ActivityThread.currentActivityThread();
mUiContext = mSystemThread.getSystemUiContext();
mLifecycleManager = new ClientLifecycleManager();
- mBackGestureController = BackGestureController.isEnabled() ? new BackGestureController()
- : null;
mVisibleActivityProcessTracker = new VisibleActivityProcessTracker(this);
mInternal = new LocalService();
GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version", GL_ES_VERSION_UNDEFINED);
@@ -845,6 +843,8 @@
mTaskOrganizerController = mWindowOrganizerController.mTaskOrganizerController;
mTaskFragmentOrganizerController =
mWindowOrganizerController.mTaskFragmentOrganizerController;
+ mBackNavigationController = BackNavigationController.isEnabled()
+ ? new BackNavigationController() : null;
}
public void onSystemReady() {
@@ -1022,6 +1022,9 @@
mLockTaskController.setWindowManager(wm);
mTaskSupervisor.setWindowManager(wm);
mRootWindowContainer.setWindowManager(wm);
+ if (mBackNavigationController != null) {
+ mBackNavigationController.setTaskSnapshotController(wm.mTaskSnapshotController);
+ }
}
}
@@ -1768,11 +1771,13 @@
}
@Override
- public void startBackPreview(IRemoteAnimationRunner runner) {
- if (mBackGestureController == null) {
- return;
+ public BackNavigationInfo startBackNavigation() {
+ mAmInternal.enforceCallingPermission(START_TASKS_FROM_RECENTS,
+ "startBackNavigation()");
+ if (mBackNavigationController == null) {
+ return null;
}
- mBackGestureController.startBackPreview();
+ return mBackNavigationController.startBackNavigation(getTopDisplayFocusedRootTask());
}
/**
diff --git a/services/core/java/com/android/server/wm/BackGestureController.java b/services/core/java/com/android/server/wm/BackGestureController.java
deleted file mode 100644
index f8f6254..0000000
--- a/services/core/java/com/android/server/wm/BackGestureController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.wm;
-
-import android.os.SystemProperties;
-
-/**
- * Controller to handle actions related to the back gesture on the server side.
- */
-public class BackGestureController {
-
- private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";
-
- public static boolean isEnabled() {
- return SystemProperties.getInt(BACK_PREDICTABILITY_PROP, 0) > 0;
- }
-
- /**
- * Start a remote animation the back gesture.
- */
- public void startBackPreview() {
- }
-}
diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java
new file mode 100644
index 0000000..a8779fa
--- /dev/null
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2021 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.wm;
+
+import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_BACK_PREVIEW;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.WindowConfiguration;
+import android.content.ComponentName;
+import android.hardware.HardwareBuffer;
+import android.os.RemoteCallback;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.util.Slog;
+import android.view.SurfaceControl;
+import android.window.BackNavigationInfo;
+import android.window.TaskSnapshot;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.protolog.common.ProtoLog;
+
+/**
+ * Controller to handle actions related to the back gesture on the server side.
+ */
+class BackNavigationController {
+
+ private static final String TAG = "BackNavigationController";
+ private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";
+
+ @Nullable
+ private TaskSnapshotController mTaskSnapshotController;
+
+ /**
+ * Returns true if the back predictability feature is enabled
+ */
+ static boolean isEnabled() {
+ return SystemProperties.getInt(BACK_PREDICTABILITY_PROP, 0) > 0;
+ }
+
+ /**
+ * Set up the necessary leashes and build a {@link BackNavigationInfo} instance for an upcoming
+ * back gesture animation.
+ *
+ * @param task the currently focused {@link Task}.
+ * @return a {@link BackNavigationInfo} instance containing the required leashes and metadata
+ * for the animation.
+ */
+ @Nullable
+ BackNavigationInfo startBackNavigation(@NonNull Task task) {
+ return startBackNavigation(task, null);
+ }
+
+ /**
+ * @param tx, a transaction to be used for the attaching the animation leash.
+ * This is used in tests. If null, the object will be initialized with a new {@link
+ * android.view.SurfaceControl.Transaction}
+ * @see #startBackNavigation(Task)
+ */
+ @VisibleForTesting
+ @Nullable
+ BackNavigationInfo startBackNavigation(@NonNull Task task,
+ @Nullable SurfaceControl.Transaction tx) {
+
+ if (tx == null) {
+ tx = new SurfaceControl.Transaction();
+ }
+
+ int backType = BackNavigationInfo.TYPE_UNDEFINED;
+ Task prevTask = task;
+ ActivityRecord prev;
+ WindowContainer<?> removedWindowContainer;
+ ActivityRecord activityRecord;
+ SurfaceControl animationLeashParent;
+ WindowConfiguration taskWindowConfiguration;
+ SurfaceControl animLeash;
+ HardwareBuffer screenshotBuffer = null;
+ int prevTaskId;
+ int prevUserId;
+
+ synchronized (task.mWmService.mGlobalLock) {
+ activityRecord = task.topRunningActivity();
+ removedWindowContainer = activityRecord;
+ taskWindowConfiguration = task.getTaskInfo().configuration.windowConfiguration;
+
+ ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "startBackNavigation task=%s, topRunningActivity=%s",
+ task, activityRecord);
+
+ // IME is visible, back gesture will dismiss it, nothing to preview.
+ if (task.getDisplayContent().getImeContainer().isVisible()) {
+ return null;
+ }
+
+ // Current Activity is home, there is no previous activity to display
+ if (activityRecord.isActivityTypeHome()) {
+ return null;
+ }
+
+ prev = task.getActivity(
+ (r) -> !r.finishing && r.getTask() == task && !r.isTopRunningActivity());
+
+ if (prev != null) {
+ backType = BackNavigationInfo.TYPE_CROSS_ACTIVITY;
+ } else if (task.returnsToHomeRootTask()) {
+ prevTask = null;
+ removedWindowContainer = task;
+ backType = BackNavigationInfo.TYPE_RETURN_TO_HOME;
+ } else if (activityRecord.isRootOfTask()) {
+ // TODO(208789724): Create single source of truth for this, maybe in
+ // RootWindowContainer
+ // TODO: Also check Task.shouldUpRecreateTaskLocked() for prev logic
+ prevTask = task.mRootWindowContainer.getTaskBelow(task);
+ removedWindowContainer = task;
+ if (prevTask.isActivityTypeHome()) {
+ backType = BackNavigationInfo.TYPE_RETURN_TO_HOME;
+ } else {
+ prev = prevTask.getTopNonFinishingActivity();
+ backType = BackNavigationInfo.TYPE_CROSS_TASK;
+ }
+ }
+
+ prevTaskId = prevTask != null ? prevTask.mTaskId : 0;
+ prevUserId = prevTask != null ? prevTask.mUserId : 0;
+
+ ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "Previous Activity is %s",
+ prev != null ? prev.mActivityComponent : null);
+
+ //TODO(207481538) Remove once the infrastructure to support per-activity screenshot is
+ // implemented. For now we simply have the mBackScreenshots hash map that dumbly
+ // saves the screenshots.
+ if (needsScreenshot(backType) && prev != null && prev.mActivityComponent != null) {
+ screenshotBuffer = getActivitySnapshot(task, prev.mActivityComponent);
+ }
+
+ // Prepare a leash to animate the current top window
+ animLeash = removedWindowContainer.makeAnimationLeash()
+ .setName("BackPreview Leash")
+ .setHidden(false)
+ .setBLASTLayer()
+ .build();
+ removedWindowContainer.reparentSurfaceControl(tx, animLeash);
+
+ animationLeashParent = removedWindowContainer.getAnimationLeashParent();
+ }
+
+ SurfaceControl.Builder builder = new SurfaceControl.Builder()
+ .setName("BackPreview Screenshot")
+ .setParent(animationLeashParent)
+ .setHidden(false)
+ .setBLASTLayer();
+ SurfaceControl screenshotSurface = builder.build();
+
+ // Find a screenshot of the previous activity
+
+ if (needsScreenshot(backType) && prevTask != null) {
+ if (screenshotBuffer == null) {
+ screenshotBuffer = getTaskSnapshot(prevTaskId, prevUserId);
+ }
+ }
+ tx.apply();
+
+ WindowContainer<?> finalRemovedWindowContainer = removedWindowContainer;
+ try {
+ activityRecord.token.linkToDeath(
+ () -> resetSurfaces(finalRemovedWindowContainer), 0);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Failed to link to death", e);
+ resetSurfaces(removedWindowContainer);
+ return null;
+ }
+
+ return new BackNavigationInfo(backType,
+ animLeash,
+ screenshotSurface,
+ screenshotBuffer,
+ taskWindowConfiguration,
+ new RemoteCallback(result -> resetSurfaces(finalRemovedWindowContainer
+ )));
+ }
+
+
+ private HardwareBuffer getActivitySnapshot(@NonNull Task task,
+ ComponentName activityComponent) {
+ // Check if we have a screenshot of the previous activity, indexed by its
+ // component name.
+ SurfaceControl.ScreenshotHardwareBuffer backBuffer = task.mBackScreenshots
+ .get(activityComponent.flattenToString());
+ return backBuffer != null ? backBuffer.getHardwareBuffer() : null;
+
+ }
+
+ private HardwareBuffer getTaskSnapshot(int taskId, int userId) {
+ if (mTaskSnapshotController == null) {
+ return null;
+ }
+ TaskSnapshot snapshot = mTaskSnapshotController.getSnapshot(taskId,
+ userId, true /* restoreFromDisk */, false /* isLowResolution */);
+ return snapshot != null ? snapshot.getHardwareBuffer() : null;
+ }
+
+ private boolean needsScreenshot(int backType) {
+ switch (backType) {
+ case BackNavigationInfo.TYPE_RETURN_TO_HOME:
+ case BackNavigationInfo.TYPE_DIALOG_CLOSE:
+ return false;
+ }
+ return true;
+ }
+
+ private void resetSurfaces(@NonNull WindowContainer<?> windowContainer) {
+ synchronized (windowContainer.mWmService.mGlobalLock) {
+ ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "Back: Reset surfaces");
+ SurfaceControl.Transaction tx = windowContainer.getSyncTransaction();
+ SurfaceControl surfaceControl = windowContainer.getSurfaceControl();
+ if (surfaceControl != null) {
+ tx.reparent(surfaceControl,
+ windowContainer.getParent().getSurfaceControl());
+ tx.apply();
+ }
+ }
+ }
+
+ void setTaskSnapshotController(@Nullable TaskSnapshotController taskSnapshotController) {
+ mTaskSnapshotController = taskSnapshotController;
+ }
+}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index c65ca08..e449dde 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -122,6 +122,7 @@
import static com.android.server.wm.DisplayContentProto.INPUT_METHOD_TARGET;
import static com.android.server.wm.DisplayContentProto.INSETS_SOURCE_PROVIDERS;
import static com.android.server.wm.DisplayContentProto.IS_SLEEPING;
+import static com.android.server.wm.DisplayContentProto.KEEP_CLEAR_AREAS;
import static com.android.server.wm.DisplayContentProto.OPENING_APPS;
import static com.android.server.wm.DisplayContentProto.RESUMED_ACTIVITY;
import static com.android.server.wm.DisplayContentProto.ROOT_DISPLAY_AREA;
@@ -169,6 +170,7 @@
import android.graphics.Bitmap;
import android.graphics.ColorSpace;
import android.graphics.Insets;
+import android.graphics.Matrix;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
@@ -838,7 +840,6 @@
}
w.mSurfacePlacementNeeded = true;
w.mLayoutNeeded = false;
- w.prelayout();
final boolean firstLayout = !w.isLaidOut();
getDisplayPolicy().layoutWindowLw(w, null, mDisplayFrames);
w.mLayoutSeq = mLayoutSeq;
@@ -881,7 +882,6 @@
}
w.mSurfacePlacementNeeded = true;
w.mLayoutNeeded = false;
- w.prelayout();
getDisplayPolicy().layoutWindowLw(w, w.getParentWindow(), mDisplayFrames);
w.mLayoutSeq = mLayoutSeq;
if (DEBUG_LAYOUT) Slog.v(TAG, " LAYOUT: mFrame=" + w.getFrame()
@@ -2001,6 +2001,7 @@
}
void configureDisplayPolicy() {
+ mRootWindowContainer.updateDisplayImePolicyCache();
mDisplayPolicy.updateConfigurationAndScreenSizeDependentBehaviors();
mDisplayRotation.configure(mBaseDisplayWidth, mBaseDisplayHeight);
}
@@ -2718,6 +2719,7 @@
void onDisplayChanged(DisplayContent dc) {
super.onDisplayChanged(dc);
updateSystemGestureExclusionLimit();
+ updateKeepClearAreas();
}
void updateSystemGestureExclusionLimit() {
@@ -3327,6 +3329,9 @@
}
}
proto.write(IME_POLICY, getImePolicy());
+ for (Rect r : getKeepClearAreas()) {
+ r.dumpDebug(proto, KEEP_CLEAR_AREAS);
+ }
proto.end(token);
}
@@ -3386,6 +3391,13 @@
pw.println(mSystemGestureExclusion);
}
+ final List<Rect> keepClearAreas = getKeepClearAreas();
+ if (!keepClearAreas.isEmpty()) {
+ pw.println();
+ pw.print(" keepClearAreas=");
+ pw.println(keepClearAreas);
+ }
+
pw.println();
pw.println(prefix + "Display areas in top down Z order:");
dumpChildDisplayArea(pw, subPrefix, dumpAll);
@@ -3613,6 +3625,7 @@
}
adjustForImeIfNeeded();
+ updateKeepClearAreas();
// We may need to schedule some toast windows to be removed. The toasts for an app that
// does not have input focus are removed within a timeout to prevent apps to redress
@@ -3939,6 +3952,9 @@
}
}
+ // IMPORTANT: When introducing new dependencies in this method, make sure that
+ // changes to those result in RootWindowContainer.updateDisplayImePolicyCache()
+ // being called.
@DisplayImePolicy int getImePolicy() {
if (!isTrusted()) {
return DISPLAY_IME_POLICY_FALLBACK_DISPLAY;
@@ -3987,11 +4003,12 @@
if (target == mImeLayeringTarget) {
return;
}
- // Prepare the IME screenshot for the last IME target when its task is applying app
- // transition. This is for the better IME transition to keep IME visibility when
- // transitioning to the next task.
+ // If the IME target is the input target, before it changes, prepare the IME screenshot
+ // for the last IME target when its task is applying app transition. This is for the
+ // better IME transition to keep IME visibility when transitioning to the next task.
if (mImeLayeringTarget != null && mImeLayeringTarget.isAnimating(PARENTS | TRANSITION,
- ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)) {
+ ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)
+ && mImeLayeringTarget == mImeInputTarget) {
attachAndShowImeScreenshotOnTarget();
}
@@ -5477,19 +5494,28 @@
mSystemGestureExclusionListeners.unregister(listener);
}
+ void updateKeepClearAreas() {
+ mWmService.mDisplayNotificationController.dispatchKeepClearAreasChanged(
+ this, getKeepClearAreas());
+ }
+
/**
- * @see IWindowManager#setForwardedInsets
+ * Returns all keep-clear areas from visible windows on this display.
*/
- public void setForwardedInsets(Insets insets) {
- if (insets == null) {
- insets = Insets.NONE;
- }
- if (mDisplayPolicy.getForwardedInsets().equals(insets)) {
- return;
- }
- mDisplayPolicy.setForwardedInsets(insets);
- setLayoutNeeded();
- mWmService.mWindowPlacerLocked.requestTraversal();
+ ArrayList<Rect> getKeepClearAreas() {
+ final ArrayList<Rect> keepClearAreas = new ArrayList<Rect>();
+ final Matrix tmpMatrix = new Matrix();
+ final float[] tmpFloat9 = new float[9];
+ forAllWindows(w -> {
+ if (w.isVisible() && !w.inPinnedWindowingMode()) {
+ keepClearAreas.addAll(w.getKeepClearAreas(tmpMatrix, tmpFloat9));
+ }
+
+ // We stop traversing when we reach the base of a fullscreen app.
+ return w.getWindowType() == TYPE_BASE_APPLICATION
+ && w.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;
+ }, true);
+ return keepClearAreas;
}
protected MetricsLogger getMetricsLogger() {
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 0745b3b..ab1e349 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -359,16 +359,6 @@
private int mDisplayCutoutTouchableRegionSize;
- /**
- * The area covered by system windows which belong to another display. Forwarded insets is set
- * in case this is a virtual display, this is displayed on another display that has insets, and
- * the bounds of this display is overlapping with the insets of the host display (e.g. IME is
- * displayed on the host display, and it covers a part of this virtual display.)
- * The forwarded insets is used to compute display frames of this virtual display, which will
- * be then used to layout windows in the virtual display.
- */
- @NonNull private Insets mForwardedInsets = Insets.NONE;
-
private RefreshRatePolicy mRefreshRatePolicy;
/**
@@ -1442,33 +1432,6 @@
return mForceShowSystemBars;
}
- // TODO: Should probably be moved into DisplayFrames.
- /**
- * Return the layout hints for a newly added window. These values are computed on the
- * most recent layout, so they are not guaranteed to be correct.
- *
- * @param attrs The LayoutParams of the window.
- * @param windowToken The token of the window.
- * @param outInsetsState The insets state of this display from the client's perspective.
- * @param localClient Whether the client is from the our process.
- * @return Whether to always consume the system bars.
- * See {@link #areSystemBarsForcedShownLw()}.
- */
- boolean getLayoutHint(LayoutParams attrs, WindowToken windowToken, InsetsState outInsetsState,
- boolean localClient) {
- final InsetsState state =
- mDisplayContent.getInsetsPolicy().getInsetsForWindowMetrics(attrs);
- final boolean hasCompatScale = WindowState.hasCompatScale(attrs, windowToken);
- outInsetsState.set(state, hasCompatScale || localClient);
- if (hasCompatScale) {
- final float compatScale = windowToken != null
- ? windowToken.getSizeCompatScale()
- : mDisplayContent.mCompatibleScreenScale;
- outInsetsState.scale(1f / compatScale);
- }
- return mForceShowSystemBars;
- }
-
/**
* Computes the frames of display (its logical size, rotation and cutout should already be set)
* used to layout window. This method only changes the given display frames, insets state and
@@ -2149,18 +2112,6 @@
}
}
- /**
- * @see IWindowManager#setForwardedInsets
- */
- public void setForwardedInsets(@NonNull Insets forwardedInsets) {
- mForwardedInsets = forwardedInsets;
- }
-
- @NonNull
- public Insets getForwardedInsets() {
- return mForwardedInsets;
- }
-
@NavigationBarPosition
int navigationBarPosition(int displayRotation) {
if (mNavigationBar != null) {
diff --git a/services/core/java/com/android/server/wm/DisplayWindowListenerController.java b/services/core/java/com/android/server/wm/DisplayWindowListenerController.java
index 4141090..276dbe9 100644
--- a/services/core/java/com/android/server/wm/DisplayWindowListenerController.java
+++ b/services/core/java/com/android/server/wm/DisplayWindowListenerController.java
@@ -17,11 +17,14 @@
package com.android.server.wm;
import android.content.res.Configuration;
+import android.graphics.Rect;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.util.IntArray;
import android.view.IDisplayWindowListener;
+import java.util.List;
+
/**
* Manages dispatch of relevant hierarchy changes to interested listeners. Listeners are assumed
* to be remote.
@@ -116,4 +119,16 @@
}
mDisplayListeners.finishBroadcast();
}
+
+ void dispatchKeepClearAreasChanged(DisplayContent display, List<Rect> keepClearAreas) {
+ int count = mDisplayListeners.beginBroadcast();
+ for (int i = 0; i < count; ++i) {
+ try {
+ mDisplayListeners.getBroadcastItem(i).onKeepClearAreasChanged(
+ display.mDisplayId, keepClearAreas);
+ } catch (RemoteException e) {
+ }
+ }
+ mDisplayListeners.finishBroadcast();
+ }
}
diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
index 963f326..8d3e071 100644
--- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
+++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
@@ -97,7 +97,7 @@
// activities are actually behind other fullscreen activities, but still required
// to be visible (such as performing Recents animation).
final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind
- && mTaskFragment.isTopActivityFocusable()
+ && mTaskFragment.canBeResumed(starting)
&& (starting == null || !starting.isDescendantOf(mTaskFragment));
ArrayList<TaskFragment> adjacentTaskFragments = null;
diff --git a/services/core/java/com/android/server/wm/InputManagerCallback.java b/services/core/java/com/android/server/wm/InputManagerCallback.java
index e02e7c5..f91969b 100644
--- a/services/core/java/com/android/server/wm/InputManagerCallback.java
+++ b/services/core/java/com/android/server/wm/InputManagerCallback.java
@@ -24,6 +24,7 @@
import static com.android.server.wm.WindowManagerService.H.ON_POINTER_DOWN_OUTSIDE_FOCUS;
import android.annotation.NonNull;
+import android.graphics.PointF;
import android.os.Debug;
import android.os.IBinder;
import android.util.Slog;
@@ -219,6 +220,11 @@
}
@Override
+ public PointF getCursorPosition() {
+ return mService.getLatestMousePosition();
+ }
+
+ @Override
public void onPointerDownOutsideFocus(IBinder touchedToken) {
mService.mH.obtainMessage(ON_POINTER_DOWN_OUTSIDE_FOCUS, touchedToken).sendToTarget();
}
diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java
index 1a1101e..a1468cc 100644
--- a/services/core/java/com/android/server/wm/InsetsStateController.java
+++ b/services/core/java/com/android/server/wm/InsetsStateController.java
@@ -366,6 +366,7 @@
if (changed) {
notifyInsetsChanged();
mDisplayContent.updateSystemGestureExclusion();
+ mDisplayContent.updateKeepClearAreas();
mDisplayContent.getDisplayPolicy().updateSystemBarAttributes();
}
}
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 5a420ca..d031bec 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -165,6 +165,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -986,6 +987,7 @@
forAllDisplays(dc -> {
dc.getInputMonitor().updateInputWindowsLw(true /*force*/);
dc.updateSystemGestureExclusion();
+ dc.updateKeepClearAreas();
dc.updateTouchExcludeRegion();
});
@@ -2530,9 +2532,16 @@
// Drop any cached DisplayInfos associated with this display id - the values are now
// out of date given this display changed event.
mWmService.mPossibleDisplayInfoMapper.removePossibleDisplayInfos(displayId);
+ updateDisplayImePolicyCache();
}
}
+ void updateDisplayImePolicyCache() {
+ ArrayMap<Integer, Integer> displayImePolicyMap = new ArrayMap<>();
+ forAllDisplays(dc -> displayImePolicyMap.put(dc.getDisplayId(), dc.getImePolicy()));
+ mWmService.mDisplayImePolicyCache = Collections.unmodifiableMap(displayImePolicyMap);
+ }
+
/** Update lists of UIDs that are present on displays and have access to them. */
void updateUIDsPresentOnDisplay() {
mDisplayAccessUIDs.clear();
@@ -3665,7 +3674,8 @@
try {
if (mTaskSupervisor.realStartActivityLocked(r, mApp,
- mTop == r && r.isFocusable() /* andResume */, true /* checkConfig */)) {
+ mTop == r && r.getTask().canBeResumed(r) /* andResume */,
+ true /* checkConfig */)) {
mHasActivityStarted = true;
}
} catch (RemoteException e) {
diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index 005544b..7acc0c5 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -73,6 +73,7 @@
import android.view.SurfaceSession;
import android.view.WindowManager;
import android.window.ClientWindowFrames;
+import android.window.IOnBackInvokedCallback;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.logging.MetricsLoggerWrapper;
@@ -490,6 +491,16 @@
}
}
+ @Override
+ public void reportKeepClearAreasChanged(IWindow window, List<Rect> keepClearAreas) {
+ final long ident = Binder.clearCallingIdentity();
+ try {
+ mService.reportKeepClearAreasChanged(this, window, keepClearAreas);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+
private void actionOnWallpaper(IBinder window,
BiConsumer<WallpaperController, WindowState> action) {
final WindowState windowState = mService.windowForClientLocked(this, window, true);
@@ -863,4 +874,10 @@
Binder.restoreCallingIdentity(origId);
}
}
+
+ @Override
+ public void setOnBackInvokedCallback(IWindow iWindow,
+ IOnBackInvokedCallback iOnBackInvokedCallback) throws RemoteException {
+ // TODO: Set the callback to the WindowState of the window.
+ }
}
diff --git a/services/core/java/com/android/server/wm/TaskFpsCallbackController.java b/services/core/java/com/android/server/wm/TaskFpsCallbackController.java
new file mode 100644
index 0000000..d9dc9aa
--- /dev/null
+++ b/services/core/java/com/android/server/wm/TaskFpsCallbackController.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2022 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.wm;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.window.IOnFpsCallbackListener;
+
+import java.util.HashMap;
+
+final class TaskFpsCallbackController {
+
+ private final Context mContext;
+ private final HashMap<IOnFpsCallbackListener, Long> mTaskFpsCallbackListeners;
+ private final HashMap<IOnFpsCallbackListener, IBinder.DeathRecipient> mDeathRecipients;
+
+ TaskFpsCallbackController(Context context) {
+ mContext = context;
+ mTaskFpsCallbackListeners = new HashMap<>();
+ mDeathRecipients = new HashMap<>();
+ }
+
+ void registerCallback(int taskId, IOnFpsCallbackListener listener) {
+ if (mTaskFpsCallbackListeners.containsKey(listener)) {
+ return;
+ }
+
+ final long nativeListener = nativeRegister(listener, taskId);
+ mTaskFpsCallbackListeners.put(listener, nativeListener);
+
+ final IBinder.DeathRecipient deathRecipient = () -> unregisterCallback(listener);
+ try {
+ listener.asBinder().linkToDeath(deathRecipient, 0);
+ mDeathRecipients.put(listener, deathRecipient);
+ } catch (RemoteException e) {
+ // ignore
+ }
+ }
+
+ void unregisterCallback(IOnFpsCallbackListener listener) {
+ if (!mTaskFpsCallbackListeners.containsKey(listener)) {
+ return;
+ }
+
+ listener.asBinder().unlinkToDeath(mDeathRecipients.get(listener), 0);
+ mDeathRecipients.remove(listener);
+
+ nativeUnregister(mTaskFpsCallbackListeners.get(listener));
+ mTaskFpsCallbackListeners.remove(listener);
+ }
+
+ private static native long nativeRegister(IOnFpsCallbackListener listener, int taskId);
+ private static native void nativeUnregister(long ptr);
+}
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index b681a96..177d2e6 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -24,8 +24,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.pm.ActivityInfo.FLAG_RESUME_WHILE_PAUSING;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
@@ -39,6 +37,7 @@
import static android.view.WindowManager.TRANSIT_NONE;
import static android.view.WindowManager.TRANSIT_OPEN;
+import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_BACK_PREVIEW;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_STATES;
import static com.android.server.wm.ActivityRecord.State.PAUSED;
import static com.android.server.wm.ActivityRecord.State.PAUSING;
@@ -100,6 +99,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
@@ -254,6 +254,10 @@
private final Rect mTmpStableBounds = new Rect();
private final Rect mTmpNonDecorBounds = new Rect();
+ //TODO(b/207481538) Remove once the infrastructure to support per-activity screenshot is
+ // implemented
+ HashMap<String, SurfaceControl.ScreenshotHardwareBuffer> mBackScreenshots = new HashMap<>();
+
private final EnsureActivitiesVisibleHelper mEnsureActivitiesVisibleHelper =
new EnsureActivitiesVisibleHelper(this);
private final EnsureVisibleActivitiesConfigHelper mEnsureVisibleActivitiesConfigHelper =
@@ -790,13 +794,8 @@
return TASK_FRAGMENT_VISIBILITY_VISIBLE;
}
- boolean gotRootSplitScreenFragment = false;
- boolean gotOpaqueSplitScreenPrimary = false;
- boolean gotOpaqueSplitScreenSecondary = false;
boolean gotTranslucentFullscreen = false;
boolean gotTranslucentAdjacent = false;
- boolean gotTranslucentSplitScreenPrimary = false;
- boolean gotTranslucentSplitScreenSecondary = false;
boolean shouldBeVisible = true;
// This TaskFragment is only considered visible if all its parent TaskFragments are
@@ -815,8 +814,6 @@
}
final List<TaskFragment> adjacentTaskFragments = new ArrayList<>();
- final int windowingMode = getWindowingMode();
- final boolean isAssistantType = isActivityTypeAssistant();
for (int i = parent.getChildCount() - 1; i >= 0; --i) {
final WindowContainer other = parent.getChildAt(i);
if (other == null) continue;
@@ -864,37 +861,6 @@
}
// Multi-window TaskFragment that matches parent bounds would occlude other children
return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
- } else if (otherWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
- && !gotOpaqueSplitScreenPrimary) {
- gotRootSplitScreenFragment = true;
- gotTranslucentSplitScreenPrimary = isTranslucent(other, starting);
- gotOpaqueSplitScreenPrimary = !gotTranslucentSplitScreenPrimary;
- if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
- && gotOpaqueSplitScreenPrimary) {
- // Can't be visible behind another opaque TaskFragment in split-screen-primary.
- return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
- }
- } else if (otherWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY
- && !gotOpaqueSplitScreenSecondary) {
- gotRootSplitScreenFragment = true;
- gotTranslucentSplitScreenSecondary = isTranslucent(other, starting);
- gotOpaqueSplitScreenSecondary = !gotTranslucentSplitScreenSecondary;
- if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY
- && gotOpaqueSplitScreenSecondary) {
- // Can't be visible behind another opaque TaskFragment in split-screen-secondary
- return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
- }
- }
- if (gotOpaqueSplitScreenPrimary && gotOpaqueSplitScreenSecondary) {
- // Can not be visible if we are in split-screen windowing mode and both halves of
- // the screen are opaque.
- return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
- }
- if (isAssistantType && gotRootSplitScreenFragment) {
- // Assistant TaskFragment can't be visible behind split-screen. In addition to
- // this not making sense, it also works around an issue here we boost the z-order
- // of the assistant window surfaces in window manager whenever it is visible.
- return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
}
final TaskFragment otherTaskFrag = other.asTaskFragment();
@@ -920,34 +886,6 @@
return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
}
- // Handle cases when there can be a translucent split-screen TaskFragment on top.
- switch (windowingMode) {
- case WINDOWING_MODE_FULLSCREEN:
- if (gotTranslucentSplitScreenPrimary || gotTranslucentSplitScreenSecondary) {
- // At least one of the split-screen TaskFragment that covers this one is
- // translucent.
- // When in split mode, home will be reparented to the secondary split while
- // leaving TaskFragments not supporting split below. Due to
- // TaskDisplayArea#assignRootTaskOrdering always adjusts home surface layer to
- // the bottom, this makes sure TaskFragments not in split roots won't occlude
- // home task unexpectedly.
- return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
- }
- break;
- case WINDOWING_MODE_SPLIT_SCREEN_PRIMARY:
- if (gotTranslucentSplitScreenPrimary) {
- // Covered by translucent primary split-screen on top.
- return TASK_FRAGMENT_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT;
- }
- break;
- case WINDOWING_MODE_SPLIT_SCREEN_SECONDARY:
- if (gotTranslucentSplitScreenSecondary) {
- // Covered by translucent secondary split-screen on top.
- return TASK_FRAGMENT_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT;
- }
- break;
- }
-
// Lastly - check if there is a translucent fullscreen TaskFragment on top.
return gotTranslucentFullscreen
? TASK_FRAGMENT_VISIBILITY_VISIBLE_BEHIND_TRANSLUCENT
@@ -1683,6 +1621,7 @@
@Override
void addChild(WindowContainer child, int index) {
+ ActivityRecord r = topRunningActivity();
mClearedTaskForReuse = false;
boolean isAddingActivity = child.asActivityRecord() != null;
@@ -1697,6 +1636,18 @@
super.addChild(child, index);
if (isAddingActivity && task != null) {
+
+ // TODO(b/207481538): temporary per-activity screenshoting
+ if (r != null && BackNavigationController.isEnabled()) {
+ ProtoLog.v(WM_DEBUG_BACK_PREVIEW, "Screenshotting Activity %s",
+ r.mActivityComponent.flattenToString());
+ Rect outBounds = r.getBounds();
+ SurfaceControl.ScreenshotHardwareBuffer backBuffer = SurfaceControl.captureLayers(
+ r.mSurfaceControl,
+ new Rect(0, 0, outBounds.width(), outBounds.height()),
+ 1f);
+ mBackScreenshots.put(r.mActivityComponent.flattenToString(), backBuffer);
+ }
child.asActivityRecord().inHistory = true;
task.onDescendantActivityAdded(taskHadActivity, activityType, child.asActivityRecord());
}
@@ -2290,6 +2241,14 @@
void removeChild(WindowContainer child, boolean removeSelfIfPossible) {
super.removeChild(child);
+ if (BackNavigationController.isEnabled()) {
+ //TODO(b/207481538) Remove once the infrastructure to support per-activity screenshot is
+ // implemented
+ ActivityRecord r = child.asActivityRecord();
+ if (r != null) {
+ mBackScreenshots.remove(r.mActivityComponent.flattenToString());
+ }
+ }
if (removeSelfIfPossible && (!mCreatedByOrganizer || mIsRemovalRequested) && !hasChild()) {
removeImmediately("removeLastChild " + child);
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java
index 1ab191b..b9fa297 100644
--- a/services/core/java/com/android/server/wm/WindowManagerInternal.java
+++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java
@@ -16,6 +16,9 @@
package com.android.server.wm;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.ClipData;
@@ -40,6 +43,7 @@
import com.android.server.input.InputManagerService;
import com.android.server.policy.WindowManagerPolicy;
+import java.lang.annotation.Retention;
import java.util.List;
import java.util.Set;
@@ -609,6 +613,7 @@
/**
* Checks whether the specified IME client has IME focus or not.
*
+ * @param windowToken The window token of the input method client
* @param uid UID of the process to be queried
* @param pid PID of the process to be queried
* @param displayId Display ID reported from the client. Note that this method also verifies
@@ -616,7 +621,22 @@
* @return {@code true} if the IME client specified with {@code uid}, {@code pid}, and
* {@code displayId} has IME focus
*/
- public abstract boolean isInputMethodClientFocus(int uid, int pid, int displayId);
+ public abstract @ImeClientFocusResult int hasInputMethodClientFocus(IBinder windowToken,
+ int uid, int pid, int displayId);
+
+ @Retention(SOURCE)
+ @IntDef({
+ ImeClientFocusResult.HAS_IME_FOCUS,
+ ImeClientFocusResult.NOT_IME_TARGET_WINDOW,
+ ImeClientFocusResult.DISPLAY_ID_MISMATCH,
+ ImeClientFocusResult.INVALID_DISPLAY_ID
+ })
+ public @interface ImeClientFocusResult {
+ int HAS_IME_FOCUS = 0;
+ int NOT_IME_TARGET_WINDOW = -1;
+ int DISPLAY_ID_MISMATCH = -2;
+ int INVALID_DISPLAY_ID = -3;
+ }
/**
* Checks whether the given {@code uid} is allowed to use the given {@code displayId} or not.
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 2f0ef4a..c1a8ceb 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -143,6 +143,7 @@
import android.Manifest.permission;
import android.animation.ValueAnimator;
import android.annotation.IntDef;
+import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -170,14 +171,12 @@
import android.content.res.TypedArray;
import android.database.ContentObserver;
import android.graphics.Bitmap;
-import android.graphics.Insets;
import android.graphics.Point;
+import android.graphics.PointF;
import android.graphics.Rect;
import android.graphics.Region;
import android.hardware.configstore.V1_0.OptionalBool;
-import android.hardware.configstore.V1_1.DisplayOrientation;
import android.hardware.configstore.V1_1.ISurfaceFlingerConfigs;
-import android.hardware.configstore.V1_1.OptionalDisplayOrientation;
import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManagerInternal;
import android.hardware.input.InputManager;
@@ -229,7 +228,6 @@
import android.util.proto.ProtoOutputStream;
import android.view.Choreographer;
import android.view.Display;
-import android.view.DisplayAddress;
import android.view.DisplayInfo;
import android.view.Gravity;
import android.view.IAppTransitionAnimationSpecsFuture;
@@ -282,6 +280,7 @@
import android.view.displayhash.DisplayHash;
import android.view.displayhash.VerifiedDisplayHash;
import android.window.ClientWindowFrames;
+import android.window.IOnFpsCallbackListener;
import android.window.TaskSnapshot;
import com.android.internal.R;
@@ -439,8 +438,6 @@
*/
static final boolean ENABLE_FIXED_ROTATION_TRANSFORM =
SystemProperties.getBoolean("persist.wm.fixed_rotation_transform", true);
- private @Surface.Rotation int mPrimaryDisplayOrientation = Surface.ROTATION_0;
- private DisplayAddress mPrimaryDisplayPhysicalAddress;
// Enums for animation scale update types.
@Retention(RetentionPolicy.SOURCE)
@@ -589,6 +586,13 @@
final ArrayList<WindowState> mResizingWindows = new ArrayList<>();
/**
+ * Mapping of displayId to {@link DisplayImePolicy}.
+ * Note that this can be accessed without holding the lock.
+ */
+ volatile Map<Integer, Integer> mDisplayImePolicyCache = Collections.unmodifiableMap(
+ new ArrayMap<>());
+
+ /**
* Windows whose surface should be destroyed.
*/
final ArrayList<WindowState> mDestroySurface = new ArrayList<>();
@@ -708,6 +712,7 @@
final TaskSnapshotController mTaskSnapshotController;
final BlurController mBlurController;
+ final TaskFpsCallbackController mTaskFpsCallbackController;
boolean mIsTouchDevice;
boolean mIsFakeTouchDevice;
@@ -1354,6 +1359,7 @@
mStartingSurfaceController = new StartingSurfaceController(this);
mBlurController = new BlurController(mContext, mPowerManager);
+ mTaskFpsCallbackController = new TaskFpsCallbackController(mContext);
mAccessibilityController = new AccessibilityController(this);
}
@@ -1788,8 +1794,7 @@
prepareNoneTransitionForRelaunching(activity);
}
- if (displayPolicy.getLayoutHint(win.mAttrs, token, outInsetsState,
- win.isClientLocal())) {
+ if (displayPolicy.areSystemBarsForcedShownLw()) {
res |= WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_SYSTEM_BARS;
}
@@ -1836,6 +1841,7 @@
displayContent.getInsetsStateController().updateAboveInsetsState(
win, false /* notifyInsetsChanged */);
+ outInsetsState.set(win.getCompatInsetsState(), win.isClientLocal());
getInsetsSourceControls(win, outActiveControls);
}
@@ -2438,23 +2444,6 @@
configChanged = displayContent.updateOrientation();
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
- final DisplayInfo displayInfo = win.getDisplayInfo();
- int transformHint = displayInfo.rotation;
- // If the window is on the primary display, use the panel orientation to adjust the
- // transform hint
- final boolean isPrimaryDisplay = displayInfo.address != null &&
- displayInfo.address.equals(mPrimaryDisplayPhysicalAddress);
- if (isPrimaryDisplay) {
- transformHint = (transformHint + mPrimaryDisplayOrientation) % 4;
- }
- outSurfaceControl.setTransformHint(
- SurfaceControl.rotationToBufferTransform(transformHint));
- ProtoLog.v(WM_DEBUG_ORIENTATION,
- "Passing transform hint %d for window %s%s",
- transformHint, win,
- isPrimaryDisplay ? " on primary display with orientation "
- + mPrimaryDisplayOrientation : "");
-
if (toBeDisplayed && win.mIsWallpaper) {
displayContent.mWallpaperController.updateWallpaperOffset(win, false /* sync */);
}
@@ -3838,6 +3827,40 @@
}
/**
+ * Generates and returns an up-to-date {@link Bitmap} for the specified taskId. The returned
+ * bitmap will be full size and will not include any secure content.
+ *
+ * @param taskId The task ID of the task for which a snapshot is requested.
+ * @return The Bitmap, or null if no task with the specified ID can be found or the bitmap could
+ * not be generated.
+ */
+ @Nullable public Bitmap captureTaskBitmap(int taskId) {
+ if (mTaskSnapshotController.shouldDisableSnapshots()) {
+ return null;
+ }
+
+ synchronized (mGlobalLock) {
+ final Task task = mRoot.anyTaskForId(taskId);
+ if (task == null) {
+ return null;
+ }
+
+ task.getBounds(mTmpRect);
+ final SurfaceControl sc = task.getSurfaceControl();
+ final SurfaceControl.ScreenshotHardwareBuffer buffer = SurfaceControl.captureLayers(
+ new SurfaceControl.LayerCaptureArgs.Builder(sc)
+ .setSourceCrop(mTmpRect)
+ .build());
+ if (buffer == null) {
+ Slog.w(TAG, "Could not get screenshot buffer for taskId: " + taskId);
+ return null;
+ }
+
+ return buffer.asBitmap();
+ }
+ }
+
+ /**
* In case a task write/delete operation was lost because the system crashed, this makes sure to
* clean up the directory to remove obsolete files.
*
@@ -4316,6 +4339,15 @@
}
}
+ void reportKeepClearAreasChanged(Session session, IWindow window, List<Rect> keepClearAreas) {
+ synchronized (mGlobalLock) {
+ final WindowState win = windowForClientLocked(session, window, true);
+ if (win.setKeepClearAreas(keepClearAreas)) {
+ win.getDisplayContent().updateKeepClearAreas();
+ }
+ }
+ }
+
@Override
public void registerDisplayFoldListener(IDisplayFoldListener listener) {
mPolicy.registerDisplayFoldListener(listener);
@@ -4888,9 +4920,6 @@
mTaskSnapshotController.systemReady();
mHasWideColorGamutSupport = queryWideColorGamutSupport();
mHasHdrSupport = queryHdrSupport();
- mPrimaryDisplayOrientation = queryPrimaryDisplayOrientation();
- mPrimaryDisplayPhysicalAddress =
- DisplayAddress.fromPhysicalDisplayId(SurfaceControl.getPrimaryPhysicalDisplayId());
UiThread.getHandler().post(mSettingsObserver::loadSettings);
IVrManager vrManager = IVrManager.Stub.asInterface(
ServiceManager.getService(Context.VR_SERVICE));
@@ -4953,39 +4982,6 @@
return false;
}
- private static @Surface.Rotation int queryPrimaryDisplayOrientation() {
- Optional<SurfaceFlingerProperties.primary_display_orientation_values> prop =
- SurfaceFlingerProperties.primary_display_orientation();
- if (prop.isPresent()) {
- switch (prop.get()) {
- case ORIENTATION_90: return Surface.ROTATION_90;
- case ORIENTATION_180: return Surface.ROTATION_180;
- case ORIENTATION_270: return Surface.ROTATION_270;
- case ORIENTATION_0:
- default:
- return Surface.ROTATION_0;
- }
- }
- try {
- ISurfaceFlingerConfigs surfaceFlinger = ISurfaceFlingerConfigs.getService();
- OptionalDisplayOrientation primaryDisplayOrientation =
- surfaceFlinger.primaryDisplayOrientation();
- if (primaryDisplayOrientation != null && primaryDisplayOrientation.specified) {
- switch (primaryDisplayOrientation.value) {
- case DisplayOrientation.ORIENTATION_90: return Surface.ROTATION_90;
- case DisplayOrientation.ORIENTATION_180: return Surface.ROTATION_180;
- case DisplayOrientation.ORIENTATION_270: return Surface.ROTATION_270;
- case DisplayOrientation.ORIENTATION_0:
- default:
- return Surface.ROTATION_0;
- }
- }
- } catch (Exception e) {
- // Use default value if we can't talk to config store.
- }
- return Surface.ROTATION_0;
- }
-
// Returns an input target which is mapped to the given input token. This can be a WindowState
// or an embedded window.
@Nullable InputTarget getInputTargetFromToken(IBinder inputToken) {
@@ -6908,6 +6904,7 @@
void setForceDesktopModeOnExternalDisplays(boolean forceDesktopModeOnExternalDisplays) {
synchronized (mGlobalLock) {
mForceDesktopModeOnExternalDisplays = forceDesktopModeOnExternalDisplays;
+ mRoot.updateDisplayImePolicyCache();
}
}
@@ -6963,23 +6960,6 @@
}
}
- @Override
- public void setForwardedInsets(int displayId, Insets insets) throws RemoteException {
- synchronized (mGlobalLock) {
- final DisplayContent dc = mRoot.getDisplayContent(displayId);
- if (dc == null) {
- return;
- }
- final int callingUid = Binder.getCallingUid();
- final int displayOwnerUid = dc.getDisplay().getOwnerUid();
- if (callingUid != displayOwnerUid) {
- throw new SecurityException(
- "Only owner of the display can set ForwardedInsets to it.");
- }
- dc.setForwardedInsets(insets);
- }
- }
-
MousePositionTracker mMousePositionTracker = new MousePositionTracker();
private static class MousePositionTracker implements PointerEventListener {
@@ -7066,6 +7046,13 @@
}
}
+ PointF getLatestMousePosition() {
+ synchronized (mMousePositionTracker) {
+ return new PointF(mMousePositionTracker.mLatestMouseX,
+ mMousePositionTracker.mLatestMouseY);
+ }
+ }
+
/**
* Update a tap exclude region in the window identified by the provided id. Touches down on this
* region will not:
@@ -7332,16 +7319,14 @@
if (!checkCallingPermission(INTERNAL_SYSTEM_WINDOW, "getDisplayImePolicy()")) {
throw new SecurityException("Requires INTERNAL_SYSTEM_WINDOW permission");
}
- final DisplayContent dc = mRoot.getDisplayContent(displayId);
- if (dc == null) {
+ final Map<Integer, Integer> displayImePolicyCache = mDisplayImePolicyCache;
+ if (!displayImePolicyCache.containsKey(displayId)) {
ProtoLog.w(WM_ERROR,
"Attempted to get IME policy of a display that does not exist: %d",
displayId);
return DISPLAY_IME_POLICY_FALLBACK_DISPLAY;
}
- synchronized (mGlobalLock) {
- return dc.getImePolicy();
- }
+ return displayImePolicyCache.get(displayId);
}
@Override
@@ -7690,19 +7675,32 @@
}
@Override
- public boolean isInputMethodClientFocus(int uid, int pid, int displayId) {
+ public @ImeClientFocusResult int hasInputMethodClientFocus(IBinder windowToken,
+ int uid, int pid, int displayId) {
if (displayId == Display.INVALID_DISPLAY) {
- return false;
+ return ImeClientFocusResult.INVALID_DISPLAY_ID;
}
synchronized (mGlobalLock) {
final DisplayContent displayContent = mRoot.getTopFocusedDisplayContent();
+ final WindowState window = mWindowMap.get(windowToken);
+ if (window == null) {
+ return ImeClientFocusResult.NOT_IME_TARGET_WINDOW;
+ }
+ final int tokenDisplayId = window.getDisplayContent().getDisplayId();
+ if (tokenDisplayId != displayId) {
+ Slog.e(TAG, "isInputMethodClientFocus: display ID mismatch."
+ + " from client: " + displayId
+ + " from window: " + tokenDisplayId);
+ return ImeClientFocusResult.DISPLAY_ID_MISMATCH;
+ }
if (displayContent == null
|| displayContent.getDisplayId() != displayId
|| !displayContent.hasAccess(uid)) {
- return false;
+ return ImeClientFocusResult.INVALID_DISPLAY_ID;
}
+
if (displayContent.isInputMethodClientFocus(uid, pid)) {
- return true;
+ return ImeClientFocusResult.HAS_IME_FOCUS;
}
// Okay, how about this... what is the current focus?
// It seems in some cases we may not have moved the IM
@@ -7715,10 +7713,11 @@
final WindowState currentFocus = displayContent.mCurrentFocus;
if (currentFocus != null && currentFocus.mSession.mUid == uid
&& currentFocus.mSession.mPid == pid) {
- return currentFocus.canBeImeTarget();
+ return currentFocus.canBeImeTarget() ? ImeClientFocusResult.HAS_IME_FOCUS
+ : ImeClientFocusResult.NOT_IME_TARGET_WINDOW;
}
}
- return false;
+ return ImeClientFocusResult.NOT_IME_TARGET_WINDOW;
}
@Override
@@ -7817,9 +7816,7 @@
@Override
public @DisplayImePolicy int getDisplayImePolicy(int displayId) {
- synchronized (mGlobalLock) {
- return WindowManagerService.this.getDisplayImePolicy(displayId);
- }
+ return WindowManagerService.this.getDisplayImePolicy(displayId);
}
@Override
@@ -8475,6 +8472,7 @@
public boolean getWindowInsets(WindowManager.LayoutParams attrs, int displayId,
InsetsState outInsetsState) {
final boolean fromLocal = Binder.getCallingPid() == myPid();
+ final int uid = Binder.getCallingUid();
final long origId = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
@@ -8483,9 +8481,20 @@
throw new WindowManager.InvalidDisplayException("Display#" + displayId
+ "could not be found!");
}
- final WindowToken windowToken = dc.getWindowToken(attrs.token);
- return dc.getDisplayPolicy().getLayoutHint(attrs, windowToken, outInsetsState,
- fromLocal);
+ final WindowToken token = dc.getWindowToken(attrs.token);
+ final float overrideScale = mAtmService.mCompatModePackages.getCompatScale(
+ attrs.packageName, uid);
+ final InsetsState state = dc.getInsetsPolicy().getInsetsForWindowMetrics(attrs);
+ final boolean hasCompatScale =
+ WindowState.hasCompatScale(attrs, token, overrideScale);
+ outInsetsState.set(state, hasCompatScale || fromLocal);
+ if (hasCompatScale) {
+ final float compatScale = token != null && token.hasSizeCompatBounds()
+ ? token.getSizeCompatScale() * overrideScale
+ : overrideScale;
+ outInsetsState.scale(1f / compatScale);
+ }
+ return dc.getDisplayPolicy().areSystemBarsForcedShownLw();
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -8714,20 +8723,21 @@
}
boolean shouldRestoreImeVisibility(IBinder imeTargetWindowToken) {
+ final Task imeTargetWindowTask;
synchronized (mGlobalLock) {
final WindowState imeTargetWindow = mWindowMap.get(imeTargetWindowToken);
if (imeTargetWindow == null) {
return false;
}
- final Task imeTargetWindowTask = imeTargetWindow.getTask();
+ imeTargetWindowTask = imeTargetWindow.getTask();
if (imeTargetWindowTask == null) {
return false;
}
- final TaskSnapshot snapshot = getTaskSnapshot(imeTargetWindowTask.mTaskId,
- imeTargetWindowTask.mUserId, false /* isLowResolution */,
- false /* restoreFromDisk */);
- return snapshot != null && snapshot.hasImeSurface();
}
+ final TaskSnapshot snapshot = getTaskSnapshot(imeTargetWindowTask.mTaskId,
+ imeTargetWindowTask.mUserId, false /* isLowResolution */,
+ false /* restoreFromDisk */);
+ return snapshot != null && snapshot.hasImeSurface();
}
@Override
@@ -8772,4 +8782,34 @@
mTaskTransitionSpec = null;
}
+ @Override
+ @RequiresPermission(Manifest.permission.ACCESS_FPS_COUNTER)
+ public void registerTaskFpsCallback(@IntRange(from = 0) int taskId,
+ IOnFpsCallbackListener listener) {
+ if (mContext.checkCallingOrSelfPermission(Manifest.permission.ACCESS_FPS_COUNTER)
+ != PackageManager.PERMISSION_GRANTED) {
+ final int pid = Binder.getCallingPid();
+ throw new SecurityException("Access denied to process: " + pid
+ + ", must have permission " + Manifest.permission.ACCESS_FPS_COUNTER);
+ }
+
+ if (mRoot.anyTaskForId(taskId) == null) {
+ throw new IllegalArgumentException("no task with taskId: " + taskId);
+ }
+
+ mTaskFpsCallbackController.registerCallback(taskId, listener);
+ }
+
+ @Override
+ @RequiresPermission(Manifest.permission.ACCESS_FPS_COUNTER)
+ public void unregisterTaskFpsCallback(IOnFpsCallbackListener listener) {
+ if (mContext.checkCallingOrSelfPermission(Manifest.permission.ACCESS_FPS_COUNTER)
+ != PackageManager.PERMISSION_GRANTED) {
+ final int pid = Binder.getCallingPid();
+ throw new SecurityException("Access denied to process: " + pid
+ + ", must have permission " + Manifest.permission.ACCESS_FPS_COUNTER);
+ }
+
+ mTaskFpsCallbackController.unregisterCallback(listener);
+ }
}
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index e4d3e05..1f83767 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -172,6 +172,7 @@
import static com.android.server.wm.WindowStateProto.IS_ON_SCREEN;
import static com.android.server.wm.WindowStateProto.IS_READY_FOR_DISPLAY;
import static com.android.server.wm.WindowStateProto.IS_VISIBLE;
+import static com.android.server.wm.WindowStateProto.KEEP_CLEAR_AREAS;
import static com.android.server.wm.WindowStateProto.PENDING_SEAMLESS_ROTATION;
import static com.android.server.wm.WindowStateProto.REMOVED;
import static com.android.server.wm.WindowStateProto.REMOVE_ON_EXIT;
@@ -196,6 +197,7 @@
import android.graphics.PixelFormat;
import android.graphics.Point;
import android.graphics.Rect;
+import android.graphics.RectF;
import android.graphics.Region;
import android.gui.TouchOcclusionMode;
import android.os.Binder;
@@ -442,9 +444,8 @@
// Current transformation being applied.
float mGlobalScale=1;
- float mLastGlobalScale=1;
float mInvGlobalScale=1;
- float mOverrideScale = 1;
+ final float mOverrideScale;
float mHScale=1, mVScale=1;
float mLastHScale=1, mLastVScale=1;
@@ -471,6 +472,12 @@
* Coordinates are relative to the window's position.
*/
private final List<Rect> mExclusionRects = new ArrayList<>();
+ /**
+ * List of rects which should ideally not be covered by floating windows like Pip.
+ *
+ * Coordinates are relative to the window's position.
+ */
+ private final List<Rect> mKeepClearAreas = new ArrayList<>();
// 0 = left, 1 = right
private final int[] mLastRequestedExclusionHeight = {0, 0};
@@ -1012,6 +1019,55 @@
}
}
+ /**
+ * @return a list of rects that should ideally not be covered by floating windows like pip.
+ * The returned rect coordinates are relative to the display origin.
+ */
+ List<Rect> getKeepClearAreas() {
+ final Matrix tmpMatrix = new Matrix();
+ final float[] tmpFloat9 = new float[9];
+ return getKeepClearAreas(tmpMatrix, tmpFloat9);
+ }
+
+ /**
+ * @param tmpMatrix a temporary matrix to be used for transformations
+ * @param float9 a temporary array of 9 floats
+ *
+ * @return a list of rects that should ideally not be covered by floating windows like pip.
+ * The returned rect coordinates are relative to the display origin.
+ */
+ List<Rect> getKeepClearAreas(Matrix tmpMatrix, float[] float9) {
+ getTransformationMatrix(float9, tmpMatrix);
+
+ // Translate all keep-clear rects to screen coordinates.
+ final List<Rect> transformedKeepClearAreas = new ArrayList<Rect>();
+ final RectF tmpRect = new RectF();
+ Rect curr;
+ for (Rect r : mKeepClearAreas) {
+ tmpRect.set(r);
+ tmpMatrix.mapRect(tmpRect);
+ curr = new Rect();
+ tmpRect.roundOut(curr);
+ transformedKeepClearAreas.add(curr);
+ }
+ return transformedKeepClearAreas;
+ }
+
+ /**
+ * @param keepClearAreas the new keep-clear areas for this window. The rects should be defined
+ * in window coordinate space
+ *
+ * @return true if there is a change in the list of keep-clear areas; false otherwise
+ */
+ boolean setKeepClearAreas(List<Rect> keepClearAreas) {
+ if (mKeepClearAreas.equals(keepClearAreas)) {
+ return false;
+ }
+ mKeepClearAreas.clear();
+ mKeepClearAreas.addAll(keepClearAreas);
+ return true;
+ }
+
interface PowerManagerWrapper {
void wakeUp(long time, @WakeReason int reason, String details);
@@ -1091,6 +1147,7 @@
mSubLayer = 0;
mWinAnimator = null;
mWpcForDisplayAreaConfigChanges = null;
+ mOverrideScale = 1f;
return;
}
mDeathRecipient = deathRecipient;
@@ -1138,6 +1195,7 @@
mLayer = 0;
mOverrideScale = mWmService.mAtmService.mCompatModePackages.getCompatScale(
mAttrs.packageName, s.mUid);
+ updateGlobalScale();
// Make sure we initial all fields before adding to parentWindow, to prevent exception
// during onDisplayChanged.
@@ -1167,6 +1225,23 @@
mSession.windowAddedLocked();
}
+ boolean updateGlobalScale() {
+ if (hasCompatScale()) {
+ if (mOverrideScale != 1f) {
+ mGlobalScale = mToken.hasSizeCompatBounds()
+ ? mToken.getSizeCompatScale() * mOverrideScale
+ : mOverrideScale;
+ } else {
+ mGlobalScale = mToken.getSizeCompatScale();
+ }
+ mInvGlobalScale = 1f / mGlobalScale;
+ return true;
+ }
+
+ mGlobalScale = mInvGlobalScale = 1f;
+ return false;
+ }
+
/**
* @return {@code true} if the application runs in size compatibility mode or has an app level
* scaling override set.
@@ -1175,7 +1250,7 @@
* @see ActivityRecord#hasSizeCompatBounds()
*/
boolean hasCompatScale() {
- return mOverrideScale != 1f || hasCompatScale(mAttrs, mActivityRecord);
+ return hasCompatScale(mAttrs, mActivityRecord, mOverrideScale);
}
/**
@@ -1183,11 +1258,16 @@
* @see android.content.res.CompatibilityInfo#supportsScreen
* @see ActivityRecord#hasSizeCompatBounds()
*/
- static boolean hasCompatScale(WindowManager.LayoutParams attrs, WindowToken windowToken) {
- return (attrs.privateFlags & PRIVATE_FLAG_COMPATIBLE_WINDOW) != 0
- || (windowToken != null && windowToken.hasSizeCompatBounds()
- // Exclude starting window because it is not displayed by the application.
- && attrs.type != TYPE_APPLICATION_STARTING);
+ static boolean hasCompatScale(WindowManager.LayoutParams attrs, WindowToken token,
+ float overrideScale) {
+ if ((attrs.privateFlags & PRIVATE_FLAG_COMPATIBLE_WINDOW) != 0) {
+ return true;
+ }
+ if (attrs.type == TYPE_APPLICATION_STARTING) {
+ // Exclude starting window because it is not displayed by the application.
+ return false;
+ }
+ return token != null && token.hasSizeCompatBounds() || overrideScale != 1f;
}
/**
@@ -1691,21 +1771,6 @@
&& (mActivityRecord.firstWindowDrawn || mActivityRecord.startingDisplayed);
}
- void prelayout() {
- if (hasCompatScale()) {
- if (mOverrideScale != 1f) {
- mGlobalScale = mToken.hasSizeCompatBounds()
- ? mToken.getSizeCompatScale() * mOverrideScale
- : mOverrideScale;
- } else {
- mGlobalScale = mToken.getSizeCompatScale();
- }
- mInvGlobalScale = 1 / mGlobalScale;
- } else {
- mGlobalScale = mInvGlobalScale = 1;
- }
- }
-
@Override
boolean hasContentToDisplay() {
if (!mAppFreezing && isDrawn() && (mViewVisibility == View.VISIBLE
@@ -2928,7 +2993,6 @@
@Override
public void binderDied() {
try {
- boolean resetSplitScreenResizing = false;
synchronized (mWmService.mGlobalLock) {
final WindowState win = mWmService
.windowForClientLocked(mSession, mClient, false);
@@ -2944,16 +3008,6 @@
WindowState.this.removeIfPossible();
}
}
- if (resetSplitScreenResizing) {
- try {
- // Note: this calls into ActivityManager, so we must *not* hold the window
- // manager lock while calling this.
- mWmService.mActivityTaskManager.setSplitScreenResizing(false);
- } catch (RemoteException e) {
- // Local call, shouldn't return RemoteException.
- throw e.rethrowAsRuntimeException();
- }
- }
} catch (IllegalArgumentException ex) {
// This will happen if the window has already been removed.
}
@@ -4063,6 +4117,9 @@
proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);
proto.write(HAS_COMPAT_SCALE, hasCompatScale());
proto.write(GLOBAL_SCALE, mGlobalScale);
+ for (Rect r : getKeepClearAreas()) {
+ r.dumpDebug(proto, KEEP_CLEAR_AREAS);
+ }
proto.end(token);
}
@@ -4231,6 +4288,7 @@
}
pw.println(prefix + "isOnScreen=" + isOnScreen());
pw.println(prefix + "isVisible=" + isVisible());
+ pw.println(prefix + "keepClearAreas=" + getKeepClearAreas());
if (dumpAll) {
final String visibilityString = mRequestedVisibilities.toString();
if (!visibilityString.isEmpty()) {
@@ -5259,7 +5317,6 @@
mLastVScale != newVScale ) {
getPendingTransaction().setMatrix(getSurfaceControl(),
newHScale, 0, 0, newVScale);
- mLastGlobalScale = mGlobalScale;
mLastHScale = newHScale;
mLastVScale = newVScale;
}
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index b643883..79a980f 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -68,6 +68,7 @@
"com_android_server_am_LowMemDetector.cpp",
"com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",
"com_android_server_sensor_SensorService.cpp",
+ "com_android_server_wm_TaskFpsCallbackController.cpp",
"onload.cpp",
":lib_cachedAppOptimizer_native",
":lib_networkStatsFactory_native",
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 3cd4e5e..4524bb7 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -286,6 +286,7 @@
void requestPointerCapture(const sp<IBinder>& windowToken, bool enabled);
void setCustomPointerIcon(const SpriteIcon& icon);
void setMotionClassifierEnabled(bool enabled);
+ void notifyPointerDisplayIdChanged();
/* --- InputReaderPolicyInterface implementation --- */
@@ -1494,6 +1495,18 @@
mInputManager->getClassifier().setMotionClassifierEnabled(enabled);
}
+void NativeInputManager::notifyPointerDisplayIdChanged() {
+ int32_t pointerDisplayId = getPointerDisplayId();
+
+ { // acquire lock
+ AutoMutex _l(mLock);
+ mLocked.pointerDisplayId = pointerDisplayId;
+ } // release lock
+
+ mInputManager->getReader().requestRefreshConfiguration(
+ InputReaderConfiguration::CHANGE_DISPLAY_INFO);
+}
+
// ----------------------------------------------------------------------------
static jlong nativeInit(JNIEnv* env, jclass /* clazz */,
@@ -2186,6 +2199,18 @@
InputReaderConfiguration::CHANGE_DISPLAY_INFO);
}
+static void nativeNotifyPointerDisplayIdChanged(JNIEnv* env, jclass /* clazz */, jlong ptr) {
+ NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
+ im->notifyPointerDisplayIdChanged();
+}
+
+static void nativeSetDisplayEligibilityForPointerCapture(JNIEnv* env, jclass /* clazz */, jlong ptr,
+ jint displayId, jboolean isEligible) {
+ NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
+ im->getInputManager()->getDispatcher().setDisplayEligibilityForPointerCapture(displayId,
+ isEligible);
+}
+
static void nativeChangeUniqueIdAssociation(JNIEnv* env, jclass /* clazz */, jlong ptr) {
NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
im->getInputManager()->getReader().requestRefreshConfiguration(
@@ -2370,6 +2395,9 @@
{"nativeCanDispatchToDisplay", "(JII)Z", (void*)nativeCanDispatchToDisplay},
{"nativeNotifyPortAssociationsChanged", "(J)V", (void*)nativeNotifyPortAssociationsChanged},
{"nativeChangeUniqueIdAssociation", "(J)V", (void*)nativeChangeUniqueIdAssociation},
+ {"nativeNotifyPointerDisplayIdChanged", "(J)V", (void*)nativeNotifyPointerDisplayIdChanged},
+ {"nativeSetDisplayEligibilityForPointerCapture", "(JIZ)V",
+ (void*)nativeSetDisplayEligibilityForPointerCapture},
{"nativeSetMotionClassifierEnabled", "(JZ)V", (void*)nativeSetMotionClassifierEnabled},
{"nativeGetSensorList", "(JI)[Landroid/hardware/input/InputSensorInfo;",
(void*)nativeGetSensorList},
diff --git a/services/core/jni/com_android_server_wm_TaskFpsCallbackController.cpp b/services/core/jni/com_android_server_wm_TaskFpsCallbackController.cpp
new file mode 100644
index 0000000..0202306
--- /dev/null
+++ b/services/core/jni/com_android_server_wm_TaskFpsCallbackController.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2022 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.
+ */
+
+#define LOG_TAG "TaskFpsCallbackController"
+
+#include <android/gui/BnFpsListener.h>
+#include <android_runtime/AndroidRuntime.h>
+#include <android_runtime/Log.h>
+#include <gui/ISurfaceComposer.h>
+#include <gui/SurfaceComposerClient.h>
+#include <nativehelper/JNIHelp.h>
+#include <utils/Log.h>
+#include <utils/RefBase.h>
+
+#include "android_util_Binder.h"
+#include "core_jni_helpers.h"
+
+namespace android {
+
+namespace {
+
+struct {
+ jclass mClass;
+ jmethodID mDispatchOnFpsReported;
+} gCallbackClassInfo;
+
+struct TaskFpsCallback : public gui::BnFpsListener {
+ TaskFpsCallback(JNIEnv* env, jobject listener) : mListener(env->NewWeakGlobalRef(listener)) {}
+
+ binder::Status onFpsReported(float fps) override {
+ JNIEnv* env = AndroidRuntime::getJNIEnv();
+ LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onFpsReported.");
+
+ jobject listener = env->NewGlobalRef(mListener);
+ if (listener == NULL) {
+ // Weak reference went out of scope
+ return binder::Status::ok();
+ }
+ env->CallStaticVoidMethod(gCallbackClassInfo.mClass,
+ gCallbackClassInfo.mDispatchOnFpsReported, listener,
+ static_cast<jfloat>(fps));
+ env->DeleteGlobalRef(listener);
+
+ if (env->ExceptionCheck()) {
+ ALOGE("TaskFpsCallback.onFpsReported() failed.");
+ LOGE_EX(env);
+ env->ExceptionClear();
+ }
+ return binder::Status::ok();
+ }
+
+protected:
+ virtual ~TaskFpsCallback() {
+ JNIEnv* env = AndroidRuntime::getJNIEnv();
+ env->DeleteWeakGlobalRef(mListener);
+ }
+
+private:
+ jweak mListener;
+};
+
+jlong nativeRegister(JNIEnv* env, jclass clazz, jobject obj, jint taskId) {
+ TaskFpsCallback* callback = new TaskFpsCallback(env, obj);
+
+ if (SurfaceComposerClient::addFpsListener(taskId, callback) != OK) {
+ constexpr auto error_msg = "Couldn't addFpsListener";
+ ALOGE(error_msg);
+ jniThrowRuntimeException(env, error_msg);
+ }
+ callback->incStrong((void*)nativeRegister);
+
+ return reinterpret_cast<jlong>(callback);
+}
+
+void nativeUnregister(JNIEnv* env, jclass clazz, jlong ptr) {
+ sp<TaskFpsCallback> callback = reinterpret_cast<TaskFpsCallback*>(ptr);
+
+ if (SurfaceComposerClient::removeFpsListener(callback) != OK) {
+ constexpr auto error_msg = "Couldn't removeFpsListener";
+ ALOGE(error_msg);
+ jniThrowRuntimeException(env, error_msg);
+ }
+
+ callback->decStrong((void*)nativeRegister);
+}
+
+static const JNINativeMethod gMethods[] = {
+ /* name, signature, funcPtr */
+ {"nativeRegister", "(Landroid/window/IOnFpsCallbackListener;I)J", (void*)nativeRegister},
+ {"nativeUnregister", "(J)V", (void*)nativeUnregister}};
+
+} // namespace
+
+int register_com_android_server_wm_TaskFpsCallbackController(JNIEnv* env) {
+ int res = jniRegisterNativeMethods(env, "com/android/server/wm/TaskFpsCallbackController",
+ gMethods, NELEM(gMethods));
+ LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods.");
+
+ jclass clazz = env->FindClass("android/window/TaskFpsCallback");
+ gCallbackClassInfo.mClass = MakeGlobalRefOrDie(env, clazz);
+ gCallbackClassInfo.mDispatchOnFpsReported =
+ env->GetStaticMethodID(clazz, "dispatchOnFpsReported",
+ "(Landroid/window/IOnFpsCallbackListener;F)V");
+ return 0;
+}
+
+} // namespace android
diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp
index 80d7055..ba5b3f5 100644
--- a/services/core/jni/onload.cpp
+++ b/services/core/jni/onload.cpp
@@ -65,6 +65,7 @@
int register_android_server_sensor_SensorService(JavaVM* vm, JNIEnv* env);
int register_android_server_companion_virtual_InputController(JNIEnv* env);
int register_android_server_app_GameManagerService(JNIEnv* env);
+int register_com_android_server_wm_TaskFpsCallbackController(JNIEnv* env);
};
using namespace android;
@@ -123,5 +124,6 @@
register_android_server_sensor_SensorService(vm, env);
register_android_server_companion_virtual_InputController(env);
register_android_server_app_GameManagerService(env);
+ register_com_android_server_wm_TaskFpsCallbackController(env);
return JNI_VERSION_1_4;
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
index df9ab50..f19202a 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
@@ -145,6 +145,10 @@
private static final String TAG_PREFERENTIAL_NETWORK_SERVICE_ENABLED =
"preferential-network-service-enabled";
private static final String TAG_USB_DATA_SIGNALING = "usb-data-signaling";
+ private static final String TAG_WIFI_MIN_SECURITY = "wifi-min-security";
+ private static final String TAG_SSID_ALLOWLIST = "ssid-allowlist";
+ private static final String TAG_SSID_DENYLIST = "ssid-denylist";
+ private static final String TAG_SSID = "ssid";
private static final String ATTR_VALUE = "value";
private static final String ATTR_LAST_NETWORK_LOGGING_NOTIFICATION = "last-notification";
private static final String ATTR_NUM_NETWORK_LOGGING_NOTIFICATIONS = "num-notifications";
@@ -237,6 +241,14 @@
// List of package names to keep cached.
List<String> keepUninstalledPackages;
+ // The allowlist of SSIDs the device may connect to.
+ // By default, the allowlist restriction is deactivated.
+ List<String> mSsidAllowlist;
+
+ // The denylist of SSIDs the device may not connect to.
+ // By default, the denylist restriction is deactivated.
+ List<String> mSsidDenylist;
+
// TODO: review implementation decisions with frameworks team
boolean specifiesGlobalProxy = false;
String globalProxySpec = null;
@@ -298,6 +310,8 @@
private static final boolean USB_DATA_SIGNALING_ENABLED_DEFAULT = true;
boolean mUsbDataSignalingEnabled = USB_DATA_SIGNALING_ENABLED_DEFAULT;
+ int mWifiMinimumSecurityLevel = DevicePolicyManager.WIFI_SECURITY_OPEN;
+
ActiveAdmin(DeviceAdminInfo info, boolean isParent) {
this.info = info;
this.isParent = isParent;
@@ -574,6 +588,15 @@
if (mUsbDataSignalingEnabled != USB_DATA_SIGNALING_ENABLED_DEFAULT) {
writeAttributeValueToXml(out, TAG_USB_DATA_SIGNALING, mUsbDataSignalingEnabled);
}
+ if (mWifiMinimumSecurityLevel != DevicePolicyManager.WIFI_SECURITY_OPEN) {
+ writeAttributeValueToXml(out, TAG_WIFI_MIN_SECURITY, mWifiMinimumSecurityLevel);
+ }
+ if (mSsidAllowlist != null && !mSsidAllowlist.isEmpty()) {
+ writeAttributeValuesToXml(out, TAG_SSID_ALLOWLIST, TAG_SSID, mSsidAllowlist);
+ }
+ if (mSsidDenylist != null && !mSsidDenylist.isEmpty()) {
+ writeAttributeValuesToXml(out, TAG_SSID_DENYLIST, TAG_SSID, mSsidDenylist);
+ }
}
void writeTextToXml(TypedXmlSerializer out, String tag, String text) throws IOException {
@@ -826,6 +849,14 @@
} else if (TAG_USB_DATA_SIGNALING.equals(tag)) {
mUsbDataSignalingEnabled = parser.getAttributeBoolean(null, ATTR_VALUE,
USB_DATA_SIGNALING_ENABLED_DEFAULT);
+ } else if (TAG_WIFI_MIN_SECURITY.equals(tag)) {
+ mWifiMinimumSecurityLevel = parser.getAttributeInt(null, ATTR_VALUE);
+ } else if (TAG_SSID_ALLOWLIST.equals(tag)) {
+ mSsidAllowlist = new ArrayList<>();
+ readAttributeValues(parser, TAG_SSID, mSsidAllowlist);
+ } else if (TAG_SSID_DENYLIST.equals(tag)) {
+ mSsidDenylist = new ArrayList<>();
+ readAttributeValues(parser, TAG_SSID, mSsidDenylist);
} else {
Slogf.w(LOG_TAG, "Unknown admin tag: %s", tag);
XmlUtils.skipCurrentTag(parser);
@@ -1184,5 +1215,14 @@
pw.print("mUsbDataSignaling=");
pw.println(mUsbDataSignalingEnabled);
+
+ pw.print("mWifiMinimumSecurityLevel=");
+ pw.println(mWifiMinimumSecurityLevel);
+
+ pw.print("mSsidAllowlist=");
+ pw.println(mSsidAllowlist);
+
+ pw.print("mSsidDenylist=");
+ pw.println(mSsidDenylist);
}
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java
index ebe9f93..9b87b9d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java
@@ -19,6 +19,7 @@
import android.annotation.UserIdInt;
import android.app.admin.DevicePolicyDrawableResource;
import android.app.admin.DevicePolicySafetyChecker;
+import android.app.admin.DevicePolicyStringResource;
import android.app.admin.FullyManagedDeviceProvisioningParams;
import android.app.admin.IDevicePolicyManager;
import android.app.admin.ManagedProfileProvisioningParams;
@@ -177,4 +178,15 @@
int drawableId, int drawableStyle, int drawableSource) {
return null;
}
+
+ @Override
+ public void setStrings(@NonNull List<DevicePolicyStringResource> strings){}
+
+ @Override
+ public void resetStrings(String[] stringIds){}
+
+ @Override
+ public ParcelableResource getString(String stringId) {
+ return null;
+ }
}
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
index 53422940..9a98235 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceManagementResourcesProvider.java
@@ -20,6 +20,7 @@
import static android.app.admin.DevicePolicyResources.Drawable.Style;
import static android.app.admin.DevicePolicyResources.Drawable.Style.UPDATABLE_DRAWABLE_STYLES;
import static android.app.admin.DevicePolicyResources.Drawable.UPDATABLE_DRAWABLE_IDS;
+import static android.app.admin.DevicePolicyResources.Strings.UPDATABLE_STRING_IDS;
import static java.util.Objects.requireNonNull;
@@ -27,6 +28,7 @@
import android.annotation.Nullable;
import android.app.admin.DevicePolicyDrawableResource;
import android.app.admin.DevicePolicyResources;
+import android.app.admin.DevicePolicyStringResource;
import android.app.admin.ParcelableResource;
import android.os.Environment;
import android.util.AtomicFile;
@@ -64,14 +66,26 @@
private static final String ATTR_DRAWABLE_STYLE = "drawable-style";
private static final String ATTR_DRAWABLE_SOURCE = "drawable-source";
private static final String ATTR_DRAWABLE_ID = "drawable-id";
+ private static final String TAG_STRING_ENTRY = "string-entry";
+ private static final String ATTR_SOURCE_ID = "source-id";
-
+ /**
+ * Map of <drawable_id, <style_id, resource_value>>
+ */
private final Map<Integer, Map<Integer, ParcelableResource>>
mUpdatedDrawablesForStyle = new HashMap<>();
+ /**
+ * Map of <drawable_id, <source_id, resource_value>>
+ */
private final Map<Integer, Map<Integer, ParcelableResource>>
mUpdatedDrawablesForSource = new HashMap<>();
+ /**
+ * Map of <string_id, resource_value>
+ */
+ private final Map<String, ParcelableResource> mUpdatedStrings = new HashMap<>();
+
private final Object mLock = new Object();
private final Injector mInjector;
@@ -114,12 +128,10 @@
private boolean updateDrawable(
int drawableId, int drawableStyle, ParcelableResource updatableResource) {
if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) {
- throw new IllegalArgumentException(
- "Can't update drawable resource, invalid drawable " + "id " + drawableId);
+ Log.w(TAG, "Updating a resource for an unknown drawable id " + drawableId);
}
if (!UPDATABLE_DRAWABLE_STYLES.contains(drawableStyle)) {
- throw new IllegalArgumentException(
- "Can't update drawable resource, invalid style id " + drawableStyle);
+ Log.w(TAG, "Updating a resource for an unknown style id " + drawableStyle);
}
synchronized (mLock) {
if (!mUpdatedDrawablesForStyle.containsKey(drawableId)) {
@@ -139,12 +151,10 @@
private boolean updateDrawableForSource(
int drawableId, int drawableSource, ParcelableResource updatableResource) {
if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) {
- throw new IllegalArgumentException("Can't update drawable resource, invalid drawable "
- + "id " + drawableId);
+ Log.w(TAG, "Updating a resource for an unknown drawable id " + drawableId);
}
if (!UPDATABLE_DRAWABLE_SOURCES.contains(drawableSource)) {
- throw new IllegalArgumentException("Can't update drawable resource, invalid source id "
- + drawableSource);
+ Log.w(TAG, "Updating a resource for an unknown source id " + drawableSource);
}
synchronized (mLock) {
if (!mUpdatedDrawablesForSource.containsKey(drawableId)) {
@@ -183,19 +193,15 @@
ParcelableResource getDrawable(
int drawableId, int drawableStyle, int drawableSource) {
if (!UPDATABLE_DRAWABLE_IDS.contains(drawableId)) {
- Log.e(TAG, "Can't get updated drawable resource, invalid drawable id "
- + drawableId);
- return null;
+ Log.w(TAG, "Getting an updated resource for an unknown drawable id " + drawableId);
}
if (!UPDATABLE_DRAWABLE_STYLES.contains(drawableStyle)) {
- Log.e(TAG, "Can't get updated drawable resource, invalid style id "
+ Log.w(TAG, "Getting an updated resource for an unknown drawable style "
+ drawableStyle);
- return null;
}
if (!UPDATABLE_DRAWABLE_SOURCES.contains(drawableSource)) {
- Log.e(TAG, "Can't get updated drawable resource, invalid source id "
+ Log.w(TAG, "Getting an updated resource for an unknown drawable Source "
+ drawableSource);
- return null;
}
if (mUpdatedDrawablesForSource.containsKey(drawableId)
&& mUpdatedDrawablesForSource.get(drawableId).containsKey(drawableSource)) {
@@ -216,6 +222,73 @@
return null;
}
+ /**
+ * Returns {@code false} if no resources were updated.
+ */
+ boolean updateStrings(@NonNull List<DevicePolicyStringResource> strings) {
+ boolean updated = false;
+ for (int i = 0; i < strings.size(); i++) {
+ String stringId = strings.get(i).getStringId();
+ ParcelableResource resource = strings.get(i).getResource();
+
+ Objects.requireNonNull(resource, "ParcelableResource must be provided.");
+ updated |= updateString(stringId, resource);
+ }
+ if (!updated) {
+ return false;
+ }
+ synchronized (mLock) {
+ write();
+ return true;
+ }
+ }
+
+ private boolean updateString(String stringId, ParcelableResource updatableResource) {
+ if (!UPDATABLE_STRING_IDS.contains(stringId)) {
+ Log.w(TAG, "Updating a resource for an unknown string id " + stringId);
+ }
+ synchronized (mLock) {
+ ParcelableResource current = mUpdatedStrings.get(stringId);
+ if (updatableResource.equals(current)) {
+ return false;
+ }
+ mUpdatedStrings.put(stringId, updatableResource);
+ return true;
+ }
+ }
+
+ /**
+ * Returns {@code false} if no resources were removed.
+ */
+ boolean removeStrings(@NonNull String[] stringIds) {
+ synchronized (mLock) {
+ boolean removed = false;
+ for (int i = 0; i < stringIds.length; i++) {
+ String stringId = stringIds[i];
+ removed |= mUpdatedStrings.remove(stringId) != null;
+ }
+ if (!removed) {
+ return false;
+ }
+ write();
+ return true;
+ }
+ }
+
+ @Nullable
+ ParcelableResource getString(String stringId) {
+ if (!UPDATABLE_STRING_IDS.contains(stringId)) {
+ Log.w(TAG, "Getting an updated resource for an unknown string id " + stringId);
+ }
+
+ if (mUpdatedStrings.containsKey(stringId)) {
+ return mUpdatedStrings.get(stringId);
+ }
+
+ Log.d(TAG, "No updated string found for string id " + stringId);
+ return null;
+ }
+
private void write() {
Log.d(TAG, "Writing updated resources to file.");
new ResourcesReaderWriter().writeToFileLocked();
@@ -362,6 +435,18 @@
out.endTag(/* namespace= */ null, TAG_DRAWABLE_SOURCE_ENTRY);
}
}
+ if (mUpdatedStrings != null && !mUpdatedStrings.isEmpty()) {
+ for (Map.Entry<String, ParcelableResource> entry
+ : mUpdatedStrings.entrySet()) {
+ out.startTag(/* namespace= */ null, TAG_STRING_ENTRY);
+ out.attribute(
+ /* namespace= */ null,
+ ATTR_SOURCE_ID,
+ entry.getKey());
+ entry.getValue().writeToXmlFile(out);
+ out.endTag(/* namespace= */ null, TAG_STRING_ENTRY);
+ }
+ }
}
private boolean readInner(
@@ -401,6 +486,12 @@
ParcelableResource.createFromXml(parser));
}
break;
+ case TAG_STRING_ENTRY:
+ String sourceId = parser.getAttributeValue(
+ /* namespace= */ null, ATTR_SOURCE_ID);
+ mUpdatedStrings.put(
+ sourceId, ParcelableResource.createFromXml(parser));
+ break;
default:
Log.e(TAG, "Unexpected tag: " + tag);
return false;
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 0f15db1..92952cd 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -59,6 +59,7 @@
import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER;
import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_ID;
import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_DRAWABLE;
+import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_STRING;
import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO;
import static android.app.admin.DevicePolicyManager.ID_TYPE_IMEI;
import static android.app.admin.DevicePolicyManager.ID_TYPE_INDIVIDUAL_ATTESTATION;
@@ -99,6 +100,18 @@
import static android.app.admin.DevicePolicyManager.WIPE_EXTERNAL_STORAGE;
import static android.app.admin.DevicePolicyManager.WIPE_RESET_PROTECTION_DATA;
import static android.app.admin.DevicePolicyManager.WIPE_SILENTLY;
+import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.LOCATION_CHANGED_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NETWORK_LOGGING_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TITLE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.PRINTING_DISABLED_NAMED_ADMIN;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_GENERIC_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE;
+import static android.app.admin.DevicePolicyResources.Strings.Core.WORK_PROFILE_DELETED_TITLE;
import static android.app.admin.ProvisioningException.ERROR_ADMIN_PACKAGE_INSTALLATION_FAILED;
import static android.app.admin.ProvisioningException.ERROR_PRE_CONDITION_FAILED;
import static android.app.admin.ProvisioningException.ERROR_PROFILE_CREATION_FAILED;
@@ -175,6 +188,7 @@
import android.app.admin.DevicePolicyManagerInternal;
import android.app.admin.DevicePolicyManagerLiteInternal;
import android.app.admin.DevicePolicySafetyChecker;
+import android.app.admin.DevicePolicyStringResource;
import android.app.admin.DeviceStateCache;
import android.app.admin.FactoryResetProtectionPolicy;
import android.app.admin.FullyManagedDeviceProvisioningParams;
@@ -2234,7 +2248,7 @@
* a managed profile.
*/
@GuardedBy("getLockObject()")
- private void applyManagedProfileRestrictionIfDeviceOwnerLocked() {
+ private void applyProfileRestrictionsIfDeviceOwnerLocked() {
final int doUserId = mOwners.getDeviceOwnerUserId();
if (doUserId == UserHandle.USER_NULL) {
if (VERBOSE_LOG) Slogf.d(LOG_TAG, "No DO found, skipping application of restriction.");
@@ -2242,7 +2256,17 @@
}
final UserHandle doUserHandle = UserHandle.of(doUserId);
- // Set the restriction if not set.
+
+ // Based on CDD : https://source.android.com/compatibility/12/android-12-cdd#95_multi-user_support,
+ // creation of clone profile is not allowed in case device owner is set.
+ // Enforcing this restriction on setting up of device owner.
+ if (!mUserManager.hasUserRestriction(
+ UserManager.DISALLOW_ADD_CLONE_PROFILE, doUserHandle)) {
+ mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, true,
+ doUserHandle);
+ }
+ // Creation of managed profile is restricted in case device owner is set, enforcing this
+ // restriction by setting user level restriction at time of device owner setup.
if (!mUserManager.hasUserRestriction(
UserManager.DISALLOW_ADD_MANAGED_PROFILE, doUserHandle)) {
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, true,
@@ -3151,7 +3175,7 @@
case SystemService.PHASE_ACTIVITY_MANAGER_READY:
synchronized (getLockObject()) {
migrateToProfileOnOrganizationOwnedDeviceIfCompLocked();
- applyManagedProfileRestrictionIfDeviceOwnerLocked();
+ applyProfileRestrictionsIfDeviceOwnerLocked();
}
maybeStartSecurityLogMonitorOnActivityManagerReady();
break;
@@ -3776,6 +3800,12 @@
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false,
userHandle);
}
+ // When a device owner is set, the system automatically restricts adding a clone profile.
+ // Remove this restriction when the device owner is cleared.
+ if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, userHandle)) {
+ mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, false,
+ userHandle);
+ }
}
/**
@@ -6927,12 +6957,8 @@
checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_WIPE_DATA);
if (TextUtils.isEmpty(wipeReasonForUser)) {
- if (calledByProfileOwnerOnOrgOwnedDevice && !calledOnParentInstance) {
- wipeReasonForUser = mContext.getString(R.string.device_ownership_relinquished);
- } else {
- wipeReasonForUser = mContext.getString(
- R.string.work_profile_deleted_description_dpm_wipe);
- }
+ wipeReasonForUser = getGenericWipeReason(
+ calledByProfileOwnerOnOrgOwnedDevice, calledOnParentInstance);
}
int userId = admin != null ? admin.getUserHandle().getIdentifier()
@@ -6983,6 +7009,18 @@
wipeDataNoLock(adminComp, flags, internalReason, wipeReasonForUser, userId);
}
+ private String getGenericWipeReason(
+ boolean calledByProfileOwnerOnOrgOwnedDevice, boolean calledOnParentInstance) {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return calledByProfileOwnerOnOrgOwnedDevice && !calledOnParentInstance
+ ? dpm.getString(WORK_PROFILE_DELETED_ORG_OWNED_MESSAGE,
+ () -> mContext.getString(
+ R.string.device_ownership_relinquished))
+ : dpm.getString(WORK_PROFILE_DELETED_GENERIC_MESSAGE,
+ () -> mContext.getString(
+ R.string.work_profile_deleted_description_dpm_wipe));
+ }
+
/**
* Clears device wide policies enforced by COPE PO when relinquishing the device. This method
* should be invoked once the admin is gone, so that all methods that rely on calculating
@@ -7067,7 +7105,7 @@
Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(android.R.drawable.stat_sys_warning)
- .setContentTitle(mContext.getString(R.string.work_profile_deleted))
+ .setContentTitle(getWorkProfileDeletedTitle())
.setContentText(wipeReasonForUser)
.setColor(mContext.getColor(R.color.system_notification_accent_color))
.setStyle(new Notification.BigTextStyle().bigText(wipeReasonForUser))
@@ -7075,6 +7113,12 @@
mInjector.getNotificationManager().notify(SystemMessage.NOTE_PROFILE_WIPED, notification);
}
+ private String getWorkProfileDeletedTitle() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(WORK_PROFILE_DELETED_TITLE,
+ () -> mContext.getString(R.string.work_profile_deleted));
+ }
+
private void clearWipeProfileNotification() {
mInjector.getNotificationManager().cancel(SystemMessage.NOTE_PROFILE_WIPED);
}
@@ -7305,12 +7349,10 @@
// able to do so).
// IMPORTANT: Call without holding the lock to prevent deadlock.
try {
- String wipeReasonForUser = mContext.getString(
- R.string.work_profile_deleted_reason_maximum_password_failure);
wipeDataNoLock(strictestAdmin.info.getComponent(),
/*flags=*/ 0,
/*reason=*/ "reportFailedPasswordAttempt()",
- wipeReasonForUser,
+ getFailedPasswordAttemptWipeMessage(),
userId);
} catch (SecurityException e) {
Slogf.w(LOG_TAG, "Failed to wipe user " + userId
@@ -7324,6 +7366,13 @@
}
}
+ private String getFailedPasswordAttemptWipeMessage() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(WORK_PROFILE_DELETED_FAILED_PASSWORD_ATTEMPTS_MESSAGE,
+ () -> mContext.getString(
+ R.string.work_profile_deleted_reason_maximum_password_failure));
+ }
+
/**
* Returns which user should be wiped if this admin's maximum filed password attempts policy is
* violated.
@@ -8468,6 +8517,12 @@
// on the primary profile).
mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, true,
UserHandle.of(userId));
+ // Restrict adding a clone profile when a device owner is set on the device.
+ // That is to prevent the co-existence of a clone profile and a device owner
+ // on the same device.
+ // CDD for reference : https://source.android.com/compatibility/12/android-12-cdd#95_multi-user_support
+ mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, true,
+ UserHandle.of(userId));
// TODO Send to system too?
sendOwnerChangedBroadcast(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED, userId);
});
@@ -8940,7 +8995,7 @@
mOwners.writeProfileOwner(userId);
deleteTransferOwnershipBundleLocked(userId);
toggleBackupServiceActive(userId, true);
- applyManagedProfileRestrictionIfDeviceOwnerLocked();
+ applyProfileRestrictionsIfDeviceOwnerLocked();
setNetworkLoggingActiveInternal(false);
}
@@ -12395,8 +12450,8 @@
Notification notification = new Notification.Builder(mContext,
SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(R.drawable.ic_info_outline)
- .setContentTitle(mContext.getString(R.string.location_changed_notification_title))
- .setContentText(mContext.getString(R.string.location_changed_notification_text))
+ .setContentTitle(getLocationChangedTitle())
+ .setContentText(getLocationChangedText())
.setColor(mContext.getColor(R.color.system_notification_accent_color))
.setShowWhen(true)
.setContentIntent(locationSettingsIntent)
@@ -12406,6 +12461,18 @@
notification);
}
+ private String getLocationChangedTitle() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(LOCATION_CHANGED_TITLE,
+ () -> mContext.getString(R.string.location_changed_notification_title));
+ }
+
+ private String getLocationChangedText() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(LOCATION_CHANGED_MESSAGE,
+ () -> mContext.getString(R.string.location_changed_notification_text));
+ }
+
@Override
public boolean setTime(ComponentName who, long millis) {
Objects.requireNonNull(who, "ComponentName is null");
@@ -12996,11 +13063,19 @@
Slogf.e(LOG_TAG, "appLabel is inexplicably null");
return null;
}
- return ((Context) ActivityThread.currentActivityThread().getSystemUiContext())
- .getResources().getString(R.string.printing_disabled_by, appLabel);
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(
+ PRINTING_DISABLED_NAMED_ADMIN,
+ () -> getDefaultPrintingDisabledMsg(appLabel),
+ appLabel);
}
}
+ private String getDefaultPrintingDisabledMsg(CharSequence appLabel) {
+ return ((Context) ActivityThread.currentActivityThread().getSystemUiContext())
+ .getResources().getString(R.string.printing_disabled_by, appLabel);
+ }
+
@Override
protected DevicePolicyCache getDevicePolicyCache() {
return mPolicyCache;
@@ -15532,16 +15607,18 @@
// Simple notification clicks are immutable
final PendingIntent pendingIntent = PendingIntent.getBroadcastAsUser(mContext, 0, intent,
PendingIntent.FLAG_IMMUTABLE, UserHandle.CURRENT);
+
+ final String title = getNetworkLoggingTitle();
+ final String text = getNetworkLoggingText();
Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(R.drawable.ic_info_outline)
- .setContentTitle(mContext.getString(R.string.network_logging_notification_title))
- .setContentText(mContext.getString(R.string.network_logging_notification_text))
- .setTicker(mContext.getString(R.string.network_logging_notification_title))
+ .setContentTitle(title)
+ .setContentText(text)
+ .setTicker(title)
.setShowWhen(true)
.setContentIntent(pendingIntent)
- .setStyle(new Notification.BigTextStyle()
- .bigText(mContext.getString(R.string.network_logging_notification_text)))
+ .setStyle(new Notification.BigTextStyle().bigText(text))
.build();
Slogf.i(LOG_TAG, "Sending network logging notification to user %d",
mNetworkLoggingNotificationUserId);
@@ -15550,6 +15627,18 @@
UserHandle.of(mNetworkLoggingNotificationUserId));
}
+ private String getNetworkLoggingTitle() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(NETWORK_LOGGING_TITLE,
+ () -> mContext.getString(R.string.network_logging_notification_title));
+ }
+
+ private String getNetworkLoggingText() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(NETWORK_LOGGING_MESSAGE,
+ () -> mContext.getString(R.string.network_logging_notification_text));
+ }
+
private void handleCancelNetworkLoggingNotification() {
if (mNetworkLoggingNotificationUserId == UserHandle.USER_NULL) {
// Happens when setNetworkLoggingActive(false) is called before called with true
@@ -17042,10 +17131,8 @@
0 /* requestCode */, intent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
- final String buttonText =
- mContext.getString(R.string.personal_apps_suspended_turn_profile_on);
- final Notification.Action turnProfileOnButton =
- new Notification.Action.Builder(null /* icon */, buttonText, pendingIntent).build();
+ final Notification.Action turnProfileOnButton = new Notification.Action.Builder(
+ /* icon= */ null, getPersonalAppSuspensionButtonText(), pendingIntent).build();
final String text;
final boolean ongoing;
@@ -17057,26 +17144,24 @@
mContext, profileOwner.mProfileOffDeadline, DateUtils.FORMAT_SHOW_DATE);
final String time = DateUtils.formatDateTime(
mContext, profileOwner.mProfileOffDeadline, DateUtils.FORMAT_SHOW_TIME);
- text = mContext.getString(
- R.string.personal_apps_suspension_soon_text, date, time, maxDays);
+ text = getPersonalAppSuspensionSoonText(date, time, maxDays);
ongoing = false;
} else {
- text = mContext.getString(R.string.personal_apps_suspension_text);
+ text = getPersonalAppSuspensionText();
ongoing = true;
}
final int color = mContext.getColor(R.color.personal_apps_suspension_notification_color);
final Bundle extras = new Bundle();
// TODO: Create a separate string for this.
- extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,
- mContext.getString(R.string.notification_work_profile_content_description));
+ extras.putString(
+ Notification.EXTRA_SUBSTITUTE_APP_NAME, getWorkProfileContentDescription());
final Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(R.drawable.ic_corp_badge_no_background)
.setOngoing(ongoing)
.setAutoCancel(false)
- .setContentTitle(mContext.getString(
- R.string.personal_apps_suspension_title))
+ .setContentTitle(getPersonalAppSuspensionTitle())
.setContentText(text)
.setStyle(new Notification.BigTextStyle().bigText(text))
.setColor(color)
@@ -17087,6 +17172,38 @@
SystemMessage.NOTE_PERSONAL_APPS_SUSPENDED, notification);
}
+ private String getPersonalAppSuspensionButtonText() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(PERSONAL_APP_SUSPENSION_TURN_ON_PROFILE,
+ () -> mContext.getString(R.string.personal_apps_suspended_turn_profile_on));
+ }
+
+ private String getPersonalAppSuspensionTitle() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(PERSONAL_APP_SUSPENSION_TITLE,
+ () -> mContext.getString(R.string.personal_apps_suspension_title));
+ }
+
+ private String getPersonalAppSuspensionText() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(PERSONAL_APP_SUSPENSION_TITLE,
+ () -> mContext.getString(R.string.personal_apps_suspension_text));
+ }
+
+ private String getPersonalAppSuspensionSoonText(String date, String time, int maxDays) {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(PERSONAL_APP_SUSPENSION_TITLE,
+ () -> mContext.getString(
+ R.string.personal_apps_suspension_soon_text, date, time, maxDays),
+ date, time, maxDays);
+ }
+
+ private String getWorkProfileContentDescription() {
+ DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+ return dpm.getString(NOTIFICATION_WORK_PROFILE_CONTENT_DESCRIPTION,
+ () -> mContext.getString(R.string.notification_work_profile_content_description));
+ }
+
@Override
public void setManagedProfileMaximumTimeOff(ComponentName who, long timeoutMillis) {
Objects.requireNonNull(who, "ComponentName is null");
@@ -17977,6 +18094,117 @@
);
}
+ private void validateCurrentWifiMeetsAdminRequirements() {
+ mInjector.binderWithCleanCallingIdentity(
+ () -> mInjector.getWifiManager().validateCurrentWifiMeetsAdminRequirements());
+ }
+
+ @Override
+ public void setMinimumRequiredWifiSecurityLevel(int level) {
+ final CallerIdentity caller = getCallerIdentity();
+ Preconditions.checkCallAuthorization(
+ isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller),
+ "Wi-Fi minimum security level can only be controlled by a device owner or "
+ + "a profile owner on an organization-owned device.");
+
+ boolean valueChanged = false;
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller);
+ if (admin.mWifiMinimumSecurityLevel != level) {
+ admin.mWifiMinimumSecurityLevel = level;
+ saveSettingsLocked(caller.getUserId());
+ valueChanged = true;
+ }
+ }
+ if (valueChanged) validateCurrentWifiMeetsAdminRequirements();
+ }
+
+ @Override
+ public int getMinimumRequiredWifiSecurityLevel() {
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(
+ UserHandle.USER_SYSTEM);
+ return (admin == null) ? DevicePolicyManager.WIFI_SECURITY_OPEN
+ : admin.mWifiMinimumSecurityLevel;
+ }
+ }
+
+ @Override
+ public void setSsidAllowlist(List<String> ssids) {
+ final CallerIdentity caller = getCallerIdentity();
+ Preconditions.checkCallAuthorization(
+ isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller),
+ "SSID allowlist can only be controlled by a device owner or "
+ + "a profile owner on an organization-owned device.");
+
+ Collections.sort(ssids);
+ boolean changed = false;
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller);
+ if (!ssids.equals(admin.mSsidAllowlist)) {
+ admin.mSsidAllowlist = ssids;
+ admin.mSsidDenylist = null;
+ changed = true;
+ }
+ if (changed) saveSettingsLocked(caller.getUserId());
+ }
+ if (changed) validateCurrentWifiMeetsAdminRequirements();
+ }
+
+ @Override
+ public List<String> getSsidAllowlist() {
+ final CallerIdentity caller = getCallerIdentity();
+ Preconditions.checkCallAuthorization(
+ isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller)
+ || isSystemUid(caller),
+ "SSID allowlist can only be retrieved by a device owner or "
+ + "a profile owner on an organization-owned device or a system app.");
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(
+ UserHandle.USER_SYSTEM);
+ return (admin == null || admin.mSsidAllowlist == null) ? new ArrayList<>()
+ : admin.mSsidAllowlist;
+ }
+ }
+
+ @Override
+ public void setSsidDenylist(List<String> ssids) {
+ final CallerIdentity caller = getCallerIdentity();
+ Preconditions.checkCallAuthorization(
+ isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller),
+ "SSID denylist can only be controlled by a device owner or "
+ + "a profile owner on an organization-owned device.");
+
+ Collections.sort(ssids);
+ boolean changed = false;
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller);
+ if (!ssids.equals(admin.mSsidDenylist)) {
+ admin.mSsidDenylist = ssids;
+ admin.mSsidAllowlist = null;
+ changed = true;
+ }
+ if (changed) saveSettingsLocked(caller.getUserId());
+ }
+ if (changed) validateCurrentWifiMeetsAdminRequirements();
+ }
+
+ @Override
+ public List<String> getSsidDenylist() {
+ final CallerIdentity caller = getCallerIdentity();
+ Preconditions.checkCallAuthorization(
+ isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller)
+ || isSystemUid(caller),
+ "SSID denylist can only be retrieved by a device owner or "
+ + "a profile owner on an organization-owned device or a system app.");
+ synchronized (getLockObject()) {
+ final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(
+ UserHandle.USER_SYSTEM);
+ return (admin == null || admin.mSsidDenylist == null) ? new ArrayList<>()
+ : admin.mSsidDenylist;
+ }
+ }
+
@Override
public void setDrawables(@NonNull List<DevicePolicyDrawableResource> drawables) {
Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(
@@ -18026,4 +18254,50 @@
mContext.sendBroadcastAsUser(intent, user);
}
}
+
+ @Override
+ public void setStrings(@NonNull List<DevicePolicyStringResource> strings) {
+ Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(
+ android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES));
+
+ Objects.requireNonNull(strings, "strings must be provided.");
+
+ mInjector.binderWithCleanCallingIdentity(() -> {
+ if (mDeviceManagementResourcesProvider.updateStrings(strings))
+ sendStringsUpdatedBroadcast(
+ strings.stream().map(s -> s.getStringId()).toArray(String[]::new));
+ });
+ }
+
+ @Override
+ public void resetStrings(String[] stringIds) {
+ Preconditions.checkCallAuthorization(hasCallingOrSelfPermission(
+ android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES));
+
+ mInjector.binderWithCleanCallingIdentity(() -> {
+ if (mDeviceManagementResourcesProvider.removeStrings(stringIds)) {
+ sendStringsUpdatedBroadcast(stringIds);
+ }
+ });
+ }
+
+ @Override
+ public ParcelableResource getString(String stringId) {
+ return mInjector.binderWithCleanCallingIdentity(() ->
+ mDeviceManagementResourcesProvider.getString(stringId));
+ }
+
+ private void sendStringsUpdatedBroadcast(String[] stringIds) {
+ final Intent intent = new Intent(ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+ intent.putExtra(EXTRA_RESOURCE_ID, stringIds);
+ intent.putExtra(EXTRA_RESOURCE_TYPE_STRING, /* value= */ true);
+ intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+ intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+
+ List<UserInfo> users = mUserManager.getAliveUsers();
+ for (int i = 0; i < users.size(); i++) {
+ UserHandle user = users.get(i).getUserHandle();
+ mContext.sendBroadcastAsUser(intent, user);
+ }
+ }
}
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 4b21454..ad8753d 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -54,6 +54,7 @@
import android.net.ConnectivityManager;
import android.net.ConnectivityModuleConnector;
import android.net.NetworkStackClient;
+import android.net.TrafficStats;
import android.os.BaseBundle;
import android.os.Binder;
import android.os.Build;
@@ -103,6 +104,7 @@
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.widget.ILockSettings;
import com.android.server.am.ActivityManagerService;
+import com.android.server.ambientcontext.AmbientContextManagerService;
import com.android.server.appbinding.AppBindingService;
import com.android.server.art.ArtManagerLocal;
import com.android.server.attention.AttentionManagerService;
@@ -194,7 +196,7 @@
import com.android.server.trust.TrustManagerService;
import com.android.server.tv.TvInputManagerService;
import com.android.server.tv.TvRemoteService;
-import com.android.server.tv.interactive.TvIAppManagerService;
+import com.android.server.tv.interactive.TvInteractiveAppManagerService;
import com.android.server.tv.tunerresourcemanager.TunerResourceManagerService;
import com.android.server.twilight.TwilightService;
import com.android.server.uri.UriGrantsManagerService;
@@ -261,6 +263,8 @@
"/apex/com.android.os.statsd/javalib/service-statsd.jar";
private static final String CONNECTIVITY_SERVICE_APEX_PATH =
"/apex/com.android.tethering/javalib/service-connectivity.jar";
+ private static final String NEARBY_SERVICE_APEX_PATH =
+ "/apex/com.android.nearby/javalib/service-nearby.jar";
private static final String STATS_COMPANION_LIFECYCLE_CLASS =
"com.android.server.stats.StatsCompanion$Lifecycle";
private static final String STATS_PULL_ATOM_SERVICE_CLASS =
@@ -271,6 +275,8 @@
"com.android.server.usb.UsbService$Lifecycle";
private static final String MIDI_SERVICE_CLASS =
"com.android.server.midi.MidiService$Lifecycle";
+ private static final String NEARBY_SERVICE_CLASS =
+ "com.android.server.nearby.NearbyService";
private static final String WIFI_APEX_SERVICE_JAR_PATH =
"/apex/com.android.wifi/javalib/service-wifi.jar";
private static final String WIFI_SERVICE_CLASS =
@@ -403,8 +409,6 @@
private static final String SAFETY_CENTER_SERVICE_CLASS =
"com.android.safetycenter.SafetyCenterService";
- private static final String SUPPLEMENTALPROCESS_APEX_PATH =
- "/apex/com.android.supplementalprocess/javalib/service-supplementalprocess.jar";
private static final String SUPPLEMENTALPROCESS_SERVICE_CLASS =
"com.android.server.supplementalprocess.SupplementalProcessManagerService$Lifecycle";
@@ -1807,6 +1811,7 @@
startRotationResolverService(context, t);
startSystemCaptionsManagerService(context, t);
startTextToSpeechManagerService(context, t);
+ startAmbientContextService(t);
// System Speech Recognition Service
t.traceBegin("StartSpeechRecognitionManagerService");
@@ -1901,6 +1906,7 @@
try {
networkStats = NetworkStatsService.create(context);
ServiceManager.addService(Context.NETWORK_STATS_SERVICE, networkStats);
+ TrafficStats.init(context);
} catch (Throwable e) {
reportWtf("starting NetworkStats Service", e);
}
@@ -1976,6 +1982,16 @@
}
t.traceEnd();
+ // Start Nearby Service.
+ t.traceBegin("StartNearbyService");
+ try {
+ mSystemServiceManager.startServiceFromJar(NEARBY_SERVICE_CLASS,
+ NEARBY_SERVICE_APEX_PATH);
+ } catch (Throwable e) {
+ reportWtf("starting NearbyService", e);
+ }
+ t.traceEnd();
+
t.traceBegin("StartConnectivityService");
// This has to be called after NetworkManagementService, NetworkStatsService
// and NetworkPolicyManager because ConnectivityService needs to take these
@@ -2367,8 +2383,8 @@
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_LIVE_TV)
|| mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
- t.traceBegin("StartTvIAppManager");
- mSystemServiceManager.startService(TvIAppManagerService.class);
+ t.traceBegin("StartTvInteractiveAppManager");
+ mSystemServiceManager.startService(TvInteractiveAppManagerService.class);
t.traceEnd();
}
@@ -2558,8 +2574,7 @@
// Supplemental Process
t.traceBegin("StartSupplementalProcessManagerService");
- mSystemServiceManager.startServiceFromJar(SUPPLEMENTALPROCESS_SERVICE_CLASS,
- SUPPLEMENTALPROCESS_APEX_PATH);
+ mSystemServiceManager.startService(SUPPLEMENTALPROCESS_SERVICE_CLASS);
t.traceEnd();
if (safeMode) {
@@ -3149,6 +3164,17 @@
}
+ private void startAmbientContextService(@NonNull TimingsTraceAndSlog t) {
+ if (!AmbientContextManagerService.isDetectionServiceConfigured()) {
+ Slog.d(TAG, "AmbientContextDetectionService is not configured on this device");
+ return;
+ }
+
+ t.traceBegin("StartAmbientContextService");
+ mSystemServiceManager.startService(AmbientContextManagerService.class);
+ t.traceEnd();
+ }
+
private static void startSystemUi(Context context, WindowManagerService windowManager) {
PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class);
Intent intent = new Intent();
diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java
index 715fe6e..6e72479 100644
--- a/services/midi/java/com/android/server/midi/MidiService.java
+++ b/services/midi/java/com/android/server/midi/MidiService.java
@@ -18,9 +18,11 @@
import android.annotation.NonNull;
import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@@ -33,6 +35,7 @@
import android.media.midi.IMidiDeviceOpenCallback;
import android.media.midi.IMidiDeviceServer;
import android.media.midi.IMidiManager;
+import android.media.midi.MidiDevice;
import android.media.midi.MidiDeviceInfo;
import android.media.midi.MidiDeviceService;
import android.media.midi.MidiDeviceStatus;
@@ -55,6 +58,7 @@
import org.xmlpull.v1.XmlPullParser;
import java.io.FileDescriptor;
+import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -96,9 +100,12 @@
= new HashMap<MidiDeviceInfo, Device>();
// list of all Bluetooth devices, keyed by BluetoothDevice
- private final HashMap<BluetoothDevice, Device> mBluetoothDevices
+ private final HashMap<BluetoothDevice, Device> mBluetoothDevices
= new HashMap<BluetoothDevice, Device>();
+ private final HashMap<BluetoothDevice, MidiDevice> mBleMidiDeviceMap =
+ new HashMap<BluetoothDevice, MidiDevice>();
+
// list of all devices, keyed by IMidiDeviceServer
private final HashMap<IBinder, Device> mDevicesByServer = new HashMap<IBinder, Device>();
@@ -569,10 +576,45 @@
}
}
+ private final BroadcastReceiver mBleMidiReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ if (action == null) {
+ Log.w(TAG, "MidiService, action is null");
+ return;
+ }
+
+ switch (action) {
+ case BluetoothDevice.ACTION_ACL_CONNECTED: {
+ Log.d(TAG, "ACTION_ACL_CONNECTED");
+ BluetoothDevice btDevice =
+ intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+ openBluetoothDevice(btDevice);
+ }
+ break;
+
+ case BluetoothDevice.ACTION_ACL_DISCONNECTED: {
+ Log.d(TAG, "ACTION_ACL_DISCONNECTED");
+ BluetoothDevice btDevice =
+ intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+ closeBluetoothDevice(btDevice);
+ }
+ break;
+ }
+ }
+ };
+
public MidiService(Context context) {
mContext = context;
mPackageManager = context.getPackageManager();
+ // Setup broadcast receivers
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+ filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+ context.registerReceiver(mBleMidiReceiver, filter);
+
mBluetoothServiceUid = -1;
}
@@ -701,9 +743,43 @@
}
}
+ private void openBluetoothDevice(BluetoothDevice bluetoothDevice) {
+ Log.d(TAG, "openBluetoothDevice() device: " + bluetoothDevice);
+
+ MidiManager midiManager = mContext.getSystemService(MidiManager.class);
+ midiManager.openBluetoothDevice(bluetoothDevice,
+ new MidiManager.OnDeviceOpenedListener() {
+ @Override
+ public void onDeviceOpened(MidiDevice device) {
+ synchronized (mBleMidiDeviceMap) {
+ mBleMidiDeviceMap.put(bluetoothDevice, device);
+ }
+ }
+ }, null);
+ }
+
+ private void closeBluetoothDevice(BluetoothDevice bluetoothDevice) {
+ Log.d(TAG, "closeBluetoothDevice() device: " + bluetoothDevice);
+
+ MidiDevice midiDevice;
+ synchronized (mBleMidiDeviceMap) {
+ midiDevice = mBleMidiDeviceMap.remove(bluetoothDevice);
+ }
+
+ if (midiDevice != null) {
+ try {
+ midiDevice.close();
+ } catch (IOException ex) {
+ Log.e(TAG, "Exception closing BLE-MIDI device" + ex);
+ }
+ }
+ }
+
@Override
public void openBluetoothDevice(IBinder token, BluetoothDevice bluetoothDevice,
IMidiDeviceOpenCallback callback) {
+ Log.d(TAG, "openBluetoothDevice()");
+
Client client = getClient(token);
if (client == null) return;
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
index a0f3bbf..cc663d9 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/parsing/parcelling/AndroidPackageTest.kt
@@ -503,6 +503,11 @@
PackageManager.Property::getString
)
}
+ ),
+ getSetByValue(
+ AndroidPackage::shouldInheritKeyStoreKeys,
+ ParsingPackage::setInheritKeyStoreKeys,
+ true
)
)
diff --git a/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java b/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java
new file mode 100644
index 0000000..fec9b12
--- /dev/null
+++ b/services/tests/mockingservicestests/src/android/service/games/GameSessionTest.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.games;
+
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+
+import android.graphics.Bitmap;
+import android.platform.test.annotations.Presubmit;
+import android.service.games.GameSession.ScreenshotCallback;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+import android.view.SurfaceControlViewHost;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+
+import com.android.internal.infra.AndroidFuture;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoSession;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Unit tests for the {@link android.service.games.GameSession}.
+ */
+@RunWith(AndroidTestingRunner.class)
+@SmallTest
+@Presubmit
+@TestableLooper.RunWithLooper(setAsMainLooper = true)
+public final class GameSessionTest {
+ private static final long WAIT_FOR_CALLBACK_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1);
+ private static final Bitmap TEST_BITMAP = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+
+ @Mock
+ private IGameSessionController mMockGameSessionController;
+ @Mock
+ SurfaceControlViewHost mSurfaceControlViewHost;
+ private LifecycleTrackingGameSession mGameSession;
+ private MockitoSession mMockitoSession;
+
+ @Before
+ public void setUp() {
+ mMockitoSession = mockitoSession()
+ .initMocks(this)
+ .startMocking();
+
+ mGameSession = new LifecycleTrackingGameSession() {};
+ mGameSession.attach(mMockGameSessionController, /* taskId= */ 10,
+ InstrumentationRegistry.getContext(),
+ mSurfaceControlViewHost,
+ /* widthPx= */ 0, /* heightPx= */0);
+ }
+
+ @After
+ public void tearDown() {
+ mMockitoSession.finishMocking();
+ }
+
+ @Test
+ public void takeScreenshot_attachNotCalled_throwsIllegalStateException() throws Exception {
+ GameSession gameSession = new GameSession() {};
+
+ try {
+ gameSession.takeScreenshot(DIRECT_EXECUTOR,
+ new ScreenshotCallback() {
+ @Override
+ public void onFailure(int statusCode) {
+ fail();
+ }
+
+ @Override
+ public void onSuccess(Bitmap bitmap) {
+ fail();
+ }
+ });
+ fail();
+ } catch (IllegalStateException expected) {
+
+ }
+ }
+
+ @Test
+ public void takeScreenshot_gameManagerException_returnsInternalError() throws Exception {
+ doAnswer(invocation -> {
+ AndroidFuture result = invocation.getArgument(1);
+ result.completeExceptionally(new Exception());
+ return null;
+ }).when(mMockGameSessionController).takeScreenshot(anyInt(), any());
+
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ mGameSession.takeScreenshot(DIRECT_EXECUTOR,
+ new ScreenshotCallback() {
+ @Override
+ public void onFailure(int statusCode) {
+ assertEquals(ScreenshotCallback.ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR,
+ statusCode);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onSuccess(Bitmap bitmap) {
+ fail();
+ }
+ });
+
+ assertTrue(countDownLatch.await(
+ WAIT_FOR_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+ }
+
+ @Test
+ public void takeScreenshot_gameManagerError_returnsInternalError() throws Exception {
+ doAnswer(invocation -> {
+ AndroidFuture result = invocation.getArgument(1);
+ result.complete(GameScreenshotResult.createInternalErrorResult());
+ return null;
+ }).when(mMockGameSessionController).takeScreenshot(anyInt(), any());
+
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ mGameSession.takeScreenshot(DIRECT_EXECUTOR,
+ new ScreenshotCallback() {
+ @Override
+ public void onFailure(int statusCode) {
+ assertEquals(ScreenshotCallback.ERROR_TAKE_SCREENSHOT_INTERNAL_ERROR,
+ statusCode);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onSuccess(Bitmap bitmap) {
+ fail();
+ }
+ });
+
+ assertTrue(countDownLatch.await(
+ WAIT_FOR_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+ }
+
+ @Test
+ public void takeScreenshot_gameManagerSuccess_returnsBitmap() throws Exception {
+ doAnswer(invocation -> {
+ AndroidFuture result = invocation.getArgument(1);
+ result.complete(GameScreenshotResult.createSuccessResult(TEST_BITMAP));
+ return null;
+ }).when(mMockGameSessionController).takeScreenshot(anyInt(), any());
+
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ mGameSession.takeScreenshot(DIRECT_EXECUTOR,
+ new ScreenshotCallback() {
+ @Override
+ public void onFailure(int statusCode) {
+ fail();
+ }
+
+ @Override
+ public void onSuccess(Bitmap bitmap) {
+ assertEquals(TEST_BITMAP, bitmap);
+ countDownLatch.countDown();
+ }
+ });
+
+ assertTrue(countDownLatch.await(
+ WAIT_FOR_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+ }
+
+ @Test
+ public void moveState_InitializedToInitialized_noLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.INITIALIZED);
+
+ assertThat(mGameSession.mLifecycleMethodCalls.isEmpty()).isTrue();
+ }
+
+ @Test
+ public void moveState_FullLifecycle_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.DESTROYED);
+
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder();
+ }
+
+ @Test
+ public void moveState_DestroyedWhenInitialized_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.DESTROYED);
+
+ // ON_CREATE is always called before ON_DESTROY.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder();
+ }
+
+ @Test
+ public void moveState_DestroyedWhenFocused_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.DESTROYED);
+
+ // The ON_GAME_TASK_UNFOCUSED lifecycle event is implied because the session is destroyed
+ // while in focus.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder();
+ }
+
+ @Test
+ public void moveState_FocusCycled_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+
+ // Both cycles from focus and unfocus are captured.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED).inOrder();
+ }
+
+ @Test
+ public void moveState_MultipleFocusAndUnfocusCalls_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+
+ // The second TASK_FOCUSED call and the second TASK_UNFOCUSED call are ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED).inOrder();
+ }
+
+ @Test
+ public void moveState_CreatedAfterFocused_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+
+ // The second CREATED call is ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED).inOrder();
+ }
+
+ @Test
+ public void moveState_UnfocusedWithoutFocused_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+
+ // The TASK_UNFOCUSED call without an earlier TASK_FOCUSED call is ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE).inOrder();
+ }
+
+ @Test
+ public void moveState_NeverFocused_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.DESTROYED);
+
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder();
+ }
+
+ @Test
+ public void moveState_MultipleFocusCalls_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+
+ // The extra TASK_FOCUSED moves are ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_GAME_TASK_FOCUSED).inOrder();
+ }
+
+ @Test
+ public void moveState_MultipleCreateCalls_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+
+ // The extra CREATE moves are ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE).inOrder();
+ }
+
+ @Test
+ public void moveState_FocusBeforeCreate_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+
+ // The TASK_FOCUSED move before CREATE is ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls.isEmpty()).isTrue();
+ }
+
+ @Test
+ public void moveState_UnfocusBeforeCreate_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_UNFOCUSED);
+
+ // The TASK_UNFOCUSED move before CREATE is ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls.isEmpty()).isTrue();
+ }
+
+ @Test
+ public void moveState_FocusWhenDestroyed_ExpectedLifecycleCalls() throws Exception {
+ mGameSession.moveToState(GameSession.LifecycleState.CREATED);
+ mGameSession.moveToState(GameSession.LifecycleState.DESTROYED);
+ mGameSession.moveToState(GameSession.LifecycleState.TASK_FOCUSED);
+
+ // The TASK_FOCUSED move after DESTROYED is ignored.
+ assertThat(mGameSession.mLifecycleMethodCalls).containsExactly(
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_CREATE,
+ LifecycleTrackingGameSession.LifecycleMethodCall.ON_DESTROY).inOrder();
+ }
+
+ private static class LifecycleTrackingGameSession extends GameSession {
+ private enum LifecycleMethodCall {
+ ON_CREATE,
+ ON_DESTROY,
+ ON_GAME_TASK_FOCUSED,
+ ON_GAME_TASK_UNFOCUSED
+ }
+
+ final List<LifecycleMethodCall> mLifecycleMethodCalls = new ArrayList<>();
+
+ @Override
+ public void onCreate() {
+ mLifecycleMethodCalls.add(LifecycleMethodCall.ON_CREATE);
+ }
+
+ @Override
+ public void onDestroy() {
+ mLifecycleMethodCalls.add(LifecycleMethodCall.ON_DESTROY);
+ }
+
+ @Override
+ public void onGameTaskFocusChanged(boolean focused) {
+ if (focused) {
+ mLifecycleMethodCalls.add(LifecycleMethodCall.ON_GAME_TASK_FOCUSED);
+ } else {
+ mLifecycleMethodCalls.add(LifecycleMethodCall.ON_GAME_TASK_UNFOCUSED);
+ }
+ }
+ }
+}
diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
index d6705a5..0198253 100644
--- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
+++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java
@@ -20,6 +20,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -28,6 +29,7 @@
import android.Manifest;
import android.app.GameManager;
+import android.app.GameModeInfo;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
@@ -515,7 +517,7 @@
public void testDeviceConfigDefault() {
mockDeviceConfigDefault();
mockModifyGameModeGranted();
- checkReportedModes(null, GameManager.GAME_MODE_UNSUPPORTED);
+ checkReportedModes(null);
}
/**
@@ -525,7 +527,7 @@
public void testDeviceConfigNone() {
mockDeviceConfigNone();
mockModifyGameModeGranted();
- checkReportedModes(null, GameManager.GAME_MODE_UNSUPPORTED);
+ checkReportedModes(null);
}
/**
@@ -566,7 +568,7 @@
public void testDeviceConfigInvalid() {
mockDeviceConfigInvalid();
mockModifyGameModeGranted();
- checkReportedModes(null, GameManager.GAME_MODE_UNSUPPORTED);
+ checkReportedModes(null);
}
/**
@@ -576,7 +578,7 @@
public void testDeviceConfigMalformed() {
mockDeviceConfigMalformed();
mockModifyGameModeGranted();
- checkReportedModes(null, GameManager.GAME_MODE_UNSUPPORTED);
+ checkReportedModes(null);
}
/**
@@ -966,4 +968,84 @@
static {
System.loadLibrary("mockingservicestestjni");
}
+ @Test
+ public void testGetGameModeInfoPermissionDenied() {
+ mockDeviceConfigAll();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+
+ // Deny permission.MANAGE_GAME_MODE and verify the game mode is not updated.
+ mockModifyGameModeDenied();
+ assertThrows(SecurityException.class,
+ () -> gameManagerService.getGameModeInfo(mPackageName, USER_ID_1));
+ }
+
+ @Test
+ public void testGetGameModeInfoWithAllGameModesDefault() {
+ mockDeviceConfigAll();
+ mockModifyGameModeGranted();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+ GameModeInfo gameModeInfo = gameManagerService.getGameModeInfo(mPackageName, USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_STANDARD, gameModeInfo.getActiveGameMode());
+ assertEquals(3, gameModeInfo.getAvailableGameModes().length);
+ }
+
+ @Test
+ public void testGetGameModeInfoWithAllGameModes() {
+ mockDeviceConfigAll();
+ mockModifyGameModeGranted();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+ gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_PERFORMANCE, USER_ID_1);
+ GameModeInfo gameModeInfo = gameManagerService.getGameModeInfo(mPackageName, USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_PERFORMANCE, gameModeInfo.getActiveGameMode());
+ assertEquals(3, gameModeInfo.getAvailableGameModes().length);
+ }
+
+ @Test
+ public void testGetGameModeInfoWithBatteryMode() {
+ mockDeviceConfigBattery();
+ mockModifyGameModeGranted();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+ gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_BATTERY, USER_ID_1);
+ GameModeInfo gameModeInfo = gameManagerService.getGameModeInfo(mPackageName, USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_BATTERY, gameModeInfo.getActiveGameMode());
+ assertEquals(2, gameModeInfo.getAvailableGameModes().length);
+ }
+
+ @Test
+ public void testGetGameModeInfoWithPerformanceMode() {
+ mockDeviceConfigPerformance();
+ mockModifyGameModeGranted();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+ gameManagerService.setGameMode(mPackageName, GameManager.GAME_MODE_PERFORMANCE, USER_ID_1);
+ GameModeInfo gameModeInfo = gameManagerService.getGameModeInfo(mPackageName, USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_PERFORMANCE, gameModeInfo.getActiveGameMode());
+ assertEquals(2, gameModeInfo.getAvailableGameModes().length);
+ }
+
+ @Test
+ public void testGetGameModeInfoWithUnsupportedGameMode() {
+ mockDeviceConfigNone();
+ mockModifyGameModeGranted();
+ GameManagerService gameManagerService =
+ new GameManagerService(mMockContext, mTestLooper.getLooper());
+ startUser(gameManagerService, USER_ID_1);
+ GameModeInfo gameModeInfo = gameManagerService.getGameModeInfo(mPackageName, USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_UNSUPPORTED, gameModeInfo.getActiveGameMode());
+ assertEquals(0, gameModeInfo.getAvailableGameModes().length);
+ }
}
diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java
index 0d513bb..bdfa3bf 100644
--- a/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/app/GameServiceProviderInstanceImplTest.java
@@ -18,29 +18,43 @@
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
-import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;
+import static com.android.server.app.GameServiceProviderInstanceImplTest.FakeGameService.GameServiceState;
+import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
import android.annotation.Nullable;
+import android.app.ActivityManager.RunningTaskInfo;
+import android.app.ActivityTaskManager;
import android.app.IActivityTaskManager;
import android.app.ITaskStackListener;
import android.content.ComponentName;
import android.content.pm.PackageManager;
-import android.os.IBinder;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
import android.os.RemoteException;
import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
import android.service.games.CreateGameSessionRequest;
+import android.service.games.CreateGameSessionResult;
+import android.service.games.GameScreenshotResult;
+import android.service.games.GameSessionViewHostConfiguration;
import android.service.games.GameStartedEvent;
import android.service.games.IGameService;
import android.service.games.IGameServiceController;
import android.service.games.IGameSession;
+import android.service.games.IGameSessionController;
import android.service.games.IGameSessionService;
+import android.view.SurfaceControlViewHost.SurfacePackage;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -48,20 +62,21 @@
import com.android.internal.infra.AndroidFuture;
import com.android.internal.util.ConcurrentUtils;
import com.android.internal.util.FunctionalUtils.ThrowingConsumer;
+import com.android.internal.util.Preconditions;
+import com.android.server.wm.WindowManagerInternal;
+import com.android.server.wm.WindowManagerService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InOrder;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoSession;
import org.mockito.quality.Strictness;
import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
+import java.util.HashMap;
/**
@@ -72,6 +87,9 @@
@Presubmit
public final class GameServiceProviderInstanceImplTest {
+ private static final GameSessionViewHostConfiguration
+ DEFAULT_GAME_SESSION_VIEW_HOST_CONFIGURATION =
+ new GameSessionViewHostConfiguration(1, 500, 800);
private static final int USER_ID = 10;
private static final String APP_A_PACKAGE = "com.package.app.a";
private static final ComponentName APP_A_MAIN_ACTIVITY =
@@ -81,19 +99,23 @@
private static final ComponentName GAME_A_MAIN_ACTIVITY =
new ComponentName(GAME_A_PACKAGE, "com.package.game.a.MainActivity");
+ private static final Bitmap TEST_BITMAP = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888);
+
private MockitoSession mMockingSession;
private GameServiceProviderInstance mGameServiceProviderInstance;
@Mock
private IActivityTaskManager mMockActivityTaskManager;
@Mock
- private IGameService mMockGameService;
+ private WindowManagerService mMockWindowManagerService;
@Mock
- private IGameSessionService mMockGameSessionService;
+ private WindowManagerInternal mMockWindowManagerInternal;
private FakeGameClassifier mFakeGameClassifier;
+ private FakeGameService mFakeGameService;
private FakeServiceConnector<IGameService> mFakeGameServiceConnector;
+ private FakeGameSessionService mFakeGameSessionService;
private FakeServiceConnector<IGameSessionService> mFakeGameSessionServiceConnector;
private ArrayList<ITaskStackListener> mTaskStackListeners;
- private InOrder mInOrder;
+ private ArrayList<RunningTaskInfo> mRunningTaskInfos;
@Before
public void setUp() throws PackageManager.NameNotFoundException, RemoteException {
@@ -102,13 +124,13 @@
.strictness(Strictness.LENIENT)
.startMocking();
- mInOrder = inOrder(mMockGameService, mMockGameSessionService);
-
mFakeGameClassifier = new FakeGameClassifier();
mFakeGameClassifier.recordGamePackage(GAME_A_PACKAGE);
- mFakeGameServiceConnector = new FakeServiceConnector<>(mMockGameService);
- mFakeGameSessionServiceConnector = new FakeServiceConnector<>(mMockGameSessionService);
+ mFakeGameService = new FakeGameService();
+ mFakeGameServiceConnector = new FakeServiceConnector<>(mFakeGameService);
+ mFakeGameSessionService = new FakeGameSessionService();
+ mFakeGameSessionServiceConnector = new FakeServiceConnector<>(mFakeGameSessionService);
mTaskStackListeners = new ArrayList<>();
doAnswer(invocation -> {
@@ -116,6 +138,10 @@
return null;
}).when(mMockActivityTaskManager).registerTaskStackListener(any());
+ mRunningTaskInfos = new ArrayList<>();
+ when(mMockActivityTaskManager.getTasks(anyInt(), anyBoolean(), anyBoolean())).thenReturn(
+ mRunningTaskInfos);
+
doAnswer(invocation -> {
mTaskStackListeners.remove(invocation.getArgument(0));
return null;
@@ -126,6 +152,8 @@
ConcurrentUtils.DIRECT_EXECUTOR,
mFakeGameClassifier,
mMockActivityTaskManager,
+ mMockWindowManagerService,
+ mMockWindowManagerInternal,
mFakeGameServiceConnector,
mFakeGameSessionServiceConnector);
}
@@ -139,8 +167,7 @@
public void start_startsGameSession() throws Exception {
mGameServiceProviderInstance.start();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verifyNoMoreInteractions();
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.CONNECTED);
assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
@@ -149,9 +176,9 @@
@Test
public void start_multipleTimes_startsGameSessionOnce() throws Exception {
mGameServiceProviderInstance.start();
+ mGameServiceProviderInstance.start();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verifyNoMoreInteractions();
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.CONNECTED);
assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
@@ -161,9 +188,10 @@
public void stop_neverStarted_doesNothing() throws Exception {
mGameServiceProviderInstance.stop();
+
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.DISCONNECTED);
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(0);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
- mInOrder.verifyNoMoreInteractions();
}
@Test
@@ -171,9 +199,8 @@
mGameServiceProviderInstance.start();
mGameServiceProviderInstance.stop();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verifyNoMoreInteractions();
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.DISCONNECTED);
+ assertThat(mFakeGameService.getConnectedCount()).isEqualTo(1);
assertThat(mFakeGameServiceConnector.getIsConnected()).isFalse();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
@@ -187,11 +214,8 @@
mGameServiceProviderInstance.start();
mGameServiceProviderInstance.stop();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verifyNoMoreInteractions();
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.DISCONNECTED);
+ assertThat(mFakeGameService.getConnectedCount()).isEqualTo(2);
assertThat(mFakeGameServiceConnector.getIsConnected()).isFalse();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(2);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
@@ -203,9 +227,8 @@
mGameServiceProviderInstance.stop();
mGameServiceProviderInstance.stop();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verifyNoMoreInteractions();
+ assertThat(mFakeGameService.getState()).isEqualTo(GameServiceState.DISCONNECTED);
+ assertThat(mFakeGameService.getConnectedCount()).isEqualTo(1);
assertThat(mFakeGameServiceConnector.getIsConnected()).isFalse();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
@@ -215,7 +238,6 @@
public void gameTaskStarted_neverStarted_doesNothing() throws Exception {
dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY);
- mInOrder.verifyNoMoreInteractions();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(0);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
}
@@ -224,35 +246,25 @@
public void gameTaskRemoved_neverStarted_doesNothing() throws Exception {
dispatchTaskRemoved(10);
- mInOrder.verifyNoMoreInteractions();
assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(0);
assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
}
@Test
- public void gameTaskStarted_afterStopped_doesNothing() throws Exception {
+ public void gameTaskStarted_afterStopped_doesNotSendGameStartedEvent() throws Exception {
mGameServiceProviderInstance.start();
mGameServiceProviderInstance.stop();
dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verifyNoMoreInteractions();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
+ assertThat(mFakeGameService.getGameStartedEvents()).isEmpty();
}
@Test
- public void appTaskStarted_doesNothing() throws Exception {
+ public void appTaskStarted_doesNotSendGameStartedEvent() throws Exception {
mGameServiceProviderInstance.start();
dispatchTaskCreated(10, APP_A_MAIN_ACTIVITY);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verifyNoMoreInteractions();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
+ assertThat(mFakeGameService.getGameStartedEvents()).isEmpty();
}
@Test
@@ -260,26 +272,17 @@
mGameServiceProviderInstance.start();
dispatchTaskCreated(10, null);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verifyNoMoreInteractions();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
+ assertThat(mFakeGameService.getGameStartedEvents()).isEmpty();
}
@Test
- public void gameSessionRequested_withoutTaskDispatch_ignoredAndDoesNotCrash() throws Exception {
+ public void gameSessionRequested_withoutTaskDispatch_doesNotCrashAndDoesNotCreateGameSession()
+ throws Exception {
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- controllerArgumentCaptor.getValue().createGameSession(10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verifyNoMoreInteractions();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
+ mFakeGameService.requestCreateGameSession(10);
+
+ assertThat(mFakeGameSessionService.getCapturedCreateInvocations()).isEmpty();
}
@Test
@@ -287,433 +290,410 @@
mGameServiceProviderInstance.start();
dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verifyNoMoreInteractions();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(0);
+ GameStartedEvent expectedGameStartedEvent = new GameStartedEvent(10, GAME_A_PACKAGE);
+ assertThat(mFakeGameService.getGameStartedEvents())
+ .containsExactly(expectedGameStartedEvent).inOrder();
+ }
+
+ @Test
+ public void gameTaskStarted_requestToCreateGameSessionIncludesTaskConfiguration()
+ throws Exception {
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSessionService.CapturedCreateInvocation capturedCreateInvocation =
+ getOnlyElement(mFakeGameSessionService.getCapturedCreateInvocations());
+ assertThat(capturedCreateInvocation.mGameSessionViewHostConfiguration)
+ .isEqualTo(DEFAULT_GAME_SESSION_VIEW_HOST_CONFIGURATION);
+ }
+
+ @Test
+ public void gameTaskStarted_failsToDetermineTaskOverlayConfiguration_gameSessionNotCreated()
+ throws Exception {
+ mGameServiceProviderInstance.start();
+ dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY);
+
+ mFakeGameService.requestCreateGameSession(10);
+
+ assertThat(mFakeGameSessionService.getCapturedCreateInvocations()).isEmpty();
}
@Test
public void gameTaskStartedAndSessionRequested_createsGameSession() throws Exception {
- CreateGameSessionRequest createGameSessionRequest =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest), any());
- mInOrder.verifyNoMoreInteractions();
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
assertThat(gameSession10.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
+ assertThat(gameSession10.mIsFocused).isFalse();
}
@Test
public void gameTaskStartedAndSessionRequested_secondSessionRequest_ignoredAndDoesNotCrash()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest);
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+
+ mFakeGameService.requestCreateGameSession(10);
+ mFakeGameService.requestCreateGameSession(10);
+
+ CreateGameSessionRequest expectedCreateGameSessionRequest = new CreateGameSessionRequest(10,
+ GAME_A_PACKAGE);
+ assertThat(getOnlyElement(
+ mFakeGameSessionService.getCapturedCreateInvocations()).mCreateGameSessionRequest)
+ .isEqualTo(expectedCreateGameSessionRequest);
+ }
+
+ @Test
+ public void gameSessionSuccessfullyCreated_createsTaskOverlay() throws Exception {
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ verify(mMockWindowManagerInternal).addTaskOverlay(eq(10), eq(mockSurfacePackage10));
+ verifyNoMoreInteractions(mMockWindowManagerInternal);
+ }
+
+ @Test
+ public void gameTaskFocused_propagatedToGameSession() throws Exception {
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ assertThat(gameSession10.mIsFocused).isFalse();
+
+ dispatchTaskFocused(10, /*focused=*/ true);
+ assertThat(gameSession10.mIsFocused).isTrue();
+
+ dispatchTaskFocused(10, /*focused=*/ false);
+ assertThat(gameSession10.mIsFocused).isFalse();
+ }
+
+ @Test
+ public void gameTaskAlreadyFocusedWhenGameSessionCreated_propagatedToGameSession()
+ throws Exception {
+ ActivityTaskManager.RootTaskInfo gameATaskInfo = new ActivityTaskManager.RootTaskInfo();
+ gameATaskInfo.taskId = 10;
+ when(mMockActivityTaskManager.getFocusedRootTaskInfo()).thenReturn(gameATaskInfo);
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
- controllerArgumentCaptor.getValue().createGameSession(10);
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest), any());
- mInOrder.verifyNoMoreInteractions();
- assertThat(gameSession10.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
+ assertThat(gameSession10.mIsFocused).isTrue();
}
@Test
public void gameTaskRemoved_whileAwaitingGameSessionAttached_destroysGameSession()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- dispatchTaskRemoved(10);
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest), any());
- mInOrder.verifyNoMoreInteractions();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ dispatchTaskRemoved(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
assertThat(gameSession10.mIsDestroyed).isTrue();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
}
@Test
- public void gameTaskRemoved_destroysGameSession() throws Exception {
- CreateGameSessionRequest createGameSessionRequest =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest);
-
+ public void gameTaskRemoved_whileGameSessionAttached_destroysGameSession() throws Exception {
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
+
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
dispatchTaskRemoved(10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest), any());
- mInOrder.verifyNoMoreInteractions();
assertThat(gameSession10.mIsDestroyed).isTrue();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
+ }
+
+ @Test
+ public void gameTaskRemoved_removesTaskOverlay() throws Exception {
+ mGameServiceProviderInstance.start();
+
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ stopTask(10);
+
+ verify(mMockWindowManagerInternal).addTaskOverlay(eq(10), eq(mockSurfacePackage10));
+ verify(mMockWindowManagerInternal).removeTaskOverlay(eq(10), eq(mockSurfacePackage10));
+ verifyNoMoreInteractions(mMockWindowManagerInternal);
}
@Test
public void gameTaskStartedAndSessionRequested_multipleTimes_createsMultipleGameSessions()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest10 =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest10);
-
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest10), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verifyNoMoreInteractions();
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ startTask(11, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(11);
+
+ FakeGameSession gameSession11 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage11 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(11)
+ .complete(new CreateGameSessionResult(gameSession11, mockSurfacePackage11));
+
assertThat(gameSession10.mIsDestroyed).isFalse();
assertThat(gameSession11.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
}
@Test
- public void gameTaskStartedTwice_sessionRequestedSecondTimeOnly_createsOneGameSessions()
+ public void gameTaskStartedTwice_sessionRequestedSecondTimeOnly_createsOneGameSession()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
- // The game task is started twice, but a session is requested only for the second one.
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreated(10, GAME_A_MAIN_ACTIVITY);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ startTask(11, GAME_A_MAIN_ACTIVITY);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verifyNoMoreInteractions();
- assertThat(gameSession11.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
- assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ assertThat(gameSession10.mIsDestroyed).isFalse();
+ assertThat(mFakeGameSessionService.getCapturedCreateInvocations()).hasSize(1);
}
@Test
- public void gameTaskRemoved_afterMultipleCreated_destroysOnlyThatGameSession()
+ public void gameTaskRemoved_multipleSessions_destroysOnlyThatGameSession()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest10 =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest10);
-
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ startTask(11, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(11);
+
+ FakeGameSession gameSession11 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage11 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(11)
+ .complete(new CreateGameSessionResult(gameSession11, mockSurfacePackage11));
dispatchTaskRemoved(10);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest10), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verifyNoMoreInteractions();
assertThat(gameSession10.mIsDestroyed).isTrue();
assertThat(gameSession11.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
}
@Test
- public void allGameTasksRemoved_destroysAllGameSessions() throws Exception {
- CreateGameSessionRequest createGameSessionRequest10 =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest10);
-
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
+ public void allGameTasksRemoved_destroysAllGameSessionsAndGameSessionServiceIsDisconnected() {
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ startTask(11, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(11);
+
+ FakeGameSession gameSession11 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage11 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(11)
+ .complete(new CreateGameSessionResult(gameSession11, mockSurfacePackage11));
dispatchTaskRemoved(10);
dispatchTaskRemoved(11);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest10), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verifyNoMoreInteractions();
assertThat(gameSession10.mIsDestroyed).isTrue();
assertThat(gameSession11.mIsDestroyed).isTrue();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
}
@Test
- public void gameTasksCreatedAndSessionsReq_afterAllPreviousSessionsDestroyed_createsSession()
+ public void createSessionRequested_afterAllPreviousSessionsDestroyed_createsSession()
throws Exception {
- CreateGameSessionRequest createGameSessionRequest10 =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest10);
-
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
- CreateGameSessionRequest createGameSessionRequest12 =
- new CreateGameSessionRequest(12, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> unusedGameSession12Future =
- captureCreateGameSessionFuture(createGameSessionRequest12);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ startTask(11, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(11);
+
+ FakeGameSession gameSession11 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage11 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(11)
+ .complete(new CreateGameSessionResult(gameSession11, mockSurfacePackage11));
dispatchTaskRemoved(10);
dispatchTaskRemoved(11);
- dispatchTaskCreatedAndTriggerSessionRequest(12, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession12 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession12);
+ startTask(12, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(12);
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest10), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(12, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest12), any());
- mInOrder.verifyNoMoreInteractions();
+ FakeGameSession gameSession12 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage12 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(12)
+ .complete(new CreateGameSessionResult(gameSession12, mockSurfacePackage12));
+
assertThat(gameSession10.mIsDestroyed).isTrue();
assertThat(gameSession11.mIsDestroyed).isTrue();
assertThat(gameSession12.mIsDestroyed).isFalse();
- assertThat(mFakeGameServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isTrue();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(2);
}
@Test
public void stop_severalActiveGameSessions_destroysGameSessionsAndUnbinds() throws Exception {
- CreateGameSessionRequest createGameSessionRequest10 =
- new CreateGameSessionRequest(10, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession10Future =
- captureCreateGameSessionFuture(createGameSessionRequest10);
-
- CreateGameSessionRequest createGameSessionRequest11 =
- new CreateGameSessionRequest(11, GAME_A_PACKAGE);
- Supplier<AndroidFuture<IBinder>> gameSession11Future =
- captureCreateGameSessionFuture(createGameSessionRequest11);
-
mGameServiceProviderInstance.start();
- ArgumentCaptor<IGameServiceController> controllerArgumentCaptor = ArgumentCaptor.forClass(
- IGameServiceController.class);
- verify(mMockGameService).connected(controllerArgumentCaptor.capture());
- dispatchTaskCreatedAndTriggerSessionRequest(10, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession10 = new IGameSessionStub();
- gameSession10Future.get().complete(gameSession10);
- dispatchTaskCreatedAndTriggerSessionRequest(11, GAME_A_MAIN_ACTIVITY,
- controllerArgumentCaptor.getValue());
- IGameSessionStub gameSession11 = new IGameSessionStub();
- gameSession11Future.get().complete(gameSession11);
+
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ FakeGameSession gameSession10 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage10 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(10)
+ .complete(new CreateGameSessionResult(gameSession10, mockSurfacePackage10));
+
+ startTask(11, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(11);
+
+ FakeGameSession gameSession11 = new FakeGameSession();
+ SurfacePackage mockSurfacePackage11 = Mockito.mock(SurfacePackage.class);
+ mFakeGameSessionService.removePendingFutureForTaskId(11)
+ .complete(new CreateGameSessionResult(gameSession11, mockSurfacePackage11));
+
mGameServiceProviderInstance.stop();
- mInOrder.verify(mMockGameService).connected(any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(10, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest10), any());
- mInOrder.verify(mMockGameService).gameStarted(
- eq(new GameStartedEvent(11, GAME_A_PACKAGE)));
- mInOrder.verify(mMockGameSessionService).create(eq(createGameSessionRequest11), any());
- mInOrder.verify(mMockGameService).disconnected();
- mInOrder.verifyNoMoreInteractions();
assertThat(gameSession10.mIsDestroyed).isTrue();
assertThat(gameSession11.mIsDestroyed).isTrue();
assertThat(mFakeGameServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameServiceConnector.getConnectCount()).isEqualTo(1);
assertThat(mFakeGameSessionServiceConnector.getIsConnected()).isFalse();
- assertThat(mFakeGameSessionServiceConnector.getConnectCount()).isEqualTo(1);
}
- private Supplier<AndroidFuture<IBinder>> captureCreateGameSessionFuture(
- CreateGameSessionRequest expectedCreateGameSessionRequest) throws Exception {
- final AtomicReference<AndroidFuture<IBinder>> gameSessionFuture = new AtomicReference<>();
- doAnswer(invocation -> {
- gameSessionFuture.set(invocation.getArgument(1));
- return null;
- }).when(mMockGameSessionService).create(eq(expectedCreateGameSessionRequest), any());
+ @Test
+ public void takeScreenshot_failureNoBitmapCaptured() throws Exception {
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
- return gameSessionFuture::get;
+ IGameSessionController gameSessionController = getOnlyElement(
+ mFakeGameSessionService.getCapturedCreateInvocations()).mGameSessionController;
+ AndroidFuture<GameScreenshotResult> resultFuture = new AndroidFuture<>();
+ gameSessionController.takeScreenshot(10, resultFuture);
+
+ GameScreenshotResult result = resultFuture.get();
+ assertEquals(GameScreenshotResult.GAME_SCREENSHOT_ERROR_INTERNAL_ERROR,
+ result.getStatus());
+ verify(mMockWindowManagerService).captureTaskBitmap(10);
}
+ @Test
+ public void takeScreenshot_success() throws Exception {
+ when(mMockWindowManagerService.captureTaskBitmap(10)).thenReturn(TEST_BITMAP);
+
+ mGameServiceProviderInstance.start();
+ startTask(10, GAME_A_MAIN_ACTIVITY);
+ mFakeGameService.requestCreateGameSession(10);
+
+ IGameSessionController gameSessionController = getOnlyElement(
+ mFakeGameSessionService.getCapturedCreateInvocations()).mGameSessionController;
+ AndroidFuture<GameScreenshotResult> resultFuture = new AndroidFuture<>();
+ gameSessionController.takeScreenshot(10, resultFuture);
+
+ GameScreenshotResult result = resultFuture.get();
+ assertEquals(GameScreenshotResult.GAME_SCREENSHOT_SUCCESS, result.getStatus());
+ assertEquals(TEST_BITMAP, result.getBitmap());
+ }
+
+ private void startTask(int taskId, ComponentName componentName) {
+ RunningTaskInfo runningTaskInfo = new RunningTaskInfo();
+ runningTaskInfo.taskId = taskId;
+ runningTaskInfo.displayId = 1;
+ runningTaskInfo.configuration.windowConfiguration.setBounds(new Rect(0, 0, 500, 800));
+ mRunningTaskInfos.add(runningTaskInfo);
+
+ dispatchTaskCreated(taskId, componentName);
+ }
+
+ private void stopTask(int taskId) {
+ mRunningTaskInfos.removeIf(runningTaskInfo -> runningTaskInfo.taskId == taskId);
+ dispatchTaskRemoved(taskId);
+ }
+
+
private void dispatchTaskRemoved(int taskId) {
dispatchTaskChangeEvent(taskStackListener -> {
taskStackListener.onTaskRemoved(taskId);
});
}
- private void dispatchTaskCreatedAndTriggerSessionRequest(int taskId,
- @Nullable ComponentName componentName, IGameServiceController gameServiceController)
- throws Exception {
- dispatchTaskCreated(taskId, componentName);
- gameServiceController.createGameSession(taskId);
- }
-
private void dispatchTaskCreated(int taskId, @Nullable ComponentName componentName) {
dispatchTaskChangeEvent(taskStackListener -> {
taskStackListener.onTaskCreated(taskId, componentName);
});
}
+ private void dispatchTaskFocused(int taskId, boolean focused) {
+ dispatchTaskChangeEvent(taskStackListener -> {
+ taskStackListener.onTaskFocusChanged(taskId, focused);
+ });
+ }
+
private void dispatchTaskChangeEvent(
ThrowingConsumer<ITaskStackListener> taskStackListenerConsumer) {
for (ITaskStackListener taskStackListener : mTaskStackListeners) {
@@ -721,12 +701,129 @@
}
}
- private static class IGameSessionStub extends IGameSession.Stub {
- boolean mIsDestroyed = false;
+ static final class FakeGameService extends IGameService.Stub {
+ private IGameServiceController mGameServiceController;
+
+ public enum GameServiceState {
+ DISCONNECTED,
+ CONNECTED,
+ }
+
+ private ArrayList<GameStartedEvent> mGameStartedEvents = new ArrayList<>();
+ private int mConnectedCount = 0;
+ private GameServiceState mGameServiceState = GameServiceState.DISCONNECTED;
+
+ public GameServiceState getState() {
+ return mGameServiceState;
+ }
+
+ public int getConnectedCount() {
+ return mConnectedCount;
+ }
+
+ public ArrayList<GameStartedEvent> getGameStartedEvents() {
+ return mGameStartedEvents;
+ }
@Override
- public void destroy() {
- mIsDestroyed = true;
+ public void connected(IGameServiceController gameServiceController) {
+ Preconditions.checkState(mGameServiceState == GameServiceState.DISCONNECTED);
+
+ mGameServiceState = GameServiceState.CONNECTED;
+ mConnectedCount += 1;
+ mGameServiceController = gameServiceController;
+ }
+
+ @Override
+ public void disconnected() {
+ Preconditions.checkState(mGameServiceState == GameServiceState.CONNECTED);
+
+ mGameServiceState = GameServiceState.DISCONNECTED;
+ mGameServiceController = null;
+ }
+
+ @Override
+ public void gameStarted(GameStartedEvent gameStartedEvent) {
+ Preconditions.checkState(mGameServiceState == GameServiceState.CONNECTED);
+
+ mGameStartedEvents.add(gameStartedEvent);
+ }
+
+ public void requestCreateGameSession(int task) {
+ Preconditions.checkState(mGameServiceState == GameServiceState.CONNECTED);
+
+ try {
+ mGameServiceController.createGameSession(task);
+ } catch (RemoteException ex) {
+ throw new AssertionError(ex);
+ }
}
}
-}
+
+ static final class FakeGameSessionService extends IGameSessionService.Stub {
+
+ private final ArrayList<CapturedCreateInvocation> mCapturedCreateInvocations =
+ new ArrayList<>();
+ private final HashMap<Integer, AndroidFuture<CreateGameSessionResult>>
+ mPendingCreateGameSessionResultFutures =
+ new HashMap<>();
+
+ public static final class CapturedCreateInvocation {
+ private final IGameSessionController mGameSessionController;
+ private final CreateGameSessionRequest mCreateGameSessionRequest;
+ private final GameSessionViewHostConfiguration mGameSessionViewHostConfiguration;
+
+ CapturedCreateInvocation(
+ IGameSessionController gameSessionController,
+ CreateGameSessionRequest createGameSessionRequest,
+ GameSessionViewHostConfiguration gameSessionViewHostConfiguration) {
+ mGameSessionController = gameSessionController;
+ mCreateGameSessionRequest = createGameSessionRequest;
+ mGameSessionViewHostConfiguration = gameSessionViewHostConfiguration;
+ }
+ }
+
+ public ArrayList<CapturedCreateInvocation> getCapturedCreateInvocations() {
+ return mCapturedCreateInvocations;
+ }
+
+ public AndroidFuture<CreateGameSessionResult> removePendingFutureForTaskId(int taskId) {
+ return mPendingCreateGameSessionResultFutures.remove(taskId);
+ }
+
+ @Override
+ public void create(
+ IGameSessionController gameSessionController,
+ CreateGameSessionRequest createGameSessionRequest,
+ GameSessionViewHostConfiguration gameSessionViewHostConfiguration,
+ AndroidFuture createGameSessionResultFuture) {
+
+ mCapturedCreateInvocations.add(
+ new CapturedCreateInvocation(
+ gameSessionController,
+ createGameSessionRequest,
+ gameSessionViewHostConfiguration));
+
+ Preconditions.checkState(!mPendingCreateGameSessionResultFutures.containsKey(
+ createGameSessionRequest.getTaskId()));
+ mPendingCreateGameSessionResultFutures.put(
+ createGameSessionRequest.getTaskId(),
+ createGameSessionResultFuture);
+ }
+ }
+
+ private static class FakeGameSession extends IGameSession.Stub {
+ boolean mIsDestroyed = false;
+ boolean mIsFocused = false;
+
+ @Override
+ public void onDestroyed() {
+ mIsDestroyed = true;
+ }
+
+ @Override
+ public void onTaskFocusChanged(boolean focused) {
+ mIsFocused = focused;
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
index c2e0a04..555f4b8 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
@@ -216,6 +216,7 @@
val displayMetrics: DisplayMetrics = mock()
val domainVerificationManagerInternal: DomainVerificationManagerInternal = mock()
val handler = TestHandler(null)
+ val defaultAppProvider: DefaultAppProvider = mock()
}
companion object {
@@ -294,6 +295,7 @@
whenever(mocks.injector.domainVerificationManagerInternal)
.thenReturn(mocks.domainVerificationManagerInternal)
whenever(mocks.injector.handler) { mocks.handler }
+ whenever(mocks.injector.defaultAppProvider) { mocks.defaultAppProvider }
wheneverStatic { SystemConfig.getInstance() }.thenReturn(mocks.systemConfig)
whenever(mocks.systemConfig.availableFeatures).thenReturn(DEFAULT_AVAILABLE_FEATURES_MAP)
whenever(mocks.systemConfig.sharedLibraries).thenReturn(DEFAULT_SHARED_LIBRARIES_LIST)
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt
new file mode 100644
index 0000000..fe7e2d9
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackageHelperTest.kt
@@ -0,0 +1,507 @@
+/*
+ * Copyright (C) 2021 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.pm
+
+import android.content.Intent
+import android.content.pm.PackageManagerInternal
+import android.content.pm.SuspendDialogInfo
+import android.os.Binder
+import android.os.Build
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.os.UserHandle
+import android.os.UserManager
+import android.util.ArrayMap
+import android.util.SparseArray
+import com.android.server.pm.pkg.PackageStateInternal
+import com.android.server.testutils.TestHandler
+import com.android.server.testutils.any
+import com.android.server.testutils.eq
+import com.android.server.testutils.nullable
+import com.android.server.testutils.whenever
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.argThat
+import org.mockito.Mockito.spy
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+
+@RunWith(JUnit4::class)
+class SuspendPackageHelperTest {
+
+ companion object {
+ const val TEST_PACKAGE_1 = "com.android.test.package1"
+ const val TEST_PACKAGE_2 = "com.android.test.package2"
+ const val DEVICE_OWNER_PACKAGE = "com.android.test.owner"
+ const val NONEXISTENT_PACKAGE = "com.android.test.nonexistent"
+ const val DEVICE_ADMIN_PACKAGE = "com.android.test.known.device.admin"
+ const val DEFAULT_HOME_PACKAGE = "com.android.test.known.home"
+ const val DIALER_PACKAGE = "com.android.test.known.dialer"
+ const val INSTALLER_PACKAGE = "com.android.test.known.installer"
+ const val UNINSTALLER_PACKAGE = "com.android.test.known.uninstaller"
+ const val VERIFIER_PACKAGE = "com.android.test.known.verifier"
+ const val PERMISSION_CONTROLLER_PACKAGE = "com.android.test.known.permission"
+ const val TEST_USER_ID = 0
+ }
+
+ lateinit var pms: PackageManagerService
+ lateinit var suspendPackageHelper: SuspendPackageHelper
+ lateinit var testHandler: TestHandler
+ lateinit var defaultAppProvider: DefaultAppProvider
+ lateinit var packageSetting1: PackageStateInternal
+ lateinit var packageSetting2: PackageStateInternal
+ lateinit var ownerSetting: PackageStateInternal
+ lateinit var packagesToSuspend: Array<String>
+ lateinit var uidsToSuspend: IntArray
+
+ @Mock
+ lateinit var broadcastHelper: BroadcastHelper
+ @Mock
+ lateinit var protectedPackages: ProtectedPackages
+
+ @Captor
+ lateinit var bundleCaptor: ArgumentCaptor<Bundle>
+
+ @Rule
+ @JvmField
+ val rule = MockSystemRule()
+ var deviceOwnerUid = 0
+
+ @Before
+ @Throws(Exception::class)
+ fun setup() {
+ MockitoAnnotations.initMocks(this)
+ rule.system().stageNominalSystemState()
+ pms = spy(createPackageManagerService(
+ TEST_PACKAGE_1, TEST_PACKAGE_2, DEVICE_OWNER_PACKAGE, DEVICE_ADMIN_PACKAGE,
+ DEFAULT_HOME_PACKAGE, DIALER_PACKAGE, INSTALLER_PACKAGE, UNINSTALLER_PACKAGE,
+ VERIFIER_PACKAGE, PERMISSION_CONTROLLER_PACKAGE))
+ suspendPackageHelper = SuspendPackageHelper(
+ pms, rule.mocks().injector, broadcastHelper, protectedPackages)
+ defaultAppProvider = rule.mocks().defaultAppProvider
+ testHandler = rule.mocks().handler
+ packageSetting1 = pms.getPackageStateInternal(TEST_PACKAGE_1)!!
+ packageSetting2 = pms.getPackageStateInternal(TEST_PACKAGE_2)!!
+ ownerSetting = pms.getPackageStateInternal(DEVICE_OWNER_PACKAGE)!!
+ deviceOwnerUid = UserHandle.getUid(TEST_USER_ID, ownerSetting.appId)
+ packagesToSuspend = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ uidsToSuspend = intArrayOf(packageSetting1.appId, packageSetting2.appId)
+
+ whenever(protectedPackages.getDeviceOwnerOrProfileOwnerPackage(eq(TEST_USER_ID)))
+ .thenReturn(DEVICE_OWNER_PACKAGE)
+ whenever(rule.mocks().userManagerService.hasUserRestriction(
+ eq(UserManager.DISALLOW_APPS_CONTROL), eq(TEST_USER_ID))).thenReturn(true)
+ whenever(rule.mocks().userManagerService.hasUserRestriction(
+ eq(UserManager.DISALLOW_UNINSTALL_APPS), eq(TEST_USER_ID))).thenReturn(true)
+ mockKnownPackages(pms)
+ }
+
+ @Test
+ fun setPackagesSuspended() {
+ val targetPackages = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ val failedNames = suspendPackageHelper.setPackagesSuspended(targetPackages,
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+
+ verify(pms).scheduleWritePackageRestrictionsLocked(eq(TEST_USER_ID))
+ verify(broadcastHelper).sendPackageBroadcast(eq(Intent.ACTION_PACKAGES_SUSPENDED),
+ nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(),
+ nullable(), nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_SUSPENDED), nullable(),
+ nullable(), any(), eq(TEST_PACKAGE_1), nullable(), any(), any(), nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_SUSPENDED), nullable(),
+ nullable(), any(), eq(TEST_PACKAGE_2), nullable(), any(), any(), nullable(), nullable())
+
+ var modifiedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ assertThat(modifiedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(failedNames).isEmpty()
+ }
+
+ @Test
+ fun setPackagesSuspended_emptyPackageName() {
+ var failedNames = suspendPackageHelper.setPackagesSuspended(null /* packageNames */,
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+
+ assertThat(failedNames).isNull()
+
+ failedNames = suspendPackageHelper.setPackagesSuspended(arrayOfNulls(0),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+
+ assertThat(failedNames).isEmpty()
+ }
+
+ @Test
+ fun setPackagesSuspended_callerIsNotAllowed() {
+ val failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_2),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, TEST_PACKAGE_1, TEST_USER_ID, Binder.getCallingUid())
+
+ assertThat(failedNames).asList().hasSize(1)
+ assertThat(failedNames).asList().contains(TEST_PACKAGE_2)
+ }
+
+ @Test
+ fun setPackagesSuspended_callerSuspendItself() {
+ val failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(DEVICE_OWNER_PACKAGE),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+
+ assertThat(failedNames).asList().hasSize(1)
+ assertThat(failedNames).asList().contains(DEVICE_OWNER_PACKAGE)
+ }
+
+ @Test
+ fun setPackagesSuspended_nonexistentPackage() {
+ val failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(NONEXISTENT_PACKAGE),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+
+ assertThat(failedNames).asList().hasSize(1)
+ assertThat(failedNames).asList().contains(NONEXISTENT_PACKAGE)
+ }
+
+ @Test
+ fun setPackagesSuspended_knownPackages() {
+ val knownPackages = arrayOf(DEVICE_ADMIN_PACKAGE, DEFAULT_HOME_PACKAGE, DIALER_PACKAGE,
+ INSTALLER_PACKAGE, UNINSTALLER_PACKAGE, VERIFIER_PACKAGE, PERMISSION_CONTROLLER_PACKAGE)
+ val failedNames = suspendPackageHelper.setPackagesSuspended(knownPackages,
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)!!
+
+ assertThat(failedNames.size).isEqualTo(knownPackages.size)
+ for (pkg in knownPackages) {
+ assertThat(failedNames).asList().contains(pkg)
+ }
+ }
+
+ @Test
+ fun setPackagesUnsuspended() {
+ val targetPackages = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ var failedNames = suspendPackageHelper.setPackagesSuspended(targetPackages,
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+ failedNames = suspendPackageHelper.setPackagesSuspended(targetPackages,
+ false /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+
+ verify(pms, times(2)).scheduleWritePackageRestrictionsLocked(eq(TEST_USER_ID))
+ verify(broadcastHelper).sendPackageBroadcast(eq(Intent.ACTION_PACKAGES_UNSUSPENDED),
+ nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(),
+ nullable(), nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_UNSUSPENDED),
+ nullable(), nullable(), any(), eq(TEST_PACKAGE_1), nullable(), any(), any(),
+ nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_UNSUSPENDED),
+ nullable(), nullable(), any(), eq(TEST_PACKAGE_2), nullable(), any(), any(),
+ nullable(), nullable())
+
+ var modifiedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ assertThat(modifiedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(failedNames).isEmpty()
+ }
+
+ @Test
+ fun getUnsuspendablePackagesForUser() {
+ val suspendables = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ val unsuspendables = arrayOf(DEVICE_ADMIN_PACKAGE, DEFAULT_HOME_PACKAGE, DIALER_PACKAGE,
+ INSTALLER_PACKAGE, UNINSTALLER_PACKAGE, VERIFIER_PACKAGE, PERMISSION_CONTROLLER_PACKAGE)
+ val results = suspendPackageHelper.getUnsuspendablePackagesForUser(
+ suspendables + unsuspendables, TEST_USER_ID, deviceOwnerUid)
+
+ assertThat(results.size).isEqualTo(unsuspendables.size)
+ for (pkg in unsuspendables) {
+ assertThat(results).asList().contains(pkg)
+ }
+ }
+
+ @Test
+ fun getUnsuspendablePackagesForUser_callerIsNotAllowed() {
+ val suspendables = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ val results = suspendPackageHelper.getUnsuspendablePackagesForUser(
+ suspendables, TEST_USER_ID, Binder.getCallingUid())
+
+ assertThat(results.size).isEqualTo(suspendables.size)
+ for (pkg in suspendables) {
+ assertThat(results).asList().contains(pkg)
+ }
+ }
+
+ @Test
+ fun getSuspendedPackageAppExtras() {
+ val appExtras = PersistableBundle()
+ appExtras.putString(TEST_PACKAGE_1, TEST_PACKAGE_1)
+ var failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_1),
+ true /* suspended */, appExtras, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+
+ val result = suspendPackageHelper.getSuspendedPackageAppExtras(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)!!
+
+ assertThat(result.getString(TEST_PACKAGE_1)).isEqualTo(TEST_PACKAGE_1)
+ }
+
+ @Test
+ fun removeSuspensionsBySuspendingPackage() {
+ val appExtras = PersistableBundle()
+ appExtras.putString(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ val targetPackages = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ var failedNames = suspendPackageHelper.setPackagesSuspended(targetPackages,
+ true /* suspended */, appExtras, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+ assertThat(suspendPackageHelper.getSuspendingPackage(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE)
+ assertThat(suspendPackageHelper.getSuspendingPackage(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE)
+ assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNotNull()
+ assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNotNull()
+
+ suspendPackageHelper.removeSuspensionsBySuspendingPackage(targetPackages,
+ { suspendingPackage -> suspendingPackage == DEVICE_OWNER_PACKAGE }, TEST_USER_ID)
+
+ testHandler.flush()
+ verify(pms, times(2)).scheduleWritePackageRestrictionsLocked(eq(TEST_USER_ID))
+ verify(broadcastHelper).sendPackageBroadcast(eq(Intent.ACTION_PACKAGES_UNSUSPENDED),
+ nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(),
+ nullable(), nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_UNSUSPENDED),
+ nullable(), nullable(), any(), eq(TEST_PACKAGE_1), nullable(), any(), any(),
+ nullable(), nullable())
+ verify(broadcastHelper).doSendBroadcast(eq(Intent.ACTION_MY_PACKAGE_UNSUSPENDED),
+ nullable(), nullable(), any(), eq(TEST_PACKAGE_2), nullable(), any(), any(),
+ nullable(), nullable())
+
+ assertThat(suspendPackageHelper.getSuspendingPackage(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNull()
+ assertThat(suspendPackageHelper.getSuspendingPackage(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNull()
+ assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isNull()
+ assertThat(suspendPackageHelper.getSuspendedPackageAppExtras(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isNull()
+ }
+
+ @Test
+ fun getSuspendedPackageLauncherExtras() {
+ val launcherExtras = PersistableBundle()
+ launcherExtras.putString(TEST_PACKAGE_2, TEST_PACKAGE_2)
+ var failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_2),
+ true /* suspended */, null /* appExtras */, launcherExtras,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+
+ val result = suspendPackageHelper.getSuspendedPackageLauncherExtras(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)!!
+
+ assertThat(result.getString(TEST_PACKAGE_2)).isEqualTo(TEST_PACKAGE_2)
+ }
+
+ @Test
+ fun isPackageSuspended() {
+ var failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_1),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+
+ assertThat(suspendPackageHelper.isPackageSuspended(
+ TEST_PACKAGE_1, TEST_USER_ID, deviceOwnerUid)).isTrue()
+ }
+
+ @Test
+ fun getSuspendingPackage() {
+ val launcherExtras = PersistableBundle()
+ launcherExtras.putString(TEST_PACKAGE_2, TEST_PACKAGE_2)
+ var failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_2),
+ true /* suspended */, null /* appExtras */, launcherExtras,
+ null /* dialogInfo */, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+
+ assertThat(suspendPackageHelper.getSuspendingPackage(
+ TEST_PACKAGE_2, TEST_USER_ID, deviceOwnerUid)).isEqualTo(DEVICE_OWNER_PACKAGE)
+ }
+
+ @Test
+ fun getSuspendedDialogInfo() {
+ val dialogInfo = SuspendDialogInfo.Builder()
+ .setTitle(TEST_PACKAGE_1).build()
+ var failedNames = suspendPackageHelper.setPackagesSuspended(arrayOf(TEST_PACKAGE_1),
+ true /* suspended */, null /* appExtras */, null /* launcherExtras */,
+ dialogInfo, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)
+ testHandler.flush()
+ assertThat(failedNames).isEmpty()
+
+ val result = suspendPackageHelper.getSuspendedDialogInfo(
+ TEST_PACKAGE_1, DEVICE_OWNER_PACKAGE, TEST_USER_ID, deviceOwnerUid)!!
+
+ assertThat(result.title).isEqualTo(TEST_PACKAGE_1)
+ }
+
+ @Test
+ @Throws(Exception::class)
+ fun sendPackagesSuspendedForUser_withSameVisibilityAllowList() {
+ mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
+ mockAllowList(packageSetting2, allowList(10001, 10002, 10003))
+
+ suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
+ packagesToSuspend, uidsToSuspend, TEST_USER_ID)
+ testHandler.flush()
+ verify(broadcastHelper).sendPackageBroadcast(any(), nullable(), bundleCaptor.capture(),
+ anyInt(), nullable(), nullable(), any(), nullable(), any(), nullable())
+
+ var changedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ var changedUids = bundleCaptor.value.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
+ assertThat(changedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(changedUids).asList().containsExactly(
+ packageSetting1.appId, packageSetting2.appId)
+ }
+
+ @Test
+ @Throws(Exception::class)
+ fun sendPackagesSuspendedForUser_withDifferentVisibilityAllowList() {
+ mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
+ mockAllowList(packageSetting2, allowList(10001, 10002, 10007))
+
+ suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
+ packagesToSuspend, uidsToSuspend, TEST_USER_ID)
+ testHandler.flush()
+ verify(broadcastHelper, times(2)).sendPackageBroadcast(
+ any(), nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(),
+ nullable(), any(), nullable())
+
+ bundleCaptor.allValues.forEach {
+ var changedPackages = it.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ var changedUids = it.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
+ assertThat(changedPackages?.size).isEqualTo(1)
+ assertThat(changedUids?.size).isEqualTo(1)
+ assertThat(changedPackages?.get(0)).isAnyOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(changedUids?.get(0)).isAnyOf(packageSetting1.appId, packageSetting2.appId)
+ }
+ }
+
+ @Test
+ @Throws(Exception::class)
+ fun sendPackagesSuspendedForUser_withNullVisibilityAllowList() {
+ mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
+ mockAllowList(packageSetting2, null)
+
+ suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
+ packagesToSuspend, uidsToSuspend, TEST_USER_ID)
+ testHandler.flush()
+ verify(broadcastHelper, times(2)).sendPackageBroadcast(
+ any(), nullable(), bundleCaptor.capture(), anyInt(), nullable(), nullable(), any(),
+ nullable(), nullable(), nullable())
+
+ bundleCaptor.allValues.forEach {
+ var changedPackages = it.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ var changedUids = it.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
+ assertThat(changedPackages?.size).isEqualTo(1)
+ assertThat(changedUids?.size).isEqualTo(1)
+ assertThat(changedPackages?.get(0)).isAnyOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(changedUids?.get(0)).isAnyOf(packageSetting1.appId, packageSetting2.appId)
+ }
+ }
+
+ @Test
+ @Throws(Exception::class)
+ fun sendPackagesSuspendModifiedForUser() {
+ suspendPackageHelper.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED,
+ packagesToSuspend, uidsToSuspend, TEST_USER_ID)
+ testHandler.flush()
+ verify(broadcastHelper).sendPackageBroadcast(
+ eq(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED), nullable(), bundleCaptor.capture(),
+ anyInt(), nullable(), nullable(), any(), nullable(), nullable(), nullable())
+
+ var modifiedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
+ var modifiedUids = bundleCaptor.value.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
+ assertThat(modifiedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
+ assertThat(modifiedUids).asList().containsExactly(
+ packageSetting1.appId, packageSetting2.appId)
+ }
+
+ private fun allowList(vararg uids: Int) = SparseArray<IntArray>().apply {
+ this.put(TEST_USER_ID, uids)
+ }
+
+ private fun mockAllowList(pkgSetting: PackageStateInternal, list: SparseArray<IntArray>?) {
+ whenever(rule.mocks().appsFilter.getVisibilityAllowList(
+ argThat { it?.packageName == pkgSetting.packageName }, any(IntArray::class.java),
+ any() as ArrayMap<String, out PackageStateInternal>
+ ))
+ .thenReturn(list)
+ }
+
+ private fun mockKnownPackages(pms: PackageManagerService) {
+ Mockito.doAnswer { it.arguments[0] == DEVICE_ADMIN_PACKAGE }.`when`(pms)
+ .isPackageDeviceAdmin(any(), any())
+ Mockito.doReturn(DEFAULT_HOME_PACKAGE).`when`(defaultAppProvider)
+ .getDefaultHome(eq(TEST_USER_ID))
+ Mockito.doReturn(DIALER_PACKAGE).`when`(defaultAppProvider)
+ .getDefaultDialer(eq(TEST_USER_ID))
+ Mockito.doReturn(arrayOf(INSTALLER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal(
+ eq(PackageManagerInternal.PACKAGE_INSTALLER), eq(TEST_USER_ID))
+ Mockito.doReturn(arrayOf(UNINSTALLER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal(
+ eq(PackageManagerInternal.PACKAGE_UNINSTALLER), eq(TEST_USER_ID))
+ Mockito.doReturn(arrayOf(VERIFIER_PACKAGE)).`when`(pms).getKnownPackageNamesInternal(
+ eq(PackageManagerInternal.PACKAGE_VERIFIER), eq(TEST_USER_ID))
+ Mockito.doReturn(arrayOf(PERMISSION_CONTROLLER_PACKAGE)).`when`(pms)
+ .getKnownPackageNamesInternal(
+ eq(PackageManagerInternal.PACKAGE_PERMISSION_CONTROLLER), eq(TEST_USER_ID))
+ }
+
+ private fun createPackageManagerService(vararg stageExistingPackages: String):
+ PackageManagerService {
+ stageExistingPackages.forEach {
+ rule.system().stageScanExistingPackage(it, 1L,
+ rule.system().dataAppDirectory)
+ }
+ var pms = PackageManagerService(rule.mocks().injector,
+ false /*coreOnly*/,
+ false /*factoryTest*/,
+ MockSystem.DEFAULT_VERSION_INFO.fingerprint,
+ false /*isEngBuild*/,
+ false /*isUserDebugBuild*/,
+ Build.VERSION_CODES.CUR_DEVELOPMENT,
+ Build.VERSION.INCREMENTAL,
+ false /*snapshotEnabled*/)
+ rule.system().validateFinalState()
+ return pms
+ }
+}
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackagesBroadcastTest.kt b/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackagesBroadcastTest.kt
deleted file mode 100644
index 02ee35b..0000000
--- a/services/tests/mockingservicestests/src/com/android/server/pm/SuspendPackagesBroadcastTest.kt
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2021 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.pm
-
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.util.ArrayMap
-import android.util.SparseArray
-import com.android.server.pm.pkg.PackageStateInternal
-import com.android.server.testutils.any
-import com.android.server.testutils.eq
-import com.android.server.testutils.nullable
-import com.android.server.testutils.whenever
-import com.google.common.truth.Truth.assertThat
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.mockito.ArgumentCaptor
-import org.mockito.ArgumentMatchers.anyInt
-import org.mockito.Captor
-import org.mockito.Mockito.argThat
-import org.mockito.Mockito.spy
-import org.mockito.Mockito.times
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-
-@RunWith(JUnit4::class)
-class SuspendPackagesBroadcastTest {
-
- companion object {
- const val TEST_PACKAGE_1 = "com.android.test.package1"
- const val TEST_PACKAGE_2 = "com.android.test.package2"
- const val TEST_USER_ID = 0
- }
-
- lateinit var pms: PackageManagerService
- lateinit var packageSetting1: PackageStateInternal
- lateinit var packageSetting2: PackageStateInternal
- lateinit var packagesToSuspend: Array<String>
- lateinit var uidsToSuspend: IntArray
-
- @Captor
- lateinit var bundleCaptor: ArgumentCaptor<Bundle>
-
- @Rule
- @JvmField
- val rule = MockSystemRule()
-
- @Before
- @Throws(Exception::class)
- fun setup() {
- MockitoAnnotations.initMocks(this)
- rule.system().stageNominalSystemState()
- pms = spy(createPackageManagerService(TEST_PACKAGE_1, TEST_PACKAGE_2))
- packageSetting1 = pms.getPackageStateInternal(TEST_PACKAGE_1)!!
- packageSetting2 = pms.getPackageStateInternal(TEST_PACKAGE_2)!!
- packagesToSuspend = arrayOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
- uidsToSuspend = intArrayOf(packageSetting1.appId, packageSetting2.appId)
- }
-
- @Test
- @Throws(Exception::class)
- fun sendPackagesSuspendedForUser_withSameVisibilityAllowList() {
- mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
- mockAllowList(packageSetting2, allowList(10001, 10002, 10003))
-
- pms.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
- packagesToSuspend, uidsToSuspend, TEST_USER_ID)
- verify(pms).sendPackageBroadcast(any(), nullable(), bundleCaptor.capture(),
- anyInt(), nullable(), nullable(), any(), nullable(), any(), nullable())
-
- var changedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
- var changedUids = bundleCaptor.value.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
- assertThat(changedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
- assertThat(changedUids).asList().containsExactly(
- packageSetting1.appId, packageSetting2.appId)
- }
-
- @Test
- @Throws(Exception::class)
- fun sendPackagesSuspendedForUser_withDifferentVisibilityAllowList() {
- mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
- mockAllowList(packageSetting2, allowList(10001, 10002, 10007))
-
- pms.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
- packagesToSuspend, uidsToSuspend, TEST_USER_ID)
- verify(pms, times(2)).sendPackageBroadcast(any(), nullable(), bundleCaptor.capture(),
- anyInt(), nullable(), nullable(), any(), nullable(), any(), nullable())
-
- bundleCaptor.allValues.forEach {
- var changedPackages = it.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
- var changedUids = it.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
- assertThat(changedPackages?.size).isEqualTo(1)
- assertThat(changedUids?.size).isEqualTo(1)
- assertThat(changedPackages?.get(0)).isAnyOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
- assertThat(changedUids?.get(0)).isAnyOf(packageSetting1.appId, packageSetting2.appId)
- }
- }
-
- @Test
- @Throws(Exception::class)
- fun sendPackagesSuspendedForUser_withNullVisibilityAllowList() {
- mockAllowList(packageSetting1, allowList(10001, 10002, 10003))
- mockAllowList(packageSetting2, null)
-
- pms.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENDED,
- packagesToSuspend, uidsToSuspend, TEST_USER_ID)
- verify(pms, times(2)).sendPackageBroadcast(any(), nullable(), bundleCaptor.capture(),
- anyInt(), nullable(), nullable(), any(), nullable(), nullable(), nullable())
-
- bundleCaptor.allValues.forEach {
- var changedPackages = it.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
- var changedUids = it.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
- assertThat(changedPackages?.size).isEqualTo(1)
- assertThat(changedUids?.size).isEqualTo(1)
- assertThat(changedPackages?.get(0)).isAnyOf(TEST_PACKAGE_1, TEST_PACKAGE_2)
- assertThat(changedUids?.get(0)).isAnyOf(packageSetting1.appId, packageSetting2.appId)
- }
- }
-
- @Test
- @Throws(Exception::class)
- fun sendPackagesSuspendModifiedForUser() {
- pms.sendPackagesSuspendedForUser(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED,
- packagesToSuspend, uidsToSuspend, TEST_USER_ID)
- verify(pms).sendPackageBroadcast(
- eq(Intent.ACTION_PACKAGES_SUSPENSION_CHANGED), nullable(), bundleCaptor.capture(),
- anyInt(), nullable(), nullable(), any(), nullable(), nullable(), nullable())
-
- var modifiedPackages = bundleCaptor.value.getStringArray(Intent.EXTRA_CHANGED_PACKAGE_LIST)
- var modifiedUids = bundleCaptor.value.getIntArray(Intent.EXTRA_CHANGED_UID_LIST)
- assertThat(modifiedPackages).asList().containsExactly(TEST_PACKAGE_1, TEST_PACKAGE_2)
- assertThat(modifiedUids).asList().containsExactly(
- packageSetting1.appId, packageSetting2.appId)
- }
-
- private fun allowList(vararg uids: Int) = SparseArray<IntArray>().apply {
- this.put(TEST_USER_ID, uids)
- }
-
- private fun mockAllowList(pkgSetting: PackageStateInternal, list: SparseArray<IntArray>?) {
- whenever(rule.mocks().appsFilter.getVisibilityAllowList(
- argThat { it?.packageName == pkgSetting.packageName }, any(IntArray::class.java),
- any() as ArrayMap<String, out PackageStateInternal>
- ))
- .thenReturn(list)
- }
-
- private fun createPackageManagerService(vararg stageExistingPackages: String):
- PackageManagerService {
- stageExistingPackages.forEach {
- rule.system().stageScanExistingPackage(it, 1L,
- rule.system().dataAppDirectory)
- }
- var pms = PackageManagerService(rule.mocks().injector,
- false /*coreOnly*/,
- false /*factoryTest*/,
- MockSystem.DEFAULT_VERSION_INFO.fingerprint,
- false /*isEngBuild*/,
- false /*isUserDebugBuild*/,
- Build.VERSION_CODES.CUR_DEVELOPMENT,
- Build.VERSION.INCREMENTAL,
- false /*snapshotEnabled*/)
- rule.system().validateFinalState()
- return pms
- }
-}
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
index 36c37c4..677f0f6 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
@@ -541,11 +541,14 @@
| ActivityManager.UID_OBSERVER_CAPABILITY
};
final IUidObserver[] observers = new IUidObserver.Stub[changesToObserve.length];
+ doReturn(Process.myUid()).when(sPackageManagerInternal)
+ .getPackageUid(mContext.getOpPackageName(), 0 /* flags */, mContext.getUserId());
for (int i = 0; i < observers.length; ++i) {
observers[i] = mock(IUidObserver.Stub.class);
when(observers[i].asBinder()).thenReturn((IBinder) observers[i]);
mAms.registerUidObserver(observers[i], changesToObserve[i] /* which */,
- ActivityManager.PROCESS_STATE_UNKNOWN /* cutpoint */, null /* caller */);
+ ActivityManager.PROCESS_STATE_UNKNOWN /* cutpoint */,
+ mContext.getOpPackageName());
// When we invoke AMS.registerUidObserver, there are some interactions with observers[i]
// mock in RemoteCallbackList class. We don't want to test those interactions and
@@ -674,10 +677,12 @@
mockNoteOperation();
final IUidObserver observer = mock(IUidObserver.Stub.class);
-
when(observer.asBinder()).thenReturn((IBinder) observer);
+ doReturn(Process.myUid()).when(sPackageManagerInternal)
+ .getPackageUid(mContext.getOpPackageName(), 0 /* flags */, mContext.getUserId());
mAms.registerUidObserver(observer, ActivityManager.UID_OBSERVER_PROCSTATE /* which */,
- ActivityManager.PROCESS_STATE_SERVICE /* cutpoint */, null /* callingPackage */);
+ ActivityManager.PROCESS_STATE_SERVICE /* cutpoint */,
+ mContext.getOpPackageName());
// When we invoke AMS.registerUidObserver, there are some interactions with observer
// mock in RemoteCallbackList class. We don't want to test those interactions and
// at the same time, we don't want those to interfere with verifyNoMoreInteractions.
@@ -771,7 +776,9 @@
final IUidObserver observer = mock(IUidObserver.Stub.class);
when(observer.asBinder()).thenReturn((IBinder) observer);
- mAms.registerUidObserver(observer, 0, 0, null);
+ doReturn(Process.myUid()).when(sPackageManagerInternal)
+ .getPackageUid(mContext.getOpPackageName(), 0 /* flags */, mContext.getUserId());
+ mAms.registerUidObserver(observer, 0, 0, mContext.getOpPackageName());
// Verify that when observers are registered, then validateUids is correctly updated.
addPendingUidChanges(pendingItemsForUids);
mAms.mUidObserverController.dispatchUidsChanged();
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/AcquisitionClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/AcquisitionClientTest.java
index a06a782..fc55a9f 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/AcquisitionClientTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/AcquisitionClientTest.java
@@ -52,7 +52,7 @@
@Mock
private ClientMonitorCallbackConverter mClientCallback;
@Mock
- private BaseClientMonitor.Callback mSchedulerCallback;
+ private ClientMonitorCallback mSchedulerCallback;
@Before
public void setUp() {
@@ -96,7 +96,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
startHalOperation();
}
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BaseClientMonitorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BaseClientMonitorTest.java
new file mode 100644
index 0000000..51d234d
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BaseClientMonitorTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2022 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.biometrics.sensors;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
+
+import com.android.server.biometrics.log.BiometricLogger;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@Presubmit
+@SmallTest
+public class BaseClientMonitorTest {
+
+ @Mock
+ private Context mContext;
+ @Mock
+ private IBinder mToken;
+ private @Mock ClientMonitorCallbackConverter mListener;
+ @Mock
+ private BiometricLogger mLogger;
+ @Mock
+ private ClientMonitorCallback mCallback;
+
+ private TestClientMonitor mClientMonitor;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mClientMonitor = new TestClientMonitor();
+ }
+
+ @Test
+ public void preparesForDeath() throws RemoteException {
+ verify(mToken).linkToDeath(eq(mClientMonitor), anyInt());
+
+ mClientMonitor.binderDied();
+
+ assertThat(mClientMonitor.mCanceled).isTrue();
+ assertThat(mClientMonitor.getListener()).isNull();
+ }
+
+ @Test
+ public void ignoresDeathWhenDone() {
+ mClientMonitor.markAlreadyDone();
+ mClientMonitor.binderDied();
+
+ assertThat(mClientMonitor.mCanceled).isFalse();
+ }
+
+ @Test
+ public void start() {
+ mClientMonitor.start(mCallback);
+
+ verify(mCallback).onClientStarted(eq(mClientMonitor));
+ }
+
+ @Test
+ public void destroy() {
+ mClientMonitor.destroy();
+ mClientMonitor.destroy();
+
+ assertThat(mClientMonitor.isAlreadyDone()).isTrue();
+ verify(mToken).unlinkToDeath(eq(mClientMonitor), anyInt());
+ }
+
+ @Test
+ public void hasRequestId() {
+ assertThat(mClientMonitor.hasRequestId()).isFalse();
+
+ final int id = 200;
+ mClientMonitor.setRequestId(id);
+ assertThat(mClientMonitor.hasRequestId()).isTrue();
+ assertThat(mClientMonitor.getRequestId()).isEqualTo(id);
+ }
+
+ private class TestClientMonitor extends BaseClientMonitor implements Interruptable {
+ public boolean mCanceled = false;
+
+ TestClientMonitor() {
+ super(mContext, mToken, mListener, 9 /* userId */, "foo" /* owner */, 2 /* cookie */,
+ 5 /* sensorId */, mLogger);
+ }
+
+ @Override
+ public int getProtoEnum() {
+ return 0;
+ }
+
+ @Override
+ public void cancel() {
+ mCanceled = true;
+ }
+
+ @Override
+ public void cancelWithoutStarting(@NonNull ClientMonitorCallback callback) {
+ mCanceled = true;
+ }
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerOperationTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerOperationTest.java
index d4bac2c..8751cf3 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerOperationTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerOperationTest.java
@@ -61,11 +61,11 @@
@Mock
private InterruptableMonitor<FakeHal> mClientMonitor;
@Mock
- private BaseClientMonitor.Callback mClientCallback;
+ private ClientMonitorCallback mClientCallback;
@Mock
private FakeHal mHal;
@Captor
- ArgumentCaptor<BaseClientMonitor.Callback> mStartCallback;
+ ArgumentCaptor<ClientMonitorCallback> mStartCallback;
private Handler mHandler;
private BiometricSchedulerOperation mOperation;
@@ -89,7 +89,7 @@
assertThat(mOperation.isFinished()).isFalse();
final boolean started = mOperation.startWithCookie(
- mock(BaseClientMonitor.Callback.class), cookie);
+ mock(ClientMonitorCallback.class), cookie);
assertThat(started).isTrue();
verify(mClientMonitor).start(mStartCallback.capture());
@@ -106,7 +106,7 @@
assertThat(mOperation.isReadyToStart()).isEqualTo(goodCookie);
final boolean started = mOperation.startWithCookie(
- mock(BaseClientMonitor.Callback.class), badCookie);
+ mock(ClientMonitorCallback.class), badCookie);
assertThat(started).isFalse();
assertThat(mOperation.isStarted()).isFalse();
@@ -119,7 +119,7 @@
when(mClientMonitor.getCookie()).thenReturn(0);
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- final BaseClientMonitor.Callback cb = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback cb = mock(ClientMonitorCallback.class);
mOperation.start(cb);
verify(mClientMonitor).start(mStartCallback.capture());
mStartCallback.getValue().onClientStarted(mClientMonitor);
@@ -146,7 +146,7 @@
when(mClientMonitor.getCookie()).thenReturn(0);
when(mClientMonitor.getFreshDaemon()).thenReturn(null);
- final BaseClientMonitor.Callback cb = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback cb = mock(ClientMonitorCallback.class);
mOperation.start(cb);
verify(mClientMonitor, never()).start(any());
@@ -164,17 +164,17 @@
public void doesNotStartWithCookie() {
when(mClientMonitor.getCookie()).thenReturn(9);
assertThrows(IllegalStateException.class,
- () -> mOperation.start(mock(BaseClientMonitor.Callback.class)));
+ () -> mOperation.start(mock(ClientMonitorCallback.class)));
}
@Test
public void cannotRestart() {
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- mOperation.start(mock(BaseClientMonitor.Callback.class));
+ mOperation.start(mock(ClientMonitorCallback.class));
assertThrows(IllegalStateException.class,
- () -> mOperation.start(mock(BaseClientMonitor.Callback.class)));
+ () -> mOperation.start(mock(ClientMonitorCallback.class)));
}
@Test
@@ -187,14 +187,14 @@
verify(mClientMonitor).unableToStart();
verify(mClientMonitor).destroy();
assertThrows(IllegalStateException.class,
- () -> mOperation.start(mock(BaseClientMonitor.Callback.class)));
+ () -> mOperation.start(mock(ClientMonitorCallback.class)));
}
@Test
public void cannotAbortRunning() {
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- mOperation.start(mock(BaseClientMonitor.Callback.class));
+ mOperation.start(mock(ClientMonitorCallback.class));
assertThrows(IllegalStateException.class, () -> mOperation.abort());
}
@@ -203,8 +203,8 @@
public void cancel() {
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- final BaseClientMonitor.Callback startCb = mock(BaseClientMonitor.Callback.class);
- final BaseClientMonitor.Callback cancelCb = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback startCb = mock(ClientMonitorCallback.class);
+ final ClientMonitorCallback cancelCb = mock(ClientMonitorCallback.class);
mOperation.start(startCb);
verify(mClientMonitor).start(mStartCallback.capture());
mStartCallback.getValue().onClientStarted(mClientMonitor);
@@ -230,12 +230,12 @@
public void cancelWithoutStarting() {
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- final BaseClientMonitor.Callback cancelCb = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback cancelCb = mock(ClientMonitorCallback.class);
mOperation.cancel(mHandler, cancelCb);
assertThat(mOperation.isCanceling()).isTrue();
- ArgumentCaptor<BaseClientMonitor.Callback> cbCaptor =
- ArgumentCaptor.forClass(BaseClientMonitor.Callback.class);
+ ArgumentCaptor<ClientMonitorCallback> cbCaptor =
+ ArgumentCaptor.forClass(ClientMonitorCallback.class);
verify(mClientMonitor).cancelWithoutStarting(cbCaptor.capture());
cbCaptor.getValue().onClientFinished(mClientMonitor, true);
@@ -278,7 +278,7 @@
}
mOperation.markCanceling();
- final BaseClientMonitor.Callback cb = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback cb = mock(ClientMonitorCallback.class);
if (withCookie != null) {
mOperation.startWithCookie(cb, withCookie);
} else {
@@ -307,12 +307,12 @@
private void cancelWatchdog(boolean start) {
when(mClientMonitor.getFreshDaemon()).thenReturn(mHal);
- mOperation.start(mock(BaseClientMonitor.Callback.class));
+ mOperation.start(mock(ClientMonitorCallback.class));
if (start) {
verify(mClientMonitor).start(mStartCallback.capture());
mStartCallback.getValue().onClientStarted(mClientMonitor);
}
- mOperation.cancel(mHandler, mock(BaseClientMonitor.Callback.class));
+ mOperation.cancel(mHandler, mock(ClientMonitorCallback.class));
assertThat(mOperation.isCanceling()).isTrue();
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
index ac08319..c99d656 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
@@ -114,13 +114,13 @@
final TestHalClientMonitor client2 = new TestHalClientMonitor(
mContext, mToken, () -> mock(Object.class));
- final BaseClientMonitor.Callback callback1 = mock(BaseClientMonitor.Callback.class);
- final BaseClientMonitor.Callback callback2 = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback callback1 = mock(ClientMonitorCallback.class);
+ final ClientMonitorCallback callback2 = mock(ClientMonitorCallback.class);
// Pretend the scheduler is busy so the first operation doesn't start right away. We want
// to pretend like there are two operations in the queue before kicking things off
mScheduler.mCurrentOperation = new BiometricSchedulerOperation(
- mock(BaseClientMonitor.class), mock(BaseClientMonitor.Callback.class));
+ mock(BaseClientMonitor.class), mock(ClientMonitorCallback.class));
mScheduler.scheduleClientMonitor(client1, callback1);
assertEquals(1, mScheduler.mPendingOperations.size());
@@ -152,13 +152,13 @@
final TestHalClientMonitor client2 =
new TestHalClientMonitor(mContext, mToken, () -> daemon2);
- final BaseClientMonitor.Callback callback1 = mock(BaseClientMonitor.Callback.class);
- final BaseClientMonitor.Callback callback2 = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback callback1 = mock(ClientMonitorCallback.class);
+ final ClientMonitorCallback callback2 = mock(ClientMonitorCallback.class);
// Pretend the scheduler is busy so the first operation doesn't start right away. We want
// to pretend like there are two operations in the queue before kicking things off
mScheduler.mCurrentOperation = new BiometricSchedulerOperation(
- mock(BaseClientMonitor.class), mock(BaseClientMonitor.Callback.class));
+ mock(BaseClientMonitor.class), mock(ClientMonitorCallback.class));
mScheduler.scheduleClientMonitor(client1, callback1);
assertEquals(1, mScheduler.mPendingOperations.size());
@@ -187,7 +187,7 @@
final HalClientMonitor.LazyDaemon<Object> lazyDaemon1 = () -> mock(Object.class);
final TestAuthenticationClient client1 = new TestAuthenticationClient(mContext,
lazyDaemon1, mToken, mock(ClientMonitorCallbackConverter.class));
- final BaseClientMonitor.Callback callback1 = mock(BaseClientMonitor.Callback.class);
+ final ClientMonitorCallback callback1 = mock(ClientMonitorCallback.class);
// Schedule a BiometricPrompt authentication request
mScheduler.scheduleClientMonitor(client1, callback1);
@@ -628,7 +628,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
assertFalse(mStarted);
mStarted = true;
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CompositeCallbackTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CompositeCallbackTest.java
index 09b5c5c..587bb60 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CompositeCallbackTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CompositeCallbackTest.java
@@ -17,36 +17,62 @@
package com.android.server.biometrics.sensors;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.SmallTest;
+import org.junit.Before;
import org.junit.Test;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Objects;
@Presubmit
@SmallTest
public class CompositeCallbackTest {
+ @Mock
+ private BaseClientMonitor mClientMonitor;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ }
+
@Test
- public void testNullCallback() {
- BaseClientMonitor.Callback callback1 = mock(BaseClientMonitor.Callback.class);
- BaseClientMonitor.Callback callback2 = mock(BaseClientMonitor.Callback.class);
- BaseClientMonitor.Callback callback3 = null;
+ public void testCallbacks() {
+ testCallbacks(mock(ClientMonitorCallback.class), mock(ClientMonitorCallback.class));
+ }
- BaseClientMonitor.CompositeCallback callback = new BaseClientMonitor.CompositeCallback(
- callback1, callback2, callback3);
+ @Test
+ public void testNullCallbacks() {
+ testCallbacks(null, mock(ClientMonitorCallback.class),
+ null, mock(ClientMonitorCallback.class));
+ }
- BaseClientMonitor clientMonitor = mock(BaseClientMonitor.class);
+ private void testCallbacks(ClientMonitorCallback... callbacks) {
+ final ClientMonitorCallback[] expected = Arrays.stream(callbacks)
+ .filter(Objects::nonNull).toArray(ClientMonitorCallback[]::new);
- callback.onClientStarted(clientMonitor);
- verify(callback1).onClientStarted(eq(clientMonitor));
- verify(callback2).onClientStarted(eq(clientMonitor));
+ ClientMonitorCompositeCallback callback = new ClientMonitorCompositeCallback(callbacks);
- callback.onClientFinished(clientMonitor, true /* success */);
- verify(callback1).onClientFinished(eq(clientMonitor), eq(true));
- verify(callback2).onClientFinished(eq(clientMonitor), eq(true));
+ callback.onClientStarted(mClientMonitor);
+ final InOrder order = inOrder(expected);
+ for (ClientMonitorCallback cb : expected) {
+ order.verify(cb).onClientStarted(eq(mClientMonitor));
+ }
+
+ callback.onClientFinished(mClientMonitor, true /* success */);
+ Collections.reverse(Arrays.asList(expected));
+ for (ClientMonitorCallback cb : expected) {
+ order.verify(cb).onClientFinished(eq(mClientMonitor), eq(true));
+ }
}
}
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java
index 407f5fb..a11709a 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/UserAwareBiometricSchedulerTest.java
@@ -155,7 +155,7 @@
assertNull(mScheduler.mCurrentOperation);
final BiometricSchedulerOperation fakeOperation = new BiometricSchedulerOperation(
- mock(BaseClientMonitor.class), new BaseClientMonitor.Callback() {});
+ mock(BaseClientMonitor.class), new ClientMonitorCallback() {});
mScheduler.mCurrentOperation = fakeOperation;
startUserClient.mCallback.onClientFinished(startUserClient, true);
assertSame(fakeOperation, mScheduler.mCurrentOperation);
@@ -234,7 +234,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
onUserStopped();
}
@@ -248,7 +248,7 @@
private static class TestStartUserClient extends StartUserClient<Object, Object> {
private final boolean mShouldFinish;
- Callback mCallback;
+ ClientMonitorCallback mCallback;
public TestStartUserClient(@NonNull Context context,
@NonNull LazyDaemon<Object> lazyDaemon, @Nullable IBinder token, int userId,
@@ -263,7 +263,7 @@
}
@Override
- public void start(@NonNull Callback callback) {
+ public void start(@NonNull ClientMonitorCallback callback) {
super.start(callback);
mCallback = callback;
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClientTest.java
index 55dc035..931fad1 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClientTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/face/hidl/FaceGenerateChallengeClientTest.java
@@ -34,7 +34,7 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.filters.SmallTest;
-import com.android.server.biometrics.sensors.BaseClientMonitor;
+import com.android.server.biometrics.sensors.ClientMonitorCallback;
import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;
import org.junit.Before;
@@ -61,7 +61,7 @@
@Mock
private IFaceServiceReceiver mOtherReceiver;
@Mock
- private BaseClientMonitor.Callback mMonitorCallback;
+ private ClientMonitorCallback mMonitorCallback;
private FaceGenerateChallengeClient mClient;
diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/InputControllerTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/InputControllerTest.java
new file mode 100644
index 0000000..53468c8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/companion/virtual/InputControllerTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 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.companion.virtual;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.verify;
+
+import android.hardware.input.InputManagerInternal;
+import android.os.Binder;
+import android.os.IBinder;
+import android.platform.test.annotations.Presubmit;
+import android.view.Display;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.server.LocalServices;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@Presubmit
+@RunWith(AndroidJUnit4.class)
+public class InputControllerTest {
+
+ @Mock
+ private InputManagerInternal mInputManagerInternalMock;
+ @Mock
+ private InputController.NativeWrapper mNativeWrapperMock;
+
+ private InputController mInputController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ doNothing().when(mInputManagerInternalMock).setVirtualMousePointerDisplayId(anyInt());
+ LocalServices.removeServiceForTest(InputManagerInternal.class);
+ LocalServices.addService(InputManagerInternal.class, mInputManagerInternalMock);
+
+ mInputController = new InputController(new Object(), mNativeWrapperMock);
+ }
+
+ @Test
+ public void unregisterInputDevice_allMiceUnregistered_unsetValues() {
+ final IBinder deviceToken = new Binder();
+ mInputController.createMouse("name", /*vendorId= */ 1, /*productId= */ 1, deviceToken,
+ /* displayId= */ 1);
+ mInputController.unregisterInputDevice(deviceToken);
+ verify(mInputManagerInternalMock).setVirtualMousePointerDisplayId(
+ eq(Display.INVALID_DISPLAY));
+ }
+
+ @Test
+ public void unregisterInputDevice_anotherMouseExists_setPointerDisplayIdOverride() {
+ final IBinder deviceToken = new Binder();
+ mInputController.createMouse("name", /*vendorId= */ 1, /*productId= */ 1, deviceToken,
+ /* displayId= */ 1);
+ verify(mInputManagerInternalMock).setVirtualMousePointerDisplayId(eq(1));
+ mInputController.createMouse("name", /*vendorId= */ 1, /*productId= */ 1, deviceToken,
+ /* displayId= */ 2);
+ verify(mInputManagerInternalMock).setVirtualMousePointerDisplayId(eq(2));
+ mInputController.unregisterInputDevice(deviceToken);
+ verify(mInputManagerInternalMock).setVirtualMousePointerDisplayId(eq(1));
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java
index 0a0f7d7..fe7d34a 100644
--- a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java
@@ -18,19 +18,23 @@
import static com.google.common.truth.Truth.assertWithMessage;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import static org.testng.Assert.assertThrows;
import android.Manifest;
+import android.app.admin.DevicePolicyManager;
import android.companion.virtual.VirtualDeviceParams;
import android.content.Context;
import android.content.ContextWrapper;
import android.graphics.Point;
import android.hardware.display.DisplayManagerInternal;
+import android.hardware.input.InputManagerInternal;
import android.hardware.input.VirtualKeyEvent;
import android.hardware.input.VirtualMouseButtonEvent;
import android.hardware.input.VirtualMouseRelativeEvent;
@@ -73,6 +77,10 @@
private DisplayManagerInternal mDisplayManagerInternalMock;
@Mock
private VirtualDeviceImpl.PendingTrampolineCallback mPendingTrampolineCallback;
+ @Mock
+ private DevicePolicyManager mDevicePolicyManagerMock;
+ @Mock
+ private InputManagerInternal mInputManagerInternalMock;
@Before
public void setUp() {
@@ -81,9 +89,16 @@
LocalServices.removeServiceForTest(DisplayManagerInternal.class);
LocalServices.addService(DisplayManagerInternal.class, mDisplayManagerInternalMock);
+ doNothing().when(mInputManagerInternalMock).setVirtualMousePointerDisplayId(anyInt());
+ LocalServices.removeServiceForTest(InputManagerInternal.class);
+ LocalServices.addService(InputManagerInternal.class, mInputManagerInternalMock);
+
mContext = Mockito.spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
doNothing().when(mContext).enforceCallingOrSelfPermission(
eq(Manifest.permission.CREATE_VIRTUAL_DEVICE), anyString());
+ when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(
+ mDevicePolicyManagerMock);
+
mInputController = new InputController(new Object(), mNativeWrapperMock);
mDeviceImpl = new VirtualDeviceImpl(mContext,
/* association info */ null, new Binder(), /* uid */ 0, mInputController,
@@ -92,6 +107,14 @@
}
@Test
+ public void onVirtualDisplayRemovedLocked_doesNotThrowException() {
+ final int displayId = 2;
+ mDeviceImpl.onVirtualDisplayCreatedLocked(displayId);
+ // This call should not throw any exceptions.
+ mDeviceImpl.onVirtualDisplayRemovedLocked(displayId);
+ }
+
+ @Test
public void createVirtualKeyboard_noDisplay_failsSecurityException() {
assertThrows(
SecurityException.class,
@@ -154,7 +177,7 @@
mDeviceImpl.createVirtualKeyboard(DISPLAY_ID, DEVICE_NAME, VENDOR_ID, PRODUCT_ID,
BINDER);
assertWithMessage("Virtual keyboard should register fd when the display matches")
- .that(mInputController.mInputDeviceFds).isNotEmpty();
+ .that(mInputController.mInputDeviceDescriptors).isNotEmpty();
verify(mNativeWrapperMock).openUinputKeyboard(DEVICE_NAME, VENDOR_ID, PRODUCT_ID);
}
@@ -164,7 +187,7 @@
mDeviceImpl.createVirtualMouse(DISPLAY_ID, DEVICE_NAME, VENDOR_ID, PRODUCT_ID,
BINDER);
assertWithMessage("Virtual keyboard should register fd when the display matches")
- .that(mInputController.mInputDeviceFds).isNotEmpty();
+ .that(mInputController.mInputDeviceDescriptors).isNotEmpty();
verify(mNativeWrapperMock).openUinputMouse(DEVICE_NAME, VENDOR_ID, PRODUCT_ID);
}
@@ -174,7 +197,7 @@
mDeviceImpl.createVirtualTouchscreen(DISPLAY_ID, DEVICE_NAME, VENDOR_ID, PRODUCT_ID,
BINDER, new Point(WIDTH, HEIGHT));
assertWithMessage("Virtual keyboard should register fd when the display matches")
- .that(mInputController.mInputDeviceFds).isNotEmpty();
+ .that(mInputController.mInputDeviceDescriptors).isNotEmpty();
verify(mNativeWrapperMock).openUinputTouchscreen(DEVICE_NAME, VENDOR_ID, PRODUCT_ID, HEIGHT,
WIDTH);
}
@@ -194,7 +217,9 @@
final int fd = 1;
final int keyCode = KeyEvent.KEYCODE_A;
final int action = VirtualKeyEvent.ACTION_UP;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 1,
+ /* displayId= */ 1));
mDeviceImpl.sendKeyEvent(BINDER, new VirtualKeyEvent.Builder().setKeyCode(keyCode)
.setAction(action).build());
verify(mNativeWrapperMock).writeKeyEvent(fd, keyCode, action);
@@ -217,7 +242,10 @@
final int fd = 1;
final int buttonCode = VirtualMouseButtonEvent.BUTTON_BACK;
final int action = VirtualMouseButtonEvent.ACTION_BUTTON_PRESS;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ mInputController.mActivePointerDisplayId = 1;
mDeviceImpl.sendButtonEvent(BINDER, new VirtualMouseButtonEvent.Builder()
.setButtonCode(buttonCode)
.setAction(action).build());
@@ -225,6 +253,22 @@
}
@Test
+ public void sendButtonEvent_hasFd_wrongDisplay_throwsIllegalStateException() {
+ final int fd = 1;
+ final int buttonCode = VirtualMouseButtonEvent.BUTTON_BACK;
+ final int action = VirtualMouseButtonEvent.ACTION_BUTTON_PRESS;
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ assertThrows(
+ IllegalStateException.class,
+ () ->
+ mDeviceImpl.sendButtonEvent(BINDER, new VirtualMouseButtonEvent.Builder()
+ .setButtonCode(buttonCode)
+ .setAction(action).build()));
+ }
+
+ @Test
public void sendRelativeEvent_noFd() {
assertThrows(
IllegalArgumentException.class,
@@ -239,13 +283,32 @@
final int fd = 1;
final float x = -0.2f;
final float y = 0.7f;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ mInputController.mActivePointerDisplayId = 1;
mDeviceImpl.sendRelativeEvent(BINDER, new VirtualMouseRelativeEvent.Builder()
.setRelativeX(x).setRelativeY(y).build());
verify(mNativeWrapperMock).writeRelativeEvent(fd, x, y);
}
@Test
+ public void sendRelativeEvent_hasFd_wrongDisplay_throwsIllegalStateException() {
+ final int fd = 1;
+ final float x = -0.2f;
+ final float y = 0.7f;
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ assertThrows(
+ IllegalStateException.class,
+ () ->
+ mDeviceImpl.sendRelativeEvent(BINDER,
+ new VirtualMouseRelativeEvent.Builder()
+ .setRelativeX(x).setRelativeY(y).build()));
+ }
+
+ @Test
public void sendScrollEvent_noFd() {
assertThrows(
IllegalArgumentException.class,
@@ -261,7 +324,10 @@
final int fd = 1;
final float x = 0.5f;
final float y = 1f;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ mInputController.mActivePointerDisplayId = 1;
mDeviceImpl.sendScrollEvent(BINDER, new VirtualMouseScrollEvent.Builder()
.setXAxisMovement(x)
.setYAxisMovement(y).build());
@@ -269,6 +335,22 @@
}
@Test
+ public void sendScrollEvent_hasFd_wrongDisplay_throwsIllegalStateException() {
+ final int fd = 1;
+ final float x = 0.5f;
+ final float y = 1f;
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 2,
+ /* displayId= */ 1));
+ assertThrows(
+ IllegalStateException.class,
+ () ->
+ mDeviceImpl.sendScrollEvent(BINDER, new VirtualMouseScrollEvent.Builder()
+ .setXAxisMovement(x)
+ .setYAxisMovement(y).build()));
+ }
+
+ @Test
public void sendTouchEvent_noFd() {
assertThrows(
IllegalArgumentException.class,
@@ -290,7 +372,9 @@
final float x = 100.5f;
final float y = 200.5f;
final int action = VirtualTouchEvent.ACTION_UP;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 3,
+ /* displayId= */ 1));
mDeviceImpl.sendTouchEvent(BINDER, new VirtualTouchEvent.Builder().setX(x)
.setY(y).setAction(action).setPointerId(pointerId).setToolType(toolType).build());
verify(mNativeWrapperMock).writeTouchEvent(fd, pointerId, toolType, action, x, y, Float.NaN,
@@ -307,7 +391,9 @@
final int action = VirtualTouchEvent.ACTION_UP;
final float pressure = 1.0f;
final float majorAxisSize = 10.0f;
- mInputController.mInputDeviceFds.put(BINDER, fd);
+ mInputController.mInputDeviceDescriptors.put(BINDER,
+ new InputController.InputDeviceDescriptor(fd, () -> {}, /* type= */ 3,
+ /* displayId= */ 1));
mDeviceImpl.sendTouchEvent(BINDER, new VirtualTouchEvent.Builder().setX(x)
.setY(y).setAction(action).setPointerId(pointerId).setToolType(toolType)
.setPressure(pressure).setMajorAxisSize(majorAxisSize).build());
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index 1228d62..8a5b16e 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -18,7 +18,6 @@
import static android.app.AppOpsManager.MODE_ALLOWED;
import static android.app.AppOpsManager.MODE_DEFAULT;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
-import static android.app.Notification.EXTRA_TEXT;
import static android.app.Notification.EXTRA_TITLE;
import static android.app.admin.DevicePolicyManager.ACTION_CHECK_POLICY_COMPLIANCE;
import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS;
@@ -34,6 +33,10 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
import static android.app.admin.DevicePolicyManager.PRIVATE_DNS_SET_NO_ERROR;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_192;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_EAP;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_OPEN;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_PERSONAL;
import static android.app.admin.DevicePolicyManager.WIPE_EUICC;
import static android.app.admin.PasswordMetrics.computeForPasswordOrPin;
import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE;
@@ -91,6 +94,7 @@
import android.app.admin.FactoryResetProtectionPolicy;
import android.app.admin.PasswordMetrics;
import android.app.admin.SystemUpdatePolicy;
+import android.app.admin.WifiSsidPolicy;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Intent;
@@ -1112,6 +1116,10 @@
eq(UserManager.DISALLOW_ADD_MANAGED_PROFILE),
eq(true), eq(UserHandle.SYSTEM));
+ verify(getServices().userManager, times(1)).setUserRestriction(
+ eq(UserManager.DISALLOW_ADD_CLONE_PROFILE),
+ eq(true), eq(UserHandle.SYSTEM));
+
verify(mContext.spiedContext, times(1)).sendBroadcastAsUser(
MockUtils.checkIntentAction(DevicePolicyManager.ACTION_DEVICE_OWNER_CHANGED),
MockUtils.checkUserHandle(UserHandle.USER_SYSTEM));
@@ -1393,6 +1401,10 @@
eq(false),
MockUtils.checkUserHandle(UserHandle.USER_SYSTEM));
+ verify(getServices().userManager)
+ .setUserRestriction(eq(UserManager.DISALLOW_ADD_CLONE_PROFILE), eq(false),
+ MockUtils.checkUserHandle(UserHandle.USER_SYSTEM));
+
verify(getServices().userManagerInternal).setDevicePolicyUserRestrictions(
eq(UserHandle.USER_SYSTEM), MockUtils.checkUserRestrictions(),
MockUtils.checkUserRestrictions(UserHandle.USER_SYSTEM), eq(true));
@@ -7209,8 +7221,7 @@
verify(getServices().alarmManager, times(1)).set(anyInt(), eq(PROFILE_OFF_DEADLINE), any());
// Now the user should see a warning notification.
verify(getServices().notificationManager, times(1))
- .notify(anyInt(), argThat(hasExtra(EXTRA_TITLE, PROFILE_OFF_SUSPENSION_TITLE,
- EXTRA_TEXT, PROFILE_OFF_SUSPENSION_SOON_TEXT)));
+ .notify(anyInt(), any());
// Apps shouldn't be suspended yet.
verifyZeroInteractions(getServices().ipackageManager);
clearInvocations(getServices().alarmManager);
@@ -7224,8 +7235,7 @@
verifyZeroInteractions(getServices().alarmManager);
// Now the user should see a notification about suspended apps.
verify(getServices().notificationManager, times(1))
- .notify(anyInt(), argThat(hasExtra(EXTRA_TITLE, PROFILE_OFF_SUSPENSION_TITLE,
- EXTRA_TEXT, PROFILE_OFF_SUSPENSION_TEXT)));
+ .notify(anyInt(), any());
// Verify that the apps are suspended.
verify(getServices().ipackageManager, times(1)).setPackagesSuspendedAsUser(
any(), eq(true), any(), any(), any(), any(), anyInt());
@@ -7828,6 +7838,128 @@
() -> dpm.getOrganizationNameForUser(UserHandle.USER_SYSTEM));
}
+ @Test
+ public void testSetWifiMinimumSecurity_noDeviceOwnerOrPoOfOrgOwnedDevice() {
+ assertThrows(SecurityException.class, () -> dpm.setMinimumRequiredWifiSecurityLevel(
+ DevicePolicyManager.WIFI_SECURITY_PERSONAL));
+ }
+
+ @Test
+ public void testSetWifiMinimumSecurity_asDeviceOwner() throws Exception {
+ setDeviceOwner();
+
+ final Set<Integer> allowedLevels = Set.of(WIFI_SECURITY_OPEN, WIFI_SECURITY_PERSONAL,
+ WIFI_SECURITY_ENTERPRISE_EAP, WIFI_SECURITY_ENTERPRISE_192);
+ for (int level : allowedLevels) {
+ dpm.setMinimumRequiredWifiSecurityLevel(level);
+ assertThat(dpm.getMinimumRequiredWifiSecurityLevel()).isEqualTo(level);
+ }
+ }
+
+ @Test
+ public void testSetWifiMinimumSecurity_asPoOfOrgOwnedDevice() throws Exception {
+ final int managedProfileUserId = 15;
+ final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436);
+ addManagedProfile(admin1, managedProfileAdminUid, admin1);
+ configureProfileOwnerOfOrgOwnedDevice(admin1, managedProfileUserId);
+ mContext.binder.callingUid = managedProfileAdminUid;
+
+ final Set<Integer> allowedLevels = Set.of(WIFI_SECURITY_OPEN, WIFI_SECURITY_PERSONAL,
+ WIFI_SECURITY_ENTERPRISE_EAP, WIFI_SECURITY_ENTERPRISE_192);
+ for (int level : allowedLevels) {
+ dpm.setMinimumRequiredWifiSecurityLevel(level);
+ assertThat(dpm.getMinimumRequiredWifiSecurityLevel()).isEqualTo(level);
+ }
+ }
+
+ @Test
+ public void testSetSsidAllowlist_noDeviceOwnerOrPoOfOrgOwnedDevice() {
+ final Set<String> ssids = Collections.singleton("ssid1");
+ WifiSsidPolicy policy = WifiSsidPolicy.createAllowlistPolicy(ssids);
+ assertThrows(SecurityException.class, () -> dpm.setWifiSsidPolicy(policy));
+ }
+
+ @Test
+ public void testSetSsidAllowlist_asDeviceOwner() throws Exception {
+ setDeviceOwner();
+
+ final Set<String> ssids = Collections.singleton("ssid1");
+ WifiSsidPolicy policy = WifiSsidPolicy.createAllowlistPolicy(ssids);
+ dpm.setWifiSsidPolicy(policy);
+ assertThat(dpm.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+ assertThat(dpm.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+ WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST);
+ }
+
+ @Test
+ public void testSetSsidAllowlist_asPoOfOrgOwnedDevice() throws Exception {
+ final int managedProfileUserId = 15;
+ final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436);
+ addManagedProfile(admin1, managedProfileAdminUid, admin1);
+ configureProfileOwnerOfOrgOwnedDevice(admin1, managedProfileUserId);
+ mContext.binder.callingUid = managedProfileAdminUid;
+
+ final Set<String> ssids = new ArraySet<>(Arrays.asList("ssid1", "ssid2", "ssid3"));
+ WifiSsidPolicy policy = WifiSsidPolicy.createAllowlistPolicy(ssids);
+ dpm.setWifiSsidPolicy(policy);
+ assertThat(dpm.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+ assertThat(dpm.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+ WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST);
+ }
+
+ @Test
+ public void testSetSsidAllowlist_emptyList() throws Exception {
+ setDeviceOwner();
+
+ final Set<String> ssids = new ArraySet<>();
+ assertThrows(IllegalArgumentException.class,
+ () -> WifiSsidPolicy.createAllowlistPolicy(ssids));
+ }
+
+ @Test
+ public void testSetSsidDenylist_noDeviceOwnerOrPoOfOrgOwnedDevice() {
+ final Set<String> ssids = Collections.singleton("ssid1");
+ WifiSsidPolicy policy = WifiSsidPolicy.createDenylistPolicy(ssids);
+ assertThrows(SecurityException.class, () -> dpm.setWifiSsidPolicy(policy));
+ }
+
+ @Test
+ public void testSetSsidDenylist_asDeviceOwner() throws Exception {
+ setDeviceOwner();
+
+ final Set<String> ssids = Collections.singleton("ssid1");
+ WifiSsidPolicy policy = WifiSsidPolicy.createDenylistPolicy(ssids);
+ dpm.setWifiSsidPolicy(policy);
+ assertThat(dpm.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+ assertThat(dpm.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+ WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST);
+ }
+
+ @Test
+ public void testSetSsidDenylist_asPoOfOrgOwnedDevice() throws Exception {
+ final int managedProfileUserId = 15;
+ final int managedProfileAdminUid = UserHandle.getUid(managedProfileUserId, 19436);
+ addManagedProfile(admin1, managedProfileAdminUid, admin1);
+ configureProfileOwnerOfOrgOwnedDevice(admin1, managedProfileUserId);
+ mContext.binder.callingUid = managedProfileAdminUid;
+
+ final Set<String> ssids = new ArraySet<>(Arrays.asList("ssid1", "ssid2", "ssid3"));
+ WifiSsidPolicy policy = WifiSsidPolicy.createDenylistPolicy(ssids);
+ dpm.setWifiSsidPolicy(policy);
+ assertThat(dpm.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+ assertThat(dpm.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+ WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST);
+ }
+
+ @Test
+ public void testSetSsidDenylist_emptyList() throws Exception {
+ setDeviceOwner();
+
+ final Set<String> ssids = new ArraySet<>();
+ assertThrows(IllegalArgumentException.class,
+ () -> WifiSsidPolicy.createDenylistPolicy(ssids));
+ }
+
private void setupVpnAuthorization(String userVpnPackage, int userVpnUid) {
final AppOpsManager.PackageOps vpnOp = new AppOpsManager.PackageOps(userVpnPackage,
userVpnUid, List.of(new AppOpsManager.OpEntry(
@@ -7863,18 +7995,6 @@
// To allow creation of Notification via Notification.Builder
mContext.applicationInfo = mRealTestContext.getApplicationInfo();
- // Setup resources to render notification titles and texts.
- when(mServiceContext.resources
- .getString(R.string.personal_apps_suspension_title))
- .thenReturn(PROFILE_OFF_SUSPENSION_TITLE);
- when(mServiceContext.resources
- .getString(R.string.personal_apps_suspension_text))
- .thenReturn(PROFILE_OFF_SUSPENSION_TEXT);
- when(mServiceContext.resources
- .getString(eq(R.string.personal_apps_suspension_soon_text),
- anyString(), anyString(), anyInt()))
- .thenReturn(PROFILE_OFF_SUSPENSION_SOON_TEXT);
-
// Make locale available for date formatting:
when(mServiceContext.resources.getConfiguration())
.thenReturn(mRealTestContext.getResources().getConfiguration());
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
index d4b1165..6eb2085 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
@@ -232,6 +232,8 @@
return mMockSystemServices.crossProfileApps;
case Context.VPN_MANAGEMENT_SERVICE:
return mMockSystemServices.vpnManager;
+ case Context.DEVICE_POLICY_SERVICE:
+ return mMockSystemServices.devicePolicyManager;
}
throw new UnsupportedOperationException();
}
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java
index 8a2919d..597a165 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java
@@ -31,6 +31,7 @@
import android.app.IActivityManager;
import android.app.IActivityTaskManager;
import android.app.NotificationManager;
+import android.app.admin.DevicePolicyManager;
import android.app.backup.IBackupManager;
import android.app.usage.UsageStatsManagerInternal;
import android.content.BroadcastReceiver;
@@ -125,6 +126,7 @@
public final AppOpsManager appOpsManager;
public final UsbManager usbManager;
public final VpnManager vpnManager;
+ public final DevicePolicyManager devicePolicyManager;
/** Note this is a partial mock, not a real mock. */
public final PackageManager packageManager;
public final BuildMock buildMock = new BuildMock();
@@ -172,6 +174,7 @@
appOpsManager = mock(AppOpsManager.class);
usbManager = mock(UsbManager.class);
vpnManager = mock(VpnManager.class);
+ devicePolicyManager = mock(DevicePolicyManager.class);
// Package manager is huge, so we use a partial mock instead.
packageManager = spy(realContext.getPackageManager());
diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
index c544f5c..81c9871 100644
--- a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
@@ -2046,7 +2046,7 @@
private static NetworkStateSnapshot buildWifi() {
WifiInfo mockWifiInfo = mock(WifiInfo.class);
when(mockWifiInfo.makeCopy(anyLong())).thenReturn(mockWifiInfo);
- when(mockWifiInfo.getCurrentNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY);
+ when(mockWifiInfo.getNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY);
final LinkProperties prop = new LinkProperties();
prop.setInterfaceName(TEST_IFACE);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index 408d2c5..99edecf 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -16,6 +16,7 @@
package com.android.server.pm;
import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertBundlesEqual;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertEmpty;
import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertExpectException;
import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith;
import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list;
@@ -257,6 +258,10 @@
.setLongLived(true)
.setExtras(pb)
.setStartingTheme(android.R.style.Theme_Black_NoTitleBar_Fullscreen)
+ .addCapabilityBinding("action.intent.START_EXERCISE",
+ "exercise.type", list("running", "jogging"))
+ .addCapabilityBinding("action.intent.START_EXERCISE",
+ "exercise.duration", list("10m"))
.build();
si.addFlags(ShortcutInfo.FLAG_PINNED);
si.setBitmapPath("abc");
@@ -294,6 +299,13 @@
assertEquals(null, si.getDisabledMessageResName());
assertEquals("android:style/Theme.Black.NoTitleBar.Fullscreen",
si.getStartingThemeResName());
+ assertTrue(si.hasCapability("action.intent.START_EXERCISE"));
+ assertFalse(si.hasCapability(""));
+ assertFalse(si.hasCapability("random"));
+ assertEquals(list("running", "jogging"), si.getCapabilityParameterValues(
+ "action.intent.START_EXERCISE", "exercise.type"));
+ assertEmpty(si.getCapabilityParameterValues("action.intent.START_EXERCISE", ""));
+ assertEmpty(si.getCapabilityParameterValues("action.intent.START_EXERCISE", "random"));
}
public void testShortcutInfoParcel_resId() {
@@ -947,6 +959,10 @@
.setRank(123)
.setExtras(pb)
.setLocusId(new LocusId("1.2.3.4.5"))
+ .addCapabilityBinding("action.intent.START_EXERCISE",
+ "exercise.type", list("running", "jogging"))
+ .addCapabilityBinding("action.intent.START_EXERCISE",
+ "exercise.duration", list("10m"))
.build();
sorig.setTimestamp(mInjectedCurrentTimeMillis);
@@ -1008,6 +1024,14 @@
assertNull(si.getIconUri());
assertTrue(si.getLastChangedTimestamp() < now);
+ assertTrue(si.hasCapability("action.intent.START_EXERCISE"));
+ assertFalse(si.hasCapability(""));
+ assertFalse(si.hasCapability("random"));
+ assertEquals(list("running", "jogging"), si.getCapabilityParameterValues(
+ "action.intent.START_EXERCISE", "exercise.type"));
+ assertEmpty(si.getCapabilityParameterValues("action.intent.START_EXERCISE", ""));
+ assertEmpty(si.getCapabilityParameterValues("action.intent.START_EXERCISE", "random"));
+
// Make sure ranks are saved too. Because of the auto-adjusting, we need two shortcuts
// to test it.
si = mService.getPackageShortcutForTest(CALLING_PACKAGE_1, "id2", USER_10);
diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index 429445f..7e5fe04 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -664,6 +664,24 @@
}
}
+ // Make sure createProfile would fail if we have DISALLOW_ADD_CLONE_PROFILE.
+ @MediumTest
+ @Test
+ public void testCreateUser_disallowAddClonedUserProfile() throws Exception {
+ final int primaryUserId = ActivityManager.getCurrentUser();
+ final UserHandle primaryUserHandle = asHandle(primaryUserId);
+ mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE,
+ true, primaryUserHandle);
+ try {
+ UserInfo cloneProfileUserInfo = createProfileForUser("Clone",
+ UserManager.USER_TYPE_PROFILE_CLONE, primaryUserId);
+ assertThat(cloneProfileUserInfo).isNull();
+ } finally {
+ mUserManager.setUserRestriction(UserManager.DISALLOW_ADD_CLONE_PROFILE, false,
+ primaryUserHandle);
+ }
+ }
+
// Make sure createProfile would fail if we have DISALLOW_ADD_MANAGED_PROFILE.
@MediumTest
@Test
diff --git a/services/tests/servicestests/src/com/android/server/statusbar/StatusBarManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/statusbar/StatusBarManagerServiceTest.java
index d164d2a..0e98b5e 100644
--- a/services/tests/servicestests/src/com/android/server/statusbar/StatusBarManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/statusbar/StatusBarManagerServiceTest.java
@@ -29,6 +29,7 @@
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -38,6 +39,7 @@
import android.app.StatusBarManager;
import android.content.ComponentName;
import android.content.Intent;
+import android.content.om.IOverlayManager;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal;
@@ -96,6 +98,10 @@
private ApplicationInfo mApplicationInfo;
@Mock
private IStatusBar.Stub mMockStatusBar;
+ @Mock
+ private IOverlayManager mOverlayManager;
+ @Mock
+ private PackageManager mPackageManager;
@Captor
private ArgumentCaptor<IAddTileResultCallback> mAddTileResultCallbackCaptor;
@@ -130,6 +136,7 @@
mStatusBarManagerService);
mStatusBarManagerService.registerStatusBar(mMockStatusBar);
+ mStatusBarManagerService.registerOverlayManager(mOverlayManager);
mIcon = Icon.createWithResource(mContext, android.R.drawable.btn_plus);
}
@@ -577,27 +584,56 @@
}
@Test
- public void testSetNavBarModeOverride_setsOverrideModeKids() {
+ public void testSetNavBarModeOverride_setsOverrideModeKids() throws RemoteException {
int navBarModeOverrideKids = StatusBarManager.NAV_BAR_MODE_OVERRIDE_KIDS;
+
mStatusBarManagerService.setNavBarModeOverride(navBarModeOverrideKids);
assertEquals(navBarModeOverrideKids, mStatusBarManagerService.getNavBarModeOverride());
+ verify(mOverlayManager).setEnabledExclusiveInCategory(anyString(), anyInt());
}
@Test
- public void testSetNavBarModeOverride_setsOverrideModeNone() {
+ public void testSetNavBarModeOverride_setsOverrideModeNone() throws RemoteException {
int navBarModeOverrideNone = StatusBarManager.NAV_BAR_MODE_OVERRIDE_NONE;
+
mStatusBarManagerService.setNavBarModeOverride(navBarModeOverrideNone);
assertEquals(navBarModeOverrideNone, mStatusBarManagerService.getNavBarModeOverride());
+ verify(mOverlayManager, never()).setEnabledExclusiveInCategory(anyString(), anyInt());
}
@Test
- public void testSetNavBarModeOverride_invalidInputThrowsError() {
+ public void testSetNavBarModeOverride_invalidInputThrowsError() throws RemoteException {
int navBarModeOverrideInvalid = -1;
assertThrows(UnsupportedOperationException.class,
() -> mStatusBarManagerService.setNavBarModeOverride(navBarModeOverrideInvalid));
+ verify(mOverlayManager, never()).setEnabledExclusiveInCategory(anyString(), anyInt());
+ }
+
+ @Test
+ public void testSetNavBarModeOverride_noOverlayManagerDoesNotEnable() throws RemoteException {
+ mOverlayManager = null;
+ int navBarModeOverrideKids = StatusBarManager.NAV_BAR_MODE_OVERRIDE_KIDS;
+
+ mStatusBarManagerService.setNavBarModeOverride(navBarModeOverrideKids);
+
+ assertEquals(navBarModeOverrideKids, mStatusBarManagerService.getNavBarModeOverride());
+ verify(mOverlayManager, never()).setEnabledExclusiveInCategory(anyString(), anyInt());
+ }
+
+ @Test
+ public void testSetNavBarModeOverride_noPackageDoesNotEnable() throws Exception {
+ mContext.setMockPackageManager(mPackageManager);
+ when(mPackageManager.getPackageInfo(anyString(),
+ any(PackageManager.PackageInfoFlags.class))).thenReturn(null);
+ int navBarModeOverrideKids = StatusBarManager.NAV_BAR_MODE_OVERRIDE_KIDS;
+
+ mStatusBarManagerService.setNavBarModeOverride(navBarModeOverrideKids);
+
+ assertEquals(navBarModeOverrideKids, mStatusBarManagerService.getNavBarModeOverride());
+ verify(mOverlayManager, never()).setEnabledExclusiveInCategory(anyString(), anyInt());
}
private void mockUidCheck() {
diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java
index 2c22419..5d4ffbb 100644
--- a/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java
+++ b/services/tests/servicestests/src/com/android/server/vibrator/VibrationSettingsTest.java
@@ -319,6 +319,34 @@
}
}
+
+ @Test
+ public void shouldIgnoreVibration_vibrateOnDisabled_ignoresUsagesNotAccessibility() {
+ setUserSetting(Settings.System.VIBRATE_ON, 0);
+
+ for (int usage : ALL_USAGES) {
+ if (usage == USAGE_ACCESSIBILITY) {
+ assertVibrationNotIgnoredForUsage(usage);
+ } else {
+ assertVibrationIgnoredForUsage(usage, Vibration.Status.IGNORED_FOR_SETTINGS);
+ }
+ assertVibrationNotIgnoredForUsageAndFlags(usage,
+ VibrationAttributes.FLAG_BYPASS_USER_VIBRATION_INTENSITY_OFF);
+ }
+ }
+
+ @Test
+ public void shouldIgnoreVibration_vibrateOnEnabledOrUnset_allowsAnyUsage() {
+ deleteUserSetting(Settings.System.VIBRATE_ON);
+ for (int usage : ALL_USAGES) {
+ assertVibrationNotIgnoredForUsage(usage);
+ }
+
+ setUserSetting(Settings.System.VIBRATE_ON, 1);
+ for (int usage : ALL_USAGES) {
+ assertVibrationNotIgnoredForUsage(usage);
+ }
+ }
@Test
public void shouldIgnoreVibration_withRingSettingsOff_disableRingtoneVibrations() {
setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 0);
@@ -560,10 +588,17 @@
when(mVibrationConfigMock.getDefaultVibrationIntensity(eq(usage))).thenReturn(intensity);
}
+ private void deleteUserSetting(String settingName) {
+ Settings.System.putStringForUser(
+ mContextSpy.getContentResolver(), settingName, null, UserHandle.USER_CURRENT);
+ // FakeSettingsProvider doesn't support testing triggering ContentObserver yet.
+ mVibrationSettings.updateSettings();
+ }
+
private void setUserSetting(String settingName, int value) {
Settings.System.putIntForUser(
mContextSpy.getContentResolver(), settingName, value, UserHandle.USER_CURRENT);
- // FakeSettingsProvider don't support testing triggering ContentObserver yet.
+ // FakeSettingsProvider doesn't support testing triggering ContentObserver yet.
mVibrationSettings.updateSettings();
}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java
index a834e2b6..12cd834 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java
@@ -394,7 +394,7 @@
"disabledMessage", 0, "disabledMessageResName",
null, null, 0, null, 0, 0,
0, "iconResName", "bitmapPath", null, 0,
- null, null, null);
+ null, null, null, null);
return si;
}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
index b48c9c3..736fbd9 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
@@ -46,6 +46,7 @@
import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.UID_FIELD_NUMBER;
import static com.android.server.notification.PreferencesHelper.DEFAULT_BUBBLE_PREFERENCE;
import static com.android.server.notification.PreferencesHelper.NOTIFICATION_CHANNEL_COUNT_LIMIT;
+import static com.android.server.notification.PreferencesHelper.NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT;
import static com.android.server.notification.PreferencesHelper.UNKNOWN_UID;
import static com.google.common.truth.Truth.assertThat;
@@ -4250,6 +4251,52 @@
}
@Test
+ public void testTooManyGroups() {
+ for (int i = 0; i < NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT; i++) {
+ NotificationChannelGroup group = new NotificationChannelGroup(String.valueOf(i),
+ String.valueOf(i));
+ mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);
+ }
+ try {
+ NotificationChannelGroup group = new NotificationChannelGroup(
+ String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT),
+ String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT));
+ mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);
+ fail("Allowed to create too many notification channel groups");
+ } catch (IllegalStateException e) {
+ // great
+ }
+ }
+
+ @Test
+ public void testTooManyGroups_xml() throws Exception {
+ String extraGroup = "EXTRA";
+ String extraGroup1 = "EXTRA1";
+
+ // create first... many... directly so we don't need a big xml blob in this test
+ for (int i = 0; i < NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT; i++) {
+ NotificationChannelGroup group = new NotificationChannelGroup(String.valueOf(i),
+ String.valueOf(i));
+ mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);
+ }
+
+ final String xml = "<ranking version=\"1\">\n"
+ + "<package name=\"" + PKG_O + "\" uid=\"" + UID_O + "\" >\n"
+ + "<channelGroup id=\"" + extraGroup + "\" name=\"hi\"/>"
+ + "<channelGroup id=\"" + extraGroup1 + "\" name=\"hi2\"/>"
+ + "</package>"
+ + "</ranking>";
+ TypedXmlPullParser parser = Xml.newFastPullParser();
+ parser.setInput(new BufferedInputStream(new ByteArrayInputStream(xml.getBytes())),
+ null);
+ parser.nextTag();
+ mHelper.readXml(parser, false, UserHandle.USER_ALL);
+
+ assertNull(mHelper.getNotificationChannelGroup(extraGroup, PKG_O, UID_O));
+ assertNull(mHelper.getNotificationChannelGroup(extraGroup1, PKG_O, UID_O));
+ }
+
+ @Test
public void testRestoreMultiUser() throws Exception {
String pkg = "restore_pkg";
String channelId = "channelId";
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index 0dcf799..774e5b9 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -24,7 +24,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT;
import static android.content.pm.ActivityInfo.FLAG_SUPPORTS_PICTURE_IN_PICTURE;
@@ -571,7 +570,7 @@
final ActivityRecord activity = createActivityWith2LevelTask();
final Task task = activity.getTask();
final Task rootTask = activity.getRootTask();
- rootTask.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
+ rootTask.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
final Rect stableRect = new Rect();
rootTask.mDisplayContent.getStableRect(stableRect);
@@ -616,7 +615,7 @@
spyOn(tda);
doReturn(true).when(tda).supportsNonResizableMultiWindow();
final Task rootTask = mDisplayContent.getDefaultTaskDisplayArea().createRootTask(
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */);
+ WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, true /* onTop */);
rootTask.setBounds(0, 0, 1000, 500);
final ActivityRecord activity = new ActivityBuilder(mAtm)
.setParentTask(rootTask)
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
index a2b04c2..7c340ec 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
@@ -77,6 +77,7 @@
import org.mockito.MockitoSession;
import java.util.ArrayList;
+import java.util.List;
import java.util.function.Consumer;
/**
@@ -188,6 +189,9 @@
@Override
public void onFixedRotationFinished(int displayId) {}
+
+ @Override
+ public void onKeepClearAreasChanged(int displayId, List<Rect> keepClearAreas) {}
};
int[] displayIds = mAtm.mWindowManager.registerDisplayWindowListener(listener);
for (int i = 0; i < displayIds.length; i++) {
diff --git a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
new file mode 100644
index 0000000..687779d
--- /dev/null
+++ b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2021 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.wm;
+
+import static android.window.BackNavigationInfo.typeToString;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.annotation.NonNull;
+import android.hardware.HardwareBuffer;
+import android.platform.test.annotations.Presubmit;
+import android.window.BackNavigationInfo;
+import android.window.TaskSnapshot;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@Presubmit
+@RunWith(WindowTestRunner.class)
+public class BackNavigationControllerTests extends WindowTestsBase {
+
+ private BackNavigationController mBackNavigationController;
+
+ @Before
+ public void setUp() throws Exception {
+ mBackNavigationController = new BackNavigationController();
+ }
+
+ @Test
+ public void backTypeHomeWhenBackToLauncher() {
+ Task task = createTopTaskWithActivity();
+ BackNavigationInfo backNavigationInfo =
+ mBackNavigationController.startBackNavigation(task, new StubTransaction());
+ assertThat(backNavigationInfo).isNotNull();
+ assertThat(typeToString(backNavigationInfo.getType()))
+ .isEqualTo(typeToString(BackNavigationInfo.TYPE_RETURN_TO_HOME));
+ }
+
+ @Test
+ public void backTypeCrossTaskWhenBackToPreviousTask() {
+ Task taskA = createTask(mDefaultDisplay);
+ createActivityRecord(taskA);
+ Task task = createTopTaskWithActivity();
+ BackNavigationInfo backNavigationInfo =
+ mBackNavigationController.startBackNavigation(task, new StubTransaction());
+ assertThat(backNavigationInfo).isNotNull();
+ assertThat(typeToString(backNavigationInfo.getType()))
+ .isEqualTo(typeToString(BackNavigationInfo.TYPE_CROSS_TASK));
+ }
+
+ @Test
+ public void backTypeCrossActivityWhenBackToPreviousActivity() {
+ Task task = createTopTaskWithActivity();
+ mAtm.setFocusedTask(task.mTaskId, createActivityRecord(task));
+ BackNavigationInfo backNavigationInfo =
+ mBackNavigationController.startBackNavigation(task, new StubTransaction());
+ assertThat(backNavigationInfo).isNotNull();
+ assertThat(typeToString(backNavigationInfo.getType()))
+ .isEqualTo(typeToString(BackNavigationInfo.TYPE_CROSS_ACTIVITY));
+ }
+
+ /**
+ * Checks that we are able to fill all the field of the {@link BackNavigationInfo} object.
+ */
+ @Test
+ public void backNavInfoFullyPopulated() {
+ Task task = createTopTaskWithActivity();
+ createActivityRecord(task);
+
+ // We need a mock screenshot so
+ TaskSnapshotController taskSnapshotController = createMockTaskSnapshotController();
+
+ mBackNavigationController.setTaskSnapshotController(taskSnapshotController);
+
+ BackNavigationInfo backNavigationInfo =
+ mBackNavigationController.startBackNavigation(task, new StubTransaction());
+ assertThat(backNavigationInfo).isNotNull();
+ assertThat(backNavigationInfo.getDepartingWindowContainer()).isNotNull();
+ assertThat(backNavigationInfo.getScreenshotSurface()).isNotNull();
+ assertThat(backNavigationInfo.getScreenshotHardwareBuffer()).isNotNull();
+ assertThat(backNavigationInfo.getTaskWindowConfiguration()).isNotNull();
+ }
+
+ @NonNull
+ private TaskSnapshotController createMockTaskSnapshotController() {
+ TaskSnapshotController taskSnapshotController = mock(TaskSnapshotController.class);
+ TaskSnapshot taskSnapshot = mock(TaskSnapshot.class);
+ when(taskSnapshot.getHardwareBuffer()).thenReturn(mock(HardwareBuffer.class));
+ when(taskSnapshotController.getSnapshot(anyInt(), anyInt(), anyBoolean(), anyBoolean()))
+ .thenReturn(taskSnapshot);
+ return taskSnapshotController;
+ }
+
+ @NonNull
+ private Task createTopTaskWithActivity() {
+ Task task = createTask(mDefaultDisplay);
+ ActivityRecord record = createActivityRecord(task);
+ when(record.mSurfaceControl.isValid()).thenReturn(true);
+ mAtm.setFocusedTask(task.mTaskId, record);
+ return task;
+ }
+}
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
index 2f78b58..8d58ec0 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
@@ -119,6 +119,7 @@
import android.os.RemoteException;
import android.os.SystemClock;
import android.platform.test.annotations.Presubmit;
+import android.util.ArraySet;
import android.util.DisplayMetrics;
import android.view.DisplayCutout;
import android.view.DisplayInfo;
@@ -1101,7 +1102,7 @@
final DisplayContent dc = createNewDisplay();
dc.setImeLayeringTarget(createWindow(null, TYPE_STATUS_BAR, "app"));
dc.getImeTarget(IME_TARGET_LAYERING).getWindow().setWindowingMode(
- WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
+ WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);
assertEquals(dc.getImeContainer().getParentSurfaceControl(), dc.computeImeParent());
}
@@ -1152,7 +1153,7 @@
final DisplayContent dc = createNewDisplay();
dc.setImeInputTarget(createWindow(null, TYPE_BASE_APPLICATION, "app"));
dc.getImeTarget(IME_TARGET_INPUT).getWindow().setWindowingMode(
- WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
+ WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);
dc.setImeLayeringTarget(dc.getImeTarget(IME_TARGET_INPUT).getWindow());
dc.setRemoteInsetsController(createDisplayWindowInsetsController());
assertNotEquals(dc.getImeTarget(IME_TARGET_INPUT).getWindow(),
@@ -1982,6 +1983,7 @@
// Test step 1: appWin1 is the current IME target and soft-keyboard is visible.
mDisplayContent.computeImeTarget(true);
assertEquals(appWin1, mDisplayContent.getImeTarget(IME_TARGET_LAYERING));
+ mDisplayContent.setImeInputTarget(appWin1);
spyOn(mDisplayContent.mInputMethodWindow);
doReturn(true).when(mDisplayContent.mInputMethodWindow).isVisible();
mDisplayContent.getInsetsStateController().getImeSourceProvider().setImeShowing(true);
@@ -1998,7 +2000,6 @@
// be shown at this time.
final Transaction t = mDisplayContent.getPendingTransaction();
spyOn(t);
- mDisplayContent.setImeInputTarget(appWin2);
mDisplayContent.computeImeTarget(true);
assertEquals(appWin2, mDisplayContent.getImeTarget(IME_TARGET_LAYERING));
assertTrue(mDisplayContent.shouldImeAttachedToApp());
@@ -2436,6 +2437,31 @@
mockSession.finishMocking();
}
+ @Test
+ public void testKeepClearAreasMultipleWindows() {
+ final WindowState w1 = createWindow(null, TYPE_NAVIGATION_BAR, mDisplayContent, "w1");
+ final Rect rect1 = new Rect(0, 0, 10, 10);
+ w1.setKeepClearAreas(Arrays.asList(rect1));
+ final WindowState w2 = createWindow(null, TYPE_NOTIFICATION_SHADE, mDisplayContent, "w2");
+ final Rect rect2 = new Rect(10, 10, 20, 20);
+ w2.setKeepClearAreas(Arrays.asList(rect2));
+
+ // No keep clear areas on display, because the windows are not visible
+ assertEquals(Arrays.asList(), mDisplayContent.getKeepClearAreas());
+
+ makeWindowVisible(w1);
+
+ // The returned keep-clear areas contain the areas just from the visible window
+ assertEquals(new ArraySet(Arrays.asList(rect1)),
+ new ArraySet(mDisplayContent.getKeepClearAreas()));
+
+ makeWindowVisible(w1, w2);
+
+ // The returned keep-clear areas contain the areas from all visible windows
+ assertEquals(new ArraySet(Arrays.asList(rect1, rect2)),
+ new ArraySet(mDisplayContent.getKeepClearAreas()));
+ }
+
private class TestToken extends Binder {
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
index acf6dc5..497ae1d 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
@@ -31,10 +31,8 @@
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
-import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
@@ -44,7 +42,6 @@
import android.graphics.Rect;
import android.platform.test.annotations.Presubmit;
import android.util.Pair;
-import android.view.DisplayCutout;
import android.view.DisplayInfo;
import android.view.InsetsState;
import android.view.PrivacyIndicatorBounds;
@@ -210,24 +207,6 @@
expectThrows(IllegalArgumentException.class, () -> addWindow(win2));
}
- @Test
- public void layoutHint_appWindow() {
- mWindow.mAttrs.setFitInsetsTypes(0);
-
- final DisplayCutout.ParcelableWrapper outDisplayCutout =
- new DisplayCutout.ParcelableWrapper();
- final InsetsState outState = new InsetsState();
-
- mDisplayPolicy.getLayoutHint(mWindow.mAttrs, null /* windowToken */, outState,
- true /* localClient */);
-
- assertThat(outDisplayCutout, is(new DisplayCutout.ParcelableWrapper()));
- assertThat(outState.getSource(ITYPE_STATUS_BAR).getFrame(),
- is(new Rect(0, 0, DISPLAY_WIDTH, STATUS_BAR_HEIGHT)));
- assertThat(outState.getSource(ITYPE_NAVIGATION_BAR).getFrame(),
- is(new Rect(0, DISPLAY_HEIGHT - NAV_BAR_HEIGHT, DISPLAY_WIDTH, DISPLAY_HEIGHT)));
- }
-
/**
* Verify that {@link DisplayPolicy#simulateLayoutDisplay} outputs the same display frames as
* the real one.
diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
index 94bc7f2..2eece4c 100644
--- a/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/InsetsStateControllerTest.java
@@ -19,7 +19,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.view.InsetsState.ITYPE_CLIMATE_BAR;
import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;
import static android.view.InsetsState.ITYPE_IME;
@@ -246,7 +245,7 @@
final WindowState child = createWindow(app, TYPE_APPLICATION, "child");
app.mAboveInsetsState.addSource(getController().getRawInsetsState().peekSource(ITYPE_IME));
child.mAttrs.flags |= FLAG_NOT_FOCUSABLE;
- child.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
+ child.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
mDisplayContent.computeImeTarget(true);
mDisplayContent.setLayoutNeeded();
diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java
index fc298b0..0c2de5c 100644
--- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java
@@ -20,7 +20,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.view.Display.INVALID_DISPLAY;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.any;
@@ -334,7 +333,7 @@
params.mWindowingMode = windowingMode;
final InstrumentedPositioner positioner = new InstrumentedPositioner(RESULT_DONE, params);
final Task task = new TaskBuilder(mAtm.mTaskSupervisor).setCreateParentTask(true).build();
- task.getRootTask().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
+ task.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
mController.registerModifier(positioner);
diff --git a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java
index 3cb0bed..65b5cf5 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RootTaskTests.java
@@ -88,6 +88,7 @@
import androidx.test.filters.SmallTest;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -529,6 +530,7 @@
// TODO(b/199236198): check this is unnecessary or need to migrate after remove legacy split.
@Test
+ @Ignore
public void testShouldBeVisible_SplitScreen() {
// task not supporting split should be fullscreen for this test.
final Task notSupportingSplitTask = createTaskForShouldBeVisibleTest(
diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java
index 4069f0f..f4abf88 100644
--- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java
@@ -21,8 +21,8 @@
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.Display.TYPE_VIRTUAL;
@@ -458,7 +458,7 @@
final TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer
.getDefaultTaskDisplayArea();
final Task task = defaultTaskDisplayArea.createRootTask(
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, true /* onTop */);
+ WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, true /* onTop */);
final ActivityRecord activity = new ActivityBuilder(mAtm).setTask(task).build();
// Created tasks are focusable by default.
diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
index c722b0a..b815c38 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
@@ -77,6 +77,7 @@
import android.content.pm.ActivityInfo.ScreenOrientation;
import android.content.res.Configuration;
import android.graphics.Rect;
+import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
import android.provider.DeviceConfig;
import android.provider.DeviceConfig.Properties;
@@ -2182,6 +2183,29 @@
.computeAspectRatio(sizeCompatAppBounds), delta);
}
+ @Test
+ public void testClearSizeCompat_resetOverrideConfig() {
+ final int origDensity = 480;
+ final int newDensity = 520;
+ final DisplayContent display = new TestDisplayContent.Builder(mAtm, 600, 800)
+ .setDensityDpi(origDensity)
+ .build();
+ setUpApp(display);
+ prepareUnresizable(mActivity, -1.f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT);
+
+ // Activity should enter size compat with old density after display density change.
+ display.setForcedDensity(newDensity, UserHandle.USER_CURRENT);
+
+ assertScaled();
+ assertEquals(origDensity, mActivity.getConfiguration().densityDpi);
+
+ // Activity should exit size compat with new density.
+ mActivity.clearSizeCompatMode();
+
+ assertFitted();
+ assertEquals(newDensity, mActivity.getConfiguration().densityDpi);
+ }
+
private void assertHorizontalPositionForDifferentDisplayConfigsForLandscapeActivity(
float letterboxHorizontalPositionMultiplier) {
// Set up a display in landscape and ignoring orientation request.
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java
index cdf6b59..80f6bce 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskDisplayAreaTests.java
@@ -25,8 +25,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
@@ -355,14 +353,10 @@
true /* reuseCandidate */);
assertGetOrCreateRootTask(WINDOWING_MODE_UNDEFINED, type, candidateTask,
true /* reuseCandidate */);
- assertGetOrCreateRootTask(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, type, candidateTask,
- true /* reuseCandidate */);
assertGetOrCreateRootTask(WINDOWING_MODE_FREEFORM, type, candidateTask,
true /* reuseCandidate */);
assertGetOrCreateRootTask(WINDOWING_MODE_MULTI_WINDOW, type, candidateTask,
true /* reuseCandidate */);
- assertGetOrCreateRootTask(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, type, candidateTask,
- false /* reuseCandidate */);
assertGetOrCreateRootTask(WINDOWING_MODE_PINNED, type, candidateTask,
true /* reuseCandidate */);
@@ -388,7 +382,7 @@
final Task primarySplitTask = new TaskBuilder(mSupervisor)
.setTaskDisplayArea(defaultTaskDisplayArea)
- .setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)
+ .setWindowingMode(WINDOWING_MODE_MULTI_WINDOW)
.setActivityType(ACTIVITY_TYPE_STANDARD)
.setOnTop(true)
.setCreateActivity(true)
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java
index f138475..64959f2 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTraversalTests.java
@@ -17,8 +17,7 @@
package com.android.server.wm;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;
@@ -50,11 +49,8 @@
@Test
public void testDockedDividerPosition() {
final WindowState splitScreenWindow = createWindow(null,
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION,
+ WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION,
mDisplayContent, "splitScreenWindow");
- final WindowState splitScreenSecondaryWindow = createWindow(null,
- WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_STANDARD,
- TYPE_BASE_APPLICATION, mDisplayContent, "splitScreenSecondaryWindow");
mDisplayContent.setImeLayeringTarget(splitScreenWindow);
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
index 75a87ba..4d5fb6d 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowOrganizerTests.java
@@ -24,8 +24,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
@@ -520,16 +518,16 @@
DisplayContent dc = mWm.mRoot.getDisplayContent(Display.DEFAULT_DISPLAY);
Task task1 = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- dc, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, null);
+ dc, WINDOWING_MODE_FULLSCREEN, null);
RunningTaskInfo info1 = task1.getTaskInfo();
- assertEquals(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,
+ assertEquals(WINDOWING_MODE_FULLSCREEN,
info1.configuration.windowConfiguration.getWindowingMode());
assertEquals(ACTIVITY_TYPE_UNDEFINED, info1.topActivityType);
Task task2 = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- dc, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, null);
+ dc, WINDOWING_MODE_MULTI_WINDOW, null);
RunningTaskInfo info2 = task2.getTaskInfo();
- assertEquals(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY,
+ assertEquals(WINDOWING_MODE_MULTI_WINDOW,
info2.configuration.windowConfiguration.getWindowingMode());
assertEquals(ACTIVITY_TYPE_UNDEFINED, info2.topActivityType);
@@ -539,7 +537,7 @@
assertTrue(mWm.mAtmService.mTaskOrganizerController.deleteRootTask(info1.token));
infos = getTasksCreatedByOrganizer(dc);
assertEquals(1, infos.size());
- assertEquals(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, infos.get(0).getWindowingMode());
+ assertEquals(WINDOWING_MODE_MULTI_WINDOW, infos.get(0).getWindowingMode());
}
@Test
@@ -577,7 +575,7 @@
final StubOrganizer listener = new StubOrganizer();
mWm.mAtmService.mTaskOrganizerController.registerTaskOrganizer(listener);
Task task = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
RunningTaskInfo info1 = task.getTaskInfo();
final Task rootTask = createTask(
@@ -626,7 +624,7 @@
};
mWm.mAtmService.mTaskOrganizerController.registerTaskOrganizer(listener);
Task task = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
RunningTaskInfo info1 = task.getTaskInfo();
// Ensure events dispatch to organizer.
mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
@@ -684,10 +682,10 @@
mWm.mAtmService.mTaskOrganizerController.registerTaskOrganizer(listener);
Task task1 = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
RunningTaskInfo info1 = task1.getTaskInfo();
Task task2 = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
RunningTaskInfo info2 = task2.getTaskInfo();
// Ensure events dispatch to organizer.
mWm.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
@@ -1056,7 +1054,7 @@
public void testReparentToOrganizedTask() {
final ITaskOrganizer organizer = registerMockOrganizer();
Task rootTask = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
final Task task1 = createRootTask();
final Task task2 = createTask(rootTask, false /* fakeDraw */);
WindowContainerTransaction wct = new WindowContainerTransaction();
@@ -1223,7 +1221,7 @@
final Task rootTask = activity.getRootTask();
rootTask.setResizeMode(activity.info.resizeMode);
final Task splitPrimaryRootTask = mWm.mAtmService.mTaskOrganizerController.createRootTask(
- mDisplayContent, WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, null);
+ mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, null);
final WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reparent(rootTask.mRemoteToken.toWindowContainerToken(),
splitPrimaryRootTask.mRemoteToken.toWindowContainerToken(), true /* onTop */);
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index ec8ec2b..80192f7 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -20,7 +20,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.view.InsetsState.ITYPE_IME;
import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;
import static android.view.InsetsState.ITYPE_STATUS_BAR;
@@ -83,6 +82,7 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
+import android.util.ArraySet;
import android.view.Gravity;
import android.view.InputWindowHandle;
import android.view.InsetsSource;
@@ -265,22 +265,19 @@
assertFalse(appWindow.canBeImeTarget());
assertFalse(imeWindow.canBeImeTarget());
- // Simulate the window is in split screen primary root task and the current state is
- // minimized and home root task is resizable, so that we should ignore input for the
- // root task.
+ // Simulate the window is in split screen root task.
final DockedTaskDividerController controller =
mDisplayContent.getDockedDividerController();
final Task rootTask = createTask(mDisplayContent,
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD);
+ WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD);
spyOn(appWindow);
spyOn(controller);
spyOn(rootTask);
rootTask.setFocusable(false);
doReturn(rootTask).when(appWindow).getRootTask();
- // Make sure canBeImeTarget is false due to shouldIgnoreInput is true;
+ // Make sure canBeImeTarget is false;
assertFalse(appWindow.canBeImeTarget());
- assertTrue(rootTask.shouldIgnoreInput());
}
@Test
@@ -727,8 +724,9 @@
@Test
public void testCantReceiveTouchWhenNotFocusable() {
final WindowState win0 = createWindow(null, TYPE_APPLICATION, "win0");
- win0.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
- win0.mActivityRecord.getRootTask().setFocusable(false);
+ final Task rootTask = win0.mActivityRecord.getRootTask();
+ spyOn(rootTask);
+ when(rootTask.shouldIgnoreInput()).thenReturn(true);
assertFalse(win0.canReceiveTouchInput());
}
@@ -928,8 +926,8 @@
mDisplayContent.setImeLayeringTarget(mAppWindow);
// Simulate entering multi-window mode and verify if the IME control target is remote.
- app.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
- assertEquals(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, app.getWindowingMode());
+ app.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
+ assertEquals(WINDOWING_MODE_MULTI_WINDOW, app.getWindowingMode());
assertEquals(mDisplayContent.mRemoteInsetsControlTarget,
mDisplayContent.computeImeControlTarget());
@@ -944,14 +942,13 @@
@UseTestDisplay(addWindows = { W_ACTIVITY, W_INPUT_METHOD, W_NOTIFICATION_SHADE })
@Test
- public void testNotificationShadeHasImeInsetsWhenSplitscreenActivated() {
+ public void testNotificationShadeHasImeInsetsWhenMultiWindow() {
WindowState app = createWindow(null, TYPE_BASE_APPLICATION,
mAppWindow.mToken, "app");
- // Simulate entering multi-window mode and verify if the split-screen is activated.
- app.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
- assertEquals(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, app.getWindowingMode());
- assertTrue(mDisplayContent.getDefaultTaskDisplayArea().isSplitScreenModeActivated());
+ // Simulate entering multi-window mode and windowing mode is multi-window.
+ app.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);
+ assertEquals(WINDOWING_MODE_MULTI_WINDOW, app.getWindowingMode());
// Simulate notificationShade is shown and being IME layering target.
mNotificationShadeWindow.setHasSurface(true);
@@ -965,7 +962,7 @@
mDisplayContent.getInsetsStateController().getRawInsetsState()
.setSourceVisible(ITYPE_IME, true);
- // Verify notificationShade can still get IME insets even the split-screen is activated.
+ // Verify notificationShade can still get IME insets even windowing mode is multi-window.
InsetsState state = mDisplayContent.getInsetsStateController().getInsetsForWindow(
mNotificationShadeWindow);
assertNotNull(state.peekSource(ITYPE_IME));
@@ -986,4 +983,40 @@
assertFalse(app.isVisible());
assertTrue(app.isVisibleRequested());
}
+
+ @Test
+ public void testKeepClearAreas() {
+ final WindowState window = createWindow(null, TYPE_APPLICATION, "window");
+ makeWindowVisible(window);
+
+ final Rect keepClearArea1 = new Rect(0, 0, 10, 10);
+ final Rect keepClearArea2 = new Rect(5, 10, 15, 20);
+ final List<Rect> keepClearAreas = Arrays.asList(keepClearArea1, keepClearArea2);
+ window.setKeepClearAreas(keepClearAreas);
+
+ // Test that the keep-clear rects are stored and returned
+ assertEquals(new ArraySet(keepClearAreas), new ArraySet(window.getKeepClearAreas()));
+
+ // Test that keep-clear rects are overwritten
+ window.setKeepClearAreas(Arrays.asList());
+ assertEquals(0, window.getKeepClearAreas().size());
+
+ // Move the window position
+ final SurfaceControl.Transaction t = spy(StubTransaction.class);
+ window.mSurfaceControl = mock(SurfaceControl.class);
+ final Rect frame = window.getFrame();
+ frame.set(10, 20, 60, 80);
+ window.updateSurfacePosition(t);
+ assertEquals(new Point(frame.left, frame.top), window.mLastSurfacePosition);
+
+ // Test that the returned keep-clear rects are translated to display space
+ window.setKeepClearAreas(keepClearAreas);
+ Rect expectedArea1 = new Rect(keepClearArea1);
+ expectedArea1.offset(frame.left, frame.top);
+ Rect expectedArea2 = new Rect(keepClearArea2);
+ expectedArea2.offset(frame.left, frame.top);
+
+ assertEquals(new ArraySet(Arrays.asList(expectedArea1, expectedArea2)),
+ new ArraySet(window.getKeepClearAreas()));
+ }
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java
index 4dffe7e..0f223ca 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java
@@ -22,7 +22,6 @@
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
-import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL;
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
@@ -363,7 +362,7 @@
ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION, mDisplayContent,
"pinnedStackWindow");
final WindowState dockedStackWindow = createWindow(null,
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION,
+ WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, TYPE_BASE_APPLICATION,
mDisplayContent, "dockedStackWindow");
final WindowState assistantStackWindow = createWindow(null,
WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_ASSISTANT, TYPE_BASE_APPLICATION,
diff --git a/services/usage/java/com/android/server/usage/StorageStatsService.java b/services/usage/java/com/android/server/usage/StorageStatsService.java
index 88725a6..0d88a0d 100644
--- a/services/usage/java/com/android/server/usage/StorageStatsService.java
+++ b/services/usage/java/com/android/server/usage/StorageStatsService.java
@@ -61,6 +61,7 @@
import android.os.storage.StorageEventListener;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
+import android.provider.DeviceConfig;
import android.provider.Settings;
import android.text.TextUtils;
import android.text.format.DateUtils;
@@ -70,6 +71,7 @@
import android.util.Slog;
import android.util.SparseLongArray;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.Preconditions;
@@ -128,6 +130,12 @@
private final CopyOnWriteArrayList<Pair<String, StorageStatsAugmenter>>
mStorageStatsAugmenters = new CopyOnWriteArrayList<>();
+ @GuardedBy("mLock")
+ private int
+ mStorageThresholdPercentHigh = StorageManager.DEFAULT_STORAGE_THRESHOLD_PERCENT_HIGH;
+
+ private final Object mLock = new Object();
+
public StorageStatsService(Context context) {
mContext = Preconditions.checkNotNull(context);
mAppOps = Preconditions.checkNotNull(context.getSystemService(AppOpsManager.class));
@@ -173,6 +181,19 @@
}
}
}, prFilter);
+
+ updateConfig();
+ DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ mContext.getMainExecutor(), properties -> updateConfig());
+ }
+
+ private void updateConfig() {
+ synchronized (mLock) {
+ mStorageThresholdPercentHigh = DeviceConfig.getInt(
+ DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+ StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH_KEY,
+ StorageManager.DEFAULT_STORAGE_THRESHOLD_PERCENT_HIGH);
+ }
}
private void invalidateMounts() {
@@ -554,7 +575,7 @@
* By only triggering a re-calculation after the storage has changed sizes, we can avoid
* recalculating quotas too often. Minimum change delta high and low define the
* percentage of change we need to see before we recalculate quotas when the device has
- * enough storage space (more than StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH of total
+ * enough storage space (more than mStorageThresholdPercentHigh of total
* free) and in low storage condition respectively.
*/
private static final long MINIMUM_CHANGE_DELTA_PERCENT_HIGH = 5;
@@ -588,11 +609,15 @@
mStats.restat(Environment.getDataDirectory().getAbsolutePath());
long bytesDelta = Math.abs(mPreviousBytes - mStats.getAvailableBytes());
long bytesDeltaThreshold;
- if (mStats.getAvailableBytes() > mTotalBytes
- * StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH / 100) {
- bytesDeltaThreshold = mTotalBytes * MINIMUM_CHANGE_DELTA_PERCENT_HIGH / 100;
- } else {
- bytesDeltaThreshold = mTotalBytes * MINIMUM_CHANGE_DELTA_PERCENT_LOW / 100;
+ synchronized (mLock) {
+ if (mStats.getAvailableBytes() > mTotalBytes
+ * mStorageThresholdPercentHigh / 100) {
+ bytesDeltaThreshold = mTotalBytes
+ * MINIMUM_CHANGE_DELTA_PERCENT_HIGH / 100;
+ } else {
+ bytesDeltaThreshold = mTotalBytes
+ * MINIMUM_CHANGE_DELTA_PERCENT_LOW / 100;
+ }
}
if (bytesDelta > bytesDeltaThreshold) {
mPreviousBytes = mStats.getAvailableBytes();
diff --git a/services/usb/Android.bp b/services/usb/Android.bp
index 01feacd..3b50fa4 100644
--- a/services/usb/Android.bp
+++ b/services/usb/Android.bp
@@ -29,6 +29,7 @@
"android.hardware.usb-V1.1-java",
"android.hardware.usb-V1.2-java",
"android.hardware.usb-V1.3-java",
+ "android.hardware.usb-V1-java",
"android.hardware.usb.gadget-V1.0-java",
"android.hardware.usb.gadget-V1.1-java",
"android.hardware.usb.gadget-V1.2-java",
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaDevice.java b/services/usb/java/com/android/server/usb/UsbAlsaDevice.java
index 9d4db00..85b1de5 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaDevice.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaDevice.java
@@ -41,6 +41,7 @@
private final boolean mIsInputHeadset;
private final boolean mIsOutputHeadset;
+ private final boolean mIsDock;
private boolean mSelected = false;
private int mOutputState;
@@ -53,7 +54,7 @@
public UsbAlsaDevice(IAudioService audioService, int card, int device, String deviceAddress,
boolean hasOutput, boolean hasInput,
- boolean isInputHeadset, boolean isOutputHeadset) {
+ boolean isInputHeadset, boolean isOutputHeadset, boolean isDock) {
mAudioService = audioService;
mCardNum = card;
mDeviceNum = device;
@@ -62,31 +63,32 @@
mHasInput = hasInput;
mIsInputHeadset = isInputHeadset;
mIsOutputHeadset = isOutputHeadset;
+ mIsDock = isDock;
}
/**
- * @returns the ALSA card number associated with this peripheral.
+ * @return the ALSA card number associated with this peripheral.
*/
public int getCardNum() {
return mCardNum;
}
/**
- * @returns the ALSA device number associated with this peripheral.
+ * @return the ALSA device number associated with this peripheral.
*/
public int getDeviceNum() {
return mDeviceNum;
}
/**
- * @returns the USB device device address associated with this peripheral.
+ * @return the USB device device address associated with this peripheral.
*/
public String getDeviceAddress() {
return mDeviceAddress;
}
/**
- * @returns the ALSA card/device address string.
+ * @return the ALSA card/device address string.
*/
public String getAlsaCardDeviceString() {
if (mCardNum < 0 || mDeviceNum < 0) {
@@ -98,35 +100,42 @@
}
/**
- * @returns true if the device supports output.
+ * @return true if the device supports output.
*/
public boolean hasOutput() {
return mHasOutput;
}
/**
- * @returns true if the device supports input (recording).
+ * @return true if the device supports input (recording).
*/
public boolean hasInput() {
return mHasInput;
}
/**
- * @returns true if the device is a headset for purposes of input.
+ * @return true if the device is a headset for purposes of input.
*/
public boolean isInputHeadset() {
return mIsInputHeadset;
}
/**
- * @returns true if the device is a headset for purposes of output.
+ * @return true if the device is a headset for purposes of output.
*/
public boolean isOutputHeadset() {
return mIsOutputHeadset;
}
/**
- * @returns true if input jack is detected or jack detection is not supported.
+ * @return true if the device is a USB dock.
+ */
+ public boolean isDock() {
+ return mIsDock;
+ }
+
+ /**
+ * @return true if input jack is detected or jack detection is not supported.
*/
private synchronized boolean isInputJackConnected() {
if (mJackDetector == null) {
@@ -136,7 +145,7 @@
}
/**
- * @returns true if input jack is detected or jack detection is not supported.
+ * @return true if input jack is detected or jack detection is not supported.
*/
private synchronized boolean isOutputJackConnected() {
if (mJackDetector == null) {
@@ -190,9 +199,10 @@
try {
// Output Device
if (mHasOutput) {
- int device = mIsOutputHeadset
- ? AudioSystem.DEVICE_OUT_USB_HEADSET
- : AudioSystem.DEVICE_OUT_USB_DEVICE;
+ int device = mIsDock ? AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET
+ : (mIsOutputHeadset
+ ? AudioSystem.DEVICE_OUT_USB_HEADSET
+ : AudioSystem.DEVICE_OUT_USB_DEVICE);
if (DEBUG) {
Slog.d(TAG, "pre-call device:0x" + Integer.toHexString(device)
+ " addr:" + alsaCardDeviceString
@@ -231,7 +241,7 @@
/**
* @Override
- * @returns a string representation of the object.
+ * @return a string representation of the object.
*/
public synchronized String toString() {
return "UsbAlsaDevice: [card: " + mCardNum
@@ -273,7 +283,7 @@
/**
* @Override
- * @returns true if the objects are equivalent.
+ * @return true if the objects are equivalent.
*/
public boolean equals(Object obj) {
if (!(obj instanceof UsbAlsaDevice)) {
@@ -285,12 +295,13 @@
&& mHasOutput == other.mHasOutput
&& mHasInput == other.mHasInput
&& mIsInputHeadset == other.mIsInputHeadset
- && mIsOutputHeadset == other.mIsOutputHeadset);
+ && mIsOutputHeadset == other.mIsOutputHeadset
+ && mIsDock == other.mIsDock);
}
/**
* @Override
- * @returns a hash code generated from the object contents.
+ * @return a hash code generated from the object contents.
*/
public int hashCode() {
final int prime = 31;
@@ -301,6 +312,7 @@
result = prime * result + (mHasInput ? 0 : 1);
result = prime * result + (mIsInputHeadset ? 0 : 1);
result = prime * result + (mIsOutputHeadset ? 0 : 1);
+ result = prime * result + (mIsDock ? 0 : 1);
return result;
}
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 1c72eb8..fd9b995 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -237,6 +237,7 @@
if (hasInput || hasOutput) {
boolean isInputHeadset = parser.isInputHeadset();
boolean isOutputHeadset = parser.isOutputHeadset();
+ boolean isDock = parser.isDock();
if (mAudioService == null) {
Slog.e(TAG, "no AudioService");
@@ -246,7 +247,7 @@
UsbAlsaDevice alsaDevice =
new UsbAlsaDevice(mAudioService, cardRec.getCardNum(), 0 /*device*/,
deviceAddress, hasOutput, hasInput,
- isInputHeadset, isOutputHeadset);
+ isInputHeadset, isOutputHeadset, isDock);
if (alsaDevice != null) {
alsaDevice.setDeviceNameAndDescription(
cardRec.getCardName(), cardRec.getCardDescription());
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java
index 9ac270f..94cc826 100644
--- a/services/usb/java/com/android/server/usb/UsbHostManager.java
+++ b/services/usb/java/com/android/server/usb/UsbHostManager.java
@@ -165,7 +165,7 @@
pw.println("manfacturer:0x" + Integer.toHexString(deviceDescriptor.getVendorID())
+ " product:" + Integer.toHexString(deviceDescriptor.getProductID()));
pw.println("isHeadset[in: " + parser.isInputHeadset()
- + " , out: " + parser.isOutputHeadset() + "]");
+ + " , out: " + parser.isOutputHeadset() + "], isDock: " + parser.isDock());
} else {
pw.println(formatTime() + " Disconnect " + mDeviceAddress);
}
@@ -179,9 +179,8 @@
UsbDescriptorsTree descriptorTree = new UsbDescriptorsTree();
descriptorTree.parse(parser);
descriptorTree.report(new TextReportCanvas(parser, stringBuilder));
-
stringBuilder.append("isHeadset[in: " + parser.isInputHeadset()
- + " , out: " + parser.isOutputHeadset() + "]");
+ + " , out: " + parser.isOutputHeadset() + "], isDock: " + parser.isDock());
pw.println(stringBuilder.toString());
} else {
pw.println(formatTime() + " Disconnect " + mDeviceAddress);
@@ -198,9 +197,8 @@
descriptor.report(canvas);
}
pw.println(stringBuilder.toString());
-
pw.println("isHeadset[in: " + parser.isInputHeadset()
- + " , out: " + parser.isOutputHeadset() + "]");
+ + " , out: " + parser.isOutputHeadset() + "], isDock: " + parser.isDock());
} else {
pw.println(formatTime() + " Disconnect " + mDeviceAddress);
}
diff --git a/services/usb/java/com/android/server/usb/UsbPortManager.java b/services/usb/java/com/android/server/usb/UsbPortManager.java
index ec28040..98173ad 100644
--- a/services/usb/java/com/android/server/usb/UsbPortManager.java
+++ b/services/usb/java/com/android/server/usb/UsbPortManager.java
@@ -16,6 +16,8 @@
package com.android.server.usb;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_PORT_MISMATCH;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL;
import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED;
import static android.hardware.usb.UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
@@ -25,6 +27,12 @@
import static android.hardware.usb.UsbPortStatus.MODE_UFP;
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_POWER_ROLE_SOURCE;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_POWER_ROLE_SINK;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_DATA_ROLE_HOST;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_DATA_ROLE_DEVICE;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_MODE_DFP;
+import static com.android.server.usb.hal.port.UsbPortHal.HAL_MODE_UFP;
import static com.android.internal.usb.DumpUtils.writePort;
import static com.android.internal.usb.DumpUtils.writePortStatus;
@@ -38,6 +46,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.hardware.usb.IUsbOperationInternal;
import android.hardware.usb.ParcelableUsbPort;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
@@ -74,9 +83,13 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.dump.DualDumpOutputStream;
import com.android.server.FgThread;
+import com.android.server.usb.hal.port.RawPortInfo;
+import com.android.server.usb.hal.port.UsbPortHal;
+import com.android.server.usb.hal.port.UsbPortHalInstance;
import java.util.ArrayList;
import java.util.NoSuchElementException;
+import java.util.Objects;
/**
* Allows trusted components to control the properties of physical USB ports
@@ -109,16 +122,9 @@
// The system context.
private final Context mContext;
- // Proxy object for the usb hal daemon.
- @GuardedBy("mLock")
- private IUsb mProxy = null;
-
// Callback when the UsbPort status is changed by the kernel.
// Mostly due a command sent by the remote Usb device.
- private HALCallback mHALCallback = new HALCallback(null, this);
-
- // Cookie sent for usb hal death notification.
- private static final int USB_HAL_DEATH_COOKIE = 1000;
+ //private HALCallback mHALCallback = new HALCallback(null, this);
// Used as the key while sending the bundle to Main thread.
private static final String PORT_INFO = "port_info";
@@ -156,36 +162,23 @@
*/
private int mIsPortContaminatedNotificationId;
- private boolean mEnableUsbDataSignaling;
- protected int mCurrentUsbHalVersion;
+ private UsbPortHal mUsbPortHal;
+
+ private long mTransactionId;
public UsbPortManager(Context context) {
mContext = context;
- try {
- ServiceNotification serviceNotification = new ServiceNotification();
-
- boolean ret = IServiceManager.getService()
- .registerForNotifications("android.hardware.usb@1.0::IUsb",
- "", serviceNotification);
- if (!ret) {
- logAndPrint(Log.ERROR, null,
- "Failed to register service start notification");
- }
- } catch (RemoteException e) {
- logAndPrintException(null,
- "Failed to register service start notification", e);
- return;
- }
- connectToProxy(null);
+ mUsbPortHal = UsbPortHalInstance.getInstance(this, null);
+ logAndPrint(Log.DEBUG, null, "getInstance done");
}
public void systemReady() {
- mSystemReady = true;
- if (mProxy != null) {
+ mSystemReady = true;
+ if (mUsbPortHal != null) {
+ mUsbPortHal.systemReady();
try {
- mProxy.queryPortStatus();
- mEnableUsbDataSignaling = true;
- } catch (RemoteException e) {
+ mUsbPortHal.queryPortStatus(++mTransactionId);
+ } catch (Exception e) {
logAndPrintException(null,
"ServiceStart: Failed to query port status", e);
}
@@ -233,6 +226,7 @@
intent.setComponent(ComponentName.unflattenFromString(r.getString(
com.android.internal.R.string.config_usbContaminantActivity)));
intent.putExtra(UsbManager.EXTRA_PORT, ParcelableUsbPort.of(currentPortInfo.mUsbPort));
+ intent.putExtra(UsbManager.EXTRA_PORT_STATUS, currentPortInfo.mUsbPortStatus);
// Simple notification clicks are immutable
PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0,
@@ -340,13 +334,52 @@
}
try {
- // Oneway call into the hal. Use the castFrom method from HIDL.
- android.hardware.usb.V1_2.IUsb proxy = android.hardware.usb.V1_2.IUsb.castFrom(mProxy);
- proxy.enableContaminantPresenceDetection(portId, enable);
- } catch (RemoteException e) {
+ mUsbPortHal.enableContaminantPresenceDetection(portId, enable, ++mTransactionId);
+ } catch (Exception e) {
logAndPrintException(pw, "Failed to set contaminant detection", e);
- } catch (ClassCastException e) {
- logAndPrintException(pw, "Method only applicable to V1.2 or above implementation", e);
+ }
+ }
+
+ /**
+ * Limits power transfer in/out of USB-C port.
+ *
+ * @param portId port identifier.
+ * @param limit limit power transfer when true.
+ */
+ public void enableLimitPowerTransfer(@NonNull String portId, boolean limit, long transactionId,
+ IUsbOperationInternal callback, IndentingPrintWriter pw) {
+ Objects.requireNonNull(portId);
+ final PortInfo portInfo = mPorts.get(portId);
+ if (portInfo == null) {
+ logAndPrint(Log.ERROR, pw, "enableLimitPowerTransfer: No such port: " + portId
+ + " opId:" + transactionId);
+ try {
+ if (callback != null) {
+ callback.onOperationComplete(USB_OPERATION_ERROR_PORT_MISMATCH);
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(pw,
+ "enableLimitPowerTransfer: Failed to call OperationComplete. opId:"
+ + transactionId, e);
+ }
+ return;
+ }
+
+ try {
+ try {
+ mUsbPortHal.enableLimitPowerTransfer(portId, limit, transactionId, callback);
+ } catch (Exception e) {
+ logAndPrintException(pw,
+ "enableLimitPowerTransfer: Failed to limit power transfer. opId:"
+ + transactionId , e);
+ if (callback != null) {
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ }
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(pw,
+ "enableLimitPowerTransfer:Failed to call onOperationComplete. opId:"
+ + transactionId, e);
}
}
@@ -355,46 +388,79 @@
*
* @param enable enable or disable USB data signaling
*/
- public boolean enableUsbDataSignal(boolean enable) {
- try {
- mEnableUsbDataSignaling = enable;
- // Call into the hal. Use the castFrom method from HIDL.
- android.hardware.usb.V1_3.IUsb proxy = android.hardware.usb.V1_3.IUsb.castFrom(mProxy);
- return proxy.enableUsbDataSignal(enable);
- } catch (RemoteException e) {
- logAndPrintException(null, "Failed to set USB data signaling", e);
- return false;
- } catch (ClassCastException e) {
- logAndPrintException(null, "Method only applicable to V1.3 or above implementation", e);
+ public boolean enableUsbData(@NonNull String portId, boolean enable, int transactionId,
+ @NonNull IUsbOperationInternal callback, IndentingPrintWriter pw) {
+ Objects.requireNonNull(callback);
+ Objects.requireNonNull(portId);
+ final PortInfo portInfo = mPorts.get(portId);
+ if (portInfo == null) {
+ logAndPrint(Log.ERROR, pw, "enableUsbData: No such port: " + portId
+ + " opId:" + transactionId);
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_PORT_MISMATCH);
+ } catch (RemoteException e) {
+ logAndPrintException(pw,
+ "enableUsbData: Failed to call OperationComplete. opId:"
+ + transactionId, e);
+ }
return false;
}
+
+ try {
+ try {
+ return mUsbPortHal.enableUsbData(portId, enable, transactionId, callback);
+ } catch (Exception e) {
+ logAndPrintException(pw,
+ "enableUsbData: Failed to invoke enableUsbData. opId:"
+ + transactionId , e);
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(pw,
+ "enableUsbData: Failed to call onOperationComplete. opId:"
+ + transactionId, e);
+ }
+
+ return false;
}
/**
* Get USB HAL version
*
* @param none
+ * @return {@link UsbManager#USB_HAL_RETRY} returned when hal version
+ * is yet to be determined.
*/
public int getUsbHalVersion() {
- return mCurrentUsbHalVersion;
+ if (mUsbPortHal != null) {
+ try {
+ return mUsbPortHal.getUsbHalVersion();
+ } catch (RemoteException e) {
+ return UsbManager.USB_HAL_RETRY;
+ }
+ }
+ return UsbManager.USB_HAL_RETRY;
}
- /**
- * update USB HAL version
- *
- * @param none
- */
- private void updateUsbHalVersion() {
- if (android.hardware.usb.V1_3.IUsb.castFrom(mProxy) != null) {
- mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_3;
- } else if (android.hardware.usb.V1_2.IUsb.castFrom(mProxy) != null) {
- mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_2;
- } else if (android.hardware.usb.V1_1.IUsb.castFrom(mProxy) != null) {
- mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_1;
- } else {
- mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_0;
- }
- logAndPrint(Log.INFO, null, "USB HAL version: " + mCurrentUsbHalVersion);
+ private int toHalUsbDataRole(int usbDataRole) {
+ if (usbDataRole == DATA_ROLE_DEVICE)
+ return HAL_DATA_ROLE_DEVICE;
+ else
+ return HAL_DATA_ROLE_HOST;
+ }
+
+ private int toHalUsbPowerRole(int usbPowerRole) {
+ if (usbPowerRole == POWER_ROLE_SINK)
+ return HAL_POWER_ROLE_SINK;
+ else
+ return HAL_POWER_ROLE_SOURCE;
+ }
+
+ private int toHalUsbMode(int usbMode) {
+ if (usbMode == MODE_UFP)
+ return HAL_MODE_UFP;
+ else
+ return HAL_MODE_DFP;
}
public void setPortRoles(String portId, int newPowerRole, int newDataRole,
@@ -473,7 +539,7 @@
sim.currentPowerRole = newPowerRole;
sim.currentDataRole = newDataRole;
updatePortsLocked(pw, null);
- } else if (mProxy != null) {
+ } else if (mUsbPortHal != null) {
if (currentMode != newMode) {
// Changing the mode will have the side-effect of also changing
// the power and data roles but it might take some time to apply
@@ -485,44 +551,37 @@
logAndPrint(Log.ERROR, pw, "Trying to set the USB port mode: "
+ "portId=" + portId
+ ", newMode=" + UsbPort.modeToString(newMode));
- PortRole newRole = new PortRole();
- newRole.type = PortRoleType.MODE;
- newRole.role = newMode;
try {
- mProxy.switchRole(portId, newRole);
- } catch (RemoteException e) {
+ mUsbPortHal.switchMode(portId, toHalUsbMode(newMode), ++mTransactionId);
+ } catch (Exception e) {
logAndPrintException(pw, "Failed to set the USB port mode: "
+ "portId=" + portId
- + ", newMode=" + UsbPort.modeToString(newRole.role), e);
+ + ", newMode=" + UsbPort.modeToString(newMode), e);
}
} else {
// Change power and data role independently as needed.
if (currentPowerRole != newPowerRole) {
- PortRole newRole = new PortRole();
- newRole.type = PortRoleType.POWER_ROLE;
- newRole.role = newPowerRole;
try {
- mProxy.switchRole(portId, newRole);
- } catch (RemoteException e) {
+ mUsbPortHal.switchPowerRole(portId, toHalUsbPowerRole(newPowerRole),
+ ++mTransactionId);
+ } catch (Exception e) {
logAndPrintException(pw, "Failed to set the USB port power role: "
+ "portId=" + portId
+ ", newPowerRole=" + UsbPort.powerRoleToString
- (newRole.role),
+ (newPowerRole),
e);
return;
}
}
if (currentDataRole != newDataRole) {
- PortRole newRole = new PortRole();
- newRole.type = PortRoleType.DATA_ROLE;
- newRole.role = newDataRole;
try {
- mProxy.switchRole(portId, newRole);
- } catch (RemoteException e) {
+ mUsbPortHal.switchDataRole(portId, toHalUsbDataRole(newDataRole),
+ ++mTransactionId);
+ } catch (Exception e) {
logAndPrintException(pw, "Failed to set the USB port data role: "
+ "portId=" + portId
- + ", newDataRole=" + UsbPort.dataRoleToString(newRole
- .role),
+ + ", newDataRole=" + UsbPort.dataRoleToString
+ (newDataRole),
e);
}
}
@@ -531,6 +590,15 @@
}
}
+ public void updatePorts(ArrayList<RawPortInfo> newPortInfo) {
+ Message message = mHandler.obtainMessage();
+ Bundle bundle = new Bundle();
+ bundle.putParcelableArrayList(PORT_INFO, newPortInfo);
+ message.what = MSG_UPDATE_PORTS;
+ message.setData(bundle);
+ mHandler.sendMessage(message);
+ }
+
public void addSimulatedPort(String portId, int supportedModes, IndentingPrintWriter pw) {
synchronized (mLock) {
if (mSimulatedPorts.containsKey(portId)) {
@@ -662,191 +730,12 @@
portInfo.dump(dump, "usb_ports", UsbPortManagerProto.USB_PORTS);
}
- dump.write("enable_usb_data_signaling", UsbPortManagerProto.ENABLE_USB_DATA_SIGNALING,
- mEnableUsbDataSignaling);
+ dump.write("usb_hal_version", UsbPortManagerProto.HAL_VERSION, getUsbHalVersion());
}
dump.end(token);
}
- private static class HALCallback extends IUsbCallback.Stub {
- public IndentingPrintWriter pw;
- public UsbPortManager portManager;
-
- HALCallback(IndentingPrintWriter pw, UsbPortManager portManager) {
- this.pw = pw;
- this.portManager = portManager;
- }
-
- public void notifyPortStatusChange(
- ArrayList<android.hardware.usb.V1_0.PortStatus> currentPortStatus, int retval) {
- if (!portManager.mSystemReady) {
- return;
- }
-
- if (retval != Status.SUCCESS) {
- logAndPrint(Log.ERROR, pw, "port status enquiry failed");
- return;
- }
-
- ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
-
- for (android.hardware.usb.V1_0.PortStatus current : currentPortStatus) {
- RawPortInfo temp = new RawPortInfo(current.portName,
- current.supportedModes, CONTAMINANT_PROTECTION_NONE,
- current.currentMode,
- current.canChangeMode, current.currentPowerRole,
- current.canChangePowerRole,
- current.currentDataRole, current.canChangeDataRole,
- false, CONTAMINANT_PROTECTION_NONE,
- false, CONTAMINANT_DETECTION_NOT_SUPPORTED);
- newPortInfo.add(temp);
- logAndPrint(Log.INFO, pw, "ClientCallback V1_0: " + current.portName);
- }
-
- Message message = portManager.mHandler.obtainMessage();
- Bundle bundle = new Bundle();
- bundle.putParcelableArrayList(PORT_INFO, newPortInfo);
- message.what = MSG_UPDATE_PORTS;
- message.setData(bundle);
- portManager.mHandler.sendMessage(message);
- }
-
-
- public void notifyPortStatusChange_1_1(ArrayList<PortStatus_1_1> currentPortStatus,
- int retval) {
- if (!portManager.mSystemReady) {
- return;
- }
-
- if (retval != Status.SUCCESS) {
- logAndPrint(Log.ERROR, pw, "port status enquiry failed");
- return;
- }
-
- ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
-
- int numStatus = currentPortStatus.size();
- for (int i = 0; i < numStatus; i++) {
- PortStatus_1_1 current = currentPortStatus.get(i);
- RawPortInfo temp = new RawPortInfo(current.status.portName,
- current.supportedModes, CONTAMINANT_PROTECTION_NONE,
- current.currentMode,
- current.status.canChangeMode, current.status.currentPowerRole,
- current.status.canChangePowerRole,
- current.status.currentDataRole, current.status.canChangeDataRole,
- false, CONTAMINANT_PROTECTION_NONE,
- false, CONTAMINANT_DETECTION_NOT_SUPPORTED);
- newPortInfo.add(temp);
- logAndPrint(Log.INFO, pw, "ClientCallback V1_1: " + current.status.portName);
- }
-
- Message message = portManager.mHandler.obtainMessage();
- Bundle bundle = new Bundle();
- bundle.putParcelableArrayList(PORT_INFO, newPortInfo);
- message.what = MSG_UPDATE_PORTS;
- message.setData(bundle);
- portManager.mHandler.sendMessage(message);
- }
-
- public void notifyPortStatusChange_1_2(
- ArrayList<PortStatus> currentPortStatus, int retval) {
- if (!portManager.mSystemReady) {
- return;
- }
-
- if (retval != Status.SUCCESS) {
- logAndPrint(Log.ERROR, pw, "port status enquiry failed");
- return;
- }
-
- ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
-
- int numStatus = currentPortStatus.size();
- for (int i = 0; i < numStatus; i++) {
- PortStatus current = currentPortStatus.get(i);
- RawPortInfo temp = new RawPortInfo(current.status_1_1.status.portName,
- current.status_1_1.supportedModes,
- current.supportedContaminantProtectionModes,
- current.status_1_1.currentMode,
- current.status_1_1.status.canChangeMode,
- current.status_1_1.status.currentPowerRole,
- current.status_1_1.status.canChangePowerRole,
- current.status_1_1.status.currentDataRole,
- current.status_1_1.status.canChangeDataRole,
- current.supportsEnableContaminantPresenceProtection,
- current.contaminantProtectionStatus,
- current.supportsEnableContaminantPresenceDetection,
- current.contaminantDetectionStatus);
- newPortInfo.add(temp);
- logAndPrint(Log.INFO, pw, "ClientCallback V1_2: "
- + current.status_1_1.status.portName);
- }
-
- Message message = portManager.mHandler.obtainMessage();
- Bundle bundle = new Bundle();
- bundle.putParcelableArrayList(PORT_INFO, newPortInfo);
- message.what = MSG_UPDATE_PORTS;
- message.setData(bundle);
- portManager.mHandler.sendMessage(message);
- }
-
- public void notifyRoleSwitchStatus(String portName, PortRole role, int retval) {
- if (retval == Status.SUCCESS) {
- logAndPrint(Log.INFO, pw, portName + " role switch successful");
- } else {
- logAndPrint(Log.ERROR, pw, portName + " role switch failed");
- }
- }
- }
-
- final class DeathRecipient implements HwBinder.DeathRecipient {
- public IndentingPrintWriter pw;
-
- DeathRecipient(IndentingPrintWriter pw) {
- this.pw = pw;
- }
-
- @Override
- public void serviceDied(long cookie) {
- if (cookie == USB_HAL_DEATH_COOKIE) {
- logAndPrint(Log.ERROR, pw, "Usb hal service died cookie: " + cookie);
- synchronized (mLock) {
- mProxy = null;
- }
- }
- }
- }
-
- final class ServiceNotification extends IServiceNotification.Stub {
- @Override
- public void onRegistration(String fqName, String name, boolean preexisting) {
- logAndPrint(Log.INFO, null, "Usb hal service started " + fqName + " " + name);
- connectToProxy(null);
- }
- }
-
- private void connectToProxy(IndentingPrintWriter pw) {
- synchronized (mLock) {
- if (mProxy != null) {
- return;
- }
-
- try {
- mProxy = IUsb.getService();
- mProxy.linkToDeath(new DeathRecipient(pw), USB_HAL_DEATH_COOKIE);
- mProxy.setCallback(mHALCallback);
- mProxy.queryPortStatus();
- updateUsbHalVersion();
- } catch (NoSuchElementException e) {
- logAndPrintException(pw, "connectToProxy: usb hal service not found."
- + " Did the service fail to start?", e);
- } catch (RemoteException e) {
- logAndPrintException(pw, "connectToProxy: usb hal service not responding", e);
- }
- }
- }
-
/**
* Simulated ports directly add the new roles to mSimulatedPorts before calling.
* USB hal callback populates and sends the newPortInfo.
@@ -869,7 +758,9 @@
portInfo.supportsEnableContaminantPresenceProtection,
portInfo.contaminantProtectionStatus,
portInfo.supportsEnableContaminantPresenceDetection,
- portInfo.contaminantDetectionStatus, pw);
+ portInfo.contaminantDetectionStatus,
+ portInfo.usbDataEnabled,
+ portInfo.powerTransferLimited, pw);
}
} else {
for (RawPortInfo currentPortInfo : newPortInfo) {
@@ -881,7 +772,9 @@
currentPortInfo.supportsEnableContaminantPresenceProtection,
currentPortInfo.contaminantProtectionStatus,
currentPortInfo.supportsEnableContaminantPresenceDetection,
- currentPortInfo.contaminantDetectionStatus, pw);
+ currentPortInfo.contaminantDetectionStatus,
+ currentPortInfo.usbDataEnabled,
+ currentPortInfo.powerTransferLimited, pw);
}
}
@@ -917,6 +810,8 @@
int contaminantProtectionStatus,
boolean supportsEnableContaminantPresenceDetection,
int contaminantDetectionStatus,
+ boolean usbDataEnabled,
+ boolean powerTransferLimited,
IndentingPrintWriter pw) {
// Only allow mode switch capability for dual role ports.
// Validate that the current mode matches the supported modes we expect.
@@ -975,7 +870,8 @@
currentPowerRole, canChangePowerRole,
currentDataRole, canChangeDataRole,
supportedRoleCombinations, contaminantProtectionStatus,
- contaminantDetectionStatus);
+ contaminantDetectionStatus, usbDataEnabled,
+ powerTransferLimited);
mPorts.put(portId, portInfo);
} else {
// Validate that ports aren't changing definition out from under us.
@@ -1012,7 +908,8 @@
currentPowerRole, canChangePowerRole,
currentDataRole, canChangeDataRole,
supportedRoleCombinations, contaminantProtectionStatus,
- contaminantDetectionStatus)) {
+ contaminantDetectionStatus, usbDataEnabled,
+ powerTransferLimited)) {
portInfo.mDisposition = PortInfo.DISPOSITION_CHANGED;
} else {
portInfo.mDisposition = PortInfo.DISPOSITION_READY;
@@ -1034,6 +931,7 @@
private void handlePortChangedLocked(PortInfo portInfo, IndentingPrintWriter pw) {
logAndPrint(Log.INFO, pw, "USB port changed: " + portInfo);
enableContaminantDetectionIfNeeded(portInfo, pw);
+ disableLimitPowerTransferIfNeeded(portInfo, pw);
handlePortLocked(portInfo, pw);
}
@@ -1090,6 +988,19 @@
}
}
+ private void disableLimitPowerTransferIfNeeded(PortInfo portInfo, IndentingPrintWriter pw) {
+ if (!mConnected.containsKey(portInfo.mUsbPort.getId())) {
+ return;
+ }
+
+ if (mConnected.get(portInfo.mUsbPort.getId())
+ && !portInfo.mUsbPortStatus.isConnected()
+ && portInfo.mUsbPortStatus.isPowerTransferLimited()) {
+ // Relax enableLimitPowerTransfer upon unplug.
+ enableLimitPowerTransfer(portInfo.mUsbPort.getId(), false, ++mTransactionId, null, pw);
+ }
+ }
+
private void logToStatsd(PortInfo portInfo, IndentingPrintWriter pw) {
// Port is removed
if (portInfo.mUsbPortStatus == null) {
@@ -1141,14 +1052,14 @@
}
}
- private static void logAndPrint(int priority, IndentingPrintWriter pw, String msg) {
+ public static void logAndPrint(int priority, IndentingPrintWriter pw, String msg) {
Slog.println(priority, TAG, msg);
if (pw != null) {
pw.println(msg);
}
}
- private static void logAndPrintException(IndentingPrintWriter pw, String msg, Exception e) {
+ public static void logAndPrintException(IndentingPrintWriter pw, String msg, Exception e) {
Slog.e(TAG, msg, e);
if (pw != null) {
pw.println(msg + e);
@@ -1179,7 +1090,7 @@
/**
* Describes a USB port.
*/
- private static final class PortInfo {
+ public static final class PortInfo {
public static final int DISPOSITION_ADDED = 0;
public static final int DISPOSITION_CHANGED = 1;
public static final int DISPOSITION_READY = 2;
@@ -1224,7 +1135,7 @@
!= supportedRoleCombinations) {
mUsbPortStatus = new UsbPortStatus(currentMode, currentPowerRole, currentDataRole,
supportedRoleCombinations, UsbPortStatus.CONTAMINANT_PROTECTION_NONE,
- UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED);
+ UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED, true, false);
dispositionChanged = true;
}
@@ -1243,7 +1154,8 @@
int currentPowerRole, boolean canChangePowerRole,
int currentDataRole, boolean canChangeDataRole,
int supportedRoleCombinations, int contaminantProtectionStatus,
- int contaminantDetectionStatus) {
+ int contaminantDetectionStatus, boolean usbDataEnabled,
+ boolean powerTransferLimited) {
boolean dispositionChanged = false;
mCanChangeMode = canChangeMode;
@@ -1258,10 +1170,15 @@
|| mUsbPortStatus.getContaminantProtectionStatus()
!= contaminantProtectionStatus
|| mUsbPortStatus.getContaminantDetectionStatus()
- != contaminantDetectionStatus) {
+ != contaminantDetectionStatus
+ || mUsbPortStatus.getUsbDataStatus()
+ != usbDataEnabled
+ || mUsbPortStatus.isPowerTransferLimited()
+ != powerTransferLimited) {
mUsbPortStatus = new UsbPortStatus(currentMode, currentPowerRole, currentDataRole,
supportedRoleCombinations, contaminantProtectionStatus,
- contaminantDetectionStatus);
+ contaminantDetectionStatus, usbDataEnabled,
+ powerTransferLimited);
dispositionChanged = true;
}
@@ -1290,7 +1207,6 @@
UsbPortInfoProto.CONNECTED_AT_MILLIS, mConnectedAtMillis);
dump.write("last_connect_duration_millis",
UsbPortInfoProto.LAST_CONNECT_DURATION_MILLIS, mLastConnectDurationMillis);
-
dump.end(token);
}
@@ -1304,115 +1220,4 @@
+ ", lastConnectDurationMillis=" + mLastConnectDurationMillis;
}
}
-
- /**
- * Used for storing the raw data from the kernel
- * Values of the member variables mocked directly incase of emulation.
- */
- private static final class RawPortInfo implements Parcelable {
- public final String portId;
- public final int supportedModes;
- public final int supportedContaminantProtectionModes;
- public int currentMode;
- public boolean canChangeMode;
- public int currentPowerRole;
- public boolean canChangePowerRole;
- public int currentDataRole;
- public boolean canChangeDataRole;
- public boolean supportsEnableContaminantPresenceProtection;
- public int contaminantProtectionStatus;
- public boolean supportsEnableContaminantPresenceDetection;
- public int contaminantDetectionStatus;
-
- RawPortInfo(String portId, int supportedModes) {
- this.portId = portId;
- this.supportedModes = supportedModes;
- this.supportedContaminantProtectionModes = UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
- this.supportsEnableContaminantPresenceProtection = false;
- this.contaminantProtectionStatus = UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
- this.supportsEnableContaminantPresenceDetection = false;
- this.contaminantDetectionStatus = UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED;
- }
-
- RawPortInfo(String portId, int supportedModes, int supportedContaminantProtectionModes,
- int currentMode, boolean canChangeMode,
- int currentPowerRole, boolean canChangePowerRole,
- int currentDataRole, boolean canChangeDataRole,
- boolean supportsEnableContaminantPresenceProtection,
- int contaminantProtectionStatus,
- boolean supportsEnableContaminantPresenceDetection,
- int contaminantDetectionStatus) {
- this.portId = portId;
- this.supportedModes = supportedModes;
- this.supportedContaminantProtectionModes = supportedContaminantProtectionModes;
- this.currentMode = currentMode;
- this.canChangeMode = canChangeMode;
- this.currentPowerRole = currentPowerRole;
- this.canChangePowerRole = canChangePowerRole;
- this.currentDataRole = currentDataRole;
- this.canChangeDataRole = canChangeDataRole;
- this.supportsEnableContaminantPresenceProtection =
- supportsEnableContaminantPresenceProtection;
- this.contaminantProtectionStatus = contaminantProtectionStatus;
- this.supportsEnableContaminantPresenceDetection =
- supportsEnableContaminantPresenceDetection;
- this.contaminantDetectionStatus = contaminantDetectionStatus;
- }
-
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(portId);
- dest.writeInt(supportedModes);
- dest.writeInt(supportedContaminantProtectionModes);
- dest.writeInt(currentMode);
- dest.writeByte((byte) (canChangeMode ? 1 : 0));
- dest.writeInt(currentPowerRole);
- dest.writeByte((byte) (canChangePowerRole ? 1 : 0));
- dest.writeInt(currentDataRole);
- dest.writeByte((byte) (canChangeDataRole ? 1 : 0));
- dest.writeBoolean(supportsEnableContaminantPresenceProtection);
- dest.writeInt(contaminantProtectionStatus);
- dest.writeBoolean(supportsEnableContaminantPresenceDetection);
- dest.writeInt(contaminantDetectionStatus);
- }
-
- public static final Parcelable.Creator<RawPortInfo> CREATOR =
- new Parcelable.Creator<RawPortInfo>() {
- @Override
- public RawPortInfo createFromParcel(Parcel in) {
- String id = in.readString();
- int supportedModes = in.readInt();
- int supportedContaminantProtectionModes = in.readInt();
- int currentMode = in.readInt();
- boolean canChangeMode = in.readByte() != 0;
- int currentPowerRole = in.readInt();
- boolean canChangePowerRole = in.readByte() != 0;
- int currentDataRole = in.readInt();
- boolean canChangeDataRole = in.readByte() != 0;
- boolean supportsEnableContaminantPresenceProtection = in.readBoolean();
- int contaminantProtectionStatus = in.readInt();
- boolean supportsEnableContaminantPresenceDetection = in.readBoolean();
- int contaminantDetectionStatus = in.readInt();
- return new RawPortInfo(id, supportedModes,
- supportedContaminantProtectionModes, currentMode, canChangeMode,
- currentPowerRole, canChangePowerRole,
- currentDataRole, canChangeDataRole,
- supportsEnableContaminantPresenceProtection,
- contaminantProtectionStatus,
- supportsEnableContaminantPresenceDetection,
- contaminantDetectionStatus);
- }
-
- @Override
- public RawPortInfo[] newArray(int size) {
- return new RawPortInfo[size];
- }
- };
- }
}
diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java
index 3d3538d..51643e7 100644
--- a/services/usb/java/com/android/server/usb/UsbService.java
+++ b/services/usb/java/com/android/server/usb/UsbService.java
@@ -16,6 +16,7 @@
package com.android.server.usb;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL;
import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
import static android.hardware.usb.UsbPortStatus.DATA_ROLE_HOST;
import static android.hardware.usb.UsbPortStatus.MODE_DFP;
@@ -35,6 +36,7 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.hardware.usb.IUsbManager;
+import android.hardware.usb.IUsbOperationInternal;
import android.hardware.usb.ParcelableUsbPort;
import android.hardware.usb.UsbAccessory;
import android.hardware.usb.UsbDevice;
@@ -44,6 +46,7 @@
import android.os.Binder;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
import android.service.usb.UsbServiceDumpProto;
@@ -731,6 +734,28 @@
}
@Override
+ public void enableLimitPowerTransfer(String portId, boolean limit, int operationId,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(portId, "portId must not be null. opID:" + operationId);
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null);
+
+ final long ident = Binder.clearCallingIdentity();
+ try {
+ if (mPortManager != null) {
+ mPortManager.enableLimitPowerTransfer(portId, limit, operationId, callback, null);
+ } else {
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "enableLimitPowerTransfer: Failed to call onOperationComplete", e);
+ }
+ }
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
+ }
+
+ @Override
public void enableContaminantDetection(String portId, boolean enable) {
Objects.requireNonNull(portId, "portId must not be null");
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null);
@@ -762,19 +787,30 @@
}
@Override
- public boolean enableUsbDataSignal(boolean enable) {
+ public boolean enableUsbData(String portId, boolean enable, int operationId,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(portId, "enableUsbData: portId must not be null. opId:"
+ + operationId);
+ Objects.requireNonNull(callback, "enableUsbData: callback must not be null. opId:"
+ + operationId);
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null);
-
final long ident = Binder.clearCallingIdentity();
+ boolean wait;
try {
if (mPortManager != null) {
- return mPortManager.enableUsbDataSignal(enable);
+ wait = mPortManager.enableUsbData(portId, enable, operationId, callback, null);
} else {
- return false;
+ wait = false;
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "enableUsbData: Failed to call onOperationComplete", e);
+ }
}
} finally {
Binder.restoreCallingIdentity(ident);
}
+ return wait;
}
@Override
diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
index 3412a6f..6e68a91 100644
--- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
+++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java
@@ -870,4 +870,35 @@
return getOutputHeadsetProbability() >= OUT_HEADSET_TRIGGER;
}
+ /**
+ * isDock() indicates if the connected USB output peripheral is a docking station with
+ * audio output.
+ * A valid audio dock must declare only one audio output control terminal of type
+ * TERMINAL_EXTERN_DIGITAL.
+ */
+ public boolean isDock() {
+ if (hasMIDIInterface() || hasHIDInterface()) {
+ return false;
+ }
+
+ ArrayList<UsbDescriptor> acDescriptors =
+ getACInterfaceDescriptors(UsbACInterface.ACI_OUTPUT_TERMINAL,
+ UsbACInterface.AUDIO_AUDIOCONTROL);
+
+ if (acDescriptors.size() != 1) {
+ return false;
+ }
+
+ if (acDescriptors.get(0) instanceof UsbACTerminal) {
+ UsbACTerminal outDescr = (UsbACTerminal) acDescriptors.get(0);
+ if (outDescr.getTerminalType() == UsbTerminalTypes.TERMINAL_EXTERN_DIGITAL) {
+ return true;
+ }
+ } else {
+ Log.w(TAG, "Undefined Audio Output terminal l: " + acDescriptors.get(0).getLength()
+ + " t:0x" + Integer.toHexString(acDescriptors.get(0).getType()));
+ }
+ return false;
+ }
+
}
diff --git a/services/usb/java/com/android/server/usb/hal/port/RawPortInfo.java b/services/usb/java/com/android/server/usb/hal/port/RawPortInfo.java
new file mode 100644
index 0000000..8dfc859
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/hal/port/RawPortInfo.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 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.usb.hal.port;
+
+import android.hardware.usb.UsbPortStatus;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Used for storing the raw data from the HAL.
+ * Values of the member variables mocked directly in case of emulation.
+ */
+public final class RawPortInfo implements Parcelable {
+ public final String portId;
+ public final int supportedModes;
+ public final int supportedContaminantProtectionModes;
+ public int currentMode;
+ public boolean canChangeMode;
+ public int currentPowerRole;
+ public boolean canChangePowerRole;
+ public int currentDataRole;
+ public boolean canChangeDataRole;
+ public boolean supportsEnableContaminantPresenceProtection;
+ public int contaminantProtectionStatus;
+ public boolean supportsEnableContaminantPresenceDetection;
+ public int contaminantDetectionStatus;
+ public boolean usbDataEnabled;
+ public boolean powerTransferLimited;
+
+ public RawPortInfo(String portId, int supportedModes) {
+ this.portId = portId;
+ this.supportedModes = supportedModes;
+ this.supportedContaminantProtectionModes = UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+ this.supportsEnableContaminantPresenceProtection = false;
+ this.contaminantProtectionStatus = UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+ this.supportsEnableContaminantPresenceDetection = false;
+ this.contaminantDetectionStatus = UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED;
+ this.usbDataEnabled = true;
+ this.powerTransferLimited = false;
+ }
+
+ public RawPortInfo(String portId, int supportedModes, int supportedContaminantProtectionModes,
+ int currentMode, boolean canChangeMode,
+ int currentPowerRole, boolean canChangePowerRole,
+ int currentDataRole, boolean canChangeDataRole,
+ boolean supportsEnableContaminantPresenceProtection,
+ int contaminantProtectionStatus,
+ boolean supportsEnableContaminantPresenceDetection,
+ int contaminantDetectionStatus,
+ boolean usbDataEnabled,
+ boolean powerTransferLimited) {
+ this.portId = portId;
+ this.supportedModes = supportedModes;
+ this.supportedContaminantProtectionModes = supportedContaminantProtectionModes;
+ this.currentMode = currentMode;
+ this.canChangeMode = canChangeMode;
+ this.currentPowerRole = currentPowerRole;
+ this.canChangePowerRole = canChangePowerRole;
+ this.currentDataRole = currentDataRole;
+ this.canChangeDataRole = canChangeDataRole;
+ this.supportsEnableContaminantPresenceProtection =
+ supportsEnableContaminantPresenceProtection;
+ this.contaminantProtectionStatus = contaminantProtectionStatus;
+ this.supportsEnableContaminantPresenceDetection =
+ supportsEnableContaminantPresenceDetection;
+ this.contaminantDetectionStatus = contaminantDetectionStatus;
+ this.usbDataEnabled = usbDataEnabled;
+ this.powerTransferLimited = powerTransferLimited;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(portId);
+ dest.writeInt(supportedModes);
+ dest.writeInt(supportedContaminantProtectionModes);
+ dest.writeInt(currentMode);
+ dest.writeByte((byte) (canChangeMode ? 1 : 0));
+ dest.writeInt(currentPowerRole);
+ dest.writeByte((byte) (canChangePowerRole ? 1 : 0));
+ dest.writeInt(currentDataRole);
+ dest.writeByte((byte) (canChangeDataRole ? 1 : 0));
+ dest.writeBoolean(supportsEnableContaminantPresenceProtection);
+ dest.writeInt(contaminantProtectionStatus);
+ dest.writeBoolean(supportsEnableContaminantPresenceDetection);
+ dest.writeInt(contaminantDetectionStatus);
+ dest.writeBoolean(usbDataEnabled);
+ dest.writeBoolean(powerTransferLimited);
+ }
+
+ public static final Parcelable.Creator<RawPortInfo> CREATOR =
+ new Parcelable.Creator<RawPortInfo>() {
+ @Override
+ public RawPortInfo createFromParcel(Parcel in) {
+ String id = in.readString();
+ int supportedModes = in.readInt();
+ int supportedContaminantProtectionModes = in.readInt();
+ int currentMode = in.readInt();
+ boolean canChangeMode = in.readByte() != 0;
+ int currentPowerRole = in.readInt();
+ boolean canChangePowerRole = in.readByte() != 0;
+ int currentDataRole = in.readInt();
+ boolean canChangeDataRole = in.readByte() != 0;
+ boolean supportsEnableContaminantPresenceProtection = in.readBoolean();
+ int contaminantProtectionStatus = in.readInt();
+ boolean supportsEnableContaminantPresenceDetection = in.readBoolean();
+ int contaminantDetectionStatus = in.readInt();
+ boolean usbDataEnabled = in.readBoolean();
+ boolean powerTransferLimited = in.readBoolean();
+ return new RawPortInfo(id, supportedModes,
+ supportedContaminantProtectionModes, currentMode, canChangeMode,
+ currentPowerRole, canChangePowerRole,
+ currentDataRole, canChangeDataRole,
+ supportsEnableContaminantPresenceProtection,
+ contaminantProtectionStatus,
+ supportsEnableContaminantPresenceDetection,
+ contaminantDetectionStatus, usbDataEnabled,
+ powerTransferLimited);
+ }
+
+ @Override
+ public RawPortInfo[] newArray(int size) {
+ return new RawPortInfo[size];
+ }
+ };
+}
diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java
new file mode 100644
index 0000000..2460242
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java
@@ -0,0 +1,533 @@
+/*
+ * Copyright (C) 2021 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.usb.hal.port;
+
+import static android.hardware.usb.UsbManager.USB_HAL_V2_0;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_SUCCESS;
+
+import static com.android.server.usb.UsbPortManager.logAndPrint;
+import static com.android.server.usb.UsbPortManager.logAndPrintException;
+
+import android.annotation.Nullable;
+import android.hardware.usb.ContaminantProtectionStatus;
+import android.hardware.usb.IUsb;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbManager.UsbHalVersion;
+import android.hardware.usb.UsbPort;
+import android.hardware.usb.UsbPortStatus;
+import android.hardware.usb.PortMode;
+import android.hardware.usb.Status;
+import android.hardware.usb.IUsbCallback;
+import android.hardware.usb.PortRole;
+import android.hardware.usb.PortStatus;
+import android.os.ServiceManager;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+import android.util.LongSparseArray;
+import android.util.Slog;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.usb.UsbPortManager;
+import com.android.server.usb.hal.port.RawPortInfo;
+
+import java.util.ArrayList;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+
+/**
+ * Implements the methods to interact with AIDL USB HAL.
+ */
+public final class UsbPortAidl implements UsbPortHal {
+ private static final String TAG = UsbPortAidl.class.getSimpleName();
+ private static final String USB_AIDL_SERVICE =
+ "android.hardware.usb.IUsb/default";
+ private static final LongSparseArray<IUsbOperationInternal>
+ sCallbacks = new LongSparseArray<>();
+ // Proxy object for the usb hal daemon.
+ @GuardedBy("mLock")
+ private IUsb mProxy;
+ private UsbPortManager mPortManager;
+ public IndentingPrintWriter mPw;
+ // Mutex for all mutable shared state.
+ private final Object mLock = new Object();
+ // Callback when the UsbPort status is changed by the kernel.
+ private HALCallback mHALCallback;
+ private IBinder mBinder;
+ private boolean mSystemReady;
+ private long mTransactionId;
+
+ public @UsbHalVersion int getUsbHalVersion() throws RemoteException {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ throw new RemoteException("IUsb not initialized yet");
+ }
+ }
+ logAndPrint(Log.INFO, null, "USB HAL AIDL version: USB_HAL_V2_0");
+ return USB_HAL_V2_0;
+ }
+
+ @Override
+ public void systemReady() {
+ mSystemReady = true;
+ }
+
+ public void serviceDied() {
+ logAndPrint(Log.ERROR, mPw, "Usb AIDL hal service died");
+ synchronized (mLock) {
+ mProxy = null;
+ }
+ connectToProxy(null);
+ }
+
+ private void connectToProxy(IndentingPrintWriter pw) {
+ synchronized (mLock) {
+ if (mProxy != null) {
+ return;
+ }
+
+ try {
+ mBinder = ServiceManager.waitForService(USB_AIDL_SERVICE);
+ mProxy = IUsb.Stub.asInterface(mBinder);
+ mBinder.linkToDeath(this::serviceDied, 0);
+ mProxy.setCallback(mHALCallback);
+ mProxy.queryPortStatus(++mTransactionId);
+ } catch (NoSuchElementException e) {
+ logAndPrintException(pw, "connectToProxy: usb hal service not found."
+ + " Did the service fail to start?", e);
+ } catch (RemoteException e) {
+ logAndPrintException(pw, "connectToProxy: usb hal service not responding", e);
+ }
+ }
+ }
+
+ static boolean isServicePresent(IndentingPrintWriter pw) {
+ try {
+ return ServiceManager.isDeclared(USB_AIDL_SERVICE);
+ } catch (NoSuchElementException e) {
+ logAndPrintException(pw, "connectToProxy: usb Aidl hal service not found.", e);
+ }
+
+ return false;
+ }
+
+ public UsbPortAidl(UsbPortManager portManager, IndentingPrintWriter pw) {
+ mPortManager = Objects.requireNonNull(portManager);
+ mPw = pw;
+ mHALCallback = new HALCallback(null, mPortManager, this);
+ connectToProxy(mPw);
+ }
+
+ @Override
+ public void enableContaminantPresenceDetection(String portName, boolean enable,
+ long operationID) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry ! opID: "
+ + operationID);
+ return;
+ }
+
+ try {
+ // Oneway call into the hal. Use the castFrom method from HIDL.
+ mProxy.enableContaminantPresenceDetection(portName, enable, operationID);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set contaminant detection. opID:"
+ + operationID, e);
+ }
+ }
+ }
+
+ @Override
+ public void queryPortStatus(long operationID) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry ! opID:"
+ + operationID);
+ return;
+ }
+
+ try {
+ mProxy.queryPortStatus(operationID);
+ } catch (RemoteException e) {
+ logAndPrintException(null, "ServiceStart: Failed to query port status. opID:"
+ + operationID, e);
+ }
+ }
+ }
+
+ @Override
+ public void switchMode(String portId, @HalUsbPortMode int newMode, long operationID) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry ! opID:"
+ + operationID);
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.setMode((byte)newMode);
+ try {
+ mProxy.switchRole(portId, newRole, operationID);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB port mode: "
+ + "portId=" + portId
+ + ", newMode=" + UsbPort.modeToString(newMode)
+ + "opID:" + operationID, e);
+ }
+ }
+ }
+
+ @Override
+ public void switchPowerRole(String portId, @HalUsbPowerRole int newPowerRole,
+ long operationID) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry ! opID:"
+ + operationID);
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.setPowerRole((byte)newPowerRole);
+ try {
+ mProxy.switchRole(portId, newRole, operationID);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB power role: portId=" + portId
+ + ", newPowerRole=" + UsbPort.powerRoleToString(newPowerRole)
+ + "opID:" + operationID, e);
+ }
+ }
+ }
+
+ @Override
+ public void switchDataRole(String portId, @HalUsbDataRole int newDataRole, long operationID) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry ! opID:"
+ + operationID);
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.setDataRole((byte)newDataRole);
+ try {
+ mProxy.switchRole(portId, newRole, operationID);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB data role: portId=" + portId
+ + ", newDataRole=" + UsbPort.dataRoleToString(newDataRole)
+ + "opID:" + operationID, e);
+ }
+ }
+ }
+
+ @Override
+ public boolean enableUsbData(String portName, boolean enable, long operationID,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(portName);
+ Objects.requireNonNull(callback);
+ long key = operationID;
+ synchronized (mLock) {
+ try {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw,
+ "enableUsbData: Proxy is null. Retry !opID:"
+ + operationID);
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ return false;
+ }
+ while (sCallbacks.get(key) != null) {
+ key = ThreadLocalRandom.current().nextInt();
+ }
+ if (key != operationID) {
+ logAndPrint(Log.INFO, mPw, "enableUsbData: operationID exists ! opID:"
+ + operationID + " key:" + key);
+ }
+ try {
+ sCallbacks.put(key, callback);
+ mProxy.enableUsbData(portName, enable, key);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "enableUsbData: Failed to invoke enableUsbData: portID="
+ + portName + "opID:" + operationID, e);
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ sCallbacks.remove(key);
+ return false;
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "enableUsbData: Failed to call onOperationComplete portID="
+ + portName + "opID:" + operationID, e);
+ sCallbacks.remove(key);
+ return false;
+ }
+ return true;
+ }
+ }
+
+ @Override
+ public void enableLimitPowerTransfer(String portName, boolean limit, long operationID,
+ IUsbOperationInternal callback) {
+ Objects.requireNonNull(portName);
+ long key = operationID;
+ synchronized (mLock) {
+ try {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw,
+ "enableLimitPowerTransfer: Proxy is null. Retry !opID:"
+ + operationID);
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ return;
+ }
+ while (sCallbacks.get(key) != null) {
+ key = ThreadLocalRandom.current().nextInt();
+ }
+ if (key != operationID) {
+ logAndPrint(Log.INFO, mPw, "enableUsbData: operationID exists ! opID:"
+ + operationID + " key:" + key);
+ }
+ try {
+ sCallbacks.put(key, callback);
+ mProxy.limitPowerTransfer(portName, limit, key);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "enableLimitPowerTransfer: Failed while invoking AIDL HAL"
+ + " portID=" + portName + " opID:" + operationID, e);
+ if (callback != null) {
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ }
+ sCallbacks.remove(key);
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "enableLimitPowerTransfer: Failed to call onOperationComplete portID="
+ + portName + " opID:" + operationID, e);
+ }
+ }
+ }
+
+ private static class HALCallback extends IUsbCallback.Stub {
+ public IndentingPrintWriter mPw;
+ public UsbPortManager mPortManager;
+ public UsbPortAidl mUsbPortAidl;
+
+ HALCallback(IndentingPrintWriter pw, UsbPortManager portManager, UsbPortAidl usbPortAidl) {
+ this.mPw = pw;
+ this.mPortManager = portManager;
+ this.mUsbPortAidl = usbPortAidl;
+ }
+
+ /**
+ * Converts from AIDL defined mode constants to UsbPortStatus constants.
+ * AIDL does not gracefully support bitfield when combined with enums.
+ */
+ private int toPortMode(byte aidlPortMode) {
+ switch (aidlPortMode) {
+ case PortMode.NONE:
+ return UsbPortStatus.MODE_NONE;
+ case PortMode.UFP:
+ return UsbPortStatus.MODE_UFP;
+ case PortMode.DFP:
+ return UsbPortStatus.MODE_DFP;
+ case PortMode.DRP:
+ return UsbPortStatus.MODE_DUAL;
+ case PortMode.AUDIO_ACCESSORY:
+ return UsbPortStatus.MODE_AUDIO_ACCESSORY;
+ case PortMode.DEBUG_ACCESSORY:
+ return UsbPortStatus.MODE_DEBUG_ACCESSORY;
+ default:
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, "Unrecognized aidlPortMode:"
+ + aidlPortMode);
+ return UsbPortStatus.MODE_NONE;
+ }
+ }
+
+ private int toSupportedModes(byte[] aidlPortModes) {
+ int supportedModes = UsbPortStatus.MODE_NONE;
+
+ for (byte aidlPortMode : aidlPortModes) {
+ supportedModes |= toPortMode(aidlPortMode);
+ }
+
+ return supportedModes;
+ }
+
+ /**
+ * Converts from AIDL defined contaminant protection constants to UsbPortStatus constants.
+ * AIDL does not gracefully support bitfield when combined with enums.
+ * Common to both ContaminantProtectionMode and ContaminantProtectionStatus.
+ */
+ private int toContaminantProtectionStatus(byte aidlContaminantProtection) {
+ switch (aidlContaminantProtection) {
+ case ContaminantProtectionStatus.NONE:
+ return UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+ case ContaminantProtectionStatus.FORCE_SINK:
+ return UsbPortStatus.CONTAMINANT_PROTECTION_SINK;
+ case ContaminantProtectionStatus.FORCE_SOURCE:
+ return UsbPortStatus.CONTAMINANT_PROTECTION_SOURCE;
+ case ContaminantProtectionStatus.FORCE_DISABLE:
+ return UsbPortStatus.CONTAMINANT_PROTECTION_FORCE_DISABLE;
+ case ContaminantProtectionStatus.DISABLED:
+ return UsbPortStatus.CONTAMINANT_PROTECTION_DISABLED;
+ default:
+ UsbPortManager.logAndPrint(Log.ERROR, mPw,
+ "Unrecognized aidlContaminantProtection:"
+ + aidlContaminantProtection);
+ return UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+ }
+ }
+
+ private int toSupportedContaminantProtectionModes(byte[] aidlModes) {
+ int supportedContaminantProtectionModes = UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+
+ for (byte aidlMode : aidlModes) {
+ supportedContaminantProtectionModes |= toContaminantProtectionStatus(aidlMode);
+ }
+
+ return supportedContaminantProtectionModes;
+ }
+
+ @Override
+ public void notifyPortStatusChange(
+ android.hardware.usb.PortStatus[] currentPortStatus, int retval) {
+ if (!mUsbPortAidl.mSystemReady) {
+ return;
+ }
+
+ if (retval != Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, "port status enquiry failed");
+ return;
+ }
+
+ ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
+
+ int numStatus = currentPortStatus.length;
+ for (int i = 0; i < numStatus; i++) {
+ PortStatus current = currentPortStatus[i];
+ RawPortInfo temp = new RawPortInfo(current.portName,
+ toSupportedModes(current.supportedModes),
+ toSupportedContaminantProtectionModes(current
+ .supportedContaminantProtectionModes),
+ toPortMode(current.currentMode),
+ current.canChangeMode,
+ current.currentPowerRole,
+ current.canChangePowerRole,
+ current.currentDataRole,
+ current.canChangeDataRole,
+ current.supportsEnableContaminantPresenceProtection,
+ toContaminantProtectionStatus(current.contaminantProtectionStatus),
+ current.supportsEnableContaminantPresenceDetection,
+ current.contaminantDetectionStatus,
+ current.usbDataEnabled,
+ current.powerTransferLimited);
+ newPortInfo.add(temp);
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "ClientCallback AIDL V1: "
+ + current.portName);
+ }
+ mPortManager.updatePorts(newPortInfo);
+ }
+
+ @Override
+ public void notifyRoleSwitchStatus(String portName, PortRole role, int retval,
+ long operationID) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, portName
+ + " role switch successful. opID:"
+ + operationID);
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName + " role switch failed. err:"
+ + retval
+ + "opID:" + operationID);
+ }
+ }
+
+ @Override
+ public void notifyQueryPortStatus(String portName, int retval, long operationID) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, portName + ": opID:"
+ + operationID + " successful");
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName + ": opID:"
+ + operationID + " failed. err:" + retval);
+ }
+ }
+
+ @Override
+ public void notifyEnableUsbDataStatus(String portName, boolean enable, int retval,
+ long operationID) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "notifyEnableUsbDataStatus:"
+ + portName + ": opID:"
+ + operationID + " enable:" + enable);
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName
+ + "notifyEnableUsbDataStatus: opID:"
+ + operationID + " failed. err:" + retval);
+ }
+ try {
+ sCallbacks.get(operationID).onOperationComplete(retval == Status.SUCCESS
+ ? USB_OPERATION_SUCCESS
+ : USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "notifyEnableUsbDataStatus: Failed to call onOperationComplete",
+ e);
+ }
+ }
+
+ @Override
+ public void notifyContaminantEnabledStatus(String portName, boolean enable, int retval,
+ long operationID) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "notifyContaminantEnabledStatus:"
+ + portName + ": opID:"
+ + operationID + " enable:" + enable);
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName
+ + "notifyContaminantEnabledStatus: opID:"
+ + operationID + " failed. err:" + retval);
+ }
+ }
+
+ @Override
+ public void notifyLimitPowerTransferStatus(String portName, boolean limit, int retval,
+ long operationID) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, portName + ": opID:"
+ + operationID + " successful");
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName
+ + "notifyLimitPowerTransferStatus: opID:"
+ + operationID + " failed. err:" + retval);
+ }
+ try {
+ IUsbOperationInternal callback = sCallbacks.get(operationID);
+ if (callback != null) {
+ sCallbacks.get(operationID).onOperationComplete(retval == Status.SUCCESS
+ ? USB_OPERATION_SUCCESS
+ : USB_OPERATION_ERROR_INTERNAL);
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(mPw,
+ "enableLimitPowerTransfer: Failed to call onOperationComplete",
+ e);
+ }
+ }
+ }
+}
diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java
new file mode 100644
index 0000000..90c8909
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2021 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.usb.hal.port;
+
+import android.annotation.IntDef;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbManager.UsbHalVersion;
+import android.os.RemoteException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.String;
+
+/**
+ * @hide
+ */
+public interface UsbPortHal {
+ /**
+ * Power role: This USB port can act as a source (provide power).
+ * @hide
+ */
+ public static final int HAL_POWER_ROLE_SOURCE = 1;
+
+ /**
+ * Power role: This USB port can act as a sink (receive power).
+ * @hide
+ */
+ public static final int HAL_POWER_ROLE_SINK = 2;
+
+ @IntDef(prefix = { "HAL_POWER_ROLE_" }, value = {
+ HAL_POWER_ROLE_SOURCE,
+ HAL_POWER_ROLE_SINK
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface HalUsbPowerRole{}
+
+ /**
+ * Data role: This USB port can act as a host (access data services).
+ * @hide
+ */
+ public static final int HAL_DATA_ROLE_HOST = 1;
+
+ /**
+ * Data role: This USB port can act as a device (offer data services).
+ * @hide
+ */
+ public static final int HAL_DATA_ROLE_DEVICE = 2;
+
+ @IntDef(prefix = { "HAL_DATA_ROLE_" }, value = {
+ HAL_DATA_ROLE_HOST,
+ HAL_DATA_ROLE_DEVICE
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface HalUsbDataRole{}
+
+ /**
+ * This USB port can act as a downstream facing port (host).
+ *
+ * @hide
+ */
+ public static final int HAL_MODE_DFP = 1;
+
+ /**
+ * This USB port can act as an upstream facing port (device).
+ *
+ * @hide
+ */
+ public static final int HAL_MODE_UFP = 2;
+ @IntDef(prefix = { "HAL_MODE_" }, value = {
+ HAL_MODE_DFP,
+ HAL_MODE_UFP,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ @interface HalUsbPortMode{}
+
+ /**
+ * UsbPortManager would call this when the system is done booting.
+ */
+ public void systemReady();
+
+ /**
+ * Invoked to enable/disable contaminant presence detection on the USB port.
+ *
+ * @param portName Port Identifier.
+ * @param enable Enable contaminant presence detection when true.
+ * Disable when false.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ */
+ public void enableContaminantPresenceDetection(String portName, boolean enable,
+ long transactionId);
+
+ /**
+ * Invoked to query port status of all the ports.
+ *
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ */
+ public void queryPortStatus(long transactionId);
+
+ /**
+ * Invoked to switch USB port mode.
+ *
+ * @param portName Port Identifier.
+ * @param mode New mode that the port is switching into.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ */
+ public void switchMode(String portName, @HalUsbPortMode int mode, long transactionId);
+
+ /**
+ * Invoked to switch USB port power role.
+ *
+ * @param portName Port Identifier.
+ * @param powerRole New power role that the port is switching into.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ */
+ public void switchPowerRole(String portName, @HalUsbPowerRole int powerRole,
+ long transactionId);
+
+ /**
+ * Invoked to switch USB port data role.
+ *
+ * @param portName Port Identifier.
+ * @param dataRole New data role that the port is switching into.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ */
+ public void switchDataRole(String portName, @HalUsbDataRole int dataRole, long transactionId);
+
+ /**
+ * Invoked to query the version of current hal implementation.
+ */
+ public @UsbHalVersion int getUsbHalVersion() throws RemoteException;
+
+ /**
+ * Invoked to enable/disable UsbData on the specified port.
+ *
+ * @param portName Port Identifier.
+ * @param enable Enable USB data when true.
+ * Disable when false.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ * @param callback callback object to be invoked to invoke the status of the operation upon
+ * completion.
+ * @param callback callback object to be invoked when the operation is complete.
+ * @return True when the operation is asynchronous. The caller of
+ * {@link UsbOperationCallbackInternal} must therefore call
+ * {@link UsbOperationCallbackInternal#waitForOperationComplete} for processing
+ * the result.
+ * False when the operation is synchronous. Caller can proceed reading the result
+ * through {@link UsbOperationCallbackInternal#getStatus}
+ */
+ public boolean enableUsbData(String portName, boolean enable, long transactionId,
+ IUsbOperationInternal callback);
+
+ /**
+ * Invoked to enableLimitPowerTransfer on the specified port.
+ *
+ * @param portName Port Identifier.
+ * @param limit limit power transfer when true. Port wouldn't charge or power USB accessoried
+ * when set.
+ * Lift power transfer restrictions when false.
+ * @param transactionId Used for tracking the current request and is passed down to the HAL
+ * implementation as needed.
+ * @param callback callback object to be invoked to invoke the status of the operation upon
+ * completion.
+ */
+ public void enableLimitPowerTransfer(String portName, boolean limit, long transactionId,
+ IUsbOperationInternal callback);
+}
diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java
new file mode 100644
index 0000000..41f9fae
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.usb.hal.port;
+
+import static com.android.server.usb.UsbPortManager.logAndPrint;
+
+import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.usb.hal.port.UsbPortHidl;
+import com.android.server.usb.hal.port.UsbPortAidl;
+import com.android.server.usb.UsbPortManager;
+
+import android.util.Log;
+/**
+ * Helper class that queries the underlying hal layer to populate UsbPortHal instance.
+ */
+public final class UsbPortHalInstance {
+
+ public static UsbPortHal getInstance(UsbPortManager portManager, IndentingPrintWriter pw) {
+
+ logAndPrint(Log.DEBUG, null, "Querying USB HAL version");
+ if (UsbPortHidl.isServicePresent(null)) {
+ logAndPrint(Log.INFO, null, "USB HAL HIDL present");
+ return new UsbPortHidl(portManager, pw);
+ }
+ if (UsbPortAidl.isServicePresent(null)) {
+ logAndPrint(Log.INFO, null, "USB HAL AIDL present");
+ return new UsbPortAidl(portManager, pw);
+ }
+
+ return null;
+ }
+}
diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortHidl.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortHidl.java
new file mode 100644
index 0000000..8a0370a
--- /dev/null
+++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortHidl.java
@@ -0,0 +1,485 @@
+/*
+ * Copyright (C) 2021 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.usb.hal.port;
+
+import static android.hardware.usb.UsbManager.USB_HAL_NOT_SUPPORTED;
+import static android.hardware.usb.UsbManager.USB_HAL_V1_0;
+import static android.hardware.usb.UsbManager.USB_HAL_V1_1;
+import static android.hardware.usb.UsbManager.USB_HAL_V1_2;
+import static android.hardware.usb.UsbManager.USB_HAL_V1_3;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_INTERNAL;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_ERROR_NOT_SUPPORTED;
+import static android.hardware.usb.UsbOperationInternal.USB_OPERATION_SUCCESS;
+import static android.hardware.usb.UsbPortStatus.CONTAMINANT_DETECTION_NOT_SUPPORTED;
+import static android.hardware.usb.UsbPortStatus.CONTAMINANT_PROTECTION_NONE;
+import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
+import static android.hardware.usb.UsbPortStatus.DATA_ROLE_HOST;
+import static android.hardware.usb.UsbPortStatus.MODE_DFP;
+import static android.hardware.usb.UsbPortStatus.MODE_DUAL;
+import static android.hardware.usb.UsbPortStatus.MODE_UFP;
+import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
+import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
+
+import static com.android.server.usb.UsbPortManager.logAndPrint;
+import static com.android.server.usb.UsbPortManager.logAndPrintException;
+
+import android.annotation.Nullable;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbManager.UsbHalVersion;
+import android.hardware.usb.UsbPort;
+import android.hardware.usb.V1_0.IUsb;
+import android.hardware.usb.V1_0.PortRoleType;
+import android.hardware.usb.V1_0.Status;
+import android.hardware.usb.V1_1.PortStatus_1_1;
+import android.hardware.usb.V1_2.IUsbCallback;
+import android.hardware.usb.V1_0.PortRole;
+import android.hardware.usb.V1_2.PortStatus;
+import android.hidl.manager.V1_0.IServiceManager;
+import android.hidl.manager.V1_0.IServiceNotification;
+import android.os.IHwBinder;
+import android.os.RemoteException;
+import android.util.Log;
+import android.util.Slog;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.usb.UsbPortManager;
+import com.android.server.usb.hal.port.RawPortInfo;
+
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+/**
+ *
+ */
+public final class UsbPortHidl implements UsbPortHal {
+ private static final String TAG = UsbPortHidl.class.getSimpleName();
+ // Cookie sent for usb hal death notification.
+ private static final int USB_HAL_DEATH_COOKIE = 1000;
+ // Proxy object for the usb hal daemon.
+ @GuardedBy("mLock")
+ private IUsb mProxy;
+ private UsbPortManager mPortManager;
+ public IndentingPrintWriter mPw;
+ // Mutex for all mutable shared state.
+ private final Object mLock = new Object();
+ // Callback when the UsbPort status is changed by the kernel.
+ private HALCallback mHALCallback;
+ private boolean mSystemReady;
+ // Workaround since HIDL HAL versions report UsbDataEnabled status in UsbPortStatus;
+ private static boolean sUsbDataEnabled = true;
+
+ public @UsbHalVersion int getUsbHalVersion() throws RemoteException {
+ int version;
+ synchronized(mLock) {
+ if (mProxy == null) {
+ throw new RemoteException("IUsb not initialized yet");
+ }
+ if (android.hardware.usb.V1_3.IUsb.castFrom(mProxy) != null) {
+ version = USB_HAL_V1_3;
+ } else if (android.hardware.usb.V1_2.IUsb.castFrom(mProxy) != null) {
+ version = USB_HAL_V1_2;
+ } else if (android.hardware.usb.V1_1.IUsb.castFrom(mProxy) != null) {
+ version = USB_HAL_V1_1;
+ } else {
+ version = USB_HAL_V1_0;
+ }
+ logAndPrint(Log.INFO, null, "USB HAL HIDL version: " + version);
+ return version;
+ }
+ }
+
+ final class DeathRecipient implements IHwBinder.DeathRecipient {
+ public IndentingPrintWriter pw;
+
+ DeathRecipient(IndentingPrintWriter pw) {
+ this.pw = pw;
+ }
+
+ @Override
+ public void serviceDied(long cookie) {
+ if (cookie == USB_HAL_DEATH_COOKIE) {
+ logAndPrint(Log.ERROR, pw, "Usb hal service died cookie: " + cookie);
+ synchronized (mLock) {
+ mProxy = null;
+ }
+ }
+ }
+ }
+
+ final class ServiceNotification extends IServiceNotification.Stub {
+ @Override
+ public void onRegistration(String fqName, String name, boolean preexisting) {
+ logAndPrint(Log.INFO, null, "Usb hal service started " + fqName + " " + name);
+ connectToProxy(null);
+ }
+ }
+
+ private void connectToProxy(IndentingPrintWriter pw) {
+ synchronized (mLock) {
+ if (mProxy != null) {
+ return;
+ }
+
+ try {
+ mProxy = IUsb.getService();
+ mProxy.linkToDeath(new DeathRecipient(pw), USB_HAL_DEATH_COOKIE);
+ mProxy.setCallback(mHALCallback);
+ mProxy.queryPortStatus();
+ //updateUsbHalVersion();
+ } catch (NoSuchElementException e) {
+ logAndPrintException(pw, "connectToProxy: usb hal service not found."
+ + " Did the service fail to start?", e);
+ } catch (RemoteException e) {
+ logAndPrintException(pw, "connectToProxy: usb hal service not responding", e);
+ }
+ }
+ }
+
+ @Override
+ public void systemReady() {
+ mSystemReady = true;
+ }
+
+ static boolean isServicePresent(IndentingPrintWriter pw) {
+ try {
+ IUsb.getService(true);
+ } catch (NoSuchElementException e) {
+ logAndPrintException(pw, "connectToProxy: usb hidl hal service not found.", e);
+ return false;
+ } catch (RemoteException e) {
+ logAndPrintException(pw, "IUSB hal service present but failed to get service", e);
+ }
+
+ return true;
+ }
+
+ public UsbPortHidl(UsbPortManager portManager, IndentingPrintWriter pw) {
+ mPortManager = Objects.requireNonNull(portManager);
+ mPw = pw;
+ mHALCallback = new HALCallback(null, mPortManager, this);
+ try {
+ ServiceNotification serviceNotification = new ServiceNotification();
+
+ boolean ret = IServiceManager.getService()
+ .registerForNotifications("android.hardware.usb@1.0::IUsb",
+ "", serviceNotification);
+ if (!ret) {
+ logAndPrint(Log.ERROR, null,
+ "Failed to register service start notification");
+ }
+ } catch (RemoteException e) {
+ logAndPrintException(null,
+ "Failed to register service start notification", e);
+ return;
+ }
+ connectToProxy(mPw);
+ }
+
+ @Override
+ public void enableContaminantPresenceDetection(String portName, boolean enable,
+ long transactionId) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry !");
+ return;
+ }
+
+ try {
+ // Oneway call into the hal. Use the castFrom method from HIDL.
+ android.hardware.usb.V1_2.IUsb proxy =
+ android.hardware.usb.V1_2.IUsb.castFrom(mProxy);
+ proxy.enableContaminantPresenceDetection(portName, enable);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set contaminant detection", e);
+ } catch (ClassCastException e) {
+ logAndPrintException(mPw, "Method only applicable to V1.2 or above implementation",
+ e);
+ }
+ }
+ }
+
+ @Override
+ public void queryPortStatus(long transactionId) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry !");
+ return;
+ }
+
+ try {
+ mProxy.queryPortStatus();
+ } catch (RemoteException e) {
+ logAndPrintException(null, "ServiceStart: Failed to query port status", e);
+ }
+ }
+ }
+
+ @Override
+ public void switchMode(String portId, @HalUsbPortMode int newMode, long transactionId) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry !");
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.type = PortRoleType.MODE;
+ newRole.role = newMode;
+ try {
+ mProxy.switchRole(portId, newRole);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB port mode: "
+ + "portId=" + portId
+ + ", newMode=" + UsbPort.modeToString(newRole.role), e);
+ }
+ }
+ }
+
+ @Override
+ public void switchPowerRole(String portId, @HalUsbPowerRole int newPowerRole,
+ long transactionId) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry !");
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.type = PortRoleType.POWER_ROLE;
+ newRole.role = newPowerRole;
+ try {
+ mProxy.switchRole(portId, newRole);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB power role: portId=" + portId
+ + ", newPowerRole=" + UsbPort.powerRoleToString(newRole.role), e);
+ }
+ }
+ }
+
+ @Override
+ public void enableLimitPowerTransfer(String portName, boolean limit, long transactionId,
+ IUsbOperationInternal callback) {
+ /* Not supported in HIDL hals*/
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_NOT_SUPPORTED);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to call onOperationComplete", e);
+ }
+ }
+
+ @Override
+ public void switchDataRole(String portId, @HalUsbDataRole int newDataRole, long transactionId) {
+ synchronized (mLock) {
+ if (mProxy == null) {
+ logAndPrint(Log.ERROR, mPw, "Proxy is null. Retry !");
+ return;
+ }
+
+ PortRole newRole = new PortRole();
+ newRole.type = PortRoleType.DATA_ROLE;
+ newRole.role = newDataRole;
+ try {
+ mProxy.switchRole(portId, newRole);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to set the USB data role: portId=" + portId
+ + ", newDataRole=" + UsbPort.dataRoleToString(newRole.role), e);
+ }
+ }
+ }
+
+ @Override
+ public boolean enableUsbData(String portName, boolean enable, long transactionId,
+ IUsbOperationInternal callback) {
+ int halVersion;
+
+ try {
+ halVersion = getUsbHalVersion();
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to query USB HAL version. opID:"
+ + transactionId
+ + " portId:" + portName, e);
+ return false;
+ }
+
+ if (halVersion != USB_HAL_V1_3) {
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_NOT_SUPPORTED);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed to call onOperationComplete. opID:"
+ + transactionId
+ + " portId:" + portName, e);
+ }
+ return false;
+ }
+
+ boolean success;
+ synchronized(mLock) {
+ try {
+ android.hardware.usb.V1_3.IUsb proxy
+ = android.hardware.usb.V1_3.IUsb.castFrom(mProxy);
+ success = proxy.enableUsbDataSignal(enable);
+ } catch (RemoteException e) {
+ logAndPrintException(mPw, "Failed enableUsbData: opId:" + transactionId
+ + " portId=" + portName , e);
+ try {
+ callback.onOperationComplete(USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException r) {
+ logAndPrintException(mPw, "Failed to call onOperationComplete. opID:"
+ + transactionId
+ + " portId:" + portName, r);
+ }
+ return false;
+ }
+ }
+ if (success) {
+ sUsbDataEnabled = enable;
+ }
+
+ try {
+ callback.onOperationComplete(success
+ ? USB_OPERATION_SUCCESS
+ : USB_OPERATION_ERROR_INTERNAL);
+ } catch (RemoteException r) {
+ logAndPrintException(mPw, "Failed to call onOperationComplete. opID:"
+ + transactionId
+ + " portId:" + portName, r);
+ }
+ return false;
+ }
+
+ private static class HALCallback extends IUsbCallback.Stub {
+ public IndentingPrintWriter mPw;
+ public UsbPortManager mPortManager;
+ public UsbPortHidl mUsbPortHidl;
+
+ HALCallback(IndentingPrintWriter pw, UsbPortManager portManager, UsbPortHidl usbPortHidl) {
+ this.mPw = pw;
+ this.mPortManager = portManager;
+ this.mUsbPortHidl = usbPortHidl;
+ }
+
+ public void notifyPortStatusChange(
+ ArrayList<android.hardware.usb.V1_0.PortStatus> currentPortStatus, int retval) {
+ if (!mUsbPortHidl.mSystemReady) {
+ return;
+ }
+
+ if (retval != Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, "port status enquiry failed");
+ return;
+ }
+
+ ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
+
+ for (android.hardware.usb.V1_0.PortStatus current : currentPortStatus) {
+ RawPortInfo temp = new RawPortInfo(current.portName,
+ current.supportedModes, CONTAMINANT_PROTECTION_NONE,
+ current.currentMode,
+ current.canChangeMode, current.currentPowerRole,
+ current.canChangePowerRole,
+ current.currentDataRole, current.canChangeDataRole,
+ false, CONTAMINANT_PROTECTION_NONE,
+ false, CONTAMINANT_DETECTION_NOT_SUPPORTED, sUsbDataEnabled,
+ false);
+ newPortInfo.add(temp);
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "ClientCallback V1_0: "
+ + current.portName);
+ }
+
+ mPortManager.updatePorts(newPortInfo);
+ }
+
+
+ public void notifyPortStatusChange_1_1(ArrayList<PortStatus_1_1> currentPortStatus,
+ int retval) {
+ if (!mUsbPortHidl.mSystemReady) {
+ return;
+ }
+
+ if (retval != Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, "port status enquiry failed");
+ return;
+ }
+
+ ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
+
+ int numStatus = currentPortStatus.size();
+ for (int i = 0; i < numStatus; i++) {
+ PortStatus_1_1 current = currentPortStatus.get(i);
+ RawPortInfo temp = new RawPortInfo(current.status.portName,
+ current.supportedModes, CONTAMINANT_PROTECTION_NONE,
+ current.currentMode,
+ current.status.canChangeMode, current.status.currentPowerRole,
+ current.status.canChangePowerRole,
+ current.status.currentDataRole, current.status.canChangeDataRole,
+ false, CONTAMINANT_PROTECTION_NONE,
+ false, CONTAMINANT_DETECTION_NOT_SUPPORTED, sUsbDataEnabled,
+ false);
+ newPortInfo.add(temp);
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "ClientCallback V1_1: "
+ + current.status.portName);
+ }
+ mPortManager.updatePorts(newPortInfo);
+ }
+
+ public void notifyPortStatusChange_1_2(
+ ArrayList<PortStatus> currentPortStatus, int retval) {
+ if (!mUsbPortHidl.mSystemReady) {
+ return;
+ }
+
+ if (retval != Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, "port status enquiry failed");
+ return;
+ }
+
+ ArrayList<RawPortInfo> newPortInfo = new ArrayList<>();
+
+ int numStatus = currentPortStatus.size();
+ for (int i = 0; i < numStatus; i++) {
+ PortStatus current = currentPortStatus.get(i);
+ RawPortInfo temp = new RawPortInfo(current.status_1_1.status.portName,
+ current.status_1_1.supportedModes,
+ current.supportedContaminantProtectionModes,
+ current.status_1_1.currentMode,
+ current.status_1_1.status.canChangeMode,
+ current.status_1_1.status.currentPowerRole,
+ current.status_1_1.status.canChangePowerRole,
+ current.status_1_1.status.currentDataRole,
+ current.status_1_1.status.canChangeDataRole,
+ current.supportsEnableContaminantPresenceProtection,
+ current.contaminantProtectionStatus,
+ current.supportsEnableContaminantPresenceDetection,
+ current.contaminantDetectionStatus,
+ sUsbDataEnabled,
+ false);
+ newPortInfo.add(temp);
+ UsbPortManager.logAndPrint(Log.INFO, mPw, "ClientCallback V1_2: "
+ + current.status_1_1.status.portName);
+ }
+ mPortManager.updatePorts(newPortInfo);
+ }
+
+ public void notifyRoleSwitchStatus(String portName, PortRole role, int retval) {
+ if (retval == Status.SUCCESS) {
+ UsbPortManager.logAndPrint(Log.INFO, mPw, portName + " role switch successful");
+ } else {
+ UsbPortManager.logAndPrint(Log.ERROR, mPw, portName + " role switch failed");
+ }
+ }
+ }
+}
diff --git a/services/wallpapereffectsgeneration/OWNERS b/services/wallpapereffectsgeneration/OWNERS
new file mode 100644
index 0000000..d2d3e2c0
--- /dev/null
+++ b/services/wallpapereffectsgeneration/OWNERS
@@ -0,0 +1,4 @@
+susharon@google.com
+shanh@google.com
+huiwu@google.com
+srazdan@google.com
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 21967f4..d5c846d 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -175,7 +175,10 @@
/**
* This flag specifies whether VoLTE availability is based on provisioning. By default this is
* false.
+ * Used for UCE to determine if EAB provisioning checks should be based on provisioning.
+ * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead.
*/
+ @Deprecated
public static final String
KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
@@ -879,7 +882,12 @@
/**
* Flag specifying whether provisioning is required for VoLTE, Video Telephony, and WiFi
* Calling.
+
+ * Combines VoLTE, VT, VoWiFI calling provisioning into one parameter.
+ * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for
+ * finer-grained control.
*/
+ @Deprecated
public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
= "carrier_volte_provisioning_required_bool";
@@ -893,7 +901,11 @@
* and enable the UT over IMS capability for the subscription when the subscription is loaded.
*
* The default value for this key is {@code false}.
+ *
+ * @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for
+ * determining if UT requires provisioning.
*/
+ @Deprecated
public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL =
"carrier_ut_provisioning_required_bool";
@@ -5173,6 +5185,95 @@
/** E911 RTP inactivity occurred when call is connected. */
public static final int E911_RTP_INACTIVITY_ON_CONNECTED = 4;
+ /**
+ * A bundle which specifies the MMTEL capability and registration technology
+ * that requires provisioning. If a tuple is not present, the
+ * framework will not require that the tuple requires provisioning before
+ * enabling the capability.
+ * <p> Possible keys in this bundle are
+ * <ul>
+ * <li>{@link #KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY}</li>
+ * <li>{@link #KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY}</li>
+ * <li>{@link #KEY_CAPABILITY_TYPE_UT_INT_ARRAY}</li>
+ * <li>{@link #KEY_CAPABILITY_TYPE_SMS_INT_ARRAY}</li>
+ * <li>{@link #KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY}</li>
+ * </ul>
+ * <p> The values are defined in
+ * {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
+ */
+ public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE =
+ KEY_PREFIX + "mmtel_requires_provisioning_bundle";
+
+ /**
+ * This MmTelFeature supports Voice calling (IR.92)
+ * @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VOICE
+ */
+ public static final String KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_voice_int_array";
+
+ /**
+ * This MmTelFeature supports Video (IR.94)
+ * @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VIDEO
+ */
+ public static final String KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_video_int_array";
+
+ /**
+ * This MmTelFeature supports XCAP over Ut for supplementary services. (IR.92)
+ * @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_UT
+ */
+ public static final String KEY_CAPABILITY_TYPE_UT_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_ut_int_array";
+
+ /**
+ * This MmTelFeature supports SMS (IR.92)
+ * @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_SMS
+ */
+ public static final String KEY_CAPABILITY_TYPE_SMS_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_sms_int_array";
+
+ /**
+ * This MmTelFeature supports Call Composer (section 2.4 of RCC.20)
+ * @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_CALL_COMPOSER
+ */
+ public static final String KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_call_composer_int_array";
+
+ /**
+ * A bundle which specifies the RCS capability and registration technology
+ * that requires provisioning. If a tuple is not present, the
+ * framework will not require that the tuple requires provisioning before
+ * enabling the capability.
+ * <p> Possible keys in this bundle are
+ * <ul>
+ * <li>{@link #KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY}</li>
+ * <li>{@link #KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY}</li>
+ * </ul>
+ * <p> The values are defined in
+ * {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
+ */
+ public static final String KEY_RCS_REQUIRES_PROVISIONING_BUNDLE =
+ KEY_PREFIX + "rcs_requires_provisioning_bundle";
+
+ /**
+ * This carrier supports User Capability Exchange using SIP OPTIONS as defined by the
+ * framework. If set, the RcsFeature should support capability exchange using SIP OPTIONS.
+ * If not set, this RcsFeature should not service capability requests.
+ * @see RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE
+ */
+ public static final String KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_options_uce_int_array";
+
+ /**
+ * This carrier supports User Capability Exchange using a presence server as defined by the
+ * framework. If set, the RcsFeature should support capability exchange using a presence
+ * server. If not set, this RcsFeature should not publish capabilities or service capability
+ * requests using presence.
+ * @see RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE
+ */
+ public static final String KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY =
+ KEY_PREFIX + "key_capability_type_presence_uce_int_array";
+
private Ims() {}
private static PersistableBundle getDefaults() {
@@ -5209,6 +5310,20 @@
"+g.gsma.rcs.botversion=\"#=1,#=2\"",
"+g.gsma.rcs.cpimext"});
+ /**
+ * @see #KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
+ */
+ PersistableBundle mmtel_requires_provisioning_int_array = new PersistableBundle();
+ defaults.putPersistableBundle(
+ KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE, mmtel_requires_provisioning_int_array);
+
+ /**
+ * @see #KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
+ */
+ PersistableBundle rcs_requires_provisioning_int_array = new PersistableBundle();
+ defaults.putPersistableBundle(
+ KEY_RCS_REQUIRES_PROVISIONING_BUNDLE, rcs_requires_provisioning_int_array);
+
defaults.putBoolean(KEY_GRUU_ENABLED_BOOL, true);
defaults.putBoolean(KEY_SIP_OVER_IPSEC_ENABLED_BOOL, true);
defaults.putBoolean(KEY_KEEP_PDN_UP_IN_NO_VOPS_BOOL, false);
@@ -7573,8 +7688,8 @@
public static final String KEY_EPDG_PCO_ID_IPV4_INT = KEY_PREFIX + "epdg_pco_id_ipv4_int";
/** Controls if the IKE tunnel setup supports EAP-AKA fast reauth */
- public static final String KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL =
- KEY_PREFIX + "enable_support_for_eap_aka_fast_reauth_bool";
+ public static final String KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL =
+ KEY_PREFIX + "supports_eap_aka_fast_reauth_bool";
/** @hide */
@IntDef({AUTHENTICATION_METHOD_EAP_ONLY, AUTHENTICATION_METHOD_CERT})
@@ -7722,7 +7837,7 @@
defaults.putBoolean(KEY_ADD_KE_TO_CHILD_SESSION_REKEY_BOOL, false);
defaults.putInt(KEY_EPDG_PCO_ID_IPV6_INT, 0);
defaults.putInt(KEY_EPDG_PCO_ID_IPV4_INT, 0);
- defaults.putBoolean(KEY_ENABLE_SUPPORT_FOR_EAP_AKA_FAST_REAUTH_BOOL, false);
+ defaults.putBoolean(KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL, false);
return defaults;
}
diff --git a/telephony/java/android/telephony/ImsManager.java b/telephony/java/android/telephony/ImsManager.java
index 2758e12..b0ff949 100644
--- a/telephony/java/android/telephony/ImsManager.java
+++ b/telephony/java/android/telephony/ImsManager.java
@@ -163,6 +163,26 @@
return new SipDelegateManager(mContext, subscriptionId, sRcsCache, sTelephonyCache);
}
+
+ /**
+ * Create an instance of {@link ProvisioningManager} for the subscription id specified.
+ * <p>
+ * Provides a ProvisioningManager instance to carrier apps to update carrier provisioning
+ * information, as well as provides a callback so that apps can listen for changes
+ * in MMTEL/RCS provisioning
+ * @param subscriptionId The ID of the subscription that this ProvisioningManager will use.
+ * @throws IllegalArgumentException if the subscription is invalid.
+ * @return a ProvisioningManager instance with the specific subscription ID.
+ */
+ @NonNull
+ public ProvisioningManager getProvisioningManager(int subscriptionId) {
+ if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
+ throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId);
+ }
+
+ return new ProvisioningManager(subscriptionId);
+ }
+
private static IImsRcsController getIImsRcsControllerInterface() {
return IImsRcsController.Stub.asInterface(
TelephonyFrameworkInitializer
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 574a356..250e55c 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -3892,6 +3892,11 @@
* {@link #PHONE_NUMBER_SOURCE_UICC UICC} and decide if the previously set phone number
* of source {@link #PHONE_NUMBER_SOURCE_CARRIER carrier} should be updated.
*
+ * <p>The API provides no guarantees of what format the number is in: the format can vary
+ * depending on the {@code source} and the network etc. Programmatic parsing should be done
+ * cautiously, for example, after formatting the number to a consistent format with
+ * {@link android.telephony.PhoneNumberUtils#formatNumberToE164(String, String)}.
+ *
* <p>Note the assumption is that one subscription (which usually means one SIM) has
* only one phone number. The multiple sources backup each other so hopefully at least one
* is availavle. For example, for a carrier that doesn't typically set phone numbers
@@ -3950,6 +3955,11 @@
* from available sources in the following order: {@link #PHONE_NUMBER_SOURCE_CARRIER}
* > {@link #PHONE_NUMBER_SOURCE_UICC} > {@link #PHONE_NUMBER_SOURCE_IMS}.
*
+ * <p>The API provides no guarantees of what format the number is in: the format can vary
+ * depending on the underlying source and the network etc. Programmatic parsing should be done
+ * cautiously, for example, after formatting the number to a consistent format with
+ * {@link android.telephony.PhoneNumberUtils#formatNumberToE164(String, String)}.
+ *
* @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}
* for the default one.
* @return the phone number, or an empty string if not available.
@@ -3988,6 +3998,9 @@
* <p>The API is suitable for carrier apps to provide a phone number, for example when
* it's not possible to update {@link #PHONE_NUMBER_SOURCE_UICC UICC} directly.
*
+ * <p>It's recommended that the phone number is formatted to well-known formats,
+ * for example, by {@link PhoneNumberUtils} {@code formatNumber*} methods.
+ *
* @param subscriptionId the subscription ID, or {@link #DEFAULT_SUBSCRIPTION_ID}
* for the default one.
* @param number the phone number, or an empty string to remove the previously set number.
diff --git a/telephony/java/android/telephony/ims/ProvisioningManager.java b/telephony/java/android/telephony/ims/ProvisioningManager.java
index dbf4c99..677c1a9 100644
--- a/telephony/java/android/telephony/ims/ProvisioningManager.java
+++ b/telephony/java/android/telephony/ims/ProvisioningManager.java
@@ -34,6 +34,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyFrameworkInitializer;
import android.telephony.TelephonyManager;
+import android.telephony.ims.aidl.IFeatureProvisioningCallback;
import android.telephony.ims.aidl.IImsConfigCallback;
import android.telephony.ims.aidl.IRcsConfigCallback;
import android.telephony.ims.feature.MmTelFeature;
@@ -54,18 +55,12 @@
* IMS provisioning keys are defined per carrier or OEM using OMA-DM or other provisioning
* applications and may vary. It is up to the carrier and OEM applications to ensure that the
* correct provisioning keys are being used when integrating with a vendor's ImsService.
- *
- * Note: For compatibility purposes, the integer values [0 - 99] used in
- * {@link #setProvisioningIntValue(int, int)} have been reserved for existing provisioning keys
- * previously defined in the Android framework. Please do not redefine new provisioning keys in this
- * range or it may generate collisions with existing keys. Some common constants have also been
- * defined in this class to make integrating with other system apps easier.
- * @hide
*/
-@SystemApi
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_IMS)
public class ProvisioningManager {
+ private static final String TAG = "ProvisioningManager";
+
/**@hide*/
@StringDef(prefix = "STRING_QUERY_RESULT_ERROR_", value = {
STRING_QUERY_RESULT_ERROR_GENERIC,
@@ -76,14 +71,18 @@
/**
* The query from {@link #getProvisioningStringValue(int)} has resulted in an unspecified error.
+ * @hide
*/
+ @SystemApi
public static final String STRING_QUERY_RESULT_ERROR_GENERIC =
"STRING_QUERY_RESULT_ERROR_GENERIC";
/**
* The query from {@link #getProvisioningStringValue(int)} has resulted in an error because the
* ImsService implementation was not ready for provisioning queries.
+ * @hide
*/
+ @SystemApi
public static final String STRING_QUERY_RESULT_ERROR_NOT_READY =
"STRING_QUERY_RESULT_ERROR_NOT_READY";
@@ -95,12 +94,16 @@
/**
* The integer result of provisioning for the queried key is disabled.
+ * @hide
*/
+ @SystemApi
public static final int PROVISIONING_VALUE_DISABLED = 0;
/**
* The integer result of provisioning for the queried key is enabled.
+ * @hide
*/
+ @SystemApi
public static final int PROVISIONING_VALUE_ENABLED = 1;
@@ -445,27 +448,31 @@
/**
* Override the user-defined WiFi Roaming enabled setting for this subscription, defined in
- * {@link SubscriptionManager#WFC_ROAMING_ENABLED_CONTENT_URI}, for the purposes of provisioning
- * the subscription for WiFi Calling.
+ * {@link android.telephony.SubscriptionManager#WFC_ROAMING_ENABLED_CONTENT_URI},
+ * for the purposes of provisioning the subscription for WiFi Calling.
*
- * @see #getProvisioningIntValue(int)
* @see #setProvisioningIntValue(int, int)
+ * @see #getProvisioningIntValue(int)
+ * @hide
*/
+ @SystemApi
public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26;
/**
* Override the user-defined WiFi mode for this subscription, defined in
- * {@link SubscriptionManager#WFC_MODE_CONTENT_URI}, for the purposes of provisioning
- * this subscription for WiFi Calling.
+ * {@link android.telephony.SubscriptionManager#WFC_MODE_CONTENT_URI},
+ * for the purposes of provisioning this subscription for WiFi Calling.
*
* Valid values for this key are:
* {@link ImsMmTelManager#WIFI_MODE_WIFI_ONLY},
* {@link ImsMmTelManager#WIFI_MODE_CELLULAR_PREFERRED}, or
* {@link ImsMmTelManager#WIFI_MODE_WIFI_PREFERRED}.
*
- * @see #getProvisioningIntValue(int)
* @see #setProvisioningIntValue(int, int)
+ * @see #getProvisioningIntValue(int)
+ * @hide
*/
+ @SystemApi
public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27;
/**
@@ -864,7 +871,9 @@
* <p>Value is in String format.
* @see #setProvisioningStringValue(int, String)
* @see #getProvisioningStringValue(int)
+ * @hide
*/
+ @SystemApi
public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67;
/**
@@ -886,7 +895,9 @@
/**
* Callback for IMS provisioning changes.
+ * @hide
*/
+ @SystemApi
public static class Callback {
private static class CallbackBinder extends IImsConfigCallback.Stub {
@@ -956,11 +967,105 @@
}
}
+ /**
+ * Callback for IMS provisioning feature changes.
+ */
+ public static class FeatureProvisioningCallback {
+
+ private static class CallbackBinder extends IFeatureProvisioningCallback.Stub {
+
+ private final FeatureProvisioningCallback mFeatureProvisioningCallback;
+ private Executor mExecutor;
+
+ private CallbackBinder(FeatureProvisioningCallback featureProvisioningCallback) {
+ mFeatureProvisioningCallback = featureProvisioningCallback;
+ }
+
+ @Override
+ public final void onFeatureProvisioningChanged(
+ int capability, int tech, boolean isProvisioned) {
+ final long callingIdentity = Binder.clearCallingIdentity();
+ try {
+ mExecutor.execute(() ->
+ mFeatureProvisioningCallback.onFeatureProvisioningChanged(
+ capability, tech, isProvisioned));
+ } finally {
+ restoreCallingIdentity(callingIdentity);
+ }
+ }
+
+ @Override
+ public final void onRcsFeatureProvisioningChanged(
+ int capability, int tech, boolean isProvisioned) {
+ final long callingIdentity = Binder.clearCallingIdentity();
+ try {
+ mExecutor.execute(() ->
+ mFeatureProvisioningCallback.onRcsFeatureProvisioningChanged(
+ capability, tech, isProvisioned));
+ } finally {
+ restoreCallingIdentity(callingIdentity);
+ }
+ }
+
+ private void setExecutor(Executor executor) {
+ mExecutor = executor;
+ }
+ }
+
+ private final CallbackBinder mBinder = new CallbackBinder(this);
+
+ /**
+ * The IMS MMTEL provisioning has changed for a specific capability and IMS
+ * registration technology.
+ * @param capability The MMTEL capability that provisioning has changed for.
+ * @param tech The IMS registration technology associated with the MMTEL capability that
+ * provisioning has changed for.
+ * @param isProvisioned {@code true} if the capability is provisioned for the technology
+ * specified, or {@code false} if the capability is not provisioned for the technology
+ * specified.
+ */
+ public void onFeatureProvisioningChanged(
+ @MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech,
+ boolean isProvisioned) {
+ // Base Implementation
+ }
+
+ /**
+ * The IMS RCS provisioning has changed for a specific capability and IMS
+ * registration technology.
+ * @param capability The RCS capability that provisioning has changed for.
+ * @param tech The IMS registration technology associated with the RCS capability that
+ * provisioning has changed for.
+ * @param isProvisioned {@code true} if the capability is provisioned for the technology
+ * specified, or {@code false} if the capability is not provisioned for the technology
+ * specified.
+ */
+ public void onRcsFeatureProvisioningChanged(
+ @RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech,
+ boolean isProvisioned) {
+ // Base Implementation
+ }
+
+ /**@hide*/
+ public final IFeatureProvisioningCallback getBinder() {
+ return mBinder;
+ }
+
+ /**@hide*/
+ public void setExecutor(Executor executor) {
+ mBinder.setExecutor(executor);
+ }
+ }
+
private int mSubId;
/**
* The callback for RCS provisioning changes.
+ * @hide
*/
+ @SystemApi
public static class RcsProvisioningCallback {
private static class CallbackBinder extends IRcsConfigCallback.Stub {
@@ -1098,7 +1203,9 @@
* @param subId The ID of the subscription that this ProvisioningManager will use.
* @see android.telephony.SubscriptionManager#getActiveSubscriptionInfoList()
* @throws IllegalArgumentException if the subscription is invalid.
+ * @hide
*/
+ @SystemApi
public static @NonNull ProvisioningManager createForSubscriptionId(int subId) {
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
throw new IllegalArgumentException("Invalid subscription ID");
@@ -1107,7 +1214,9 @@
return new ProvisioningManager(subId);
}
- private ProvisioningManager(int subId) {
+ /**@hide*/
+ //@SystemApi
+ public ProvisioningManager(int subId) {
mSubId = subId;
}
@@ -1116,6 +1225,12 @@
*
* When the subscription associated with this callback is removed (SIM removed, ESIM swap,
* etc...), this callback will automatically be removed.
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>
+ * </ul>
+ *
* @param executor The {@link Executor} to call the callback methods on
* @param callback The provisioning callbackto be registered.
* @see #unregisterProvisioningChangedCallback(Callback)
@@ -1126,7 +1241,9 @@
* the {@link ImsService} associated with the subscription is not available. This can happen if
* the service crashed, for example. See {@link ImsException#getCode()} for a more detailed
* reason.
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor,
@NonNull Callback callback) throws ImsException {
@@ -1144,12 +1261,20 @@
* Unregister an existing {@link Callback}. When the subscription associated with this
* callback is removed (SIM removed, ESIM swap, etc...), this callback will automatically be
* removed. If this method is called for an inactive subscription, it will result in a no-op.
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>
+ * </ul>
+ *
* @param callback The existing {@link Callback} to be removed.
* @see #registerProvisioningChangedCallback(Executor, Callback)
*
* @throws IllegalArgumentException if the subscription associated with this callback is
* invalid.
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void unregisterProvisioningChangedCallback(@NonNull Callback callback) {
try {
@@ -1160,6 +1285,62 @@
}
/**
+ * Register a new {@link FeatureProvisioningCallback}, which is used to listen for
+ * IMS feature provisioning updates.
+ * <p>
+ * When the subscription associated with this callback is removed (SIM removed,
+ * ESIM swap,etc...), this callback will automatically be removed.
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li> android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE,</li>
+ * <li>{@link android.Manifest.permission#READ_PRECISE_PHONE_STATE},</li>
+ * <li>or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @param executor The executor that the callback methods will be called on.
+ * @param callback The callback instance being registered.
+ * @throws ImsException if the subscription associated with this callback is
+ * valid, but the {@link ImsService the service crashed, for example. See
+ * {@link ImsException#getCode()} for a more detailed reason.
+ */
+ @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
+ public void registerFeatureProvisioningChangedCallback(
+ @NonNull @CallbackExecutor Executor executor,
+ @NonNull FeatureProvisioningCallback callback) throws ImsException {
+ callback.setExecutor(executor);
+ try {
+ getITelephony().registerFeatureProvisioningChangedCallback(mSubId,
+ callback.getBinder());
+ } catch (ServiceSpecificException e) {
+ throw new ImsException(e.getMessage(), e.errorCode);
+ } catch (RemoteException | IllegalStateException e) {
+ throw new ImsException(e.getMessage(), ImsException.CODE_ERROR_SERVICE_UNAVAILABLE);
+ }
+ }
+
+ /**
+ * Unregisters a previously registered {@link FeatureProvisioningCallback}
+ * instance. When the subscription associated with this
+ * callback is removed (SIM removed, ESIM swap, etc...), this callback will
+ * automatically be removed. If this method is called for an inactive
+ * subscription, it will result in a no-op.
+ *
+ * @param callback The existing {@link FeatureProvisioningCallback} to be removed.
+ * @see #registerFeatureProvisioningChangedCallback(Executor, FeatureProvisioningCallback)
+ */
+ public void unregisterFeatureProvisioningChangedCallback(
+ @NonNull FeatureProvisioningCallback callback) {
+ try {
+ getITelephony().unregisterFeatureProvisioningChangedCallback(mSubId,
+ callback.getBinder());
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+ /**
* Query for the integer value associated with the provided key.
*
* This operation is blocking and should not be performed on the UI thread.
@@ -1168,7 +1349,9 @@
* @return an integer value for the provided key, or
* {@link ImsConfigImplBase#CONFIG_RESULT_UNKNOWN} if the key doesn't exist.
* @throws IllegalArgumentException if the key provided was invalid.
+ * @hide
*/
+ @SystemApi
@WorkerThread
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getProvisioningIntValue(int key) {
@@ -1188,7 +1371,9 @@
* @return a String value for the provided key, {@code null} if the key doesn't exist, or
* {@link StringResultError} if there was an error getting the value for the provided key.
* @throws IllegalArgumentException if the key provided was invalid.
+ * @hide
*/
+ @SystemApi
@WorkerThread
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @Nullable @StringResultError String getProvisioningStringValue(int key) {
@@ -1209,7 +1394,15 @@
* @param key An integer that represents the provisioning key, which is defined by the OEM.
* @param value a integer value for the provided key.
* @return the result of setting the configuration value.
+ * @hide
+ *
+ * Note: For compatibility purposes, the integer values [0 - 99] used in
+ * {@link #setProvisioningIntValue(int, int)} have been reserved for existing provisioning keys
+ * previously defined in the Android framework. Please do not redefine new provisioning keys
+ * in this range or it may generate collisions with existing keys. Some common constants have
+ * also been defined in this class to make integrating with other system apps easier.
*/
+ @SystemApi
@WorkerThread
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public @ImsConfigImplBase.SetConfigResult int setProvisioningIntValue(int key, int value) {
@@ -1229,7 +1422,9 @@
* should be appropriately namespaced to avoid collision.
* @param value a String value for the provided key.
* @return the result of setting the configuration value.
+ * @hide
*/
+ @SystemApi
@WorkerThread
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public @ImsConfigImplBase.SetConfigResult int setProvisioningStringValue(int key,
@@ -1249,8 +1444,14 @@
* does not support the capability/technology combination specified, this operation will be a
* no-op.
*
- * @see CarrierConfigManager#KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL
- * @see CarrierConfigManager#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
+ * <p>Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#MODIFY_PHONE_STATE},</li>
+ * <li>or that the calling app has carrier privileges (see</li>
+ * <li>{@link TelephonyManager#hasCarrierPrivileges}).</li>
+ * </ul>
+ *
+ * @see CarrierConfigManager.Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
* @param isProvisioned true if the device is provisioned for UT over IMS, false otherwise.
*/
@WorkerThread
@@ -1258,9 +1459,10 @@
public void setProvisioningStatusForCapability(
@MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
@ImsRegistrationImplBase.ImsRegistrationTech int tech, boolean isProvisioned) {
+
try {
getITelephony().setImsProvisioningStatusForCapability(mSubId, capability, tech,
- isProvisioned);
+ isProvisioned);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -1274,14 +1476,21 @@
* {@link ImsRegistrationImplBase.ImsRegistrationTech} combination specified, this method will
* always return {@code true}.
*
- * @see CarrierConfigManager#KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL
- * @see CarrierConfigManager#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
+ * <p> Requires Permission:
+ * <ul>
+ * <li>android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE,</li>
+ * <li>{@link android.Manifest.permission#READ_PRECISE_PHONE_STATE},</li>
+ * <li>or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @see CarrierConfigManager.Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
* @return true if the device is provisioned for the capability or does not require
* provisioning, false if the capability does require provisioning and has not been
* provisioned yet.
*/
@WorkerThread
- @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
+ @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
public boolean getProvisioningStatusForCapability(
@MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
@ImsRegistrationImplBase.ImsRegistrationTech int tech) {
@@ -1299,17 +1508,93 @@
* {@link RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag} this method will always return
* {@code true}.
*
- * @see CarrierConfigManager#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
+ * @see CarrierConfigManager.Ims#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
* @return true if the device is provisioned for the capability or does not require
* provisioning, false if the capability does require provisioning and has not been
* provisioned yet.
+ * @deprecated Use {@link #getRcsProvisioningStatusForCapability(int, int)} instead,
+ * as this only retrieves provisioning information for
+ * {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE}
+ * @hide
*/
+ @Deprecated
+ @SystemApi
@WorkerThread
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean getRcsProvisioningStatusForCapability(
@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability) {
try {
- return getITelephony().getRcsProvisioningStatusForCapability(mSubId, capability);
+ return getITelephony().getRcsProvisioningStatusForCapability(mSubId, capability,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+ /**
+ * Get the provisioning status for the IMS RCS capability specified.
+ *
+ * If provisioning is not required for the queried
+ * {@link RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag} this method
+ * will always return {@code true}.
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#READ_PRECISE_PHONE_STATE},</li>
+ * <li>or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @see CarrierConfigManager.Ims#KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
+ * @return true if the device is provisioned for the capability or does not require
+ * provisioning, false if the capability does require provisioning and has not been
+ * provisioned yet.
+ */
+ @WorkerThread
+ @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
+ public boolean getRcsProvisioningStatusForCapability(
+ @RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech) {
+ try {
+ return getITelephony().getRcsProvisioningStatusForCapability(mSubId, capability, tech);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+ /**
+ * Set the provisioning status for the IMS RCS capability using the specified subscription.
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#MODIFY_PHONE_STATE}</li>
+ * <li>or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+
+ * Provisioning may or may not be required, depending on the carrier configuration. If
+ * provisioning is not required for the carrier associated with this subscription or the device
+ * does not support the capability/technology combination specified, this operation will be a
+ * no-op.
+ *
+ * @see CarrierConfigManager#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
+ * @param isProvisioned true if the device is provisioned for the RCS capability specified,
+ * false otherwise.
+ * @deprecated Use {@link #setRcsProvisioningStatusForCapability(int, int, boolean)} instead,
+ * as this method only sets provisioning information for
+ * {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE}
+ * @hide
+ */
+ @Deprecated
+ @SystemApi
+ @WorkerThread
+ @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
+ public void setRcsProvisioningStatusForCapability(
+ @RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
+ boolean isProvisioned) {
+ try {
+ getITelephony().setRcsProvisioningStatusForCapability(mSubId, capability,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE, isProvisioned);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
@@ -1323,7 +1608,14 @@
* does not support the capability/technology combination specified, this operation will be a
* no-op.
*
- * @see CarrierConfigManager#KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL
+ * <p> Requires Permission:
+ * <ul>
+ * <li>{@link android.Manifest.permission#MODIFY_PHONE_STATE},</li>
+ * <li>or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @see CarrierConfigManager.Ims#KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
* @param isProvisioned true if the device is provisioned for the RCS capability specified,
* false otherwise.
*/
@@ -1331,31 +1623,92 @@
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void setRcsProvisioningStatusForCapability(
@RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
- boolean isProvisioned) {
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech, boolean isProvisioned) {
try {
getITelephony().setRcsProvisioningStatusForCapability(mSubId, capability,
- isProvisioned);
+ tech, isProvisioned);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
}
/**
+ * Indicates whether provisioning for the MMTEL capability and IMS registration technology
+ * specified is required or not
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li> android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE,</li>
+ * <li>{@link android.Manifest.permission#READ_PRECISE_PHONE_STATE},</li>
+ * <li> or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @return true if provisioning is required for the MMTEL capability and IMS
+ * registration technology specified, false if it is not required.
+ */
+ @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
+ public boolean isProvisioningRequiredForCapability(
+ @MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech) {
+ try {
+ return getITelephony().isProvisioningRequiredForCapability(mSubId, capability, tech);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+
+ /**
+ * Indicates whether provisioning for the RCS capability and IMS registration technology
+ * specified is required or not
+ *
+ * <p> Requires Permission:
+ * <ul>
+ * <li> android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE,</li>
+ * <li>{@link android.Manifest.permission#READ_PRECISE_PHONE_STATE},</li>
+ * <li> or that the caller has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
+ * @return true if provisioning is required for the RCS capability and IMS
+ * registration technology specified, false if it is not required.
+ */
+ @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
+ public boolean isRcsProvisioningRequiredForCapability(
+ @RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int tech) {
+ try {
+ return getITelephony().isRcsProvisioningRequiredForCapability(mSubId, capability, tech);
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+
+ /**
* Notify the framework that an RCS autoconfiguration XML file has been received for
* provisioning.
- * <p>
- * Requires Permission: Manifest.permission.MODIFY_PHONE_STATE or that the calling app has
- * carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).
+ *
+ * <p>Requires Permission:
+ * <ul>
+ * <li>{@link Manifest.permission#MODIFY_PHONE_STATE},</li>
+ * <li>or that the calling app has carrier privileges (see
+ * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
+ * </ul>
+ *
* @param config The XML file to be read. ASCII/UTF8 encoded text if not compressed.
* @param isCompressed The XML file is compressed in gzip format and must be decompressed
* before being read.
- *
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
public void notifyRcsAutoConfigurationReceived(@NonNull byte[] config, boolean isCompressed) {
if (config == null) {
throw new IllegalArgumentException("Must include a non-null config XML file.");
}
+
try {
getITelephony().notifyRcsAutoConfigurationReceived(mSubId, config, isCompressed);
} catch (RemoteException e) {
@@ -1374,7 +1727,9 @@
* <p>Contains {@link #EXTRA_SUBSCRIPTION_ID} to specify the subscription index for which
* the intent is valid. and {@link #EXTRA_STATUS} to specify RCS VoLTE single registration
* status.
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE =
@@ -1382,7 +1737,9 @@
/**
* Integer extra to specify subscription index.
+ * @hide
*/
+ @SystemApi
public static final String EXTRA_SUBSCRIPTION_ID =
"android.telephony.ims.extra.SUBSCRIPTION_ID";
@@ -1392,22 +1749,30 @@
* <p>The value can be {@link #STATUS_CAPABLE}, {@link #STATUS_DEVICE_NOT_CAPABLE},
* {@link #STATUS_CARRIER_NOT_CAPABLE}, or bitwise OR of
* {@link #STATUS_DEVICE_NOT_CAPABLE} and {@link #STATUS_CARRIER_NOT_CAPABLE}.
+ * @hide
*/
+ @SystemApi
public static final String EXTRA_STATUS = "android.telephony.ims.extra.STATUS";
/**
* RCS VoLTE single registration is supported by the device and carrier.
+ * @hide
*/
+ @SystemApi
public static final int STATUS_CAPABLE = 0;
/**
* RCS VoLTE single registration is not supported by the device.
+ * @hide
*/
+ @SystemApi
public static final int STATUS_DEVICE_NOT_CAPABLE = 0x01;
/**
* RCS VoLTE single registration is not supported by the carrier
+ * @hide
*/
+ @SystemApi
public static final int STATUS_CARRIER_NOT_CAPABLE = 0x01 << 1;
/**
@@ -1417,11 +1782,14 @@
* provisioning is done using autoconfiguration, then these parameters shall be
* sent in the HTTP get request to fetch the RCS provisioning. RCS client
* configuration must be provided by the application before registering for the
- * provisioning status events {@link #registerRcsProvisioningCallback()}
+ * provisioning status events
+ * {@link #registerRcsProvisioningCallback(Executor, RcsProvisioningCallback)}
* When the IMS/RCS service receives the RCS client configuration, it will detect
* the change in the configuration, and trigger the auto-configuration as needed.
* @param rcc RCS client configuration {@link RcsClientConfiguration}
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
public void setRcsClientConfiguration(
@NonNull RcsClientConfiguration rcc) throws ImsException {
@@ -1442,18 +1810,21 @@
* <ul>
* <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>
* <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>
- * <li>or that the caller has carrier privileges (see
+ * <li>or that the calling app has carrier privileges (see
* {@link TelephonyManager#hasCarrierPrivileges()}).</li>
* </ul>
+ *
* @return true if IMS single registration is capable at this time, or false otherwise
- * @throws ImsException If the remote ImsService is not available for
- * any reason or the subscription associated with this instance is no
- * longer active. See {@link ImsException#getCode()} for more
- * information.
+ * @throws ImsException If the remote ImsService is not available for any reason or
+ * the subscription associated with this instance is no longer active.
+ * See {@link ImsException#getCode()} for more information.
* @see PackageManager#FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION for whether or not this
* device supports IMS single registration.
+ * @hide
*/
- @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
+ @SystemApi
+ @RequiresPermission(anyOf = {
+ Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})
public boolean isRcsVolteSingleRegistrationCapable() throws ImsException {
try {
@@ -1480,8 +1851,6 @@
* <ul>
* <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>
* <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>
- * <li>or that the caller has carrier privileges (see
- * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
* </ul>
*
* @param executor The {@link Executor} to call the callback methods on
@@ -1499,8 +1868,11 @@
* params (See {@link #setRcsClientConfiguration}) and re register the
* callback.
* See {@link ImsException#getCode()} for a more detailed reason.
+ * @hide
*/
- @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
+ @SystemApi
+ @RequiresPermission(anyOf = {
+ Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})
public void registerRcsProvisioningCallback(
@NonNull @CallbackExecutor Executor executor,
@@ -1527,8 +1899,6 @@
* <ul>
* <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>
* <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>
- * <li>or that the caller has carrier privileges (see
- * {@link TelephonyManager#hasCarrierPrivileges()}).</li>
* </ul>
*
* @param callback The existing {@link RcsProvisioningCallback} to be
@@ -1536,8 +1906,11 @@
* @see #registerRcsProvisioningCallback(Executor, RcsProvisioningCallback)
* @throws IllegalArgumentException if the subscription associated with
* this callback is invalid.
+ * @hide
*/
- @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
+ @SystemApi
+ @RequiresPermission(anyOf = {
+ Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})
public void unregisterRcsProvisioningCallback(
@NonNull RcsProvisioningCallback callback) {
@@ -1558,9 +1931,10 @@
* {@link RcsProvisioningCallback} may expect to receive
* {@link RcsProvisioningCallback#onConfigurationReset}, then
* {@link RcsProvisioningCallback#onConfigurationChanged} when the new
- * RCS configuration is received and notified by
- * {@link #notifyRcsAutoConfigurationReceived}
+ * RCS configuration is received and notified by {@link #notifyRcsAutoConfigurationReceived}
+ * @hide
*/
+ @SystemApi
@RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
public void triggerRcsReconfiguration() {
try {
diff --git a/telephony/java/android/telephony/ims/aidl/IFeatureProvisioningCallback.aidl b/telephony/java/android/telephony/ims/aidl/IFeatureProvisioningCallback.aidl
new file mode 100644
index 0000000..63ec4aa
--- /dev/null
+++ b/telephony/java/android/telephony/ims/aidl/IFeatureProvisioningCallback.aidl
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 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.telephony.ims.aidl;
+
+/**
+ * Provides callback interface for FeatureProvisioning when a value has changed.
+ *
+ * {@hide}
+ */
+oneway interface IFeatureProvisioningCallback {
+ void onFeatureProvisioningChanged(int capability, int tech, boolean isProvisioned);
+ void onRcsFeatureProvisioningChanged(int capability, int tech, boolean isProvisioned);
+}
diff --git a/telephony/java/android/telephony/ims/feature/MmTelFeature.java b/telephony/java/android/telephony/ims/feature/MmTelFeature.java
index 7fdf21b..ad2e9e1 100644
--- a/telephony/java/android/telephony/ims/feature/MmTelFeature.java
+++ b/telephony/java/android/telephony/ims/feature/MmTelFeature.java
@@ -394,6 +394,13 @@
public @interface MmTelCapability {}
/**
+ * Undefined capability type for initialization
+ * This is used to check the upper range of MmTel capability
+ * {@hide}
+ */
+ public static final int CAPABILITY_TYPE_NONE = 0;
+
+ /**
* This MmTelFeature supports Voice calling (IR.92)
*/
public static final int CAPABILITY_TYPE_VOICE = 1 << 0;
@@ -419,6 +426,12 @@
public static final int CAPABILITY_TYPE_CALL_COMPOSER = 1 << 4;
/**
+ * This is used to check the upper range of MmTel capability
+ * {@hide}
+ */
+ public static final int CAPABILITY_TYPE_MAX = CAPABILITY_TYPE_CALL_COMPOSER + 1;
+
+ /**
* @hide
*/
@Override
diff --git a/telephony/java/android/telephony/ims/feature/RcsFeature.java b/telephony/java/android/telephony/ims/feature/RcsFeature.java
index 11cf0e3..af7373b 100644
--- a/telephony/java/android/telephony/ims/feature/RcsFeature.java
+++ b/telephony/java/android/telephony/ims/feature/RcsFeature.java
@@ -59,9 +59,7 @@
/**
* Base implementation of the RcsFeature APIs. Any ImsService wishing to support RCS should extend
* this class and provide implementations of the RcsFeature methods that they support.
- * @hide
*/
-@SystemApi
public class RcsFeature extends ImsFeature {
private static final String LOG_TAG = "RcsFeature";
@@ -186,14 +184,14 @@
* Contains the capabilities defined and supported by a {@link RcsFeature} in the
* form of a bitmask. The capabilities that are used in the RcsFeature are
* defined as:
- * {@link RcsUceAdatper.RcsImsCapabilityFlag#CAPABILITY_TYPE_OPTIONS_UCE}
- * {@link RceUceAdapter.RcsImsCapabilityFlag#CAPABILITY_TYPE_PRESENCE_UCE}
+ * {RcsUceAdapter.RcsImsCapabilityFlag#CAPABILITY_TYPE_OPTIONS_UCE}
+ * {RcsUceAdapter.RcsImsCapabilityFlag#CAPABILITY_TYPE_PRESENCE_UCE}
*
* The enabled capabilities of this RcsFeature will be set by the framework
- * using {@link #changeEnabledCapabilities(CapabilityChangeRequest, CapabilityCallbackProxy)}.
+ * using {#changeEnabledCapabilities(CapabilityChangeRequest, CapabilityCallbackProxy)}.
* After the capabilities have been set, the RcsFeature may then perform the necessary bring up
* of the capability and notify the capability status as true using
- * {@link #notifyCapabilitiesStatusChanged(RcsImsCapabilities)}. This will signal to the
+ * {#notifyCapabilitiesStatusChanged(RcsImsCapabilities)}. This will signal to the
* framework that the capability is available for usage.
*/
public static class RcsImsCapabilities extends Capabilities {
@@ -227,10 +225,18 @@
public static final int CAPABILITY_TYPE_PRESENCE_UCE = 1 << 1;
/**
+ * This is used to check the upper range of RCS capability
+ * {@hide}
+ */
+ public static final int CAPABILITY_TYPE_MAX = CAPABILITY_TYPE_PRESENCE_UCE + 1;
+
+ /**
* Create a new {@link RcsImsCapabilities} instance with the provided capabilities.
* @param capabilities The capabilities that are supported for RCS in the form of a
* bitfield.
+ * @hide
*/
+ @SystemApi
public RcsImsCapabilities(@RcsUceAdapter.RcsImsCapabilityFlag int capabilities) {
super(capabilities);
}
@@ -243,17 +249,29 @@
super(capabilities.getMask());
}
+ /**
+ * @hide
+ */
@Override
+ @SystemApi
public void addCapabilities(@RcsUceAdapter.RcsImsCapabilityFlag int capabilities) {
super.addCapabilities(capabilities);
}
+ /**
+ * @hide
+ */
@Override
+ @SystemApi
public void removeCapabilities(@RcsUceAdapter.RcsImsCapabilityFlag int capabilities) {
super.removeCapabilities(capabilities);
}
+ /**
+ * @hide
+ */
@Override
+ @SystemApi
public boolean isCapable(@RcsUceAdapter.RcsImsCapabilityFlag int capabilities) {
return super.isCapable(capabilities);
}
@@ -270,7 +288,9 @@
* Method stubs called from the framework will be called asynchronously. To specify the
* {@link Executor} that the methods stubs will be called, use
* {@link RcsFeature#RcsFeature(Executor)} instead.
+ * @hide
*/
+ @SystemApi
public RcsFeature() {
super();
// Run on the Binder threads that call them.
@@ -282,7 +302,9 @@
* framework.
* @param executor The executor for the framework to use when executing the methods overridden
* by the implementation of RcsFeature.
+ * @hide
*/
+ @SystemApi
public RcsFeature(@NonNull Executor executor) {
super();
if (executor == null) {
@@ -301,7 +323,7 @@
* @hide
*/
@Override
- public void initialize(Context context, int slotId) {
+ public void initialize(@NonNull Context context, @NonNull int slotId) {
super.initialize(context, slotId);
// Notify that the RcsFeature is ready.
mExecutor.execute(() -> onFeatureReady());
@@ -313,8 +335,10 @@
* requests. To change the status of the capabilities
* {@link #notifyCapabilitiesStatusChanged(RcsImsCapabilities)} should be called.
* @return A copy of the current RcsFeature capability status.
+ * @hide
*/
@Override
+ @SystemApi
public @NonNull final RcsImsCapabilities queryCapabilityStatus() {
return new RcsImsCapabilities(super.queryCapabilityStatus());
}
@@ -324,7 +348,9 @@
* this signals to the framework that the capability has been initialized and is ready.
* Call {@link #queryCapabilityStatus()} to return the current capability status.
* @param capabilities The current capability status of the RcsFeature.
+ * @hide
*/
+ @SystemApi
public final void notifyCapabilitiesStatusChanged(@NonNull RcsImsCapabilities capabilities) {
if (capabilities == null) {
throw new IllegalArgumentException("RcsImsCapabilities must be non-null!");
@@ -341,7 +367,9 @@
* @param capability The capability that we are querying the configuration for.
* @param radioTech The radio technology type that we are querying.
* @return true if the capability is enabled, false otherwise.
+ * @hide
*/
+ @SystemApi
public boolean queryCapabilityConfiguration(
@RcsUceAdapter.RcsImsCapabilityFlag int capability,
@ImsRegistrationImplBase.ImsRegistrationTech int radioTech) {
@@ -364,8 +392,10 @@
* be called for each capability change that resulted in an error.
* @param request The request to change the capability.
* @param callback To notify the framework that the result of the capability changes.
+ * @hide
*/
@Override
+ @SystemApi
public void changeEnabledCapabilities(@NonNull CapabilityChangeRequest request,
@NonNull CapabilityCallbackProxy callback) {
// Base Implementation - Override to provide functionality
@@ -385,7 +415,9 @@
* event to the framework.
* @return An instance of {@link RcsCapabilityExchangeImplBase} that implements capability
* exchange if it is supported by the device.
+ * @hide
*/
+ @SystemApi
public @NonNull RcsCapabilityExchangeImplBase createCapabilityExchangeImpl(
@NonNull CapabilityExchangeEventListener listener) {
// Base Implementation, override to implement functionality
@@ -395,20 +427,28 @@
/**
* Remove the given CapabilityExchangeImplBase instance.
* @param capExchangeImpl The {@link RcsCapabilityExchangeImplBase} instance to be destroyed.
+ * @hide
*/
+ @SystemApi
public void destroyCapabilityExchangeImpl(
@NonNull RcsCapabilityExchangeImplBase capExchangeImpl) {
// Override to implement the process of destroying RcsCapabilityExchangeImplBase instance.
}
- /**{@inheritDoc}*/
+ /**{@inheritDoc}
+ * @hide
+ */
@Override
+ @SystemApi
public void onFeatureRemoved() {
}
- /**{@inheritDoc}*/
+ /**{@inheritDoc}
+ * @hide
+ */
@Override
+ @SystemApi
public void onFeatureReady() {
}
@@ -448,7 +488,9 @@
* has already been created in the framework.
* @param listener A {@link CapabilityExchangeEventListener} to send the capability exchange
* event to the framework.
+ * @hide
*/
+ @SystemApi
private void initRcsCapabilityExchangeImplBase(
@NonNull CapabilityExchangeEventListener listener) {
synchronized (mLock) {
diff --git a/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java b/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
index 3b151a4..ac5565b 100644
--- a/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
@@ -34,7 +34,6 @@
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.internal.util.ArrayUtils;
-
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.concurrent.CancellationException;
@@ -51,9 +50,7 @@
* <p>
* Note: There is no guarantee on the thread that the calls from the framework will be called on. It
* is the implementors responsibility to handle moving the calls to a working thread if required.
- * @hide
*/
-@SystemApi
public class ImsRegistrationImplBase {
private static final String LOG_TAG = "ImsRegistrationImplBase";
@@ -94,6 +91,12 @@
*/
public static final int REGISTRATION_TECH_NR = 3;
+ /**
+ * This is used to check the upper range of registration tech
+ * {@hide}
+ */
+ public static final int REGISTRATION_TECH_MAX = REGISTRATION_TECH_NR + 1;
+
// Registration states, used to notify new ImsRegistrationImplBase#Callbacks of the current
// state.
// The unknown state is set as the initialization state. This is so that we do not call back
@@ -109,7 +112,9 @@
* Method stubs called from the framework will be called asynchronously. To specify the
* {@link Executor} that the methods stubs will be called, use
* {@link ImsRegistrationImplBase#ImsRegistrationImplBase(Executor)} instead.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public ImsRegistrationImplBase() {
super();
}
@@ -119,7 +124,9 @@
* framework.
* @param executor The executor for the framework to use when executing the methods overridden
* by the implementation of ImsRegistration.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public ImsRegistrationImplBase(@NonNull Executor executor) {
super();
mExecutor = executor;
@@ -250,7 +257,9 @@
* If the SIP delegate feature tag configuration has changed, then this method will be
* called in order to let the ImsService know that it can pick up these changes in the IMS
* registration.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public void updateSipDelegateRegistration() {
// Stub implementation, ImsService should implement this
}
@@ -266,7 +275,9 @@
* <p>
* This should not affect the registration of features managed by the ImsService itself, such as
* feature tags related to MMTEL registration.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public void triggerSipDelegateDeregistration() {
// Stub implementation, ImsService should implement this
}
@@ -284,7 +295,9 @@
* be carrier specific.
* @param sipReason The reason associated with the SIP error code. {@code null} if there was no
* reason associated with the error.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public void triggerFullNetworkRegistration(@IntRange(from = 100, to = 699) int sipCode,
@Nullable String sipReason) {
// Stub implementation, ImsService should implement this
@@ -295,7 +308,9 @@
* Notify the framework that the device is connected to the IMS network.
*
* @param imsRadioTech the radio access technology.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onRegistered(@ImsRegistrationTech int imsRadioTech) {
onRegistered(new ImsRegistrationAttributes.Builder(imsRadioTech).build());
}
@@ -304,7 +319,9 @@
* Notify the framework that the device is connected to the IMS network.
*
* @param attributes The attributes associated with the IMS registration.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onRegistered(@NonNull ImsRegistrationAttributes attributes) {
updateToState(attributes, RegistrationManager.REGISTRATION_STATE_REGISTERED);
mCallbacks.broadcastAction((c) -> {
@@ -320,7 +337,9 @@
* Notify the framework that the device is trying to connect the IMS network.
*
* @param imsRadioTech the radio access technology.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onRegistering(@ImsRegistrationTech int imsRadioTech) {
onRegistering(new ImsRegistrationAttributes.Builder(imsRadioTech).build());
}
@@ -329,7 +348,9 @@
* Notify the framework that the device is trying to connect the IMS network.
*
* @param attributes The attributes associated with the IMS registration.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onRegistering(@NonNull ImsRegistrationAttributes attributes) {
updateToState(attributes, RegistrationManager.REGISTRATION_STATE_REGISTERING);
mCallbacks.broadcastAction((c) -> {
@@ -356,7 +377,9 @@
* result.
*
* @param info the {@link ImsReasonInfo} associated with why registration was disconnected.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onDeregistered(ImsReasonInfo info) {
updateToDisconnectedState(info);
// ImsReasonInfo should never be null.
@@ -377,7 +400,9 @@
* {@link #REGISTRATION_TECH_LTE}, {@link #REGISTRATION_TECH_IWLAN} and
* {@link #REGISTRATION_TECH_CROSS_SIM}.
* @param info The {@link ImsReasonInfo} for the failure to change technology.
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onTechnologyChangeFailed(@ImsRegistrationTech int imsRadioTech,
ImsReasonInfo info) {
final ImsReasonInfo reasonInfo = (info != null) ? info : new ImsReasonInfo();
@@ -396,7 +421,9 @@
*
* The {@link Uri}s are not guaranteed to be different between subsequent calls.
* @param uris changed uris
+ * @hide This API is not part of the Android public SDK API
*/
+ @SystemApi
public final void onSubscriberAssociatedUriChanged(Uri[] uris) {
synchronized (mLock) {
mUris = ArrayUtils.cloneOrNull(uris);
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index be54cec..bce7a24 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -55,6 +55,7 @@
import android.telephony.emergency.EmergencyNumber;
import android.telephony.ims.RcsClientConfiguration;
import android.telephony.ims.RcsContactUceCapability;
+import android.telephony.ims.aidl.IFeatureProvisioningCallback;
import android.telephony.ims.aidl.IImsCapabilityCallback;
import android.telephony.ims.aidl.IImsConfig;
import android.telephony.ims.aidl.IImsConfigCallback;
@@ -1992,6 +1993,18 @@
void unregisterImsProvisioningChangedCallback(int subId, IImsConfigCallback callback);
/**
+ * Register an IMS provisioning change callback with Telephony.
+ */
+ void registerFeatureProvisioningChangedCallback(int subId,
+ IFeatureProvisioningCallback callback);
+
+ /**
+ * unregister an existing IMS provisioning change callback.
+ */
+ void unregisterFeatureProvisioningChangedCallback(int subId,
+ IFeatureProvisioningCallback callback);
+
+ /**
* Set the provisioning status for the IMS MmTel capability using the specified subscription.
*/
void setImsProvisioningStatusForCapability(int subId, int capability, int tech,
@@ -2005,19 +2018,12 @@
/**
* Get the provisioning status for the IMS Rcs capability specified.
*/
- boolean getRcsProvisioningStatusForCapability(int subId, int capability);
+ boolean getRcsProvisioningStatusForCapability(int subId, int capability, int tech);
/**
* Set the provisioning status for the IMS Rcs capability using the specified subscription.
*/
- void setRcsProvisioningStatusForCapability(int subId, int capability,
- boolean isProvisioned);
-
- /** Is the capability and tech flagged as provisioned in the cache */
- boolean isMmTelCapabilityProvisionedInCache(int subId, int capability, int tech);
-
- /** Set the provisioning for the capability and tech in the cache */
- void cacheMmTelCapabilityProvisioning(int subId, int capability, int tech,
+ void setRcsProvisioningStatusForCapability(int subId, int capability, int tech,
boolean isProvisioned);
/**
@@ -2523,4 +2529,18 @@
* @return the service name of the modem service which bind to.
*/
String getModemService();
+
+ /**
+ * Is Provisioning required for capability
+ * @return true if provisioning is required for the MMTEL capability and IMS
+ * registration technology specified, false if it is not required.
+ */
+ boolean isProvisioningRequiredForCapability(int subId, int capability, int tech);
+
+ /**
+ * Is RCS Provisioning required for capability
+ * @return true if provisioning is required for the RCS capability and IMS
+ * registration technology specified, false if it is not required.
+ */
+ boolean isRcsProvisioningRequiredForCapability(int subId, int capability, int tech);
}
diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
index 21c3f76..f518d53 100644
--- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
+++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
@@ -24,6 +24,7 @@
import android.graphics.Color;
import android.os.Build;
import android.telephony.UiccPortInfo;
+import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.GsmAlphabet;
@@ -934,6 +935,13 @@
}
/**
+ * Strip all the trailing 'F' characters of a string if exists and compare.
+ */
+ public static boolean compareIgnoreTrailingFs(String a, String b) {
+ return TextUtils.equals(a, b) || TextUtils.equals(stripTrailingFs(a), stripTrailingFs(b));
+ }
+
+ /**
* Converts a character of [0-9a-fA-F] to its hex value in a byte. If the character is not a
* hex number, 0 will be returned.
*/
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt
index 22acc03..d960e94 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt
@@ -108,6 +108,15 @@
super.entireScreenCovered()
}
+ /** {@inheritDoc} */
+ @Presubmit
+ @Test
+ override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
+ // This test doesn't work in shell transitions because of b/215885246
+ assumeFalse(isShellTransitionsEnabled)
+ super.visibleLayersShownMoreThanOneConsecutiveEntry()
+ }
+
companion object {
/**
* Creates the test configurations.
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/OWNERS b/tests/FlickerTests/src/com/android/server/wm/flicker/close/OWNERS
new file mode 100644
index 0000000..f7c0a87
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/OWNERS
@@ -0,0 +1,2 @@
+# window manager > animations/transitions
+# Bug component: 316275
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt
index 0b1748a..535612a 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt
@@ -17,7 +17,9 @@
package com.android.server.wm.flicker.helpers
import android.app.Instrumentation
+import androidx.test.uiautomator.By
import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.Until
import com.android.server.wm.flicker.testapp.ActivityOptions
import com.android.server.wm.traces.common.FlickerComponentName
import com.android.server.wm.traces.parser.toFlickerComponent
@@ -47,4 +49,28 @@
}
launcherStrategy.launch(appName, expectedPackage)
}
+
+ fun startDialogThemedActivity(wmHelper: WindowManagerStateHelper) {
+ val button = uiDevice.wait(Until.findObject(By.res(getPackage(),
+ "start_dialog_themed_activity_btn")), FIND_TIMEOUT)
+
+ require(button != null) {
+ "Button not found, this usually happens when the device " +
+ "was left in an unknown state (e.g. Screen turned off)"
+ }
+ button.click()
+ wmHelper.waitForAppTransitionIdle()
+ wmHelper.waitForFullScreenApp(
+ ActivityOptions.DIALOG_THEMED_ACTIVITY_COMPONENT_NAME.toFlickerComponent())
+ }
+ fun dismissDialog(wmHelper: WindowManagerStateHelper) {
+ val dialog = uiDevice.wait(
+ Until.findObject(By.text("Dialog for test")), FIND_TIMEOUT)
+
+ // Pressing back key to dismiss the dialog
+ if (dialog != null) {
+ uiDevice.pressBack()
+ wmHelper.waitForAppTransitionIdle()
+ }
+ }
}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt
new file mode 100644
index 0000000..429541c
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2021 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.wm.flicker.ime
+
+import android.app.Instrumentation
+import android.platform.test.annotations.Presubmit
+import android.view.Surface
+import android.view.WindowManagerPolicyConstants
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.RequiresDevice
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.server.wm.flicker.FlickerBuilderProvider
+import com.android.server.wm.flicker.FlickerParametersRunnerFactory
+import com.android.server.wm.flicker.FlickerTestParameter
+import com.android.server.wm.flicker.FlickerTestParameterFactory
+import com.android.server.wm.flicker.dsl.FlickerBuilder
+import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
+import com.android.server.wm.traces.common.FlickerComponentName
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
+import org.junit.runners.Parameterized
+
+/**
+ * Test IME snapshot mechanism won't apply when transitioning from non-IME focused dialog activity.
+ * To run this test: `atest FlickerTests:LaunchAppShowImeAndDialogThemeAppTest`
+ */
+@RequiresDevice
+@RunWith(Parameterized::class)
+@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+class LaunchAppShowImeAndDialogThemeAppTest(private val testSpec: FlickerTestParameter) {
+ private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+ private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)
+
+ @FlickerBuilderProvider
+ fun buildFlicker(): FlickerBuilder {
+ return FlickerBuilder(instrumentation).apply {
+ setup {
+ eachRun {
+ testApp.launchViaIntent(wmHelper)
+ wmHelper.waitImeShown()
+ testApp.startDialogThemedActivity(wmHelper)
+ }
+ }
+ teardown {
+ eachRun {
+ testApp.exit()
+ }
+ }
+ transitions {
+ testApp.dismissDialog(wmHelper)
+ }
+ }
+ }
+
+ /**
+ * Checks that [FlickerComponentName.IME] layer becomes visible during the transition
+ */
+ @FlakyTest(bugId = 215884488)
+ @Test
+ fun imeWindowIsAlwaysVisible() = testSpec.imeWindowIsAlwaysVisible()
+
+ /**
+ * Checks that [FlickerComponentName.IME] layer is visible at the end of the transition
+ */
+ @Presubmit
+ @Test
+ fun imeLayerExistsEnd() {
+ testSpec.assertLayersEnd {
+ this.isVisible(FlickerComponentName.IME)
+ }
+ }
+
+ /**
+ * Checks that [FlickerComponentName.IME_SNAPSHOT] layer is invisible always.
+ */
+ @Presubmit
+ @Test
+ fun imeSnapshotNotVisible() {
+ testSpec.assertLayers {
+ this.isInvisible(FlickerComponentName.IME_SNAPSHOT)
+ }
+ }
+
+ companion object {
+ /**
+ * Creates the test configurations.
+ *
+ * See [FlickerTestParameterFactory.getConfigNonRotationTests] for configuring
+ * repetitions, screen orientation and navigation modes.
+ */
+ @Parameterized.Parameters(name = "{0}")
+ @JvmStatic
+ fun getParams(): Collection<FlickerTestParameter> {
+ return FlickerTestParameterFactory.getInstance()
+ .getConfigNonRotationTests(
+ repetitions = 3,
+ supportedRotations = listOf(Surface.ROTATION_0),
+ supportedNavigationModes = listOf(
+ WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,
+ WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
+ )
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OWNERS b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OWNERS
new file mode 100644
index 0000000..301fafa
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OWNERS
@@ -0,0 +1,2 @@
+# ime
+# Bug component: 34867
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
index 0ad0a03..5e06f11 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
@@ -18,8 +18,8 @@
import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
+import android.view.Display
import android.view.Surface
-import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry
@@ -41,7 +41,9 @@
import com.android.server.wm.flicker.statusBarLayerIsVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
import com.android.server.wm.flicker.statusBarWindowIsVisible
+import com.android.server.wm.traces.common.ConditionList
import com.android.server.wm.traces.common.FlickerComponentName
+import com.android.server.wm.traces.common.WindowManagerConditionsFactory
import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.FixMethodOrder
@@ -63,6 +65,12 @@
private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)
+ private val waitConditionSetup = ConditionList(listOf(
+ WindowManagerConditionsFactory.isAppTransitionIdle(Display.DEFAULT_DISPLAY),
+ WindowManagerConditionsFactory.hasLayersAnimating().negate(),
+ WindowManagerConditionsFactory.isHomeActivityVisible()
+ ))
+
@FlickerBuilderProvider
fun buildFlicker(): FlickerBuilder {
return FlickerBuilder(instrumentation).apply {
@@ -73,8 +81,7 @@
}
eachRun {
device.pressRecentApps()
- wmHelper.waitImeGone()
- wmHelper.waitForAppTransitionIdle()
+ wmHelper.waitFor(waitConditionSetup)
this.setRotation(testSpec.startRotation)
}
}
@@ -231,11 +238,8 @@
fun getParams(): Collection<FlickerTestParameter> {
return FlickerTestParameterFactory.getInstance()
.getConfigNonRotationTests(
- repetitions = 1,
- supportedRotations = listOf(Surface.ROTATION_0),
- supportedNavigationModes = listOf(
- WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
- )
+ repetitions = 5,
+ supportedRotations = listOf(Surface.ROTATION_0)
)
}
}
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OWNERS b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OWNERS
new file mode 100644
index 0000000..2c414a2
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OWNERS
@@ -0,0 +1,4 @@
+# System UI > ... > Overview (recent apps) > UI
+# Bug template url: https://b.corp.google.com/issues/new?component=807991&template=1390280 = per-file *Overview*
+# window manager > animations/transitions
+# Bug template url: https://b.corp.google.com/issues/new?component=316275&template=1018192
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
index e07a8f9..5450610 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt
@@ -122,6 +122,11 @@
@Test
override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()
+ /** {@inheritDoc} */
+ @FlakyTest(bugId = 213852103)
+ @Test
+ override fun entireScreenCovered() = super.entireScreenCovered()
+
companion object {
/**
* Creates the test configurations.
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt
index 6e5c600..a85dcc5 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt
@@ -127,7 +127,7 @@
* The `isAppWindowInvisible` step is optional because we log once per frame, upon logging,
* the window may be visible or not depending on what was processed until that moment.
*/
- @Presubmit
+ @FlakyTest(bugId = 203538234)
@Test
fun appWindowBecomesVisible() {
testSpec.assertWm {
@@ -240,7 +240,7 @@
* it cannot use the regular assertion (check over time), because on lock screen neither
* the app not the launcher are visible, and there is no top visible window.
*/
- @Presubmit
+ @FlakyTest(bugId = 203538234)
@Test
override fun appWindowReplacesLauncherAsTopWindow() {
testSpec.assertWm {
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/OWNERS b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/OWNERS
new file mode 100644
index 0000000..897fe5d
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/OWNERS
@@ -0,0 +1,2 @@
+# System UI > ... > Launcher > Gesture nav
+# Bug component: 565144
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/OWNERS b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/OWNERS
new file mode 100644
index 0000000..f7c0a87
--- /dev/null
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/OWNERS
@@ -0,0 +1,2 @@
+# window manager > animations/transitions
+# Bug component: 316275
diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
index 0a88f6b..9e371e5 100644
--- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
+++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
@@ -97,5 +97,16 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <activity android:name=".DialogThemedActivity"
+ android:taskAffinity="com.android.server.wm.flicker.testapp.DialogThemedActivity"
+ android:configChanges="orientation|screenSize"
+ android:theme="@style/DialogTheme"
+ android:label="DialogThemedActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml
index 2620ff4..baaf707 100644
--- a/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml
+++ b/tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml
@@ -31,4 +31,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Finish activity" />
+ <Button
+ android:id="@+id/start_dialog_themed_activity_btn"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Start dialog themed activity" />
</LinearLayout>
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
index 87a61a8..746b0f4c 100644
--- a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
+++ b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
@@ -27,4 +27,15 @@
<style name="CutoutNever">
<item name="android:windowLayoutInDisplayCutoutMode">never</item>
</style>
-</resources>
\ No newline at end of file
+
+ <style name="DialogTheme" parent="@android:style/Theme.DeviceDefault">
+ <item name="android:windowAnimationStyle">@null</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:windowBackground">@null</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:backgroundDimEnabled">false</item>
+ <item name="android:windowSoftInputMode">stateUnchanged</item>
+ </style>
+</resources>
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java
index baf36ab..13adb68 100644
--- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ActivityOptions.java
@@ -56,4 +56,8 @@
public static final ComponentName LAUNCH_NEW_TASK_ACTIVITY_COMPONENT_NAME =
new ComponentName(FLICKER_APP_PACKAGE,
FLICKER_APP_PACKAGE + ".LaunchNewTaskActivity");
+ public static final String DIALOG_THEMED_ACTIVITY = "DialogThemedActivity";
+ public static final ComponentName DIALOG_THEMED_ACTIVITY_COMPONENT_NAME =
+ new ComponentName(FLICKER_APP_PACKAGE,
+ FLICKER_APP_PACKAGE + ".DialogThemedActivity");
}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/DialogThemedActivity.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/DialogThemedActivity.java
new file mode 100644
index 0000000..27606d8
--- /dev/null
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/DialogThemedActivity.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.wm.flicker.testapp;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class DialogThemedActivity extends Activity {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_simple);
+ getWindow().getDecorView().setBackgroundColor(Color.TRANSPARENT);
+ TextView textView = new TextView(this);
+ textView.setText("This is a test dialog");
+ textView.setTextColor(Color.BLACK);
+ LinearLayout layout = new LinearLayout(this);
+ layout.setBackgroundColor(Color.GREEN);
+ layout.addView(textView);
+
+ // Create a dialog with dialog-themed activity
+ AlertDialog dialog = new AlertDialog.Builder(this)
+ .setView(layout)
+ .setTitle("Dialog for test")
+ .create();
+ final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(MATCH_PARENT,
+ MATCH_PARENT);
+ attrs.flags = FLAG_DIM_BEHIND | FLAG_ALT_FOCUSABLE_IM;
+ dialog.getWindow().getDecorView().setLayoutParams(attrs);
+ dialog.setCanceledOnTouchOutside(true);
+ dialog.show();
+ dialog.setOnDismissListener((d) -> finish());
+ }
+}
diff --git a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java
index 05da717..bb200f1 100644
--- a/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java
+++ b/tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/ImeActivityAutoFocus.java
@@ -16,6 +16,8 @@
package com.android.server.wm.flicker.testapp;
+import android.content.Intent;
+import android.widget.Button;
import android.widget.EditText;
public class ImeActivityAutoFocus extends ImeActivity {
@@ -26,5 +28,9 @@
EditText editTextField = findViewById(R.id.plain_text_input);
editTextField.requestFocus();
+
+ Button startThemedActivityButton = findViewById(R.id.start_dialog_themed_activity_btn);
+ startThemedActivityButton.setOnClickListener(
+ button -> startActivity(new Intent(this, DialogThemedActivity.class)));
}
}
diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py
index 3131f56..99f77fe 100755
--- a/tools/fonts/fontchain_linter.py
+++ b/tools/fonts/fontchain_linter.py
@@ -54,6 +54,7 @@
'or': 'Orya',
'pa': 'Guru',
'pt': 'Latn',
+ 'ru': 'Latn',
'sk': 'Latn',
'sl': 'Latn',
'sq': 'Latn',
diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt b/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt
index 900c214..a6fd9bb 100644
--- a/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt
+++ b/tools/lint/checks/src/main/java/com/google/android/lint/AndroidFrameworkIssueRegistry.kt
@@ -31,7 +31,9 @@
CallingIdentityTokenDetector.ISSUE_RESTORE_IDENTITY_CALL_NOT_IN_FINALLY_BLOCK,
CallingIdentityTokenDetector.ISSUE_USE_OF_CALLER_AWARE_METHODS_WITH_CLEARED_IDENTITY,
CallingIdentityTokenDetector.ISSUE_CLEAR_IDENTITY_CALL_NOT_FOLLOWED_BY_TRY_FINALLY,
- CallingSettingsNonUserGetterMethodsDetector.ISSUE_NON_USER_GETTER_CALLED
+ CallingSettingsNonUserGetterMethodsDetector.ISSUE_NON_USER_GETTER_CALLED,
+ EnforcePermissionDetector.ISSUE_MISSING_ENFORCE_PERMISSION,
+ EnforcePermissionDetector.ISSUE_MISMATCHING_ENFORCE_PERMISSION
)
override val api: Int
diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt b/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt
new file mode 100644
index 0000000..8011b36
--- /dev/null
+++ b/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2022 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.google.android.lint
+
+import com.android.tools.lint.detector.api.AnnotationInfo
+import com.android.tools.lint.detector.api.AnnotationOrigin
+import com.android.tools.lint.detector.api.AnnotationUsageInfo
+import com.android.tools.lint.detector.api.AnnotationUsageType
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Category
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.Severity
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiMethod
+import org.jetbrains.uast.UElement
+
+/**
+ * Lint Detector that ensures that any method overriding a method annotated
+ * with @EnforcePermission is also annotated with the exact same annotation.
+ * The intent is to surface the effective permission checks to the service
+ * implementations.
+ */
+class EnforcePermissionDetector : Detector(), SourceCodeScanner {
+
+ val ENFORCE_PERMISSION = "android.annotation.EnforcePermission"
+
+ override fun applicableAnnotations(): List<String> {
+ return listOf(ENFORCE_PERMISSION)
+ }
+
+ private fun areAnnotationsEquivalent(
+ context: JavaContext,
+ anno1: PsiAnnotation,
+ anno2: PsiAnnotation
+ ): Boolean {
+ if (anno1.qualifiedName != anno2.qualifiedName) {
+ return false
+ }
+ val attr1 = anno1.parameterList.attributes
+ val attr2 = anno2.parameterList.attributes
+ if (attr1.size != attr2.size) {
+ return false
+ }
+ for (i in attr1.indices) {
+ if (attr1[i].name != attr2[i].name) {
+ return false
+ }
+ val v1 = ConstantEvaluator.evaluate(context, attr1[i].value)
+ val v2 = ConstantEvaluator.evaluate(context, attr2[i].value)
+ if (v1 != v2) {
+ return false
+ }
+ }
+ return true
+ }
+
+ override fun visitAnnotationUsage(
+ context: JavaContext,
+ element: UElement,
+ annotationInfo: AnnotationInfo,
+ usageInfo: AnnotationUsageInfo
+ ) {
+ if (usageInfo.type == AnnotationUsageType.EXTENDS) {
+ val newClass = element.sourcePsi?.parent?.parent as PsiClass
+ val extendedClass: PsiClass = usageInfo.referenced as PsiClass
+ val newAnnotation = newClass.getAnnotation(ENFORCE_PERMISSION)
+ val extendedAnnotation = extendedClass.getAnnotation(ENFORCE_PERMISSION)!!
+
+ val location = context.getLocation(element)
+ val newClassName = newClass.qualifiedName
+ val extendedClassName = extendedClass.qualifiedName
+ if (newAnnotation == null) {
+ val msg = "The class $newClassName extends the class $extendedClassName which " +
+ "is annotated with @EnforcePermission. The same annotation must be used " +
+ "on $newClassName."
+ context.report(ISSUE_MISSING_ENFORCE_PERMISSION, element, location, msg)
+ } else if (!areAnnotationsEquivalent(context, newAnnotation, extendedAnnotation)) {
+ val msg = "The class $newClassName is annotated with ${newAnnotation.text} " +
+ "which differs from the parent class $extendedClassName: " +
+ "${extendedAnnotation.text}. The same annotation must be used for " +
+ "both classes."
+ context.report(ISSUE_MISMATCHING_ENFORCE_PERMISSION, element, location, msg)
+ }
+ } else if (usageInfo.type == AnnotationUsageType.METHOD_OVERRIDE &&
+ annotationInfo.origin == AnnotationOrigin.METHOD) {
+ val overridingMethod = element.sourcePsi as PsiMethod
+ val overriddenMethod = usageInfo.referenced as PsiMethod
+ val overridingAnnotation = overridingMethod.getAnnotation(ENFORCE_PERMISSION)
+ val overriddenAnnotation = overriddenMethod.getAnnotation(ENFORCE_PERMISSION)!!
+
+ val location = context.getLocation(element)
+ val overridingClass = overridingMethod.parent as PsiClass
+ val overriddenClass = overriddenMethod.parent as PsiClass
+ val overridingName = "${overridingClass.name}.${overridingMethod.name}"
+ val overriddenName = "${overriddenClass.name}.${overriddenMethod.name}"
+ if (overridingAnnotation == null) {
+ val msg = "The method $overridingName overrides the method $overriddenName which " +
+ "is annotated with @EnforcePermission. The same annotation must be used " +
+ "on $overridingName"
+ context.report(ISSUE_MISSING_ENFORCE_PERMISSION, element, location, msg)
+ } else if (!areAnnotationsEquivalent(
+ context, overridingAnnotation, overriddenAnnotation)) {
+ val msg = "The method $overridingName is annotated with " +
+ "${overridingAnnotation.text} which differs from the overridden " +
+ "method $overriddenName: ${overriddenAnnotation.text}. The same " +
+ "annotation must be used for both methods."
+ context.report(ISSUE_MISMATCHING_ENFORCE_PERMISSION, element, location, msg)
+ }
+ }
+ }
+
+ companion object {
+ val EXPLANATION = """
+ The @EnforcePermission annotation is used to indicate that the underlying binder code
+ has already verified the caller's permissions before calling the appropriate method. The
+ verification code is usually generated by the AIDL compiler, which also takes care of
+ annotating the generated Java code.
+
+ In order to surface that information to platform developers, the same annotation must be
+ used on the implementation class or methods.
+ """
+
+ val ISSUE_MISSING_ENFORCE_PERMISSION: Issue = Issue.create(
+ id = "MissingEnforcePermissionAnnotation",
+ briefDescription = "Missing @EnforcePermission annotation on Binder method",
+ explanation = EXPLANATION,
+ category = Category.SECURITY,
+ priority = 6,
+ severity = Severity.ERROR,
+ implementation = Implementation(
+ EnforcePermissionDetector::class.java,
+ Scope.JAVA_FILE_SCOPE
+ )
+ )
+
+ val ISSUE_MISMATCHING_ENFORCE_PERMISSION: Issue = Issue.create(
+ id = "MismatchingEnforcePermissionAnnotation",
+ briefDescription = "Incorrect @EnforcePermission annotation on Binder method",
+ explanation = EXPLANATION,
+ category = Category.SECURITY,
+ priority = 6,
+ severity = Severity.ERROR,
+ implementation = Implementation(
+ EnforcePermissionDetector::class.java,
+ Scope.JAVA_FILE_SCOPE
+ )
+ )
+ }
+}
diff --git a/tools/lint/checks/src/test/java/com/google/android/lint/EnforcePermissionDetectorTest.kt b/tools/lint/checks/src/test/java/com/google/android/lint/EnforcePermissionDetectorTest.kt
new file mode 100644
index 0000000..f5f4ebe
--- /dev/null
+++ b/tools/lint/checks/src/test/java/com/google/android/lint/EnforcePermissionDetectorTest.kt
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2022 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.google.android.lint
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest
+import com.android.tools.lint.checks.infrastructure.TestFile
+import com.android.tools.lint.checks.infrastructure.TestLintTask
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Issue
+
+@Suppress("UnstableApiUsage")
+class EnforcePermissionDetectorTest : LintDetectorTest() {
+ override fun getDetector(): Detector = EnforcePermissionDetector()
+
+ override fun getIssues(): List<Issue> = listOf(
+ EnforcePermissionDetector.ISSUE_MISSING_ENFORCE_PERMISSION,
+ EnforcePermissionDetector.ISSUE_MISMATCHING_ENFORCE_PERMISSION
+ )
+
+ override fun lint(): TestLintTask = super.lint().allowMissingSdk(true)
+
+ fun testDoesNotDetectIssuesCorrectAnnotationOnClass() {
+ lint().files(java(
+ """
+ package test.pkg;
+ @android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public class TestClass1 extends IFoo.Stub {
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expectClean()
+ }
+
+ fun testDoesNotDetectIssuesCorrectAnnotationOnMethod() {
+ lint().files(java(
+ """
+ package test.pkg;
+ import android.annotation.EnforcePermission;
+ public class TestClass2 extends IFooMethod.Stub {
+ @Override
+ @EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expectClean()
+ }
+
+ fun testDetectIssuesMismatchingAnnotationOnClass() {
+ lint().files(java(
+ """
+ package test.pkg;
+ @android.annotation.EnforcePermission(android.Manifest.permission.INTERNET)
+ public class TestClass3 extends IFoo.Stub {
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expect("""src/test/pkg/TestClass3.java:3: Error: The class test.pkg.TestClass3 is \
+annotated with @android.annotation.EnforcePermission(android.Manifest.permission.INTERNET) \
+which differs from the parent class IFoo.Stub: \
+@android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE). The \
+same annotation must be used for both classes. [MismatchingEnforcePermissionAnnotation]
+public class TestClass3 extends IFoo.Stub {
+ ~~~~~~~~~
+1 errors, 0 warnings""".addLineContinuation())
+ }
+
+ fun testDetectIssuesMismatchingAnnotationOnMethod() {
+ lint().files(java(
+ """
+ package test.pkg;
+ public class TestClass4 extends IFooMethod.Stub {
+ @android.annotation.EnforcePermission(android.Manifest.permission.INTERNET)
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expect("""src/test/pkg/TestClass4.java:4: Error: The method TestClass4.testMethod is \
+annotated with @android.annotation.EnforcePermission(android.Manifest.permission.INTERNET) \
+which differs from the overridden method Stub.testMethod: \
+@android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE). The same \
+annotation must be used for both methods. [MismatchingEnforcePermissionAnnotation]
+ public void testMethod() {}
+ ~~~~~~~~~~
+1 errors, 0 warnings""".addLineContinuation())
+ }
+
+ fun testDetectIssuesMissingAnnotationOnClass() {
+ lint().files(java(
+ """
+ package test.pkg;
+ public class TestClass5 extends IFoo.Stub {
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expect("""src/test/pkg/TestClass5.java:2: Error: The class test.pkg.TestClass5 extends \
+the class IFoo.Stub which is annotated with @EnforcePermission. The same annotation must be \
+used on test.pkg.TestClass5. [MissingEnforcePermissionAnnotation]
+public class TestClass5 extends IFoo.Stub {
+ ~~~~~~~~~
+1 errors, 0 warnings""".addLineContinuation())
+ }
+
+ fun testDetectIssuesMissingAnnotationOnMethod() {
+ lint().files(java(
+ """
+ package test.pkg;
+ public class TestClass6 extends IFooMethod.Stub {
+ public void testMethod() {}
+ }
+ """).indented(),
+ *stubs
+ )
+ .run()
+ .expect("""src/test/pkg/TestClass6.java:3: Error: The method TestClass6.testMethod \
+overrides the method Stub.testMethod which is annotated with @EnforcePermission. The same \
+annotation must be used on TestClass6.testMethod [MissingEnforcePermissionAnnotation]
+ public void testMethod() {}
+ ~~~~~~~~~~
+1 errors, 0 warnings""".addLineContinuation())
+ }
+
+ /* Stubs */
+
+ private val interfaceIFooStub: TestFile = java(
+ """
+ @android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public interface IFoo {
+ @android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public static abstract class Stub implements IFoo {
+ @Override
+ public void testMethod() {}
+ }
+ public void testMethod();
+ }
+ """
+ ).indented()
+
+ private val interfaceIFooMethodStub: TestFile = java(
+ """
+ public interface IFooMethod {
+ public static abstract class Stub implements IFooMethod {
+ @Override
+ @android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public void testMethod() {}
+ }
+ @android.annotation.EnforcePermission(android.Manifest.permission.READ_PHONE_STATE)
+ public void testMethod();
+ }
+ """
+ ).indented()
+
+ private val manifestPermissionStub: TestFile = java(
+ """
+ package android.Manifest;
+ class permission {
+ public static final String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
+ public static final String INTERNET = "android.permission.INTERNET";
+ }
+ """
+ ).indented()
+
+ private val enforcePermissionAnnotationStub: TestFile = java(
+ """
+ package android.annotation;
+ public @interface EnforcePermission {}
+ """
+ ).indented()
+
+ private val stubs = arrayOf(interfaceIFooStub, interfaceIFooMethodStub,
+ manifestPermissionStub, enforcePermissionAnnotationStub)
+
+ // Substitutes "backslash + new line" with an empty string to imitate line continuation
+ private fun String.addLineContinuation(): String = this.trimIndent().replace("\\\n", "")
+}
diff --git a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
index 3b75660..459696e 100644
--- a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
+++ b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
@@ -1262,6 +1262,26 @@
}
/**
+ * Notifies the wificond daemon that the WiFi framework has successfully updated the Country
+ * Code of the driver. The wificond daemon needs this notification if the device does not
+ * support the NL80211_CMD_REG_CHANGED (otherwise it will find out on its own). The wificond
+ * updates in internal state in response to this Country Code update.
+ *
+ * @return true on success, false otherwise.
+ */
+ public boolean notifyCountryCodeChanged() {
+ try {
+ if (mWificond != null) {
+ mWificond.notifyCountryCodeChanged();
+ return true;
+ }
+ } catch (RemoteException e1) {
+ Log.e(TAG, "Failed to notify country code changed due to remote exception");
+ }
+ return false;
+ }
+
+ /**
* Register the provided callback handler for SoftAp events. The interface must first be created
* using {@link #setupInterfaceForSoftApMode(String)}. The callback registration is valid until
* the interface is deleted using {@link #tearDownSoftApInterface(String)} (no deregistration
diff --git a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java
index 3fb2301..4032a7b 100644
--- a/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java
@@ -1137,6 +1137,26 @@
assertEquals(capaExpected, capaActual);
}
+ /**
+ * Tests notifyCountryCodeChanged
+ */
+ @Test
+ public void testNotifyCountryCodeChanged() throws Exception {
+ doNothing().when(mWificond).notifyCountryCodeChanged();
+ assertTrue(mWificondControl.notifyCountryCodeChanged());
+ verify(mWificond).notifyCountryCodeChanged();
+ }
+
+ /**
+ * Tests notifyCountryCodeChanged with RemoteException
+ */
+ @Test
+ public void testNotifyCountryCodeChangedRemoteException() throws Exception {
+ doThrow(new RemoteException()).when(mWificond).notifyCountryCodeChanged();
+ assertFalse(mWificondControl.notifyCountryCodeChanged());
+ verify(mWificond).notifyCountryCodeChanged();
+ }
+
// Create a ArgumentMatcher which captures a SingleScanSettings parameter and checks if it
// matches the provided frequency set and ssid set.
private class ScanMatcher implements ArgumentMatcher<SingleScanSettings> {