diff options
169 files changed, 6483 insertions, 3386 deletions
diff --git a/Android.bp b/Android.bp index 3b6eaa7a3afe..8169d6de7813 100644 --- a/Android.bp +++ b/Android.bp @@ -548,6 +548,12 @@ filegroup { ], } +filegroup { + name: "framework-tethering-shared-srcs", + srcs: [ + "core/java/android/util/LocalLog.java", + ], +} // Build ext.jar // ============================================================ java_library { @@ -922,7 +928,8 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x "--hide RequiresPermission " + "--hide MissingPermission --hide BroadcastBehavior " + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + - "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" // http://b/129765390 Rewrite links to "platform" or "technotes" folders // which are siblings (and thus outside of) {@docRoot}. @@ -1599,6 +1606,17 @@ filegroup { } filegroup { + name: "framework-ims-common-shared-srcs", + srcs: [ + "core/java/android/os/AsyncResult.java", + "core/java/android/os/RegistrantList.java", + "core/java/android/os/Registrant.java", + "core/java/com/android/internal/os/SomeArgs.java", + "core/java/com/android/internal/util/Preconditions.java", + ], +} + +filegroup { name: "framework-wifistack-shared-srcs", srcs: [ ":framework-annotations", diff --git a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java index c036c772d7d0..041825c235d0 100644 --- a/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java +++ b/apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java @@ -1,9 +1,9 @@ package com.android.server.usage; +import android.annotation.UserIdInt; import android.app.usage.AppStandbyInfo; import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManager.StandbyBuckets; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.content.Context; import android.os.Looper; @@ -33,6 +33,24 @@ public interface AppStandbyInternal { } } + /** + * Listener interface for notifications that an app's idle state changed. + */ + abstract static class AppIdleStateChangeListener { + + /** Callback to inform listeners that the idle state has changed to a new bucket. */ + public abstract void onAppIdleStateChanged(String packageName, @UserIdInt int userId, + boolean idle, int bucket, int reason); + + /** + * Optional callback to inform the listener that the app has transitioned into + * an active state due to user interaction. + */ + public void onUserInteractionStarted(String packageName, @UserIdInt int userId) { + // No-op by default + } + } + void onBootPhase(int phase); void postCheckIdleStates(int userId); diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index c3ffad66d829..a1734d8d25d5 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -37,7 +37,6 @@ import android.app.job.JobSnapshot; import android.app.job.JobWorkItem; import android.app.usage.UsageStatsManager; import android.app.usage.UsageStatsManagerInternal; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -103,6 +102,8 @@ import com.android.server.job.controllers.StorageController; import com.android.server.job.controllers.TimeController; import com.android.server.job.restrictions.JobRestriction; import com.android.server.job.restrictions.ThermalStatusRestriction; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import libcore.util.EmptyArray; @@ -1295,7 +1296,9 @@ public class JobSchedulerService extends com.android.server.SystemService // Set up the app standby bucketing tracker mStandbyTracker = new StandbyTracker(); mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class); - mUsageStats.addAppIdleStateChangeListener(mStandbyTracker); + + AppStandbyInternal appStandby = LocalServices.getService(AppStandbyInternal.class); + appStandby.addListener(mStandbyTracker); // The job store needs to call back publishLocalService(JobSchedulerInternal.class, new LocalService()); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java index 14dce84e686a..cda524418664 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java @@ -35,8 +35,6 @@ import android.app.ActivityManagerInternal; import android.app.AlarmManager; import android.app.AppGlobals; import android.app.IUidObserver; -import android.app.usage.UsageStatsManagerInternal; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -70,6 +68,8 @@ import com.android.server.job.ConstantsProto; import com.android.server.job.JobSchedulerService; import com.android.server.job.JobServiceContext; import com.android.server.job.StateControllerProto; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.util.ArrayList; import java.util.List; @@ -574,9 +574,8 @@ public final class QuotaController extends StateController { mContext.registerReceiverAsUser(mPackageAddedReceiver, UserHandle.ALL, filter, null, null); // Set up the app standby bucketing tracker - UsageStatsManagerInternal usageStats = LocalServices.getService( - UsageStatsManagerInternal.class); - usageStats.addAppIdleStateChangeListener(new StandbyTracker()); + AppStandbyInternal appStandby = LocalServices.getService(AppStandbyInternal.class); + appStandby.addListener(new StandbyTracker()); try { ActivityManager.getService().registerUidObserver(mUidObserver, 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 ecc045995521..bcd8be7b63e0 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -53,7 +53,6 @@ import android.app.AppGlobals; import android.app.usage.AppStandbyInfo; import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManager.StandbyBuckets; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.appwidget.AppWidgetManager; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -102,6 +101,7 @@ import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.server.LocalServices; import com.android.server.usage.AppIdleHistory.AppUsageHistory; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.io.File; import java.io.PrintWriter; diff --git a/apex/statsd/.clang-format b/apex/statsd/.clang-format new file mode 100644 index 000000000000..cead3a079435 --- /dev/null +++ b/apex/statsd/.clang-format @@ -0,0 +1,17 @@ +BasedOnStyle: Google +AllowShortIfStatementsOnASingleLine: true +AllowShortFunctionsOnASingleLine: false +AllowShortLoopsOnASingleLine: true +BinPackArguments: true +BinPackParameters: true +ColumnLimit: 100 +CommentPragmas: NOLINT:.* +ContinuationIndentWidth: 8 +DerivePointerAlignment: false +IndentWidth: 4 +PointerAlignment: Left +TabWidth: 4 +AccessModifierOffset: -4 +IncludeCategories: + - Regex: '^"Log\.h"' + Priority: -1 diff --git a/api/current.txt b/api/current.txt index 0a317c3a26de..6d2221e4e43c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9490,6 +9490,7 @@ package android.content { method @Nullable public android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable android.os.CancellationSignal); method @Nullable public android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal); method public boolean refresh(android.net.Uri, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal); + method @NonNull public final android.content.Context requireContext(); method public final void restoreCallingIdentity(@NonNull android.content.ContentProvider.CallingIdentity); method protected final void setPathPermissions(@Nullable android.content.pm.PathPermission[]); method protected final void setReadPermission(@Nullable String); diff --git a/api/system-current.txt b/api/system-current.txt index 35b096d6f535..79650fc18245 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4737,6 +4737,7 @@ package android.net.wifi { method @Deprecated public boolean hasNoInternetAccess(); method @Deprecated public boolean isEphemeral(); method @Deprecated public boolean isNoInternetAccessExpected(); + field @Deprecated public boolean allowAutojoin; field @Deprecated public String creatorName; field @Deprecated public int creatorUid; field @Deprecated public String lastUpdateName; @@ -4759,6 +4760,7 @@ package android.net.wifi { public class WifiManager { method @RequiresPermission("android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE") public void addOnWifiUsabilityStatsListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener); + method @RequiresPermission("android.permission.NETWORK_SETTINGS") public void allowAutojoin(int, boolean); method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener); method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void connect(int, @Nullable android.net.wifi.WifiManager.ActionListener); method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void disable(int, @Nullable android.net.wifi.WifiManager.ActionListener); @@ -4845,6 +4847,7 @@ package android.net.wifi { public class WifiScanner { method @Deprecated public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]); method @Deprecated public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings); + method @Nullable @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<java.lang.Integer> getAvailableChannels(int); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean getScanResults(); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource); @@ -5941,6 +5944,7 @@ package android.provider { field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; + field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; diff --git a/api/test-current.txt b/api/test-current.txt index b3834bf9681c..a060dfcb8311 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2373,6 +2373,7 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean); field public static final String NAMESPACE_AUTOFILL = "autofill"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; + field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; diff --git a/core/java/android/annotation/UnsupportedAppUsage.java b/core/java/android/annotation/UnsupportedAppUsage.java index a454df5d68f4..204d71d93cd8 100644 --- a/core/java/android/annotation/UnsupportedAppUsage.java +++ b/core/java/android/annotation/UnsupportedAppUsage.java @@ -83,8 +83,9 @@ public @interface UnsupportedAppUsage { * <p>Possible values are: * <ul> * <li> - * {@link android.os.Build.VERSION_CODES#O} or {@link android.os.Build.VERSION_CODES#P}, - * to limit access to apps targeting these SDKs (or earlier). + * An API level like {@link android.os.Build.VERSION_CODES#O} - in which case the API is + * available up to and including the specified release. Or, in other words, the API is + * blacklisted (unavailable) from the next API level from the one specified. * </li> * <li> * absent (default value) - All apps can access this API, but doing so may result in @@ -94,10 +95,6 @@ public @interface UnsupportedAppUsage { * * </ul> * - * Note, if this is set to {@link android.os.Build.VERSION_CODES#O}, apps targeting O - * maintenance releases will also be allowed to use the API, and similarly for any future - * maintenance releases of P. - * * @return The maximum value for an apps targetSdkVersion in order to access this API. */ int maxTargetSdk() default Integer.MAX_VALUE; diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 2c57622a4df8..9872e306eb9f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2563,9 +2563,12 @@ public class Activity extends ContextThemeWrapper } /** - * Report to the system that your app is now fully drawn, purely for diagnostic - * purposes (calling it does not impact the visible behavior of the activity). - * This is only used to help instrument application launch times, so that the + * Report to the system that your app is now fully drawn, for diagnostic and + * optimization purposes. The system may adjust optimizations to prioritize + * work that happens before reportFullyDrawn is called, to improve app startup. + * Misrepresenting the startup window by calling reportFullyDrawn too late or too + * early may decrease application and startup performance.<p> + * This is also used to help instrument application launch times, so that the * app can report when it is fully in a usable state; without this, the only thing * the system itself can determine is the point at which the activity's window * is <em>first</em> drawn and displayed. To participate in app launch time diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index d5e41f0eacbe..8bca87e69ecc 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -2822,12 +2822,12 @@ public class AppOpsManager { LongSparseArray.StringParcelling.class); return new OpFeatureEntry.Builder(source.readBoolean(), - (LongSparseLongArray) longSparseLongArrayParcelling.unparcel(source), - (LongSparseLongArray) longSparseLongArrayParcelling.unparcel(source), - (LongSparseLongArray) longSparseLongArrayParcelling.unparcel(source), - (LongSparseLongArray) longSparseLongArrayParcelling.unparcel(source), - (LongSparseArray<String>) longSparseStringArrayParcelling.unparcel(source), - (LongSparseArray<String>) longSparseStringArrayParcelling.unparcel(source)); + longSparseLongArrayParcelling.unparcel(source), + longSparseLongArrayParcelling.unparcel(source), + longSparseLongArrayParcelling.unparcel(source), + longSparseLongArrayParcelling.unparcel(source), + longSparseStringArrayParcelling.unparcel(source), + longSparseStringArrayParcelling.unparcel(source)); } } diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index 30868bfeac66..97e3f5221c72 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -154,7 +154,7 @@ public final class ScanRecord { } /** - * Returns the local name of the BLE device. The is a UTF-8 encoded string. + * Returns the local name of the BLE device. This is a UTF-8 encoded string. */ @Nullable public String getDeviceName() { diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 02b6b3ef64ef..7de87938c1f6 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -834,6 +834,23 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall } /** + * Retrieves a Non-Nullable Context this provider is running in, this is intended to be called + * after {@link #onCreate}. When called before context was created, an IllegalStateException + * will be thrown. + * <p> + * Note A provider must be declared in the manifest and created automatically by the system, + * and context is only available after {@link #onCreate} is called. + */ + @NonNull + public final Context requireContext() { + final Context ctx = getContext(); + if (ctx == null) { + throw new IllegalStateException("Cannot find context from the provider."); + } + return ctx; + } + + /** * Set the calling package, returning the current value (or {@code null}) * which can be used later to restore the previous state. */ diff --git a/core/java/android/content/pm/VerificationParams.java b/core/java/android/content/pm/VerificationParams.java deleted file mode 100644 index f07216796eb9..000000000000 --- a/core/java/android/content/pm/VerificationParams.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.content.pm; - -import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; - -/** - * Represents verification parameters used to verify packages to be installed. - * - * @deprecated callers should migrate to {@link PackageInstaller}. - * @hide - */ -@Deprecated -public class VerificationParams implements Parcelable { - /** A constant used to indicate that a uid value is not present. */ - public static final int NO_UID = -1; - - /** What we print out first when toString() is called. */ - private static final String TO_STRING_PREFIX = "VerificationParams{"; - - /** The location of the supplementary verification file. */ - private final Uri mVerificationURI; - - /** URI referencing where the package was downloaded from. */ - private final Uri mOriginatingURI; - - /** HTTP referrer URI associated with the originatingURI. */ - private final Uri mReferrer; - - /** UID of the application that the install request originated from. */ - private final int mOriginatingUid; - - /** UID of application requesting the install */ - private int mInstallerUid; - - /** - * Creates verification specifications for installing with application verification. - * - * @param verificationURI The location of the supplementary verification - * file. This can be a 'file:' or a 'content:' URI. May be {@code null}. - * @param originatingURI URI referencing where the package was downloaded - * from. May be {@code null}. - * @param referrer HTTP referrer URI associated with the originatingURI. - * May be {@code null}. - * @param originatingUid UID of the application that the install request originated - * from, or NO_UID if not present - */ - public VerificationParams(Uri verificationURI, Uri originatingURI, Uri referrer, - int originatingUid) { - mVerificationURI = verificationURI; - mOriginatingURI = originatingURI; - mReferrer = referrer; - mOriginatingUid = originatingUid; - mInstallerUid = NO_UID; - } - - public Uri getVerificationURI() { - return mVerificationURI; - } - - public Uri getOriginatingURI() { - return mOriginatingURI; - } - - public Uri getReferrer() { - return mReferrer; - } - - /** return NO_UID if not available */ - public int getOriginatingUid() { - return mOriginatingUid; - } - - /** @return NO_UID when not set */ - public int getInstallerUid() { - return mInstallerUid; - } - - public void setInstallerUid(int uid) { - mInstallerUid = uid; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - - if (!(o instanceof VerificationParams)) { - return false; - } - - final VerificationParams other = (VerificationParams) o; - - if (mVerificationURI == null) { - if (other.mVerificationURI != null) { - return false; - } - } else if (!mVerificationURI.equals(other.mVerificationURI)) { - return false; - } - - if (mOriginatingURI == null) { - if (other.mOriginatingURI != null) { - return false; - } - } else if (!mOriginatingURI.equals(other.mOriginatingURI)) { - return false; - } - - if (mReferrer == null) { - if (other.mReferrer != null) { - return false; - } - } else if (!mReferrer.equals(other.mReferrer)) { - return false; - } - - if (mOriginatingUid != other.mOriginatingUid) { - return false; - } - - if (mInstallerUid != other.mInstallerUid) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hash = 3; - - hash += 5 * (mVerificationURI == null ? 1 : mVerificationURI.hashCode()); - hash += 7 * (mOriginatingURI == null ? 1 : mOriginatingURI.hashCode()); - hash += 11 * (mReferrer == null ? 1 : mReferrer.hashCode()); - hash += 13 * mOriginatingUid; - hash += 17 * mInstallerUid; - - return hash; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(TO_STRING_PREFIX); - - sb.append("mVerificationURI="); - sb.append(mVerificationURI.toString()); - sb.append(",mOriginatingURI="); - sb.append(mOriginatingURI.toString()); - sb.append(",mReferrer="); - sb.append(mReferrer.toString()); - sb.append(",mOriginatingUid="); - sb.append(mOriginatingUid); - sb.append(",mInstallerUid="); - sb.append(mInstallerUid); - sb.append('}'); - - return sb.toString(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelable(mVerificationURI, 0); - dest.writeParcelable(mOriginatingURI, 0); - dest.writeParcelable(mReferrer, 0); - dest.writeInt(mOriginatingUid); - dest.writeInt(mInstallerUid); - } - - - private VerificationParams(Parcel source) { - mVerificationURI = source.readParcelable(Uri.class.getClassLoader()); - mOriginatingURI = source.readParcelable(Uri.class.getClassLoader()); - mReferrer = source.readParcelable(Uri.class.getClassLoader()); - mOriginatingUid = source.readInt(); - mInstallerUid = source.readInt(); - } - - public static final @android.annotation.NonNull Parcelable.Creator<VerificationParams> CREATOR = - new Parcelable.Creator<VerificationParams>() { - public VerificationParams createFromParcel(Parcel source) { - return new VerificationParams(source); - } - - public VerificationParams[] newArray(int size) { - return new VerificationParams[size]; - } - }; -} diff --git a/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java b/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java index 160376bf6cba..eb5d0cb539a1 100644 --- a/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java +++ b/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java @@ -58,8 +58,8 @@ public class KeyphraseEnrollmentInfo { */ private static final String VOICE_KEYPHRASE_META_DATA = "android.voice_enrollment"; /** - * Activity Action: Show activity for managing the keyphrases for hotword detection. - * This needs to be defined by an activity that supports enrolling users for hotword/keyphrase + * Intent Action: for managing the keyphrases for hotword detection. + * This needs to be defined by a service that supports enrolling users for hotword/keyphrase * detection. */ public static final String ACTION_MANAGE_VOICE_KEYPHRASES = @@ -101,7 +101,7 @@ public class KeyphraseEnrollmentInfo { // Find the apps that supports enrollment for hotword keyhphrases, // Pick a privileged app and obtain the information about the supported keyphrases // from its metadata. - List<ResolveInfo> ris = pm.queryIntentActivities( + List<ResolveInfo> ris = pm.queryIntentServices( new Intent(ACTION_MANAGE_VOICE_KEYPHRASES), PackageManager.MATCH_DEFAULT_ONLY); if (ris == null || ris.isEmpty()) { // No application capable of enrolling for voice keyphrases is present. @@ -116,11 +116,11 @@ public class KeyphraseEnrollmentInfo { for (ResolveInfo ri : ris) { try { ApplicationInfo ai = pm.getApplicationInfo( - ri.activityInfo.packageName, PackageManager.GET_META_DATA); + ri.serviceInfo.packageName, PackageManager.GET_META_DATA); if ((ai.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) == 0) { // The application isn't privileged (/system/priv-app). // The enrollment application needs to be a privileged system app. - Slog.w(TAG, ai.packageName + "is not a privileged system app"); + Slog.w(TAG, ai.packageName + " is not a privileged system app"); continue; } if (!Manifest.permission.MANAGE_VOICE_KEYPHRASES.equals(ai.permission)) { @@ -137,7 +137,7 @@ public class KeyphraseEnrollmentInfo { } } catch (PackageManager.NameNotFoundException e) { String error = "error parsing voice enrollment meta-data for " - + ri.activityInfo.packageName; + + ri.serviceInfo.packageName; parseErrors.add(error + ": " + e); Slog.w(TAG, error, e); } @@ -290,7 +290,7 @@ public class KeyphraseEnrollmentInfo { } /** - * Returns an intent to launch an activity that manages the given keyphrase + * Returns an intent to launch an service that manages the given keyphrase * for the locale. * * @param action The enrollment related action that this intent is supposed to perform. diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index e456c8a42e19..8b8afd549c9f 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -338,6 +338,15 @@ public final class DeviceConfig { public static final String NAMESPACE_PRIVACY = "privacy"; /** + * Permission related properties definitions. + * + * @hide + */ + @SystemApi + @TestApi + public static final String NAMESPACE_PERMISSIONS = "permissions"; + + /** * Interface for accessing keys belonging to {@link #NAMESPACE_WINDOW_MANAGER}. * @hide */ diff --git a/core/java/android/service/voice/AlwaysOnHotwordDetector.java b/core/java/android/service/voice/AlwaysOnHotwordDetector.java index 94f6a50c1bd9..cf56eae4a052 100644 --- a/core/java/android/service/voice/AlwaysOnHotwordDetector.java +++ b/core/java/android/service/voice/AlwaysOnHotwordDetector.java @@ -20,7 +20,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; -import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.hardware.soundtrigger.IRecognitionStatusCallback; import android.hardware.soundtrigger.KeyphraseEnrollmentInfo; @@ -446,7 +446,7 @@ public class AlwaysOnHotwordDetector { /** * Creates an intent to start the enrollment for the associated keyphrase. - * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}. + * This intent must be invoked using {@link Context#startForegroundService(Intent)}. * Starting re-enrollment is only valid if the keyphrase is un-enrolled, * i.e. {@link #STATE_KEYPHRASE_UNENROLLED}, * otherwise {@link #createReEnrollIntent()} should be preferred. @@ -468,7 +468,7 @@ public class AlwaysOnHotwordDetector { /** * Creates an intent to start the un-enrollment for the associated keyphrase. - * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}. + * This intent must be invoked using {@link Context#startForegroundService(Intent)}. * Starting re-enrollment is only valid if the keyphrase is already enrolled, * i.e. {@link #STATE_KEYPHRASE_ENROLLED}, otherwise invoking this may result in an error. * @@ -489,7 +489,7 @@ public class AlwaysOnHotwordDetector { /** * Creates an intent to start the re-enrollment for the associated keyphrase. - * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}. + * This intent must be invoked using {@link Context#startForegroundService(Intent)}. * Starting re-enrollment is only valid if the keyphrase is already enrolled, * i.e. {@link #STATE_KEYPHRASE_ENROLLED}, otherwise invoking this may result in an error. * diff --git a/core/java/android/util/LongSparseArray.java b/core/java/android/util/LongSparseArray.java index e78b79695d3d..73e17a61d17f 100644 --- a/core/java/android/util/LongSparseArray.java +++ b/core/java/android/util/LongSparseArray.java @@ -17,7 +17,6 @@ package android.util; import android.os.Parcel; -import android.os.Parcelable; import com.android.internal.util.ArrayUtils; import com.android.internal.util.GrowingArrayUtils; @@ -25,6 +24,8 @@ import com.android.internal.util.Preconditions; import libcore.util.EmptyArray; +import java.util.Arrays; + /** * SparseArray mapping longs to Objects. Unlike a normal array of Objects, * there can be gaps in the indices. It is intended to be more memory efficient @@ -450,22 +451,25 @@ public class LongSparseArray<E> implements Cloneable { /** * @hide */ - public static class StringParcelling implements com.android.internal.util.Parcelling { + public static class StringParcelling implements + com.android.internal.util.Parcelling<LongSparseArray<String>> { @Override - public void parcel(Object item, Parcel dest, int parcelFlags) { - if (item == null) { + public void parcel(LongSparseArray<String> array, Parcel dest, int parcelFlags) { + if (array == null) { dest.writeInt(-1); return; } - LongSparseArray<String> array = (LongSparseArray<String>) item; - dest.writeInt(array.mSize); + int size = array.mSize; + + dest.writeInt(size); dest.writeLongArray(array.mKeys); - dest.writeStringArray((String[]) array.mValues); + + dest.writeStringArray(Arrays.copyOfRange(array.mValues, 0, size, String[].class)); } @Override - public Object unparcel(Parcel source) { + public LongSparseArray<String> unparcel(Parcel source) { int size = source.readInt(); if (size == -1) { return null; @@ -490,49 +494,4 @@ public class LongSparseArray<E> implements Cloneable { return array; } } - - /** - * @hide - */ - public static class Parcelling<T extends Parcelable> implements - com.android.internal.util.Parcelling { - @Override - public void parcel(Object item, Parcel dest, int parcelFlags) { - if (item == null) { - dest.writeInt(-1); - return; - } - - LongSparseArray<T> array = (LongSparseArray<T>) item; - dest.writeInt(array.mSize); - dest.writeLongArray(array.mKeys); - dest.writeParcelableArray((T[]) array.mValues, parcelFlags); - } - - @Override - public Object unparcel(Parcel source) { - int size = source.readInt(); - if (size == -1) { - return null; - } - - LongSparseArray<T> array = new LongSparseArray<>(0); - array.mSize = size; - array.mKeys = source.createLongArray(); - array.mValues = source.readParcelableArray(null); - - // Make sure array is sane - Preconditions.checkArgument(array.mKeys.length >= size); - Preconditions.checkArgument(array.mValues.length >= size); - - if (size > 0) { - long last = array.mKeys[0]; - for (int i = 1; i < size; i++) { - Preconditions.checkArgument(last < array.mKeys[i]); - } - } - - return array; - } - } } diff --git a/core/java/android/util/LongSparseLongArray.java b/core/java/android/util/LongSparseLongArray.java index 9ffd4f05bd47..a0edd047a49b 100644 --- a/core/java/android/util/LongSparseLongArray.java +++ b/core/java/android/util/LongSparseLongArray.java @@ -289,22 +289,22 @@ public class LongSparseLongArray implements Cloneable { /** * @hide */ - public static class Parcelling implements com.android.internal.util.Parcelling { + public static class Parcelling implements + com.android.internal.util.Parcelling<LongSparseLongArray> { @Override - public void parcel(Object item, Parcel dest, int parcelFlags) { - if (item == null) { + public void parcel(LongSparseLongArray array, Parcel dest, int parcelFlags) { + if (array == null) { dest.writeInt(-1); return; } - LongSparseLongArray array = (LongSparseLongArray) item; dest.writeInt(array.mSize); dest.writeLongArray(array.mKeys); dest.writeLongArray(array.mValues); } @Override - public Object unparcel(Parcel source) { + public LongSparseLongArray unparcel(Parcel source) { int size = source.readInt(); if (size == -1) { return null; diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 00c1e2977c03..3b82f186d80e 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -2505,9 +2505,7 @@ public class ChooserActivity extends ResolverActivity { ri.noResourceId = true; ri.icon = 0; } - ResolveInfoPresentationGetter getter = makePresentationGetter(ri); - mCallerTargets.add(new DisplayResolveInfo(ii, ri, - getter.getLabel(), getter.getSubLabel(), ii)); + mCallerTargets.add(new DisplayResolveInfo(ii, ri, ii)); } } } @@ -2606,7 +2604,22 @@ public class ChooserActivity extends ResolverActivity { @Override public void onListRebuilt() { - updateAlphabeticalList(); + if (getDisplayList() == null || getDisplayList().isEmpty()) { + notifyDataSetChanged(); + } else { + new AsyncTask<Void, Void, Void>() { + @Override + protected Void doInBackground(Void... voids) { + updateAlphabeticalList(); + return null; + } + + @Override + protected void onPostExecute(Void aVoid) { + notifyDataSetChanged(); + } + }.execute(); + } // don't support direct share on low ram devices if (ActivityManager.isLowRamDeviceStatic()) { diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 7f18ae35b00c..74996e9fc212 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1406,14 +1406,18 @@ public class ResolverActivity extends Activity { public final class DisplayResolveInfo implements TargetInfo { private final ResolveInfo mResolveInfo; - private final CharSequence mDisplayLabel; + private CharSequence mDisplayLabel; private Drawable mDisplayIcon; private Drawable mBadge; - private final CharSequence mExtendedInfo; + private CharSequence mExtendedInfo; private final Intent mResolvedIntent; private final List<Intent> mSourceIntents = new ArrayList<>(); private boolean mIsSuspended; + public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, Intent pOrigIntent) { + this(originalIntent, pri, null /*mDisplayLabel*/, null /*mExtendedInfo*/, pOrigIntent); + } + public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel, CharSequence pInfo, Intent pOrigIntent) { mSourceIntents.add(originalIntent); @@ -1448,9 +1452,26 @@ public class ResolverActivity extends Activity { } public CharSequence getDisplayLabel() { + if (mDisplayLabel == null) { + ResolveInfoPresentationGetter pg = makePresentationGetter(mResolveInfo); + mDisplayLabel = pg.getLabel(); + mExtendedInfo = pg.getSubLabel(); + } return mDisplayLabel; } + public boolean hasDisplayLabel() { + return mDisplayLabel != null; + } + + public void setDisplayLabel(CharSequence displayLabel) { + mDisplayLabel = displayLabel; + } + + public void setExtendedInfo(CharSequence extendedInfo) { + mExtendedInfo = extendedInfo; + } + public Drawable getDisplayIcon() { return mDisplayIcon; } @@ -1866,9 +1887,7 @@ public class ResolverActivity extends Activity { final ResolveInfo ri = rci.getResolveInfoAt(0); if (ri != null) { mAllTargetsAreBrowsers &= ri.handleAllWebDataURI; - - ResolveInfoPresentationGetter pg = makePresentationGetter(ri); - addResolveInfoWithAlternates(rci, pg.getSubLabel(), pg.getLabel()); + addResolveInfoWithAlternates(rci); } } } @@ -1915,14 +1934,12 @@ public class ResolverActivity extends Activity { return mFilterLastUsed; } - private void addResolveInfoWithAlternates(ResolvedComponentInfo rci, - CharSequence extraInfo, CharSequence roLabel) { + private void addResolveInfoWithAlternates(ResolvedComponentInfo rci) { final int count = rci.getCount(); final Intent intent = rci.getIntentAt(0); final ResolveInfo add = rci.getResolveInfoAt(0); final Intent replaceIntent = getReplacementIntent(add.activityInfo, intent); - final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, roLabel, - extraInfo, replaceIntent); + final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, replaceIntent); addResolveInfo(dri); if (replaceIntent == intent) { // Only add alternates if we didn't get a specific replacement from @@ -2054,20 +2071,11 @@ public class ResolverActivity extends Activity { return; } - final CharSequence label = info.getDisplayLabel(); - if (!TextUtils.equals(holder.text.getText(), label)) { - holder.text.setText(info.getDisplayLabel()); - } - - // Always show a subLabel for visual consistency across list items. Show an empty - // subLabel if the subLabel is the same as the label - CharSequence subLabel = info.getExtendedInfo(); - if (TextUtils.equals(label, subLabel)) subLabel = null; - - if (!TextUtils.equals(holder.text2.getText(), subLabel) - && !TextUtils.isEmpty(subLabel)) { - holder.text2.setVisibility(View.VISIBLE); - holder.text2.setText(subLabel); + if (info instanceof DisplayResolveInfo + && !((DisplayResolveInfo) info).hasDisplayLabel()) { + getLoadLabelTask((DisplayResolveInfo) info, holder).execute(); + } else { + holder.bindLabel(info.getDisplayLabel(), info.getExtendedInfo()); } if (info.isSuspended()) { @@ -2085,6 +2093,9 @@ public class ResolverActivity extends Activity { } } + protected LoadLabelTask getLoadLabelTask(DisplayResolveInfo info, ViewHolder holder) { + return new LoadLabelTask(info, holder); + } @VisibleForTesting public static final class ResolvedComponentInfo { @@ -2148,6 +2159,24 @@ public class ResolverActivity extends Activity { text2 = (TextView) view.findViewById(com.android.internal.R.id.text2); icon = (ImageView) view.findViewById(R.id.icon); } + + public void bindLabel(CharSequence label, CharSequence subLabel) { + if (!TextUtils.equals(text.getText(), label)) { + text.setText(label); + } + + // Always show a subLabel for visual consistency across list items. Show an empty + // subLabel if the subLabel is the same as the label + if (TextUtils.equals(label, subLabel)) { + subLabel = null; + } + + if (!TextUtils.equals(text2.getText(), subLabel) + && !TextUtils.isEmpty(subLabel)) { + text2.setVisibility(View.VISIBLE); + text2.setText(subLabel); + } + } } class ItemClickListener implements AdapterView.OnItemClickListener, @@ -2200,6 +2229,34 @@ public class ResolverActivity extends Activity { } + protected class LoadLabelTask extends AsyncTask<Void, Void, CharSequence[]> { + private final DisplayResolveInfo mDisplayResolveInfo; + private final ViewHolder mHolder; + + protected LoadLabelTask(DisplayResolveInfo dri, ViewHolder holder) { + mDisplayResolveInfo = dri; + mHolder = holder; + } + + + @Override + protected CharSequence[] doInBackground(Void... voids) { + ResolveInfoPresentationGetter pg = + makePresentationGetter(mDisplayResolveInfo.mResolveInfo); + return new CharSequence[] { + pg.getLabel(), + pg.getSubLabel() + }; + } + + @Override + protected void onPostExecute(CharSequence[] result) { + mDisplayResolveInfo.setDisplayLabel(result[0]); + mDisplayResolveInfo.setExtendedInfo(result[1]); + mHolder.bindLabel(result[0], result[1]); + } + } + class LoadIconTask extends AsyncTask<Void, Void, Drawable> { protected final DisplayResolveInfo mDisplayResolveInfo; private final ResolveInfo mResolveInfo; diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 94be61f40eae..97dae599f5c2 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -2406,6 +2406,11 @@ enum PageId { // CATEGORY: SETTINGS // OS: Q SETTINGS_AWARE_DISPLAY = 1750; + + // OPEN: Settings > System > Input & Gesture > tap gesture + // CATEGORY: SETTINGS + // OS: Q + SETTINGS_GESTURE_TAP = 1751; // ---- End Q Constants, all Q constants go above this line ---- // OPEN: Settings > Network & Internet > Wi-Fi > Click new network // CATEGORY: SETTINGS @@ -2426,4 +2431,9 @@ enum PageId { // and under gesture navigation mode. DIALOG_TOGGLE_SCREEN_MAGNIFICATION_GESTURE_NAVIGATION = 1802; + // OPEN: Settings > Security & screen lock -> Encryption & credentials > Install a certificate + // CATEGORY: SETTINGS + // OS: R + INSTALL_CERTIFICATE_FROM_STORAGE = 1803; + } diff --git a/core/proto/android/server/notificationhistory.proto b/core/proto/android/server/notificationhistory.proto index 148bd7e4b663..1e6ee3f1a3a8 100644 --- a/core/proto/android/server/notificationhistory.proto +++ b/core/proto/android/server/notificationhistory.proto @@ -46,7 +46,7 @@ message NotificationHistoryProto { // The uid of the package that posted the notification optional int32 uid = 7; - // The user id of the package that posted the notification + // The user id that the notification was posted to optional int32 user_id = 8; // The time at which the notification was posted optional int64 posted_time_ms = 9; @@ -71,19 +71,19 @@ message NotificationHistoryProto { optional ImageTypeEnum image_type = 1; optional string image_bitmap_filename = 2; optional int32 image_resource_id = 3; - optional bytes image_data = 4; - optional string image_uri = 5; + optional string image_resource_id_package = 4; + optional bytes image_data = 5; + optional int32 image_data_length = 6; + optional int32 image_data_offset = 7; + optional string image_uri = 8; } } - // The time the last entry was written - optional int64 end_time_ms = 1; // Pool of strings to save space - optional StringPool stringpool = 2; + optional StringPool string_pool = 1; // Versioning fields - optional int32 major_version = 3; - optional int32 minor_version = 4; + optional int32 major_version = 2; // List of historical notifications - repeated Notification notification = 5; + repeated Notification notification = 3; } diff --git a/core/proto/android/service/usb.proto b/core/proto/android/service/usb.proto index 2e1de79b199f..40c5a85e1f24 100644 --- a/core/proto/android/service/usb.proto +++ b/core/proto/android/service/usb.proto @@ -32,6 +32,7 @@ message UsbServiceDumpProto { optional UsbPortManagerProto port_manager = 3; optional UsbAlsaManagerProto alsa_manager = 4; optional UsbSettingsManagerProto settings_manager = 5; + optional UsbPermissionsManagerProto permissions_manager = 6; } message UsbDeviceManagerProto { @@ -309,40 +310,83 @@ message UsbUserSettingsManagerProto { option (android.msg_privacy).dest = DEST_AUTOMATIC; optional int32 user_id = 1; - repeated UsbSettingsDevicePermissionProto device_permissions = 2; - repeated UsbSettingsAccessoryPermissionProto accessory_permissions = 3; + reserved 2; // previously device_permissions, now unused + reserved 3; // previously accessory_permissions, now unused repeated UsbDeviceAttachedActivities device_attached_activities = 4; repeated UsbAccessoryAttachedActivities accessory_attached_activities = 5; } -message UsbSettingsDevicePermissionProto { +message UsbProfileGroupSettingsManagerProto { + option (android.msg_privacy).dest = DEST_AUTOMATIC; + + // The user id of the personal profile if the device has a work profile. + optional int32 parent_user_id = 1; + repeated UsbSettingsDevicePreferenceProto device_preferences = 2; + repeated UsbSettingsAccessoryPreferenceProto accessory_preferences = 3; +} + +message UsbSettingsDevicePreferenceProto { + option (android.msg_privacy).dest = DEST_AUTOMATIC; + + optional UsbDeviceFilterProto filter = 1; + optional UserPackageProto user_package = 2; +} + +message UsbPermissionsManagerProto { + option (android.msg_privacy).dest = DEST_AUTOMATIC; + + repeated UsbUserPermissionsManagerProto user_permissions = 1; +} + +message UsbUserPermissionsManagerProto { option (android.msg_privacy).dest = DEST_AUTOMATIC; + optional int32 user_id = 1; + + repeated UsbDevicePermissionProto device_permissions = 2; + repeated UsbAccessoryPermissionProto accessory_permissions = 3; + + repeated UsbDevicePersistentPermissionProto device_persistent_permissions = 4; + repeated UsbAccessoryPersistentPermissionProto accessory_persistent_permissions = 5; +} + +message UsbDevicePermissionProto { + option (android.msg_privacy).dest = DEST_AUTOMATIC; + + // Name of device set by manufacturer + // All devices of the same model have the same name optional string device_name = 1; repeated int32 uids = 2; } -message UsbSettingsAccessoryPermissionProto { +message UsbAccessoryPermissionProto { option (android.msg_privacy).dest = DEST_AUTOMATIC; + // Description of accessory set by manufacturer + // All accessories of the same model have the same description optional string accessory_description = 1; repeated int32 uids = 2; } -message UsbProfileGroupSettingsManagerProto { +message UsbDevicePersistentPermissionProto { option (android.msg_privacy).dest = DEST_AUTOMATIC; - // The user id of the personal profile if the device has a work profile. - optional int32 parent_user_id = 1; - repeated UsbSettingsDevicePreferenceProto device_preferences = 2; - repeated UsbSettingsAccessoryPreferenceProto accessory_preferences = 3; + optional UsbDeviceFilterProto device_filter = 1; + repeated UsbUidPermissionProto permission_values = 2; } -message UsbSettingsDevicePreferenceProto { +message UsbAccessoryPersistentPermissionProto { option (android.msg_privacy).dest = DEST_AUTOMATIC; - optional UsbDeviceFilterProto filter = 1; - optional UserPackageProto user_package = 2; + optional UsbAccessoryFilterProto accessory_filter = 1; + repeated UsbUidPermissionProto permission_values = 2; +} + +message UsbUidPermissionProto { + option (android.msg_privacy).dest = DEST_AUTOMATIC; + + optional int32 uid = 1; + optional bool is_granted = 2; } message UsbDeviceFilterProto { diff --git a/core/res/res/xml/sms_short_codes.xml b/core/res/res/xml/sms_short_codes.xml index f71c8b0558cf..2d1c61cc22fc 100644 --- a/core/res/res/xml/sms_short_codes.xml +++ b/core/res/res/xml/sms_short_codes.xml @@ -90,7 +90,7 @@ <shortcode country="cz" premium="9\\d{6,7}" free="116\\d{3}" /> <!-- Germany: 4-5 digits plus 1232xxx (premium codes from http://www.vodafone.de/infofaxe/537.pdf and http://premiumdienste.eplus.de/pdf/kodex.pdf), plus EU. To keep the premium regex from being too large, it only includes payment processors that have been used by SMS malware, with the regular pattern matching the other premium short codes. --> - <shortcode country="de" pattern="\\d{4,5}|1232\\d{3}" premium="11(?:111|833)|1232(?:013|021|060|075|286|358)|118(?:44|80|86)|20[25]00|220(?:21|22|88|99)|221(?:14|21)|223(?:44|53|77)|224[13]0|225(?:20|59|90)|226(?:06|10|20|26|30|40|56|70)|227(?:07|33|39|66|76|78|79|88|99)|228(?:08|11|66|77)|23300|30030|3[12347]000|330(?:33|55|66)|33(?:233|331|366|533)|34(?:34|567)|37000|40(?:040|123|444|[3568]00)|41(?:010|414)|44(?:000|044|344|44[24]|544)|50005|50100|50123|50555|51000|52(?:255|783)|54(?:100|2542)|55(?:077|[24]00|222|333|55|[12369]55)|56(?:789|886)|60800|6[13]000|66(?:[12348]66|566|766|777|88|999)|68888|70(?:07|123|777)|76766|77(?:007|070|222|444|[567]77)|80(?:008|123|888)|82(?:002|[378]00|323|444|472|474|488|727)|83(?:005|[169]00|333|830)|84(?:141|300|32[34]|343|488|499|777|888)|85888|86(?:188|566|640|644|650|677|868|888)|870[24]9|871(?:23|[49]9)|872(?:1[0-8]|49|99)|87499|875(?:49|55|99)|876(?:0[1367]|1[1245678]|54|99)|877(?:00|99)|878(?:15|25|3[567]|8[12])|87999|880(?:08|44|55|77|99)|88688|888(?:03|10|8|89)|8899|90(?:009|999)|99999" free="116\\d{3}|81214|81215|47529|70296|83782|3011|73240" /> + <shortcode country="de" pattern="\\d{4,5}|1232\\d{3}" premium="11(?:111|833)|1232(?:013|021|060|075|286|358)|118(?:44|80|86)|20[25]00|220(?:21|22|88|99)|221(?:14|21)|223(?:44|53|77)|224[13]0|225(?:20|59|90)|226(?:06|10|20|26|30|40|56|70)|227(?:07|33|39|66|76|78|79|88|99)|228(?:08|11|66|77)|23300|30030|3[12347]000|330(?:33|55|66)|33(?:233|331|366|533)|34(?:34|567)|37000|40(?:040|123|444|[3568]00)|41(?:010|414)|44(?:000|044|344|44[24]|544)|50005|50100|50123|50555|51000|52(?:255|783)|54(?:100|2542)|55(?:077|[24]00|222|333|55|[12369]55)|56(?:789|886)|60800|6[13]000|66(?:[12348]66|566|766|777|88|999)|68888|70(?:07|123|777)|76766|77(?:007|070|222|444|[567]77)|80(?:008|123|888)|82(?:002|[378]00|323|444|472|474|488|727)|83(?:005|[169]00|333|830)|84(?:141|300|32[34]|343|488|499|777|888)|85888|86(?:188|566|640|644|650|677|868|888)|870[24]9|871(?:23|[49]9)|872(?:1[0-8]|49|99)|87499|875(?:49|55|99)|876(?:0[1367]|1[1245678]|54|99)|877(?:00|99)|878(?:15|25|3[567]|8[12])|87999|880(?:08|44|55|77|99)|88688|888(?:03|10|8|89)|8899|90(?:009|999)|99999" free="116\\d{3}|81214|81215|47529|70296|83782|3011|73240|72438" /> <!-- Denmark: see http://iprs.webspacecommerce.com/Denmark-Premium-Rate-Numbers --> <shortcode country="dk" pattern="\\d{4,5}" premium="1\\d{3}" free="116\\d{3}|4665" /> diff --git a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java b/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java deleted file mode 100644 index f6527da0ba1a..000000000000 --- a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.content.pm; - -import android.net.Uri; -import android.os.Parcel; -import android.test.AndroidTestCase; - -import androidx.test.filters.LargeTest; - -/** - * Tests the android.content.pm.VerificationParams class - * - * To test run: - * ./development/testrunner/runtest.py frameworks-core -c android.content.pm.VerificationParamsTest - */ -@LargeTest -public class VerificationParamsTest extends AndroidTestCase { - - private final static String VERIFICATION_URI_STRING = "http://verification.uri/path"; - private final static String ORIGINATING_URI_STRING = "http://originating.uri/path"; - private final static String REFERRER_STRING = "http://referrer.uri/path"; - private final static int INSTALLER_UID = 42; - - private final static Uri VERIFICATION_URI = Uri.parse(VERIFICATION_URI_STRING); - private final static Uri ORIGINATING_URI = Uri.parse(ORIGINATING_URI_STRING); - private final static Uri REFERRER = Uri.parse(REFERRER_STRING); - - private final static int ORIGINATING_UID = 10042; - - public void testParcel() throws Exception { - VerificationParams expected = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - Parcel parcel = Parcel.obtain(); - expected.writeToParcel(parcel, 0); - parcel.setDataPosition(0); - - VerificationParams actual = VerificationParams.CREATOR.createFromParcel(parcel); - - assertEquals(VERIFICATION_URI, actual.getVerificationURI()); - - assertEquals(ORIGINATING_URI, actual.getOriginatingURI()); - - assertEquals(REFERRER, actual.getReferrer()); - - assertEquals(ORIGINATING_UID, actual.getOriginatingUid()); - } - - public void testEquals_Success() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertEquals(params1, params2); - } - - public void testEquals_VerificationUri_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse("http://a.different.uri/"), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertFalse(params1.equals(params2)); - } - - public void testEquals_OriginatingUri_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse("http://a.different.uri/"), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertFalse(params1.equals(params2)); - } - - public void testEquals_Referrer_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse("http://a.different.uri/"), ORIGINATING_UID); - - assertFalse(params1.equals(params2)); - } - - public void testEquals_Originating_Uid_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), 12345); - - assertFalse(params1.equals(params2)); - } - - public void testEquals_InstallerUid_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - params2.setInstallerUid(INSTALLER_UID); - - assertFalse(params1.equals(params2)); - } - - public void testHashCode_Success() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertEquals(params1.hashCode(), params2.hashCode()); - } - - public void testHashCode_VerificationUri_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams(null, Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertFalse(params1.hashCode() == params2.hashCode()); - } - - public void testHashCode_OriginatingUri_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse("http://a.different.uri/"), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - - assertFalse(params1.hashCode() == params2.hashCode()); - } - - public void testHashCode_Referrer_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), null, - ORIGINATING_UID); - - assertFalse(params1.hashCode() == params2.hashCode()); - } - - public void testHashCode_Originating_Uid_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), 12345); - - assertFalse(params1.hashCode() == params2.hashCode()); - } - - public void testHashCode_InstallerUid_Failure() throws Exception { - VerificationParams params1 = new VerificationParams(VERIFICATION_URI, ORIGINATING_URI, - REFERRER, ORIGINATING_UID); - - VerificationParams params2 = new VerificationParams( - Uri.parse(VERIFICATION_URI_STRING), Uri.parse(ORIGINATING_URI_STRING), - Uri.parse(REFERRER_STRING), ORIGINATING_UID); - params2.setInstallerUid(INSTALLER_UID); - - assertFalse(params1.hashCode() == params2.hashCode()); - } -} diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java index 453bddd9e962..0fa29bf4436a 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java @@ -38,6 +38,7 @@ import android.view.View; import android.widget.RelativeLayout; import androidx.test.InstrumentationRegistry; +import androidx.test.espresso.Espresso; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; @@ -82,6 +83,7 @@ public class ResolverActivityTest { Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + Espresso.registerIdlingResources(activity.getLabelIdlingResource()); waitForIdle(); assertThat(activity.getAdapter().getCount(), is(2)); @@ -214,6 +216,7 @@ public class ResolverActivityTest { Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + Espresso.registerIdlingResources(activity.getLabelIdlingResource()); waitForIdle(); // The other entry is filtered to the last used slot @@ -251,6 +254,7 @@ public class ResolverActivityTest { Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + Espresso.registerIdlingResources(activity.getLabelIdlingResource()); waitForIdle(); // The other entry is filtered to the other profile slot @@ -296,6 +300,7 @@ public class ResolverActivityTest { .thenReturn(resolvedComponentInfos.get(1).getResolveInfoAt(0)); final ResolverWrapperActivity activity = mActivityRule.launchActivity(sendIntent); + Espresso.registerIdlingResources(activity.getLabelIdlingResource()); waitForIdle(); // The other entry is filtered to the other profile slot diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java index 6218fa9fbac8..5ac1489bcfef 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverListControllerTest.java @@ -16,6 +16,8 @@ package com.android.internal.app; +import static junit.framework.Assert.assertEquals; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Matchers.any; @@ -126,7 +128,7 @@ public class ResolverListControllerTest { String annotation = "test_annotation"; Intent sendIntent = createSendImageIntent(annotation); String refererPackage = "test_referer_package"; - List<ResolvedComponentInfo> resolvedComponents = createResolvedComponentsForTest(15); + List<ResolvedComponentInfo> resolvedComponents = createResolvedComponentsForTest(10); mUsm = new UsageStatsManager(mMockContext, mMockService); when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)).thenReturn(mUsm); mController = new ResolverListController(mMockContext, mMockPackageManager, sendIntent, @@ -135,7 +137,18 @@ public class ResolverListControllerTest { mController.topK(topKList, 5); List<ResolvedComponentInfo> sortList = new ArrayList<>(topKList); mController.sort(sortList); - assertThat(sortList.subList(0, 5), is(topKList.subList(0, 5))); + assertEquals("Top k elements should be sorted when input size greater than k.", + sortList.subList(0, 5), topKList.subList(0, 5)); + mController.topK(topKList, 10); + sortList = new ArrayList<>(topKList); + mController.sort(sortList); + assertEquals("All elements should be sorted when input size equals k.", + sortList, topKList); + mController.topK(topKList, 15); + sortList = new ArrayList<>(topKList); + mController.sort(sortList); + assertEquals("All elements should be sorted when input size less than k.", + sortList, topKList); } private UsageStats initStats(String packageName, String action, diff --git a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java index 83f6bc2e8bf3..9082543e8ebc 100644 --- a/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java +++ b/core/tests/coretests/src/com/android/internal/app/ResolverWrapperActivity.java @@ -21,6 +21,8 @@ import static org.mockito.Mockito.mock; import android.app.usage.UsageStatsManager; import android.content.pm.PackageManager; +import androidx.test.espresso.idling.CountingIdlingResource; + import java.util.function.Function; /* @@ -29,6 +31,12 @@ import java.util.function.Function; public class ResolverWrapperActivity extends ResolverActivity { static final OverrideData sOverrides = new OverrideData(); private UsageStatsManager mUsm; + private CountingIdlingResource mLabelIdlingResource = + new CountingIdlingResource("LoadLabelTask"); + + public CountingIdlingResource getLabelIdlingResource() { + return mLabelIdlingResource; + } ResolveListAdapter getAdapter() { return mAdapter; @@ -64,6 +72,11 @@ public class ResolverWrapperActivity extends ResolverActivity { return super.getPackageManager(); } + @Override + protected LoadLabelTask getLoadLabelTask(DisplayResolveInfo info, ViewHolder holder) { + return new LoadLabelWrapperTask(info, holder); + } + /** * We cannot directly mock the activity created since instrumentation creates it. * <p> @@ -83,4 +96,22 @@ public class ResolverWrapperActivity extends ResolverActivity { resolverListController = mock(ResolverListController.class); } } + + class LoadLabelWrapperTask extends LoadLabelTask { + + protected LoadLabelWrapperTask(DisplayResolveInfo dri, ViewHolder holder) { + super(dri, holder); + } + + @Override + protected void onPreExecute() { + mLabelIdlingResource.increment(); + } + + @Override + protected void onPostExecute(CharSequence[] result) { + super.onPostExecute(result); + mLabelIdlingResource.decrement(); + } + } }
\ No newline at end of file diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index 54995ac9d050..f25910beb537 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -71,6 +71,15 @@ public class Credentials { /** Key containing suffix of lockdown VPN profile. */ public static final String LOCKDOWN_VPN = "LOCKDOWN_VPN"; + /** Name of CA certificate usage. */ + public static final String CERTIFICATE_USAGE_CA = "ca"; + + /** Name of User certificate usage. */ + public static final String CERTIFICATE_USAGE_USER = "user"; + + /** Name of WIFI certificate usage. */ + public static final String CERTIFICATE_USAGE_WIFI = "wifi"; + /** Data type for public keys. */ public static final String EXTRA_PUBLIC_KEY = "KEY"; @@ -91,6 +100,11 @@ public class Credentials { public static final String EXTRA_INSTALL_AS_UID = "install_as_uid"; /** + * Intent extra: type of the certificate to install + */ + public static final String EXTRA_CERTIFICATE_USAGE = "certificate_install_usage"; + + /** * Intent extra: name for the user's key pair. */ public static final String EXTRA_USER_KEY_ALIAS = "user_key_pair_name"; diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 010f92f1ec67..d3db9d83b3e7 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -2183,7 +2183,7 @@ public class LocationManager { public void removeGpsNavigationMessageListener(GpsNavigationMessageEvent.Listener listener) {} /** - * Registers a GNSS Navigation Message callback. + * Registers a GNSS Navigation Message callback which will run on a binder thread. * * @param callback a {@link GnssNavigationMessage.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. @@ -2194,7 +2194,7 @@ public class LocationManager { @Deprecated public boolean registerGnssNavigationMessageCallback( @NonNull GnssNavigationMessage.Callback callback) { - return registerGnssNavigationMessageCallback(callback, null); + return registerGnssNavigationMessageCallback(Runnable::run, callback); } /** diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 0902acf176d4..0f38f7f057fa 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -30,6 +30,8 @@ import android.os.SystemClock; import android.os.WorkSource; import android.util.TimeUtils; +import com.android.internal.util.Preconditions; + /** * A data object that contains quality of service parameters for requests @@ -195,6 +197,8 @@ public final class LocationRequest implements Parcelable { @NonNull public static LocationRequest createFromDeprecatedProvider( @NonNull String provider, long minTime, float minDistance, boolean singleShot) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + if (minTime < 0) minTime = 0; if (minDistance < 0) minDistance = 0; @@ -222,6 +226,8 @@ public final class LocationRequest implements Parcelable { @NonNull public static LocationRequest createFromDeprecatedCriteria( @NonNull Criteria criteria, long minTime, float minDistance, boolean singleShot) { + Preconditions.checkArgument(criteria != null, "invalid null criteria"); + if (minTime < 0) minTime = 0; if (minDistance < 0) minDistance = 0; diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 7906fa34d844..7d107ddbe978 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -89,6 +89,10 @@ import java.util.Vector; * of audio/video files and streams. An example on how to use the methods in * this class can be found in {@link android.widget.VideoView}. * + * <p>MediaPlayer is not thread-safe. Creation of and all access to player instances + * should be on the same thread. If registering <a href="#Callbacks">callbacks</a>, + * the thread must have a Looper. + * * <p>Topics covered here are: * <ol> * <li><a href="#StateDiagram">State Diagram</a> @@ -305,7 +309,7 @@ import java.util.Vector; * </li> * <li>When the playback reaches the end of stream, the playback completes. * <ul> - * <li>If the looping mode was being set to <var>true</var>with + * <li>If the looping mode was being set to <var>true</var> with * {@link #setLooping(boolean)}, the MediaPlayer object shall remain in * the <em>Started</em> state.</li> * <li>If the looping mode was set to <var>false @@ -554,13 +558,13 @@ import java.util.Vector; * possible runtime errors during playback or streaming. Registration for * these events is done by properly setting the appropriate listeners (via calls * to - * {@link #setOnPreparedListener(OnPreparedListener)}setOnPreparedListener, - * {@link #setOnVideoSizeChangedListener(OnVideoSizeChangedListener)}setOnVideoSizeChangedListener, - * {@link #setOnSeekCompleteListener(OnSeekCompleteListener)}setOnSeekCompleteListener, - * {@link #setOnCompletionListener(OnCompletionListener)}setOnCompletionListener, - * {@link #setOnBufferingUpdateListener(OnBufferingUpdateListener)}setOnBufferingUpdateListener, - * {@link #setOnInfoListener(OnInfoListener)}setOnInfoListener, - * {@link #setOnErrorListener(OnErrorListener)}setOnErrorListener, etc). + * {@link #setOnPreparedListener(OnPreparedListener) setOnPreparedListener}, + * {@link #setOnVideoSizeChangedListener(OnVideoSizeChangedListener) setOnVideoSizeChangedListener}, + * {@link #setOnSeekCompleteListener(OnSeekCompleteListener) setOnSeekCompleteListener}, + * {@link #setOnCompletionListener(OnCompletionListener) setOnCompletionListener}, + * {@link #setOnBufferingUpdateListener(OnBufferingUpdateListener) setOnBufferingUpdateListener}, + * {@link #setOnInfoListener(OnInfoListener) setOnInfoListener}, + * {@link #setOnErrorListener(OnErrorListener) setOnErrorListener}, etc). * In order to receive the respective callback * associated with these listeners, applications are required to create * MediaPlayer objects on a thread with its own Looper running (main UI diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java new file mode 100644 index 000000000000..0228dc94fb25 --- /dev/null +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -0,0 +1,51 @@ +/* + * Copyright 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.media.tv.tuner; + +/** + * Tuner is used to interact with tuner devices. + * + * @hide + */ +public final class Tuner implements AutoCloseable { + private static final String TAG = "MediaTvTuner"; + private static final boolean DEBUG = false; + + static { + System.loadLibrary("media_tv_tuner"); + nativeInit(); + } + + public Tuner() { + nativeSetup(); + } + + private long mNativeContext; // used by native jMediaTuner + + @Override + public void close() {} + + /** + * Native Initialization. + */ + private static native void nativeInit(); + + /** + * Native setup. + */ + private native void nativeSetup(); +} diff --git a/media/jni/Android.bp b/media/jni/Android.bp index b4edabfb2e8b..a596d89bdcce 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -123,6 +123,30 @@ cc_library_shared { ], } +cc_library_shared { + name: "libmedia_tv_tuner", + srcs: [ + "android_media_tv_Tuner.cpp", + ], + + shared_libs: [ + "android.hardware.tv.tuner@1.0", + "libandroid_runtime", + "liblog", + "libutils", + ], + + export_include_dirs: ["."], + + cflags: [ + "-Wall", + "-Werror", + "-Wno-error=deprecated-declarations", + "-Wunused", + "-Wunreachable-code", + ], +} + subdirs = [ "audioeffect", "soundpool", diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp new file mode 100644 index 000000000000..d499eee5a9da --- /dev/null +++ b/media/jni/android_media_tv_Tuner.cpp @@ -0,0 +1,135 @@ +/* + * Copyright 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "TvTuner-JNI" +#include <utils/Log.h> + +#include "android_media_tv_Tuner.h" +#include "android_runtime/AndroidRuntime.h" + +#include <android/hardware/tv/tuner/1.0/ITuner.h> +#include <media/stagefright/foundation/ADebug.h> + +#pragma GCC diagnostic ignored "-Wunused-function" + +using ::android::hardware::tv::tuner::V1_0::ITuner; + +struct fields_t { + jfieldID context; +}; + +static fields_t gFields; + +namespace android { + +sp<ITuner> JTuner::mTuner; + +JTuner::JTuner(JNIEnv *env, jobject thiz) + : mClass(NULL) { + jclass clazz = env->GetObjectClass(thiz); + CHECK(clazz != NULL); + + mClass = (jclass)env->NewGlobalRef(clazz); + mObject = env->NewWeakGlobalRef(thiz); + if (mTuner == NULL) { + mTuner = getTunerService(); + } +} + +JTuner::~JTuner() { + JNIEnv *env = AndroidRuntime::getJNIEnv(); + + env->DeleteGlobalRef(mClass); + mTuner = NULL; + mClass = NULL; + mObject = NULL; +} + +sp<ITuner> JTuner::getTunerService() { + if (mTuner == nullptr) { + mTuner = ITuner::getService(); + + if (mTuner == nullptr) { + ALOGW("Failed to get tuner service."); + } + } + return mTuner; +} + +} // namespace android + +//////////////////////////////////////////////////////////////////////////////// + +using namespace android; + +static sp<JTuner> setTuner(JNIEnv *env, jobject thiz, const sp<JTuner> &tuner) { + sp<JTuner> old = (JTuner *)env->GetLongField(thiz, gFields.context); + + if (tuner != NULL) { + tuner->incStrong(thiz); + } + if (old != NULL) { + old->decStrong(thiz); + } + env->SetLongField(thiz, gFields.context, (jlong)tuner.get()); + + return old; +} + +static sp<JTuner> getTuner(JNIEnv *env, jobject thiz) { + return (JTuner *)env->GetLongField(thiz, gFields.context); +} + +static void android_media_tv_Tuner_native_init(JNIEnv *env) { + jclass clazz = env->FindClass("android/media/tv/tuner/Tuner"); + CHECK(clazz != NULL); + + gFields.context = env->GetFieldID(clazz, "mNativeContext", "J"); + CHECK(gFields.context != NULL); +} + +static void android_media_tv_Tuner_native_setup(JNIEnv *env, jobject thiz) { + sp<JTuner> tuner = new JTuner(env, thiz); + setTuner(env,thiz, tuner); +} + +static const JNINativeMethod gMethods[] = { + { "nativeInit", "()V", (void *)android_media_tv_Tuner_native_init }, + { "nativeSetup", "()V", (void *)android_media_tv_Tuner_native_setup }, +}; + +static int register_android_media_tv_Tuner(JNIEnv *env) { + return AndroidRuntime::registerNativeMethods( + env, "android/media/tv/tuner/Tuner", gMethods, NELEM(gMethods)); +} + +jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) +{ + JNIEnv* env = NULL; + jint result = -1; + + if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { + ALOGE("ERROR: GetEnv failed\n"); + return result; + } + assert(env != NULL); + + if (register_android_media_tv_Tuner(env) != JNI_OK) { + ALOGE("ERROR: Tuner native registration failed\n"); + return result; + } + return JNI_VERSION_1_4; +} diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h new file mode 100644 index 000000000000..e7d5924a7dbe --- /dev/null +++ b/media/jni/android_media_tv_Tuner.h @@ -0,0 +1,43 @@ +/* + * Copyright 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _ANDROID_MEDIA_TV_TUNER_H_ +#define _ANDROID_MEDIA_TV_TUNER_H_ + +#include <android/hardware/tv/tuner/1.0/ITuner.h> +#include <utils/RefBase.h> + +#include "jni.h" + +using ::android::hardware::tv::tuner::V1_0::ITuner; + +namespace android { + +struct JTuner : public RefBase { + JTuner(JNIEnv *env, jobject thiz); + sp<ITuner> getTunerService(); +protected: + virtual ~JTuner(); + +private: + jclass mClass; + jweak mObject; + static sp<ITuner> mTuner; +}; + +} // namespace android + +#endif // _ANDROID_MEDIA_TV_TUNER_H_ diff --git a/media/jni/soundpool/Android.bp b/media/jni/soundpool/Android.bp index 35b7b01e207c..e1945dddaa0b 100644 --- a/media/jni/soundpool/Android.bp +++ b/media/jni/soundpool/Android.bp @@ -3,11 +3,16 @@ cc_library_shared { srcs: [ "android_media_SoundPool.cpp", + "Sound.cpp", + "SoundDecoder.cpp", + "SoundManager.cpp", "SoundPool.cpp", - "SoundPoolThread.cpp", + "Stream.cpp", + "StreamManager.cpp", ], shared_libs: [ + "libaudioutils", "liblog", "libcutils", "libutils", diff --git a/media/jni/soundpool/Sound.cpp b/media/jni/soundpool/Sound.cpp new file mode 100644 index 000000000000..0bbc3e46b044 --- /dev/null +++ b/media/jni/soundpool/Sound.cpp @@ -0,0 +1,241 @@ +/* + * 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. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "SoundPool::Sound" +#include <utils/Log.h> + +#include "Sound.h" + +#include <media/NdkMediaCodec.h> +#include <media/NdkMediaExtractor.h> +#include <media/NdkMediaFormat.h> + +namespace android::soundpool { + +constexpr uint32_t kMaxSampleRate = 192000; +constexpr size_t kDefaultHeapSize = 1024 * 1024; // 1MB (compatible with low mem devices) + +Sound::Sound(int32_t soundID, int fd, int64_t offset, int64_t length) + : mSoundID(soundID) + , mFd(dup(fd)) + , mOffset(offset) + , mLength(length) +{ + ALOGV("%s(soundID=%d, fd=%d, offset=%lld, length=%lld)", + __func__, soundID, fd, (long long)offset, (long long)length); + ALOGW_IF(mFd == -1, "Unable to dup descriptor %d", fd); +} + +Sound::~Sound() +{ + ALOGV("%s(soundID=%d, fd=%d)", __func__, mSoundID, mFd.get()); +} + +static status_t decode(int fd, int64_t offset, int64_t length, + uint32_t *rate, int32_t *channelCount, audio_format_t *audioFormat, + audio_channel_mask_t *channelMask, sp<MemoryHeapBase> heap, + size_t *sizeInBytes) { + ALOGV("%s(fd=%d, offset=%lld, length=%lld, ...)", + __func__, fd, (long long)offset, (long long)length); + std::unique_ptr<AMediaExtractor, decltype(&AMediaExtractor_delete)> ex{ + AMediaExtractor_new(), &AMediaExtractor_delete}; + status_t err = AMediaExtractor_setDataSourceFd(ex.get(), fd, offset, length); + + if (err != AMEDIA_OK) { + return err; + } + + *audioFormat = AUDIO_FORMAT_PCM_16_BIT; // default format for audio codecs. + const size_t numTracks = AMediaExtractor_getTrackCount(ex.get()); + for (size_t i = 0; i < numTracks; i++) { + std::unique_ptr<AMediaFormat, decltype(&AMediaFormat_delete)> format{ + AMediaExtractor_getTrackFormat(ex.get(), i), &AMediaFormat_delete}; + const char *mime; + if (!AMediaFormat_getString(format.get(), AMEDIAFORMAT_KEY_MIME, &mime)) { + return UNKNOWN_ERROR; + } + if (strncmp(mime, "audio/", 6) == 0) { + std::unique_ptr<AMediaCodec, decltype(&AMediaCodec_delete)> codec{ + AMediaCodec_createDecoderByType(mime), &AMediaCodec_delete}; + if (codec == nullptr + || AMediaCodec_configure(codec.get(), format.get(), + nullptr /* window */, nullptr /* drm */, 0 /* flags */) != AMEDIA_OK + || AMediaCodec_start(codec.get()) != AMEDIA_OK + || AMediaExtractor_selectTrack(ex.get(), i) != AMEDIA_OK) { + return UNKNOWN_ERROR; + } + + bool sawInputEOS = false; + bool sawOutputEOS = false; + uint8_t* writePos = static_cast<uint8_t*>(heap->getBase()); + size_t available = heap->getSize(); + size_t written = 0; + format.reset(AMediaCodec_getOutputFormat(codec.get())); // update format. + + while (!sawOutputEOS) { + if (!sawInputEOS) { + ssize_t bufidx = AMediaCodec_dequeueInputBuffer(codec.get(), 5000); + ALOGV("%s: input buffer %zd", __func__, bufidx); + if (bufidx >= 0) { + size_t bufsize; + uint8_t * const buf = AMediaCodec_getInputBuffer( + codec.get(), bufidx, &bufsize); + if (buf == nullptr) { + ALOGE("%s: AMediaCodec_getInputBuffer returned nullptr, short decode", + __func__); + break; + } + int sampleSize = AMediaExtractor_readSampleData(ex.get(), buf, bufsize); + ALOGV("%s: read %d", __func__, sampleSize); + if (sampleSize < 0) { + sampleSize = 0; + sawInputEOS = true; + ALOGV("%s: EOS", __func__); + } + const int64_t presentationTimeUs = AMediaExtractor_getSampleTime(ex.get()); + + const media_status_t mstatus = AMediaCodec_queueInputBuffer( + codec.get(), bufidx, + 0 /* offset */, sampleSize, presentationTimeUs, + sawInputEOS ? AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM : 0); + if (mstatus != AMEDIA_OK) { + // AMEDIA_ERROR_UNKNOWN == { -ERANGE -EINVAL -EACCES } + ALOGE("%s: AMediaCodec_queueInputBuffer returned status %d," + "short decode", + __func__, (int)mstatus); + break; + } + (void)AMediaExtractor_advance(ex.get()); + } + } + + AMediaCodecBufferInfo info; + const int status = AMediaCodec_dequeueOutputBuffer(codec.get(), &info, 1); + ALOGV("%s: dequeueoutput returned: %d", __func__, status); + if (status >= 0) { + if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) { + ALOGV("%s: output EOS", __func__); + sawOutputEOS = true; + } + ALOGV("%s: got decoded buffer size %d", __func__, info.size); + + const uint8_t * const buf = AMediaCodec_getOutputBuffer( + codec.get(), status, nullptr /* out_size */); + if (buf == nullptr) { + ALOGE("%s: AMediaCodec_getOutputBuffer returned nullptr, short decode", + __func__); + break; + } + const size_t dataSize = std::min((size_t)info.size, available); + memcpy(writePos, buf + info.offset, dataSize); + writePos += dataSize; + written += dataSize; + available -= dataSize; + const media_status_t mstatus = AMediaCodec_releaseOutputBuffer( + codec.get(), status, false /* render */); + if (mstatus != AMEDIA_OK) { + // AMEDIA_ERROR_UNKNOWN == { -ERANGE -EINVAL -EACCES } + ALOGE("%s: AMediaCodec_releaseOutputBuffer" + " returned status %d, short decode", + __func__, (int)mstatus); + break; + } + if (available == 0) { + // there might be more data, but there's no space for it + sawOutputEOS = true; + } + } else if (status == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) { + ALOGV("%s: output buffers changed", __func__); + } else if (status == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) { + format.reset(AMediaCodec_getOutputFormat(codec.get())); // update format + ALOGV("%s: format changed to: %s", + __func__, AMediaFormat_toString(format.get())); + } else if (status == AMEDIACODEC_INFO_TRY_AGAIN_LATER) { + ALOGV("%s: no output buffer right now", __func__); + } else if (status <= AMEDIA_ERROR_BASE) { + ALOGE("%s: decode error: %d", __func__, status); + break; + } else { + ALOGV("%s: unexpected info code: %d", __func__, status); + } + } + + (void)AMediaCodec_stop(codec.get()); + if (!AMediaFormat_getInt32( + format.get(), AMEDIAFORMAT_KEY_SAMPLE_RATE, (int32_t*) rate) || + !AMediaFormat_getInt32( + format.get(), AMEDIAFORMAT_KEY_CHANNEL_COUNT, channelCount)) { + return UNKNOWN_ERROR; + } + if (!AMediaFormat_getInt32(format.get(), AMEDIAFORMAT_KEY_CHANNEL_MASK, + (int32_t*) channelMask)) { + *channelMask = AUDIO_CHANNEL_NONE; + } + *sizeInBytes = written; + return OK; + } + } + return UNKNOWN_ERROR; +} + +status_t Sound::doLoad() +{ + ALOGV("%s()", __func__); + status_t status = NO_INIT; + if (mFd.get() != -1) { + mHeap = new MemoryHeapBase(kDefaultHeapSize); + + ALOGV("%s: start decode", __func__); + uint32_t sampleRate; + int32_t channelCount; + audio_format_t format; + audio_channel_mask_t channelMask; + status_t status = decode(mFd.get(), mOffset, mLength, &sampleRate, &channelCount, &format, + &channelMask, mHeap, &mSizeInBytes); + ALOGV("%s: close(%d)", __func__, mFd.get()); + mFd.reset(); // close + + if (status != NO_ERROR) { + ALOGE("%s: unable to load sound", __func__); + } else if (sampleRate > kMaxSampleRate) { + ALOGE("%s: sample rate (%u) out of range", __func__, sampleRate); + status = BAD_VALUE; + } else if (channelCount < 1 || channelCount > FCC_8) { + ALOGE("%s: sample channel count (%d) out of range", __func__, channelCount); + status = BAD_VALUE; + } else { + // Correctly loaded, proper parameters + ALOGV("%s: pointer = %p, sizeInBytes = %zu, sampleRate = %u, channelCount = %d", + __func__, mHeap->getBase(), mSizeInBytes, sampleRate, channelCount); + mData = new MemoryBase(mHeap, 0, mSizeInBytes); + mSampleRate = sampleRate; + mChannelCount = channelCount; + mFormat = format; + mChannelMask = channelMask; + mState = READY; // this should be last, as it is an atomic sync point + return NO_ERROR; + } + } else { + ALOGE("%s: uninitialized fd, dup failed", __func__); + } + // ERROR handling + mHeap.clear(); + mState = DECODE_ERROR; // this should be last, as it is an atomic sync point + return status; +} + +} // namespace android::soundpool diff --git a/media/jni/soundpool/Sound.h b/media/jni/soundpool/Sound.h new file mode 100644 index 000000000000..efe940a7bd68 --- /dev/null +++ b/media/jni/soundpool/Sound.h @@ -0,0 +1,93 @@ +/* + * 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. + */ + +#pragma once + +#include <android-base/unique_fd.h> +#include <binder/MemoryBase.h> +#include <binder/MemoryHeapBase.h> +#include <system/audio.h> + +namespace android::soundpool { + +class SoundDecoder; + +/** + * Sound is a resource used by SoundPool, referenced by soundID. + * + * After loading, it is effectively const so no locking required. + * However, in order to guarantee that all the values have been + * written properly and read properly, we use the mState as an atomic synchronization + * point. So if getState() shows READY, then all the other getters may + * be safely read. + * + * Technical details: + * We access the mState atomic value through memory_order_seq_cst + * + * https://en.cppreference.com/w/cpp/atomic/memory_order + * + * which provides memory barriers. So if the last value written by the SoundDecoder + * is mState, then the compiler ensures no other prior writes by SoundDecoder will be + * reordered afterwards, and memory barrier is placed (as necessary) to ensure the + * cache is visible to other processors. + * + * Likewise, if the first value read by SoundPool is mState, + * the compiler ensures no reads for that thread will be reordered before mState is read, + * and a memory barrier is placed (as necessary) to ensure that the cache is properly + * updated with other processor's writes before reading. + * + * See https://developer.android.com/training/articles/smp for discussions about + * the variant load-acquire, store-release semantics. + */ +class Sound { + friend SoundDecoder; // calls doLoad(). + +public: + enum sound_state : int32_t { LOADING, READY, DECODE_ERROR }; + // A sound starts in the LOADING state and transitions only once + // to either READY or DECODE_ERROR when doLoad() is called. + + Sound(int soundID, int fd, int64_t offset, int64_t length); + ~Sound(); + + int32_t getSoundID() const { return mSoundID; } + int32_t getChannelCount() const { return mChannelCount; } + uint32_t getSampleRate() const { return mSampleRate; } + audio_format_t getFormat() const { return mFormat; } + audio_channel_mask_t getChannelMask() const { return mChannelMask; } + size_t getSizeInBytes() const { return mSizeInBytes; } + sound_state getState() const { return mState; } + uint8_t* getData() const { return static_cast<uint8_t*>(mData->unsecurePointer()); } + sp<IMemory> getIMemory() const { return mData; } + +private: + status_t doLoad(); // only SoundDecoder accesses this. + + size_t mSizeInBytes = 0; + const int32_t mSoundID; + uint32_t mSampleRate = 0; + std::atomic<sound_state> mState = LOADING; // used as synchronization point + int32_t mChannelCount = 0; + audio_format_t mFormat = AUDIO_FORMAT_INVALID; + audio_channel_mask_t mChannelMask = AUDIO_CHANNEL_NONE; + base::unique_fd mFd; // initialized in constructor, reset to -1 after loading + const int64_t mOffset; // int64_t to match java long, see off64_t + const int64_t mLength; // int64_t to match java long, see off64_t + sp<IMemory> mData; + sp<MemoryHeapBase> mHeap; +}; + +} // namespace android::soundpool diff --git a/media/jni/soundpool/SoundDecoder.cpp b/media/jni/soundpool/SoundDecoder.cpp new file mode 100644 index 000000000000..12200ef03aad --- /dev/null +++ b/media/jni/soundpool/SoundDecoder.cpp @@ -0,0 +1,115 @@ +/* + * 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. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "SoundPool::SoundDecoder" +#include "utils/Log.h" + +#include "SoundDecoder.h" + +namespace android::soundpool { + +// Maximum Samples that can be background decoded before we block the caller. +static constexpr size_t kMaxQueueSize = 128; + +// The amount of time we wait for a new Sound decode request +// before the SoundDecoder thread closes. +static constexpr int32_t kWaitTimeBeforeCloseMs = 1000; + +SoundDecoder::SoundDecoder(SoundManager* soundManager, size_t threads) + : mSoundManager(soundManager) +{ + ALOGV("%s(%p, %zu)", __func__, soundManager, threads); + // ThreadPool is created, but we don't launch any threads. + mThreadPool = std::make_unique<ThreadPool>( + std::min(threads, (size_t)std::thread::hardware_concurrency()), + "SoundDecoder_"); +} + +SoundDecoder::~SoundDecoder() +{ + ALOGV("%s()", __func__); + quit(); +} + +void SoundDecoder::quit() +{ + ALOGV("%s()", __func__); + { + std::lock_guard lock(mLock); + mQuit = true; + mQueueSpaceAvailable.notify_all(); // notify all load waiters + mQueueDataAvailable.notify_all(); // notify all worker threads + } + mThreadPool->quit(); +} + +void SoundDecoder::run(int32_t id __unused /* ALOGV only */) +{ + ALOGV("%s(%d): entering", __func__, id); + std::unique_lock lock(mLock); + while (!mQuit) { + if (mSoundIDs.size() == 0) { + ALOGV("%s(%d): waiting", __func__, id); + mQueueDataAvailable.wait_for( + lock, std::chrono::duration<int32_t, std::milli>(kWaitTimeBeforeCloseMs)); + if (mSoundIDs.size() == 0) { + break; // no new sound, exit this thread. + } + continue; + } + const int32_t soundID = mSoundIDs.front(); + mSoundIDs.pop_front(); + mQueueSpaceAvailable.notify_one(); + ALOGV("%s(%d): processing soundID: %d size: %zu", __func__, id, soundID, mSoundIDs.size()); + lock.unlock(); + std::shared_ptr<Sound> sound = mSoundManager->findSound(soundID); + status_t status = NO_INIT; + if (sound.get() != nullptr) { + status = sound->doLoad(); + } + ALOGV("%s(%d): notifying loaded soundID:%d status:%d", __func__, id, soundID, status); + mSoundManager->notify(SoundPoolEvent(SoundPoolEvent::SOUND_LOADED, soundID, status)); + lock.lock(); + } + ALOGV("%s(%d): exiting", __func__, id); +} + +void SoundDecoder::loadSound(int32_t soundID) +{ + ALOGV("%s(%d)", __func__, soundID); + size_t pendingSounds; + { + std::unique_lock lock(mLock); + while (mSoundIDs.size() == kMaxQueueSize) { + if (mQuit) return; + ALOGV("%s: waiting soundID: %d size: %zu", __func__, soundID, mSoundIDs.size()); + mQueueSpaceAvailable.wait(lock); + } + if (mQuit) return; + mSoundIDs.push_back(soundID); + mQueueDataAvailable.notify_one(); + ALOGV("%s: adding soundID: %d size: %zu", __func__, soundID, mSoundIDs.size()); + pendingSounds = mSoundIDs.size(); + } + // Launch threads as needed. The "as needed" is weakly consistent as we release mLock. + if (pendingSounds > mThreadPool->getActiveThreadCount()) { + const int32_t id __unused = mThreadPool->launch([this](int32_t id) { run(id); }); + ALOGV_IF(id != 0, "%s: launched thread %d", __func__, id); + } +} + +} // end namespace android::soundpool diff --git a/media/jni/soundpool/SoundDecoder.h b/media/jni/soundpool/SoundDecoder.h new file mode 100644 index 000000000000..1288943e86e3 --- /dev/null +++ b/media/jni/soundpool/SoundDecoder.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#pragma once + +#include "SoundPool.h" + +#include <deque> +#include <mutex> + +namespace android::soundpool { + +/** + * SoundDecoder handles background decoding tasks. + */ +class SoundDecoder { +public: + SoundDecoder(SoundManager* soundManager, size_t threads); + ~SoundDecoder(); + void loadSound(int32_t soundID); + void quit(); + +private: + void run(int32_t id); // The decode thread function. + + SoundManager* const mSoundManager; // set in constructor, has own lock + std::unique_ptr<ThreadPool> mThreadPool; // set in constructor, has own lock + + std::mutex mLock; + std::condition_variable mQueueSpaceAvailable; + std::condition_variable mQueueDataAvailable; + + std::deque<int32_t> mSoundIDs; // GUARDED_BY(mLock); + bool mQuit = false; // GUARDED_BY(mLock); +}; + +} // end namespace android::soundpool + diff --git a/media/jni/soundpool/SoundManager.cpp b/media/jni/soundpool/SoundManager.cpp new file mode 100644 index 000000000000..3c625bf3bb7f --- /dev/null +++ b/media/jni/soundpool/SoundManager.cpp @@ -0,0 +1,104 @@ +/* + * 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. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "SoundPool::SoundManager" +#include <utils/Log.h> + +#include "SoundManager.h" + +#include <thread> + +#include "SoundDecoder.h" + +namespace android::soundpool { + +static const size_t kDecoderThreads = std::thread::hardware_concurrency() >= 4 ? 2 : 1; + +SoundManager::SoundManager() + : mDecoder{std::make_unique<SoundDecoder>(this, kDecoderThreads)} +{ + ALOGV("%s()", __func__); +} + +SoundManager::~SoundManager() +{ + ALOGV("%s()", __func__); + mDecoder->quit(); + + std::lock_guard lock(mSoundManagerLock); + mSounds.clear(); +} + +int32_t SoundManager::load(int fd, int64_t offset, int64_t length, int32_t priority __unused) +{ + ALOGV("%s(fd=%d, offset=%lld, length=%lld, priority=%d)", + __func__, fd, (long long)offset, (long long)length, priority); + int32_t soundID; + { + std::lock_guard lock(mSoundManagerLock); + // mNextSoundID is always positive and does not "integer overflow" + do { + mNextSoundID = mNextSoundID == INT32_MAX ? 1 : mNextSoundID + 1; + } while (findSound_l(mNextSoundID) != nullptr); + soundID = mNextSoundID; + auto sound = std::make_shared<Sound>(soundID, fd, offset, length); + mSounds.emplace(soundID, sound); + } + // mDecoder->loadSound() must be called outside of mSoundManagerLock. + // mDecoder->loadSound() may block on mDecoder message queue space; + // the message queue emptying may block on SoundManager::findSound(). + // + // It is theoretically possible that sound loads might decode out-of-order. + mDecoder->loadSound(soundID); + return soundID; +} + +bool SoundManager::unload(int32_t soundID) +{ + ALOGV("%s(soundID=%d)", __func__, soundID); + std::lock_guard lock(mSoundManagerLock); + return mSounds.erase(soundID) > 0; // erase() returns number of sounds removed. +} + +std::shared_ptr<Sound> SoundManager::findSound(int32_t soundID) const +{ + std::lock_guard lock(mSoundManagerLock); + return findSound_l(soundID); +} + +std::shared_ptr<Sound> SoundManager::findSound_l(int32_t soundID) const +{ + auto it = mSounds.find(soundID); + return it != mSounds.end() ? it->second : nullptr; +} + +void SoundManager::setCallback(SoundPool *soundPool, SoundPoolCallback* callback, void* user) +{ + mCallbackHandler.setCallback(soundPool, callback, user); +} + +void SoundManager::notify(SoundPoolEvent event) +{ + mCallbackHandler.notify(event); +} + +void* SoundManager::getUserData() const +{ + return mCallbackHandler.getUserData(); +} + +} // namespace android::soundpool diff --git a/media/jni/soundpool/SoundManager.h b/media/jni/soundpool/SoundManager.h new file mode 100644 index 000000000000..9201e78132f4 --- /dev/null +++ b/media/jni/soundpool/SoundManager.h @@ -0,0 +1,110 @@ +/* + * 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. + */ + +#pragma once + +#include "Sound.h" + +#include <mutex> +#include <unordered_map> + +namespace android { + +class SoundPool; + +// for queued events +class SoundPoolEvent { +public: + explicit SoundPoolEvent(int msg, int arg1 = 0, int arg2 = 0) : + mMsg(msg), mArg1(arg1), mArg2(arg2) {} + const int mMsg; // MessageType + const int mArg1; // soundID + const int mArg2; // status + enum MessageType { INVALID, SOUND_LOADED }; +}; + +// callback function prototype +typedef void SoundPoolCallback(SoundPoolEvent event, SoundPool* soundPool, void* user); + +} // namespace android + +namespace android::soundpool { + +// This class manages Sounds for the SoundPool. +class SoundManager { +public: + SoundManager(); + ~SoundManager(); + + // Matches corresponding SoundPool API functions + int32_t load(int fd, int64_t offset, int64_t length, int32_t priority); + bool unload(int32_t soundID); + void setCallback(SoundPool* soundPool, SoundPoolCallback* callback, void* user); + void* getUserData() const; + + // SoundPool and SoundDecoder access + std::shared_ptr<Sound> findSound(int32_t soundID) const; + + // from the SoundDecoder + void notify(SoundPoolEvent event); + +private: + + // CallbackHandler is used to manage notifications back to the app when a sound + // has been loaded. It uses a recursive lock to allow setting the callback + // during the callback. + class CallbackHandler { + public: + void setCallback(SoundPool *soundPool, SoundPoolCallback* callback, void* userData) + { + std::lock_guard<std::recursive_mutex> lock(mCallbackLock); + mSoundPool = soundPool; + mCallback = callback; + mUserData = userData; + } + void notify(SoundPoolEvent event) const + { + std::lock_guard<std::recursive_mutex> lock(mCallbackLock); + if (mCallback != nullptr) { + mCallback(event, mSoundPool, mUserData); + // Note: mCallback may call setCallback(). + // so mCallback, mUserData may have changed. + } + } + void* getUserData() const + { + std::lock_guard<std::recursive_mutex> lock(mCallbackLock); + return mUserData; + } + private: + mutable std::recursive_mutex mCallbackLock; // allow mCallback to setCallback(). + SoundPool* mSoundPool = nullptr; // GUARDED_BY(mCallbackLock) + SoundPoolCallback* mCallback = nullptr; // GUARDED_BY(mCallbackLock) + void* mUserData = nullptr; // GUARDED_BY(mCallbackLock) + }; + + std::shared_ptr<Sound> findSound_l(int32_t soundID) const; + + // The following variables are initialized in constructor and can be accessed anytime. + CallbackHandler mCallbackHandler; // has its own lock + const std::unique_ptr<SoundDecoder> mDecoder; // has its own lock + + mutable std::mutex mSoundManagerLock; + std::unordered_map<int, std::shared_ptr<Sound>> mSounds; // GUARDED_BY(mSoundManagerLock) + int32_t mNextSoundID = 0; // GUARDED_BY(mSoundManagerLock) +}; + +} // namespace android::soundpool diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 102bbf0e5931..ac44843859f6 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -16,1124 +16,230 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "SoundPool" - -#include <chrono> -#include <inttypes.h> -#include <thread> #include <utils/Log.h> -#define USE_SHARED_MEM_BUFFER +#include <algorithm> +#include <thread> -#include <media/AudioTrack.h> #include "SoundPool.h" -#include "SoundPoolThread.h" -#include <media/NdkMediaCodec.h> -#include <media/NdkMediaExtractor.h> -#include <media/NdkMediaFormat.h> namespace android { -int kDefaultBufferCount = 4; -uint32_t kMaxSampleRate = 48000; -uint32_t kDefaultSampleRate = 44100; -uint32_t kDefaultFrameCount = 1200; -size_t kDefaultHeapSize = 1024 * 1024; // 1MB - - -SoundPool::SoundPool(int maxChannels, const audio_attributes_t* pAttributes) -{ - ALOGV("SoundPool constructor: maxChannels=%d, attr.usage=%d, attr.flags=0x%x, attr.tags=%s", - maxChannels, pAttributes->usage, pAttributes->flags, pAttributes->tags); - - // check limits - mMaxChannels = maxChannels; - if (mMaxChannels < 1) { - mMaxChannels = 1; - } - else if (mMaxChannels > 32) { - mMaxChannels = 32; - } - ALOGW_IF(maxChannels != mMaxChannels, "App requested %d channels", maxChannels); - - mQuit = false; - mMuted = false; - mDecodeThread = 0; - memcpy(&mAttributes, pAttributes, sizeof(audio_attributes_t)); - mAllocated = 0; - mNextSampleID = 0; - mNextChannelID = 0; - - mCallback = 0; - mUserData = 0; - - mChannelPool = new SoundChannel[mMaxChannels]; - for (int i = 0; i < mMaxChannels; ++i) { - mChannelPool[i].init(this); - mChannels.push_back(&mChannelPool[i]); - } - - // start decode thread - startThreads(); -} - -SoundPool::~SoundPool() -{ - ALOGV("SoundPool destructor"); - mDecodeThread->quit(); - quit(); - - Mutex::Autolock lock(&mLock); +// kManagerThreads = 1 historically. +// Not really necessary to have more than one, but it does speed things up by about +// 25% having 2 threads instead of 1 when playing many sounds. Having many threads +// could starve other AudioFlinger clients with SoundPool activity. It may also cause +// issues with app loading, e.g. Camera. +static const size_t kStreamManagerThreads = std::thread::hardware_concurrency() >= 4 ? 2 : 1; - mChannels.clear(); - if (mChannelPool) - delete [] mChannelPool; - // clean up samples - ALOGV("clear samples"); - mSamples.clear(); +// kUseApiLock = true prior to R. +// Set to true to prevent multiple users access internal to the SoundPool API. +// Set to false to make the SoundPool methods weakly consistent. When set to false, +// only AutoPause and AutoResume are locked, which are the only two methods that +// require API level locking for consistency. +static constexpr bool kUseApiLock = false; - if (mDecodeThread) - delete mDecodeThread; -} +namespace { +// Check input arguments to SoundPool - return "true" to reject request. -void SoundPool::addToRestartList(SoundChannel* channel) +bool checkVolume(float *leftVolume, float *rightVolume) { - Mutex::Autolock lock(&mRestartLock); - if (!mQuit) { - mRestart.push_back(channel); - mCondition.signal(); + if (*leftVolume != std::clamp(*leftVolume, 0.f, 1.f) || + *rightVolume != std::clamp(*rightVolume, 0.f, 1.f)) { + ALOGI("volume l=%f r=%f out of (0.f, 1.f) bounds, using 1.f", *leftVolume, *rightVolume); + // for backward compatibility use 1.f. + *leftVolume = *rightVolume = 1.f; } + return false; } -void SoundPool::addToStopList(SoundChannel* channel) +bool checkRate(float *rate) { - Mutex::Autolock lock(&mRestartLock); - if (!mQuit) { - mStop.push_back(channel); - mCondition.signal(); + if (*rate != std::clamp(*rate, 0.125f, 8.f)) { + ALOGI("rate %f out of (0.125f, 8.f) bounds, clamping", *rate); + // for backward compatibility just clamp + *rate = std::clamp(*rate, 0.125f, 8.f); } + return false; } -int SoundPool::beginThread(void* arg) -{ - SoundPool* p = (SoundPool*)arg; - return p->run(); -} - -int SoundPool::run() +bool checkPriority(int32_t *priority) { - mRestartLock.lock(); - while (!mQuit) { - mCondition.wait(mRestartLock); - ALOGV("awake"); - if (mQuit) break; - - while (!mStop.empty()) { - SoundChannel* channel; - ALOGV("Getting channel from stop list"); - List<SoundChannel* >::iterator iter = mStop.begin(); - channel = *iter; - mStop.erase(iter); - mRestartLock.unlock(); - if (channel != 0) { - Mutex::Autolock lock(&mLock); - channel->stop(); - } - mRestartLock.lock(); - if (mQuit) break; - } - - while (!mRestart.empty()) { - SoundChannel* channel; - ALOGV("Getting channel from list"); - List<SoundChannel*>::iterator iter = mRestart.begin(); - channel = *iter; - mRestart.erase(iter); - mRestartLock.unlock(); - if (channel != 0) { - Mutex::Autolock lock(&mLock); - channel->nextEvent(); - } - mRestartLock.lock(); - if (mQuit) break; - } + if (*priority < 0) { + ALOGI("negative priority %d, should be >= 0.", *priority); + // for backward compatibility, ignore. } - - mStop.clear(); - mRestart.clear(); - mCondition.signal(); - mRestartLock.unlock(); - ALOGV("goodbye"); - return 0; -} - -void SoundPool::quit() -{ - mRestartLock.lock(); - mQuit = true; - mCondition.signal(); - mCondition.wait(mRestartLock); - ALOGV("return from quit"); - mRestartLock.unlock(); -} - -bool SoundPool::startThreads() -{ - createThreadEtc(beginThread, this, "SoundPool"); - if (mDecodeThread == NULL) - mDecodeThread = new SoundPoolThread(this); - return mDecodeThread != NULL; + return false; } -sp<Sample> SoundPool::findSample(int sampleID) +bool checkLoop(int32_t *loop) { - Mutex::Autolock lock(&mLock); - return findSample_l(sampleID); + if (*loop < -1) { + ALOGI("loop %d, should be >= -1", *loop); + *loop = -1; + } + return false; } -sp<Sample> SoundPool::findSample_l(int sampleID) -{ - return mSamples.valueFor(sampleID); -} +} // namespace -SoundChannel* SoundPool::findChannel(int channelID) +SoundPool::SoundPool(int32_t maxStreams, const audio_attributes_t* attributes) + : mStreamManager(maxStreams, kStreamManagerThreads, attributes) { - for (int i = 0; i < mMaxChannels; ++i) { - if (mChannelPool[i].channelID() == channelID) { - return &mChannelPool[i]; - } - } - return NULL; + ALOGV("%s(maxStreams=%d, attr={ content_type=%d, usage=%d, flags=0x%x, tags=%s })", + __func__, maxStreams, + attributes->content_type, attributes->usage, attributes->flags, attributes->tags); } -SoundChannel* SoundPool::findNextChannel(int channelID) +SoundPool::~SoundPool() { - for (int i = 0; i < mMaxChannels; ++i) { - if (mChannelPool[i].nextChannelID() == channelID) { - return &mChannelPool[i]; - } - } - return NULL; + ALOGV("%s()", __func__); } -int SoundPool::load(int fd, int64_t offset, int64_t length, int priority __unused) +int32_t SoundPool::load(int fd, int64_t offset, int64_t length, int32_t priority) { - ALOGV("load: fd=%d, offset=%" PRId64 ", length=%" PRId64 ", priority=%d", - fd, offset, length, priority); - int sampleID; - { - Mutex::Autolock lock(&mLock); - sampleID = ++mNextSampleID; - sp<Sample> sample = new Sample(sampleID, fd, offset, length); - mSamples.add(sampleID, sample); - sample->startLoad(); - } - // mDecodeThread->loadSample() must be called outside of mLock. - // mDecodeThread->loadSample() may block on mDecodeThread message queue space; - // the message queue emptying may block on SoundPool::findSample(). - // - // It theoretically possible that sample loads might decode out-of-order. - mDecodeThread->loadSample(sampleID); - return sampleID; + ALOGV("%s(fd=%d, offset=%lld, length=%lld, priority=%d)", + __func__, fd, (long long)offset, (long long)length, priority); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + return mSoundManager.load(fd, offset, length, priority); } -bool SoundPool::unload(int sampleID) +bool SoundPool::unload(int32_t soundID) { - ALOGV("unload: sampleID=%d", sampleID); - Mutex::Autolock lock(&mLock); - return mSamples.removeItem(sampleID) >= 0; // removeItem() returns index or BAD_VALUE + ALOGV("%s(%d)", __func__, soundID); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + return mSoundManager.unload(soundID); } -int SoundPool::play(int sampleID, float leftVolume, float rightVolume, - int priority, int loop, float rate) +int32_t SoundPool::play(int32_t soundID, float leftVolume, float rightVolume, + int32_t priority, int32_t loop, float rate) { - ALOGV("play sampleID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f", - sampleID, leftVolume, rightVolume, priority, loop, rate); - SoundChannel* channel; - int channelID; - - Mutex::Autolock lock(&mLock); - - if (mQuit) { - return 0; - } - // is sample ready? - sp<Sample> sample(findSample_l(sampleID)); - if ((sample == 0) || (sample->state() != Sample::READY)) { - ALOGW(" sample %d not READY", sampleID); - return 0; - } + ALOGV("%s(soundID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f)", + __func__, soundID, leftVolume, rightVolume, priority, loop, rate); - dump(); + // New for R: check arguments to ensure track can be created. + // If SoundPool defers the creation of the AudioTrack to the StreamManager thread, + // the failure to create may not be visible to the caller, so this precheck is needed. + if (checkVolume(&leftVolume, &rightVolume) + || checkPriority(&priority) + || checkLoop(&loop) + || checkRate(&rate)) return 0; - // allocate a channel - channel = allocateChannel_l(priority, sampleID); - - // no channel allocated - return 0 - if (!channel) { - ALOGV("No channel allocated"); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + const std::shared_ptr<soundpool::Sound> sound = mSoundManager.findSound(soundID); + if (sound == nullptr || sound->getState() != soundpool::Sound::READY) { + ALOGW("%s soundID %d not READY", __func__, soundID); return 0; } - channelID = ++mNextChannelID; - - ALOGV("play channel %p state = %d", channel, channel->state()); - channel->play(sample, channelID, leftVolume, rightVolume, priority, loop, rate); - return channelID; -} - -SoundChannel* SoundPool::allocateChannel_l(int priority, int sampleID) -{ - List<SoundChannel*>::iterator iter; - SoundChannel* channel = NULL; - - // check if channel for given sampleID still available - if (!mChannels.empty()) { - for (iter = mChannels.begin(); iter != mChannels.end(); ++iter) { - if (sampleID == (*iter)->getPrevSampleID() && (*iter)->state() == SoundChannel::IDLE) { - channel = *iter; - mChannels.erase(iter); - ALOGV("Allocated recycled channel for same sampleID"); - break; - } - } - } - - // allocate any channel - if (!channel && !mChannels.empty()) { - iter = mChannels.begin(); - if (priority >= (*iter)->priority()) { - channel = *iter; - mChannels.erase(iter); - ALOGV("Allocated active channel"); - } - } - - // update priority and put it back in the list - if (channel) { - channel->setPriority(priority); - for (iter = mChannels.begin(); iter != mChannels.end(); ++iter) { - if (priority < (*iter)->priority()) { - break; - } - } - mChannels.insert(iter, channel); - } - return channel; -} - -// move a channel from its current position to the front of the list -void SoundPool::moveToFront_l(SoundChannel* channel) -{ - for (List<SoundChannel*>::iterator iter = mChannels.begin(); iter != mChannels.end(); ++iter) { - if (*iter == channel) { - mChannels.erase(iter); - mChannels.push_front(channel); - break; - } - } -} - -void SoundPool::pause(int channelID) -{ - ALOGV("pause(%d)", channelID); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->pause(); - } + const int32_t streamID = mStreamManager.queueForPlay( + sound, soundID, leftVolume, rightVolume, priority, loop, rate); + ALOGV("%s returned %d", __func__, streamID); + return streamID; } void SoundPool::autoPause() { - ALOGV("autoPause()"); - Mutex::Autolock lock(&mLock); - for (int i = 0; i < mMaxChannels; ++i) { - SoundChannel* channel = &mChannelPool[i]; - channel->autoPause(); - } + ALOGV("%s()", __func__); + auto apiLock = std::make_unique<std::lock_guard<std::mutex>>(mApiLock); + mStreamManager.forEach([](soundpool::Stream *stream) { stream->autoPause(); }); } -void SoundPool::resume(int channelID) +void SoundPool::autoResume() { - ALOGV("resume(%d)", channelID); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->resume(); - } + ALOGV("%s()", __func__); + auto apiLock = std::make_unique<std::lock_guard<std::mutex>>(mApiLock); + mStreamManager.forEach([](soundpool::Stream *stream) { stream->autoResume(); }); } void SoundPool::mute(bool muting) { - ALOGV("mute(%d)", muting); - Mutex::Autolock lock(&mLock); - mMuted = muting; - if (!mChannels.empty()) { - for (List<SoundChannel*>::iterator iter = mChannels.begin(); - iter != mChannels.end(); ++iter) { - (*iter)->mute(muting); - } - } + ALOGV("%s(%d)", __func__, muting); + auto apiLock = std::make_unique<std::lock_guard<std::mutex>>(mApiLock); + mStreamManager.forEach([=](soundpool::Stream *stream) { stream->mute(muting); }); } -void SoundPool::autoResume() +void SoundPool::pause(int32_t streamID) { - ALOGV("autoResume()"); - Mutex::Autolock lock(&mLock); - for (int i = 0; i < mMaxChannels; ++i) { - SoundChannel* channel = &mChannelPool[i]; - channel->autoResume(); + ALOGV("%s(%d)", __func__, streamID); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->pause(streamID); } } -void SoundPool::stop(int channelID) +void SoundPool::resume(int32_t streamID) { - ALOGV("stop(%d)", channelID); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->stop(); - } else { - channel = findNextChannel(channelID); - if (channel) - channel->clearNextEvent(); + ALOGV("%s(%d)", __func__, streamID); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->resume(streamID); } } -void SoundPool::setVolume(int channelID, float leftVolume, float rightVolume) +void SoundPool::stop(int32_t streamID) { - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->setVolume(leftVolume, rightVolume); + ALOGV("%s(%d)", __func__, streamID); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + soundpool::Stream* stream = mStreamManager.findStream(streamID); + if (stream != nullptr && stream->requestStop(streamID)) { + mStreamManager.moveToRestartQueue(stream); } } -void SoundPool::setPriority(int channelID, int priority) +void SoundPool::setVolume(int32_t streamID, float leftVolume, float rightVolume) { - ALOGV("setPriority(%d, %d)", channelID, priority); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->setPriority(priority); + ALOGV("%s(%d, %f %f)", __func__, streamID, leftVolume, rightVolume); + if (checkVolume(&leftVolume, &rightVolume)) return; + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->setVolume(streamID, leftVolume, rightVolume); } } -void SoundPool::setLoop(int channelID, int loop) +void SoundPool::setPriority(int32_t streamID, int32_t priority) { - ALOGV("setLoop(%d, %d)", channelID, loop); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->setLoop(loop); + ALOGV("%s(%d, %d)", __func__, streamID, priority); + if (checkPriority(&priority)) return; + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->setPriority(streamID, priority); } } -void SoundPool::setRate(int channelID, float rate) +void SoundPool::setLoop(int32_t streamID, int32_t loop) { - ALOGV("setRate(%d, %f)", channelID, rate); - Mutex::Autolock lock(&mLock); - SoundChannel* channel = findChannel(channelID); - if (channel) { - channel->setRate(rate); + ALOGV("%s(%d, %d)", __func__, streamID, loop); + if (checkLoop(&loop)) return; + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->setLoop(streamID, loop); } } -// call with lock held -void SoundPool::done_l(SoundChannel* channel) +void SoundPool::setRate(int32_t streamID, float rate) { - ALOGV("done_l(%d)", channel->channelID()); - // if "stolen", play next event - if (channel->nextChannelID() != 0) { - ALOGV("add to restart list"); - addToRestartList(channel); - } - - // return to idle state - else { - ALOGV("move to front"); - moveToFront_l(channel); + ALOGV("%s(%d, %f)", __func__, streamID, rate); + if (checkRate(&rate)) return; + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + if (soundpool::Stream* stream = mStreamManager.findStream(streamID)) { + stream->setRate(streamID, rate); } } void SoundPool::setCallback(SoundPoolCallback* callback, void* user) { - Mutex::Autolock lock(&mCallbackLock); - mCallback = callback; - mUserData = user; -} - -void SoundPool::notify(SoundPoolEvent event) -{ - Mutex::Autolock lock(&mCallbackLock); - if (mCallback != NULL) { - mCallback(event, this, mUserData); - } -} - -void SoundPool::dump() -{ - for (int i = 0; i < mMaxChannels; ++i) { - mChannelPool[i].dump(); - } -} - - -Sample::Sample(int sampleID, int fd, int64_t offset, int64_t length) -{ - init(); - mSampleID = sampleID; - mFd = dup(fd); - mOffset = offset; - mLength = length; - ALOGV("create sampleID=%d, fd=%d, offset=%" PRId64 " length=%" PRId64, - mSampleID, mFd, mLength, mOffset); -} - -void Sample::init() -{ - mSize = 0; - mRefCount = 0; - mSampleID = 0; - mState = UNLOADED; - mFd = -1; - mOffset = 0; - mLength = 0; -} - -Sample::~Sample() -{ - ALOGV("Sample::destructor sampleID=%d, fd=%d", mSampleID, mFd); - if (mFd > 0) { - ALOGV("close(%d)", mFd); - ::close(mFd); - } -} - -static status_t decode(int fd, int64_t offset, int64_t length, - uint32_t *rate, int *numChannels, audio_format_t *audioFormat, - audio_channel_mask_t *channelMask, sp<MemoryHeapBase> heap, - size_t *memsize) { - - ALOGV("fd %d, offset %" PRId64 ", size %" PRId64, fd, offset, length); - AMediaExtractor *ex = AMediaExtractor_new(); - status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length); - - if (err != AMEDIA_OK) { - AMediaExtractor_delete(ex); - return err; - } - - *audioFormat = AUDIO_FORMAT_PCM_16_BIT; - - size_t numTracks = AMediaExtractor_getTrackCount(ex); - for (size_t i = 0; i < numTracks; i++) { - AMediaFormat *format = AMediaExtractor_getTrackFormat(ex, i); - const char *mime; - if (!AMediaFormat_getString(format, AMEDIAFORMAT_KEY_MIME, &mime)) { - AMediaExtractor_delete(ex); - AMediaFormat_delete(format); - return UNKNOWN_ERROR; - } - if (strncmp(mime, "audio/", 6) == 0) { - - AMediaCodec *codec = AMediaCodec_createDecoderByType(mime); - if (codec == NULL - || AMediaCodec_configure(codec, format, - NULL /* window */, NULL /* drm */, 0 /* flags */) != AMEDIA_OK - || AMediaCodec_start(codec) != AMEDIA_OK - || AMediaExtractor_selectTrack(ex, i) != AMEDIA_OK) { - AMediaExtractor_delete(ex); - AMediaCodec_delete(codec); - AMediaFormat_delete(format); - return UNKNOWN_ERROR; - } - - bool sawInputEOS = false; - bool sawOutputEOS = false; - uint8_t* writePos = static_cast<uint8_t*>(heap->getBase()); - size_t available = heap->getSize(); - size_t written = 0; - - AMediaFormat_delete(format); - format = AMediaCodec_getOutputFormat(codec); - - while (!sawOutputEOS) { - if (!sawInputEOS) { - ssize_t bufidx = AMediaCodec_dequeueInputBuffer(codec, 5000); - ALOGV("input buffer %zd", bufidx); - if (bufidx >= 0) { - size_t bufsize; - uint8_t *buf = AMediaCodec_getInputBuffer(codec, bufidx, &bufsize); - if (buf == nullptr) { - ALOGE("AMediaCodec_getInputBuffer returned nullptr, short decode"); - break; - } - int sampleSize = AMediaExtractor_readSampleData(ex, buf, bufsize); - ALOGV("read %d", sampleSize); - if (sampleSize < 0) { - sampleSize = 0; - sawInputEOS = true; - ALOGV("EOS"); - } - int64_t presentationTimeUs = AMediaExtractor_getSampleTime(ex); - - media_status_t mstatus = AMediaCodec_queueInputBuffer(codec, bufidx, - 0 /* offset */, sampleSize, presentationTimeUs, - sawInputEOS ? AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM : 0); - if (mstatus != AMEDIA_OK) { - // AMEDIA_ERROR_UNKNOWN == { -ERANGE -EINVAL -EACCES } - ALOGE("AMediaCodec_queueInputBuffer returned status %d, short decode", - (int)mstatus); - break; - } - (void)AMediaExtractor_advance(ex); - } - } - - AMediaCodecBufferInfo info; - int status = AMediaCodec_dequeueOutputBuffer(codec, &info, 1); - ALOGV("dequeueoutput returned: %d", status); - if (status >= 0) { - if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) { - ALOGV("output EOS"); - sawOutputEOS = true; - } - ALOGV("got decoded buffer size %d", info.size); - - uint8_t *buf = AMediaCodec_getOutputBuffer(codec, status, NULL /* out_size */); - if (buf == nullptr) { - ALOGE("AMediaCodec_getOutputBuffer returned nullptr, short decode"); - break; - } - size_t dataSize = info.size; - if (dataSize > available) { - dataSize = available; - } - memcpy(writePos, buf + info.offset, dataSize); - writePos += dataSize; - written += dataSize; - available -= dataSize; - media_status_t mstatus = AMediaCodec_releaseOutputBuffer( - codec, status, false /* render */); - if (mstatus != AMEDIA_OK) { - // AMEDIA_ERROR_UNKNOWN == { -ERANGE -EINVAL -EACCES } - ALOGE("AMediaCodec_releaseOutputBuffer returned status %d, short decode", - (int)mstatus); - break; - } - if (available == 0) { - // there might be more data, but there's no space for it - sawOutputEOS = true; - } - } else if (status == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) { - ALOGV("output buffers changed"); - } else if (status == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) { - AMediaFormat_delete(format); - format = AMediaCodec_getOutputFormat(codec); - ALOGV("format changed to: %s", AMediaFormat_toString(format)); - } else if (status == AMEDIACODEC_INFO_TRY_AGAIN_LATER) { - ALOGV("no output buffer right now"); - } else if (status <= AMEDIA_ERROR_BASE) { - ALOGE("decode error: %d", status); - break; - } else { - ALOGV("unexpected info code: %d", status); - } - } - - (void)AMediaCodec_stop(codec); - (void)AMediaCodec_delete(codec); - (void)AMediaExtractor_delete(ex); - if (!AMediaFormat_getInt32(format, AMEDIAFORMAT_KEY_SAMPLE_RATE, (int32_t*) rate) || - !AMediaFormat_getInt32(format, AMEDIAFORMAT_KEY_CHANNEL_COUNT, numChannels)) { - (void)AMediaFormat_delete(format); - return UNKNOWN_ERROR; - } - if (!AMediaFormat_getInt32(format, AMEDIAFORMAT_KEY_CHANNEL_MASK, - (int32_t*) channelMask)) { - *channelMask = AUDIO_CHANNEL_NONE; - } - (void)AMediaFormat_delete(format); - *memsize = written; - return OK; - } - (void)AMediaFormat_delete(format); - } - (void)AMediaExtractor_delete(ex); - return UNKNOWN_ERROR; -} - -status_t Sample::doLoad() -{ - uint32_t sampleRate; - int numChannels; - audio_format_t format; - audio_channel_mask_t channelMask; - status_t status; - mHeap = new MemoryHeapBase(kDefaultHeapSize); - - ALOGV("Start decode"); - status = decode(mFd, mOffset, mLength, &sampleRate, &numChannels, &format, - &channelMask, mHeap, &mSize); - ALOGV("close(%d)", mFd); - ::close(mFd); - mFd = -1; - if (status != NO_ERROR) { - ALOGE("Unable to load sample"); - goto error; - } - ALOGV("pointer = %p, size = %zu, sampleRate = %u, numChannels = %d", - mHeap->getBase(), mSize, sampleRate, numChannels); - - if (sampleRate > kMaxSampleRate) { - ALOGE("Sample rate (%u) out of range", sampleRate); - status = BAD_VALUE; - goto error; - } - - if ((numChannels < 1) || (numChannels > FCC_8)) { - ALOGE("Sample channel count (%d) out of range", numChannels); - status = BAD_VALUE; - goto error; - } - - mData = new MemoryBase(mHeap, 0, mSize); - mSampleRate = sampleRate; - mNumChannels = numChannels; - mFormat = format; - mChannelMask = channelMask; - mState = READY; - return NO_ERROR; - -error: - mHeap.clear(); - return status; -} - - -void SoundChannel::init(SoundPool* soundPool) -{ - mSoundPool = soundPool; - mPrevSampleID = -1; -} - -// call with sound pool lock held -void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftVolume, - float rightVolume, int priority, int loop, float rate) -{ - sp<AudioTrack> oldTrack; - sp<AudioTrack> newTrack; - status_t status = NO_ERROR; - - { // scope for the lock - Mutex::Autolock lock(&mLock); - - ALOGV("SoundChannel::play %p: sampleID=%d, channelID=%d, leftVolume=%f, rightVolume=%f," - " priority=%d, loop=%d, rate=%f", - this, sample->sampleID(), nextChannelID, leftVolume, rightVolume, - priority, loop, rate); - - // if not idle, this voice is being stolen - if (mState != IDLE) { - ALOGV("channel %d stolen - event queued for channel %d", channelID(), nextChannelID); - mNextEvent.set(sample, nextChannelID, leftVolume, rightVolume, priority, loop, rate); - stop_l(); - return; - } - - // initialize track - size_t afFrameCount; - uint32_t afSampleRate; - audio_stream_type_t streamType = - AudioSystem::attributesToStreamType(*mSoundPool->attributes()); - if (AudioSystem::getOutputFrameCount(&afFrameCount, streamType) != NO_ERROR) { - afFrameCount = kDefaultFrameCount; - } - if (AudioSystem::getOutputSamplingRate(&afSampleRate, streamType) != NO_ERROR) { - afSampleRate = kDefaultSampleRate; - } - int numChannels = sample->numChannels(); - uint32_t sampleRate = uint32_t(float(sample->sampleRate()) * rate + 0.5); - size_t frameCount = 0; - - if (loop) { - const audio_format_t format = sample->format(); - const size_t frameSize = audio_is_linear_pcm(format) - ? numChannels * audio_bytes_per_sample(format) : 1; - frameCount = sample->size() / frameSize; - } - -#ifndef USE_SHARED_MEM_BUFFER - uint32_t totalFrames = (kDefaultBufferCount * afFrameCount * sampleRate) / afSampleRate; - // Ensure minimum audio buffer size in case of short looped sample - if(frameCount < totalFrames) { - frameCount = totalFrames; - } -#endif - - // check if the existing track has the same sample id. - if (mAudioTrack != 0 && mPrevSampleID == sample->sampleID()) { - // the sample rate may fail to change if the audio track is a fast track. - if (mAudioTrack->setSampleRate(sampleRate) == NO_ERROR) { - newTrack = mAudioTrack; - ALOGV("reusing track %p for sample %d", mAudioTrack.get(), sample->sampleID()); - } - } - if (newTrack == 0) { - // mToggle toggles each time a track is started on a given channel. - // The toggle is concatenated with the SoundChannel address and passed to AudioTrack - // as callback user data. This enables the detection of callbacks received from the old - // audio track while the new one is being started and avoids processing them with - // wrong audio audio buffer size (mAudioBufferSize) - unsigned long toggle = mToggle ^ 1; - void *userData = (void *)((unsigned long)this | toggle); - audio_channel_mask_t sampleChannelMask = sample->channelMask(); - // When sample contains a not none channel mask, use it as is. - // Otherwise, use channel count to calculate channel mask. - audio_channel_mask_t channelMask = sampleChannelMask != AUDIO_CHANNEL_NONE - ? sampleChannelMask : audio_channel_out_mask_from_count(numChannels); - - // do not create a new audio track if current track is compatible with sample parameters - #ifdef USE_SHARED_MEM_BUFFER - newTrack = new AudioTrack(streamType, sampleRate, sample->format(), - channelMask, sample->getIMemory(), AUDIO_OUTPUT_FLAG_FAST, callback, userData, - 0 /*default notification frames*/, AUDIO_SESSION_ALLOCATE, - AudioTrack::TRANSFER_DEFAULT, - NULL /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, mSoundPool->attributes()); - #else - uint32_t bufferFrames = (totalFrames + (kDefaultBufferCount - 1)) / kDefaultBufferCount; - newTrack = new AudioTrack(streamType, sampleRate, sample->format(), - channelMask, frameCount, AUDIO_OUTPUT_FLAG_FAST, callback, userData, - bufferFrames, AUDIO_SESSION_ALLOCATE, AudioTrack::TRANSFER_DEFAULT, - NULL /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, mSoundPool->attributes()); - #endif - oldTrack = mAudioTrack; - status = newTrack->initCheck(); - if (status != NO_ERROR) { - ALOGE("Error creating AudioTrack"); - // newTrack goes out of scope, so reference count drops to zero - goto exit; - } - // From now on, AudioTrack callbacks received with previous toggle value will be ignored. - mToggle = toggle; - mAudioTrack = newTrack; - ALOGV("using new track %p for sample %d", newTrack.get(), sample->sampleID()); - } - if (mMuted) { - newTrack->setVolume(0.0f, 0.0f); - } else { - newTrack->setVolume(leftVolume, rightVolume); - } - newTrack->setLoop(0, frameCount, loop); - mPos = 0; - mSample = sample; - mChannelID = nextChannelID; - mPriority = priority; - mLoop = loop; - mLeftVolume = leftVolume; - mRightVolume = rightVolume; - mNumChannels = numChannels; - mRate = rate; - clearNextEvent(); - mState = PLAYING; - mAudioTrack->start(); - mAudioBufferSize = newTrack->frameCount()*newTrack->frameSize(); - } - -exit: - ALOGV("delete oldTrack %p", oldTrack.get()); - if (status != NO_ERROR) { - mAudioTrack.clear(); - } -} - -void SoundChannel::nextEvent() -{ - sp<Sample> sample; - int nextChannelID; - float leftVolume; - float rightVolume; - int priority; - int loop; - float rate; - - // check for valid event - { - Mutex::Autolock lock(&mLock); - nextChannelID = mNextEvent.channelID(); - if (nextChannelID == 0) { - ALOGV("stolen channel has no event"); - return; - } - - sample = mNextEvent.sample(); - leftVolume = mNextEvent.leftVolume(); - rightVolume = mNextEvent.rightVolume(); - priority = mNextEvent.priority(); - loop = mNextEvent.loop(); - rate = mNextEvent.rate(); - } - - ALOGV("Starting stolen channel %d -> %d", channelID(), nextChannelID); - play(sample, nextChannelID, leftVolume, rightVolume, priority, loop, rate); -} - -void SoundChannel::callback(int event, void* user, void *info) -{ - SoundChannel* channel = static_cast<SoundChannel*>((void *)((unsigned long)user & ~1)); - - channel->process(event, info, (unsigned long)user & 1); -} - -void SoundChannel::process(int event, void *info, unsigned long toggle) -{ - //ALOGV("process(%d)", mChannelID); - - Mutex::Autolock lock(&mLock); - - AudioTrack::Buffer* b = NULL; - if (event == AudioTrack::EVENT_MORE_DATA) { - b = static_cast<AudioTrack::Buffer *>(info); - } - - if (mToggle != toggle) { - ALOGV("process wrong toggle %p channel %d", this, mChannelID); - if (b != NULL) { - b->size = 0; - } - return; - } - - sp<Sample> sample = mSample; - -// ALOGV("SoundChannel::process event %d", event); - - if (event == AudioTrack::EVENT_MORE_DATA) { - - // check for stop state - if (b->size == 0) return; - - if (mState == IDLE) { - b->size = 0; - return; - } - - if (sample != 0) { - // fill buffer - uint8_t* q = (uint8_t*) b->i8; - size_t count = 0; - - if (mPos < (int)sample->size()) { - uint8_t* p = sample->data() + mPos; - count = sample->size() - mPos; - if (count > b->size) { - count = b->size; - } - memcpy(q, p, count); -// ALOGV("fill: q=%p, p=%p, mPos=%u, b->size=%u, count=%d", q, p, mPos, b->size, -// count); - } else if (mPos < mAudioBufferSize) { - count = mAudioBufferSize - mPos; - if (count > b->size) { - count = b->size; - } - memset(q, 0, count); -// ALOGV("fill extra: q=%p, mPos=%u, b->size=%u, count=%d", q, mPos, b->size, count); - } - - mPos += count; - b->size = count; - //ALOGV("buffer=%p, [0]=%d", b->i16, b->i16[0]); - } - } else if (event == AudioTrack::EVENT_UNDERRUN || event == AudioTrack::EVENT_BUFFER_END) { - ALOGV("process %p channel %d event %s", - this, mChannelID, (event == AudioTrack::EVENT_UNDERRUN) ? "UNDERRUN" : - "BUFFER_END"); - // Only BUFFER_END should happen as we use static tracks. - setVolume_l(0.f, 0.f); // set volume to 0 to indicate no need to ramp volume down. - mSoundPool->addToStopList(this); - } else if (event == AudioTrack::EVENT_LOOP_END) { - ALOGV("End loop %p channel %d", this, mChannelID); - } else if (event == AudioTrack::EVENT_NEW_IAUDIOTRACK) { - ALOGV("process %p channel %d NEW_IAUDIOTRACK", this, mChannelID); - } else { - ALOGW("SoundChannel::process unexpected event %d", event); - } -} - - -// call with lock held -bool SoundChannel::doStop_l() -{ - if (mState != IDLE) { - ALOGV("stop"); - if (mLeftVolume != 0.f || mRightVolume != 0.f) { - setVolume_l(0.f, 0.f); - if (mSoundPool->attributes()->usage != AUDIO_USAGE_GAME) { - // Since we're forcibly halting the previously playing content, - // we sleep here to ensure the volume is ramped down before we stop the track. - // Ideally the sleep time is the mixer period, or an approximation thereof - // (Fast vs Normal tracks are different). - ALOGV("sleeping: ChannelID:%d SampleID:%d", mChannelID, mSample->sampleID()); - std::this_thread::sleep_for(std::chrono::milliseconds(20)); - } - } - mAudioTrack->stop(); - mPrevSampleID = mSample->sampleID(); - mSample.clear(); - mState = IDLE; - mPriority = IDLE_PRIORITY; - return true; - } - return false; -} - -// call with lock held and sound pool lock held -void SoundChannel::stop_l() -{ - if (doStop_l()) { - mSoundPool->done_l(this); - } -} - -// call with sound pool lock held -void SoundChannel::stop() -{ - bool stopped; - { - Mutex::Autolock lock(&mLock); - stopped = doStop_l(); - } - - if (stopped) { - mSoundPool->done_l(this); - } -} - -//FIXME: Pause is a little broken right now -void SoundChannel::pause() -{ - Mutex::Autolock lock(&mLock); - if (mState == PLAYING) { - ALOGV("pause track"); - mState = PAUSED; - mAudioTrack->pause(); - } -} - -void SoundChannel::autoPause() -{ - Mutex::Autolock lock(&mLock); - if (mState == PLAYING) { - ALOGV("pause track"); - mState = PAUSED; - mAutoPaused = true; - mAudioTrack->pause(); - } -} - -void SoundChannel::resume() -{ - Mutex::Autolock lock(&mLock); - if (mState == PAUSED) { - ALOGV("resume track"); - mState = PLAYING; - mAutoPaused = false; - mAudioTrack->start(); - } -} - -void SoundChannel::autoResume() -{ - Mutex::Autolock lock(&mLock); - if (mAutoPaused && (mState == PAUSED)) { - ALOGV("resume track"); - mState = PLAYING; - mAutoPaused = false; - mAudioTrack->start(); - } -} - -void SoundChannel::setRate(float rate) -{ - Mutex::Autolock lock(&mLock); - if (mAudioTrack != NULL && mSample != 0) { - uint32_t sampleRate = uint32_t(float(mSample->sampleRate()) * rate + 0.5); - mAudioTrack->setSampleRate(sampleRate); - mRate = rate; - } -} - -// call with lock held -void SoundChannel::setVolume_l(float leftVolume, float rightVolume) -{ - mLeftVolume = leftVolume; - mRightVolume = rightVolume; - if (mAudioTrack != NULL && !mMuted) - mAudioTrack->setVolume(leftVolume, rightVolume); -} - -void SoundChannel::setVolume(float leftVolume, float rightVolume) -{ - Mutex::Autolock lock(&mLock); - setVolume_l(leftVolume, rightVolume); -} - -void SoundChannel::mute(bool muting) -{ - Mutex::Autolock lock(&mLock); - mMuted = muting; - if (mAudioTrack != NULL) { - if (mMuted) { - mAudioTrack->setVolume(0.0f, 0.0f); - } else { - mAudioTrack->setVolume(mLeftVolume, mRightVolume); - } - } -} - -void SoundChannel::setLoop(int loop) -{ - Mutex::Autolock lock(&mLock); - if (mAudioTrack != NULL && mSample != 0) { - uint32_t loopEnd = mSample->size()/mNumChannels/ - ((mSample->format() == AUDIO_FORMAT_PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t)); - mAudioTrack->setLoop(0, loopEnd, loop); - mLoop = loop; - } -} - -SoundChannel::~SoundChannel() -{ - ALOGV("SoundChannel destructor %p", this); - { - Mutex::Autolock lock(&mLock); - clearNextEvent(); - doStop_l(); - } - // do not call AudioTrack destructor with mLock held as it will wait for the AudioTrack - // callback thread to exit which may need to execute process() and acquire the mLock. - mAudioTrack.clear(); -} - -void SoundChannel::dump() -{ - ALOGV("mState = %d mChannelID=%d, mNumChannels=%d, mPos = %d, mPriority=%d, mLoop=%d", - mState, mChannelID, mNumChannels, mPos, mPriority, mLoop); + ALOGV("%s(%p, %p)", __func__, callback, user); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + mSoundManager.setCallback(this, callback, user); } -void SoundEvent::set(const sp<Sample>& sample, int channelID, float leftVolume, - float rightVolume, int priority, int loop, float rate) +void* SoundPool::getUserData() const { - mSample = sample; - mChannelID = channelID; - mLeftVolume = leftVolume; - mRightVolume = rightVolume; - mPriority = priority; - mLoop = loop; - mRate =rate; + ALOGV("%s()", __func__); + auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; + return mSoundManager.getUserData(); } } // end namespace android diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h index 01e4faae6f6c..d5b16ef629cd 100644 --- a/media/jni/soundpool/SoundPool.h +++ b/media/jni/soundpool/SoundPool.h @@ -14,227 +14,59 @@ * limitations under the License. */ -#ifndef SOUNDPOOL_H_ -#define SOUNDPOOL_H_ +#pragma once -#include <utils/threads.h> -#include <utils/List.h> -#include <utils/Vector.h> -#include <utils/KeyedVector.h> -#include <media/AudioTrack.h> -#include <binder/MemoryHeapBase.h> -#include <binder/MemoryBase.h> +#include "SoundManager.h" +#include "StreamManager.h" namespace android { -static const int IDLE_PRIORITY = -1; - -// forward declarations -class SoundEvent; -class SoundPoolThread; -class SoundPool; - -// for queued events -class SoundPoolEvent { -public: - explicit SoundPoolEvent(int msg, int arg1=0, int arg2=0) : - mMsg(msg), mArg1(arg1), mArg2(arg2) {} - int mMsg; - int mArg1; - int mArg2; - enum MessageType { INVALID, SAMPLE_LOADED }; -}; - -// callback function prototype -typedef void SoundPoolCallback(SoundPoolEvent event, SoundPool* soundPool, void* user); - -// tracks samples used by application -class Sample : public RefBase { -public: - enum sample_state { UNLOADED, LOADING, READY, UNLOADING }; - Sample(int sampleID, int fd, int64_t offset, int64_t length); - ~Sample(); - int sampleID() { return mSampleID; } - int numChannels() { return mNumChannels; } - int sampleRate() { return mSampleRate; } - audio_format_t format() { return mFormat; } - audio_channel_mask_t channelMask() { return mChannelMask; } - size_t size() { return mSize; } - int state() { return mState; } - uint8_t* data() { return static_cast<uint8_t*>(mData->unsecurePointer()); } - status_t doLoad(); - void startLoad() { mState = LOADING; } - sp<IMemory> getIMemory() { return mData; } - -private: - void init(); - - size_t mSize; - volatile int32_t mRefCount; - uint16_t mSampleID; - uint16_t mSampleRate; - uint8_t mState; - uint8_t mNumChannels; - audio_format_t mFormat; - audio_channel_mask_t mChannelMask; - int mFd; - int64_t mOffset; - int64_t mLength; - sp<IMemory> mData; - sp<MemoryHeapBase> mHeap; -}; - -// stores pending events for stolen channels -class SoundEvent -{ -public: - SoundEvent() : mChannelID(0), mLeftVolume(0), mRightVolume(0), - mPriority(IDLE_PRIORITY), mLoop(0), mRate(0) {} - void set(const sp<Sample>& sample, int channelID, float leftVolume, - float rightVolume, int priority, int loop, float rate); - sp<Sample> sample() { return mSample; } - int channelID() { return mChannelID; } - float leftVolume() { return mLeftVolume; } - float rightVolume() { return mRightVolume; } - int priority() { return mPriority; } - int loop() { return mLoop; } - float rate() { return mRate; } - void clear() { mChannelID = 0; mSample.clear(); } - -protected: - sp<Sample> mSample; - int mChannelID; - float mLeftVolume; - float mRightVolume; - int mPriority; - int mLoop; - float mRate; -}; - -// for channels aka AudioTracks -class SoundChannel : public SoundEvent { -public: - enum state { IDLE, RESUMING, STOPPING, PAUSED, PLAYING }; - SoundChannel() : mState(IDLE), mNumChannels(1), - mPos(0), mToggle(0), mAutoPaused(false), mMuted(false) {} - ~SoundChannel(); - void init(SoundPool* soundPool); - void play(const sp<Sample>& sample, int channelID, float leftVolume, float rightVolume, - int priority, int loop, float rate); - void setVolume_l(float leftVolume, float rightVolume); - void setVolume(float leftVolume, float rightVolume); - void mute(bool muting); - void stop_l(); - void stop(); - void pause(); - void autoPause(); - void resume(); - void autoResume(); - void setRate(float rate); - int state() { return mState; } - void setPriority(int priority) { mPriority = priority; } - void setLoop(int loop); - int numChannels() { return mNumChannels; } - void clearNextEvent() { mNextEvent.clear(); } - void nextEvent(); - int nextChannelID() { return mNextEvent.channelID(); } - void dump(); - int getPrevSampleID(void) { return mPrevSampleID; } - -private: - static void callback(int event, void* user, void *info); - void process(int event, void *info, unsigned long toggle); - bool doStop_l(); - - SoundPool* mSoundPool; - sp<AudioTrack> mAudioTrack; - SoundEvent mNextEvent; - Mutex mLock; - int mState; - int mNumChannels; - int mPos; - int mAudioBufferSize; - unsigned long mToggle; - bool mAutoPaused; - int mPrevSampleID; - bool mMuted; -}; - -// application object for managing a pool of sounds +/** + * Native class for Java SoundPool, manages a pool of sounds. + * + * See the Android SoundPool Java documentation for description of valid values. + * https://developer.android.com/reference/android/media/SoundPool + */ class SoundPool { - friend class SoundPoolThread; - friend class SoundChannel; public: - SoundPool(int maxChannels, const audio_attributes_t* pAttributes); + SoundPool(int32_t maxStreams, const audio_attributes_t* attributes); ~SoundPool(); - int load(int fd, int64_t offset, int64_t length, int priority); - bool unload(int sampleID); - int play(int sampleID, float leftVolume, float rightVolume, int priority, - int loop, float rate); - void pause(int channelID); - void mute(bool muting); + + // SoundPool Java API support + int32_t load(int fd, int64_t offset, int64_t length, int32_t priority); + bool unload(int32_t soundID); + int32_t play(int32_t soundID, float leftVolume, float rightVolume, int32_t priority, + int32_t loop, float rate); + void pause(int32_t streamID); void autoPause(); - void resume(int channelID); + void resume(int32_t streamID); void autoResume(); - void stop(int channelID); - void setVolume(int channelID, float leftVolume, float rightVolume); - void setPriority(int channelID, int priority); - void setLoop(int channelID, int loop); - void setRate(int channelID, float rate); - const audio_attributes_t* attributes() { return &mAttributes; } - - // called from SoundPoolThread - void sampleLoaded(int sampleID); - sp<Sample> findSample(int sampleID); - - // called from AudioTrack thread - void done_l(SoundChannel* channel); - - // callback function + void stop(int32_t streamID); + void setVolume(int32_t streamID, float leftVolume, float rightVolume); + void setPriority(int32_t streamID, int32_t priority); + void setLoop(int32_t streamID, int32_t loop); + void setRate(int32_t streamID, float rate); void setCallback(SoundPoolCallback* callback, void* user); - void* getUserData() { return mUserData; } + void* getUserData() const; -private: - SoundPool() {} // no default constructor - bool startThreads(); - sp<Sample> findSample_l(int sampleID); - SoundChannel* findChannel (int channelID); - SoundChannel* findNextChannel (int channelID); - SoundChannel* allocateChannel_l(int priority, int sampleID); - void moveToFront_l(SoundChannel* channel); - void notify(SoundPoolEvent event); - void dump(); - - // restart thread - void addToRestartList(SoundChannel* channel); - void addToStopList(SoundChannel* channel); - static int beginThread(void* arg); - int run(); - void quit(); + // not exposed in the public Java API, used for internal playerSetVolume() muting. + void mute(bool muting); - Mutex mLock; - Mutex mRestartLock; - Condition mCondition; - SoundPoolThread* mDecodeThread; - SoundChannel* mChannelPool; - List<SoundChannel*> mChannels; - List<SoundChannel*> mRestart; - List<SoundChannel*> mStop; - DefaultKeyedVector< int, sp<Sample> > mSamples; - int mMaxChannels; - audio_attributes_t mAttributes; - int mAllocated; - int mNextSampleID; - int mNextChannelID; - bool mQuit; - bool mMuted; +private: - // callback - Mutex mCallbackLock; - SoundPoolCallback* mCallback; - void* mUserData; + // Constructor initialized variables + // Can access without lock as they are internally locked, + // though care needs to be taken that the final result composed of + // individually consistent actions are consistent. + soundpool::SoundManager mSoundManager; + soundpool::StreamManager mStreamManager; + + // mApiLock serializes SoundPool application calls (configurable by kUseApiLock). + // It only locks at the SoundPool layer and not below. At this level, + // mApiLock is only required for autoPause() and autoResume() to prevent zippering + // of the individual pauses and resumes, and mute() for self-interaction with itself. + // It is optional for all other apis. + mutable std::mutex mApiLock; }; } // end namespace android - -#endif /*SOUNDPOOL_H_*/ diff --git a/media/jni/soundpool/SoundPoolThread.cpp b/media/jni/soundpool/SoundPoolThread.cpp deleted file mode 100644 index ba3b482935dd..000000000000 --- a/media/jni/soundpool/SoundPoolThread.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2007 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_NDEBUG 0 -#define LOG_TAG "SoundPoolThread" -#include "utils/Log.h" - -#include "SoundPoolThread.h" - -namespace android { - -void SoundPoolThread::write(SoundPoolMsg msg) { - Mutex::Autolock lock(&mLock); - while (mMsgQueue.size() >= maxMessages) { - mCondition.wait(mLock); - } - - // if thread is quitting, don't add to queue - if (mRunning) { - mMsgQueue.push(msg); - mCondition.signal(); - } -} - -const SoundPoolMsg SoundPoolThread::read() { - Mutex::Autolock lock(&mLock); - while (mMsgQueue.size() == 0) { - mCondition.wait(mLock); - } - SoundPoolMsg msg = mMsgQueue[0]; - mMsgQueue.removeAt(0); - mCondition.signal(); - return msg; -} - -void SoundPoolThread::quit() { - Mutex::Autolock lock(&mLock); - if (mRunning) { - mRunning = false; - mMsgQueue.clear(); - mMsgQueue.push(SoundPoolMsg(SoundPoolMsg::KILL, 0)); - mCondition.signal(); - mCondition.wait(mLock); - } - ALOGV("return from quit"); -} - -SoundPoolThread::SoundPoolThread(SoundPool* soundPool) : - mSoundPool(soundPool) -{ - mMsgQueue.setCapacity(maxMessages); - if (createThreadEtc(beginThread, this, "SoundPoolThread")) { - mRunning = true; - } -} - -SoundPoolThread::~SoundPoolThread() -{ - quit(); -} - -int SoundPoolThread::beginThread(void* arg) { - ALOGV("beginThread"); - SoundPoolThread* soundPoolThread = (SoundPoolThread*)arg; - return soundPoolThread->run(); -} - -int SoundPoolThread::run() { - ALOGV("run"); - for (;;) { - SoundPoolMsg msg = read(); - ALOGV("Got message m=%d, mData=%d", msg.mMessageType, msg.mData); - switch (msg.mMessageType) { - case SoundPoolMsg::KILL: - ALOGV("goodbye"); - return NO_ERROR; - case SoundPoolMsg::LOAD_SAMPLE: - doLoadSample(msg.mData); - break; - default: - ALOGW("run: Unrecognized message %d\n", - msg.mMessageType); - break; - } - } -} - -void SoundPoolThread::loadSample(int sampleID) { - write(SoundPoolMsg(SoundPoolMsg::LOAD_SAMPLE, sampleID)); -} - -void SoundPoolThread::doLoadSample(int sampleID) { - sp <Sample> sample = mSoundPool->findSample(sampleID); - status_t status = -1; - if (sample != 0) { - status = sample->doLoad(); - } - mSoundPool->notify(SoundPoolEvent(SoundPoolEvent::SAMPLE_LOADED, sampleID, status)); -} - -} // end namespace android diff --git a/media/jni/soundpool/SoundPoolThread.h b/media/jni/soundpool/SoundPoolThread.h deleted file mode 100644 index 7b3e1dda0a23..000000000000 --- a/media/jni/soundpool/SoundPoolThread.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2007 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. - */ - -#ifndef SOUNDPOOLTHREAD_H_ -#define SOUNDPOOLTHREAD_H_ - -#include <utils/threads.h> -#include <utils/Vector.h> -#include <media/AudioTrack.h> - -#include "SoundPool.h" - -namespace android { - -class SoundPoolMsg { -public: - enum MessageType { INVALID, KILL, LOAD_SAMPLE }; - SoundPoolMsg() : mMessageType(INVALID), mData(0) {} - SoundPoolMsg(MessageType MessageType, int data) : - mMessageType(MessageType), mData(data) {} - uint16_t mMessageType; - uint16_t mData; -}; - -/* - * This class handles background requests from the SoundPool - */ -class SoundPoolThread { -public: - explicit SoundPoolThread(SoundPool* SoundPool); - ~SoundPoolThread(); - void loadSample(int sampleID); - void quit(); - void write(SoundPoolMsg msg); - -private: - static const size_t maxMessages = 128; - - static int beginThread(void* arg); - int run(); - void doLoadSample(int sampleID); - const SoundPoolMsg read(); - - Mutex mLock; - Condition mCondition; - Vector<SoundPoolMsg> mMsgQueue; - SoundPool* mSoundPool; - bool mRunning; -}; - -} // end namespace android - -#endif /*SOUNDPOOLTHREAD_H_*/ diff --git a/media/jni/soundpool/Stream.cpp b/media/jni/soundpool/Stream.cpp new file mode 100644 index 000000000000..e7d4d9093bb8 --- /dev/null +++ b/media/jni/soundpool/Stream.cpp @@ -0,0 +1,448 @@ +/* + * 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. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "SoundPool::Stream" +#include <utils/Log.h> + +#include "Stream.h" + +#include "StreamManager.h" + +namespace android::soundpool { + +Stream::~Stream() +{ + ALOGV("%s(%p)", __func__, this); +} + +void Stream::autoPause() +{ + std::lock_guard lock(mLock); + if (mState == PLAYING) { + ALOGV("%s: track streamID: %d", __func__, (int)mStreamID); + mState = PAUSED; + mAutoPaused = true; + if (mAudioTrack != nullptr) { + mAudioTrack->pause(); + } + } +} + +void Stream::autoResume() +{ + std::lock_guard lock(mLock); + if (mAutoPaused) { + if (mState == PAUSED) { + ALOGV("%s: track streamID: %d", __func__, (int)mStreamID); + mState = PLAYING; + if (mAudioTrack != nullptr) { + mAudioTrack->start(); + } + } + mAutoPaused = false; // New for R: always reset autopause (consistent with API spec). + } +} + +void Stream::mute(bool muting) +{ + std::lock_guard lock(mLock); + mMuted = muting; + if (mAudioTrack != nullptr) { + if (mMuted) { + mAudioTrack->setVolume(0.0f, 0.0f); + } else { + mAudioTrack->setVolume(mLeftVolume, mRightVolume); + } + } +} + +void Stream::pause(int32_t streamID) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + if (mState == PLAYING) { + ALOGV("%s: track streamID: %d", __func__, streamID); + mState = PAUSED; + if (mAudioTrack != nullptr) { + mAudioTrack->pause(); + } + } + } +} + +void Stream::resume(int32_t streamID) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + if (mState == PAUSED) { + ALOGV("%s: track streamID: %d", __func__, streamID); + mState = PLAYING; + if (mAudioTrack != nullptr) { + mAudioTrack->start(); + } + mAutoPaused = false; // TODO: is this right? (ambiguous per spec), move outside? + } + } +} + +void Stream::setRate(int32_t streamID, float rate) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + mRate = rate; + if (mAudioTrack != nullptr && mSound != nullptr) { + const uint32_t sampleRate = uint32_t(float(mSound->getSampleRate()) * rate + 0.5); + mAudioTrack->setSampleRate(sampleRate); + } + } +} + +void Stream::setVolume_l(float leftVolume, float rightVolume) +{ + mLeftVolume = leftVolume; + mRightVolume = rightVolume; + if (mAudioTrack != nullptr && !mMuted) { + mAudioTrack->setVolume(leftVolume, rightVolume); + } +} + +void Stream::setVolume(int32_t streamID, float leftVolume, float rightVolume) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + setVolume_l(leftVolume, rightVolume); + } +} + +void Stream::setPriority(int32_t streamID, int32_t priority) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + mPriority = priority; + } +} + +void Stream::setLoop(int32_t streamID, int32_t loop) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + if (mAudioTrack != nullptr && mSound != nullptr) { + const uint32_t loopEnd = mSound->getSizeInBytes() / mSound->getChannelCount() / + (mSound->getFormat() == AUDIO_FORMAT_PCM_16_BIT + ? sizeof(int16_t) : sizeof(uint8_t)); + mAudioTrack->setLoop(0, loopEnd, loop); + } + mLoop = loop; + } +} + +void Stream::setPlay( + int32_t streamID, const std::shared_ptr<Sound> &sound, int32_t soundID, + float leftVolume, float rightVolume, int32_t priority, int32_t loop, float rate) +{ + std::lock_guard lock(mLock); + // We must be idle, or we must be repurposing a pending Stream. + LOG_ALWAYS_FATAL_IF(mState != IDLE && mAudioTrack != nullptr, "State %d must be IDLE", mState); + mSound = sound; + mSoundID = soundID; + mLeftVolume = leftVolume; + mRightVolume = rightVolume; + mPriority = priority; + mLoop = loop; + mRate = rate; + mState = PLAYING; + mAutoPaused = false; // New for R (consistent with Java API spec). + mStreamID = streamID; // prefer this to be the last, as it is an atomic sync point +} + +void Stream::setStopTimeNs(int64_t stopTimeNs) +{ + std::lock_guard lock(mLock); + mStopTimeNs = stopTimeNs; +} + +bool Stream::requestStop(int32_t streamID) +{ + std::lock_guard lock(mLock); + if (streamID == mStreamID) { + if (mAudioTrack != nullptr) { + if (mState == PLAYING && !mMuted && (mLeftVolume != 0.f || mRightVolume != 0.f)) { + setVolume_l(0.f, 0.f); + mStopTimeNs = systemTime() + kStopWaitTimeNs; + } else { + mStopTimeNs = systemTime(); + } + return true; // must be queued on the restart list. + } + stop_l(); + } + return false; +} + +void Stream::stop() +{ + std::lock_guard lock(mLock); + stop_l(); +} + +void Stream::stop_l() +{ + if (mState != IDLE) { + if (mAudioTrack != nullptr) { + mAudioTrack->stop(); + } + mSound.reset(); + mState = IDLE; + } +} + +void Stream::clearAudioTrack() +{ + // This will invoke the destructor which waits for the AudioTrack thread to join, + // and is currently the only safe way to ensure there are no callbacks afterwards. + mAudioTrack.clear(); +} + +Stream* Stream::getPairStream() const +{ + return mStreamManager->getPairStream(this); +} + +Stream* Stream::playPairStream() { + Stream* pairStream = getPairStream(); + LOG_ALWAYS_FATAL_IF(pairStream == nullptr, "No pair stream!"); + sp<AudioTrack> releaseTracks[2]; + { + // TODO: Do we really want to force a simultaneous synchronization between + // the stream and its pair? + + // note locking order - the paired stream is obtained before the queued stream. + // we can invert the locking order, but it is slightly more optimal to do it this way. + std::lock_guard lockp(pairStream->mLock); + if (pairStream->mSound == nullptr) { + return nullptr; // no pair sound + } + { + std::lock_guard lock(mLock); + LOG_ALWAYS_FATAL_IF(mState != IDLE, "State: %d must be IDLE", mState); + // TODO: do we want a specific set() here? + pairStream->mAudioTrack = mAudioTrack; + pairStream->mSoundID = mSoundID; // optimization to reuse AudioTrack. + pairStream->mToggle = mToggle; + pairStream->mAutoPaused = mAutoPaused; // save autopause state + pairStream->mMuted = mMuted; + mAudioTrack.clear(); // the pair owns the audiotrack. + mSound.reset(); + mSoundID = 0; + } + // TODO: do we need a specific play_l() anymore? + const int pairState = pairStream->mState; + pairStream->play_l(pairStream->mSound, pairStream->mStreamID, + pairStream->mLeftVolume, pairStream->mRightVolume, pairStream->mPriority, + pairStream->mLoop, pairStream->mRate, releaseTracks); + if (pairStream->mState == IDLE) { + return nullptr; // AudioTrack error + } + if (pairState == PAUSED) { // reestablish pause + pairStream->mState = PAUSED; + pairStream->mAudioTrack->pause(); + } + } + // release tracks outside of Stream lock + return pairStream; +} + +void Stream::play_l(const std::shared_ptr<Sound>& sound, int32_t nextStreamID, + float leftVolume, float rightVolume, int32_t priority, int32_t loop, float rate, + sp<AudioTrack> releaseTracks[2]) +{ + // These tracks are released without the lock. + sp<AudioTrack> &oldTrack = releaseTracks[0]; + sp<AudioTrack> &newTrack = releaseTracks[1]; + status_t status = NO_ERROR; + + { + ALOGV("%s(%p)(soundID=%d, streamID=%d, leftVolume=%f, rightVolume=%f," + " priority=%d, loop=%d, rate=%f)", + __func__, this, sound->getSoundID(), nextStreamID, leftVolume, rightVolume, + priority, loop, rate); + + // initialize track + const audio_stream_type_t streamType = + AudioSystem::attributesToStreamType(*mStreamManager->getAttributes()); + const int32_t channelCount = sound->getChannelCount(); + const uint32_t sampleRate = uint32_t(float(sound->getSampleRate()) * rate + 0.5); + size_t frameCount = 0; + + if (loop) { + const audio_format_t format = sound->getFormat(); + const size_t frameSize = audio_is_linear_pcm(format) + ? channelCount * audio_bytes_per_sample(format) : 1; + frameCount = sound->getSizeInBytes() / frameSize; + } + + // check if the existing track has the same sound id. + if (mAudioTrack != nullptr && mSoundID == sound->getSoundID()) { + // the sample rate may fail to change if the audio track is a fast track. + if (mAudioTrack->setSampleRate(sampleRate) == NO_ERROR) { + newTrack = mAudioTrack; + ALOGV("%s: reusing track %p for sound %d", + __func__, mAudioTrack.get(), sound->getSoundID()); + } + } + if (newTrack == 0) { + // mToggle toggles each time a track is started on a given stream. + // The toggle is concatenated with the Stream address and passed to AudioTrack + // as callback user data. This enables the detection of callbacks received from the old + // audio track while the new one is being started and avoids processing them with + // wrong audio audio buffer size (mAudioBufferSize) + auto toggle = mToggle ^ 1; + void* userData = (void*)((uintptr_t)this | toggle); + audio_channel_mask_t soundChannelMask = sound->getChannelMask(); + // When sound contains a valid channel mask, use it as is. + // Otherwise, use stream count to calculate channel mask. + audio_channel_mask_t channelMask = soundChannelMask != AUDIO_CHANNEL_NONE + ? soundChannelMask : audio_channel_out_mask_from_count(channelCount); + + // do not create a new audio track if current track is compatible with sound parameters + + newTrack = new AudioTrack(streamType, sampleRate, sound->getFormat(), + channelMask, sound->getIMemory(), AUDIO_OUTPUT_FLAG_FAST, + staticCallback, userData, + 0 /*default notification frames*/, AUDIO_SESSION_ALLOCATE, + AudioTrack::TRANSFER_DEFAULT, + nullptr /*offloadInfo*/, -1 /*uid*/, -1 /*pid*/, + mStreamManager->getAttributes()); + + oldTrack = mAudioTrack; + status = newTrack->initCheck(); + if (status != NO_ERROR) { + ALOGE("%s: error creating AudioTrack", __func__); + // newTrack goes out of scope, so reference count drops to zero + goto exit; + } + // From now on, AudioTrack callbacks received with previous toggle value will be ignored. + mToggle = toggle; + mAudioTrack = newTrack; + ALOGV("%s: using new track %p for sound %d", + __func__, newTrack.get(), sound->getSoundID()); + } + if (mMuted) { + newTrack->setVolume(0.0f, 0.0f); + } else { + newTrack->setVolume(leftVolume, rightVolume); + } + newTrack->setLoop(0, frameCount, loop); + mAudioTrack->start(); + mSound = sound; + mSoundID = sound->getSoundID(); + mPriority = priority; + mLoop = loop; + mLeftVolume = leftVolume; + mRightVolume = rightVolume; + mRate = rate; + mState = PLAYING; + mStopTimeNs = 0; + mStreamID = nextStreamID; // prefer this to be the last, as it is an atomic sync point + } + +exit: + ALOGV("%s: delete oldTrack %p", __func__, oldTrack.get()); + if (status != NO_ERROR) { + // TODO: should we consider keeping the soundID if the old track is OK? + // Do not attempt to restart this track (should we remove the stream id?) + mState = IDLE; + mSoundID = 0; + mSound.reset(); + mAudioTrack.clear(); // actual release from releaseTracks[] + } +} + +/* static */ +void Stream::staticCallback(int event, void* user, void* info) +{ + const uintptr_t userAsInt = (uintptr_t)user; + Stream* stream = reinterpret_cast<Stream*>(userAsInt & ~1); + stream->callback(event, info, userAsInt & 1, 0 /* tries */); +} + +void Stream::callback(int event, void* info, int toggle, int tries) +{ + ALOGV("%s streamID %d", __func__, (int)mStreamID); + int32_t activeStreamIDToRestart = 0; + { + std::unique_lock lock(mLock); + + if (mAudioTrack == nullptr) { + // The AudioTrack is either with this stream or its pair. + // if this swaps a few times, the toggle is bound to be wrong, so we fail then. + // + // TODO: Modify AudioTrack callbacks to avoid the hacky toggle and retry + // logic here. + if (tries < 3) { + lock.unlock(); + getPairStream()->callback(event, info, toggle, tries + 1); + } else { + ALOGW("%s streamID %d cannot find track", __func__, (int)mStreamID); + } + return; + } + if (mToggle != toggle) { + ALOGD("%s streamID %d wrong toggle", __func__, (int)mStreamID); + return; + } + switch (event) { + case AudioTrack::EVENT_MORE_DATA: + ALOGW("%s streamID %d Invalid EVENT_MORE_DATA for static track", + __func__, (int)mStreamID); + break; + case AudioTrack::EVENT_UNDERRUN: + ALOGW("%s streamID %d Invalid EVENT_UNDERRUN for static track", + __func__, (int)mStreamID); + break; + case AudioTrack::EVENT_BUFFER_END: + ALOGV("%s streamID %d EVENT_BUFFER_END", __func__, (int)mStreamID); + if (mState != IDLE) { + activeStreamIDToRestart = mStreamID; + mStopTimeNs = systemTime(); + } + break; + case AudioTrack::EVENT_LOOP_END: + ALOGV("%s streamID %d EVENT_LOOP_END", __func__, (int)mStreamID); + break; + case AudioTrack::EVENT_NEW_IAUDIOTRACK: + ALOGV("%s streamID %d NEW_IAUDIOTRACK", __func__, (int)mStreamID); + break; + default: + ALOGW("%s streamID %d Invalid event %d", __func__, (int)mStreamID, event); + break; + } + } // lock ends here. This is on the callback thread, no need to be precise. + if (activeStreamIDToRestart > 0) { + // Restart only if a particular streamID is still current and active. + ALOGV("%s: moveToRestartQueue %d", __func__, activeStreamIDToRestart); + mStreamManager->moveToRestartQueue(this, activeStreamIDToRestart); + } +} + +void Stream::dump() const +{ + ALOGV("mPairStream=%p, mState=%d, mStreamID=%d, mSoundID=%d, mPriority=%d, mLoop=%d", + getPairStream(), mState, (int)mStreamID, mSoundID, mPriority, mLoop); +} + +} // namespace android::soundpool diff --git a/media/jni/soundpool/Stream.h b/media/jni/soundpool/Stream.h new file mode 100644 index 000000000000..82d2690e2965 --- /dev/null +++ b/media/jni/soundpool/Stream.h @@ -0,0 +1,150 @@ +/* + * 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. + */ + +#pragma once + +#include "Sound.h" + +#include <audio_utils/clock.h> +#include <media/AudioTrack.h> + +namespace android::soundpool { + +// This is the amount of time to wait after stop is called when stealing an +// AudioTrack to allow the sound to ramp down. If this is 0, glitches +// may occur when stealing an AudioTrack. +inline constexpr int64_t kStopWaitTimeNs = 20 * NANOS_PER_MILLISECOND; + +inline constexpr size_t kCacheLineSize = 64; /* std::hardware_constructive_interference_size */ + +class StreamManager; // forward decl + +/** + * A Stream is associated with a StreamID exposed to the app to play a Sound. + * + * The Stream uses monitor locking strategy on mLock. + * https://en.wikipedia.org/wiki/Monitor_(synchronization) + * + * where public methods are guarded by a lock (as needed) + * + * For Java equivalent APIs, see + * https://developer.android.com/reference/android/media/SoundPool + * + * Streams are paired by the StreamManager, so one stream in the pair may be "stopping" + * while the other stream of the pair has been prepared to run + * (and the streamID returned to the app) pending its pair to be stopped. + * The pair of a Stream may be obtained by calling getPairStream(), + * where this->getPairStream()->getPairStream() == this; (pair is a commutative relationship). + * + * playPairStream() and getPairPriority() access the paired stream. + * See also StreamManager.h for details of physical layout implications of paired streams. + */ +class alignas(kCacheLineSize) Stream { +public: + enum state { IDLE, PAUSED, PLAYING }; + // The PAUSED, PLAYING state directly corresponds to the AudioTrack state of an active Stream. + // + // The IDLE state indicates an inactive Stream. An IDLE Stream may have a non-nullptr + // AudioTrack, which may be recycled for use if the SoundID matches the next Stream playback. + // + // PAUSED -> PLAYING through resume() (see also autoResume()) + // PLAYING -> PAUSED through pause() (see also autoPause()) + // + // IDLE is the initial state of a Stream and also when a stream becomes inactive. + // {PAUSED, PLAYING} -> IDLE through stop() (or if the Sound finishes playing) + // IDLE -> PLAYING through play(). (there is no way to start a Stream in paused mode). + + ~Stream(); + void setStreamManager(StreamManager* streamManager) { // non-nullptr + mStreamManager = streamManager; // set in StreamManager constructor, not changed + } + + // The following methods are monitor locked by mLock. + // + // For methods taking a streamID: + // if the streamID matches the Stream's mStreamID, then method proceeds + // else the command is ignored with no effect. + + // returns true if the stream needs to be explicitly stopped. + bool requestStop(int32_t streamID); + void stop(); // explicit stop(), typically called from the worker thread. + void clearAudioTrack(); + void pause(int32_t streamID); + void autoPause(); // see the Java SoundPool.autoPause documentation for details. + void resume(int32_t streamID); + void autoResume(); + void mute(bool muting); + void dump() const; + + // returns the pair stream if successful, nullptr otherwise + Stream* playPairStream(); + + // These parameters are explicitly checked in the SoundPool class + // so never deviate from the Java API specified values. + void setVolume(int32_t streamID, float leftVolume, float rightVolume); + void setRate(int32_t streamID, float rate); + void setPriority(int32_t streamID, int priority); + void setLoop(int32_t streamID, int loop); + void setPlay(int32_t streamID, const std::shared_ptr<Sound> &sound, int32_t soundID, + float leftVolume, float rightVolume, int32_t priority, int32_t loop, float rate); + void setStopTimeNs(int64_t stopTimeNs); // systemTime() clock monotonic. + + // The following getters are not locked and have weak consistency. + // These are considered advisory only - being stale is of nuisance. + int32_t getPriority() const { return mPriority; } + int32_t getPairPriority() const { return getPairStream()->getPriority(); } + int64_t getStopTimeNs() const { return mStopTimeNs; } + + int32_t getStreamID() const { return mStreamID; } // Can change with setPlay() + int32_t getSoundID() const { return mSoundID; } // Can change with play_l() + bool hasSound() const { return mSound.get() != nullptr; } + + Stream* getPairStream() const; // this never changes. See top of header. + +private: + void play_l(const std::shared_ptr<Sound>& sound, int streamID, + float leftVolume, float rightVolume, int priority, int loop, float rate, + sp<AudioTrack> releaseTracks[2]); + void stop_l(); + void setVolume_l(float leftVolume, float rightVolume); + + // For use with AudioTrack callback. + static void staticCallback(int event, void* user, void* info); + void callback(int event, void* info, int toggle, int tries); + + // StreamManager should be set on construction and not changed. + // release mLock before calling into StreamManager + StreamManager* mStreamManager = nullptr; + + mutable std::mutex mLock; + std::atomic_int32_t mStreamID = 0; // Note: valid streamIDs are always positive. + int mState = IDLE; + std::shared_ptr<Sound> mSound; // Non-null if playing. + int32_t mSoundID = 0; // The sound ID associated with the AudioTrack. + float mLeftVolume = 0.f; + float mRightVolume = 0.f; + int32_t mPriority = INT32_MIN; + int32_t mLoop = 0; + float mRate = 0.f; + bool mAutoPaused = false; + bool mMuted = false; + + sp<AudioTrack> mAudioTrack; + int mToggle = 0; + int64_t mStopTimeNs = 0; // if nonzero, time to wait for stop. +}; + +} // namespace android::soundpool diff --git a/media/jni/soundpool/StreamManager.cpp b/media/jni/soundpool/StreamManager.cpp new file mode 100644 index 000000000000..8928c47cf4bb --- /dev/null +++ b/media/jni/soundpool/StreamManager.cpp @@ -0,0 +1,407 @@ +/* + * 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. + */ + +//#define LOG_NDEBUG 0 +#define LOG_TAG "SoundPool::StreamManager" +#include <utils/Log.h> + +#include "StreamManager.h" + +#include <audio_utils/clock.h> +#include <audio_utils/roundup.h> + +namespace android::soundpool { + +// kMaxStreams is number that should be less than the current AudioTrack max per UID of 40. +// It is the maximum number of AudioTrack resources allowed in the SoundPool. +// We suggest a value at least 4 or greater to allow CTS tests to pass. +static constexpr int32_t kMaxStreams = 32; + +// kStealActiveStream_OldestFirst = false historically (Q and earlier) +// Changing to true could break app expectations but could change behavior beneficially. +// In R, we change this to true, as it is the correct way per SoundPool documentation. +static constexpr bool kStealActiveStream_OldestFirst = true; + +// kPlayOnCallingThread = true prior to R. +// Changing to false means calls to play() are almost instantaneous instead of taking around +// ~10ms to launch the AudioTrack. It is perhaps 100x faster. +static constexpr bool kPlayOnCallingThread = false; + +// Amount of time for a StreamManager thread to wait before closing. +static constexpr int64_t kWaitTimeBeforeCloseNs = 9 * NANOS_PER_SECOND; + +//////////// + +StreamMap::StreamMap(int32_t streams) { + ALOGV("%s(%d)", __func__, streams); + if (streams > kMaxStreams) { + ALOGW("%s: requested %d streams, clamping to %d", __func__, streams, kMaxStreams); + streams = kMaxStreams; + } else if (streams < 1) { + ALOGW("%s: requested %d streams, clamping to 1", __func__, streams); + streams = 1; + } + mStreamPoolSize = streams * 2; + mStreamPool.reset(new Stream[mStreamPoolSize]); + // we use a perfect hash table with 2x size to map StreamIDs to Stream pointers. + mPerfectHash = std::make_unique<PerfectHash<int32_t, Stream *>>(roundup(mStreamPoolSize * 2)); +} + +Stream* StreamMap::findStream(int32_t streamID) const +{ + Stream *stream = lookupStreamFromId(streamID); + return stream != nullptr && stream->getStreamID() == streamID ? stream : nullptr; +} + +size_t StreamMap::streamPosition(const Stream* stream) const +{ + ptrdiff_t index = stream - mStreamPool.get(); + LOG_ALWAYS_FATAL_IF(index < 0 || index >= mStreamPoolSize, + "%s: stream position out of range: %td", __func__, index); + return (size_t)index; +} + +Stream* StreamMap::lookupStreamFromId(int32_t streamID) const +{ + return streamID > 0 ? mPerfectHash->getValue(streamID).load() : nullptr; +} + +int32_t StreamMap::getNextIdForStream(Stream* stream) const { + // even though it is const, it mutates the internal hash table. + const int32_t id = mPerfectHash->generateKey( + stream, + [] (Stream *stream) { + return stream == nullptr ? 0 : stream->getStreamID(); + }, /* getKforV() */ + stream->getStreamID() /* oldID */); + return id; +} + +//////////// + +StreamManager::StreamManager( + int32_t streams, size_t threads, const audio_attributes_t* attributes) + : StreamMap(streams) + , mAttributes(*attributes) +{ + ALOGV("%s(%d, %zu, ...)", __func__, streams, threads); + forEach([this](Stream *stream) { + stream->setStreamManager(this); + if ((streamPosition(stream) & 1) == 0) { // put the first stream of pair as available. + mAvailableStreams.insert(stream); + } + }); + + mThreadPool = std::make_unique<ThreadPool>( + std::min(threads, (size_t)std::thread::hardware_concurrency()), + "SoundPool_"); +} + +StreamManager::~StreamManager() +{ + ALOGV("%s", __func__); + { + std::unique_lock lock(mStreamManagerLock); + mQuit = true; + mStreamManagerCondition.notify_all(); + } + mThreadPool->quit(); + + // call stop on the stream pool + forEach([](Stream *stream) { stream->stop(); }); + + // This invokes the destructor on the AudioTracks - + // we do it here to ensure that AudioTrack callbacks will not occur + // afterwards. + forEach([](Stream *stream) { stream->clearAudioTrack(); }); +} + + +int32_t StreamManager::queueForPlay(const std::shared_ptr<Sound> &sound, + int32_t soundID, float leftVolume, float rightVolume, + int32_t priority, int32_t loop, float rate) +{ + ALOGV("%s(sound=%p, soundID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f)", + __func__, sound.get(), soundID, leftVolume, rightVolume, priority, loop, rate); + bool launchThread = false; + int32_t streamID = 0; + + { // for lock + std::unique_lock lock(mStreamManagerLock); + Stream *newStream = nullptr; + bool fromAvailableQueue = false; + ALOGV("%s: mStreamManagerLock lock acquired", __func__); + + sanityCheckQueue_l(); + // find an available stream, prefer one that has matching sound id. + if (mAvailableStreams.size() > 0) { + newStream = *mAvailableStreams.begin(); + for (auto stream : mAvailableStreams) { + if (stream->getSoundID() == soundID) { + newStream = stream; + break; + } + } + if (newStream != nullptr) { + newStream->setStopTimeNs(systemTime()); + } + fromAvailableQueue = true; + } + + // also look in the streams restarting (if the paired stream doesn't have a pending play) + if (newStream == nullptr || newStream->getSoundID() != soundID) { + for (auto [unused , stream] : mRestartStreams) { + if (!stream->getPairStream()->hasSound()) { + if (stream->getSoundID() == soundID) { + newStream = stream; + break; + } else if (newStream == nullptr) { + newStream = stream; + } + } + } + } + + // no available streams, look for one to steal from the active list + if (newStream == nullptr) { + for (auto stream : mActiveStreams) { + if (stream->getPriority() <= priority) { + if (newStream == nullptr + || newStream->getPriority() > stream->getPriority()) { + newStream = stream; + } + } + } + if (newStream != nullptr) { // we need to mute as it is still playing. + (void)newStream->requestStop(newStream->getStreamID()); + } + } + + // none found, look for a stream that is restarting, evict one. + if (newStream == nullptr) { + for (auto [unused, stream] : mRestartStreams) { + if (stream->getPairPriority() <= priority) { + newStream = stream; + break; + } + } + } + + // DO NOT LOOK into mProcessingStreams as those are held by the StreamManager threads. + + if (newStream == nullptr) { + ALOGD("%s: unable to find stream, returning 0", __func__); + return 0; // unable to find available stream + } + + Stream *pairStream = newStream->getPairStream(); + streamID = getNextIdForStream(pairStream); + pairStream->setPlay( + streamID, sound, soundID, leftVolume, rightVolume, priority, loop, rate); + if (fromAvailableQueue && kPlayOnCallingThread) { + removeFromQueues_l(newStream); + mProcessingStreams.emplace(newStream); + lock.unlock(); + if (Stream* nextStream = newStream->playPairStream()) { + lock.lock(); + ALOGV("%s: starting streamID:%d", __func__, nextStream->getStreamID()); + addToActiveQueue_l(nextStream); + } else { + lock.lock(); + mAvailableStreams.insert(newStream); + streamID = 0; + } + mProcessingStreams.erase(newStream); + } else { + launchThread = moveToRestartQueue_l(newStream) && needMoreThreads_l(); + } + sanityCheckQueue_l(); + ALOGV("%s: mStreamManagerLock released", __func__); + } // lock + + if (launchThread) { + const int32_t id __unused = mThreadPool->launch([this](int32_t id) { run(id); }); + ALOGV_IF(id != 0, "%s: launched thread %d", __func__, id); + } + ALOGV("%s: returning %d", __func__, streamID); + return streamID; +} + +void StreamManager::moveToRestartQueue( + Stream* stream, int32_t activeStreamIDToMatch) +{ + ALOGV("%s(stream(ID)=%d, activeStreamIDToMatch=%d)", + __func__, stream->getStreamID(), activeStreamIDToMatch); + bool restart; + { + std::lock_guard lock(mStreamManagerLock); + sanityCheckQueue_l(); + if (mProcessingStreams.count(stream) > 0 || + mProcessingStreams.count(stream->getPairStream()) > 0) { + ALOGD("%s: attempting to restart processing stream(%d)", + __func__, stream->getStreamID()); + restart = false; + } else { + moveToRestartQueue_l(stream, activeStreamIDToMatch); + restart = needMoreThreads_l(); + } + sanityCheckQueue_l(); + } + if (restart) { + const int32_t id __unused = mThreadPool->launch([this](int32_t id) { run(id); }); + ALOGV_IF(id != 0, "%s: launched thread %d", __func__, id); + } +} + +bool StreamManager::moveToRestartQueue_l( + Stream* stream, int32_t activeStreamIDToMatch) +{ + ALOGV("%s(stream(ID)=%d, activeStreamIDToMatch=%d)", + __func__, stream->getStreamID(), activeStreamIDToMatch); + if (activeStreamIDToMatch > 0 && stream->getStreamID() != activeStreamIDToMatch) { + return false; + } + const ssize_t found = removeFromQueues_l(stream, activeStreamIDToMatch); + if (found < 0) return false; + + LOG_ALWAYS_FATAL_IF(found > 1, "stream on %zd > 1 stream lists", found); + + addToRestartQueue_l(stream); + mStreamManagerCondition.notify_one(); + return true; +} + +ssize_t StreamManager::removeFromQueues_l( + Stream* stream, int32_t activeStreamIDToMatch) { + size_t found = 0; + for (auto it = mActiveStreams.begin(); it != mActiveStreams.end(); ++it) { + if (*it == stream) { + mActiveStreams.erase(it); // we erase the iterator and break (otherwise it not safe). + ++found; + break; + } + } + // activeStreamIDToMatch is nonzero indicates we proceed only if found. + if (found == 0 && activeStreamIDToMatch > 0) { + return -1; // special code: not present on active streams, ignore restart request + } + + for (auto it = mRestartStreams.begin(); it != mRestartStreams.end(); ++it) { + if (it->second == stream) { + mRestartStreams.erase(it); + ++found; + break; + } + } + found += mAvailableStreams.erase(stream); + + // streams on mProcessingStreams are undergoing processing by the StreamManager thread + // and do not participate in normal stream migration. + return found; +} + +void StreamManager::addToRestartQueue_l(Stream *stream) { + mRestartStreams.emplace(stream->getStopTimeNs(), stream); +} + +void StreamManager::addToActiveQueue_l(Stream *stream) { + if (kStealActiveStream_OldestFirst) { + mActiveStreams.push_back(stream); // oldest to newest + } else { + mActiveStreams.push_front(stream); // newest to oldest + } +} + +void StreamManager::run(int32_t id) +{ + ALOGV("%s(%d) entering", __func__, id); + int64_t waitTimeNs = kWaitTimeBeforeCloseNs; + std::unique_lock lock(mStreamManagerLock); + while (!mQuit) { + mStreamManagerCondition.wait_for( + lock, std::chrono::duration<int64_t, std::nano>(waitTimeNs)); + ALOGV("%s(%d) awake", __func__, id); + + sanityCheckQueue_l(); + + if (mQuit || (mRestartStreams.empty() && waitTimeNs == kWaitTimeBeforeCloseNs)) { + break; // end the thread + } + + waitTimeNs = kWaitTimeBeforeCloseNs; + while (!mQuit && !mRestartStreams.empty()) { + const nsecs_t nowNs = systemTime(); + auto it = mRestartStreams.begin(); + Stream* const stream = it->second; + const int64_t diffNs = stream->getStopTimeNs() - nowNs; + if (diffNs > 0) { + waitTimeNs = std::min(waitTimeNs, diffNs); + break; + } + mRestartStreams.erase(it); + mProcessingStreams.emplace(stream); + lock.unlock(); + stream->stop(); + ALOGV("%s(%d) stopping streamID:%d", __func__, id, stream->getStreamID()); + if (Stream* nextStream = stream->playPairStream()) { + ALOGV("%s(%d) starting streamID:%d", __func__, id, nextStream->getStreamID()); + lock.lock(); + if (nextStream->getStopTimeNs() > 0) { + // the next stream was stopped before we can move it to the active queue. + ALOGV("%s(%d) stopping started streamID:%d", + __func__, id, nextStream->getStreamID()); + moveToRestartQueue_l(nextStream); + } else { + addToActiveQueue_l(nextStream); + } + } else { + lock.lock(); + mAvailableStreams.insert(stream); + } + mProcessingStreams.erase(stream); + sanityCheckQueue_l(); + } + } + ALOGV("%s(%d) exiting", __func__, id); +} + +void StreamManager::dump() const +{ + forEach([](const Stream *stream) { stream->dump(); }); +} + +void StreamManager::sanityCheckQueue_l() const +{ + // We want to preserve the invariant that each stream pair is exactly on one of the queues. + const size_t availableStreams = mAvailableStreams.size(); + const size_t restartStreams = mRestartStreams.size(); + const size_t activeStreams = mActiveStreams.size(); + const size_t processingStreams = mProcessingStreams.size(); + const size_t managedStreams = availableStreams + restartStreams + activeStreams + + processingStreams; + const size_t totalStreams = getStreamMapSize() >> 1; + LOG_ALWAYS_FATAL_IF(managedStreams != totalStreams, + "%s: mAvailableStreams:%zu + mRestartStreams:%zu + " + "mActiveStreams:%zu + mProcessingStreams:%zu = %zu != total streams %zu", + __func__, availableStreams, restartStreams, activeStreams, processingStreams, + managedStreams, totalStreams); + ALOGV("%s: mAvailableStreams:%zu + mRestartStreams:%zu + " + "mActiveStreams:%zu + mProcessingStreams:%zu = %zu (total streams: %zu)", + __func__, availableStreams, restartStreams, activeStreams, processingStreams, + managedStreams, totalStreams); +} + +} // namespace android::soundpool diff --git a/media/jni/soundpool/StreamManager.h b/media/jni/soundpool/StreamManager.h new file mode 100644 index 000000000000..8c98ac992f75 --- /dev/null +++ b/media/jni/soundpool/StreamManager.h @@ -0,0 +1,467 @@ +/* + * 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. + */ + +#pragma once + +#include "Stream.h" + +#include <condition_variable> +#include <future> +#include <list> +#include <map> +#include <memory> +#include <mutex> +#include <unordered_set> +#include <vector> + +#include <utils/AndroidThreads.h> + +namespace android::soundpool { + +// TODO: Move helper classes to a utility file, with separate test. + +/** + * JavaThread is used like std::thread but for threads that may call the JVM. + * + * std::thread does not easily attach to the JVM. We need JVM capable threads + * from createThreadEtc() since android binder call optimization may attempt to + * call back into Java if the SoundPool runs in system server. + * + * + * No locking is required - the member variables are inherently thread-safe. + */ +class JavaThread { +public: + JavaThread(std::function<void()> f, const char *name) + : mF{std::move(f)} { + createThreadEtc(staticFunction, this, name); + } + + JavaThread(JavaThread &&) = delete; // uses "this" ptr, not moveable. + + void join() const { + mFuture.wait(); + } + + bool isClosed() const { + return mIsClosed; + } + +private: + static int staticFunction(void *data) { + JavaThread *jt = static_cast<JavaThread *>(data); + jt->mF(); + jt->mIsClosed = true; + jt->mPromise.set_value(); + return 0; + } + + // No locking is provided as these variables are initialized in the constructor + // and the members referenced are thread-safe objects. + // (mFuture.wait() can block multiple threads.) + // Note the order of member variables is reversed for destructor. + const std::function<void()> mF; + // Used in join() to block until the thread completes. + // See https://en.cppreference.com/w/cpp/thread/promise for the void specialization of + // promise. + std::promise<void> mPromise; + std::future<void> mFuture{mPromise.get_future()}; + std::atomic_bool mIsClosed = false; +}; + +/** + * The ThreadPool manages thread lifetimes of SoundPool worker threads. + * + * TODO: the (eventual) goal of ThreadPool is to transparently and cooperatively + * maximize CPU utilization while avoiding starvation of other applications. + * Some possibilities: + * + * We should create worker threads when we have SoundPool work and the system is idle. + * CPU cycles are "use-it-or-lose-it" when the system is idle. + * + * We should adjust the priority of worker threads so that the second (and subsequent) worker + * threads have lower priority (should we try to promote priority also?). + * + * We should throttle the spawning of new worker threads, spacing over time, to avoid + * creating too many new threads all at once, on initialization. + */ +class ThreadPool { +public: + ThreadPool(size_t maxThreadCount, std::string name) + : mMaxThreadCount(maxThreadCount) + , mName{std::move(name)} { } + + ~ThreadPool() { quit(); } + + size_t getActiveThreadCount() const { return mActiveThreadCount; } + size_t getMaxThreadCount() const { return mMaxThreadCount; } + + void quit() { + std::list<std::unique_ptr<JavaThread>> threads; + { + std::lock_guard lock(mThreadLock); + if (mQuit) return; // already joined. + mQuit = true; + threads = std::move(mThreads); + mThreads.clear(); + } + // mQuit set under lock, no more threads will be created. + for (auto &thread : threads) { + thread->join(); + thread.reset(); + } + LOG_ALWAYS_FATAL_IF(mActiveThreadCount != 0, + "Invalid Active Threads: %zu", (size_t)mActiveThreadCount); + } + + // returns a non-zero id if successful, the id is to help logging messages. + int32_t launch(std::function<void(int32_t /* id */)> f) { + std::list<std::unique_ptr<JavaThread>> threadsToRelease; // release outside of lock. + std::lock_guard lock(mThreadLock); + if (mQuit) return 0; // ignore if we have quit + + // clean up threads. + for (auto it = mThreads.begin(); it != mThreads.end(); ) { + if ((*it)->isClosed()) { + threadsToRelease.emplace_back(std::move(*it)); + it = mThreads.erase(it); + } else { + ++it; + } + } + + const size_t threadCount = mThreads.size(); + if (threadCount < mMaxThreadCount) { + // if the id wraps, we don't care about collisions. it's just for logging. + mNextThreadId = mNextThreadId == INT32_MAX ? 1 : ++mNextThreadId; + const int32_t id = mNextThreadId; + mThreads.emplace_back(std::make_unique<JavaThread>( + [this, id, mf = std::move(f)] { mf(id); --mActiveThreadCount; }, + (mName + std::to_string(id)).c_str())); + ++mActiveThreadCount; + return id; + } + return 0; + } + + // TODO: launch only if load average is low. + // This gets the load average + // See also std::thread::hardware_concurrency() for the concurrent capability. + static double getLoadAvg() { + double loadAvg[1]; + if (getloadavg(loadAvg, std::size(loadAvg)) > 0) { + return loadAvg[0]; + } + return -1.; + } + +private: + const size_t mMaxThreadCount; + const std::string mName; + + std::atomic_size_t mActiveThreadCount = 0; + + std::mutex mThreadLock; + bool mQuit = false; // GUARDED_BY(mThreadLock) + int32_t mNextThreadId = 0; // GUARDED_BY(mThreadLock) + std::list<std::unique_ptr<JavaThread>> mThreads; // GUARDED_BY(mThreadLock) +}; + +/** + * A Perfect HashTable for IDs (key) to pointers (value). + * + * There are no collisions. Why? because we generate the IDs for you to look up :-). + * + * The goal of this hash table is to map an integer ID handle > 0 to a pointer. + * We give these IDs in monotonic order (though we may skip if it were to cause a collision). + * + * The size of the hashtable must be large enough to accommodate the max number of keys. + * We suggest 2x. + * + * Readers are lockless + * Single writer could be lockless, but we allow multiple writers through an internal lock. + * + * For the Key type K, valid keys generated are > 0 (signed or unsigned) + * For the Value type V, values are pointers - nullptr means empty. + */ +template <typename K, typename V> +class PerfectHash { +public: + PerfectHash(size_t hashCapacity) + : mHashCapacity(hashCapacity) + , mK2V{new std::atomic<V>[hashCapacity]()} { + } + + // Generate a key for a value V. + // There is a testing function getKforV() which checks what the value reports as its key. + // + // Calls back into getKforV under lock. + // + // We expect that the hashCapacity is 2x the number of stored keys in order + // to have one or two tries to find an empty slot + K generateKey(V value, std::function<K(V)> getKforV, K oldKey = 0) { + std::lock_guard lock(mHashLock); + // try to remove the old key. + if (oldKey > 0) { // key valid + const V v = getValue(oldKey); + if (v != nullptr) { // value still valid + const K atPosition = getKforV(v); + if (atPosition < 0 || // invalid value + atPosition == oldKey || // value's key still valid and matches old key + ((atPosition ^ oldKey) & (mHashCapacity - 1)) != 0) { // stale key entry + getValue(oldKey) = nullptr; // invalidate + } + } // else if value is invalid, no need to invalidate. + } + // check if we are invalidating only. + if (value == nullptr) return 0; + // now insert the new value and return the key. + size_t tries = 0; + for (; tries < mHashCapacity; ++tries) { + mNextKey = mNextKey == std::numeric_limits<K>::max() ? 1 : mNextKey + 1; + const V v = getValue(mNextKey); + //ALOGD("tries: %zu, key:%d value:%p", tries, (int)mNextKey, v); + if (v == nullptr) break; // empty + const K atPosition = getKforV(v); + //ALOGD("tries: %zu key atPosition:%d", tries, (int)atPosition); + if (atPosition < 0 || // invalid value + ((atPosition ^ mNextKey) & (mHashCapacity - 1)) != 0) { // stale key entry + break; + } + } + LOG_ALWAYS_FATAL_IF(tries == mHashCapacity, "hash table overflow!"); + //ALOGD("%s: found after %zu tries", __func__, tries); + getValue(mNextKey) = value; + return mNextKey; + } + + std::atomic<V> &getValue(K key) { return mK2V[key & (mHashCapacity - 1)]; } + const std::atomic_int32_t &getValue(K key) const { return mK2V[key & (mHashCapacity - 1)]; } + +private: + mutable std::mutex mHashLock; + const size_t mHashCapacity; // size of mK2V no lock needed. + std::unique_ptr<std::atomic<V>[]> mK2V; // no lock needed for read access. + K mNextKey{}; // GUARDED_BY(mHashLock) +}; + +/** + * StreamMap contains the all the valid streams available to SoundPool. + * + * There is no Lock required for this class because the streams are + * allocated in the constructor, the lookup is lockless, and the Streams + * returned are locked internally. + * + * The lookup uses a perfect hash. + * It is possible to use a lockless hash table or to use a stripe-locked concurrent + * hashmap for essentially lock-free lookup. + * + * This follows Map-Reduce parallelism model. + * https://en.wikipedia.org/wiki/MapReduce + * + * Conceivably the forEach could be parallelized using std::for_each with a + * std::execution::par policy. + * + * https://en.cppreference.com/w/cpp/algorithm/for_each + */ +class StreamMap { +public: + explicit StreamMap(int32_t streams); + + // Returns the stream associated with streamID or nullptr if not found. + // This need not be locked. + // The stream ID will never migrate to another Stream, but it may change + // underneath you. The Stream operations that take a streamID will confirm + // that the streamID matches under the Stream lock before executing otherwise + // it ignores the command as stale. + Stream* findStream(int32_t streamID) const; + + // Iterates through the stream pool applying the function f. + // Since this enumerates over every single stream, it is unlocked. + // + // See related: https://en.cppreference.com/w/cpp/algorithm/for_each + void forEach(std::function<void(const Stream *)>f) const { + for (size_t i = 0; i < mStreamPoolSize; ++i) { + f(&mStreamPool[i]); + } + } + + void forEach(std::function<void(Stream *)>f) { + for (size_t i = 0; i < mStreamPoolSize; ++i) { + f(&mStreamPool[i]); + } + } + + // Returns the pair stream for a given Stream. + // This need not be locked as it is a property of the pointer address. + Stream* getPairStream(const Stream* stream) const { + const size_t index = streamPosition(stream); + return &mStreamPool[index ^ 1]; + } + + // find the position of the stream in mStreamPool array. + size_t streamPosition(const Stream* stream) const; // no lock needed + + size_t getStreamMapSize() const { + return mStreamPoolSize; + } + + // find the next valid ID for a stream and store in hash table. + int32_t getNextIdForStream(Stream* stream) const; + +private: + + // use the hash table to attempt to find the stream. + // nullptr is returned if the lookup fails. + Stream* lookupStreamFromId(int32_t streamID) const; + + // The stream pool is initialized in the constructor, effectively const. + // no locking required for access. + // + // The constructor parameter "streams" results in streams pairs of streams. + // We have twice as many streams because we wish to return a streamID "handle" + // back to the app immediately, while we may be stopping the other stream in the + // pair to get its AudioTrack :-). + // + // Of the stream pair, only one of the streams may have an AudioTrack. + // The fixed association of a stream pair allows callbacks from the AudioTrack + // to be associated properly to either one or the other of the stream pair. + // + // TODO: The stream pair arrangement can be removed if we have better AudioTrack + // callback handling (being able to remove and change the callback after construction). + // + // Streams may be accessed anytime off of the stream pool + // as there is internal locking on each stream. + std::unique_ptr<Stream[]> mStreamPool; // no lock needed for access. + size_t mStreamPoolSize; // no lock needed for access. + + // In order to find the Stream from a StreamID, we could do a linear lookup in mStreamPool. + // As an alternative, one could use stripe-locked or lock-free concurrent hashtables. + // + // When considering linear search vs hashmap, verify the typical use-case size. + // Linear search is faster than std::unordered_map (circa 2018) for less than 40 elements. + // [ Skarupke, M. (2018), "You Can Do Better than std::unordered_map: New and Recent + // Improvements to Hash Table Performance." C++Now 2018. cppnow.org, see + // https://www.youtube.com/watch?v=M2fKMP47slQ ] + // + // Here, we use a PerfectHash of Id to Stream *, since we can control the + // StreamID returned to the user. This allows O(1) read access to mStreamPool lock-free. + // + // We prefer that the next stream ID is monotonic for aesthetic reasons + // (if we didn't care about monotonicity, a simple method is to apply a generation count + // to each stream in the unused upper bits of its index in mStreamPool for the id). + // + std::unique_ptr<PerfectHash<int32_t, Stream *>> mPerfectHash; +}; + +/** + * StreamManager is used to manage the streams (accessed by StreamID from Java). + * + * Locking order (proceeds from application to component). + * SoundPool mApiLock (if needed) -> StreamManager mStreamManagerLock + * -> pair Stream mLock -> queued Stream mLock + */ +class StreamManager : public StreamMap { +public: + // Note: the SoundPool pointer is only used for stream initialization. + // It is not stored in StreamManager. + StreamManager(int32_t streams, size_t threads, const audio_attributes_t* attributes); + ~StreamManager(); + + // Returns positive streamID on success, 0 on failure. This is locked. + int32_t queueForPlay(const std::shared_ptr<Sound> &sound, + int32_t soundID, float leftVolume, float rightVolume, + int32_t priority, int32_t loop, float rate); + + /////////////////////////////////////////////////////////////////////// + // Called from soundpool::Stream + + const audio_attributes_t* getAttributes() const { return &mAttributes; } + + // Moves the stream to the restart queue (called upon BUFFER_END of the static track) + // this is locked internally. + // If activeStreamIDToMatch is nonzero, it will only move to the restart queue + // if the streamIDToMatch is found on the active queue. + void moveToRestartQueue(Stream* stream, int32_t activeStreamIDToMatch = 0); + +private: + + void run(int32_t id); // worker thread, takes lock internally. + void dump() const; // no lock needed + + // returns true if more worker threads are needed. + bool needMoreThreads_l() { + return mRestartStreams.size() > 0 && + (mThreadPool->getActiveThreadCount() == 0 + || std::distance(mRestartStreams.begin(), + mRestartStreams.upper_bound(systemTime())) + > (ptrdiff_t)mThreadPool->getActiveThreadCount()); + } + + // returns true if the stream was added. + bool moveToRestartQueue_l(Stream* stream, int32_t activeStreamIDToMatch = 0); + // returns number of queues the stream was removed from (should be 0 or 1); + // a special code of -1 is returned if activeStreamIDToMatch is > 0 and + // the stream wasn't found on the active queue. + ssize_t removeFromQueues_l(Stream* stream, int32_t activeStreamIDToMatch = 0); + void addToRestartQueue_l(Stream *stream); + void addToActiveQueue_l(Stream *stream); + void sanityCheckQueue_l() const; + + const audio_attributes_t mAttributes; + std::unique_ptr<ThreadPool> mThreadPool; // locked internally + + // mStreamManagerLock is used to lock access for transitions between the + // 4 stream queues by the Manager Thread or by the user initiated play(). + // A stream pair has exactly one stream on exactly one of the queues. + std::mutex mStreamManagerLock; + std::condition_variable mStreamManagerCondition; + + bool mQuit = false; // GUARDED_BY(mStreamManagerLock) + + // There are constructor arg "streams" pairs of streams, only one of each + // pair on the 4 stream queues below. The other stream in the pair serves as + // placeholder to accumulate user changes, pending actual availability of the + // AudioTrack, as it may be in use, requiring stop-then-restart. + // + // The 4 queues are implemented in the appropriate STL container based on perceived + // optimality. + + // 1) mRestartStreams: Streams awaiting stop. + // The paired stream may be active (but with no AudioTrack), and will be restarted + // with an active AudioTrack when the current stream is stopped. + std::multimap<int64_t /* stopTimeNs */, Stream*> + mRestartStreams; // GUARDED_BY(mStreamManagerLock) + + // 2) mActiveStreams: Streams that are active. + // The paired stream will be inactive. + // This is in order of specified by kStealActiveStream_OldestFirst + std::list<Stream*> mActiveStreams; // GUARDED_BY(mStreamManagerLock) + + // 3) mAvailableStreams: Streams that are inactive. + // The paired stream will also be inactive. + // No particular order. + std::unordered_set<Stream*> mAvailableStreams; // GUARDED_BY(mStreamManagerLock) + + // 4) mProcessingStreams: Streams that are being processed by the ManagerThreads + // When on this queue, the stream and its pair are not available for stealing. + // Each ManagerThread will have at most one stream on the mProcessingStreams queue. + // The paired stream may be active or restarting. + // No particular order. + std::unordered_set<Stream*> mProcessingStreams; // GUARDED_BY(mStreamManagerLock) +}; + +} // namespace android::soundpool diff --git a/media/jni/soundpool/tests/Android.bp b/media/jni/soundpool/tests/Android.bp new file mode 100644 index 000000000000..96ec4e5d5913 --- /dev/null +++ b/media/jni/soundpool/tests/Android.bp @@ -0,0 +1,28 @@ +cc_binary { + name: "soundpool_stress", + host_supported: false, + + include_dirs: [ + "frameworks/base/media/jni/" + ], + + shared_libs: [ + "libaudioutils", + "libbinder", + "liblog", + "libmedia", + "libsoundpool", + "libstagefright", + "libutils", + ], + + srcs: [ + "soundpool_stress.cpp" + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], +} diff --git a/media/jni/soundpool/tests/build_and_run.sh b/media/jni/soundpool/tests/build_and_run.sh new file mode 100755 index 000000000000..741f2efbfddb --- /dev/null +++ b/media/jni/soundpool/tests/build_and_run.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# +# Run samples from this directory +# + +if [ -z "$ANDROID_BUILD_TOP" ]; then + echo "Android build environment not set" + exit -1 +fi + +# ensure we have mm +. $ANDROID_BUILD_TOP/build/envsetup.sh + +mm + +echo "waiting for device" + +adb root && adb wait-for-device remount + +echo "========================================" +echo "testing soundpool_stress" +uidir="/product/media/audio/notifications" +adb push $OUT/system/bin/soundpool_stress /system/bin + +# test SoundPool playback of all the UI sound samples (loaded twice) looping 10s 1 thread. +#adb shell /system/bin/soundpool_stress -l -1 $uidir/*.ogg $uidir/*.ogg + +# performance test SoundPool playback of all the UI sound samples (x2) +# 1 iterations, looping, 1 second playback, 4 threads. +adb shell /system/bin/soundpool_stress -i 1 -l -1 -p 1 -t 4 $uidir/*.ogg $uidir/*.ogg diff --git a/media/jni/soundpool/tests/soundpool_stress.cpp b/media/jni/soundpool/tests/soundpool_stress.cpp new file mode 100644 index 000000000000..212662fb6b96 --- /dev/null +++ b/media/jni/soundpool/tests/soundpool_stress.cpp @@ -0,0 +1,309 @@ +/* + * Copyright (C) 2014 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_NDEBUG 0 +#define LOG_TAG "soundpool" + +#include <fcntl.h> +#include <stdio.h> +#include <sys/stat.h> + +#include <atomic> +#include <future> +#include <mutex> +#include <set> +#include <vector> + +#include <audio_utils/clock.h> +#include <binder/ProcessState.h> +#include <media/stagefright/MediaExtractorFactory.h> +#include <soundpool/SoundPool.h> // direct include, this is not an NDK feature. +#include <system/audio.h> +#include <utils/Log.h> + +using namespace android; + +// Errors and diagnostic messages all go to stdout. + +namespace { + +void usage(const char *name) +{ + printf("Usage: %s " + "[-i #iterations] [-l #loop] [-p #playback_seconds] [-s #streams] [-t #threads] " + "[-z #snoozeSec] <input-file>+\n", name); + printf("Uses soundpool to load and play a file (the first 10 seconds)\n"); + printf(" -i #iterations, default 1\n"); + printf(" -l #loop looping mode, -1 forever\n"); + printf(" -p #playback_seconds, default 10\n"); + printf(" -s #streams for concurrent sound playback, default 20\n"); + printf(" -t #threads, default 1\n"); + printf(" -z #snoozeSec after stopping, -1 forever, default 0\n"); + printf(" <input-file>+ files to be played\n"); +} + +std::atomic_int32_t gErrors{}; +std::atomic_int32_t gWarnings{}; + +void printEvent(const SoundPoolEvent *event) { + printf("{ msg:%d id:%d status:%d }\n", event->mMsg, event->mArg1, event->mArg2); +} + +class CallbackManager { +public: + int32_t getNumberEvents(int32_t soundID) { + std::lock_guard lock(mLock); + return mEvents[soundID] > 0; + } + + void setSoundPool(SoundPool* soundPool) { + std::lock_guard lock(mLock); + mSoundPool = soundPool; + } + + void callback(SoundPoolEvent event, const SoundPool *soundPool) { + std::lock_guard lock(mLock); + printEvent(&event); + if (soundPool != mSoundPool) { + printf("ERROR: mismatched soundpool: %p\n", soundPool); + ++gErrors; + return; + } + if (event.mMsg != 1 /* SoundPoolEvent::SOUND_LOADED */) { + printf("ERROR: invalid event msg: %d\n", event.mMsg); + ++gErrors; + return; + } + if (event.mArg2 != 0) { + printf("ERROR: event status(%d) != 0\n", event.mArg2); + ++gErrors; + return; + } + if (event.mArg1 <= 0) { + printf("ERROR: event soundID(%d) < 0\n", event.mArg1); + ++gErrors; + return; + } + ++mEvents[event.mArg1]; + } + +private: + std::mutex mLock; + SoundPool *mSoundPool = nullptr; + std::map<int32_t /* soundID */, int32_t /* count */> mEvents; +} gCallbackManager; + + +void StaticCallbackManager(SoundPoolEvent event, SoundPool* soundPool, void* user) { + ((CallbackManager *)user)->callback(event, soundPool); +} + +void testStreams(SoundPool *soundPool, const std::vector<const char *> &filenames, + int loop, int playSec) +{ + const int64_t startTimeNs = systemTime(); + std::vector<int32_t> soundIDs; + for (auto filename : filenames) { + struct stat st; + if (stat(filename, &st) < 0) { + printf("ERROR: cannot stat %s\n", filename); + return; + } + const uint64_t length = uint64_t(st.st_size); + const int inp = open(filename, O_RDONLY); + if (inp < 0) { + printf("ERROR: cannot open %s\n", filename); + return; + } + printf("loading (%s) size (%llu)\n", filename, (unsigned long long)length); + const int32_t soundID = soundPool->load( + inp, 0 /*offset*/, length, 0 /*priority - unused*/); + if (soundID == 0) { + printf("ERROR: cannot load %s\n", filename); + return; + } + close(inp); + soundIDs.emplace_back(soundID); + printf("loaded %s soundID(%d)\n", filename, soundID); + } + const int64_t requestLoadTimeNs = systemTime(); + printf("\nrequestLoadTimeMs: %d\n", + (int)((requestLoadTimeNs - startTimeNs) / NANOS_PER_MILLISECOND)); + + // create stream & get Id (playing) + const float maxVol = 1.f; + const float silentVol = 0.f; + const int priority = 0; // lowest + const float rate = 1.f; // normal + + // Loading is done by a SoundPool Worker thread. + // TODO: Use SoundPool::setCallback() for wait + + for (int32_t soundID : soundIDs) { + while (true) { + const int32_t streamID = + soundPool->play(soundID, silentVol, silentVol, priority, 0 /*loop*/, rate); + if (streamID != 0) { + const int32_t events = gCallbackManager.getNumberEvents(soundID); + if (events != 1) { + printf("WARNING: successful play for streamID:%d soundID:%d" + " but callback events(%d) != 1\n", streamID, soundID, events); + ++gWarnings; + } + soundPool->stop(streamID); + break; + } + usleep(1000); + } + printf("[%d]", soundID); + fflush(stdout); + } + + const int64_t loadTimeNs = systemTime(); + printf("\nloadTimeMs: %d\n", (int)((loadTimeNs - startTimeNs) / NANOS_PER_MILLISECOND)); + + // check and play (overlap with above). + std::vector<int32_t> streamIDs; + for (int32_t soundID : soundIDs) { + printf("\nplaying soundID=%d", soundID); + const int32_t streamID = soundPool->play(soundID, maxVol, maxVol, priority, loop, rate); + if (streamID == 0) { + printf(" failed! ERROR"); + ++gErrors; + } else { + printf(" streamID=%d", streamID); + streamIDs.emplace_back(streamID); + } + } + const int64_t playTimeNs = systemTime(); + printf("\nplayTimeMs: %d\n", (int)((playTimeNs - loadTimeNs) / NANOS_PER_MILLISECOND)); + + for (int i = 0; i < playSec; ++i) { + sleep(1); + printf("."); + fflush(stdout); + } + + for (int32_t streamID : streamIDs) { + soundPool->stop(streamID); + } + + for (int32_t soundID : soundIDs) { + soundPool->unload(soundID); + } + printf("\nDone!\n"); +} + +} // namespace + +int main(int argc, char *argv[]) +{ + const char * const me = argv[0]; + + int iterations = 1; + int loop = 0; // disable looping + int maxStreams = 40; // change to have more concurrent playback streams + int playSec = 10; + int snoozeSec = 0; + int threadCount = 1; + for (int ch; (ch = getopt(argc, argv, "i:l:p:s:t:z:")) != -1; ) { + switch (ch) { + case 'i': + iterations = atoi(optarg); + break; + case 'l': + loop = atoi(optarg); + break; + case 'p': + playSec = atoi(optarg); + break; + case 's': + maxStreams = atoi(optarg); + break; + case 't': + threadCount = atoi(optarg); + break; + case 'z': + snoozeSec = atoi(optarg); + break; + default: + usage(me); + return EXIT_FAILURE; + } + } + + argc -= optind; + argv += optind; + if (argc <= 0) { + usage(me); + return EXIT_FAILURE; + } + + std::vector<const char *> filenames(argv, argv + argc); + + android::ProcessState::self()->startThreadPool(); + + // O and later requires data sniffer registration for proper file type detection + MediaExtractorFactory::LoadExtractors(); + + // create soundpool + audio_attributes_t aa = { + .content_type = AUDIO_CONTENT_TYPE_MUSIC, + .usage = AUDIO_USAGE_MEDIA, + }; + auto soundPool = std::make_unique<SoundPool>(maxStreams, &aa); + + gCallbackManager.setSoundPool(soundPool.get()); + soundPool->setCallback(StaticCallbackManager, &gCallbackManager); + + const int64_t startTimeNs = systemTime(); + + for (int it = 0; it < iterations; ++it) { + // One instance: + // testStreams(soundPool.get(), filenames, loop, playSec); + + // Test multiple instances + std::vector<std::future<void>> threads(threadCount); + printf("testing %zu threads\n", threads.size()); + for (auto &thread : threads) { + thread = std::async(std::launch::async, + [&]{ testStreams(soundPool.get(), filenames, loop, playSec);}); + } + // automatically joins. + } + + const int64_t endTimeNs = systemTime(); + + // snooze before cleaning up to examine soundpool dumpsys state after stop + for (int i = 0; snoozeSec < 0 || i < snoozeSec; ++i) { + printf("z"); + fflush(stdout); + sleep(1); + }; + + gCallbackManager.setSoundPool(nullptr); + soundPool.reset(); + + printf("total time in ms: %lld\n", (endTimeNs - startTimeNs) / NANOS_PER_MILLISECOND); + if (gWarnings != 0) { + printf("%d warnings!\n", gWarnings.load()); + } + if (gErrors != 0) { + printf("%d errors!\n", gErrors.load()); + return EXIT_FAILURE; + } + return EXIT_SUCCESS; +} diff --git a/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml b/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml index 1cf48c5ffd0b..0f964fd56285 100644 --- a/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml +++ b/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml @@ -31,14 +31,15 @@ android:paddingStart="@*android:dimen/car_padding_5" android:paddingEnd="@*android:dimen/car_padding_5"> - <com.android.systemui.navigationbar.car.CarNavigationButton + <com.android.systemui.navigationbar.car.CarFacetButton android:id="@+id/home" android:layout_width="@*android:dimen/car_touch_target_size" android:layout_height="match_parent" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/car_ic_overview" + systemui:icon="@drawable/car_ic_overview" systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" - /> + systemui:selectedIcon="@drawable/car_ic_overview_selected" + systemui:useMoreIcon="false"/> </LinearLayout> </com.android.systemui.navigationbar.car.CarNavigationBarView> diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java index 6fba1d516c73..63bc66afddf8 100644 --- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java @@ -25,7 +25,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.view.Display; import android.view.Gravity; -import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; @@ -37,8 +36,6 @@ import com.android.systemui.dagger.qualifiers.MainHandler; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.NavigationBarController; -import com.android.systemui.statusbar.car.hvac.HvacController; -import com.android.systemui.statusbar.car.hvac.TemperatureView; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -52,15 +49,13 @@ import dagger.Lazy; /** Navigation bars customized for the automotive use case. */ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks { - private final NavigationBarViewFactory mNavigationBarViewFactory; + private final CarNavigationBarController mCarNavigationBarController; private final WindowManager mWindowManager; private final DeviceProvisionedController mDeviceProvisionedController; private final Lazy<FacetButtonTaskStackListener> mFacetButtonTaskStackListener; private final Handler mMainHandler; private final Lazy<KeyguardStateController> mKeyguardStateController; - private final Lazy<CarFacetButtonController> mFacetButtonController; private final Lazy<NavigationBarController> mNavigationBarController; - private final Lazy<HvacController> mHvacController; private IStatusBarService mBarService; private CommandQueue mCommandQueue; @@ -82,33 +77,23 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks // it's open. private boolean mDeviceIsSetUpForUser = true; - // Configuration values for if nav bars should be shown. - private boolean mShowBottom; - private boolean mShowLeft; - private boolean mShowRight; - - @Inject public CarNavigationBar(Context context, - NavigationBarViewFactory navigationBarViewFactory, + CarNavigationBarController carNavigationBarController, WindowManager windowManager, DeviceProvisionedController deviceProvisionedController, Lazy<FacetButtonTaskStackListener> facetButtonTaskStackListener, @MainHandler Handler mainHandler, Lazy<KeyguardStateController> keyguardStateController, - Lazy<CarFacetButtonController> facetButtonController, - Lazy<NavigationBarController> navigationBarController, - Lazy<HvacController> hvacController) { + Lazy<NavigationBarController> navigationBarController) { super(context); - mNavigationBarViewFactory = navigationBarViewFactory; + mCarNavigationBarController = carNavigationBarController; mWindowManager = windowManager; mDeviceProvisionedController = deviceProvisionedController; mFacetButtonTaskStackListener = facetButtonTaskStackListener; mMainHandler = mainHandler; mKeyguardStateController = keyguardStateController; - mFacetButtonController = facetButtonController; mNavigationBarController = navigationBarController; - mHvacController = hvacController; } @Override @@ -118,11 +103,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks com.android.internal.R.bool.config_automotiveHideNavBarForKeyboard); mBottomNavBarVisible = false; - // Read configuration. - mShowBottom = mContext.getResources().getBoolean(R.bool.config_enableBottomNavigationBar); - mShowLeft = mContext.getResources().getBoolean(R.bool.config_enableLeftNavigationBar); - mShowRight = mContext.getResources().getBoolean(R.bool.config_enableRightNavigationBar); - // Get bar service. mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); @@ -157,7 +137,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks mActivityManagerWrapper = ActivityManagerWrapper.getInstance(); mActivityManagerWrapper.registerTaskStackListener(mFacetButtonTaskStackListener.get()); - mHvacController.get().connectToCarService(); + mCarNavigationBarController.connectToHvac(); } private void restartNavBarsIfNecessary() { @@ -175,8 +155,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks private void restartNavBars() { // remove and reattach all hvac components such that we don't keep a reference to unused // ui elements - mHvacController.get().removeAllComponents(); - mFacetButtonController.get().removeAll(); + mCarNavigationBarController.removeAllFromHvac(); if (mNavigationBarWindow != null) { mNavigationBarWindow.removeAllViews(); @@ -199,10 +178,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks if (mKeyguardStateController.get().isShowing()) { updateNavBarForKeyguardContent(); } - - // CarFacetButtonController was reset therefore we need to re-add the status bar elements - // to the controller. - // TODO(hseog): Add facet buttons in status bar to controller. } private void createNavigationBar(RegisterStatusBarResult result) { @@ -224,54 +199,30 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks } private void buildNavBarWindows() { - if (mShowBottom) { - mNavigationBarWindow = mNavigationBarViewFactory.getBottomWindow(); - } - - if (mShowLeft) { - mLeftNavigationBarWindow = mNavigationBarViewFactory.getLeftWindow(); - } - - if (mShowRight) { - mRightNavigationBarWindow = mNavigationBarViewFactory.getRightWindow(); - } + mNavigationBarWindow = mCarNavigationBarController.getBottomWindow(); + mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow(); + mRightNavigationBarWindow = mCarNavigationBarController.getRightWindow(); } private void buildNavBarContent() { - if (mShowBottom) { - mNavigationBarView = mNavigationBarViewFactory.getBottomBar(mDeviceIsSetUpForUser); + mNavigationBarView = mCarNavigationBarController.getBottomBar(mDeviceIsSetUpForUser); + if (mNavigationBarView != null) { mNavigationBarWindow.addView(mNavigationBarView); - addTemperatureViewToController(mNavigationBarView); } - if (mShowLeft) { - mLeftNavigationBarView = mNavigationBarViewFactory.getLeftBar(mDeviceIsSetUpForUser); + mLeftNavigationBarView = mCarNavigationBarController.getLeftBar(mDeviceIsSetUpForUser); + if (mLeftNavigationBarView != null) { mLeftNavigationBarWindow.addView(mLeftNavigationBarView); - addTemperatureViewToController(mLeftNavigationBarView); } - if (mShowRight) { - mRightNavigationBarView = mNavigationBarViewFactory.getRightBar(mDeviceIsSetUpForUser); + mRightNavigationBarView = mCarNavigationBarController.getRightBar(mDeviceIsSetUpForUser); + if (mRightNavigationBarView != null) { mRightNavigationBarWindow.addView(mRightNavigationBarView); - // Add ability to toggle notification center. - addTemperatureViewToController(mRightNavigationBarView); - // Add ability to close notification center on touch. - } - } - - private void addTemperatureViewToController(View v) { - if (v instanceof TemperatureView) { - mHvacController.get().addHvacTextView((TemperatureView) v); - } else if (v instanceof ViewGroup) { - ViewGroup viewGroup = (ViewGroup) v; - for (int i = 0; i < viewGroup.getChildCount(); i++) { - addTemperatureViewToController(viewGroup.getChildAt(i)); - } } } private void attachNavBarWindows() { - if (mShowBottom && !mBottomNavBarVisible) { + if (mNavigationBarWindow != null && !mBottomNavBarVisible) { mBottomNavBarVisible = true; WindowManager.LayoutParams lp = new WindowManager.LayoutParams( @@ -287,7 +238,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks mWindowManager.addView(mNavigationBarWindow, lp); } - if (mShowLeft) { + if (mLeftNavigationBarWindow != null) { int width = mContext.getResources().getDimensionPixelSize( R.dimen.car_left_navigation_bar_width); WindowManager.LayoutParams leftlp = new WindowManager.LayoutParams( @@ -304,7 +255,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks leftlp.gravity = Gravity.LEFT; mWindowManager.addView(mLeftNavigationBarWindow, leftlp); } - if (mShowRight) { + if (mRightNavigationBarWindow != null) { int width = mContext.getResources().getDimensionPixelSize( R.dimen.car_right_navigation_bar_width); WindowManager.LayoutParams rightlp = new WindowManager.LayoutParams( @@ -340,23 +291,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks } boolean isKeyboardVisible = (vis & InputMethodService.IME_VISIBLE) != 0; - showBottomNavBarWindow(isKeyboardVisible); - } - - private void showBottomNavBarWindow(boolean isKeyboardVisible) { - if (!mShowBottom) { - return; - } - - // If keyboard is visible and bottom nav bar not visible, this is the correct state, so do - // nothing. Same with if keyboard is not visible and bottom nav bar is visible. - if (isKeyboardVisible ^ mBottomNavBarVisible) { - return; - } - - mNavigationBarViewFactory.getBottomWindow().setVisibility( - isKeyboardVisible ? View.GONE : View.VISIBLE); - mBottomNavBarVisible = !isKeyboardVisible; + mCarNavigationBarController.setBottomWindowVisibility(!isKeyboardVisible); } private void updateNavBarForKeyguardContent() { diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java new file mode 100644 index 000000000000..f59f886d487b --- /dev/null +++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarController.java @@ -0,0 +1,247 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.navigationbar.car; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.systemui.R; +import com.android.systemui.statusbar.car.hvac.HvacController; +import com.android.systemui.statusbar.car.hvac.TemperatureView; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import dagger.Lazy; + +/** A single class which controls the navigation bar views. */ +@Singleton +public class CarNavigationBarController { + + private final Context mContext; + private final NavigationBarViewFactory mNavigationBarViewFactory; + private final Lazy<HvacController> mHvacControllerLazy; + + private boolean mShowBottom; + private boolean mShowLeft; + private boolean mShowRight; + + private View.OnTouchListener mTopBarTouchListener; + private View.OnTouchListener mBottomBarTouchListener; + private View.OnTouchListener mLeftBarTouchListener; + private View.OnTouchListener mRightBarTouchListener; + private NotificationsShadeController mNotificationsShadeController; + + private CarNavigationBarView mTopView; + private CarNavigationBarView mBottomView; + private CarNavigationBarView mLeftView; + private CarNavigationBarView mRightView; + + @Inject + public CarNavigationBarController(Context context, + NavigationBarViewFactory navigationBarViewFactory, + Lazy<HvacController> hvacControllerLazy) { + mContext = context; + mNavigationBarViewFactory = navigationBarViewFactory; + mHvacControllerLazy = hvacControllerLazy; + + // Read configuration. + mShowBottom = mContext.getResources().getBoolean(R.bool.config_enableBottomNavigationBar); + mShowLeft = mContext.getResources().getBoolean(R.bool.config_enableLeftNavigationBar); + mShowRight = mContext.getResources().getBoolean(R.bool.config_enableRightNavigationBar); + } + + /** Connect to hvac service. */ + public void connectToHvac() { + mHvacControllerLazy.get().connectToCarService(); + } + + /** Clean up hvac. */ + public void removeAllFromHvac() { + mHvacControllerLazy.get().removeAllComponents(); + } + + /** Gets the bottom window if configured to do so. */ + @Nullable + public ViewGroup getBottomWindow() { + return mShowBottom ? mNavigationBarViewFactory.getBottomWindow() : null; + } + + /** Gets the left window if configured to do so. */ + @Nullable + public ViewGroup getLeftWindow() { + return mShowLeft ? mNavigationBarViewFactory.getLeftWindow() : null; + } + + /** Gets the right window if configured to do so. */ + @Nullable + public ViewGroup getRightWindow() { + return mShowRight ? mNavigationBarViewFactory.getRightWindow() : null; + } + + /** Toggles the bottom nav bar visibility. */ + public boolean setBottomWindowVisibility(boolean isVisible) { + return setWindowVisibility(getBottomWindow(), isVisible); + } + + /** Toggles the left nav bar visibility. */ + public boolean setLeftWindowVisibility(boolean isVisible) { + return setWindowVisibility(getLeftWindow(), isVisible); + } + + /** Toggles the right nav bar visibility. */ + public boolean setRightWindowVisibility(boolean isVisible) { + return setWindowVisibility(getRightWindow(), isVisible); + } + + private boolean setWindowVisibility(ViewGroup window, boolean isVisible) { + if (window == null) { + return false; + } + + int newVisibility = isVisible ? View.VISIBLE : View.GONE; + if (window.getVisibility() == newVisibility) { + return false; + } + + window.setVisibility(newVisibility); + return true; + } + + /** Gets the top navigation bar with the appropriate listeners set. */ + @NonNull + public CarNavigationBarView getTopBar(boolean isSetUp) { + mTopView = mNavigationBarViewFactory.getTopBar(isSetUp); + mTopView.setStatusBarWindowTouchListener(mTopBarTouchListener); + mTopView.setNotificationsPanelController(mNotificationsShadeController); + addTemperatureViewToController(mTopView); + return mTopView; + } + + /** Gets the bottom navigation bar with the appropriate listeners set. */ + @Nullable + public CarNavigationBarView getBottomBar(boolean isSetUp) { + if (!mShowBottom) { + return null; + } + + mBottomView = mNavigationBarViewFactory.getBottomBar(isSetUp); + mBottomView.setStatusBarWindowTouchListener(mBottomBarTouchListener); + mBottomView.setNotificationsPanelController(mNotificationsShadeController); + addTemperatureViewToController(mBottomView); + return mBottomView; + } + + /** Gets the left navigation bar with the appropriate listeners set. */ + @Nullable + public CarNavigationBarView getLeftBar(boolean isSetUp) { + if (!mShowLeft) { + return null; + } + + mLeftView = mNavigationBarViewFactory.getLeftBar(isSetUp); + mLeftView.setStatusBarWindowTouchListener(mLeftBarTouchListener); + mLeftView.setNotificationsPanelController(mNotificationsShadeController); + addTemperatureViewToController(mLeftView); + return mLeftView; + } + + /** Gets the right navigation bar with the appropriate listeners set. */ + @Nullable + public CarNavigationBarView getRightBar(boolean isSetUp) { + if (!mShowRight) { + return null; + } + + mRightView = mNavigationBarViewFactory.getRightBar(isSetUp); + mRightView.setStatusBarWindowTouchListener(mRightBarTouchListener); + mRightView.setNotificationsPanelController(mNotificationsShadeController); + addTemperatureViewToController(mRightView); + return mRightView; + } + + /** Sets a touch listener for the top navigation bar. */ + public void registerTopBarTouchListener(View.OnTouchListener listener) { + mTopBarTouchListener = listener; + if (mTopView != null) { + mTopView.setStatusBarWindowTouchListener(mTopBarTouchListener); + } + } + + /** Sets a touch listener for the bottom navigation bar. */ + public void registerBottomBarTouchListener(View.OnTouchListener listener) { + mBottomBarTouchListener = listener; + if (mBottomView != null) { + mBottomView.setStatusBarWindowTouchListener(mBottomBarTouchListener); + } + } + + /** Sets a touch listener for the left navigation bar. */ + public void registerLeftBarTouchListener(View.OnTouchListener listener) { + mLeftBarTouchListener = listener; + if (mLeftView != null) { + mLeftView.setStatusBarWindowTouchListener(mLeftBarTouchListener); + } + } + + /** Sets a touch listener for the right navigation bar. */ + public void registerRightBarTouchListener(View.OnTouchListener listener) { + mRightBarTouchListener = listener; + if (mRightView != null) { + mRightView.setStatusBarWindowTouchListener(mRightBarTouchListener); + } + } + + /** Sets a notification controller which toggles the notification panel. */ + public void registerNotificationController( + NotificationsShadeController notificationsShadeController) { + mNotificationsShadeController = notificationsShadeController; + if (mTopView != null) { + mTopView.setNotificationsPanelController(mNotificationsShadeController); + } + if (mBottomView != null) { + mBottomView.setNotificationsPanelController(mNotificationsShadeController); + } + if (mLeftView != null) { + mLeftView.setNotificationsPanelController(mNotificationsShadeController); + } + if (mRightView != null) { + mRightView.setNotificationsPanelController(mNotificationsShadeController); + } + } + + /** Interface for controlling the notifications shade. */ + public interface NotificationsShadeController { + /** Toggles the visibility of the notifications shade. */ + void togglePanel(); + } + + private void addTemperatureViewToController(View v) { + if (v instanceof TemperatureView) { + mHvacControllerLazy.get().addHvacTextView((TemperatureView) v); + } else if (v instanceof ViewGroup) { + ViewGroup viewGroup = (ViewGroup) v; + for (int i = 0; i < viewGroup.getChildCount(); i++) { + addTemperatureViewToController(viewGroup.getChildAt(i)); + } + } + } +} diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarView.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarView.java index afb69547cb47..24f8b74eed61 100644 --- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarView.java +++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarView.java @@ -24,7 +24,6 @@ import android.widget.LinearLayout; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.statusbar.car.CarStatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; /** @@ -36,7 +35,7 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; public class CarNavigationBarView extends LinearLayout { private View mNavButtons; private CarNavigationButton mNotificationsButton; - private CarStatusBar mCarStatusBar; + private CarNavigationBarController.NotificationsShadeController mNotificationsShadeController; private Context mContext; private View mLockScreenButtons; // used to wire in open/close gestures for notifications @@ -82,8 +81,9 @@ public class CarNavigationBarView extends LinearLayout { return super.onInterceptTouchEvent(ev); } - public void setStatusBar(CarStatusBar carStatusBar) { - mCarStatusBar = carStatusBar; + public void setNotificationsPanelController( + CarNavigationBarController.NotificationsShadeController controller) { + mNotificationsShadeController = controller; } /** @@ -104,7 +104,9 @@ public class CarNavigationBarView extends LinearLayout { } protected void onNotificationsClick(View v) { - mCarStatusBar.togglePanel(); + if (mNotificationsShadeController != null) { + mNotificationsShadeController.togglePanel(); + } } /** diff --git a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationButton.java b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationButton.java index 707d80fc0d3b..40823abaaead 100644 --- a/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationButton.java +++ b/packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationButton.java @@ -85,6 +85,7 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag super.onFinishInflate(); setScaleType(ImageView.ScaleType.CENTER); setAlpha(mUnselectedAlpha); + setImageResource(mIconResourceId); try { if (mIntent != null) { final Intent intent = Intent.parseUri(mIntent, Intent.URI_INTENT_SCHEME); diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 16073ae5e4a6..aebb62d7b069 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -32,6 +32,7 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.PowerManager; import android.util.DisplayMetrics; import android.util.Log; import android.view.GestureDetector; @@ -75,8 +76,8 @@ import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.navigationbar.car.CarFacetButtonController; +import com.android.systemui.navigationbar.car.CarNavigationBarController; import com.android.systemui.navigationbar.car.CarNavigationBarView; -import com.android.systemui.navigationbar.car.NavigationBarViewFactory; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.car.CarQSFragment; @@ -92,8 +93,6 @@ import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.VibratorHelper; -import com.android.systemui.statusbar.car.hvac.HvacController; -import com.android.systemui.statusbar.car.hvac.TemperatureView; import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NewNotifPipeline; @@ -109,6 +108,8 @@ import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.BiometricUnlockController; import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment; import com.android.systemui.statusbar.phone.DozeParameters; +import com.android.systemui.statusbar.phone.DozeScrimController; +import com.android.systemui.statusbar.phone.DozeServiceHost; import com.android.systemui.statusbar.phone.HeadsUpManagerPhone; import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.LightBarController; @@ -171,14 +172,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt private CarNavigationBarView mRightNavigationBarView; private final Object mQueueLock = new Object(); - private boolean mShowLeft; - private boolean mShowRight; - private boolean mShowBottom; - private final NavigationBarViewFactory mNavigationBarViewFactory; + private final CarNavigationBarController mCarNavigationBarController; private CarFacetButtonController mCarFacetButtonController; private DeviceProvisionedController mDeviceProvisionedController; private boolean mDeviceIsSetUpForUser = true; - private HvacController mHvacController; private DrivingStateHelper mDrivingStateHelper; private PowerManagerHelper mPowerManagerHelper; private FlingAnimationUtils mFlingAnimationUtils; @@ -301,9 +298,12 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt ScrimController scrimController, Lazy<LockscreenWallpaper> lockscreenWallpaperLazy, Lazy<BiometricUnlockController> biometricUnlockControllerLazy, + DozeServiceHost dozeServiceHost, + PowerManager powerManager, + DozeScrimController dozeScrimController, /* Car Settings injected components. */ - NavigationBarViewFactory navigationBarViewFactory) { + CarNavigationBarController carNavigationBarController) { super( context, featureFlags, @@ -364,9 +364,12 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt dozeParameters, scrimController, lockscreenWallpaperLazy, - biometricUnlockControllerLazy); + biometricUnlockControllerLazy, + dozeServiceHost, + powerManager, + dozeScrimController); mScrimController = scrimController; - mNavigationBarViewFactory = navigationBarViewFactory; + mCarNavigationBarController = carNavigationBarController; } @Override @@ -381,10 +384,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt mScreenLifecycle = Dependency.get(ScreenLifecycle.class); mScreenLifecycle.addObserver(mScreenObserver); - // Need to initialize HVAC controller before calling super.start - before system bars are - // created. - mHvacController = new HvacController(mContext); - super.start(); mNotificationPanel.setScrollingEnabled(true); @@ -398,8 +397,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt createBatteryController(); mCarBatteryController.startListening(); - mHvacController.connectToCarService(); - mDeviceProvisionedController.addCallback( new DeviceProvisionedController.DeviceProvisionedListener() { @Override @@ -436,9 +433,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt * before and after the device is provisioned. . Also for change of density and font size. */ private void restartNavBars() { - // remove and reattach all hvac components such that we don't keep a reference to unused - // ui elements - mHvacController.removeAllComponents(); mCarFacetButtonController.removeAll(); if (mNavigationBarWindow != null) { @@ -457,17 +451,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt mCarFacetButtonController.addAllFacetButtons(mStatusBarWindow); } - private void addTemperatureViewToController(View v) { - if (v instanceof TemperatureView) { - mHvacController.addHvacTextView((TemperatureView) v); - } else if (v instanceof ViewGroup) { - ViewGroup viewGroup = (ViewGroup) v; - for (int i = 0; i < viewGroup.getChildCount(); i++) { - addTemperatureViewToController(viewGroup.getChildAt(i)); - } - } - } - /** * Allows for showing or hiding just the navigation bars. This is indented to be used when * the full screen user selector is shown. @@ -888,10 +871,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt @Override protected void createNavigationBar(@Nullable RegisterStatusBarResult result) { - mShowBottom = mContext.getResources().getBoolean(R.bool.config_enableBottomNavigationBar); - mShowLeft = mContext.getResources().getBoolean(R.bool.config_enableLeftNavigationBar); - mShowRight = mContext.getResources().getBoolean(R.bool.config_enableRightNavigationBar); - buildNavBarWindows(); buildNavBarContent(); } @@ -899,50 +878,36 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt private void buildNavBarContent() { buildTopBar(); - if (mShowBottom) { - mNavigationBarView = mNavigationBarViewFactory.getBottomBar(mDeviceIsSetUpForUser); - mNavigationBarView.setStatusBar(this); - mNavigationBarView.setStatusBarWindowTouchListener(mNavBarNotificationTouchListener); - } + mNavigationBarView = mCarNavigationBarController.getBottomBar(mDeviceIsSetUpForUser); + mCarNavigationBarController.registerBottomBarTouchListener( + mNavBarNotificationTouchListener); - if (mShowLeft) { - mLeftNavigationBarView = mNavigationBarViewFactory.getLeftBar(mDeviceIsSetUpForUser); - mLeftNavigationBarView.setStatusBar(this); - mLeftNavigationBarView.setStatusBarWindowTouchListener( - mNavBarNotificationTouchListener); - } + mLeftNavigationBarView = mCarNavigationBarController.getLeftBar(mDeviceIsSetUpForUser); + mCarNavigationBarController.registerLeftBarTouchListener( + mNavBarNotificationTouchListener); - if (mShowRight) { - mRightNavigationBarView = mNavigationBarViewFactory.getLeftBar(mDeviceIsSetUpForUser); - mRightNavigationBarView.setStatusBar(this); - mRightNavigationBarView.setStatusBarWindowTouchListener( - mNavBarNotificationTouchListener); - } + mRightNavigationBarView = mCarNavigationBarController.getLeftBar(mDeviceIsSetUpForUser); + mCarNavigationBarController.registerRightBarTouchListener( + mNavBarNotificationTouchListener); + + mCarNavigationBarController.registerNotificationController(() -> togglePanel()); } private void buildNavBarWindows() { mTopNavigationBarContainer = mStatusBarWindow .findViewById(R.id.car_top_navigation_bar_container); - if (mShowBottom) { - mNavigationBarWindow = mNavigationBarViewFactory.getBottomWindow(); - } - if (mShowLeft) { - mLeftNavigationBarWindow = mNavigationBarViewFactory.getLeftWindow(); - } - if (mShowRight) { - mRightNavigationBarWindow = mNavigationBarViewFactory.getRightWindow(); - } + mNavigationBarWindow = mCarNavigationBarController.getBottomWindow(); + mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow(); + mRightNavigationBarWindow = mCarNavigationBarController.getRightWindow(); } private void buildTopBar() { mTopNavigationBarContainer.removeAllViews(); - mTopNavigationBarView = mNavigationBarViewFactory.getTopBar(mDeviceIsSetUpForUser); + mTopNavigationBarView = mCarNavigationBarController.getTopBar(mDeviceIsSetUpForUser); + mCarNavigationBarController.registerTopBarTouchListener( + mTopNavBarNotificationTouchListener); mTopNavigationBarContainer.addView(mTopNavigationBarView); - - mTopNavigationBarView.setStatusBar(this); - addTemperatureViewToController(mTopNavigationBarView); - mTopNavigationBarView.setStatusBarWindowTouchListener(mTopNavBarNotificationTouchListener); } @Override diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java index 30144524fd42..3b482599b2a0 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java @@ -18,6 +18,7 @@ package com.android.systemui.statusbar.car; import static android.content.DialogInterface.BUTTON_NEGATIVE; import static android.content.DialogInterface.BUTTON_POSITIVE; +import static android.os.UserManager.DISALLOW_ADD_USER; import android.app.ActivityManager; import android.app.AlertDialog; @@ -145,7 +146,8 @@ public class UserGridRecyclerView extends RecyclerView { userRecords.add(createStartGuestUserRecord()); // Add add user record if the foreground user can add users - if (mCarUserManagerHelper.canForegroundUserAddUsers()) { + UserHandle fgUserHandle = UserHandle.of(ActivityManager.getCurrentUser()); + if (!mUserManager.hasUserRestriction(DISALLOW_ADD_USER, fgUserHandle)) { userRecords.add(createAddUserRecord()); } @@ -285,7 +287,7 @@ public class UserGridRecyclerView extends RecyclerView { } private void handleAddUserClicked() { - if (mCarUserManagerHelper.isUserLimitReached()) { + if (!mUserManager.canAddMoreUsers()) { mAddUserView.setEnabled(true); showMaxUserLimitReachedDialog(); } else { diff --git a/packages/SettingsProvider/OWNERS b/packages/SettingsProvider/OWNERS new file mode 100644 index 000000000000..2054129506bc --- /dev/null +++ b/packages/SettingsProvider/OWNERS @@ -0,0 +1,3 @@ +hackbod@google.com +svetoslavganov@google.com +moltmann@google.com diff --git a/packages/SystemUI/res/layout/home_controls.xml b/packages/SystemUI/res/layout/home_controls.xml index bb971c206e5c..b9a6a482cf1a 100644 --- a/packages/SystemUI/res/layout/home_controls.xml +++ b/packages/SystemUI/res/layout/home_controls.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/home_controls_layout" android:layout_width="match_parent" @@ -8,6 +8,5 @@ android:visibility="gone" android:padding="8dp" android:layout_margin="5dp" - android:background="?android:attr/colorBackgroundFloating" - android:orientation="vertical"> -</LinearLayout> + android:background="?android:attr/colorBackgroundFloating"> +</FrameLayout> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java index 00e8b535ccac..70f8e15eb83d 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java @@ -78,6 +78,7 @@ public class ActivityManagerWrapper { // Should match the values in PhoneWindowManager public static final String CLOSE_SYSTEM_WINDOWS_REASON_RECENTS = "recentapps"; + public static final String CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY = "homekey"; private final PackageManager mPackageManager; private final BackgroundExecutor mBackgroundExecutor; diff --git a/packages/SystemUI/src/com/android/systemui/LatencyTester.java b/packages/SystemUI/src/com/android/systemui/LatencyTester.java index ddbabee283c2..30a60abfcd86 100644 --- a/packages/SystemUI/src/com/android/systemui/LatencyTester.java +++ b/packages/SystemUI/src/com/android/systemui/LatencyTester.java @@ -16,6 +16,8 @@ package com.android.systemui; +import static android.os.PowerManager.WAKE_REASON_UNKNOWN; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -28,21 +30,32 @@ import android.os.SystemClock; import com.android.internal.util.LatencyTracker; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.statusbar.phone.BiometricUnlockController; -import com.android.systemui.statusbar.phone.StatusBar; + +import javax.inject.Inject; +import javax.inject.Singleton; /** * Class that only runs on debuggable builds that listens to broadcasts that simulate actions in the * system that are used for testing the latency. */ +@Singleton public class LatencyTester extends SystemUI { - private static final String ACTION_FINGERPRINT_WAKE = + private static final String + ACTION_FINGERPRINT_WAKE = "com.android.systemui.latency.ACTION_FINGERPRINT_WAKE"; - private static final String ACTION_TURN_ON_SCREEN = + private static final String + ACTION_TURN_ON_SCREEN = "com.android.systemui.latency.ACTION_TURN_ON_SCREEN"; + private final BiometricUnlockController mBiometricUnlockController; + private final PowerManager mPowerManager; - public LatencyTester(Context context) { + @Inject + public LatencyTester(Context context, BiometricUnlockController biometricUnlockController, + PowerManager powerManager) { super(context); + mBiometricUnlockController = biometricUnlockController; + mPowerManager = powerManager; } @Override @@ -68,19 +81,17 @@ public class LatencyTester extends SystemUI { } private void fakeTurnOnScreen() { - PowerManager powerManager = mContext.getSystemService(PowerManager.class); if (LatencyTracker.isEnabled(mContext)) { LatencyTracker.getInstance(mContext).onActionStart( LatencyTracker.ACTION_TURN_ON_SCREEN); } - powerManager.wakeUp(SystemClock.uptimeMillis(), "android.policy:LATENCY_TESTS"); + mPowerManager.wakeUp( + SystemClock.uptimeMillis(), WAKE_REASON_UNKNOWN, "android.policy:LATENCY_TESTS"); } private void fakeWakeAndUnlock() { - BiometricUnlockController biometricUnlockController = getComponent(StatusBar.class) - .getBiometricUnlockController(); - biometricUnlockController.onBiometricAcquired(BiometricSourceType.FINGERPRINT); - biometricUnlockController.onBiometricAuthenticated( + mBiometricUnlockController.onBiometricAcquired(BiometricSourceType.FINGERPRINT); + mBiometricUnlockController.onBiometricAuthenticated( KeyguardUpdateMonitor.getCurrentUser(), BiometricSourceType.FINGERPRINT); } } diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index ad209861d273..8a99e451934e 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -81,10 +81,16 @@ import com.android.systemui.util.leak.RotationUtils; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; +import javax.inject.Singleton; + +import dagger.Lazy; + /** * An overlay that draws screen decorations in software (e.g for rounded corners or display cutout) * for antialiasing and emulation purposes. */ +@Singleton public class ScreenDecorations extends SystemUI implements Tunable { private static final boolean DEBUG = false; private static final String TAG = "ScreenDecorations"; @@ -94,6 +100,7 @@ public class ScreenDecorations extends SystemUI implements Tunable { private static final boolean DEBUG_SCREENSHOT_ROUNDED_CORNERS = SystemProperties.getBoolean("debug.screenshot_rounded_corners", false); private static final boolean VERBOSE = false; + private final Lazy<StatusBar> mStatusBarLazy; private DisplayManager mDisplayManager; private DisplayManager.DisplayListener mDisplayListener; @@ -132,8 +139,10 @@ public class ScreenDecorations extends SystemUI implements Tunable { return result; } - public ScreenDecorations(Context context) { + @Inject + public ScreenDecorations(Context context, Lazy<StatusBar> statusBarLazy) { super(context); + mStatusBarLazy = statusBarLazy; } @Override @@ -434,13 +443,13 @@ public class ScreenDecorations extends SystemUI implements Tunable { private void setupStatusBarPadding(int padding) { // Add some padding to all the content near the edge of the screen. - StatusBar sb = getComponent(StatusBar.class); - View statusBar = (sb != null ? sb.getStatusBarWindow() : null); - if (statusBar != null) { - TunablePadding.addTunablePadding(statusBar.findViewById(R.id.keyguard_header), PADDING, - padding, FLAG_END); + StatusBar statusBar = mStatusBarLazy.get(); + View statusBarWindow = statusBar.getStatusBarWindow(); + if (statusBarWindow != null) { + TunablePadding.addTunablePadding(statusBarWindow.findViewById(R.id.keyguard_header), + PADDING, padding, FLAG_END); - FragmentHostManager fragmentHostManager = FragmentHostManager.get(statusBar); + FragmentHostManager fragmentHostManager = FragmentHostManager.get(statusBarWindow); fragmentHostManager.addTagListener(CollapsedStatusBarFragment.TAG, new TunablePaddingTagListener(padding, R.id.status_bar)); fragmentHostManager.addTagListener(QS.TAG, diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index b75873100025..446ed2572bab 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -93,8 +93,11 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, Log.w(TAG, "Evicting client due to: " + topPackage); mCurrentDialog.dismissWithoutCallback(true /* animate */); mCurrentDialog = null; - mReceiver.onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL); - mReceiver = null; + if (mReceiver != null) { + mReceiver.onDialogDismissed( + BiometricPrompt.DISMISSED_REASON_USER_CANCEL); + mReceiver = null; + } } } } catch (RemoteException e) { @@ -105,6 +108,10 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, @Override public void onTryAgainPressed() { + if (mReceiver == null) { + Log.e(TAG, "onTryAgainPressed: Receiver is null"); + return; + } try { mReceiver.onTryAgainPressed(); } catch (RemoteException e) { @@ -114,6 +121,10 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, @Override public void onDeviceCredentialPressed() { + if (mReceiver == null) { + Log.e(TAG, "onDeviceCredentialPressed: Receiver is null"); + return; + } try { mReceiver.onDeviceCredentialPressed(); } catch (RemoteException e) { @@ -161,7 +172,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, private void sendResultAndCleanUp(@DismissedReason int reason) { if (mReceiver == null) { - Log.e(TAG, "Receiver is null"); + Log.e(TAG, "sendResultAndCleanUp: Receiver is null"); return; } try { diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java index 6674c12ab613..9032c6fc8639 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java @@ -20,6 +20,7 @@ import com.android.systemui.ActivityStarterDelegate; import com.android.systemui.appops.AppOpsController; import com.android.systemui.appops.AppOpsControllerImpl; import com.android.systemui.classifier.FalsingManagerProxy; +import com.android.systemui.doze.DozeHost; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.FalsingManager; @@ -33,6 +34,7 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.StatusBarStateControllerImpl; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl; +import com.android.systemui.statusbar.phone.DozeServiceHost; import com.android.systemui.statusbar.phone.ManagedProfileController; import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl; import com.android.systemui.statusbar.phone.StatusBarIconController; @@ -241,5 +243,10 @@ public abstract class DependencyBinder { /** */ @Binds - public abstract FalsingManager provideFalsingmanager(FalsingManagerProxy falsingManagerImpl); + public abstract FalsingManager provideFalsingManager(FalsingManagerProxy falsingManagerImpl); + + /** + */ + @Binds + public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java index 49cd414f9d9e..738f53920b98 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java @@ -16,6 +16,8 @@ package com.android.systemui.dagger; +import com.android.systemui.LatencyTester; +import com.android.systemui.ScreenDecorations; import com.android.systemui.SystemUI; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.pip.PipUI; @@ -48,6 +50,12 @@ public abstract class SystemUIBinder { @ClassKey(KeyguardViewMediator.class) public abstract SystemUI bindKeyguardViewMediator(KeyguardViewMediator sysui); + /** Inject into LatencyTests. */ + @Binds + @IntoMap + @ClassKey(LatencyTester.class) + public abstract SystemUI bindLatencyTester(LatencyTester sysui); + /** Inject into PipUI. */ @Binds @IntoMap @@ -66,6 +74,12 @@ public abstract class SystemUIBinder { @ClassKey(Recents.class) public abstract SystemUI bindRecents(Recents sysui); + /** Inject into ScreenDecorations. */ + @Binds + @IntoMap + @ClassKey(ScreenDecorations.class) + public abstract SystemUI bindScreenDecorations(ScreenDecorations sysui); + /** Inject into VolumeUI. */ @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 41ac69c6b603..4e60f194e552 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.content.Context; import android.content.pm.PackageManager; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.assist.AssistModule; import com.android.systemui.model.SysUiState; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -46,11 +47,13 @@ public abstract class SystemUIModule { @Nullable static KeyguardLiftController provideKeyguardLiftController(Context context, StatusBarStateController statusBarStateController, - AsyncSensorManager asyncSensorManager) { + AsyncSensorManager asyncSensorManager, + KeyguardUpdateMonitor keyguardUpdateMonitor) { if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) { return null; } - return new KeyguardLiftController(statusBarStateController, asyncSensorManager); + return new KeyguardLiftController(statusBarStateController, asyncSensorManager, + keyguardUpdateMonitor); } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 98f0b2a35f9f..f60d9db7ac9c 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -55,7 +55,11 @@ import java.util.Arrays; import java.util.concurrent.Future; import javax.inject.Inject; +import javax.inject.Singleton; +import dagger.Lazy; + +@Singleton public class PowerUI extends SystemUI { static final String TAG = "PowerUI"; @@ -101,11 +105,14 @@ public class PowerUI extends SystemUI { private IThermalEventListener mSkinThermalEventListener; private IThermalEventListener mUsbThermalEventListener; private final BroadcastDispatcher mBroadcastDispatcher; + private final Lazy<StatusBar> mStatusBarLazy; @Inject - public PowerUI(Context context, BroadcastDispatcher broadcastDispatcher) { + public PowerUI(Context context, BroadcastDispatcher broadcastDispatcher, + Lazy<StatusBar> statusBarLazy) { super(context); mBroadcastDispatcher = broadcastDispatcher; + mStatusBarLazy = statusBarLazy; } public void start() { @@ -663,8 +670,7 @@ public class PowerUI extends SystemUI { int status = temp.getStatus(); if (status >= Temperature.THROTTLING_EMERGENCY) { - StatusBar statusBar = getComponent(StatusBar.class); - if (statusBar != null && !statusBar.isDeviceInVrMode()) { + if (!mStatusBarLazy.get().isDeviceInVrMode()) { mWarnings.showHighTemperatureWarning(); Slog.d(TAG, "SkinThermalEventListener: notifyThrottling was called " + ", current skin status = " + status diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java index af418f6308a0..694964075032 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java @@ -33,6 +33,7 @@ import android.media.MediaMetadata; import android.media.session.MediaController; import android.media.session.MediaSession; import android.media.session.PlaybackState; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -50,7 +51,6 @@ import com.android.settingslib.media.MediaOutputSliceConstants; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.statusbar.MediaTransferManager; /** * Single media player for carousel in QSPanel @@ -101,6 +101,12 @@ public class QSMediaPlayer { mToken = token; mController = new MediaController(mContext, token); MediaMetadata mMediaMetadata = mController.getMetadata(); + + if (mMediaMetadata == null) { + Log.e(TAG, "Media metadata was null"); + return; + } + Notification.Builder builder = Notification.Builder.recoverBuilder(mContext, notif); // Album art @@ -151,18 +157,17 @@ public class QSMediaPlayer { // Album name TextView albumName = headerView.findViewById(com.android.internal.R.id.header_text); String albumString = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_ALBUM); - if (!albumString.isEmpty()) { + if (TextUtils.isEmpty(albumString)) { + albumName.setVisibility(View.GONE); + separator.setVisibility(View.GONE); + } else { albumName.setText(albumString); albumName.setTextColor(iconColor); albumName.setVisibility(View.VISIBLE); separator.setVisibility(View.VISIBLE); - } else { - albumName.setVisibility(View.GONE); - separator.setVisibility(View.GONE); } // Transfer chip - MediaTransferManager mediaTransferManager = new MediaTransferManager(mContext); View transferBackgroundView = headerView.findViewById( com.android.internal.R.id.media_seamless); LinearLayout viewLayout = (LinearLayout) transferBackgroundView; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 20600596c3a1..b48814bfd6bd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -166,6 +166,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne mMediaCarousel = new LinearLayout(mContext); mMediaCarousel.setOrientation(LinearLayout.HORIZONTAL); mediaScrollView.addView(mMediaCarousel, lpCarousel); + mediaScrollView.setVisibility(View.GONE); } else { mMediaCarousel = null; } @@ -239,6 +240,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne } else { mMediaCarousel.addView(player.getView(), lp); // add at end } + mMediaPlayers.add(player); } else if (player.isPlaying()) { // move it to the front mMediaCarousel.removeView(player.getView()); @@ -248,7 +250,10 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne Log.d(TAG, "setting player session"); player.setMediaSession(token, icon, iconColor, bgColor, actionsContainer, notif.getNotification()); - mMediaPlayers.add(player); + + if (mMediaPlayers.size() > 0) { + ((View) mMediaCarousel.getParent()).setVisibility(View.VISIBLE); + } } protected View getMediaPanel() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java index ae66cd576765..3ec71ac30da1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java @@ -84,6 +84,11 @@ public class QuickQSMediaPlayer { mController = new MediaController(mContext, token); MediaMetadata mMediaMetadata = mController.getMetadata(); + if (mMediaMetadata == null) { + Log.e(TAG, "Media metadata was null"); + return; + } + // Album art addAlbumArtBackground(mMediaMetadata, bgColor); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java index 1c8e451e52f7..9a33c8c825cf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java @@ -145,7 +145,7 @@ public class QSFactoryImpl implements QSFactory { return mBluetoothTileProvider.get(); case "controls": if (Settings.System.getInt(mHost.getContext().getContentResolver(), - "qs_controls_tile_enabled", 0) == 1) { + "npv_plugin_flag", 0) == 3) { return mControlsTileProvider.get(); } else return null; case "cell": diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ControlsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ControlsTile.java index 0a59618b59a1..39ae66e7607a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ControlsTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ControlsTile.java @@ -22,11 +22,11 @@ import android.content.Intent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; +import android.widget.FrameLayout; import com.android.systemui.R; import com.android.systemui.plugins.ActivityStarter; -import com.android.systemui.plugins.HomeControlsPlugin; +import com.android.systemui.plugins.NPVPlugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.plugins.qs.QSTile.BooleanState; @@ -44,7 +44,7 @@ public class ControlsTile extends QSTileImpl<BooleanState> { private ControlsDetailAdapter mDetailAdapter; private final ActivityStarter mActivityStarter; private PluginManager mPluginManager; - private HomeControlsPlugin mPlugin; + private NPVPlugin mPlugin; private Intent mHomeAppIntent; @Inject @@ -81,7 +81,7 @@ public class ControlsTile extends QSTileImpl<BooleanState> { public void setDetailListening(boolean listening) { if (mPlugin == null) return; - mPlugin.setVisible(listening); + mPlugin.setListening(listening); } @Override @@ -142,7 +142,7 @@ public class ControlsTile extends QSTileImpl<BooleanState> { private class ControlsDetailAdapter implements DetailAdapter { private View mDetailView; - protected LinearLayout mHomeControlsLayout; + protected FrameLayout mHomeControlsLayout; public CharSequence getTitle() { return "Controls"; @@ -157,24 +157,30 @@ public class ControlsTile extends QSTileImpl<BooleanState> { } public View createDetailView(Context context, View convertView, final ViewGroup parent) { - mHomeControlsLayout = (LinearLayout) LayoutInflater.from(context).inflate( - R.layout.home_controls, parent, false); + if (convertView != null) return convertView; + + mHomeControlsLayout = (FrameLayout) LayoutInflater.from(context).inflate( + R.layout.home_controls, parent, false); mHomeControlsLayout.setVisibility(View.VISIBLE); + parent.addView(mHomeControlsLayout); + mPluginManager.addPluginListener( - new PluginListener<HomeControlsPlugin>() { + new PluginListener<NPVPlugin>() { @Override - public void onPluginConnected(HomeControlsPlugin plugin, + public void onPluginConnected(NPVPlugin plugin, Context pluginContext) { mPlugin = plugin; - mPlugin.sendParentGroup(mHomeControlsLayout); - mPlugin.setVisible(true); + mPlugin.attachToRoot(mHomeControlsLayout); + mPlugin.setListening(true); } @Override - public void onPluginDisconnected(HomeControlsPlugin plugin) { + public void onPluginDisconnected(NPVPlugin plugin) { + mPlugin.setListening(false); + mHomeControlsLayout.removeAllViews(); } - }, HomeControlsPlugin.class, false); + }, NPVPlugin.class, false); return mHomeControlsLayout; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java index f284f737b26d..53fbe5b57d7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; @@ -155,7 +156,8 @@ public class InstantAppNotifier extends SystemUI focusedStack.configuration.windowConfiguration .getWindowingMode(); if (windowingMode == WINDOWING_MODE_FULLSCREEN - || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) { + || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY + || windowingMode == WINDOWING_MODE_FREEFORM) { checkAndPostForStack(focusedStack, notifs, noMan, pm); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleHubNotificationListener.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleHubNotificationListener.kt index e6239dfc0b23..fe257d9fd252 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleHubNotificationListener.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleHubNotificationListener.kt @@ -181,6 +181,7 @@ private fun NotificationEntry.extractPerson(): PersonModel? { return null } val clickIntent = sbn.notification.contentIntent + ?: return null val extras = sbn.notification.extras val name = extras.getString(Notification.EXTRA_CONVERSATION_TITLE) ?: extras.getString(Notification.EXTRA_TITLE) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index b9516cfac1ed..ffcbc40e7b70 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -47,16 +47,18 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import javax.inject.Inject; +import javax.inject.Singleton; /** * Controller which coordinates all the biometric unlocking actions with the UI. */ +@Singleton public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { - private static final String TAG = "BiometricUnlockController"; + private static final String TAG = "BiometricUnlockCtrl"; private static final boolean DEBUG_BIO_WAKELOCK = KeyguardConstants.DEBUG_BIOMETRIC_WAKELOCK; private static final long BIOMETRIC_WAKELOCK_TIMEOUT_MS = 15 * 1000; - private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock wakelock"; + private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock:wakelock"; @IntDef(prefix = { "MODE_" }, value = { MODE_NONE, @@ -132,7 +134,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback { private final KeyguardBypassController mKeyguardBypassController; private PowerManager.WakeLock mWakeLock; private final KeyguardUpdateMonitor mUpdateMonitor; - private final DozeParameters mDozeParameters; + private DozeParameters mDozeParameters; private final KeyguardStateController mKeyguardStateController; private final StatusBarWindowController mStatusBarWindowController; private final Context mContext; 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 50d33a70fed5..bc482353753d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java @@ -24,7 +24,6 @@ import android.os.UserHandle; import android.provider.Settings; import android.util.MathUtils; -import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.MainResources; import com.android.systemui.doze.AlwaysOnDisplayPolicy; @@ -188,12 +187,7 @@ public class DozeParameters implements TunerService.Tunable, return; } mControlScreenOffAnimation = controlScreenOffAnimation; - getPowerManager().setDozeAfterScreenOff(!controlScreenOffAnimation); - } - - @VisibleForTesting - protected PowerManager getPowerManager() { - return mPowerManager; + mPowerManager.setDozeAfterScreenOff(!controlScreenOffAnimation); } private boolean getBoolean(String propName, int resId) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java index fe3c04e3cda3..1ecc4899d5e7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -29,10 +29,12 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener; import javax.inject.Inject; +import javax.inject.Singleton; /** * Controller which handles all the doze animations of the scrims. */ +@Singleton public class DozeScrimController implements StateListener { private static final String TAG = "DozeScrimController"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java new file mode 100644 index 000000000000..28543555bf4d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java @@ -0,0 +1,465 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; +import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING; + +import android.annotation.NonNull; +import android.os.Bundle; +import android.os.PowerManager; +import android.os.SystemClock; +import android.os.SystemProperties; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.keyguard.KeyguardUpdateMonitor; +import com.android.systemui.assist.AssistManager; +import com.android.systemui.doze.DozeEvent; +import com.android.systemui.doze.DozeHost; +import com.android.systemui.doze.DozeLog; +import com.android.systemui.doze.DozeReceiver; +import com.android.systemui.keyguard.KeyguardViewMediator; +import com.android.systemui.keyguard.WakefulnessLifecycle; +import com.android.systemui.statusbar.PulseExpansionHandler; +import com.android.systemui.statusbar.StatusBarState; +import com.android.systemui.statusbar.SysuiStatusBarStateController; +import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; +import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.policy.BatteryController; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; + +import java.util.ArrayList; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import dagger.Lazy; + +/** + * Implementation of DozeHost for SystemUI. + */ +@Singleton +public final class DozeServiceHost implements DozeHost { + private static final String TAG = "DozeServiceHost"; + private final ArrayList<Callback> mCallbacks = new ArrayList<>(); + private final DozeLog mDozeLog; + private final PowerManager mPowerManager; + private boolean mAnimateWakeup; + private boolean mAnimateScreenOff; + private boolean mIgnoreTouchWhilePulsing; + private Runnable mPendingScreenOffCallback; + @VisibleForTesting + boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean( + "persist.sysui.wake_performs_auth", true); + private boolean mDozingRequested; + private boolean mDozing; + private boolean mPulsing; + private WakefulnessLifecycle mWakefulnessLifecycle; + private final SysuiStatusBarStateController mStatusBarStateController; + private final DeviceProvisionedController mDeviceProvisionedController; + private final HeadsUpManagerPhone mHeadsUpManagerPhone; + private final BatteryController mBatteryController; + private final ScrimController mScrimController; + private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy; + private BiometricUnlockController mBiometricUnlockController; + private final KeyguardViewMediator mKeyguardViewMediator; + private final AssistManager mAssistManager; + private final DozeScrimController mDozeScrimController; + private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; + private final VisualStabilityManager mVisualStabilityManager; + private final PulseExpansionHandler mPulseExpansionHandler; + private final StatusBarWindowController mStatusBarWindowController; + private final NotificationWakeUpCoordinator mNotificationWakeUpCoordinator; + private NotificationIconAreaController mNotificationIconAreaController; + private StatusBarWindowViewController mStatusBarWindowViewController; + private StatusBarWindowView mStatusBarWindow; + private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + private NotificationPanelView mNotificationPanel; + private View mAmbientIndicationContainer; + private StatusBar mStatusBar; + + @Inject + public DozeServiceHost(DozeLog dozeLog, PowerManager powerManager, + WakefulnessLifecycle wakefulnessLifecycle, + SysuiStatusBarStateController statusBarStateController, + DeviceProvisionedController deviceProvisionedController, + HeadsUpManagerPhone headsUpManagerPhone, BatteryController batteryController, + ScrimController scrimController, + Lazy<BiometricUnlockController> biometricUnlockControllerLazy, + KeyguardViewMediator keyguardViewMediator, + AssistManager assistManager, + DozeScrimController dozeScrimController, KeyguardUpdateMonitor keyguardUpdateMonitor, + VisualStabilityManager visualStabilityManager, + PulseExpansionHandler pulseExpansionHandler, + StatusBarWindowController statusBarWindowController, + NotificationWakeUpCoordinator notificationWakeUpCoordinator) { + super(); + mDozeLog = dozeLog; + mPowerManager = powerManager; + mWakefulnessLifecycle = wakefulnessLifecycle; + mStatusBarStateController = statusBarStateController; + mDeviceProvisionedController = deviceProvisionedController; + mHeadsUpManagerPhone = headsUpManagerPhone; + mBatteryController = batteryController; + mScrimController = scrimController; + mBiometricUnlockControllerLazy = biometricUnlockControllerLazy; + mKeyguardViewMediator = keyguardViewMediator; + mAssistManager = assistManager; + mDozeScrimController = dozeScrimController; + mKeyguardUpdateMonitor = keyguardUpdateMonitor; + mVisualStabilityManager = visualStabilityManager; + mPulseExpansionHandler = pulseExpansionHandler; + mStatusBarWindowController = statusBarWindowController; + mNotificationWakeUpCoordinator = notificationWakeUpCoordinator; + } + + // TODO: we should try to not pass status bar in here if we can avoid it. + + /** + * Initialize instance with objects only available later during execution. + */ + public void initialize(StatusBar statusBar, + NotificationIconAreaController notificationIconAreaController, + StatusBarWindowViewController statusBarWindowViewController, + StatusBarWindowView statusBarWindow, + StatusBarKeyguardViewManager statusBarKeyguardViewManager, + NotificationPanelView notificationPanel, View ambientIndicationContainer) { + mStatusBar = statusBar; + mNotificationIconAreaController = notificationIconAreaController; + mStatusBarWindowViewController = statusBarWindowViewController; + mStatusBarWindow = statusBarWindow; + mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; + mNotificationPanel = notificationPanel; + mAmbientIndicationContainer = ambientIndicationContainer; + mBiometricUnlockController = mBiometricUnlockControllerLazy.get(); + } + + @Override + public String toString() { + return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]"; + } + + void firePowerSaveChanged(boolean active) { + for (Callback callback : mCallbacks) { + callback.onPowerSaveChanged(active); + } + } + + void fireNotificationPulse(NotificationEntry entry) { + Runnable pulseSuppressedListener = () -> { + entry.setPulseSuppressed(true); + mNotificationIconAreaController.updateAodNotificationIcons(); + }; + for (Callback callback : mCallbacks) { + callback.onNotificationAlerted(pulseSuppressedListener); + } + } + + boolean getDozingRequested() { + return mDozingRequested; + } + + boolean isPulsing() { + return mPulsing; + } + + + @Override + public void addCallback(@NonNull Callback callback) { + mCallbacks.add(callback); + } + + @Override + public void removeCallback(@NonNull Callback callback) { + mCallbacks.remove(callback); + } + + @Override + public void startDozing() { + if (!mDozingRequested) { + mDozingRequested = true; + mDozeLog.traceDozing(mDozing); + updateDozing(); + mStatusBar.updateIsKeyguard(); + } + } + + void updateDozing() { + // When in wake-and-unlock while pulsing, keep dozing state until fully unlocked. + boolean + dozing = + mDozingRequested && mStatusBarStateController.getState() == StatusBarState.KEYGUARD + || mBiometricUnlockController.getMode() + == BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING; + // When in wake-and-unlock we may not have received a change to StatusBarState + // but we still should not be dozing, manually set to false. + if (mBiometricUnlockController.getMode() + == BiometricUnlockController.MODE_WAKE_AND_UNLOCK) { + dozing = false; + } + + + mStatusBarStateController.setIsDozing(dozing); + } + + @Override + public void pulseWhileDozing(@NonNull PulseCallback callback, int reason) { + if (reason == DozeEvent.PULSE_REASON_SENSOR_LONG_PRESS) { + mPowerManager.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, + "com.android.systemui:LONG_PRESS"); + mAssistManager.startAssist(new Bundle()); + return; + } + + if (reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN) { + mScrimController.setWakeLockScreenSensorActive(true); + } + + if (reason == DozeEvent.PULSE_REASON_DOCKING && mStatusBarWindow != null) { + mStatusBarWindowViewController.suppressWakeUpGesture(true); + } + + boolean passiveAuthInterrupt = reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN + && mWakeLockScreenPerformsAuth; + // Set the state to pulsing, so ScrimController will know what to do once we ask it to + // execute the transition. The pulse callback will then be invoked when the scrims + // are black, indicating that StatusBar is ready to present the rest of the UI. + mPulsing = true; + mDozeScrimController.pulse(new PulseCallback() { + @Override + public void onPulseStarted() { + callback.onPulseStarted(); + mStatusBar.updateNotificationPanelTouchState(); + setPulsing(true); + } + + @Override + public void onPulseFinished() { + mPulsing = false; + callback.onPulseFinished(); + mStatusBar.updateNotificationPanelTouchState(); + mScrimController.setWakeLockScreenSensorActive(false); + if (mStatusBarWindow != null) { + mStatusBarWindowViewController.suppressWakeUpGesture(false); + } + setPulsing(false); + } + + private void setPulsing(boolean pulsing) { + mStatusBarStateController.setPulsing(pulsing); + mStatusBarKeyguardViewManager.setPulsing(pulsing); + mKeyguardViewMediator.setPulsing(pulsing); + mNotificationPanel.setPulsing(pulsing); + mVisualStabilityManager.setPulsing(pulsing); + mStatusBarWindowViewController.setPulsing(pulsing); + mIgnoreTouchWhilePulsing = false; + if (mKeyguardUpdateMonitor != null && passiveAuthInterrupt) { + mKeyguardUpdateMonitor.onAuthInterruptDetected(pulsing /* active */); + } + mStatusBar.updateScrimController(); + mPulseExpansionHandler.setPulsing(pulsing); + mNotificationWakeUpCoordinator.setPulsing(pulsing); + } + }, reason); + // DozeScrimController is in pulse state, now let's ask ScrimController to start + // pulsing and draw the black frame, if necessary. + mStatusBar.updateScrimController(); + } + + @Override + public void stopDozing() { + if (mDozingRequested) { + mDozingRequested = false; + mDozeLog.traceDozing(mDozing); + updateDozing(); + } + } + + @Override + public void onIgnoreTouchWhilePulsing(boolean ignore) { + if (ignore != mIgnoreTouchWhilePulsing) { + mDozeLog.tracePulseTouchDisabledByProx(ignore); + } + mIgnoreTouchWhilePulsing = ignore; + if (mDozing && ignore) { + mStatusBarWindowViewController.cancelCurrentTouch(); + } + } + + @Override + public void dozeTimeTick() { + mNotificationPanel.dozeTimeTick(); + if (mAmbientIndicationContainer instanceof DozeReceiver) { + ((DozeReceiver) mAmbientIndicationContainer).dozeTimeTick(); + } + } + + @Override + public boolean isPowerSaveActive() { + return mBatteryController.isAodPowerSave(); + } + + @Override + public boolean isPulsingBlocked() { + return mBiometricUnlockController.getMode() + == BiometricUnlockController.MODE_WAKE_AND_UNLOCK; + } + + @Override + public boolean isProvisioned() { + return mDeviceProvisionedController.isDeviceProvisioned() + && mDeviceProvisionedController.isCurrentUserSetup(); + } + + @Override + public boolean isBlockingDoze() { + if (mBiometricUnlockController.hasPendingAuthentication()) { + Log.i(StatusBar.TAG, "Blocking AOD because fingerprint has authenticated"); + return true; + } + return false; + } + + @Override + public void extendPulse(int reason) { + if (reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN) { + mScrimController.setWakeLockScreenSensorActive(true); + } + if (mDozeScrimController.isPulsing() && mHeadsUpManagerPhone.hasNotifications()) { + mHeadsUpManagerPhone.extendHeadsUp(); + } else { + mDozeScrimController.extendPulse(); + } + } + + @Override + public void stopPulsing() { + if (mDozeScrimController.isPulsing()) { + mDozeScrimController.pulseOutNow(); + } + } + + @Override + public void setAnimateWakeup(boolean animateWakeup) { + if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_AWAKE + || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_WAKING) { + // Too late to change the wakeup animation. + return; + } + mAnimateWakeup = animateWakeup; + } + + @Override + public void setAnimateScreenOff(boolean animateScreenOff) { + mAnimateScreenOff = animateScreenOff; + } + + @Override + public void onSlpiTap(float screenX, float screenY) { + if (screenX > 0 && screenY > 0 && mAmbientIndicationContainer != null + && mAmbientIndicationContainer.getVisibility() == View.VISIBLE) { + int[] locationOnScreen = new int[2]; + mAmbientIndicationContainer.getLocationOnScreen(locationOnScreen); + float viewX = screenX - locationOnScreen[0]; + float viewY = screenY - locationOnScreen[1]; + if (0 <= viewX && viewX <= mAmbientIndicationContainer.getWidth() + && 0 <= viewY && viewY <= mAmbientIndicationContainer.getHeight()) { + + // Dispatch a tap + long now = SystemClock.elapsedRealtime(); + MotionEvent ev = MotionEvent.obtain( + now, now, MotionEvent.ACTION_DOWN, screenX, screenY, 0); + mAmbientIndicationContainer.dispatchTouchEvent(ev); + ev.recycle(); + ev = MotionEvent.obtain( + now, now, MotionEvent.ACTION_UP, screenX, screenY, 0); + mAmbientIndicationContainer.dispatchTouchEvent(ev); + ev.recycle(); + } + } + } + + @Override + public void setDozeScreenBrightness(int value) { + mStatusBarWindowController.setDozeScreenBrightness(value); + } + + @Override + public void setAodDimmingScrim(float scrimOpacity) { + mScrimController.setAodFrontScrimAlpha(scrimOpacity); + } + + + + @Override + public void prepareForGentleSleep(Runnable onDisplayOffCallback) { + if (mPendingScreenOffCallback != null) { + Log.w(TAG, "Overlapping onDisplayOffCallback. Ignoring previous one."); + } + mPendingScreenOffCallback = onDisplayOffCallback; + mStatusBar.updateScrimController(); + } + + @Override + public void cancelGentleSleep() { + mPendingScreenOffCallback = null; + if (mScrimController.getState() == ScrimState.OFF) { + mStatusBar.updateScrimController(); + } + } + + /** + * When the dozing host is waiting for scrims to fade out to change the display state. + */ + boolean hasPendingScreenOffCallback() { + return mPendingScreenOffCallback != null; + } + + /** + * Executes an nullifies the pending display state callback. + * + * @see #hasPendingScreenOffCallback() + * @see #prepareForGentleSleep(Runnable) + */ + void executePendingScreenOffCallback() { + if (mPendingScreenOffCallback == null) { + return; + } + mPendingScreenOffCallback.run(); + mPendingScreenOffCallback = null; + } + + boolean shouldAnimateWakeup() { + return mAnimateWakeup; + } + + boolean shouldAnimateScreenOff() { + return mAnimateScreenOff; + } + + public void setDozing(boolean dozing) { + mDozing = dozing; + } + + boolean getIgnoreTouchWhilePulsing() { + return mIgnoreTouchWhilePulsing; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java index dd200da56d20..7f31f3db4507 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java @@ -77,9 +77,12 @@ public class HeadsUpTouchHelper implements Gefingerpoken { ExpandableView child = mCallback.getChildAtRawPosition(x, y); mTouchingHeadsUpView = false; if (child instanceof ExpandableNotificationRow) { - mPickedChild = (ExpandableNotificationRow) child; + ExpandableNotificationRow pickedChild = (ExpandableNotificationRow) child; mTouchingHeadsUpView = !mCallback.isExpanded() - && mPickedChild.isHeadsUp() && mPickedChild.isPinned(); + && pickedChild.isHeadsUp() && pickedChild.isPinned(); + if (mTouchingHeadsUpView) { + mPickedChild = pickedChild; + } } else if (child == null && !mCallback.isExpanded()) { // We might touch above the visible heads up child, but then we still would // like to capture it. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt index d9de59efb08d..bf887044e05b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt @@ -21,17 +21,16 @@ import android.hardware.TriggerEvent import android.hardware.TriggerEventListener import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitorCallback -import com.android.systemui.Dependency import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.util.Assert import com.android.systemui.util.sensors.AsyncSensorManager class KeyguardLiftController constructor( private val statusBarStateController: StatusBarStateController, - private val asyncSensorManager: AsyncSensorManager + private val asyncSensorManager: AsyncSensorManager, + private val keyguardUpdateMonitor: KeyguardUpdateMonitor ) : StatusBarStateController.StateListener, KeyguardUpdateMonitorCallback() { - private val keyguardUpdateMonitor = Dependency.get(KeyguardUpdateMonitor::class.java) private val pickupSensor = asyncSensorManager.getDefaultSensor(Sensor.TYPE_PICK_UP_GESTURE) private var isListening = false private var bouncerVisible = false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 30fe68a28ef2..e00cfb16bd67 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -55,7 +55,6 @@ import android.view.ViewGroup; import android.view.WindowInsets; import android.view.accessibility.AccessibilityManager; import android.widget.FrameLayout; -import android.widget.LinearLayout; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; @@ -243,7 +242,7 @@ public class NotificationPanelView extends PanelView implements private View mQsNavbarScrim; protected NotificationsQuickSettingsContainer mNotificationContainerParent; protected NotificationStackScrollLayout mNotificationStackScroller; - protected LinearLayout mHomeControlsLayout; + protected FrameLayout mHomeControlsLayout; private boolean mAnimateNextPositionUpdate; private int mTrackingPointer; 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 6064fbedf63d..35039a0d74f9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -60,11 +60,13 @@ import java.lang.annotation.RetentionPolicy; import java.util.function.Consumer; import javax.inject.Inject; +import javax.inject.Singleton; /** * Controls both the scrim behind the notifications and in front of the notifications (when a * security method gets shown). */ +@Singleton public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnColorsChangedListener, Dumpable { 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 4e0af647da10..b8adfea8b059 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -50,7 +50,6 @@ import static com.android.systemui.statusbar.phone.BarTransitions.TransitionMode import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityOptions; @@ -157,10 +156,8 @@ import com.android.systemui.bubbles.BubbleController; import com.android.systemui.charging.WirelessChargingAnimation; import com.android.systemui.classifier.FalsingLog; import com.android.systemui.colorextraction.SysuiColorExtractor; -import com.android.systemui.doze.DozeEvent; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; -import com.android.systemui.doze.DozeReceiver; import com.android.systemui.fragments.ExtensionFragmentListener; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.keyguard.KeyguardSliceProvider; @@ -347,7 +344,7 @@ public class StatusBar extends SystemUI implements DemoMode, /** * The {@link StatusBarState} of the status bar. */ - protected int mState; + protected int mState; // TODO: remove this. Just use StatusBarStateController protected boolean mBouncerShowing; private PhoneStatusBarPolicy mIconPolicy; @@ -373,7 +370,7 @@ public class StatusBar extends SystemUI implements DemoMode, protected StatusBarWindowController mStatusBarWindowController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; @VisibleForTesting - DozeServiceHost mDozeServiceHost = new DozeServiceHost(); + DozeServiceHost mDozeServiceHost; private boolean mWakeUpComingFromTouch; private PointF mWakeUpTouchLocation; @@ -493,7 +490,6 @@ public class StatusBar extends SystemUI implements DemoMode, private final UiOffloadThread mUiOffloadThread; protected boolean mDozing; - private boolean mDozingRequested; private final NotificationMediaManager mMediaManager; private final NotificationLockscreenUserManager mLockscreenUserManager; @@ -612,7 +608,6 @@ public class StatusBar extends SystemUI implements DemoMode, private ActivityLaunchAnimator mActivityLaunchAnimator; protected StatusBarNotificationPresenter mPresenter; private NotificationActivityStarter mNotificationActivityStarter; - private boolean mPulsing; private final BubbleController mBubbleController; private final BubbleController.BubbleExpandListener mBubbleExpandListener; @@ -693,7 +688,10 @@ public class StatusBar extends SystemUI implements DemoMode, DozeParameters dozeParameters, ScrimController scrimController, Lazy<LockscreenWallpaper> lockscreenWallpaperLazy, - Lazy<BiometricUnlockController> biometricUnlockControllerLazy) { + Lazy<BiometricUnlockController> biometricUnlockControllerLazy, + DozeServiceHost dozeServiceHost, + PowerManager powerManager, + DozeScrimController dozeScrimController) { super(context); mFeatureFlags = featureFlags; mLightBarController = lightBarController; @@ -750,9 +748,12 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarWindowController = statusBarWindowController; mStatusBarWindowViewControllerBuilder = statusBarWindowViewControllerBuilder; mNotifLog = notifLog; + mDozeServiceHost = dozeServiceHost; + mPowerManager = powerManager; mDozeParameters = dozeParameters; mScrimController = scrimController; mLockscreenWallpaperLazy = lockscreenWallpaperLazy; + mDozeScrimController = dozeScrimController; mBiometricUnlockControllerLazy = biometricUnlockControllerLazy; mBubbleExpandListener = @@ -805,7 +806,6 @@ public class StatusBar extends SystemUI implements DemoMode, mAccessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); - mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mKeyguardUpdateMonitor.setKeyguardBypassController(mKeyguardBypassController); mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); @@ -905,6 +905,9 @@ public class StatusBar extends SystemUI implements DemoMode, startKeyguard(); mKeyguardUpdateMonitor.registerCallback(mUpdateCallback); + mDozeServiceHost.initialize(this, mNotificationIconAreaController, + mStatusBarWindowViewController, mStatusBarWindow, mStatusBarKeyguardViewManager, + mNotificationPanel, mAmbientIndicationContainer); putComponent(DozeHost.class, mDozeServiceHost); mScreenPinningRequest = new ScreenPinningRequest(mContext); @@ -1069,7 +1072,6 @@ public class StatusBar extends SystemUI implements DemoMode, mNotificationPanel.initDependencies(this, mGroupManager, mNotificationShelf, mHeadsUpManager, mNotificationIconAreaController, mScrimController); - mDozeScrimController = new DozeScrimController(mDozeParameters, mDozeLog); BackDropView backdrop = mStatusBarWindow.findViewById(R.id.backdrop); mMediaManager.setup(backdrop, backdrop.findViewById(R.id.backdrop_front), @@ -1730,7 +1732,7 @@ public class StatusBar extends SystemUI implements DemoMode, if (isDozing() && isHeadsUp) { entry.setPulseSuppressed(false); mDozeServiceHost.fireNotificationPulse(entry); - if (mPulsing) { + if (mDozeServiceHost.isPulsing()) { mDozeScrimController.cancelPendingPulseTimeout(); } } @@ -1762,7 +1764,7 @@ public class StatusBar extends SystemUI implements DemoMode, } public boolean isPulsing() { - return mPulsing; + return mDozeServiceHost.isPulsing(); } public boolean hideStatusBarIconsWhenExpanded() { @@ -2825,7 +2827,7 @@ public class StatusBar extends SystemUI implements DemoMode, if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP && mKeyguardStateController.canDismissLockScreen() && !mStatusBarStateController.leaveOpenOnKeyguardHide() - && isPulsing()) { + && mDozeServiceHost.isPulsing()) { // Reuse the biometric wake-and-unlock transition if we dismiss keyguard from a pulse. // TODO: Factor this transition out of BiometricUnlockController. mBiometricUnlockController.startWakeAndUnlock( @@ -3156,7 +3158,7 @@ public class StatusBar extends SystemUI implements DemoMode, return mState == StatusBarState.FULLSCREEN_USER_SWITCHER; } - private boolean updateIsKeyguard() { + boolean updateIsKeyguard() { boolean wakeAndUnlocking = mBiometricUnlockController.getMode() == BiometricUnlockController.MODE_WAKE_AND_UNLOCK; @@ -3164,8 +3166,8 @@ public class StatusBar extends SystemUI implements DemoMode, // there's no surface we can show to the user. Note that the device goes fully interactive // late in the transition, so we also allow the device to start dozing once the screen has // turned off fully. - boolean keyguardForDozing = mDozingRequested && - (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard)); + boolean keyguardForDozing = mDozeServiceHost.getDozingRequested() + && (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard)); boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested() || keyguardForDozing) && !wakeAndUnlocking; if (keyguardForDozing) { @@ -3581,7 +3583,7 @@ public class StatusBar extends SystemUI implements DemoMode, public void onStateChanged(int newState) { mState = newState; updateReportRejectedTouchVisibility(); - updateDozing(); + mDozeServiceHost.updateDozing(); updateTheme(); mNavigationBarController.touchAutoDim(mDisplayId); Trace.beginSection("StatusBar#updateKeyguardState"); @@ -3619,36 +3621,23 @@ public class StatusBar extends SystemUI implements DemoMode, public void onDozingChanged(boolean isDozing) { Trace.beginSection("StatusBar#updateDozing"); mDozing = isDozing; + mDozeServiceHost.setDozing(mDozing); // Collapse the notification panel if open - boolean dozingAnimated = mDozingRequested && mDozeParameters.shouldControlScreenOff(); + boolean dozingAnimated = mDozeServiceHost.getDozingRequested() + && mDozeParameters.shouldControlScreenOff(); mNotificationPanel.resetViews(dozingAnimated); updateQsExpansionEnabled(); mKeyguardViewMediator.setDozing(mDozing); mEntryManager.updateNotifications("onDozingChanged"); - updateDozingState(); + mDozeServiceHost.updateDozing(); updateScrimController(); updateReportRejectedTouchVisibility(); Trace.endSection(); } - private void updateDozing() { - // When in wake-and-unlock while pulsing, keep dozing state until fully unlocked. - boolean dozing = mDozingRequested && mState == StatusBarState.KEYGUARD - || mBiometricUnlockController.getMode() - == BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING; - // When in wake-and-unlock we may not have received a change to mState - // but we still should not be dozing, manually set to false. - if (mBiometricUnlockController.getMode() == - BiometricUnlockController.MODE_WAKE_AND_UNLOCK) { - dozing = false; - } - - mStatusBarStateController.setIsDozing(dozing); - } - private void updateKeyguardState() { mKeyguardStateController.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(), mStatusBarKeyguardViewManager.isOccluded()); @@ -3873,10 +3862,11 @@ public class StatusBar extends SystemUI implements DemoMode, * collapse the panel after we expanded it, and thus we would end up with a blank * Keyguard. */ - private void updateNotificationPanelTouchState() { + void updateNotificationPanelTouchState() { boolean goingToSleepWithoutAnimation = isGoingToSleep() && !mDozeParameters.shouldControlScreenOff(); - boolean disabled = (!mDeviceInteractive && !mPulsing) || goingToSleepWithoutAnimation; + boolean disabled = (!mDeviceInteractive && !mDozeServiceHost.isPulsing()) + || goingToSleepWithoutAnimation; mNotificationPanel.setTouchAndAnimationDisabled(disabled); mNotificationIconAreaController.setAnimationsEnabled(!disabled); } @@ -4026,7 +4016,7 @@ public class StatusBar extends SystemUI implements DemoMode, } public void notifyBiometricAuthModeChanged() { - updateDozing(); + mDozeServiceHost.updateDozing(); updateScrimController(); mStatusBarWindowViewController.onBiometricAuthModeChanged( mBiometricUnlockController.isWakeAndUnlock(), @@ -4062,7 +4052,7 @@ public class StatusBar extends SystemUI implements DemoMode, mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); } else if (mBrightnessMirrorVisible) { mScrimController.transitionTo(ScrimState.BRIGHTNESS_MIRROR); - } else if (isPulsing()) { + } else if (mDozeServiceHost.isPulsing()) { mScrimController.transitionTo(ScrimState.PULSING, mDozeScrimController.getScrimCallback()); } else if (mDozeServiceHost.hasPendingScreenOffCallback()) { @@ -4092,295 +4082,8 @@ public class StatusBar extends SystemUI implements DemoMode, return mStatusBarKeyguardViewManager.isShowing(); } - @VisibleForTesting - final class DozeServiceHost implements DozeHost { - private final ArrayList<Callback> mCallbacks = new ArrayList<>(); - private boolean mAnimateWakeup; - private boolean mAnimateScreenOff; - private boolean mIgnoreTouchWhilePulsing; - private Runnable mPendingScreenOffCallback; - @VisibleForTesting - boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean( - "persist.sysui.wake_performs_auth", true); - - @Override - public String toString() { - return "PSB.DozeServiceHost[mCallbacks=" + mCallbacks.size() + "]"; - } - - public void firePowerSaveChanged(boolean active) { - for (Callback callback : mCallbacks) { - callback.onPowerSaveChanged(active); - } - } - - public void fireNotificationPulse(NotificationEntry entry) { - Runnable pulseSupressedListener = () -> { - entry.setPulseSuppressed(true); - mNotificationIconAreaController.updateAodNotificationIcons(); - }; - for (Callback callback : mCallbacks) { - callback.onNotificationAlerted(pulseSupressedListener); - } - } - - @Override - public void addCallback(@NonNull Callback callback) { - mCallbacks.add(callback); - } - - @Override - public void removeCallback(@NonNull Callback callback) { - mCallbacks.remove(callback); - } - - @Override - public void startDozing() { - if (!mDozingRequested) { - mDozingRequested = true; - mDozeLog.traceDozing(mDozing); - updateDozing(); - updateIsKeyguard(); - } - } - - @Override - public void pulseWhileDozing(@NonNull PulseCallback callback, int reason) { - if (reason == DozeEvent.PULSE_REASON_SENSOR_LONG_PRESS) { - mPowerManager.wakeUp(SystemClock.uptimeMillis(), PowerManager.WAKE_REASON_GESTURE, - "com.android.systemui:LONG_PRESS"); - startAssist(new Bundle()); - return; - } - - if (reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN) { - mScrimController.setWakeLockScreenSensorActive(true); - } - - if (reason == DozeEvent.PULSE_REASON_DOCKING && mStatusBarWindow != null) { - mStatusBarWindowViewController.suppressWakeUpGesture(true); - } - - boolean passiveAuthInterrupt = reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN - && mWakeLockScreenPerformsAuth; - // Set the state to pulsing, so ScrimController will know what to do once we ask it to - // execute the transition. The pulse callback will then be invoked when the scrims - // are black, indicating that StatusBar is ready to present the rest of the UI. - mPulsing = true; - mDozeScrimController.pulse(new PulseCallback() { - @Override - public void onPulseStarted() { - callback.onPulseStarted(); - updateNotificationPanelTouchState(); - setPulsing(true); - } - - @Override - public void onPulseFinished() { - mPulsing = false; - callback.onPulseFinished(); - updateNotificationPanelTouchState(); - mScrimController.setWakeLockScreenSensorActive(false); - if (mStatusBarWindow != null) { - mStatusBarWindowViewController.suppressWakeUpGesture(false); - } - setPulsing(false); - } - - private void setPulsing(boolean pulsing) { - mStatusBarStateController.setPulsing(pulsing); - mStatusBarKeyguardViewManager.setPulsing(pulsing); - mKeyguardViewMediator.setPulsing(pulsing); - mNotificationPanel.setPulsing(pulsing); - mVisualStabilityManager.setPulsing(pulsing); - mStatusBarWindowViewController.setPulsing(pulsing); - mIgnoreTouchWhilePulsing = false; - if (mKeyguardUpdateMonitor != null && passiveAuthInterrupt) { - mKeyguardUpdateMonitor.onAuthInterruptDetected(pulsing /* active */); - } - updateScrimController(); - mPulseExpansionHandler.setPulsing(pulsing); - mWakeUpCoordinator.setPulsing(pulsing); - } - }, reason); - // DozeScrimController is in pulse state, now let's ask ScrimController to start - // pulsing and draw the black frame, if necessary. - updateScrimController(); - } - - @Override - public void stopDozing() { - if (mDozingRequested) { - mDozingRequested = false; - mDozeLog.traceDozing(mDozing); - updateDozing(); - } - } - - @Override - public void onIgnoreTouchWhilePulsing(boolean ignore) { - if (ignore != mIgnoreTouchWhilePulsing) { - mDozeLog.tracePulseTouchDisabledByProx(ignore); - } - mIgnoreTouchWhilePulsing = ignore; - if (isDozing() && ignore) { - mStatusBarWindowViewController.cancelCurrentTouch(); - } - } - - @Override - public void dozeTimeTick() { - mNotificationPanel.dozeTimeTick(); - if (mAmbientIndicationContainer instanceof DozeReceiver) { - ((DozeReceiver) mAmbientIndicationContainer).dozeTimeTick(); - } - } - - @Override - public boolean isPowerSaveActive() { - return mBatteryController.isAodPowerSave(); - } - - @Override - public boolean isPulsingBlocked() { - return mBiometricUnlockController.getMode() - == BiometricUnlockController.MODE_WAKE_AND_UNLOCK; - } - - @Override - public boolean isProvisioned() { - return mDeviceProvisionedController.isDeviceProvisioned() - && mDeviceProvisionedController.isCurrentUserSetup(); - } - - @Override - public boolean isBlockingDoze() { - if (mBiometricUnlockController.hasPendingAuthentication()) { - Log.i(TAG, "Blocking AOD because fingerprint has authenticated"); - return true; - } - return false; - } - - @Override - public void extendPulse(int reason) { - if (reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN) { - mScrimController.setWakeLockScreenSensorActive(true); - } - if (mDozeScrimController.isPulsing() && mHeadsUpManager.hasNotifications()) { - mHeadsUpManager.extendHeadsUp(); - } else { - mDozeScrimController.extendPulse(); - } - } - - @Override - public void stopPulsing() { - if (mDozeScrimController.isPulsing()) { - mDozeScrimController.pulseOutNow(); - } - } - - @Override - public void setAnimateWakeup(boolean animateWakeup) { - if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_AWAKE - || mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_WAKING) { - // Too late to change the wakeup animation. - return; - } - mAnimateWakeup = animateWakeup; - } - - @Override - public void setAnimateScreenOff(boolean animateScreenOff) { - mAnimateScreenOff = animateScreenOff; - } - - @Override - public void onSlpiTap(float screenX, float screenY) { - if (screenX > 0 && screenY > 0 && mAmbientIndicationContainer != null - && mAmbientIndicationContainer.getVisibility() == View.VISIBLE) { - mAmbientIndicationContainer.getLocationOnScreen(mTmpInt2); - float viewX = screenX - mTmpInt2[0]; - float viewY = screenY - mTmpInt2[1]; - if (0 <= viewX && viewX <= mAmbientIndicationContainer.getWidth() - && 0 <= viewY && viewY <= mAmbientIndicationContainer.getHeight()) { - dispatchTap(mAmbientIndicationContainer, viewX, viewY); - } - } - } - - @Override - public void setDozeScreenBrightness(int value) { - mStatusBarWindowController.setDozeScreenBrightness(value); - } - - @Override - public void setAodDimmingScrim(float scrimOpacity) { - mScrimController.setAodFrontScrimAlpha(scrimOpacity); - } - - @Override - public void prepareForGentleSleep(Runnable onDisplayOffCallback) { - if (mPendingScreenOffCallback != null) { - Log.w(TAG, "Overlapping onDisplayOffCallback. Ignoring previous one."); - } - mPendingScreenOffCallback = onDisplayOffCallback; - updateScrimController(); - } - - @Override - public void cancelGentleSleep() { - mPendingScreenOffCallback = null; - if (mScrimController.getState() == ScrimState.OFF) { - updateScrimController(); - } - } - - /** - * When the dozing host is waiting for scrims to fade out to change the display state. - */ - boolean hasPendingScreenOffCallback() { - return mPendingScreenOffCallback != null; - } - - /** - * Executes an nullifies the pending display state callback. - * - * @see #hasPendingScreenOffCallback() - * @see #prepareForGentleSleep(Runnable) - */ - void executePendingScreenOffCallback() { - if (mPendingScreenOffCallback == null) { - return; - } - mPendingScreenOffCallback.run(); - mPendingScreenOffCallback = null; - } - - private void dispatchTap(View view, float x, float y) { - long now = SystemClock.elapsedRealtime(); - dispatchTouchEvent(view, x, y, now, MotionEvent.ACTION_DOWN); - dispatchTouchEvent(view, x, y, now, MotionEvent.ACTION_UP); - } - - private void dispatchTouchEvent(View view, float x, float y, long now, int action) { - MotionEvent ev = MotionEvent.obtain(now, now, action, x, y, 0 /* meta */); - view.dispatchTouchEvent(ev); - ev.recycle(); - } - - private boolean shouldAnimateWakeup() { - return mAnimateWakeup; - } - - public boolean shouldAnimateScreenOff() { - return mAnimateScreenOff; - } - } - public boolean shouldIgnoreTouch() { - return isDozing() && mDozeServiceHost.mIgnoreTouchWhilePulsing; + return isDozing() && mDozeServiceHost.getIgnoreTouchWhilePulsing(); } // Begin Extra BaseStatusBar methods. @@ -4407,7 +4110,7 @@ public class StatusBar extends SystemUI implements DemoMode, private boolean mVisibleToUser; protected DevicePolicyManager mDevicePolicyManager; - protected PowerManager mPowerManager; + private final PowerManager mPowerManager; protected StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; protected KeyguardManager mKeyguardManager; 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 7b4a7d20293c..502a9bd34b12 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -679,8 +679,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene } }; - InputConnection ic = InputConnectionCompat.createWrapper( - inputConnection, outAttrs, callback); + InputConnection ic = inputConnection == null ? null : + InputConnectionCompat.createWrapper(inputConnection, outAttrs, callback); Context userContext = null; try { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/AudioRecordingDisclosureBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/AudioRecordingDisclosureBar.java index d6d0a3603c25..9b685f0ad0f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/AudioRecordingDisclosureBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/AudioRecordingDisclosureBar.java @@ -30,6 +30,7 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.ViewPropertyAnimator; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.ImageView; @@ -45,7 +46,10 @@ class AudioRecordingDisclosureBar { private static final String TAG = "AudioRecordingDisclosureBar"; private static final boolean DEBUG = false; - private static final String LAYOUT_PARAMS_TITLE = "AudioRecordingDisclosureBar"; + // This title is used to test the microphone disclosure indicator in + // CtsSystemUiHostTestCases:TvMicrophoneCaptureIndicatorTest + private static final String LAYOUT_PARAMS_TITLE = "MicrophoneCaptureIndicator"; + private static final int ANIM_DURATION_MS = 150; private final Context mContext; @@ -70,6 +74,7 @@ class AudioRecordingDisclosureBar { } private void createView() { + //TODO(b/142228704): this is to be re-implemented once proper design is completed mView = View.inflate(mContext, R.layout.tv_status_bar_audio_recording, null); mAppsInfoContainer = mView.findViewById(R.id.container); @@ -88,7 +93,7 @@ class AudioRecordingDisclosureBar { Context.WINDOW_SERVICE); windowManager.addView(mView, layoutParams); - // Set invisible first util it gains its actual size and we are able to hide it by moving + // Set invisible first until it gains its actual size and we are able to hide it by moving // off the screen mView.setVisibility(View.INVISIBLE); mView.getViewTreeObserver().addOnGlobalLayoutListener( @@ -98,16 +103,18 @@ class AudioRecordingDisclosureBar { // Now that we get the height, we can move the bar off ("below") the screen final int height = mView.getHeight(); mView.setTranslationY(height); - // ... and make it visible - mView.setVisibility(View.VISIBLE); // Remove the observer mView.getViewTreeObserver() .removeOnGlobalLayoutListener(this); + // Now, that the view has been measured, and the translation was set to + // move it off the screen, we change the visibility to GONE + mView.setVisibility(View.GONE); } }); } private void showAudioRecordingDisclosureBar() { + mView.setVisibility(View.VISIBLE); mView.animate() .translationY(0f) .setDuration(ANIM_DURATION_MS) @@ -138,9 +145,10 @@ class AudioRecordingDisclosureBar { } private void hideAudioRecordingDisclosureBar() { - mView.animate() - .translationY(mView.getHeight()) + final ViewPropertyAnimator animator = mView.animate(); + animator.translationY(mView.getHeight()) .setDuration(ANIM_DURATION_MS) + .withEndAction(() -> mView.setVisibility(View.GONE)) .start(); } @@ -156,7 +164,7 @@ class AudioRecordingDisclosureBar { public void onOpActiveChanged(String op, int uid, String packageName, boolean active) { if (DEBUG) { Log.d(TAG, - "OP_RECORD_AUDIO active change, active" + active + ", app=" + packageName); + "OP_RECORD_AUDIO active change, active=" + active + ", app=" + packageName); } if (mExemptApps.contains(packageName)) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java index c338d7031fea..7359fdce462d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java @@ -61,9 +61,13 @@ import com.android.systemui.tuner.TunerService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import java.util.Collections; +import dagger.Lazy; + @RunWithLooper @RunWith(AndroidTestingRunner.class) @SmallTest @@ -71,16 +75,19 @@ public class ScreenDecorationsTest extends SysuiTestCase { private TestableLooper mTestableLooper; private ScreenDecorations mScreenDecorations; - private StatusBar mStatusBar; + @Mock private StatusBar mStatusBar; private WindowManager mWindowManager; private FragmentService mFragmentService; private FragmentHostManager mFragmentHostManager; private TunerService mTunerService; private StatusBarWindowView mView; private TunablePaddingService mTunablePaddingService; + @Mock private Lazy<StatusBar> mStatusBarLazy; @Before public void setup() { + MockitoAnnotations.initMocks(this); + mTestableLooper = TestableLooper.get(this); mDependency.injectTestDependency(Dependency.MAIN_HANDLER, new Handler(mTestableLooper.getLooper())); @@ -88,11 +95,10 @@ public class ScreenDecorationsTest extends SysuiTestCase { mTunerService = mDependency.injectMockDependency(TunerService.class); mFragmentService = mDependency.injectMockDependency(FragmentService.class); - mStatusBar = mock(StatusBar.class); mWindowManager = mock(WindowManager.class); mView = spy(new StatusBarWindowView(mContext, null)); + when(mStatusBarLazy.get()).thenReturn(mStatusBar); when(mStatusBar.getStatusBarWindow()).thenReturn(mView); - mContext.putComponent(StatusBar.class, mStatusBar); Display display = mContext.getSystemService(WindowManager.class).getDefaultDisplay(); when(mWindowManager.getDefaultDisplay()).thenReturn(display); @@ -102,7 +108,7 @@ public class ScreenDecorationsTest extends SysuiTestCase { when(mFragmentService.getFragmentHostManager(any())).thenReturn(mFragmentHostManager); - mScreenDecorations = new ScreenDecorations(mContext) { + mScreenDecorations = new ScreenDecorations(mContext, mStatusBarLazy) { @Override public void start() { super.start(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java index b089b740fc47..85d818ac8be3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -389,6 +389,20 @@ public class AuthControllerTest extends SysuiTestCase { verify(mReceiver).onDialogDismissed(eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL)); } + @Test + public void testDoesNotCrash_whenTryAgainPressedAfterDismissal() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED); + mAuthController.onTryAgainPressed(); + } + + @Test + public void testDoesNotCrash_whenDeviceCredentialPressedAfterDismissal() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED); + mAuthController.onDeviceCredentialPressed(); + } + // Helpers private void showDialog(int authenticators, int biometricModality) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java index 8f4de3f114a2..47b35fdc6dc1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java @@ -22,7 +22,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.anyObject; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -60,6 +59,8 @@ import org.mockito.MockitoAnnotations; import java.time.Duration; import java.util.concurrent.TimeUnit; +import dagger.Lazy; + @RunWith(AndroidTestingRunner.class) @RunWithLooper @SmallTest @@ -86,6 +87,8 @@ public class PowerUITest extends SysuiTestCase { private IThermalEventListener mUsbThermalEventListener; private IThermalEventListener mSkinThermalEventListener; @Mock private BroadcastDispatcher mBroadcastDispatcher; + @Mock private Lazy<StatusBar> mStatusBarLazy; + @Mock private StatusBar mStatusBar; @Before public void setup() { @@ -93,7 +96,8 @@ public class PowerUITest extends SysuiTestCase { mMockWarnings = mDependency.injectMockDependency(WarningsUI.class); mEnhancedEstimates = mDependency.injectMockDependency(EnhancedEstimates.class); - mContext.putComponent(StatusBar.class, mock(StatusBar.class)); + when(mStatusBarLazy.get()).thenReturn(mStatusBar); + mContext.addMockSystemService(Context.POWER_SERVICE, mPowerManager); createPowerUi(); @@ -682,7 +686,7 @@ public class PowerUITest extends SysuiTestCase { } private void createPowerUi() { - mPowerUI = new PowerUI(mContext, mBroadcastDispatcher); + mPowerUI = new PowerUI(mContext, mBroadcastDispatcher, mStatusBarLazy); mPowerUI.mComponents = mContext.getComponents(); mPowerUI.mThermalService = mThermalServiceMock; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java new file mode 100644 index 000000000000..b05172c6d7c2 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import static org.junit.Assert.assertFalse; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.os.PowerManager; +import android.testing.AndroidTestingRunner; +import android.view.View; + +import androidx.test.filters.SmallTest; + +import com.android.keyguard.KeyguardUpdateMonitor; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.assist.AssistManager; +import com.android.systemui.doze.DozeEvent; +import com.android.systemui.doze.DozeHost; +import com.android.systemui.doze.DozeLog; +import com.android.systemui.keyguard.KeyguardViewMediator; +import com.android.systemui.keyguard.WakefulnessLifecycle; +import com.android.systemui.statusbar.PulseExpansionHandler; +import com.android.systemui.statusbar.StatusBarState; +import com.android.systemui.statusbar.StatusBarStateControllerImpl; +import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; +import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.policy.BatteryController; +import com.android.systemui.statusbar.policy.DeviceProvisionedController; + +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.Arrays; +import java.util.Collections; +import java.util.HashSet; + +import dagger.Lazy; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +public class DozeServiceHostTest extends SysuiTestCase { + + private DozeServiceHost mDozeServiceHost; + + @Mock private HeadsUpManagerPhone mHeadsUpManager; + @Mock private ScrimController mScrimController; + @Mock private DozeScrimController mDozeScrimController; + @Mock private Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy; + @Mock private VisualStabilityManager mVisualStabilityManager; + @Mock private KeyguardViewMediator mKeyguardViewMediator; + @Mock private StatusBarStateControllerImpl mStatusBarStateController; + @Mock private BatteryController mBatteryController; + @Mock private DeviceProvisionedController mDeviceProvisionedController; + @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; + @Mock private AssistManager mAssistManager; + @Mock private DozeLog mDozeLog; + @Mock private PulseExpansionHandler mPulseExpansionHandler; + @Mock private NotificationWakeUpCoordinator mNotificationWakeUpCoordinator; + @Mock private StatusBarWindowController mStatusBarWindowController; + @Mock private PowerManager mPowerManager; + @Mock private WakefulnessLifecycle mWakefullnessLifecycle; + @Mock private StatusBar mStatusBar; + @Mock private NotificationIconAreaController mNotificationIconAreaController; + @Mock private StatusBarWindowViewController mStatusBarWindowViewController; + @Mock private StatusBarWindowView mStatusBarWindow; + @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + @Mock private NotificationPanelView mNotificationPanel; + @Mock private View mAmbientIndicationContainer; + @Mock private BiometricUnlockController mBiometricUnlockController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mBiometricUnlockControllerLazy.get()).thenReturn(mBiometricUnlockController); + mDozeServiceHost = new DozeServiceHost(mDozeLog, mPowerManager, mWakefullnessLifecycle, + mStatusBarStateController, mDeviceProvisionedController, mHeadsUpManager, + mBatteryController, mScrimController, mBiometricUnlockControllerLazy, + mKeyguardViewMediator, mAssistManager, mDozeScrimController, mKeyguardUpdateMonitor, + mVisualStabilityManager, mPulseExpansionHandler, mStatusBarWindowController, + mNotificationWakeUpCoordinator); + + mDozeServiceHost.initialize(mStatusBar, mNotificationIconAreaController, + mStatusBarWindowViewController, mStatusBarWindow, mStatusBarKeyguardViewManager, + mNotificationPanel, mAmbientIndicationContainer); + } + + @Test + public void testStartStopDozing() { + when(mStatusBarStateController.getState()).thenReturn(StatusBarState.KEYGUARD); + when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); + + assertFalse(mDozeServiceHost.getDozingRequested()); + + mDozeServiceHost.startDozing(); + verify(mStatusBarStateController).setIsDozing(eq(true)); + verify(mStatusBar).updateIsKeyguard(); + + mDozeServiceHost.stopDozing(); + verify(mStatusBarStateController).setIsDozing(eq(false)); + } + + + @Test + public void testPulseWhileDozing_updatesScrimController() { + mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); + mStatusBar.showKeyguardImpl(); + + // Keep track of callback to be able to stop the pulse +// DozeHost.PulseCallback[] pulseCallback = new DozeHost.PulseCallback[1]; +// doAnswer(invocation -> { +// pulseCallback[0] = invocation.getArgument(0); +// return null; +// }).when(mDozeScrimController).pulse(any(), anyInt()); + + // Starting a pulse should change the scrim controller to the pulsing state + mDozeServiceHost.pulseWhileDozing(new DozeHost.PulseCallback() { + @Override + public void onPulseStarted() { + } + + @Override + public void onPulseFinished() { + } + }, DozeEvent.PULSE_REASON_NOTIFICATION); + + ArgumentCaptor<DozeHost.PulseCallback> pulseCallbackArgumentCaptor = + ArgumentCaptor.forClass(DozeHost.PulseCallback.class); + + verify(mDozeScrimController).pulse( + pulseCallbackArgumentCaptor.capture(), eq(DozeEvent.PULSE_REASON_NOTIFICATION)); + verify(mStatusBar).updateScrimController(); + reset(mStatusBar); + + pulseCallbackArgumentCaptor.getValue().onPulseFinished(); + assertFalse(mDozeScrimController.isPulsing()); + verify(mStatusBar).updateScrimController(); + } + + + @Test + public void testPulseWhileDozingWithDockingReason_suppressWakeUpGesture() { + // Keep track of callback to be able to stop the pulse + final DozeHost.PulseCallback[] pulseCallback = new DozeHost.PulseCallback[1]; + doAnswer(invocation -> { + pulseCallback[0] = invocation.getArgument(0); + return null; + }).when(mDozeScrimController).pulse(any(), anyInt()); + + // Starting a pulse while docking should suppress wakeup gesture + mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), + DozeEvent.PULSE_REASON_DOCKING); + verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(true)); + + // Ending a pulse should restore wakeup gesture + pulseCallback[0].onPulseFinished(); + verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(false)); + } + + @Test + public void testPulseWhileDozing_notifyAuthInterrupt() { + HashSet<Integer> reasonsWantingAuth = new HashSet<>( + Collections.singletonList(DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN)); + HashSet<Integer> reasonsSkippingAuth = new HashSet<>( + Arrays.asList(DozeEvent.PULSE_REASON_INTENT, + DozeEvent.PULSE_REASON_NOTIFICATION, + DozeEvent.PULSE_REASON_SENSOR_SIGMOTION, + DozeEvent.REASON_SENSOR_PICKUP, + DozeEvent.REASON_SENSOR_DOUBLE_TAP, + DozeEvent.PULSE_REASON_SENSOR_LONG_PRESS, + DozeEvent.PULSE_REASON_DOCKING, + DozeEvent.REASON_SENSOR_WAKE_UP, + DozeEvent.REASON_SENSOR_TAP)); + HashSet<Integer> reasonsThatDontPulse = new HashSet<>( + Arrays.asList(DozeEvent.REASON_SENSOR_PICKUP, + DozeEvent.REASON_SENSOR_DOUBLE_TAP, + DozeEvent.REASON_SENSOR_TAP)); + + doAnswer(invocation -> { + DozeHost.PulseCallback callback = invocation.getArgument(0); + callback.onPulseStarted(); + return null; + }).when(mDozeScrimController).pulse(any(), anyInt()); + + mDozeServiceHost.mWakeLockScreenPerformsAuth = true; + for (int i = 0; i < DozeEvent.TOTAL_REASONS; i++) { + reset(mKeyguardUpdateMonitor); + mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), i); + if (reasonsWantingAuth.contains(i)) { + verify(mKeyguardUpdateMonitor).onAuthInterruptDetected(eq(true)); + } else if (reasonsSkippingAuth.contains(i) || reasonsThatDontPulse.contains(i)) { + verify(mKeyguardUpdateMonitor, never()).onAuthInterruptDetected(eq(true)); + } else { + throw new AssertionError("Reason " + i + " isn't specified as wanting or skipping" + + " passive auth. Please consider how this pulse reason should behave."); + } + } + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index f5e92e4f3181..66c01ca58491 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -85,8 +85,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.bubbles.BubbleController; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.colorextraction.SysuiColorExtractor; -import com.android.systemui.doze.DozeEvent; -import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; @@ -145,9 +143,6 @@ import org.mockito.MockitoAnnotations; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import dagger.Lazy; @@ -231,6 +226,7 @@ public class StatusBarTest extends SysuiTestCase { @Mock private DozeParameters mDozeParameters; @Mock private Lazy<LockscreenWallpaper> mLockscreenWallpaperLazy; @Mock private LockscreenWallpaper mLockscreenWallpaper; + @Mock private DozeServiceHost mDozeServiceHost; @Mock private LinearLayout mLockIconContainer; @Mock private ViewMediatorCallback mKeyguardVieMediatorCallback; @@ -365,7 +361,10 @@ public class StatusBarTest extends SysuiTestCase { mDozeParameters, mScrimController, mLockscreenWallpaperLazy, - mBiometricUnlockControllerLazy); + mBiometricUnlockControllerLazy, + mDozeServiceHost, + mPowerManager, + mDozeScrimController); when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn( mLockIconContainer); @@ -388,7 +387,6 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.mNotificationIconAreaController = mNotificationIconAreaController; mStatusBar.mPresenter = mNotificationPresenter; mStatusBar.mKeyguardIndicationController = mKeyguardIndicationController; - mStatusBar.mPowerManager = mPowerManager; mStatusBar.mBarService = mBarService; mStatusBar.mStackScroller = mStackScroller; mStatusBar.mStatusBarWindowViewController = mStatusBarWindowViewController; @@ -757,83 +755,18 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); mStatusBar.showKeyguardImpl(); - // Keep track of callback to be able to stop the pulse - DozeHost.PulseCallback[] pulseCallback = new DozeHost.PulseCallback[1]; - doAnswer(invocation -> { - pulseCallback[0] = invocation.getArgument(0); - return null; - }).when(mDozeScrimController).pulse(any(), anyInt()); - // Starting a pulse should change the scrim controller to the pulsing state - mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), - DozeEvent.PULSE_REASON_NOTIFICATION); + when(mDozeServiceHost.isPulsing()).thenReturn(true); + mStatusBar.updateScrimController(); verify(mScrimController).transitionTo(eq(ScrimState.PULSING), any()); // Ending a pulse should take it back to keyguard state - pulseCallback[0].onPulseFinished(); + when(mDozeServiceHost.isPulsing()).thenReturn(false); + mStatusBar.updateScrimController(); verify(mScrimController).transitionTo(eq(ScrimState.KEYGUARD)); } @Test - public void testPulseWhileDozing_notifyAuthInterrupt() { - HashSet<Integer> reasonsWantingAuth = new HashSet<>( - Collections.singletonList(DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN)); - HashSet<Integer> reasonsSkippingAuth = new HashSet<>( - Arrays.asList(DozeEvent.PULSE_REASON_INTENT, - DozeEvent.PULSE_REASON_NOTIFICATION, - DozeEvent.PULSE_REASON_SENSOR_SIGMOTION, - DozeEvent.REASON_SENSOR_PICKUP, - DozeEvent.REASON_SENSOR_DOUBLE_TAP, - DozeEvent.PULSE_REASON_SENSOR_LONG_PRESS, - DozeEvent.PULSE_REASON_DOCKING, - DozeEvent.REASON_SENSOR_WAKE_UP, - DozeEvent.REASON_SENSOR_TAP)); - HashSet<Integer> reasonsThatDontPulse = new HashSet<>( - Arrays.asList(DozeEvent.REASON_SENSOR_PICKUP, - DozeEvent.REASON_SENSOR_DOUBLE_TAP, - DozeEvent.REASON_SENSOR_TAP)); - - doAnswer(invocation -> { - DozeHost.PulseCallback callback = invocation.getArgument(0); - callback.onPulseStarted(); - return null; - }).when(mDozeScrimController).pulse(any(), anyInt()); - - mStatusBar.mDozeServiceHost.mWakeLockScreenPerformsAuth = true; - for (int i = 0; i < DozeEvent.TOTAL_REASONS; i++) { - reset(mKeyguardUpdateMonitor); - mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), i); - if (reasonsWantingAuth.contains(i)) { - verify(mKeyguardUpdateMonitor).onAuthInterruptDetected(eq(true)); - } else if (reasonsSkippingAuth.contains(i) || reasonsThatDontPulse.contains(i)) { - verify(mKeyguardUpdateMonitor, never()).onAuthInterruptDetected(eq(true)); - } else { - throw new AssertionError("Reason " + i + " isn't specified as wanting or skipping" - + " passive auth. Please consider how this pulse reason should behave."); - } - } - } - - @Test - public void testPulseWhileDozingWithDockingReason_suppressWakeUpGesture() { - // Keep track of callback to be able to stop the pulse - final DozeHost.PulseCallback[] pulseCallback = new DozeHost.PulseCallback[1]; - doAnswer(invocation -> { - pulseCallback[0] = invocation.getArgument(0); - return null; - }).when(mDozeScrimController).pulse(any(), anyInt()); - - // Starting a pulse while docking should suppress wakeup gesture - mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), - DozeEvent.PULSE_REASON_DOCKING); - verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(true)); - - // Ending a pulse should restore wakeup gesture - pulseCallback[0].onPulseFinished(); - verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(false)); - } - - @Test public void testSetState_changesIsFullScreenUserSwitcherState() { mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); assertFalse(mStatusBar.isFullScreenUserSwitcherState()); @@ -859,27 +792,17 @@ public class StatusBarTest extends SysuiTestCase { } @Test - public void testStartStopDozing() { - mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); - when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); - - mStatusBar.mDozeServiceHost.startDozing(); - verify(mStatusBarStateController).setIsDozing(eq(true)); - - mStatusBar.mDozeServiceHost.stopDozing(); - verify(mStatusBarStateController).setIsDozing(eq(false)); - } - - @Test public void testOnStartedWakingUp_isNotDozing() { mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); - mStatusBar.mDozeServiceHost.startDozing(); - verify(mStatusBarStateController).setIsDozing(eq(true)); + when(mDozeServiceHost.getDozingRequested()).thenReturn(true); + mStatusBar.updateIsKeyguard(); + // TODO: mNotificationPanelView.expand(false) gets called twice. Should be once. + verify(mNotificationPanelView, times(2)).expand(eq(false)); clearInvocations(mNotificationPanelView); mStatusBar.mWakefulnessObserver.onStartedWakingUp(); - verify(mStatusBarStateController).setIsDozing(eq(false)); + verify(mDozeServiceHost).stopDozing(); verify(mNotificationPanelView).expand(eq(false)); } @@ -887,7 +810,8 @@ public class StatusBarTest extends SysuiTestCase { public void testOnStartedWakingUp_doesNotDismissBouncer_whenPulsing() { mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); when(mStatusBarStateController.isKeyguardRequested()).thenReturn(true); - mStatusBar.mDozeServiceHost.startDozing(); + when(mDozeServiceHost.getDozingRequested()).thenReturn(true); + mStatusBar.updateIsKeyguard(); clearInvocations(mNotificationPanelView); mStatusBar.setBouncerShowing(true); diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp new file mode 100644 index 000000000000..dc88fd4014da --- /dev/null +++ b/packages/Tethering/Android.bp @@ -0,0 +1,72 @@ +// +// 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. +// + +java_defaults { + name: "TetheringAndroidLibraryDefaults", + platform_apis: true, + srcs: [ + "src/**/*.java", + ":framework-tethering-shared-srcs", + ":services-tethering-shared-srcs", + ], + static_libs: [ + "androidx.annotation_annotation", + "tethering-client", + ], + manifest: "AndroidManifestBase.xml", +} + +// Build tethering static library, used to compile both variants of the tethering. +android_library { + name: "TetheringApiCurrentLib", + defaults: ["TetheringAndroidLibraryDefaults"], +} + +// Common defaults for compiling the actual APK. +java_defaults { + name: "TetheringAppDefaults", + platform_apis: true, + privileged: true, + resource_dirs: [ + "res", + ], + optimize: { + proguard_flags_files: ["proguard.flags"], + }, +} + +// Non-updatable tethering running in the system server process for devices not using the module +// TODO: build in-process tethering APK here. + +// Updatable tethering packaged as an application +android_app { + name: "Tethering", + defaults: ["TetheringAppDefaults"], + static_libs: ["TetheringApiCurrentLib"], + certificate: "networkstack", + manifest: "AndroidManifest.xml", + use_embedded_native_libs: true, + // The permission configuration *must* be included to ensure security of the device + required: ["NetworkPermissionConfig"], +} + +// This group will be removed when tethering migration is done. +filegroup { + name: "tethering-services-srcs", + srcs: [ + "src/com/android/server/connectivity/tethering/TetheringConfiguration.java", + ], +} diff --git a/packages/Tethering/AndroidManifest.xml b/packages/Tethering/AndroidManifest.xml new file mode 100644 index 000000000000..eb51593e4538 --- /dev/null +++ b/packages/Tethering/AndroidManifest.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tethering" + android:sharedUserId="android.uid.networkstack"> + <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" /> + + <application + android:process="com.android.networkstack.process" + android:extractNativeLibs="false" + android:persistent="true"> + </application> +</manifest> diff --git a/packages/Tethering/AndroidManifestBase.xml b/packages/Tethering/AndroidManifestBase.xml new file mode 100644 index 000000000000..b9cac1994359 --- /dev/null +++ b/packages/Tethering/AndroidManifestBase.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tethering" + android:versionCode="1" + android:versionName="R-initial"> + <application + android:label="Tethering" + android:defaultToDeviceProtectedStorage="true" + android:directBootAware="true" + android:usesCleartextTraffic="true"> + </application> +</manifest> diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp new file mode 100644 index 000000000000..5b01b1e038c3 --- /dev/null +++ b/packages/Tethering/common/TetheringLib/Android.bp @@ -0,0 +1,40 @@ +// +// 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. +// + +// AIDL interfaces between the core system and the tethering mainline module. +aidl_interface { + name: "tethering-aidl-interfaces", + local_include_dir: "src", + srcs: [ + "src/android/net/ITetheringConnector.aidl", + ], + backend: { + ndk: { + enabled: false, + }, + cpp: { + enabled: false, + }, + }, +} + +java_library { + name: "tethering-client", + platform_apis: true, + static_libs: [ + "tethering-aidl-interfaces-java", + ], +} diff --git a/packages/Tethering/common/TetheringLib/src/android/net/ITetheringConnector.aidl b/packages/Tethering/common/TetheringLib/src/android/net/ITetheringConnector.aidl new file mode 100644 index 000000000000..443481e33f8d --- /dev/null +++ b/packages/Tethering/common/TetheringLib/src/android/net/ITetheringConnector.aidl @@ -0,0 +1,20 @@ +/** + * 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 perNmissions and + * limitations under the License. + */ +package android.net; + +/** @hide */ +oneway interface ITetheringConnector { +} diff --git a/packages/Tethering/proguard.flags b/packages/Tethering/proguard.flags new file mode 100644 index 000000000000..77fc024a8755 --- /dev/null +++ b/packages/Tethering/proguard.flags @@ -0,0 +1 @@ +#TBD diff --git a/packages/Tethering/res/values/config.xml b/packages/Tethering/res/values/config.xml new file mode 100644 index 000000000000..37e679dbeb63 --- /dev/null +++ b/packages/Tethering/res/values/config.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <!-- + OEMs that wish to change the below settings must do so via a runtime resource overlay package + and *NOT* by changing this file. This file is part of the tethering mainline module. + --> +</resources> diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringConfiguration.java index a1b94ca33944..77097271c454 100644 --- a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringConfiguration.java @@ -82,7 +82,7 @@ public class TetheringConfiguration { "192.168.48.2", "192.168.48.254", "192.168.49.2", "192.168.49.254", }; - private final String[] DEFAULT_IPV4_DNS = {"8.8.4.4", "8.8.8.8"}; + private static final String[] DEFAULT_IPV4_DNS = {"8.8.4.4", "8.8.8.8"}; public final String[] tetherableUsbRegexs; public final String[] tetherableWifiRegexs; @@ -133,10 +133,12 @@ public class TetheringConfiguration { configLog.log(toString()); } + /** Check whether input interface belong to usb.*/ public boolean isUsb(String iface) { return matchesDownstreamRegexs(iface, tetherableUsbRegexs); } + /** Check whether input interface belong to wifi.*/ public boolean isWifi(String iface) { return matchesDownstreamRegexs(iface, tetherableWifiRegexs); } @@ -146,18 +148,22 @@ public class TetheringConfiguration { return matchesDownstreamRegexs(iface, tetherableWifiP2pRegexs); } + /** Check whether using legacy mode for wifi P2P. */ public boolean isWifiP2pLegacyTetheringMode() { return (tetherableWifiP2pRegexs == null || tetherableWifiP2pRegexs.length == 0); } + /** Check whether input interface belong to bluetooth.*/ public boolean isBluetooth(String iface) { return matchesDownstreamRegexs(iface, tetherableBluetoothRegexs); } + /** Check whether no ui entitlement application is available.*/ public boolean hasMobileHotspotProvisionApp() { return !TextUtils.isEmpty(provisioningAppNoUi); } + /** Does the dumping.*/ public void dump(PrintWriter pw) { pw.print("subId: "); pw.println(subId); @@ -186,6 +192,7 @@ public class TetheringConfiguration { pw.println(enableLegacyDhcpServer); } + /** Returns the string representation of this object.*/ public String toString() { final StringJoiner sj = new StringJoiner(" "); sj.add(String.format("subId:%d", subId)); @@ -210,7 +217,7 @@ public class TetheringConfiguration { if (values != null) { final StringJoiner sj = new StringJoiner(", ", "[", "]"); - for (String value : values) { sj.add(value); } + for (String value : values) sj.add(value); pw.print(sj.toString()); } else { pw.print("null"); diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp new file mode 100644 index 000000000000..089bbd31d9f3 --- /dev/null +++ b/packages/Tethering/tests/unit/Android.bp @@ -0,0 +1,47 @@ +// +// 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. +// + +android_test { + name: "TetheringTests", + certificate: "platform", + srcs: ["src/**/*.java"], + test_suites: ["device-tests"], + static_libs: [ + "androidx.test.rules", + "frameworks-base-testutils", + "mockito-target-extended-minus-junit4", + "TetheringApiCurrentLib", + "testables", + ], + libs: [ + "android.test.runner", + "android.test.base", + "android.test.mock", + ], + jni_libs: [ + // For mockito extended + "libdexmakerjvmtiagent", + "libstaticjvmtiagent", + ], +} + +// This group would be removed when tethering migration is done. +filegroup { + name: "tethering-tests-src", + srcs: [ + "src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java", + ], +} diff --git a/packages/Tethering/tests/unit/AndroidManifest.xml b/packages/Tethering/tests/unit/AndroidManifest.xml new file mode 100644 index 000000000000..049ff6d415f3 --- /dev/null +++ b/packages/Tethering/tests/unit/AndroidManifest.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tethering.tests.unit"> + + <application android:debuggable="true"> + <uses-library android:name="android.test.runner" /> + </application> + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" + android:targetPackage="com.android.tethering.tests.unit" + android:label="Tethering service tests"> + </instrumentation> +</manifest> diff --git a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java b/packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java index e28296354d2a..9f9221f3010d 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java +++ b/packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java @@ -24,7 +24,12 @@ import static android.net.ConnectivityManager.TYPE_WIFI; import static android.provider.Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER; import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; +import static com.android.internal.R.array.config_mobile_hotspot_provision_app; +import static com.android.internal.R.array.config_tether_bluetooth_regexs; +import static com.android.internal.R.array.config_tether_dhcp_range; import static com.android.internal.R.array.config_tether_upstream_types; +import static com.android.internal.R.array.config_tether_usb_regexs; +import static com.android.internal.R.array.config_tether_wifi_regexs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -86,7 +91,9 @@ public class TetheringConfigurationTest { } @Override - public Resources getResources() { return mResources; } + public Resources getResources() { + return mResources; + } @Override public Object getSystemService(String name) { @@ -105,17 +112,13 @@ public class TetheringConfigurationTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - when(mResources.getStringArray(com.android.internal.R.array.config_tether_dhcp_range)) - .thenReturn(new String[0]); - when(mResources.getStringArray(com.android.internal.R.array.config_tether_usb_regexs)) - .thenReturn(new String[0]); - when(mResources.getStringArray(com.android.internal.R.array.config_tether_wifi_regexs)) + when(mResources.getStringArray(config_tether_dhcp_range)).thenReturn(new String[0]); + when(mResources.getStringArray(config_tether_usb_regexs)).thenReturn(new String[0]); + when(mResources.getStringArray(config_tether_wifi_regexs)) .thenReturn(new String[]{ "test_wlan\\d" }); - when(mResources.getStringArray(com.android.internal.R.array.config_tether_bluetooth_regexs)) - .thenReturn(new String[0]); + when(mResources.getStringArray(config_tether_bluetooth_regexs)).thenReturn(new String[0]); when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(new int[0]); - when(mResources.getStringArray( - com.android.internal.R.array.config_mobile_hotspot_provision_app)) + when(mResources.getStringArray(config_mobile_hotspot_provision_app)) .thenReturn(new String[0]); mContentResolver = new MockContentResolver(); mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); @@ -297,19 +300,16 @@ public class TetheringConfigurationTest { private void setUpResourceForSubId() { when(mResourcesForSubId.getStringArray( - com.android.internal.R.array.config_tether_dhcp_range)).thenReturn(new String[0]); + config_tether_dhcp_range)).thenReturn(new String[0]); when(mResourcesForSubId.getStringArray( - com.android.internal.R.array.config_tether_usb_regexs)).thenReturn(new String[0]); + config_tether_usb_regexs)).thenReturn(new String[0]); when(mResourcesForSubId.getStringArray( - com.android.internal.R.array.config_tether_wifi_regexs)) - .thenReturn(new String[]{ "test_wlan\\d" }); + config_tether_wifi_regexs)).thenReturn(new String[]{ "test_wlan\\d" }); when(mResourcesForSubId.getStringArray( - com.android.internal.R.array.config_tether_bluetooth_regexs)) - .thenReturn(new String[0]); + config_tether_bluetooth_regexs)).thenReturn(new String[0]); when(mResourcesForSubId.getIntArray(config_tether_upstream_types)).thenReturn(new int[0]); when(mResourcesForSubId.getStringArray( - com.android.internal.R.array.config_mobile_hotspot_provision_app)) - .thenReturn(PROVISIONING_APP_NAME); + config_mobile_hotspot_provision_app)).thenReturn(PROVISIONING_APP_NAME); } } diff --git a/services/core/Android.bp b/services/core/Android.bp index 3067bebcf19e..ca8e11ae6042 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -80,6 +80,7 @@ java_library_static { ":vold_aidl", ":gsiservice_aidl", ":platform-compat-config", + ":tethering-services-srcs", "java/com/android/server/EventLogTags.logtags", "java/com/android/server/am/EventLogTags.logtags", "java/com/android/server/policy/EventLogTags.logtags", diff --git a/core/java/android/app/usage/UsageStatsManagerInternal.java b/services/core/java/android/app/usage/UsageStatsManagerInternal.java index 024afe25f98e..6641b5be651d 100644 --- a/core/java/android/app/usage/UsageStatsManagerInternal.java +++ b/services/core/java/android/app/usage/UsageStatsManagerInternal.java @@ -23,6 +23,8 @@ import android.content.res.Configuration; import android.os.UserHandle; import android.os.UserManager; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; + import java.util.List; import java.util.Set; @@ -153,35 +155,6 @@ public abstract class UsageStatsManagerInternal { */ public abstract int[] getIdleUidsForUser(@UserIdInt int userId); - /** - * Sets up a listener for changes to packages being accessed. - * @param listener A listener within the system process. - */ - public abstract void addAppIdleStateChangeListener( - AppIdleStateChangeListener listener); - - /** - * Removes a listener that was previously added for package usage state changes. - * @param listener The listener within the system process to remove. - */ - public abstract void removeAppIdleStateChangeListener( - AppIdleStateChangeListener listener); - - public static abstract class AppIdleStateChangeListener { - - /** Callback to inform listeners that the idle state has changed to a new bucket. */ - public abstract void onAppIdleStateChanged(String packageName, @UserIdInt int userId, - boolean idle, int bucket, int reason); - - /** - * Optional callback to inform the listener that the app has transitioned into - * an active state due to user interaction. - */ - public void onUserInteractionStarted(String packageName, @UserIdInt int userId) { - // No-op by default - } - } - /** Backup/Restore API */ public abstract byte[] getBackupPayload(@UserIdInt int userId, String key); diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index b41e95fee15c..ff0044f6f1ad 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -99,6 +99,8 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.LocalLog; import com.android.internal.util.StatLogger; import com.android.server.AppStateTracker.Listener; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; @@ -1599,7 +1601,9 @@ class AlarmManagerService extends SystemService { LocalServices.getService(DeviceIdleInternal.class); mUsageStatsManagerInternal = LocalServices.getService(UsageStatsManagerInternal.class); - mUsageStatsManagerInternal.addAppIdleStateChangeListener(new AppStandbyTracker()); + AppStandbyInternal appStandbyInternal = + LocalServices.getService(AppStandbyInternal.class); + appStandbyInternal.addListener(new AppStandbyTracker()); mAppStateTracker = LocalServices.getService(AppStateTracker.class); mAppStateTracker.addListener(mForceAppStandbyListener); @@ -4468,7 +4472,7 @@ class AlarmManagerService extends SystemService { * Tracking of app assignments to standby buckets */ private final class AppStandbyTracker extends - UsageStatsManagerInternal.AppIdleStateChangeListener { + AppIdleStateChangeListener { @Override public void onAppIdleStateChanged(final String packageName, final @UserIdInt int userId, boolean idle, int bucket, int reason) { diff --git a/services/core/java/com/android/server/AppStateTracker.java b/services/core/java/com/android/server/AppStateTracker.java index da760b6f7ffd..5eff2c5c1d37 100644 --- a/services/core/java/com/android/server/AppStateTracker.java +++ b/services/core/java/com/android/server/AppStateTracker.java @@ -24,7 +24,6 @@ import android.app.IActivityManager; import android.app.IUidObserver; import android.app.usage.UsageStatsManager; import android.app.usage.UsageStatsManagerInternal; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -58,6 +57,8 @@ import com.android.internal.util.Preconditions; import com.android.internal.util.StatLogger; import com.android.server.AppStateTrackerProto.ExemptedPackage; import com.android.server.AppStateTrackerProto.RunAnyInBackgroundRestrictedPackages; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.io.PrintWriter; import java.util.Arrays; @@ -89,7 +90,7 @@ public class AppStateTracker { IAppOpsService mAppOpsService; PowerManagerInternal mPowerManagerInternal; StandbyTracker mStandbyTracker; - UsageStatsManagerInternal mUsageStatsManagerInternal; + AppStandbyInternal mAppStandbyInternal; private final MyHandler mHandler; @@ -420,8 +421,7 @@ public class AppStateTracker { mAppOpsManager = Preconditions.checkNotNull(injectAppOpsManager()); mAppOpsService = Preconditions.checkNotNull(injectIAppOpsService()); mPowerManagerInternal = Preconditions.checkNotNull(injectPowerManagerInternal()); - mUsageStatsManagerInternal = Preconditions.checkNotNull( - injectUsageStatsManagerInternal()); + mAppStandbyInternal = Preconditions.checkNotNull(injectAppStandbyInternal()); mFlagsObserver = new FeatureFlagsObserver(); mFlagsObserver.register(); @@ -429,7 +429,7 @@ public class AppStateTracker { mForceAllAppStandbyForSmallBattery = mFlagsObserver.isForcedAppStandbyForSmallBatteryEnabled(); mStandbyTracker = new StandbyTracker(); - mUsageStatsManagerInternal.addAppIdleStateChangeListener(mStandbyTracker); + mAppStandbyInternal.addListener(mStandbyTracker); try { mIActivityManager.registerUidObserver(new UidObserver(), @@ -494,8 +494,8 @@ public class AppStateTracker { } @VisibleForTesting - UsageStatsManagerInternal injectUsageStatsManagerInternal() { - return LocalServices.getService(UsageStatsManagerInternal.class); + AppStandbyInternal injectAppStandbyInternal() { + return LocalServices.getService(AppStandbyInternal.class); } @VisibleForTesting diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index 087c84f1a42f..67d358910de1 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -23,7 +23,6 @@ import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNO import android.Manifest; import android.annotation.Nullable; import android.annotation.UserIdInt; -import android.app.ActivityManager; import android.attention.AttentionManagerInternal; import android.attention.AttentionManagerInternal.AttentionCallbackInternal; import android.content.BroadcastReceiver; @@ -300,7 +299,8 @@ public class AttentionManagerService extends SystemService { @GuardedBy("mLock") @VisibleForTesting protected UserState getOrCreateCurrentUserStateLocked() { - return getOrCreateUserStateLocked(ActivityManager.getCurrentUser()); + // Doesn't need to cache the states of different users. + return getOrCreateUserStateLocked(0); } @GuardedBy("mLock") @@ -318,7 +318,8 @@ public class AttentionManagerService extends SystemService { @Nullable @VisibleForTesting protected UserState peekCurrentUserStateLocked() { - return peekUserStateLocked(ActivityManager.getCurrentUser()); + // Doesn't need to cache the states of different users. + return peekUserStateLocked(0); } @GuardedBy("mLock") diff --git a/core/java/com/android/server/backup/SystemBackupAgent.java b/services/core/java/com/android/server/backup/SystemBackupAgent.java index 35e8f56cf36d..35e8f56cf36d 100644 --- a/core/java/com/android/server/backup/SystemBackupAgent.java +++ b/services/core/java/com/android/server/backup/SystemBackupAgent.java diff --git a/core/java/com/android/server/backup/UsageStatsBackupHelper.java b/services/core/java/com/android/server/backup/UsageStatsBackupHelper.java index d6a70d369cdc..d6a70d369cdc 100644 --- a/core/java/com/android/server/backup/UsageStatsBackupHelper.java +++ b/services/core/java/com/android/server/backup/UsageStatsBackupHelper.java diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index 619c21e7646b..44c81fc09b2a 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -988,18 +988,6 @@ public class BiometricService extends SystemService { } } - private String getErrorString(int modality, int error, int vendorCode) { - for (AuthenticatorWrapper authenticator : mAuthenticators) { - if (authenticator.modality == modality) { - // TODO(b/141025588): Refactor IBiometricServiceReceiver.aidl#onError(...) to not - // ask for a String error message, but derive it from the error code instead. - return ""; - } - } - Slog.w(TAG, "Unable to get error string for modality: " + modality); - return null; - } - private void logDialogDismissed(int reason) { if (reason == BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED) { // Explicit auth, authentication confirmed. diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 09be474a5598..3b14d50f3c07 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -229,6 +229,8 @@ import com.android.server.EventLogTags; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.SystemConfig; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import libcore.io.IoUtils; @@ -396,6 +398,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { private NetworkStatsManagerInternal mNetworkStats; private final INetworkManagementService mNetworkManager; private UsageStatsManagerInternal mUsageStats; + private AppStandbyInternal mAppStandby; private final Clock mClock; private final UserManager mUserManager; private final CarrierConfigManager mCarrierConfigManager; @@ -734,6 +737,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } mUsageStats = LocalServices.getService(UsageStatsManagerInternal.class); + mAppStandby = LocalServices.getService(AppStandbyInternal.class); mNetworkStats = LocalServices.getService(NetworkStatsManagerInternal.class); synchronized (mUidRulesFirstLock) { @@ -868,7 +872,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mContext.getSystemService(ConnectivityManager.class).registerNetworkCallback( new NetworkRequest.Builder().build(), mNetworkCallback); - mUsageStats.addAppIdleStateChangeListener(new AppIdleStateChangeListener()); + mAppStandby.addListener(new NetPolicyAppIdleStateChangeListener()); // Listen for subscriber changes mContext.getSystemService(SubscriptionManager.class).addOnSubscriptionsChangedListener( @@ -4375,9 +4379,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return newUidRules; } - private class AppIdleStateChangeListener - extends UsageStatsManagerInternal.AppIdleStateChangeListener { - + private class NetPolicyAppIdleStateChangeListener extends AppIdleStateChangeListener { @Override public void onAppIdleStateChanged(String packageName, int userId, boolean idle, int bucket, int reason) { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index cd3343bbec7b..0fc1718ad673 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -7826,6 +7826,7 @@ public class NotificationManagerService extends SystemService { R.array.config_allowedManagedServicesOnLowRamDevices)) { if (whitelisted.equals(pkg)) { canUseManagedServices = true; + break; } } diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index dc00cb45596c..fd44cbb46065 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -38,6 +38,7 @@ import android.sysprop.ApexProperties; import android.util.Slog; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BackgroundThread; import com.android.internal.util.IndentingPrintWriter; @@ -217,7 +218,8 @@ abstract class ApexManager { * An implementation of {@link ApexManager} that should be used in case device supports updating * APEX packages. */ - private static class ApexManagerImpl extends ApexManager { + @VisibleForTesting + static class ApexManagerImpl extends ApexManager { private final IApexService mApexService; private final Context mContext; private final Object mLock = new Object(); @@ -335,8 +337,8 @@ abstract class ApexManager { if (!packageInfo.packageName.equals(packageName)) { continue; } - if ((!matchActive || isActive(packageInfo)) - && (!matchFactory || isFactory(packageInfo))) { + if ((matchActive && isActive(packageInfo)) + || (matchFactory && isFactory(packageInfo))) { return packageInfo; } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 104ce1cbd5cd..b5fa80d1d706 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4092,7 +4092,7 @@ public class PackageManagerService extends IPackageManager.Stub } return generatePackageInfo(ps, flags, userId); } - if (!matchFactoryOnly && (flags & MATCH_APEX) != 0) { + if ((flags & MATCH_APEX) != 0) { return mApexManager.getPackageInfo(packageName, ApexManager.MATCH_ACTIVE_PACKAGE); } } diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index b131ab66da9f..5e4f75cca10d 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -116,6 +116,14 @@ final class AccessibilityController { return result; } + /** + * Sets a callback for observing which windows are touchable for the purposes + * of accessibility on specified display. + * + * @param displayId The logical display id. + * @param callback The callback. + * @return {@code false} if display id is not valid or an embedded display. + */ public boolean setWindowsForAccessibilityCallbackLocked(int displayId, WindowsForAccessibilityCallback callback) { if (callback != null) { @@ -129,7 +137,7 @@ final class AccessibilityController { if (display.getType() == Display.TYPE_VIRTUAL && dc.getParentWindow() != null) { // The window observer of this embedded display had been set from // window manager after setting its parent window. - return true; + return false; } else { throw new IllegalStateException( "Windows for accessibility callback of display " diff --git a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java index bc95481dcee9..11f09d0f1343 100644 --- a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java @@ -56,8 +56,6 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider { if (mIsImeLayoutDrawn && mShowImeRunner != null) { // Show IME if InputMethodService requested to be shown and it's layout has finished. mShowImeRunner.run(); - mIsImeLayoutDrawn = false; - mShowImeRunner = null; } } @@ -74,10 +72,19 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider { mDisplayContent.mInputMethodTarget.showInsets( WindowInsets.Type.ime(), true /* fromIme */); } - mImeTargetFromIme = null; + abortShowImePostLayout(); }; } + /** + * Abort any pending request to show IME post layout. + */ + void abortShowImePostLayout() { + mImeTargetFromIme = null; + mIsImeLayoutDrawn = false; + mShowImeRunner = null; + } + private boolean isImeTargetFromDisplayContentAndImeSame() { // IMMS#mLastImeTargetWindow always considers focused window as // IME target, however DisplayContent#computeImeTarget() can compute diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index 0cb4826fdfc3..d2249724ae6e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -216,7 +216,7 @@ public abstract class WindowManagerInternal { * * @param displayId The logical display id. * @param callbacks The callbacks to invoke. - * @return {@code false} if display id is not valid. + * @return {@code false} if display id is not valid or an embedded display. */ public abstract boolean setMagnificationCallbacks(int displayId, @Nullable MagnificationCallbacks callbacks); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 63ce1b1c7ad7..caa2c0199e49 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -7331,6 +7331,9 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mGlobalLock) { final DisplayContent dc = mRoot.getDisplayContent(displayId); if (dc != null && dc.mInputMethodTarget != null) { + // If there was a pending IME show(), reset it as IME has been + // requested to be hidden. + dc.getInsetsStateController().getImeSourceProvider().abortShowImePostLayout(); dc.mInputMethodTarget.hideInsets(WindowInsets.Type.ime(), true /* fromIme */); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java index 59996ccd5530..5a1d552bf325 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java @@ -62,4 +62,6 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub { String packageName, boolean hasGrant) { return false; } + + public void setLocationEnabled(ComponentName who, boolean locationEnabled) {} } diff --git a/services/net/Android.bp b/services/net/Android.bp index 1ca96ed80e5e..6a871aa81543 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -5,6 +5,7 @@ java_library_static { "dnsresolver_aidl_interface-V2-java", "netd_aidl_interface-java", "networkstack-client", + "tethering-client", ], } @@ -17,3 +18,11 @@ filegroup { "java/android/net/netlink/*.java", ], } + +filegroup { + name: "services-tethering-shared-srcs", + srcs: [ + ":framework-annotations", + "java/android/net/util/SharedLog.java" + ], +} diff --git a/services/net/java/android/net/netlink/InetDiagMessage.java b/services/net/java/android/net/netlink/InetDiagMessage.java index 31a2556f2041..ca07630d3e63 100644 --- a/services/net/java/android/net/netlink/InetDiagMessage.java +++ b/services/net/java/android/net/netlink/InetDiagMessage.java @@ -26,6 +26,7 @@ import static android.system.OsConstants.AF_INET6; import static android.system.OsConstants.IPPROTO_UDP; import static android.system.OsConstants.NETLINK_INET_DIAG; +import android.annotation.Nullable; import android.net.util.SocketUtils; import android.system.ErrnoException; import android.util.Log; @@ -53,7 +54,35 @@ public class InetDiagMessage extends NetlinkMessage { private static final int TIMEOUT_MS = 500; public static byte[] InetDiagReqV2(int protocol, InetSocketAddress local, - InetSocketAddress remote, int family, short flags) { + InetSocketAddress remote, int family, short flags) { + return InetDiagReqV2(protocol, local, remote, family, flags, 0 /* pad */, + 0 /* idiagExt */, StructInetDiagReqV2.INET_DIAG_REQ_V2_ALL_STATES); + } + + /** + * Construct an inet_diag_req_v2 message. This method will throw {@code NullPointerException} + * if local and remote are not both null or both non-null. + * + * @param protocol the request protocol type. This should be set to one of IPPROTO_TCP, + * IPPROTO_UDP, or IPPROTO_UDPLITE. + * @param local local socket address of the target socket. This will be packed into a + * {@Code StructInetDiagSockId}. Request to diagnose for all sockets if both of + * local or remote address is null. + * @param remote remote socket address of the target socket. This will be packed into a + * {@Code StructInetDiagSockId}. Request to diagnose for all sockets if both of + * local or remote address is null. + * @param family the ip family of the request message. This should be set to either AF_INET or + * AF_INET6 for IPv4 or IPv6 sockets respectively. + * @param flags message flags. See <linux_src>/include/uapi/linux/netlink.h. + * @param pad for raw socket protocol specification. + * @param idiagExt a set of flags defining what kind of extended information to report. + * @param state a bit mask that defines a filter of socket states. + * + * @return bytes array representation of the message + **/ + public static byte[] InetDiagReqV2(int protocol, @Nullable InetSocketAddress local, + @Nullable InetSocketAddress remote, int family, short flags, int pad, int idiagExt, + int state) throws NullPointerException { final byte[] bytes = new byte[StructNlMsgHdr.STRUCT_SIZE + StructInetDiagReqV2.STRUCT_SIZE]; final ByteBuffer byteBuffer = ByteBuffer.wrap(bytes); byteBuffer.order(ByteOrder.nativeOrder()); @@ -63,9 +92,9 @@ public class InetDiagMessage extends NetlinkMessage { nlMsgHdr.nlmsg_type = SOCK_DIAG_BY_FAMILY; nlMsgHdr.nlmsg_flags = flags; nlMsgHdr.pack(byteBuffer); + final StructInetDiagReqV2 inetDiagReqV2 = + new StructInetDiagReqV2(protocol, local, remote, family, pad, idiagExt, state); - final StructInetDiagReqV2 inetDiagReqV2 = new StructInetDiagReqV2(protocol, local, remote, - family); inetDiagReqV2.pack(byteBuffer); return bytes; } diff --git a/services/net/java/android/net/netlink/StructInetDiagReqV2.java b/services/net/java/android/net/netlink/StructInetDiagReqV2.java index 49a93258e714..2268113044d5 100644 --- a/services/net/java/android/net/netlink/StructInetDiagReqV2.java +++ b/services/net/java/android/net/netlink/StructInetDiagReqV2.java @@ -16,10 +16,10 @@ package android.net.netlink; -import static java.nio.ByteOrder.BIG_ENDIAN; +import android.annotation.Nullable; + import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.nio.ByteOrder; /** * struct inet_diag_req_v2 @@ -40,41 +40,58 @@ import java.nio.ByteOrder; public class StructInetDiagReqV2 { public static final int STRUCT_SIZE = 8 + StructInetDiagSockId.STRUCT_SIZE; - private final byte sdiag_family; - private final byte sdiag_protocol; - private final StructInetDiagSockId id; - private final int INET_DIAG_REQ_V2_ALL_STATES = (int) 0xffffffff; - + private final byte mSdiagFamily; + private final byte mSdiagProtocol; + private final byte mIdiagExt; + private final byte mPad; + private final StructInetDiagSockId mId; + private final int mState; + public static final int INET_DIAG_REQ_V2_ALL_STATES = (int) 0xffffffff; public StructInetDiagReqV2(int protocol, InetSocketAddress local, InetSocketAddress remote, - int family) { - sdiag_family = (byte) family; - sdiag_protocol = (byte) protocol; - id = new StructInetDiagSockId(local, remote); + int family) { + this(protocol, local, remote, family, 0 /* pad */, 0 /* extension */, + INET_DIAG_REQ_V2_ALL_STATES); + } + + public StructInetDiagReqV2(int protocol, @Nullable InetSocketAddress local, + @Nullable InetSocketAddress remote, int family, int pad, int extension, int state) + throws NullPointerException { + mSdiagFamily = (byte) family; + mSdiagProtocol = (byte) protocol; + // Request for all sockets if no specific socket is requested. Specify the local and remote + // socket address information for target request socket. + if ((local == null) != (remote == null)) { + throw new NullPointerException("Local and remote must be both null or both non-null"); + } + mId = ((local != null && remote != null) ? new StructInetDiagSockId(local, remote) : null); + mPad = (byte) pad; + mIdiagExt = (byte) extension; + mState = state; } public void pack(ByteBuffer byteBuffer) { // The ByteOrder must have already been set by the caller. - byteBuffer.put((byte) sdiag_family); - byteBuffer.put((byte) sdiag_protocol); - byteBuffer.put((byte) 0); - byteBuffer.put((byte) 0); - byteBuffer.putInt(INET_DIAG_REQ_V2_ALL_STATES); - id.pack(byteBuffer); + byteBuffer.put((byte) mSdiagFamily); + byteBuffer.put((byte) mSdiagProtocol); + byteBuffer.put((byte) mIdiagExt); + byteBuffer.put((byte) mPad); + byteBuffer.putInt(mState); + if (mId != null) mId.pack(byteBuffer); } @Override public String toString() { - final String familyStr = NetlinkConstants.stringForAddressFamily(sdiag_family); - final String protocolStr = NetlinkConstants.stringForAddressFamily(sdiag_protocol); + final String familyStr = NetlinkConstants.stringForAddressFamily(mSdiagFamily); + final String protocolStr = NetlinkConstants.stringForAddressFamily(mSdiagProtocol); return "StructInetDiagReqV2{ " + "sdiag_family{" + familyStr + "}, " + "sdiag_protocol{" + protocolStr + "}, " - + "idiag_ext{" + 0 + ")}, " - + "pad{" + 0 + "}, " - + "idiag_states{" + Integer.toHexString(INET_DIAG_REQ_V2_ALL_STATES) + "}, " - + id.toString() + + "idiag_ext{" + mIdiagExt + ")}, " + + "pad{" + mPad + "}, " + + "idiag_states{" + Integer.toHexString(mState) + "}, " + + ((mId != null) ? mId.toString() : "inet_diag_sockid=null") + "}"; } } diff --git a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java index 7b7b8e6c628a..9e7b80567263 100644 --- a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java @@ -85,6 +85,7 @@ import androidx.test.filters.FlakyTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.annotations.GuardedBy; +import com.android.server.usage.AppStandbyInternal; import org.junit.After; import org.junit.Before; @@ -108,7 +109,7 @@ public class AlarmManagerServiceTest { private long mAppStandbyWindow; private AlarmManagerService mService; - private UsageStatsManagerInternal.AppIdleStateChangeListener mAppStandbyListener; + private AppStandbyInternal.AppIdleStateChangeListener mAppStandbyListener; private AlarmManagerService.ChargingReceiver mChargingReceiver; @Mock private ContentResolver mMockResolver; @@ -119,6 +120,8 @@ public class AlarmManagerServiceTest { @Mock private UsageStatsManagerInternal mUsageStatsManagerInternal; @Mock + private AppStandbyInternal mAppStandbyInternal; + @Mock private AppStateTracker mAppStateTracker; @Mock private AlarmManagerService.ClockReceiver mClockReceiver; @@ -257,6 +260,8 @@ public class AlarmManagerServiceTest { doReturn(mAppStateTracker).when(() -> LocalServices.getService(AppStateTracker.class)); doReturn(null) .when(() -> LocalServices.getService(DeviceIdleInternal.class)); + doReturn(mAppStandbyInternal).when( + () -> LocalServices.getService(AppStandbyInternal.class)); doReturn(mUsageStatsManagerInternal).when( () -> LocalServices.getService(UsageStatsManagerInternal.class)); when(mUsageStatsManagerInternal.getAppStandbyBucket(eq(TEST_CALLING_PACKAGE), @@ -289,9 +294,9 @@ public class AlarmManagerServiceTest { assertEquals(0, mService.mConstants.MIN_FUTURITY); assertEquals(0, mService.mConstants.MIN_INTERVAL); mAppStandbyWindow = mService.mConstants.APP_STANDBY_WINDOW; - ArgumentCaptor<UsageStatsManagerInternal.AppIdleStateChangeListener> captor = - ArgumentCaptor.forClass(UsageStatsManagerInternal.AppIdleStateChangeListener.class); - verify(mUsageStatsManagerInternal).addAppIdleStateChangeListener(captor.capture()); + ArgumentCaptor<AppStandbyInternal.AppIdleStateChangeListener> captor = + ArgumentCaptor.forClass(AppStandbyInternal.AppIdleStateChangeListener.class); + verify(mAppStandbyInternal).addListener(captor.capture()); mAppStandbyListener = captor.getValue(); ArgumentCaptor<AlarmManagerService.ChargingReceiver> chargingReceiverCaptor = diff --git a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java index 80d11290fdd4..1f4656ae54a4 100644 --- a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java @@ -45,7 +45,6 @@ import android.app.IActivityManager; import android.app.IUidObserver; import android.app.usage.UsageStatsManager; import android.app.usage.UsageStatsManagerInternal; -import android.app.usage.UsageStatsManagerInternal.AppIdleStateChangeListener; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -70,6 +69,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IAppOpsCallback; import com.android.internal.app.IAppOpsService; import com.android.server.AppStateTracker.Listener; +import com.android.server.usage.AppStandbyInternal; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import org.junit.Before; import org.junit.Test; @@ -128,8 +129,8 @@ public class AppStateTrackerTest { } @Override - UsageStatsManagerInternal injectUsageStatsManagerInternal() { - return mMockUsageStatsManagerInternal; + AppStandbyInternal injectAppStandbyInternal() { + return mMockAppStandbyInternal; } @Override @@ -175,7 +176,7 @@ public class AppStateTrackerTest { private PowerManagerInternal mMockPowerManagerInternal; @Mock - private UsageStatsManagerInternal mMockUsageStatsManagerInternal; + private AppStandbyInternal mMockAppStandbyInternal; private MockContentResolver mMockContentResolver; @@ -271,7 +272,7 @@ public class AppStateTrackerTest { verify(mMockContext).registerReceiver( receiverCaptor.capture(), any(IntentFilter.class)); - verify(mMockUsageStatsManagerInternal).addAppIdleStateChangeListener( + verify(mMockAppStandbyInternal).addListener( appIdleStateChangeListenerCaptor.capture()); mIUidObserver = uidObserverArgumentCaptor.getValue(); diff --git a/services/tests/servicestests/res/raw/apex_test.apex b/services/tests/servicestests/res/raw/apex_test.apex Binary files differnew file mode 100644 index 000000000000..19b1c5e2e1c6 --- /dev/null +++ b/services/tests/servicestests/res/raw/apex_test.apex diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java new file mode 100644 index 000000000000..6bb4202fa759 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -0,0 +1,298 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.pm; + +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.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertThrows; + +import android.apex.ApexInfo; +import android.apex.ApexSessionInfo; +import android.apex.IApexService; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.os.FileUtils; +import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import com.android.frameworks.servicestests.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +@SmallTest +@Presubmit +@RunWith(AndroidJUnit4.class) +public class ApexManagerTest { + private static final String TEST_APEX_PKG = "com.android.apex.test"; + private static final int TEST_SESSION_ID = 99999999; + private static final int[] TEST_CHILD_SESSION_ID = {8888, 7777}; + private ApexManager mApexManager; + private Context mContext; + + private IApexService mApexService = mock(IApexService.class); + + @Before + public void setUp() throws RemoteException { + mContext = InstrumentationRegistry.getInstrumentation().getContext(); + mApexManager = new ApexManager.ApexManagerImpl(mContext, mApexService); + } + + @Test + public void testGetPackageInfo_setFlagsMatchActivePackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + final PackageInfo activePkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_ACTIVE_PACKAGE); + + assertThat(activePkgPi).isNotNull(); + assertThat(activePkgPi.packageName).contains(TEST_APEX_PKG); + + final PackageInfo factoryPkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_FACTORY_PACKAGE); + + assertThat(factoryPkgPi).isNull(); + } + + @Test + public void testGetPackageInfo_setFlagsMatchFactoryPackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + PackageInfo factoryPkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_FACTORY_PACKAGE); + + assertThat(factoryPkgPi).isNotNull(); + assertThat(factoryPkgPi.packageName).contains(TEST_APEX_PKG); + + final PackageInfo activePkgPi = mApexManager.getPackageInfo(TEST_APEX_PKG, + ApexManager.MATCH_ACTIVE_PACKAGE); + + assertThat(activePkgPi).isNull(); + } + + @Test + public void testGetPackageInfo_setFlagsNone() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getPackageInfo(TEST_APEX_PKG, 0)).isNull(); + } + + @Test + public void testGetActivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, true)); + + assertThat(mApexManager.getActivePackages()).isNotEmpty(); + } + + @Test + public void testGetActivePackages_noneActivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getActivePackages()).isEmpty(); + } + + @Test + public void testGetFactoryPackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getFactoryPackages()).isNotEmpty(); + } + + @Test + public void testGetFactoryPackages_noneFactoryPackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + + assertThat(mApexManager.getFactoryPackages()).isEmpty(); + } + + @Test + public void testGetInactivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.getInactivePackages()).isNotEmpty(); + } + + @Test + public void testGetInactivePackages_noneInactivePackages() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(true, false)); + + assertThat(mApexManager.getInactivePackages()).isEmpty(); + } + + @Test + public void testIsApexPackage() throws RemoteException { + when(mApexService.getAllPackages()).thenReturn(createApexInfo(false, true)); + + assertThat(mApexManager.isApexPackage(TEST_APEX_PKG)).isTrue(); + } + + @Test + public void testIsApexSupported() { + assertThat(mApexManager.isApexSupported()).isTrue(); + } + + @Test + public void testGetStagedSessionInfo() throws RemoteException { + when(mApexService.getStagedSessionInfo(anyInt())).thenReturn( + getFakeStagedSessionInfo()); + + mApexManager.getStagedSessionInfo(TEST_SESSION_ID); + verify(mApexService, times(1)).getStagedSessionInfo(TEST_SESSION_ID); + } + + @Test + public void testGetStagedSessionInfo_unKnownStagedSessionId() throws RemoteException { + when(mApexService.getStagedSessionInfo(anyInt())).thenReturn( + getFakeUnknownSessionInfo()); + + assertThat(mApexManager.getStagedSessionInfo(TEST_SESSION_ID)).isNull(); + } + + @Test + public void testSubmitStagedSession_throwPackageManagerException() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).submitStagedSession(anyInt(), any(), any()); + + assertThrows(PackageManagerException.class, + () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); + } + + @Test + public void testSubmitStagedSession_throwRunTimeException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).submitStagedSession(anyInt(), any(), + any()); + + assertThrows(RuntimeException.class, + () -> mApexManager.submitStagedSession(TEST_SESSION_ID, TEST_CHILD_SESSION_ID)); + } + + @Test + public void testMarkStagedSessionReady_throwPackageManagerException() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).markStagedSessionReady(anyInt()); + + assertThrows(PackageManagerException.class, + () -> mApexManager.markStagedSessionReady(TEST_SESSION_ID)); + } + + @Test + public void testMarkStagedSessionReady_throwRunTimeException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).markStagedSessionReady(anyInt()); + + assertThrows(RuntimeException.class, + () -> mApexManager.markStagedSessionReady(TEST_SESSION_ID)); + } + + @Test + public void testAbortActiveSession_remoteException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).abortActiveSession(); + + try { + assertThat(mApexManager.abortActiveSession()).isFalse(); + } catch (Exception e) { + throw new AssertionError("ApexManager should not raise Exception"); + } + } + + @Test + public void testMarkStagedSessionSuccessful_throwRemoteException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).markStagedSessionSuccessful(anyInt()); + + assertThrows(RuntimeException.class, + () -> mApexManager.markStagedSessionSuccessful(TEST_SESSION_ID)); + } + + @Test + public void testUninstallApex_throwException_returnFalse() throws RemoteException { + doAnswer(invocation -> { + throw new Exception(); + }).when(mApexService).unstagePackages(any()); + + assertThat(mApexManager.uninstallApex(TEST_APEX_PKG)).isFalse(); + } + + private ApexInfo[] createApexInfo(boolean isActive, boolean isFactory) { + File apexFile = copyRawResourceToFile(TEST_APEX_PKG, R.raw.apex_test); + ApexInfo apexInfo = new ApexInfo(); + apexInfo.isActive = isActive; + apexInfo.isFactory = isFactory; + apexInfo.moduleName = TEST_APEX_PKG; + apexInfo.modulePath = apexFile.getPath(); + apexInfo.versionCode = 191000070; + + return new ApexInfo[]{apexInfo}; + } + + private ApexSessionInfo getFakeStagedSessionInfo() { + ApexSessionInfo stagedSessionInfo = new ApexSessionInfo(); + stagedSessionInfo.sessionId = TEST_SESSION_ID; + stagedSessionInfo.isStaged = true; + + return stagedSessionInfo; + } + + private ApexSessionInfo getFakeUnknownSessionInfo() { + ApexSessionInfo stagedSessionInfo = new ApexSessionInfo(); + stagedSessionInfo.sessionId = TEST_SESSION_ID; + stagedSessionInfo.isUnknown = true; + + return stagedSessionInfo; + } + + /** + * Copies a specified {@code resourceId} to a temp file. Returns a non-null file if the copy + * succeeded + */ + File copyRawResourceToFile(String baseName, int resourceId) { + File outFile; + try { + outFile = File.createTempFile(baseName, ".apex"); + } catch (IOException e) { + throw new AssertionError("CreateTempFile IOException" + e); + } + + try (InputStream is = mContext.getResources().openRawResource(resourceId); + FileOutputStream os = new FileOutputStream(outFile)) { + assertThat(FileUtils.copy(is, os)).isGreaterThan(0L); + } catch (FileNotFoundException e) { + throw new AssertionError("File not found exception " + e); + } catch (IOException e) { + throw new AssertionError("IOException" + e); + } + + return outFile; + } +} diff --git a/services/usage/java/com/android/server/usage/UsageStatsProto.java b/services/usage/java/com/android/server/usage/UsageStatsProto.java index 5d1f730694ef..87e077e3df1f 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsProto.java +++ b/services/usage/java/com/android/server/usage/UsageStatsProto.java @@ -334,8 +334,6 @@ final class UsageStatsProto { proto.write(IntervalStatsProto.UsageStats.PACKAGE_INDEX, packageIndex + 1); } else { // Package not in Stringpool for some reason, write full string instead - Slog.w(TAG, "UsageStats package name (" + usageStats.mPackageName - + ") not found in IntervalStats string cache"); proto.write(IntervalStatsProto.UsageStats.PACKAGE, usageStats.mPackageName); } // Time attributes stored as an offset of the beginTime. @@ -430,8 +428,6 @@ final class UsageStatsProto { proto.write(IntervalStatsProto.Event.PACKAGE_INDEX, packageIndex + 1); } else { // Package not in Stringpool for some reason, write full string instead - Slog.w(TAG, "Usage event package name (" + event.mPackage - + ") not found in IntervalStats string cache"); proto.write(IntervalStatsProto.Event.PACKAGE, event.mPackage); } if (event.mClass != null) { @@ -440,8 +436,6 @@ final class UsageStatsProto { proto.write(IntervalStatsProto.Event.CLASS_INDEX, classIndex + 1); } else { // Class not in Stringpool for some reason, write full string instead - Slog.w(TAG, "Usage event class name (" + event.mClass - + ") not found in IntervalStats string cache"); proto.write(IntervalStatsProto.Event.CLASS, event.mClass); } } @@ -454,10 +448,6 @@ final class UsageStatsProto { if (taskRootPackageIndex >= 0) { proto.write(IntervalStatsProto.Event.TASK_ROOT_PACKAGE_INDEX, taskRootPackageIndex + 1); - } else { - // Task root package not in Stringpool for some reason. - Slog.w(TAG, "Usage event task root package name (" + event.mTaskRootPackage - + ") not found in IntervalStats string cache"); } } if (event.mTaskRootClass != null) { @@ -465,10 +455,6 @@ final class UsageStatsProto { if (taskRootClassIndex >= 0) { proto.write(IntervalStatsProto.Event.TASK_ROOT_CLASS_INDEX, taskRootClassIndex + 1); - } else { - // Task root class not in Stringpool for some reason. - Slog.w(TAG, "Usage event task root class name (" + event.mTaskRootClass - + ") not found in IntervalStats string cache"); } } switch (event.mEventType) { @@ -496,9 +482,6 @@ final class UsageStatsProto { channelIndex + 1); } else { // Channel not in Stringpool for some reason, write full string instead - Slog.w(TAG, "Usage event notification channel name (" - + event.mNotificationChannelId - + ") not found in IntervalStats string cache"); proto.write(IntervalStatsProto.Event.NOTIFICATION_CHANNEL, event.mNotificationChannelId); } diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 5d03e151e993..6a805683e23d 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -86,6 +86,7 @@ import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.server.LocalServices; import com.android.server.SystemService; +import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -180,8 +181,8 @@ public class UsageStatsService extends SystemService implements } } - private UsageStatsManagerInternal.AppIdleStateChangeListener mStandbyChangeListener = - new UsageStatsManagerInternal.AppIdleStateChangeListener() { + private AppIdleStateChangeListener mStandbyChangeListener = + new AppIdleStateChangeListener() { @Override public void onAppIdleStateChanged(String packageName, int userId, boolean idle, int bucket, int reason) { @@ -253,6 +254,7 @@ public class UsageStatsService extends SystemService implements null, mHandler); publishLocalService(UsageStatsManagerInternal.class, new LocalService()); + publishLocalService(AppStandbyInternal.class, mAppStandby); publishBinderService(Context.USAGE_STATS_SERVICE, new BinderService()); } @@ -2029,17 +2031,6 @@ public class UsageStatsService extends SystemService implements } @Override - public void addAppIdleStateChangeListener(AppIdleStateChangeListener listener) { - mAppStandby.addListener(listener); - } - - @Override - public void removeAppIdleStateChangeListener( - AppIdleStateChangeListener listener) { - mAppStandby.removeListener(listener); - } - - @Override public byte[] getBackupPayload(int user, String key) { synchronized (mLock) { if (!mUserUnlockedStates.get(user)) { diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java index 23df1c553de2..5783932db488 100644 --- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java @@ -146,17 +146,16 @@ class UserUsageStatsService { } // During system reboot, add a DEVICE_SHUTDOWN event to the end of event list, the timestamp - // is last time UsageStatsDatabase is persisted to disk. + // is last time UsageStatsDatabase is persisted to disk or the last event's time whichever + // is higher (because the file system timestamp is round down to integral seconds). // Also add a DEVICE_STARTUP event with current system timestamp. final IntervalStats currentDailyStats = mCurrentStats[INTERVAL_DAILY]; if (currentDailyStats != null) { - // File system timestamp only has precision of 1 second, add 1000ms to make up - // for the loss of round up. - final Event shutdownEvent = - new Event(DEVICE_SHUTDOWN, currentDailyStats.lastTimeSaved + 1000); + final Event shutdownEvent = new Event(DEVICE_SHUTDOWN, + Math.max(currentDailyStats.lastTimeSaved, currentDailyStats.endTime)); shutdownEvent.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME; currentDailyStats.addEvent(shutdownEvent); - final Event startupEvent = new Event(DEVICE_STARTUP, currentTimeMillis); + final Event startupEvent = new Event(DEVICE_STARTUP, System.currentTimeMillis()); startupEvent.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME; currentDailyStats.addEvent(startupEvent); } diff --git a/services/usb/java/com/android/server/usb/UsbPermissionManager.java b/services/usb/java/com/android/server/usb/UsbPermissionManager.java index ef9ee73a9b68..1e46f981f117 100644 --- a/services/usb/java/com/android/server/usb/UsbPermissionManager.java +++ b/services/usb/java/com/android/server/usb/UsbPermissionManager.java @@ -20,14 +20,20 @@ import android.annotation.NonNull; import android.annotation.UserIdInt; import android.content.Context; import android.content.Intent; +import android.content.pm.UserInfo; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; import android.os.UserHandle; +import android.os.UserManager; +import android.service.usb.UsbSettingsManagerProto; import android.util.Slog; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; +import com.android.internal.util.dump.DualDumpOutputStream; + +import java.util.List; class UsbPermissionManager { private static final String LOG_TAG = UsbPermissionManager.class.getSimpleName(); @@ -112,4 +118,18 @@ class UsbPermissionManager { mContext.sendBroadcastAsUser(intent, UserHandle.ALL); } + void dump(@NonNull DualDumpOutputStream dump, String idName, long id) { + long token = dump.start(idName, id); + UserManager userManager = mContext.getSystemService(UserManager.class); + synchronized (mPermissionsByUser) { + List<UserInfo> users = userManager.getUsers(); + int numUsers = users.size(); + for (int i = 0; i < numUsers; i++) { + getPermissionsForUser(users.get(i).id).dump(dump, "user_permissions", + UsbSettingsManagerProto.USER_SETTINGS); + } + } + dump.end(token); + } + } diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index ce6f592e2b0d..04936377bbfb 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -740,6 +740,8 @@ public class UsbService extends IUsbManager.Stub { mSettingsManager.dump(dump, "settings_manager", UsbServiceDumpProto.SETTINGS_MANAGER); + mPermissionManager.dump(dump, "permissions_manager", + UsbServiceDumpProto.PERMISSIONS_MANAGER); dump.flush(); } else if ("set-port-roles".equals(args[0]) && args.length == 4) { final String portId = args[1]; diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java index 0cb64a37f9c1..e700f19adbd4 100644 --- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java +++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java @@ -36,9 +36,12 @@ import android.os.Binder; import android.os.Environment; import android.os.Process; import android.os.UserHandle; -import android.service.usb.UsbSettingsAccessoryPermissionProto; -import android.service.usb.UsbSettingsDevicePermissionProto; -import android.service.usb.UsbUserSettingsManagerProto; +import android.service.usb.UsbAccessoryPermissionProto; +import android.service.usb.UsbAccessoryPersistentPermissionProto; +import android.service.usb.UsbDevicePermissionProto; +import android.service.usb.UsbDevicePersistentPermissionProto; +import android.service.usb.UsbUidPermissionProto; +import android.service.usb.UsbUserPermissionsManagerProto; import android.util.ArrayMap; import android.util.AtomicFile; import android.util.Slog; @@ -261,7 +264,7 @@ class UsbUserPermissionManager { } if (isChanged) { - scheduleWritePermissionLocked(); + scheduleWritePermissionsLocked(); } } } @@ -288,7 +291,7 @@ class UsbUserPermissionManager { } if (isChanged) { - scheduleWritePermissionLocked(); + scheduleWritePermissionsLocked(); } } } @@ -370,7 +373,7 @@ class UsbUserPermissionManager { } @GuardedBy("mLock") - private void scheduleWritePermissionLocked() { + private void scheduleWritePermissionsLocked() { if (mIsCopyPermissionsScheduled) { return; } @@ -393,15 +396,18 @@ class UsbUserPermissionManager { devices = new DeviceFilter[numDevices]; uidsForDevices = new int[numDevices][]; grantedValuesForDevices = new boolean[numDevices][]; - for (int i = 0; i < numDevices; i++) { - devices[i] = new DeviceFilter(mDevicePersistentPermissionMap.keyAt(i)); - SparseBooleanArray permissions = mDevicePersistentPermissionMap.valueAt(i); + for (int deviceIdx = 0; deviceIdx < numDevices; deviceIdx++) { + devices[deviceIdx] = + new DeviceFilter(mDevicePersistentPermissionMap.keyAt(deviceIdx)); + SparseBooleanArray permissions = + mDevicePersistentPermissionMap.valueAt(deviceIdx); int numPermissions = permissions.size(); - uidsForDevices[i] = new int[numPermissions]; - grantedValuesForDevices[i] = new boolean[numPermissions]; - for (int j = 0; j < numPermissions; j++) { - uidsForDevices[i][j] = permissions.keyAt(j); - grantedValuesForDevices[i][j] = permissions.valueAt(j); + uidsForDevices[deviceIdx] = new int[numPermissions]; + grantedValuesForDevices[deviceIdx] = new boolean[numPermissions]; + for (int permissionIdx = 0; permissionIdx < numPermissions; permissionIdx++) { + uidsForDevices[deviceIdx][permissionIdx] = permissions.keyAt(permissionIdx); + grantedValuesForDevices[deviceIdx][permissionIdx] = + permissions.valueAt(permissionIdx); } } @@ -409,16 +415,19 @@ class UsbUserPermissionManager { accessories = new AccessoryFilter[numAccessories]; uidsForAccessories = new int[numAccessories][]; grantedValuesForAccessories = new boolean[numAccessories][]; - for (int i = 0; i < numAccessories; i++) { - accessories[i] = - new AccessoryFilter(mAccessoryPersistentPermissionMap.keyAt(i)); - SparseBooleanArray permissions = mAccessoryPersistentPermissionMap.valueAt(i); + for (int accessoryIdx = 0; accessoryIdx < numAccessories; accessoryIdx++) { + accessories[accessoryIdx] = new AccessoryFilter( + mAccessoryPersistentPermissionMap.keyAt(accessoryIdx)); + SparseBooleanArray permissions = + mAccessoryPersistentPermissionMap.valueAt(accessoryIdx); int numPermissions = permissions.size(); - uidsForAccessories[i] = new int[numPermissions]; - grantedValuesForAccessories[i] = new boolean[numPermissions]; - for (int j = 0; j < numPermissions; j++) { - uidsForAccessories[i][j] = permissions.keyAt(j); - grantedValuesForAccessories[i][j] = permissions.valueAt(j); + uidsForAccessories[accessoryIdx] = new int[numPermissions]; + grantedValuesForAccessories[accessoryIdx] = new boolean[numPermissions]; + for (int permissionIdx = 0; permissionIdx < numPermissions; permissionIdx++) { + uidsForAccessories[accessoryIdx][permissionIdx] = + permissions.keyAt(permissionIdx); + grantedValuesForAccessories[accessoryIdx][permissionIdx] = + permissions.valueAt(permissionIdx); } } mIsCopyPermissionsScheduled = false; @@ -477,22 +486,22 @@ class UsbUserPermissionManager { * Creates UI dialog to request permission for the given package to access the device * or accessory. * - * @param device The USB device attached - * @param accessory The USB accessory attached + * @param device The USB device attached + * @param accessory The USB accessory attached * @param canBeDefault Whether the calling pacakge can set as default handler - * of the USB device or accessory - * @param packageName The package name of the calling package - * @param uid The uid of the calling package - * @param userContext The context to start the UI dialog - * @param pi PendingIntent for returning result + * of the USB device or accessory + * @param packageName The package name of the calling package + * @param uid The uid of the calling package + * @param userContext The context to start the UI dialog + * @param pi PendingIntent for returning result */ void requestPermissionDialog(@Nullable UsbDevice device, - @Nullable UsbAccessory accessory, - boolean canBeDefault, - @NonNull String packageName, - int uid, - @NonNull Context userContext, - @NonNull PendingIntent pi) { + @Nullable UsbAccessory accessory, + boolean canBeDefault, + @NonNull String packageName, + int uid, + @NonNull Context userContext, + @NonNull PendingIntent pi) { long identity = Binder.clearCallingIdentity(); Intent intent = new Intent(); if (device != null) { @@ -517,48 +526,96 @@ class UsbUserPermissionManager { } } - void dump(@NonNull DualDumpOutputStream dump) { + void dump(@NonNull DualDumpOutputStream dump, String idName, long id) { + long token = dump.start(idName, id); synchronized (mLock) { - for (String deviceName : mDevicePermissionMap.keySet()) { + dump.write("user_id", UsbUserPermissionsManagerProto.USER_ID, mUser.getIdentifier()); + int numMappings = mDevicePermissionMap.size(); + for (int mappingsIdx = 0; mappingsIdx < numMappings; mappingsIdx++) { + String deviceName = mDevicePermissionMap.keyAt(mappingsIdx); long devicePermissionToken = dump.start("device_permissions", - UsbUserSettingsManagerProto.DEVICE_PERMISSIONS); + UsbUserPermissionsManagerProto.DEVICE_PERMISSIONS); - dump.write("device_name", UsbSettingsDevicePermissionProto.DEVICE_NAME, deviceName); + dump.write("device_name", UsbDevicePermissionProto.DEVICE_NAME, deviceName); - SparseBooleanArray uidList = mDevicePermissionMap.get(deviceName); - int count = uidList.size(); - for (int i = 0; i < count; i++) { - dump.write("uids", UsbSettingsDevicePermissionProto.UIDS, uidList.keyAt(i)); + SparseBooleanArray uidList = mDevicePermissionMap.valueAt(mappingsIdx); + int numUids = uidList.size(); + for (int uidsIdx = 0; uidsIdx < numUids; uidsIdx++) { + dump.write("uids", UsbDevicePermissionProto.UIDS, uidList.keyAt(uidsIdx)); } dump.end(devicePermissionToken); } - for (UsbAccessory accessory : mAccessoryPermissionMap.keySet()) { + numMappings = mAccessoryPermissionMap.size(); + for (int mappingsIdx = 0; mappingsIdx < numMappings; ++mappingsIdx) { + UsbAccessory accessory = mAccessoryPermissionMap.keyAt(mappingsIdx); long accessoryPermissionToken = dump.start("accessory_permissions", - UsbUserSettingsManagerProto.ACCESSORY_PERMISSIONS); + UsbUserPermissionsManagerProto.ACCESSORY_PERMISSIONS); dump.write("accessory_description", - UsbSettingsAccessoryPermissionProto.ACCESSORY_DESCRIPTION, + UsbAccessoryPermissionProto.ACCESSORY_DESCRIPTION, accessory.getDescription()); - SparseBooleanArray uidList = mAccessoryPermissionMap.get(accessory); - int count = uidList.size(); - for (int i = 0; i < count; i++) { - dump.write("uids", UsbSettingsAccessoryPermissionProto.UIDS, uidList.keyAt(i)); + SparseBooleanArray uidList = mAccessoryPermissionMap.valueAt(mappingsIdx); + int numUids = uidList.size(); + for (int uidsIdx = 0; uidsIdx < numUids; uidsIdx++) { + dump.write("uids", UsbAccessoryPermissionProto.UIDS, uidList.keyAt(uidsIdx)); } dump.end(accessoryPermissionToken); } + + numMappings = mDevicePersistentPermissionMap.size(); + for (int mappingsIdx = 0; mappingsIdx < numMappings; mappingsIdx++) { + DeviceFilter filter = mDevicePersistentPermissionMap.keyAt(mappingsIdx); + long devicePermissionToken = dump.start("device_persistent_permissions", + UsbUserPermissionsManagerProto.DEVICE_PERSISTENT_PERMISSIONS); + filter.dump(dump, "device", + UsbDevicePersistentPermissionProto.DEVICE_FILTER); + SparseBooleanArray permissions = + mDevicePersistentPermissionMap.valueAt(mappingsIdx); + int numPermissions = permissions.size(); + for (int permissionsIdx = 0; permissionsIdx < numPermissions; permissionsIdx++) { + long uidPermissionToken = dump.start("uid_permission", + UsbDevicePersistentPermissionProto.PERMISSION_VALUES); + dump.write("uid", UsbUidPermissionProto.UID, permissions.keyAt(permissionsIdx)); + dump.write("is_granted", + UsbUidPermissionProto.IS_GRANTED, permissions.valueAt(permissionsIdx)); + dump.end(uidPermissionToken); + } + dump.end(devicePermissionToken); + } + + numMappings = mAccessoryPersistentPermissionMap.size(); + for (int mappingsIdx = 0; mappingsIdx < numMappings; mappingsIdx++) { + AccessoryFilter filter = mAccessoryPersistentPermissionMap.keyAt(mappingsIdx); + long accessoryPermissionToken = dump.start("accessory_persistent_permissions", + UsbUserPermissionsManagerProto.ACCESSORY_PERSISTENT_PERMISSIONS); + filter.dump(dump, "accessory", + UsbAccessoryPersistentPermissionProto.ACCESSORY_FILTER); + SparseBooleanArray permissions = + mAccessoryPersistentPermissionMap.valueAt(mappingsIdx); + int numPermissions = permissions.size(); + for (int permissionsIdx = 0; permissionsIdx < numPermissions; permissionsIdx++) { + long uidPermissionToken = dump.start("uid_permission", + UsbAccessoryPersistentPermissionProto.PERMISSION_VALUES); + dump.write("uid", UsbUidPermissionProto.UID, permissions.keyAt(permissionsIdx)); + dump.write("is_granted", + UsbUidPermissionProto.IS_GRANTED, permissions.valueAt(permissionsIdx)); + dump.end(uidPermissionToken); + } + dump.end(accessoryPermissionToken); + } } + dump.end(token); } /** * Check for camera permission of the calling process. * * @param packageName Package name of the caller. - * @param uid Linux uid of the calling process. - * + * @param uid Linux uid of the calling process. * @return True in case camera permission is available, False otherwise. */ private boolean isCameraPermissionGranted(String packageName, int uid) { @@ -677,7 +734,7 @@ class UsbUserPermissionManager { * * @param device The device that needs to get scanned * @return True in case a VIDEO device or interface is present, - * False otherwise. + * False otherwise. */ private boolean isCameraDevicePresent(UsbDevice device) { if (device.getDeviceClass() == UsbConstants.USB_CLASS_VIDEO) { diff --git a/startop/apps/test/Android.bp b/startop/apps/test/Android.bp index 2ff26b8a5cde..3f20273a8d61 100644 --- a/startop/apps/test/Android.bp +++ b/startop/apps/test/Android.bp @@ -18,9 +18,12 @@ android_app { name: "startop_test_app", srcs: [ "src/ComplexLayoutInflationActivity.java", - "src/CPUIntensive.java", + "src/CPUIntensiveBenchmarkActivity.java", + "src/CPUIntensiveBenchmarks.java", "src/EmptyActivity.java", "src/FrameLayoutInflationActivity.java", + "src/InitCheckOverheadBenchmarkActivity.java", + "src/InitCheckOverheadBenchmarks.java", "src/LayoutInflationActivity.java", "src/NonInteractiveSystemServerBenchmarkActivity.java", "src/SystemServerBenchmarkActivity.java", diff --git a/startop/apps/test/AndroidManifest.xml b/startop/apps/test/AndroidManifest.xml index ebe2584c2d32..235aa0d25e86 100644 --- a/startop/apps/test/AndroidManifest.xml +++ b/startop/apps/test/AndroidManifest.xml @@ -37,6 +37,18 @@ </activity> <activity + android:label="CPU Intensive Benchmark Test" + android:name=".CPUIntensiveBenchmarkActivity" + android:exported="true" > + + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity android:label="Empty Activity Layout Test" android:name=".EmptyActivity" android:exported="true" > @@ -61,6 +73,18 @@ </activity> <activity + android:label="Initialization Check Overhead Test" + android:name=".InitCheckOverheadBenchmarkActivity" + android:exported="true" > + + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity android:label="TextView Layout Test" android:name=".TextViewInflationActivity" android:exported="true" > diff --git a/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java b/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java new file mode 100644 index 000000000000..2ec5308afe14 --- /dev/null +++ b/startop/apps/test/src/CPUIntensiveBenchmarkActivity.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.startop.test; + +import android.os.Bundle; + +public class CPUIntensiveBenchmarkActivity extends SystemServerBenchmarkActivity { + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.system_server_benchmark_page); + + mBenchmarkList = findViewById(R.id.benchmark_list); + + CPUIntensiveBenchmarks.initializeBenchmarks(this, this); + } +} diff --git a/startop/apps/test/src/CPUIntensive.java b/startop/apps/test/src/CPUIntensiveBenchmarks.java index a411e8ce8ce0..19d0b6372c1b 100644 --- a/startop/apps/test/src/CPUIntensive.java +++ b/startop/apps/test/src/CPUIntensiveBenchmarks.java @@ -20,10 +20,11 @@ package com.android.startop.test; -final class CPUIntensive { - public static final int THREAD_COUNT = 8; +import android.app.Activity; + +public class CPUIntensiveBenchmarks { public static final int ARRAY_SIZE = 30000; - public static int[][] array = new int[THREAD_COUNT][ARRAY_SIZE]; + public static int[][] mArray; static class WorkerThread extends Thread { int mThreadNumber; @@ -31,21 +32,22 @@ final class CPUIntensive { mThreadNumber = number; } public void run() { - final int arrayLength = array[mThreadNumber].length; + final int arrayLength = mArray[mThreadNumber].length; for (int i = 0; i < arrayLength; ++i) { - array[mThreadNumber][i] = i * i; + mArray[mThreadNumber][i] = i * i; } for (int i = 0; i < arrayLength; ++i) { for (int j = 0; j < arrayLength; ++j) { - int swap = array[mThreadNumber][j]; - array[mThreadNumber][j] = array[mThreadNumber][(j + i) % arrayLength]; - array[mThreadNumber][(j + i) % arrayLength] = swap; + int swap = mArray[mThreadNumber][j]; + mArray[mThreadNumber][j] = mArray[mThreadNumber][(j + i) % arrayLength]; + mArray[mThreadNumber][(j + i) % arrayLength] = swap; } } } }; - public static void doSomeWork(int threadCount) { + static void doSomeWork(int threadCount) { + mArray = new int[threadCount][ARRAY_SIZE]; WorkerThread[] threads = new WorkerThread[threadCount]; // Create the threads. for (int i = 0; i < threadCount; ++i) { @@ -63,5 +65,25 @@ final class CPUIntensive { } } } -} + // Time limit to run benchmarks in seconds + public static final int TIME_LIMIT = 5; + + static void initializeBenchmarks(Activity parent, BenchmarkRunner benchmarks) { + benchmarks.addBenchmark("Use 1 thread", () -> { + doSomeWork(1); + }); + benchmarks.addBenchmark("Use 2 threads", () -> { + doSomeWork(2); + }); + benchmarks.addBenchmark("Use 4 threads", () -> { + doSomeWork(4); + }); + benchmarks.addBenchmark("Use 8 threads", () -> { + doSomeWork(8); + }); + benchmarks.addBenchmark("Use 16 threads", () -> { + doSomeWork(16); + }); + } +} diff --git a/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java b/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java new file mode 100644 index 000000000000..3e0e3b113a29 --- /dev/null +++ b/startop/apps/test/src/InitCheckOverheadBenchmarkActivity.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.startop.test; + +import android.os.Bundle; + +public class InitCheckOverheadBenchmarkActivity extends SystemServerBenchmarkActivity { + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.system_server_benchmark_page); + + mBenchmarkList = findViewById(R.id.benchmark_list); + + InitCheckOverheadBenchmarks.initializeBenchmarks(this, this); + } +} diff --git a/startop/apps/test/src/InitCheckOverheadBenchmarks.java b/startop/apps/test/src/InitCheckOverheadBenchmarks.java new file mode 100644 index 000000000000..79adbbce45ff --- /dev/null +++ b/startop/apps/test/src/InitCheckOverheadBenchmarks.java @@ -0,0 +1,134 @@ +/* + * 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. + */ + +/** + * A test of initialization check costs for AOT. + */ + +package com.android.startop.test; + +import android.app.Activity; + +import java.util.Random; + +public class InitCheckOverheadBenchmarks { + public static int mSum; + public static int mSum2; + public static int mStep; + public static int mStep2; + public static int mStartingValue; + + static { + Random random = new Random(); + mStep = random.nextInt(); + mStep2 = random.nextInt(); + mStartingValue = random.nextInt(); + }; + + static class OtherClass { + public static int mStep; + public static int mStep2; + public static int mStartingValue; + static { + Random random = new Random(); + mStep = random.nextInt(); + mStep2 = random.nextInt(); + mStartingValue = random.nextInt(); + }; + }; + + public static void localStaticFor(int iterationCount) { + for (int i = 0; i < iterationCount; ++i) { + mSum += mStep; + } + } + + public static void nonLocalStaticFor(int iterationCount) { + mSum = OtherClass.mStartingValue; + for (int i = 0; i < iterationCount; ++i) { + mSum += OtherClass.mStep; + } + } + + public static void localStaticForTwo(int iterationCount) { + for (int i = 0; i < iterationCount; ++i) { + mSum += mStep; + mSum2 += mStep2; + } + } + + public static void nonLocalStaticForTwo(int iterationCount) { + mSum = OtherClass.mStartingValue; + for (int i = 0; i < iterationCount; ++i) { + mSum += OtherClass.mStep; + mSum2 += OtherClass.mStep2; + } + } + + public static void localStaticDoWhile(int iterationCount) { + int i = 0; + do { + mSum += mStep; + ++i; + } while (i < iterationCount); + } + + public static void nonLocalStaticDoWhile(int iterationCount) { + mSum = OtherClass.mStartingValue; + int i = 0; + do { + mSum += OtherClass.mStep; + ++i; + } while (i < iterationCount); + } + + public static void doGC() { + Runtime.getRuntime().gc(); + } + + // Time limit to run benchmarks in seconds + public static final int TIME_LIMIT = 5; + + static void initializeBenchmarks(Activity parent, BenchmarkRunner benchmarks) { + benchmarks.addBenchmark("GC", () -> { + doGC(); + }); + + benchmarks.addBenchmark("InitCheckFor (local)", () -> { + localStaticFor(10000000); + }); + + benchmarks.addBenchmark("InitCheckFor (non-local)", () -> { + nonLocalStaticFor(10000000); + }); + + benchmarks.addBenchmark("InitCheckForTwo (local)", () -> { + localStaticForTwo(10000000); + }); + + benchmarks.addBenchmark("InitCheckForTwo (non-local)", () -> { + nonLocalStaticForTwo(10000000); + }); + + benchmarks.addBenchmark("InitCheckDoWhile (local)", () -> { + localStaticDoWhile(10000000); + }); + + benchmarks.addBenchmark("InitCheckDoWhile (non-local)", () -> { + nonLocalStaticDoWhile(10000000); + }); + } +} diff --git a/startop/apps/test/src/SystemServerBenchmarkActivity.java b/startop/apps/test/src/SystemServerBenchmarkActivity.java index 75ea69b81e02..6be8df3728af 100644 --- a/startop/apps/test/src/SystemServerBenchmarkActivity.java +++ b/startop/apps/test/src/SystemServerBenchmarkActivity.java @@ -17,28 +17,20 @@ package com.android.startop.test; import android.app.Activity; -import android.app.ActivityManager; -import android.content.ComponentName; import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.pm.PackageManager.NameNotFoundException; -import android.os.AsyncTask; import android.os.Bundle; -import android.view.ViewGroup; import android.widget.Button; import android.widget.GridLayout; import android.widget.TextView; public class SystemServerBenchmarkActivity extends Activity implements BenchmarkRunner { - private GridLayout benchmarkList; + protected GridLayout mBenchmarkList; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.system_server_benchmark_page); - benchmarkList = findViewById(R.id.benchmark_list); + mBenchmarkList = findViewById(R.id.benchmark_list); SystemServerBenchmarks.initializeBenchmarks(this, this); } @@ -49,7 +41,7 @@ public class SystemServerBenchmarkActivity extends Activity implements Benchmark * @param name A short name that shows up in the UI or benchmark results */ public void addBenchmark(CharSequence name, Runnable thunk) { - Context context = benchmarkList.getContext(); + Context context = mBenchmarkList.getContext(); Button button = new Button(context); TextView mean = new TextView(context); TextView stdev = new TextView(context); @@ -68,8 +60,8 @@ public class SystemServerBenchmarkActivity extends Activity implements Benchmark }); }); - benchmarkList.addView(button); - benchmarkList.addView(mean); - benchmarkList.addView(stdev); + mBenchmarkList.addView(button); + mBenchmarkList.addView(mean); + mBenchmarkList.addView(stdev); } } diff --git a/startop/apps/test/src/SystemServerBenchmarks.java b/startop/apps/test/src/SystemServerBenchmarks.java index 5918503c87ea..25b43f4d53f6 100644 --- a/startop/apps/test/src/SystemServerBenchmarks.java +++ b/startop/apps/test/src/SystemServerBenchmarks.java @@ -60,22 +60,6 @@ class SystemServerBenchmarks { benchmarks.addBenchmark("Empty", () -> { }); - benchmarks.addBenchmark("CPU Intensive (1 thread)", () -> { - CPUIntensive.doSomeWork(1); - }); - - benchmarks.addBenchmark("CPU Intensive (2 thread)", () -> { - CPUIntensive.doSomeWork(2); - }); - - benchmarks.addBenchmark("CPU Intensive (4 thread)", () -> { - CPUIntensive.doSomeWork(4); - }); - - benchmarks.addBenchmark("CPU Intensive (8 thread)", () -> { - CPUIntensive.doSomeWork(8); - }); - PackageManager pm = parent.getPackageManager(); benchmarks.addBenchmark("getInstalledApplications", () -> { pm.getInstalledApplications(PackageManager.MATCH_SYSTEM_ONLY); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f83520f1c7a7..2eb4809bcb27 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -424,18 +424,8 @@ public class TelephonyManager { * {@link #getActiveModemCount} returns 1 while this API returns 2. */ public @ModemCount int getSupportedModemCount() { - // TODO: b/139642279 when turning on this feature, remove dependency of - // PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and always return result based on - // PROPERTY_MAX_ACTIVE_MODEMS. - String rebootRequired = SystemProperties.get( - TelephonyProperties.PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE); - if (rebootRequired.equals("false")) { - // If no reboot is required, return max possible active modems. - return SystemProperties.getInt( - TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, getPhoneCount()); - } else { - return getPhoneCount(); - } + return SystemProperties.getInt(TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, + getActiveModemCount()); } /** {@hide} */ diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java index 5a90cb13a548..0025c7acb18c 100644 --- a/telephony/java/android/telephony/euicc/EuiccManager.java +++ b/telephony/java/android/telephony/euicc/EuiccManager.java @@ -830,7 +830,7 @@ public class EuiccManager { * @param callbackIntent a PendingIntent to launch when the operation completes. * * @deprecated From R, callers should specify a flag for specific set of subscriptions to erase - * and use @link{eraseSubscriptionsWithOptions} instead + * and use {@link #eraseSubscriptionsWithOptions(int, PendingIntent)} instead * * @hide */ diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java index ccdd452b3f1e..81937e6b7005 100644 --- a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java +++ b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java @@ -54,11 +54,15 @@ public class BootImageProfileTest implements IDeviceTest { assertTrue("profile system server not enabled", res != null && res.equals("true")); } - private void forceSaveProfile(String pkg) throws Exception { + private boolean forceSaveProfile(String pkg) throws Exception { String pid = mTestDevice.executeShellCommand("pidof " + pkg).trim(); - assertTrue("Invalid pid " + pid, pid.length() > 0); + if (pid.length() == 0) { + // Not yet running. + return false; + } String res = mTestDevice.executeShellCommand("kill -s SIGUSR1 " + pid).trim(); assertTrue("kill SIGUSR1: " + res, res.length() == 0); + return true; } @Test @@ -71,10 +75,13 @@ public class BootImageProfileTest implements IDeviceTest { // Wait up to 20 seconds for the profile to be saved. for (int i = 0; i < 20; ++i) { // Force save the profile since we truncated it. - forceSaveProfile("system_server"); - String s = mTestDevice.executeShellCommand("wc -c <" + SYSTEM_SERVER_PROFILE).trim(); - if (!"0".equals(s)) { - break; + if (forceSaveProfile("system_server")) { + // Might fail if system server is not yet running. + String s = mTestDevice.executeShellCommand( + "wc -c <" + SYSTEM_SERVER_PROFILE).trim(); + if (!"0".equals(s)) { + break; + } } Thread.sleep(1000); } diff --git a/tests/Compatibility/Android.bp b/tests/Compatibility/Android.bp index 4ca406eba3cf..7dc44fa4a260 100644 --- a/tests/Compatibility/Android.bp +++ b/tests/Compatibility/Android.bp @@ -19,4 +19,7 @@ android_test { srcs: ["src/**/*.java"], platform_apis: true, certificate: "platform", + test_suites: [ + "csuite" + ], } diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java index 79b8b4623cd8..b51aad1d63f8 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java @@ -32,6 +32,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageInstaller; import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackManager; +import android.os.ParcelFileDescriptor; import android.provider.DeviceConfig; import android.text.TextUtils; @@ -46,6 +47,8 @@ import com.android.cts.rollback.lib.Rollback; import com.android.cts.rollback.lib.RollbackUtils; import com.android.internal.R; +import libcore.io.IoUtils; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -215,7 +218,7 @@ public class StagedRollbackTest { String networkStack = getNetworkStackPackageName(); rm.expireRollbackForPackage(networkStack); - Uninstall.packages(networkStack); + uninstallNetworkStackPackage(); assertThat(getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(), networkStack)).isNull(); @@ -249,6 +252,12 @@ public class StagedRollbackTest { return comp.getPackageName(); } + private void uninstallNetworkStackPackage() { + // Since the host side use shell command to install the network stack package, uninstall + // must be done by shell command as well. Otherwise uninstall by a different user will fail. + runShellCommand("pm uninstall " + getNetworkStackPackageName()); + } + @Test public void testPreviouslyAbandonedRollbacks_Phase1() throws Exception { Uninstall.packages(TestApp.A); @@ -291,7 +300,7 @@ public class StagedRollbackTest { String networkStack = getNetworkStackPackageName(); rm.expireRollbackForPackage(networkStack); - Uninstall.packages(networkStack); + uninstallNetworkStackPackage(); assertThat(getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(), networkStack)).isNull(); @@ -332,7 +341,8 @@ public class StagedRollbackTest { } private void runShellCommand(String cmd) { - InstrumentationRegistry.getInstrumentation().getUiAutomation() + ParcelFileDescriptor pfd = InstrumentationRegistry.getInstrumentation().getUiAutomation() .executeShellCommand(cmd); + IoUtils.closeQuietly(pfd); } } diff --git a/tests/net/Android.bp b/tests/net/Android.bp index beb5e0db6422..b9b2238572ac 100644 --- a/tests/net/Android.bp +++ b/tests/net/Android.bp @@ -44,7 +44,11 @@ java_defaults { android_test { name: "FrameworksNetTests", defaults: ["FrameworksNetTests-jni-defaults"], - srcs: ["java/**/*.java", "java/**/*.kt"], + srcs: [ + ":tethering-tests-src", + "java/**/*.java", + "java/**/*.kt", + ], platform_apis: true, test_suites: ["device-tests"], certificate: "platform", diff --git a/tests/net/java/android/net/netlink/InetDiagSocketTest.java b/tests/net/java/android/net/netlink/InetDiagSocketTest.java index 46e27c1d3d3b..1f2bb0ac05ee 100644 --- a/tests/net/java/android/net/netlink/InetDiagSocketTest.java +++ b/tests/net/java/android/net/netlink/InetDiagSocketTest.java @@ -30,6 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import android.app.Instrumentation; import android.content.Context; @@ -283,6 +284,107 @@ public class InetDiagSocketTest { assertArrayEquals(INET_DIAG_REQ_V2_TCP_INET6_BYTES, msg); } + // Hexadecimal representation of InetDiagReqV2 request with extension, INET_DIAG_INFO. + private static final String INET_DIAG_REQ_V2_TCP_INET_INET_DIAG_HEX = + // struct nlmsghdr + "48000000" + // length = 72 + "1400" + // type = SOCK_DIAG_BY_FAMILY + "0100" + // flags = NLM_F_REQUEST + "00000000" + // seqno + "00000000" + // pid (0 == kernel) + // struct inet_diag_req_v2 + "02" + // family = AF_INET + "06" + // protcol = IPPROTO_TCP + "02" + // idiag_ext = INET_DIAG_INFO + "00" + // pad + "ffffffff" + // idiag_states + // inet_diag_sockid + "3039" + // idiag_sport = 12345 + "d431" + // idiag_dport = 54321 + "01020304000000000000000000000000" + // idiag_src = 1.2.3.4 + "08080404000000000000000000000000" + // idiag_dst = 8.8.4.4 + "00000000" + // idiag_if + "ffffffffffffffff"; // idiag_cookie = INET_DIAG_NOCOOKIE + + private static final byte[] INET_DIAG_REQ_V2_TCP_INET_INET_DIAG_BYTES = + HexEncoding.decode(INET_DIAG_REQ_V2_TCP_INET_INET_DIAG_HEX.toCharArray(), false); + private static final int TCP_ALL_STATES = 0xffffffff; + @Test + public void testInetDiagReqV2TcpInetWithExt() throws Exception { + InetSocketAddress local = new InetSocketAddress( + InetAddress.getByName("1.2.3.4"), 12345); + InetSocketAddress remote = new InetSocketAddress(InetAddress.getByName("8.8.4.4"), + 54321); + byte[] msg = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, local, remote, AF_INET, + NLM_F_REQUEST, 0 /* pad */, 2 /* idiagExt */, TCP_ALL_STATES); + + assertArrayEquals(INET_DIAG_REQ_V2_TCP_INET_INET_DIAG_BYTES, msg); + + local = new InetSocketAddress( + InetAddress.getByName("fe80::86c9:b2ff:fe6a:ed4b"), 42462); + remote = new InetSocketAddress(InetAddress.getByName("8.8.8.8"), + 47473); + msg = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, local, remote, AF_INET6, + NLM_F_REQUEST, 0 /* pad */, 0 /* idiagExt */, TCP_ALL_STATES); + + assertArrayEquals(INET_DIAG_REQ_V2_TCP_INET6_BYTES, msg); + } + + // Hexadecimal representation of InetDiagReqV2 request with no socket specified. + private static final String INET_DIAG_REQ_V2_TCP_INET6_NO_ID_SPECIFIED_HEX = + // struct nlmsghdr + "48000000" + // length = 72 + "1400" + // type = SOCK_DIAG_BY_FAMILY + "0100" + // flags = NLM_F_REQUEST + "00000000" + // seqno + "00000000" + // pid (0 == kernel) + // struct inet_diag_req_v2 + "0a" + // family = AF_INET6 + "06" + // protcol = IPPROTO_TCP + "00" + // idiag_ext + "00" + // pad + "ffffffff" + // idiag_states + // inet_diag_sockid + "0000" + // idiag_sport + "0000" + // idiag_dport + "00000000000000000000000000000000" + // idiag_src + "00000000000000000000000000000000" + // idiag_dst + "00000000" + // idiag_if + "0000000000000000"; // idiag_cookie + + private static final byte[] INET_DIAG_REQ_V2_TCP_INET6_NO_ID_SPECIFED_BYTES = + HexEncoding.decode(INET_DIAG_REQ_V2_TCP_INET6_NO_ID_SPECIFIED_HEX.toCharArray(), false); + + @Test + public void testInetDiagReqV2TcpInet6NoIdSpecified() throws Exception { + InetSocketAddress local = new InetSocketAddress( + InetAddress.getByName("fe80::fe6a:ed4b"), 12345); + InetSocketAddress remote = new InetSocketAddress(InetAddress.getByName("8.8.4.4"), + 54321); + // Verify no socket specified if either local or remote socket address is null. + byte[] msgExt = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, null, null, AF_INET6, + NLM_F_REQUEST, 0 /* pad */, 0 /* idiagExt */, TCP_ALL_STATES); + byte[] msg; + try { + msg = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, null, remote, AF_INET6, + NLM_F_REQUEST); + fail("Both remote and local should be null, expected UnknownHostException"); + } catch (NullPointerException e) { + } + + try { + msg = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, local, null, AF_INET6, + NLM_F_REQUEST, 0 /* pad */, 0 /* idiagExt */, TCP_ALL_STATES); + fail("Both remote and local should be null, expected UnknownHostException"); + } catch (NullPointerException e) { + } + + msg = InetDiagMessage.InetDiagReqV2(IPPROTO_TCP, null, null, AF_INET6, + NLM_F_REQUEST, 0 /* pad */, 0 /* idiagExt */, TCP_ALL_STATES); + assertArrayEquals(INET_DIAG_REQ_V2_TCP_INET6_NO_ID_SPECIFED_BYTES, msg); + assertArrayEquals(INET_DIAG_REQ_V2_TCP_INET6_NO_ID_SPECIFED_BYTES, msgExt); + } + // Hexadecimal representation of InetDiagReqV2 request. private static final String INET_DIAG_MSG_HEX = // struct nlmsghdr diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp index d80c2e742fae..fd184f50091a 100644 --- a/tools/bit/main.cpp +++ b/tools/bit/main.cpp @@ -708,10 +708,12 @@ run_phases(vector<Target*> targets, const Options& options) } } + // Figure out whether we need to sync the system and which apks to install string deviceTargetPath = buildOut + "/target/product/" + buildDevice; string systemPath = deviceTargetPath + "/system/"; string dataPath = deviceTargetPath + "/data/"; + string testPath = deviceTargetPath + "/testcases/"; bool syncSystem = false; bool alwaysSyncSystem = false; vector<string> systemFiles; @@ -734,7 +736,8 @@ run_phases(vector<Target*> targets, const Options& options) continue; } // Apk in the data partition - if (starts_with(file, dataPath) && ends_with(file, ".apk")) { + if (ends_with(file, ".apk") + && (starts_with(file, dataPath) || starts_with(file, testPath))) { // Always install it if we didn't build it because otherwise // it will never have changed. installApks.push_back(InstallApk(file, !target->build)); @@ -966,8 +969,9 @@ run_phases(vector<Target*> targets, const Options& options) for (size_t j=0; j<target->module.installed.size(); j++) { string filename = target->module.installed[j]; - // Apk in the data partition - if (!starts_with(filename, dataPath) || !ends_with(filename, ".apk")) { + // Skip of not apk in the data partition or test + if (!(ends_with(filename, ".apk") + && (starts_with(filename, dataPath) || starts_with(filename, testPath)))) { continue; } diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp index 4ce4406211ce..c08f9b04f0df 100644 --- a/tools/stats_log_api_gen/Android.bp +++ b/tools/stats_log_api_gen/Android.bp @@ -95,7 +95,7 @@ genrule { ], } -cc_library_shared { +cc_library { name: "libstatslog", host_supported: true, generated_sources: ["statslog.cpp"], diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 13377390fc04..19be13268d27 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -94,6 +94,8 @@ interface IWifiManager boolean disableNetwork(int netId, String packageName); + void allowAutojoin(int netId, boolean choice); + boolean startScan(String packageName); List<ScanResult> getScanResults(String callingPackage); diff --git a/wifi/java/android/net/wifi/IWifiScanner.aidl b/wifi/java/android/net/wifi/IWifiScanner.aidl index 398493439bbe..114c7320bc3a 100644 --- a/wifi/java/android/net/wifi/IWifiScanner.aidl +++ b/wifi/java/android/net/wifi/IWifiScanner.aidl @@ -26,5 +26,5 @@ interface IWifiScanner { Messenger getMessenger(); - Bundle getAvailableChannels(int band); + Bundle getAvailableChannels(int band, String packageName); } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 2afb14a12110..3bedddc8ec7d 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -735,6 +735,14 @@ public class WifiConfiguration implements Parcelable { */ public int userApproved = USER_UNSPECIFIED; + /** + * @hide + * Auto-join is allowed by user for this network. + * Default true. + */ + @SystemApi + public boolean allowAutojoin = true; + /** The Below RSSI thresholds are used to configure AutoJoin * - GOOD/LOW/BAD thresholds are used so as to calculate link score * - UNWANTED_SOFT are used by the blacklisting logic so as to handle @@ -2022,6 +2030,7 @@ public class WifiConfiguration implements Parcelable { if (updateIdentifier != null) sbuf.append(" updateIdentifier=" + updateIdentifier); sbuf.append(" lcuid=" + lastConnectUid); sbuf.append(" userApproved=" + userApprovedAsString(userApproved)); + sbuf.append(" allowAutojoin=" + allowAutojoin); sbuf.append(" noInternetAccessExpected=" + noInternetAccessExpected); sbuf.append(" "); @@ -2421,6 +2430,7 @@ public class WifiConfiguration implements Parcelable { numScorerOverrideAndSwitchedNetwork = source.numScorerOverrideAndSwitchedNetwork; numAssociation = source.numAssociation; userApproved = source.userApproved; + allowAutojoin = source.allowAutojoin; numNoInternetAccessReports = source.numNoInternetAccessReports; noInternetAccessExpected = source.noInternetAccessExpected; creationTime = source.creationTime; @@ -2496,6 +2506,7 @@ public class WifiConfiguration implements Parcelable { dest.writeInt(numScorerOverrideAndSwitchedNetwork); dest.writeInt(numAssociation); dest.writeInt(userApproved); + dest.writeBoolean(allowAutojoin); dest.writeInt(numNoInternetAccessReports); dest.writeInt(noInternetAccessExpected ? 1 : 0); dest.writeInt(shared ? 1 : 0); @@ -2571,6 +2582,7 @@ public class WifiConfiguration implements Parcelable { config.numScorerOverrideAndSwitchedNetwork = in.readInt(); config.numAssociation = in.readInt(); config.userApproved = in.readInt(); + config.allowAutojoin = in.readBoolean(); config.numNoInternetAccessReports = in.readInt(); config.noInternetAccessExpected = in.readInt() != 0; config.shared = in.readInt() != 0; diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 04b073be28e2..f626b0c46fa9 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -530,7 +530,9 @@ public class WifiManager { @SystemApi public static final String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state"; /** - * The interface used for the softap. + * The lookup key for a String extra that stores the interface name used for the Soft AP. + * This extra is included in the broadcast {@link #WIFI_AP_STATE_CHANGED_ACTION}. + * Retrieve its value with {@link android.content.Intent#getStringExtra(String)}. * * @hide */ @@ -538,9 +540,10 @@ public class WifiManager { public static final String EXTRA_WIFI_AP_INTERFACE_NAME = "android.net.wifi.extra.WIFI_AP_INTERFACE_NAME"; /** - * The intended ip mode for this softap. - * @see #IFACE_IP_MODE_TETHERED - * @see #IFACE_IP_MODE_LOCAL_ONLY + * The lookup key for an int extra that stores the intended IP mode for this Soft AP. + * One of {@link #IFACE_IP_MODE_TETHERED} or {@link #IFACE_IP_MODE_LOCAL_ONLY}. + * This extra is included in the broadcast {@link #WIFI_AP_STATE_CHANGED_ACTION}. + * Retrieve its value with {@link android.content.Intent#getIntExtra(String, int)}. * * @hide */ @@ -2697,12 +2700,13 @@ public class WifiManager { } /** - * Start SoftAp mode with the specified configuration. - * Note that starting in access point mode disables station - * mode operation - * @param wifiConfig SSID, security and channel details as - * part of WifiConfiguration - * @return {@code true} if the operation succeeds, {@code false} otherwise + * Start Soft AP (hotspot) mode with the specified configuration. + * Note that starting Soft AP mode may disable station mode operation if the device does not + * support concurrency. + * @param wifiConfig SSID, security and channel details as part of WifiConfiguration, or null to + * use the persisted Soft AP configuration that was previously set using + * {@link #setWifiApConfiguration(WifiConfiguration)}. + * @return {@code true} if the operation succeeded, {@code false} otherwise * * @hide */ @@ -3865,6 +3869,29 @@ public class WifiManager { } /** + * Sets the user choice for allowing auto-join to a network. + * The updated choice will be made available through the updated config supplied by the + * CONFIGURED_NETWORKS_CHANGED broadcast. + * + * @param netId the id of the network to allow/disallow autojoin for. + * @param choice true to allow autojoin, false to disallow autojoin + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) + public void allowAutojoin(int netId, boolean choice) { + try { + IWifiManager iWifiManager = getIWifiManager(); + if (iWifiManager == null) { + throw new RemoteException("Wifi service is not running"); + } + iWifiManager.allowAutojoin(netId, choice); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Disable ephemeral Network * * @param SSID, in the format of WifiConfiguration's SSID. diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 68948cbbe7a9..21189a411d94 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -17,7 +17,9 @@ package android.net.wifi; import android.Manifest; +import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; @@ -39,6 +41,8 @@ import com.android.internal.util.AsyncChannel; import com.android.internal.util.Preconditions; import com.android.internal.util.Protocol; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -51,26 +55,38 @@ import java.util.List; @SystemService(Context.WIFI_SCANNING_SERVICE) public class WifiScanner { - /** no band specified; use channel list instead */ - public static final int WIFI_BAND_UNSPECIFIED = 0; /* not specified */ + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = {"WIFI_BAND_"}, value = { + WIFI_BAND_UNSPECIFIED, + WIFI_BAND_24_GHZ, + WIFI_BAND_5_GHZ, + WIFI_BAND_BOTH, + WIFI_BAND_5_GHZ_DFS_ONLY, + WIFI_BAND_24_GHZ_WITH_5GHZ_DFS, + WIFI_BAND_5_GHZ_WITH_DFS, + WIFI_BAND_BOTH_WITH_DFS}) + public @interface WifiBand {} + /** no band specified; use channel list instead */ + public static final int WIFI_BAND_UNSPECIFIED = 0; /** 2.4 GHz band */ - public static final int WIFI_BAND_24_GHZ = 1; /* 2.4 GHz band */ + public static final int WIFI_BAND_24_GHZ = 1; /** 5 GHz band excluding DFS channels */ - public static final int WIFI_BAND_5_GHZ = 2; /* 5 GHz band without DFS channels */ + public static final int WIFI_BAND_5_GHZ = 2; + /** Both 2.4 GHz band and 5 GHz band; no DFS channels */ + public static final int WIFI_BAND_BOTH = 3; /** DFS channels from 5 GHz band only */ - public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; /* 5 GHz band DFS channels */ + public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; /** * 2.4Ghz band + DFS channels from 5 GHz band only * @hide */ public static final int WIFI_BAND_24_GHZ_WITH_5GHZ_DFS = 5; /** 5 GHz band including DFS channels */ - public static final int WIFI_BAND_5_GHZ_WITH_DFS = 6; /* 5 GHz band with DFS channels */ - /** Both 2.4 GHz band and 5 GHz band; no DFS channels */ - public static final int WIFI_BAND_BOTH = 3; /* both bands without DFS channels */ + public static final int WIFI_BAND_5_GHZ_WITH_DFS = 6; /** Both 2.4 GHz band and 5 GHz band; with DFS channels */ - public static final int WIFI_BAND_BOTH_WITH_DFS = 7; /* both bands with DFS channels */ + public static final int WIFI_BAND_BOTH_WITH_DFS = 7; /** * Max band value * @hide @@ -78,9 +94,9 @@ public class WifiScanner { public static final int WIFI_BAND_MAX = 8; /** Minimum supported scanning period */ - public static final int MIN_SCAN_PERIOD_MS = 1000; /* minimum supported period */ + public static final int MIN_SCAN_PERIOD_MS = 1000; /** Maximum supported scanning period */ - public static final int MAX_SCAN_PERIOD_MS = 1024000; /* maximum supported period */ + public static final int MAX_SCAN_PERIOD_MS = 1024000; /** No Error */ public static final int REASON_SUCCEEDED = 0; @@ -109,13 +125,20 @@ public class WifiScanner { } /** - * gives you all the possible channels; channel is specified as an - * integer with frequency in MHz i.e. channel 1 is 2412 + * Returns a list of all the possible channels for the given band(s). + * + * @param band one of the WifiScanner#WIFI_BAND_* constants, e.g. {@link #WIFI_BAND_24_GHZ} + * @return a list of all the frequencies, in MHz, for the given band(s) e.g. channel 1 is + * 2412, or null if an error occurred. + * * @hide */ - public List<Integer> getAvailableChannels(int band) { + @SystemApi + @Nullable + @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) + public List<Integer> getAvailableChannels(@WifiBand int band) { try { - Bundle bundle = mService.getAvailableChannels(band); + Bundle bundle = mService.getAvailableChannels(band, mContext.getOpPackageName()); return bundle.getIntegerArrayList(GET_AVAILABLE_CHANNELS_EXTRA); } catch (RemoteException e) { return null; diff --git a/wifi/java/com/android/server/wifi/BaseWifiService.java b/wifi/java/com/android/server/wifi/BaseWifiService.java index 94fb5ae4d61c..5e6c107dc187 100644 --- a/wifi/java/com/android/server/wifi/BaseWifiService.java +++ b/wifi/java/com/android/server/wifi/BaseWifiService.java @@ -168,6 +168,11 @@ public class BaseWifiService extends IWifiManager.Stub { } @Override + public void allowAutojoin(int netId, boolean choice) { + throw new UnsupportedOperationException(); + } + + @Override public boolean startScan(String packageName) { throw new UnsupportedOperationException(); } diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.base64 b/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.base64 index 56919c25de46..760c8395e659 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.base64 +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.base64 @@ -12,75 +12,75 @@ VnlkR2xsY3o0S0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVTVoCmJXVSthVEF3TVR3dlRt OWtaVTVoYldVK0NpQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFRtRnRaVDVJYjIx bFUxQTgKTDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1 dlpHVk9ZVzFsUGtaeWFXVnVaR3g1VG1GdApaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNB -OFZtRnNkV1UrUTJWdWRIVnllU0JJYjNWelpUd3ZWbUZzZFdVK0NpQWdJQ0FnCklDQWdQQzlPYjJS -bFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBrWlJSRTQ4 -TDA1dlpHVk8KWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBtMXBOaTVqYnk1MWF6d3ZWbUZz -ZFdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZwpJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0Fn -SUNBZ1BFNXZaR1ZPWVcxbFBsSnZZVzFwYm1kRGIyNXpiM0owYVhWdFQwazhMMDV2ClpHVk9ZVzFs -UGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUGpFeE1qSXpNeXcwTkRVMU5qWThMMVpoYkhWbFBnb2dJ -Q0FnSUNBZ0lEd3YKVG05a1pUNEtJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0E4VG05a1pUNEtJ -Q0FnSUNBZ0lDQThUbTlrWlU1aGJXVStRM0psWkdWdQpkR2xoYkR3dlRtOWtaVTVoYldVK0NpQWdJ -Q0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1VtVmhiRzA4CkwwNXZa -R1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBuTm9ZV3RsYmk1emRHbHljbVZrTG1OdmJU -d3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lD -QWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsVnpaWEp1WVcxbApVR0Z6YzNkdmNtUThMMDV2WkdWT1lX -MWxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0ClpU -NVZjMlZ5Ym1GdFpUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lXeDFaVDVxWVcx -bGN6d3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05 -a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxCaApjM04zYjNKa1BDOU9iMlJsVG1G -dFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbGx0T1hWYVJFRjNUbmM5UFR3dlZtRnNkV1Ur -CkNpQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0Fn -SUNBZ0lDQWdQRTV2WkdWT1lXMWwKUGtWQlVFMWxkR2h2WkR3dlRtOWtaVTVoYldVK0NpQWdJQ0Fn -SUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0FnSUR4TwpiMlJsVG1GdFpUNUZRVkJV -ZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnSUNBOFZtRnNkV1UrTWpFOEwxWmhi -SFZsClBnb2dJQ0FnSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxQ -Z29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeE8KYjJSbFRtRnRaVDVKYm01bGNrMWxkR2h2WkR3dlRtOWta -VTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQazFUTFVOSQpRVkF0VmpJOEwxWmhi -SFZsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0Np -QWdJQ0FnCklDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BF -NXZaR1ZPWVcxbFBrUnBaMmwwWVd4RFpYSjAKYVdacFkyRjBaVHd2VG05a1pVNWhiV1UrQ2lBZ0lD -QWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbApQa05sY25ScFpt -bGpZWFJsVkhsd1pUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lXeDFaVDU0TlRB -NWRqTThMMVpoCmJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1 -dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNURaWEowVTBoQk1qVTJSbWx1WjJW -eWNISnBiblE4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdVKwpNV1l4WmpG +OFZtRnNkV1UrUlhoaGJYQnNaU0JPWlhSM2IzSnJQQzlXWVd4MVpUNEtJQ0FnCklDQWdJQ0E4TDA1 +dlpHVStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStSbEZF +VGp3dlRtOWsKWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4Vm1Gc2RXVSthRzkwYzNCdmRDNWxlR0Z0 +Y0d4bExtNWxkRHd2Vm1Gc2RXVStDaUFnSUNBZwpJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhP +YjJSbFBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQbEp2WVcxcGJtZERiMjV6CmIzSjBhWFZ0 +VDBrOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqRXhNakl6TXl3ME5EVTFO +alk4TDFaaGJIVmwKUGdvZ0lDQWdJQ0FnSUR3dlRtOWtaVDRLSUNBZ0lDQWdQQzlPYjJSbFBnb2dJ +Q0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0E4VG05awpaVTVoYldVK1EzSmxaR1Z1ZEdsaGJEd3ZU +bTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrClpVNWhi +V1UrVW1WaGJHMDhMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbVY0WVcxd2JH +VXVZMjl0UEM5V1lXeDEKWlQ0S0lDQWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnUEU1dlpH +VStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrVlhObApjbTVoYldWUVlYTnpkMjl5WkR3dlRt +OWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2ClpH +Vk9ZVzFsUGxWelpYSnVZVzFsUEM5T2IyUmxUbUZ0WlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRlpoYkhW +bFBuVnpaWEk4TDFaaGJIVmwKUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNB +Z1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJsVG1GdApaVDVRWVhOemQyOXlaRHd2VG05 +a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1alIwWjZZek5rZG1OdFVUMDhMMVpo +CmJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFn +SUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNUZRVkJOWlhSb2IyUThMMDV2WkdWT1lXMWxQZ29n +SUNBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZwpJQ0E4VG05a1pVNWhiV1Ur +UlVGUVZIbHdaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqSXhQ +QzlXCllXeDFaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThU +bTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWcKSUNBOFRtOWtaVTVoYldVK1NXNXVaWEpOWlhSb2IyUThM +MDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1TgpVeTFEU0VGUUxWWXlQ +QzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2Iy +UmxQZ29nCklDQWdJQ0FnSUR3dlRtOWtaVDRLSUNBZ0lDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lD +QWdJRHhPYjJSbFRtRnRaVDVFYVdkcGRHRnMKUTJWeWRHbG1hV05oZEdVOEwwNXZaR1ZPWVcxbFBn +b2dJQ0FnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbApUbUZ0WlQ1RFpY +SjBhV1pwWTJGMFpWUjVjR1U4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdV +K2VEVXdPWFl6ClBDOVdZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNB +Z0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQTgKVG05a1pVNWhiV1UrUTJWeWRGTklRVEkxTmta +cGJtZGxjbkJ5YVc1MFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaApiSFZsUGpG bU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZt -TVdZeFpqRm1NV1l4ClpqRm1NV1l4Wmp3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0FnSUNBOEwwNXZaR1Ur -Q2lBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWcKSUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0Fn -UEU1dlpHVk9ZVzFsUGxOSlRUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4VG05awpaVDRL -SUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBrbE5VMGs4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJ -Q0FnSUNBZ0lDQThWbUZzCmRXVSthVzF6YVR3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0FnSUNBOEwwNXZa -R1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWcKSUNBZ0lDQWdQRTV2WkdWT1lXMWxQ -a1ZCVUZSNWNHVThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBOFZtRnNkV1UrTWpROApM -MVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lD -QWdJQ0FnUEM5T2IyUmxQZ29nCklDQWdQQzlPYjJSbFBnb2dJRHd2VG05a1pUNEtQQzlOWjIxMFZI -SmxaVDRLCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94LXg1MDktY2Et -Y2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRMUzFDUlVkSlRpQkRS -VkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlowbEtRVWxNYkVaa2Qz -cE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQwSm5UbFlLUWtGTlZF -SXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYyaGpUazFxV1hkTlZF -RTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZrRm5VVEJGZUUxSlNV -Skpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtOblMwTkJVVVZCQ25w -dVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIxV1ZYTldkVzFFWWxs -SWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJOQ01TdHZSMWhhZGto -M2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpVClJVRkRaV1pXYW1v -d2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwyUzJoU1FqZzFNVEpR -UWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dyVUdKck1IVjVhM1Jr -WW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIzUWtzM2FFUTRjRkIy -WmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNLMGxhCmFYQllOREY0 -UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFVRzVXTTJreGRIRXdO -R3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNXVVZHU1hkWU5IWnpP -RUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJOMDFFYlVGR1NYZFlO -SFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RWSkJkMFJuCldVUldV -VkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldVUldVakJVUWtGVmQw -RjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNXaDJZMDVCVVVWTVFs -RkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQwaEZDamxIUlZBdmRX -OW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5VVNYZEpWV00zCmQy -azNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5KT1EwOTBhWE5rUW5F -eWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhsT2JXMVdUQW94Y1VK -S2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhnMmVFMXVWR3c0ZUVW -WFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxXYUhwaFNFb3hkVlk0 -Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5WnpGS1VDdHNlRllL -YlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQTDNSa1RrNTJRMWw2 -YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJKUmtsRFFWUkZMUzB0 -TFMwSwotLXtib3VuZGFyeX0tLQo= +TVdZeFpqRm1NV1l4ClpqRm1NV1l4WmpGbU1XWThMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlP +YjJSbFBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWcKSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0Fn +SUNBZ0lEeE9iMlJsVG1GdFpUNVRTVTA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZwpQRTV2 +WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFRtRnRaVDVKVFZOSlBDOU9iMlJsVG1GdFpUNEtJ +Q0FnSUNBZ0lDQWdJQ0FnClBGWmhiSFZsUGpFeU16UTFOaW84TDFaaGJIVmxQZ29nSUNBZ0lDQWdJ +Q0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVSsKQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9i +MlJsVG1GdFpUNUZRVkJVZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaApi +SFZsUGpJelBDOVdZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNBOEww +NXZaR1UrQ2lBZ0lDQWdJRHd2ClRtOWtaVDRLSUNBZ0lEd3ZUbTlrWlQ0S0lDQThMMDV2WkdVK0Nq +d3ZUV2R0ZEZSeVpXVSsKCi0te2JvdW5kYXJ5fQpDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3gt +eDUwOS1jYS1jZXJ0CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NAoKTFMwdExTMUNS +VWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVUkxSRU5EUVdoRFowRjNTVUpCWjBsS1FV +bE1iRVprZDNwTQpWblZ5VFVFd1IwTlRjVWRUU1dJelJGRkZRa04zVlVGTlFrbDRSVVJCVDBKblRs +WUtRa0ZOVkVJd1ZrSlZRMEpFVVZSRmQwaG9ZMDVOClZGbDNUVlJGZVUxVVJURk5SRVV4VjJoalRr +MXFXWGROVkVFMVRWUkZNVTFFUlRGWGFrRlRUVkpCZHdwRVoxbEVWbEZSUkVWM1pFWlIKVmtGblVU +QkZlRTFKU1VKSmFrRk9RbWRyY1docmFVYzVkekJDUVZGRlJrRkJUME5CVVRoQlRVbEpRa05uUzBO +QlVVVkJDbnB1UVZCVgplakkyVFhOaFpUUjNjelF6WTNwU05ERXZTakpSZEhKVFNWcFZTMjFXVlhO +V2RXMUVZbGxJY2xCT2RsUllTMU5OV0VGalpYZFBVa1JSCldWZ0tVbkYyU0had2JqaERjMk5DTVN0 +dlIxaGFka2gzZUdvMGVsWXdWMHR2U3pKNlpWaHJZWFV6ZG1ONWJETklTVXQxY0VwbWNUSlUKUlVG +RFpXWldhbW93ZEFwS1Z5dFlNelZRUjFkd09TOUlOWHBKVlU1V1RsWnFVemRWYlhNNE5FbDJTMmhT +UWpnMU1USlFRamxWZVVoaApaMWhaVmxnMVIxZHdRV05XY0hsbWNteFNDa1pKT1ZGa2FHZ3JVR0py +TUhWNWEzUmtZbVl2UTJSbVowaFBiMlZpY2xSMGQxSnNhazB3CmIwUjBXQ3N5UTNZMmFqQjNRa3Mz +YUVRNGNGQjJaakVyZFhrS1IzcGplbWxuUVZVdk5FdDNOMlZhY1hsa1pqbENLelZTZFhCU0swbGEK +YVhCWU5ERjRSV2xKY2t0U2QzRnBOVEUzVjFkNldHTnFZVWN5WTA1aVpqUTFNUXA0Y0VnMVVHNVdN +Mmt4ZEhFd05HcE5SMUZWZWtaMwpTVVJCVVVGQ2J6UkhRVTFJTkhkSVVWbEVWbEl3VDBKQ1dVVkdT +WGRZTkhaek9FSnBRbU5UWTI5a0NqVnViMXBJVWswNFJUUXJhVTFGClNVZEJNVlZrU1hkUk4wMUVi +VUZHU1hkWU5IWnpPRUpwUW1OVFkyOWtOVzV2V2toU1RUaEZOQ3RwYjFKaGEwWkVRVk1LVFZKQmQw +Um4KV1VSV1VWRkVSWGRrUmxGV1FXZFJNRVY0WjJkclFXZDFWVll6UkUxMFZ6WnpkMFJCV1VSV1Vq +QlVRa0ZWZDBGM1JVSXZla0ZNUW1kTwpWZ3BJVVRoRlFrRk5RMEZSV1hkRVVWbEtTMjlhU1doMlkw +NUJVVVZNUWxGQlJHZG5SVUpCUm1aUmNVOVVRVGRTZGpkTEsyeDFVVGR3CmJtRnpORUpaZDBoRkNq +bEhSVkF2ZFc5b2RqWkxUM2t3VkVkUlJtSnlVbFJxUm05TVZrNUNPVUphTVhsdFRVUmFNQzlVU1hk +SlZXTTMKZDJrM1lUaDBOVzFGY1ZsSU1UVXpkMWNLWVZkdmIybFRhbmxNVEdoMVNUUnpUbkpPUTA5 +MGFYTmtRbkV5Y2pKTlJsaDBObWd3YlVGUgpXVTlRZGpoU09FczNMMlpuVTNoSFJuRjZhSGxPYlcx +V1RBb3hjVUpLYkdSNE16UlRjSGR6VkVGTVVWWlFZalJvUjNkS2VscG1jakZRClkzQkZVWGcyZUUx +dVZHdzRlRVZYV2tVelRYTTVPWFZoVlhoaVVYRkpkMUoxQ2t4blFVOXJUa050V1RKdE9EbFdhSHBo +U0VveGRWWTQKTlVGa1RTOTBSQ3RaYzIxc2JtNXFkRGxNVWtObGFtSkNhWEJxU1VkcVQxaHlaekZL +VUN0c2VGWUtiWFZOTkhaSUsxQXZiV3h0ZUhOUQpVSG93WkRZMVlpdEZSMjFLV25CdlRHdFBMM1Jr +VGs1MlExbDZha3B3VkVWWGNFVnpUelpPVFdoTFdXODlDaTB0TFMwdFJVNUVJRU5GClVsUkpSa2xE +UVZSRkxTMHRMUzBLCi0te2JvdW5kYXJ5fS0tCg==
\ No newline at end of file diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.conf b/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.conf index a44b54222589..5b4e4cb947cd 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.conf +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithCACert.conf @@ -13,38 +13,38 @@ YTptbzpob3RzcG90MmRvdDAtcGVycHJvdmlkZXJzdWJzY3JpcHRpb246MS4wPC9EREZOYW1lPgog ICAgICA8L1R5cGU+CiAgICA8L1JUUHJvcGVydGllcz4KICAgIDxOb2RlPgogICAgICA8Tm9kZU5h bWU+aTAwMTwvTm9kZU5hbWU+CiAgICAgIDxOb2RlPgogICAgICAgIDxOb2RlTmFtZT5Ib21lU1A8 L05vZGVOYW1lPgogICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPkZyaWVuZGx5TmFt -ZTwvTm9kZU5hbWU+CiAgICAgICAgICA8VmFsdWU+Q2VudHVyeSBIb3VzZTwvVmFsdWU+CiAgICAg -ICAgPC9Ob2RlPgogICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPkZRRE48L05vZGVO -YW1lPgogICAgICAgICAgPFZhbHVlPm1pNi5jby51azwvVmFsdWU+CiAgICAgICAgPC9Ob2RlPgog -ICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPlJvYW1pbmdDb25zb3J0aXVtT0k8L05v -ZGVOYW1lPgogICAgICAgICAgPFZhbHVlPjExMjIzMyw0NDU1NjY8L1ZhbHVlPgogICAgICAgIDwv -Tm9kZT4KICAgICAgPC9Ob2RlPgogICAgICA8Tm9kZT4KICAgICAgICA8Tm9kZU5hbWU+Q3JlZGVu -dGlhbDwvTm9kZU5hbWU+CiAgICAgICAgPE5vZGU+CiAgICAgICAgICA8Tm9kZU5hbWU+UmVhbG08 -L05vZGVOYW1lPgogICAgICAgICAgPFZhbHVlPnNoYWtlbi5zdGlycmVkLmNvbTwvVmFsdWU+CiAg -ICAgICAgPC9Ob2RlPgogICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPlVzZXJuYW1l -UGFzc3dvcmQ8L05vZGVOYW1lPgogICAgICAgICAgPE5vZGU+CiAgICAgICAgICAgIDxOb2RlTmFt -ZT5Vc2VybmFtZTwvTm9kZU5hbWU+CiAgICAgICAgICAgIDxWYWx1ZT5qYW1lczwvVmFsdWU+CiAg -ICAgICAgICA8L05vZGU+CiAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAgPE5vZGVOYW1lPlBh -c3N3b3JkPC9Ob2RlTmFtZT4KICAgICAgICAgICAgPFZhbHVlPlltOXVaREF3Tnc9PTwvVmFsdWU+ -CiAgICAgICAgICA8L05vZGU+CiAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAgPE5vZGVOYW1l -PkVBUE1ldGhvZDwvTm9kZU5hbWU+CiAgICAgICAgICAgIDxOb2RlPgogICAgICAgICAgICAgIDxO -b2RlTmFtZT5FQVBUeXBlPC9Ob2RlTmFtZT4KICAgICAgICAgICAgICA8VmFsdWU+MjE8L1ZhbHVl -PgogICAgICAgICAgICA8L05vZGU+CiAgICAgICAgICAgIDxOb2RlPgogICAgICAgICAgICAgIDxO -b2RlTmFtZT5Jbm5lck1ldGhvZDwvTm9kZU5hbWU+CiAgICAgICAgICAgICAgPFZhbHVlPk1TLUNI -QVAtVjI8L1ZhbHVlPgogICAgICAgICAgICA8L05vZGU+CiAgICAgICAgICA8L05vZGU+CiAgICAg -ICAgPC9Ob2RlPgogICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPkRpZ2l0YWxDZXJ0 -aWZpY2F0ZTwvTm9kZU5hbWU+CiAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAgPE5vZGVOYW1l -PkNlcnRpZmljYXRlVHlwZTwvTm9kZU5hbWU+CiAgICAgICAgICAgIDxWYWx1ZT54NTA5djM8L1Zh +ZTwvTm9kZU5hbWU+CiAgICAgICAgICA8VmFsdWU+RXhhbXBsZSBOZXR3b3JrPC9WYWx1ZT4KICAg +ICAgICA8L05vZGU+CiAgICAgICAgPE5vZGU+CiAgICAgICAgICA8Tm9kZU5hbWU+RlFETjwvTm9k +ZU5hbWU+CiAgICAgICAgICA8VmFsdWU+aG90c3BvdC5leGFtcGxlLm5ldDwvVmFsdWU+CiAgICAg +ICAgPC9Ob2RlPgogICAgICAgIDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPlJvYW1pbmdDb25z +b3J0aXVtT0k8L05vZGVOYW1lPgogICAgICAgICAgPFZhbHVlPjExMjIzMyw0NDU1NjY8L1ZhbHVl +PgogICAgICAgIDwvTm9kZT4KICAgICAgPC9Ob2RlPgogICAgICA8Tm9kZT4KICAgICAgICA8Tm9k +ZU5hbWU+Q3JlZGVudGlhbDwvTm9kZU5hbWU+CiAgICAgICAgPE5vZGU+CiAgICAgICAgICA8Tm9k +ZU5hbWU+UmVhbG08L05vZGVOYW1lPgogICAgICAgICAgPFZhbHVlPmV4YW1wbGUuY29tPC9WYWx1 +ZT4KICAgICAgICA8L05vZGU+CiAgICAgICAgPE5vZGU+CiAgICAgICAgICA8Tm9kZU5hbWU+VXNl +cm5hbWVQYXNzd29yZDwvTm9kZU5hbWU+CiAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAgPE5v +ZGVOYW1lPlVzZXJuYW1lPC9Ob2RlTmFtZT4KICAgICAgICAgICAgPFZhbHVlPnVzZXI8L1ZhbHVl +PgogICAgICAgICAgPC9Ob2RlPgogICAgICAgICAgPE5vZGU+CiAgICAgICAgICAgIDxOb2RlTmFt +ZT5QYXNzd29yZDwvTm9kZU5hbWU+CiAgICAgICAgICAgIDxWYWx1ZT5jR0Z6YzNkdmNtUT08L1Zh bHVlPgogICAgICAgICAgPC9Ob2RlPgogICAgICAgICAgPE5vZGU+CiAgICAgICAgICAgIDxOb2Rl -TmFtZT5DZXJ0U0hBMjU2RmluZ2VycHJpbnQ8L05vZGVOYW1lPgogICAgICAgICAgICA8VmFsdWU+ -MWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYx -ZjFmMWYxZjwvVmFsdWU+CiAgICAgICAgICA8L05vZGU+CiAgICAgICAgPC9Ob2RlPgogICAgICAg -IDxOb2RlPgogICAgICAgICAgPE5vZGVOYW1lPlNJTTwvTm9kZU5hbWU+CiAgICAgICAgICA8Tm9k -ZT4KICAgICAgICAgICAgPE5vZGVOYW1lPklNU0k8L05vZGVOYW1lPgogICAgICAgICAgICA8VmFs -dWU+aW1zaTwvVmFsdWU+CiAgICAgICAgICA8L05vZGU+CiAgICAgICAgICA8Tm9kZT4KICAgICAg -ICAgICAgPE5vZGVOYW1lPkVBUFR5cGU8L05vZGVOYW1lPgogICAgICAgICAgICA8VmFsdWU+MjQ8 -L1ZhbHVlPgogICAgICAgICAgPC9Ob2RlPgogICAgICAgIDwvTm9kZT4KICAgICAgPC9Ob2RlPgog -ICAgPC9Ob2RlPgogIDwvTm9kZT4KPC9NZ210VHJlZT4K +TmFtZT5FQVBNZXRob2Q8L05vZGVOYW1lPgogICAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAg +ICA8Tm9kZU5hbWU+RUFQVHlwZTwvTm9kZU5hbWU+CiAgICAgICAgICAgICAgPFZhbHVlPjIxPC9W +YWx1ZT4KICAgICAgICAgICAgPC9Ob2RlPgogICAgICAgICAgICA8Tm9kZT4KICAgICAgICAgICAg +ICA8Tm9kZU5hbWU+SW5uZXJNZXRob2Q8L05vZGVOYW1lPgogICAgICAgICAgICAgIDxWYWx1ZT5N +Uy1DSEFQLVYyPC9WYWx1ZT4KICAgICAgICAgICAgPC9Ob2RlPgogICAgICAgICAgPC9Ob2RlPgog +ICAgICAgIDwvTm9kZT4KICAgICAgICA8Tm9kZT4KICAgICAgICAgIDxOb2RlTmFtZT5EaWdpdGFs +Q2VydGlmaWNhdGU8L05vZGVOYW1lPgogICAgICAgICAgPE5vZGU+CiAgICAgICAgICAgIDxOb2Rl +TmFtZT5DZXJ0aWZpY2F0ZVR5cGU8L05vZGVOYW1lPgogICAgICAgICAgICA8VmFsdWU+eDUwOXYz +PC9WYWx1ZT4KICAgICAgICAgIDwvTm9kZT4KICAgICAgICAgIDxOb2RlPgogICAgICAgICAgICA8 +Tm9kZU5hbWU+Q2VydFNIQTI1NkZpbmdlcnByaW50PC9Ob2RlTmFtZT4KICAgICAgICAgICAgPFZh +bHVlPjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYxZjFmMWYx +ZjFmMWYxZjFmMWY8L1ZhbHVlPgogICAgICAgICAgPC9Ob2RlPgogICAgICAgIDwvTm9kZT4KICAg +ICAgICA8Tm9kZT4KICAgICAgICAgIDxOb2RlTmFtZT5TSU08L05vZGVOYW1lPgogICAgICAgICAg +PE5vZGU+CiAgICAgICAgICAgIDxOb2RlTmFtZT5JTVNJPC9Ob2RlTmFtZT4KICAgICAgICAgICAg +PFZhbHVlPjEyMzQ1Nio8L1ZhbHVlPgogICAgICAgICAgPC9Ob2RlPgogICAgICAgICAgPE5vZGU+ +CiAgICAgICAgICAgIDxOb2RlTmFtZT5FQVBUeXBlPC9Ob2RlTmFtZT4KICAgICAgICAgICAgPFZh +bHVlPjIzPC9WYWx1ZT4KICAgICAgICAgIDwvTm9kZT4KICAgICAgICA8L05vZGU+CiAgICAgIDwv +Tm9kZT4KICAgIDwvTm9kZT4KICA8L05vZGU+CjwvTWdtdFRyZWU+ --{boundary} Content-Type: application/x-x509-ca-cert diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithInvalidContentType.base64 b/wifi/tests/assets/hsr1/HSR1ProfileWithInvalidContentType.base64 index 906bfb397464..2775a9f419f9 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithInvalidContentType.base64 +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithInvalidContentType.base64 @@ -1,85 +1,86 @@ -Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PXtib3VuZGFyeX0KQ29udGVu -dC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0CgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBh -cHBsaWNhdGlvbi9wYXNzcG9pbnQtcHJvZmlsZQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBi -YXNlNjQKClBFMW5iWFJVY21WbElIaHRiRzV6UFNKemVXNWpiV3c2Wkcxa1pHWXhMaklpUGdvZ0lE -eFdaWEpFVkVRK01TNHlQQzlXWlhKRVZFUSsKQ2lBZ1BFNXZaR1UrQ2lBZ0lDQThUbTlrWlU1aGJX -VStVR1Z5VUhKdmRtbGtaWEpUZFdKelkzSnBjSFJwYjI0OEwwNXZaR1ZPWVcxbApQZ29nSUNBZ1BG -SlVVSEp2Y0dWeWRHbGxjejRLSUNBZ0lDQWdQRlI1Y0dVK0NpQWdJQ0FnSUNBZ1BFUkVSazVoYldV -K2RYSnVPbmRtCllUcHRienBvYjNSemNHOTBNbVJ2ZERBdGNHVnljSEp2ZG1sa1pYSnpkV0p6WTNK -cGNIUnBiMjQ2TVM0d1BDOUVSRVpPWVcxbFBnb2cKSUNBZ0lDQThMMVI1Y0dVK0NpQWdJQ0E4TDFK -VVVISnZjR1Z5ZEdsbGN6NEtJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQThUbTlrWlU1aApiV1UrYVRB -d01Ud3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0 -WlQ1SWIyMWxVMUE4CkwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0Fn -SUNBZ1BFNXZaR1ZPWVcxbFBrWnlhV1Z1Wkd4NVRtRnQKWlR3dlRtOWtaVTVoYldVK0NpQWdJQ0Fn -SUNBZ0lDQThWbUZzZFdVK1EyVnVkSFZ5ZVNCSWIzVnpaVHd2Vm1Gc2RXVStDaUFnSUNBZwpJQ0Fn -UEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQ -a1pSUkU0OEwwNXZaR1ZPCllXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbTFwTmk1amJ5NTFh -end2Vm1Gc2RXVStDaUFnSUNBZ0lDQWdQQzlPYjJSbFBnb2cKSUNBZ0lDQWdJRHhPYjJSbFBnb2dJ -Q0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQbEp2WVcxcGJtZERiMjV6YjNKMGFYVnRUMGs4TDA1dgpa -R1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqRXhNakl6TXl3ME5EVTFOalk4TDFaaGJI -VmxQZ29nSUNBZ0lDQWdJRHd2ClRtOWtaVDRLSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBOFRt -OWtaVDRLSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrUTNKbFpHVnUKZEdsaGJEd3ZUbTlrWlU1aGJX -VStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStVbVZoYkcw -OApMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbk5vWVd0bGJpNXpkR2x5Y21W -a0xtTnZiVHd2Vm1Gc2RXVStDaUFnCklDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJS -bFBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQbFZ6WlhKdVlXMWwKVUdGemMzZHZjbVE4TDA1 -dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJs -VG1GdApaVDVWYzJWeWJtRnRaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gx -WlQ1cVlXMWxjend2Vm1Gc2RXVStDaUFnCklDQWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0Fn -SUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsQmgKYzNOM2IzSmtQQzlP -YjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUGxsdE9YVmFSRUYzVG5jOVBUd3ZW -bUZzZFdVKwpDaUFnSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pUNEtJ -Q0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsClBrVkJVRTFsZEdodlpEd3ZUbTlrWlU1aGJXVStD -aUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeE8KYjJSbFRtRnRa -VDVGUVZCVWVYQmxQQzlPYjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdVK01q -RThMMVpoYkhWbApQZ29nSUNBZ0lDQWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lE -eE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQWdJRHhPCmIyUmxUbUZ0WlQ1SmJtNWxjazFsZEdodlpE -d3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUGsxVExVTkkKUVZBdFZq -SThMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4TDA1 -dlpHVStDaUFnSUNBZwpJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNB -Z0lDQWdQRTV2WkdWT1lXMWxQa1JwWjJsMFlXeERaWEowCmFXWnBZMkYwWlR3dlRtOWtaVTVoYldV -K0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWwKUGtO -bGNuUnBabWxqWVhSbFZIbHdaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gx -WlQ1NE5UQTVkak04TDFaaApiSFZsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0Fn -SUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJsClRtRnRaVDVEWlhKMFUwaEJNalUy -Um1sdVoyVnlVSEpwYm5ROEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4Vm1Gc2RXVSsK -TVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1N -V1l4WmpGbU1XWXhaakZtTVdZeApaakZtTVdZeFpqd3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ0lDQThM -MDV2WkdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnCklEeE9iMlJsUGdvZ0lDQWdJ -Q0FnSUNBZ1BFNXZaR1ZPWVcxbFBsTkpUVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBOFRt -OWsKWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQa2xOVTBrOEwwNXZaR1ZPWVcxbFBn -b2dJQ0FnSUNBZ0lDQWdJQ0E4Vm1GcwpkV1UrYVcxemFUd3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ0lD -QThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnCklDQWdJQ0FnUEU1dlpH -Vk9ZVzFsUGtWQlVGUjVjR1U4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdV -K01qUTgKTDFaaGJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHd2VG05 -a1pUNEtJQ0FnSUNBZ1BDOU9iMlJsUGdvZwpJQ0FnUEM5T2IyUmxQZ29nSUR3dlRtOWtaVDRLUEM5 -TloyMTBWSEpsWlQ0SwoKLS17Ym91bmRhcnl9CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veC14 -NTA5LWNhLWNlcnQKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0CgpMUzB0TFMxQ1JV -ZEpUaUJEUlZKVVNVWkpRMEZVUlMwdExTMHRDazFKU1VSTFJFTkRRV2hEWjBGM1NVSkJaMGxLUVVs -TWJFWmtkM3BNClZuVnlUVUV3UjBOVGNVZFRTV0l6UkZGRlFrTjNWVUZOUWtsNFJVUkJUMEpuVGxZ -S1FrRk5WRUl3VmtKVlEwSkVVVlJGZDBob1kwNU4KVkZsM1RWUkZlVTFVUlRGTlJFVXhWMmhqVGsx -cVdYZE5WRUUxVFZSRk1VMUVSVEZYYWtGVFRWSkJkd3BFWjFsRVZsRlJSRVYzWkVaUgpWa0ZuVVRC -RmVFMUpTVUpKYWtGT1FtZHJjV2hyYVVjNWR6QkNRVkZGUmtGQlQwTkJVVGhCVFVsSlFrTm5TME5C -VVVWQkNucHVRVkJWCmVqSTJUWE5oWlRSM2N6UXpZM3BTTkRFdlNqSlJkSEpUU1ZwVlMyMVdWWE5X -ZFcxRVlsbEljbEJPZGxSWVMxTk5XRUZqWlhkUFVrUlIKV1ZnS1VuRjJTSFp3YmpoRGMyTkNNU3R2 -UjFoYWRraDNlR28wZWxZd1YwdHZTeko2WlZocllYVXpkbU41YkROSVNVdDFjRXBtY1RKVQpSVUZE -WldaV2Ftb3dkQXBLVnl0WU16VlFSMWR3T1M5SU5YcEpWVTVXVGxacVV6ZFZiWE00TkVsMlMyaFNR -amcxTVRKUVFqbFZlVWhoCloxaFpWbGcxUjFkd1FXTldjSGxtY214U0NrWkpPVkZrYUdnclVHSnJN -SFY1YTNSa1ltWXZRMlJtWjBoUGIyVmljbFIwZDFKc2FrMHcKYjBSMFdDc3lRM1kyYWpCM1FrczNh -RVE0Y0ZCMlpqRXJkWGtLUjNwamVtbG5RVlV2TkV0M04yVmFjWGxrWmpsQ0t6VlNkWEJTSzBsYQph -WEJZTkRGNFJXbEpja3RTZDNGcE5URTNWMWQ2V0dOcVlVY3lZMDVpWmpRMU1RcDRjRWcxVUc1V00y -a3hkSEV3TkdwTlIxRlZla1ozClNVUkJVVUZDYnpSSFFVMUlOSGRJVVZsRVZsSXdUMEpDV1VWR1NY -ZFlOSFp6T0VKcFFtTlRZMjlrQ2pWdWIxcElVazA0UlRRcmFVMUYKU1VkQk1WVmtTWGRSTjAxRWJV -RkdTWGRZTkhaek9FSnBRbU5UWTI5a05XNXZXa2hTVFRoRk5DdHBiMUpoYTBaRVFWTUtUVkpCZDBS -bgpXVVJXVVZGRVJYZGtSbEZXUVdkUk1FVjRaMmRyUVdkMVZWWXpSRTEwVnpaemQwUkJXVVJXVWpC -VVFrRlZkMEYzUlVJdmVrRk1RbWRPClZncElVVGhGUWtGTlEwRlJXWGRFVVZsS1MyOWFTV2gyWTA1 -QlVVVk1RbEZCUkdkblJVSkJSbVpSY1U5VVFUZFNkamRMSzJ4MVVUZHcKYm1Gek5FSlpkMGhGQ2ps -SFJWQXZkVzlvZGpaTFQza3dWRWRSUm1KeVVsUnFSbTlNVms1Q09VSmFNWGx0VFVSYU1DOVVTWGRK -VldNMwpkMmszWVRoME5XMUZjVmxJTVRVemQxY0tZVmR2YjJsVGFubE1UR2gxU1RSelRuSk9RMDkw -YVhOa1FuRXljakpOUmxoME5tZ3diVUZSCldVOVFkamhTT0VzM0wyWm5VM2hIUm5GNmFIbE9iVzFX -VEFveGNVSktiR1I0TXpSVGNIZHpWRUZNVVZaUVlqUm9SM2RLZWxwbWNqRlEKWTNCRlVYZzJlRTF1 -Vkd3NGVFVlhXa1V6VFhNNU9YVmhWWGhpVVhGSmQxSjFDa3huUVU5clRrTnRXVEp0T0RsV2FIcGhT -RW94ZFZZNApOVUZrVFM5MFJDdFpjMjFzYm01cWREbE1Va05sYW1KQ2FYQnFTVWRxVDFoeVp6RktV -Q3RzZUZZS2JYVk5OSFpJSzFBdmJXeHRlSE5RClVIb3daRFkxWWl0RlIyMUtXbkJ2VEd0UEwzUmtU -azUyUTFsNmFrcHdWRVZYY0VWelR6Wk9UV2hMV1c4OUNpMHRMUzB0UlU1RUlFTkYKVWxSSlJrbERR -VlJGTFMwdExTMEsKLS17Ym91bmRhcnl9LS0K +TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5 +PXtib3VuZGFyeX07IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFz +ZTY0CgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9wYXNzcG9pbnQtcHJv +ZmlsZTsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKClBF +MW5iWFJVY21WbElIaHRiRzV6UFNKemVXNWpiV3c2Wkcxa1pHWXhMaklpUGdvZ0lEeFdaWEpFVkVR +K01TNHlQQzlXWlhKRVZFUSsKQ2lBZ1BFNXZaR1UrQ2lBZ0lDQThUbTlrWlU1aGJXVStVR1Z5VUhK +dmRtbGtaWEpUZFdKelkzSnBjSFJwYjI0OEwwNXZaR1ZPWVcxbApQZ29nSUNBZ1BGSlVVSEp2Y0dW +eWRHbGxjejRLSUNBZ0lDQWdQRlI1Y0dVK0NpQWdJQ0FnSUNBZ1BFUkVSazVoYldVK2RYSnVPbmRt +CllUcHRienBvYjNSemNHOTBNbVJ2ZERBdGNHVnljSEp2ZG1sa1pYSnpkV0p6WTNKcGNIUnBiMjQ2 +TVM0d1BDOUVSRVpPWVcxbFBnb2cKSUNBZ0lDQThMMVI1Y0dVK0NpQWdJQ0E4TDFKVVVISnZjR1Z5 +ZEdsbGN6NEtJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQThUbTlrWlU1aApiV1UrYVRBd01Ud3ZUbTlr +WlU1aGJXVStDaUFnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1SWIyMWxV +MUE4CkwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZa +R1ZPWVcxbFBrWnlhV1Z1Wkd4NVRtRnQKWlR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQThW +bUZzZFdVK1JYaGhiWEJzWlNCT1pYUjNiM0pyUEM5V1lXeDFaVDRLSUNBZwpJQ0FnSUNBOEwwNXZa +R1UrQ2lBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrUmxGRVRq +d3ZUbTlrClpVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBOFZtRnNkV1UrYUc5MGMzQnZkQzVsZUdGdGNH +eGxMbTVsZER3dlZtRnNkV1UrQ2lBZ0lDQWcKSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2Iy +UmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxKdllXMXBibWREYjI1egpiM0owYVhWdFQw +azhMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQakV4TWpJek15dzBORFUxTmpZ +OEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNB +Z0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBOFRtOWsKWlU1aGJXVStRM0psWkdWdWRHbGhiRHd2VG05 +a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05awpaVTVoYldV +K1VtVmhiRzA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUG1WNFlXMXdiR1V1 +WTI5dFBDOVdZV3gxClpUNEtJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ1BFNXZaR1Ur +Q2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1ZYTmwKY201aGJXVlFZWE56ZDI5eVpEd3ZUbTlr +WlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dgpaR1ZP +WVcxbFBsVnpaWEp1WVcxbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQ +blZ6WlhJOEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdQ +RTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFRtRnQKWlQ1UVlYTnpkMjl5WkR3dlRtOWta +VTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhXWVd4MVpUNWpSMFo2WXpOa2RtTnRVVDA4TDFaaApi +SFZsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lD +QWdJQ0FnSUNBZ0lEeE9iMlJsClRtRnRaVDVGUVZCTlpYUm9iMlE4TDA1dlpHVk9ZVzFsUGdvZ0lD +QWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWcKSUNBOFRtOWtaVTVoYldVK1JV +RlFWSGx3WlR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQakl4UEM5 +VwpZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4VG05 +a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnCklDQThUbTlrWlU1aGJXVStTVzV1WlhKTlpYUm9iMlE4TDA1 +dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQWdJRHhXWVd4MVpUNU4KVXkxRFNFRlFMVll5UEM5 +V1lXeDFaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJs +UGdvZwpJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0Fn +SUR4T2IyUmxUbUZ0WlQ1RWFXZHBkR0ZzClEyVnlkR2xtYVdOaGRHVThMMDV2WkdWT1lXMWxQZ29n +SUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNURaWEow +YVdacFkyRjBaVlI1Y0dVOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4Vm1Gc2RXVStl +RFV3T1hZegpQQzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUNBZ0lDQWdJ +RHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4ClRtOWtaVTVoYldVK1EyVnlkRk5JUVRJMU5rWnBi +bWRsY25CeWFXNTBQQzlPYjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BGWmgKYkhWbFBqRm1N +V1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1X +WXhaakZtTVdZeApaakZtTVdZeFpqRm1NV1k4TDFaaGJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2Iy +UmxQZ29nSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnCklDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lD +QWdJRHhPYjJSbFRtRnRaVDVUU1UwOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWcKUEU1dlpH +VStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1SlRWTkpQQzlPYjJSbFRtRnRaVDRLSUNB +Z0lDQWdJQ0FnSUNBZwpQRlpoYkhWbFBqRXlNelExTmlvOEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNB +Z1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1UrCkNpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJS +bFRtRnRaVDVGUVZCVWVYQmxQQzlPYjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BGWmgKYkhW +bFBqSXpQQzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUNBZ0lDQThMMDV2 +WkdVK0NpQWdJQ0FnSUR3dgpUbTlrWlQ0S0lDQWdJRHd2VG05a1pUNEtJQ0E4TDA1dlpHVStDand2 +VFdkdGRGUnlaV1UrCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94LXg1 +MDktY2EtY2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRMUzFDUlVk +SlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlowbEtRVWxN +YkVaa2QzcE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQwSm5UbFlL +UWtGTlZFSXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYyaGpUazFx +V1hkTlZFRTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZrRm5VVEJG +ZUUxSlNVSkpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtOblMwTkJV +VVZCQ25wdVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIxV1ZYTldk +VzFFWWxsSWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJOQ01TdHZS +MWhhZGtoM2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpVClJVRkRa +V1pXYW1vd2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwyUzJoU1Fq +ZzFNVEpRUWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dyVUdKck1I +VjVhM1JrWW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIzUWtzM2FF +UTRjRkIyWmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNLMGxhCmFY +QllOREY0UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFVRzVXTTJr +eGRIRXdOR3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNXVVZHU1hk +WU5IWnpPRUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJOMDFFYlVG +R1NYZFlOSFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RWSkJkMFJu +CldVUldVVkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldVUldVakJV +UWtGVmQwRjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNXaDJZMDVC +VVVWTVFsRkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQwaEZDamxI +UlZBdmRXOW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5VVNYZEpW +V00zCmQyazNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5KT1EwOTBh +WE5rUW5FeWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhsT2JXMVdU +QW94Y1VKS2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhnMmVFMXVW +R3c0ZUVWWFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxXYUhwaFNF +b3hkVlk0Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5WnpGS1VD +dHNlRllLYlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQTDNSa1Rr +NTJRMWw2YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJKUmtsRFFW +UkZMUzB0TFMwSwotLXtib3VuZGFyeX0tLQo=
\ No newline at end of file diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithMissingBoundary.base64 b/wifi/tests/assets/hsr1/HSR1ProfileWithMissingBoundary.base64 index 3fa97d1cdd76..7023453b3992 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithMissingBoundary.base64 +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithMissingBoundary.base64 @@ -1,85 +1,86 @@ -Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PXtib3VuZGFyeX0KQ29udGVu -dC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTY0CgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBh -cHBsaWNhdGlvbi94LXBhc3Nwb2ludC1wcm9maWxlCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6 -IGJhc2U2NAoKUEUxbmJYUlVjbVZsSUhodGJHNXpQU0p6ZVc1amJXdzZaRzFrWkdZeExqSWlQZ29n -SUR4V1pYSkVWRVErTVM0eVBDOVdaWEpFVkVRKwpDaUFnUEU1dlpHVStDaUFnSUNBOFRtOWtaVTVo -YldVK1VHVnlVSEp2ZG1sa1pYSlRkV0p6WTNKcGNIUnBiMjQ4TDA1dlpHVk9ZVzFsClBnb2dJQ0Fn -UEZKVVVISnZjR1Z5ZEdsbGN6NEtJQ0FnSUNBZ1BGUjVjR1UrQ2lBZ0lDQWdJQ0FnUEVSRVJrNWhi -V1UrZFhKdU9uZG0KWVRwdGJ6cG9iM1J6Y0c5ME1tUnZkREF0Y0dWeWNISnZkbWxrWlhKemRXSnpZ -M0pwY0hScGIyNDZNUzR3UEM5RVJFWk9ZVzFsUGdvZwpJQ0FnSUNBOEwxUjVjR1UrQ2lBZ0lDQThM -MUpVVUhKdmNHVnlkR2xsY3o0S0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVTVoCmJXVSth -VEF3TVR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFRt -RnRaVDVJYjIxbFUxQTgKTDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lD -QWdJQ0FnUEU1dlpHVk9ZVzFsUGtaeWFXVnVaR3g1VG1GdApaVHd2VG05a1pVNWhiV1UrQ2lBZ0lD -QWdJQ0FnSUNBOFZtRnNkV1UrUTJWdWRIVnllU0JJYjNWelpUd3ZWbUZzZFdVK0NpQWdJQ0FnCklD -QWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcx -bFBrWlJSRTQ4TDA1dlpHVk8KWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBtMXBOaTVqYnk1 -MWF6d3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZwpJQ0FnSUNBZ0lEeE9iMlJsUGdv -Z0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsSnZZVzFwYm1kRGIyNXpiM0owYVhWdFQwazhMMDV2 -ClpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUGpFeE1qSXpNeXcwTkRVMU5qWThMMVpo -YkhWbFBnb2dJQ0FnSUNBZ0lEd3YKVG05a1pUNEtJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0E4 -VG05a1pUNEtJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStRM0psWkdWdQpkR2xoYkR3dlRtOWtaVTVo -YldVK0NpQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1VtVmhi -RzA4CkwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBuTm9ZV3RsYmk1emRHbHlj -bVZrTG1OdmJUd3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9i -MlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsVnpaWEp1WVcxbApVR0Z6YzNkdmNtUThM -MDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2Iy -UmxUbUZ0ClpUNVZjMlZ5Ym1GdFpUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lX -eDFaVDVxWVcxbGN6d3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lD -QWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxCaApjM04zYjNKa1BD -OU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbGx0T1hWYVJFRjNUbmM5UFR3 -dlZtRnNkV1UrCkNpQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0 -S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWwKUGtWQlVFMWxkR2h2WkR3dlRtOWtaVTVoYldV -K0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0FnSUR4TwpiMlJsVG1G -dFpUNUZRVkJVZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnSUNBOFZtRnNkV1Ur -TWpFOEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0Fn -SUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeE8KYjJSbFRtRnRaVDVKYm01bGNrMWxkR2h2 -WkR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQazFUTFVOSQpRVkF0 -VmpJOEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThM -MDV2WkdVK0NpQWdJQ0FnCklDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJ -Q0FnSUNBZ1BFNXZaR1ZPWVcxbFBrUnBaMmwwWVd4RFpYSjAKYVdacFkyRjBaVHd2VG05a1pVNWhi -V1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbApQ -a05sY25ScFptbGpZWFJsVkhsd1pUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lX -eDFaVDU0TlRBNWRqTThMMVpoCmJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lD -QWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNURaWEowVTBoQk1q -VTJSbWx1WjJWeVVISnBiblE4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdV -KwpNV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpG -bU1XWXhaakZtTVdZeFpqRm1NV1l4ClpqRm1NV1l4Wmp3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0FnSUNB -OEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWcKSUR4T2IyUmxQZ29nSUNB -Z0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxOSlRUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4 -VG05awpaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBrbE5VMGs4TDA1dlpHVk9ZVzFs -UGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzCmRXVSthVzF6YVR3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0Fn -SUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWcKSUNBZ0lDQWdQRTV2 -WkdWT1lXMWxQa1ZCVUZSNWNHVThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBOFZtRnNk -V1UrTWpROApMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEd3ZU -bTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nCklDQWdQQzlPYjJSbFBnb2dJRHd2VG05a1pUNEtQ -QzlOWjIxMFZISmxaVDRLCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94 -LXg1MDktY2EtY2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRMUzFD -UlVkSlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlowbEtR -VWxNYkVaa2QzcE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQwSm5U -bFlLUWtGTlZFSXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYyaGpU -azFxV1hkTlZFRTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZrRm5V -VEJGZUUxSlNVSkpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtOblMw -TkJVVVZCQ25wdVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIxV1ZY -TldkVzFFWWxsSWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJOQ01T -dHZSMWhhZGtoM2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpVClJV -RkRaV1pXYW1vd2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwyUzJo -U1FqZzFNVEpRUWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dyVUdK -ck1IVjVhM1JrWW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIzUWtz -M2FFUTRjRkIyWmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNLMGxh -CmFYQllOREY0UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFVRzVX -TTJreGRIRXdOR3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNXVVZH -U1hkWU5IWnpPRUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJOMDFF -YlVGR1NYZFlOSFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RWSkJk -MFJuCldVUldVVkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldVUldV -akJVUWtGVmQwRjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNXaDJZ -MDVCVVVWTVFsRkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQwaEZD -amxIUlZBdmRXOW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5VVNY -ZEpWV00zCmQyazNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5KT1Ew -OTBhWE5rUW5FeWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhsT2JX -MVdUQW94Y1VKS2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhnMmVF -MXVWR3c0ZUVWWFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxXYUhw -aFNFb3hkVlk0Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5WnpG -S1VDdHNlRllLYlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQTDNS -a1RrNTJRMWw2YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJKUmts -RFFWUkZMUzB0TFMwSwo= +TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5 +PXtib3VuZGFyeX07IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmFz +ZTY0CgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94LXBhc3Nwb2ludC1w +cm9maWxlOyBjaGFyc2V0PVVURi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NAoK +UEUxbmJYUlVjbVZsSUhodGJHNXpQU0p6ZVc1amJXdzZaRzFrWkdZeExqSWlQZ29nSUR4V1pYSkVW +RVErTVM0eVBDOVdaWEpFVkVRKwpDaUFnUEU1dlpHVStDaUFnSUNBOFRtOWtaVTVoYldVK1VHVnlV +SEp2ZG1sa1pYSlRkV0p6WTNKcGNIUnBiMjQ4TDA1dlpHVk9ZVzFsClBnb2dJQ0FnUEZKVVVISnZj +R1Z5ZEdsbGN6NEtJQ0FnSUNBZ1BGUjVjR1UrQ2lBZ0lDQWdJQ0FnUEVSRVJrNWhiV1UrZFhKdU9u +ZG0KWVRwdGJ6cG9iM1J6Y0c5ME1tUnZkREF0Y0dWeWNISnZkbWxrWlhKemRXSnpZM0pwY0hScGIy +NDZNUzR3UEM5RVJFWk9ZVzFsUGdvZwpJQ0FnSUNBOEwxUjVjR1UrQ2lBZ0lDQThMMUpVVUhKdmNH +VnlkR2xsY3o0S0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVTVoCmJXVSthVEF3TVR3dlRt +OWtaVTVoYldVK0NpQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFRtRnRaVDVJYjIx +bFUxQTgKTDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1 +dlpHVk9ZVzFsUGtaeWFXVnVaR3g1VG1GdApaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNB +OFZtRnNkV1UrUlhoaGJYQnNaU0JPWlhSM2IzSnJQQzlXWVd4MVpUNEtJQ0FnCklDQWdJQ0E4TDA1 +dlpHVStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStSbEZF +VGp3dlRtOWsKWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4Vm1Gc2RXVSthRzkwYzNCdmRDNWxlR0Z0 +Y0d4bExtNWxkRHd2Vm1Gc2RXVStDaUFnSUNBZwpJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhP +YjJSbFBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQbEp2WVcxcGJtZERiMjV6CmIzSjBhWFZ0 +VDBrOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqRXhNakl6TXl3ME5EVTFO +alk4TDFaaGJIVmwKUGdvZ0lDQWdJQ0FnSUR3dlRtOWtaVDRLSUNBZ0lDQWdQQzlPYjJSbFBnb2dJ +Q0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0E4VG05awpaVTVoYldVK1EzSmxaR1Z1ZEdsaGJEd3ZU +bTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrClpVNWhi +V1UrVW1WaGJHMDhMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbVY0WVcxd2JH +VXVZMjl0UEM5V1lXeDEKWlQ0S0lDQWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnUEU1dlpH +VStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrVlhObApjbTVoYldWUVlYTnpkMjl5WkR3dlRt +OWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2ClpH +Vk9ZVzFsUGxWelpYSnVZVzFsUEM5T2IyUmxUbUZ0WlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRlpoYkhW +bFBuVnpaWEk4TDFaaGJIVmwKUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNB +Z1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJsVG1GdApaVDVRWVhOemQyOXlaRHd2VG05 +a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1alIwWjZZek5rZG1OdFVUMDhMMVpo +CmJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFn +SUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNUZRVkJOWlhSb2IyUThMMDV2WkdWT1lXMWxQZ29n +SUNBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZwpJQ0E4VG05a1pVNWhiV1Ur +UlVGUVZIbHdaVHd2VG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqSXhQ +QzlXCllXeDFaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThU +bTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWcKSUNBOFRtOWtaVTVoYldVK1NXNXVaWEpOWlhSb2IyUThM +MDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1TgpVeTFEU0VGUUxWWXlQ +QzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2Iy +UmxQZ29nCklDQWdJQ0FnSUR3dlRtOWtaVDRLSUNBZ0lDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lD +QWdJRHhPYjJSbFRtRnRaVDVFYVdkcGRHRnMKUTJWeWRHbG1hV05oZEdVOEwwNXZaR1ZPWVcxbFBn +b2dJQ0FnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbApUbUZ0WlQ1RFpY +SjBhV1pwWTJGMFpWUjVjR1U4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdV +K2VEVXdPWFl6ClBDOVdZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNB +Z0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQTgKVG05a1pVNWhiV1UrUTJWeWRGTklRVEkxTmta +cGJtZGxjbkJ5YVc1MFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaApiSFZsUGpG +bU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZt +TVdZeFpqRm1NV1l4ClpqRm1NV1l4WmpGbU1XWThMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlP +YjJSbFBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWcKSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0Fn +SUNBZ0lEeE9iMlJsVG1GdFpUNVRTVTA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZwpQRTV2 +WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFRtRnRaVDVKVFZOSlBDOU9iMlJsVG1GdFpUNEtJ +Q0FnSUNBZ0lDQWdJQ0FnClBGWmhiSFZsUGpFeU16UTFOaW84TDFaaGJIVmxQZ29nSUNBZ0lDQWdJ +Q0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVSsKQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9i +MlJsVG1GdFpUNUZRVkJVZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaApi +SFZsUGpJelBDOVdZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNBOEww +NXZaR1UrQ2lBZ0lDQWdJRHd2ClRtOWtaVDRLSUNBZ0lEd3ZUbTlrWlQ0S0lDQThMMDV2WkdVK0Nq +d3ZUV2R0ZEZSeVpXVSsKCi0te2JvdW5kYXJ5fQpDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3gt +eDUwOS1jYS1jZXJ0CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NAoKTFMwdExTMUNS +VWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVUkxSRU5EUVdoRFowRjNTVUpCWjBsS1FV +bE1iRVprZDNwTQpWblZ5VFVFd1IwTlRjVWRUU1dJelJGRkZRa04zVlVGTlFrbDRSVVJCVDBKblRs +WUtRa0ZOVkVJd1ZrSlZRMEpFVVZSRmQwaG9ZMDVOClZGbDNUVlJGZVUxVVJURk5SRVV4VjJoalRr +MXFXWGROVkVFMVRWUkZNVTFFUlRGWGFrRlRUVkpCZHdwRVoxbEVWbEZSUkVWM1pFWlIKVmtGblVU +QkZlRTFKU1VKSmFrRk9RbWRyY1docmFVYzVkekJDUVZGRlJrRkJUME5CVVRoQlRVbEpRa05uUzBO +QlVVVkJDbnB1UVZCVgplakkyVFhOaFpUUjNjelF6WTNwU05ERXZTakpSZEhKVFNWcFZTMjFXVlhO +V2RXMUVZbGxJY2xCT2RsUllTMU5OV0VGalpYZFBVa1JSCldWZ0tVbkYyU0had2JqaERjMk5DTVN0 +dlIxaGFka2gzZUdvMGVsWXdWMHR2U3pKNlpWaHJZWFV6ZG1ONWJETklTVXQxY0VwbWNUSlUKUlVG +RFpXWldhbW93ZEFwS1Z5dFlNelZRUjFkd09TOUlOWHBKVlU1V1RsWnFVemRWYlhNNE5FbDJTMmhT +UWpnMU1USlFRamxWZVVoaApaMWhaVmxnMVIxZHdRV05XY0hsbWNteFNDa1pKT1ZGa2FHZ3JVR0py +TUhWNWEzUmtZbVl2UTJSbVowaFBiMlZpY2xSMGQxSnNhazB3CmIwUjBXQ3N5UTNZMmFqQjNRa3Mz +YUVRNGNGQjJaakVyZFhrS1IzcGplbWxuUVZVdk5FdDNOMlZhY1hsa1pqbENLelZTZFhCU0swbGEK +YVhCWU5ERjRSV2xKY2t0U2QzRnBOVEUzVjFkNldHTnFZVWN5WTA1aVpqUTFNUXA0Y0VnMVVHNVdN +Mmt4ZEhFd05HcE5SMUZWZWtaMwpTVVJCVVVGQ2J6UkhRVTFJTkhkSVVWbEVWbEl3VDBKQ1dVVkdT +WGRZTkhaek9FSnBRbU5UWTI5a0NqVnViMXBJVWswNFJUUXJhVTFGClNVZEJNVlZrU1hkUk4wMUVi +VUZHU1hkWU5IWnpPRUpwUW1OVFkyOWtOVzV2V2toU1RUaEZOQ3RwYjFKaGEwWkVRVk1LVFZKQmQw +Um4KV1VSV1VWRkVSWGRrUmxGV1FXZFJNRVY0WjJkclFXZDFWVll6UkUxMFZ6WnpkMFJCV1VSV1Vq +QlVRa0ZWZDBGM1JVSXZla0ZNUW1kTwpWZ3BJVVRoRlFrRk5RMEZSV1hkRVVWbEtTMjlhU1doMlkw +NUJVVVZNUWxGQlJHZG5SVUpCUm1aUmNVOVVRVGRTZGpkTEsyeDFVVGR3CmJtRnpORUpaZDBoRkNq +bEhSVkF2ZFc5b2RqWkxUM2t3VkVkUlJtSnlVbFJxUm05TVZrNUNPVUphTVhsdFRVUmFNQzlVU1hk +SlZXTTMKZDJrM1lUaDBOVzFGY1ZsSU1UVXpkMWNLWVZkdmIybFRhbmxNVEdoMVNUUnpUbkpPUTA5 +MGFYTmtRbkV5Y2pKTlJsaDBObWd3YlVGUgpXVTlRZGpoU09FczNMMlpuVTNoSFJuRjZhSGxPYlcx +V1RBb3hjVUpLYkdSNE16UlRjSGR6VkVGTVVWWlFZalJvUjNkS2VscG1jakZRClkzQkZVWGcyZUUx +dVZHdzRlRVZYV2tVelRYTTVPWFZoVlhoaVVYRkpkMUoxQ2t4blFVOXJUa050V1RKdE9EbFdhSHBo +U0VveGRWWTQKTlVGa1RTOTBSQ3RaYzIxc2JtNXFkRGxNVWtObGFtSkNhWEJxU1VkcVQxaHlaekZL +VUN0c2VGWUtiWFZOTkhaSUsxQXZiV3h0ZUhOUQpVSG93WkRZMVlpdEZSMjFLV25CdlRHdFBMM1Jr +VGs1MlExbDZha3B3VkVWWGNFVnpUelpPVFdoTFdXODlDaTB0TFMwdFJVNUVJRU5GClVsUkpSa2xE +UVZSRkxTMHRMUzBLCg==
\ No newline at end of file diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithNonBase64Part.base64 b/wifi/tests/assets/hsr1/HSR1ProfileWithNonBase64Part.base64 index 975f8e539cc3..5c23f61b1711 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithNonBase64Part.base64 +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithNonBase64Part.base64 @@ -1,85 +1,86 @@ -Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PXtib3VuZGFyeX0KQ29udGVu -dC1UcmFuc2Zlci1FbmNvZGluZzogYmFzZTMyCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBh -cHBsaWNhdGlvbi94LXBhc3Nwb2ludC1wcm9maWxlCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6 -IGJhc2U2NAoKUEUxbmJYUlVjbVZsSUhodGJHNXpQU0p6ZVc1amJXdzZaRzFrWkdZeExqSWlQZ29n -SUR4V1pYSkVWRVErTVM0eVBDOVdaWEpFVkVRKwpDaUFnUEU1dlpHVStDaUFnSUNBOFRtOWtaVTVo -YldVK1VHVnlVSEp2ZG1sa1pYSlRkV0p6WTNKcGNIUnBiMjQ4TDA1dlpHVk9ZVzFsClBnb2dJQ0Fn -UEZKVVVISnZjR1Z5ZEdsbGN6NEtJQ0FnSUNBZ1BGUjVjR1UrQ2lBZ0lDQWdJQ0FnUEVSRVJrNWhi -V1UrZFhKdU9uZG0KWVRwdGJ6cG9iM1J6Y0c5ME1tUnZkREF0Y0dWeWNISnZkbWxrWlhKemRXSnpZ -M0pwY0hScGIyNDZNUzR3UEM5RVJFWk9ZVzFsUGdvZwpJQ0FnSUNBOEwxUjVjR1UrQ2lBZ0lDQThM -MUpVVUhKdmNHVnlkR2xsY3o0S0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVTVoCmJXVSth -VEF3TVR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFRt -RnRaVDVJYjIxbFUxQTgKTDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lD -QWdJQ0FnUEU1dlpHVk9ZVzFsUGtaeWFXVnVaR3g1VG1GdApaVHd2VG05a1pVNWhiV1UrQ2lBZ0lD -QWdJQ0FnSUNBOFZtRnNkV1UrUTJWdWRIVnllU0JJYjNWelpUd3ZWbUZzZFdVK0NpQWdJQ0FnCklD -QWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcx -bFBrWlJSRTQ4TDA1dlpHVk8KWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBtMXBOaTVqYnk1 -MWF6d3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZwpJQ0FnSUNBZ0lEeE9iMlJsUGdv -Z0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsSnZZVzFwYm1kRGIyNXpiM0owYVhWdFQwazhMMDV2 -ClpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUGpFeE1qSXpNeXcwTkRVMU5qWThMMVpo -YkhWbFBnb2dJQ0FnSUNBZ0lEd3YKVG05a1pUNEtJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0E4 -VG05a1pUNEtJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStRM0psWkdWdQpkR2xoYkR3dlRtOWtaVTVo -YldVK0NpQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1VtVmhi -RzA4CkwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBuTm9ZV3RsYmk1emRHbHlj -bVZrTG1OdmJUd3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9i -MlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsVnpaWEp1WVcxbApVR0Z6YzNkdmNtUThM -MDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2Iy -UmxUbUZ0ClpUNVZjMlZ5Ym1GdFpUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lX -eDFaVDVxWVcxbGN6d3ZWbUZzZFdVK0NpQWcKSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lD -QWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxCaApjM04zYjNKa1BD -OU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbGx0T1hWYVJFRjNUbmM5UFR3 -dlZtRnNkV1UrCkNpQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0 -S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWwKUGtWQlVFMWxkR2h2WkR3dlRtOWtaVTVoYldV -K0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0FnSUR4TwpiMlJsVG1G -dFpUNUZRVkJVZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnSUNBOFZtRnNkV1Ur -TWpFOEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnSUNBZ0lDQWdJQ0Fn -SUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeE8KYjJSbFRtRnRaVDVKYm01bGNrMWxkR2h2 -WkR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQazFUTFVOSQpRVkF0 -VmpJOEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThM -MDV2WkdVK0NpQWdJQ0FnCklDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJ -Q0FnSUNBZ1BFNXZaR1ZPWVcxbFBrUnBaMmwwWVd4RFpYSjAKYVdacFkyRjBaVHd2VG05a1pVNWhi -V1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbApQ -a05sY25ScFptbGpZWFJsVkhsd1pUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4V1lX -eDFaVDU0TlRBNWRqTThMMVpoCmJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lD -QWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNURaWEowVTBoQk1q -VTJSbWx1WjJWeVVISnBiblE4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdV -KwpNV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpG -bU1XWXhaakZtTVdZeFpqRm1NV1l4ClpqRm1NV1l4Wmp3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0FnSUNB -OEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWcKSUR4T2IyUmxQZ29nSUNB -Z0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxOSlRUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4 -VG05awpaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBrbE5VMGs4TDA1dlpHVk9ZVzFs -UGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzCmRXVSthVzF6YVR3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0Fn -SUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWcKSUNBZ0lDQWdQRTV2 -WkdWT1lXMWxQa1ZCVUZSNWNHVThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBOFZtRnNk -V1UrTWpROApMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEd3ZU -bTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nCklDQWdQQzlPYjJSbFBnb2dJRHd2VG05a1pUNEtQ -QzlOWjIxMFZISmxaVDRLCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94 -LXg1MDktY2EtY2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRMUzFD -UlVkSlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlowbEtR -VWxNYkVaa2QzcE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQwSm5U -bFlLUWtGTlZFSXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYyaGpU -azFxV1hkTlZFRTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZrRm5V -VEJGZUUxSlNVSkpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtOblMw -TkJVVVZCQ25wdVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIxV1ZY -TldkVzFFWWxsSWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJOQ01T -dHZSMWhhZGtoM2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpVClJV -RkRaV1pXYW1vd2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwyUzJo -U1FqZzFNVEpRUWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dyVUdK -ck1IVjVhM1JrWW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIzUWtz -M2FFUTRjRkIyWmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNLMGxh -CmFYQllOREY0UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFVRzVX -TTJreGRIRXdOR3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNXVVZH -U1hkWU5IWnpPRUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJOMDFF -YlVGR1NYZFlOSFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RWSkJk -MFJuCldVUldVVkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldVUldV -akJVUWtGVmQwRjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNXaDJZ -MDVCVVVWTVFsRkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQwaEZD -amxIUlZBdmRXOW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5VVNY -ZEpWV00zCmQyazNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5KT1Ew -OTBhWE5rUW5FeWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhsT2JX -MVdUQW94Y1VKS2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhnMmVF -MXVWR3c0ZUVWWFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxXYUhw -aFNFb3hkVlk0Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5WnpG -S1VDdHNlRllLYlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQTDNS -a1RrNTJRMWw2YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJKUmts -RFFWUkZMUzB0TFMwSwotLXtib3VuZGFyeX0tLQo= +TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5 +PXtib3VuZGFyeX07IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJp +dAoKLS17Ym91bmRhcnl9CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veC1wYXNzcG9pbnQtcHJv +ZmlsZTsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKClBF +MW5iWFJVY21WbElIaHRiRzV6UFNKemVXNWpiV3c2Wkcxa1pHWXhMaklpUGdvZ0lEeFdaWEpFVkVR +K01TNHlQQzlXWlhKRVZFUSsKQ2lBZ1BFNXZaR1UrQ2lBZ0lDQThUbTlrWlU1aGJXVStVR1Z5VUhK +dmRtbGtaWEpUZFdKelkzSnBjSFJwYjI0OEwwNXZaR1ZPWVcxbApQZ29nSUNBZ1BGSlVVSEp2Y0dW +eWRHbGxjejRLSUNBZ0lDQWdQRlI1Y0dVK0NpQWdJQ0FnSUNBZ1BFUkVSazVoYldVK2RYSnVPbmRt +CllUcHRienBvYjNSemNHOTBNbVJ2ZERBdGNHVnljSEp2ZG1sa1pYSnpkV0p6WTNKcGNIUnBiMjQ2 +TVM0d1BDOUVSRVpPWVcxbFBnb2cKSUNBZ0lDQThMMVI1Y0dVK0NpQWdJQ0E4TDFKVVVISnZjR1Z5 +ZEdsbGN6NEtJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQThUbTlrWlU1aApiV1UrYVRBd01Ud3ZUbTlr +WlU1aGJXVStDaUFnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1SWIyMWxV +MUE4CkwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZa +R1ZPWVcxbFBrWnlhV1Z1Wkd4NVRtRnQKWlR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQThW +bUZzZFdVK1JYaGhiWEJzWlNCT1pYUjNiM0pyUEM5V1lXeDFaVDRLSUNBZwpJQ0FnSUNBOEwwNXZa +R1UrQ2lBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrUmxGRVRq +d3ZUbTlrClpVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBOFZtRnNkV1UrYUc5MGMzQnZkQzVsZUdGdGNH +eGxMbTVsZER3dlZtRnNkV1UrQ2lBZ0lDQWcKSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2Iy +UmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxKdllXMXBibWREYjI1egpiM0owYVhWdFQw +azhMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQakV4TWpJek15dzBORFUxTmpZ +OEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNB +Z0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBOFRtOWsKWlU1aGJXVStRM0psWkdWdWRHbGhiRHd2VG05 +a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05awpaVTVoYldV +K1VtVmhiRzA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsUG1WNFlXMXdiR1V1 +WTI5dFBDOVdZV3gxClpUNEtJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ1BFNXZaR1Ur +Q2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1ZYTmwKY201aGJXVlFZWE56ZDI5eVpEd3ZUbTlr +WlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dgpaR1ZP +WVcxbFBsVnpaWEp1WVcxbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQ +blZ6WlhJOEwxWmhiSFZsClBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdQ +RTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFRtRnQKWlQ1UVlYTnpkMjl5WkR3dlRtOWta +VTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhXWVd4MVpUNWpSMFo2WXpOa2RtTnRVVDA4TDFaaApi +SFZsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lD +QWdJQ0FnSUNBZ0lEeE9iMlJsClRtRnRaVDVGUVZCTlpYUm9iMlE4TDA1dlpHVk9ZVzFsUGdvZ0lD +QWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWcKSUNBOFRtOWtaVTVoYldVK1JV +RlFWSGx3WlR3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQakl4UEM5 +VwpZV3gxWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4VG05 +a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnCklDQThUbTlrWlU1aGJXVStTVzV1WlhKTlpYUm9iMlE4TDA1 +dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQWdJRHhXWVd4MVpUNU4KVXkxRFNFRlFMVll5UEM5 +V1lXeDFaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU9iMlJs +UGdvZwpJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0Fn +SUR4T2IyUmxUbUZ0WlQ1RWFXZHBkR0ZzClEyVnlkR2xtYVdOaGRHVThMMDV2WkdWT1lXMWxQZ29n +SUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmwKVG1GdFpUNURaWEow +YVdacFkyRjBaVlI1Y0dVOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4Vm1Gc2RXVStl +RFV3T1hZegpQQzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUNBZ0lDQWdJ +RHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0E4ClRtOWtaVTVoYldVK1EyVnlkRk5JUVRJMU5rWnBi +bWRsY25CeWFXNTBQQzlPYjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BGWmgKYkhWbFBqRm1N +V1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1X +WXhaakZtTVdZeApaakZtTVdZeFpqRm1NV1k4TDFaaGJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2Iy +UmxQZ29nSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnCklDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lD +QWdJRHhPYjJSbFRtRnRaVDVUU1UwOEwwNXZaR1ZPWVcxbFBnb2dJQ0FnSUNBZ0lDQWcKUEU1dlpH +VStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1SlRWTkpQQzlPYjJSbFRtRnRaVDRLSUNB +Z0lDQWdJQ0FnSUNBZwpQRlpoYkhWbFBqRXlNelExTmlvOEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNB +Z1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1UrCkNpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJS +bFRtRnRaVDVGUVZCVWVYQmxQQzlPYjJSbFRtRnRaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BGWmgKYkhW +bFBqSXpQQzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUNBZ0lDQThMMDV2 +WkdVK0NpQWdJQ0FnSUR3dgpUbTlrWlQ0S0lDQWdJRHd2VG05a1pUNEtJQ0E4TDA1dlpHVStDand2 +VFdkdGRGUnlaV1UrCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94LXg1 +MDktY2EtY2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRMUzFDUlVk +SlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlowbEtRVWxN +YkVaa2QzcE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQwSm5UbFlL +UWtGTlZFSXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYyaGpUazFx +V1hkTlZFRTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZrRm5VVEJG +ZUUxSlNVSkpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtOblMwTkJV +VVZCQ25wdVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIxV1ZYTldk +VzFFWWxsSWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJOQ01TdHZS +MWhhZGtoM2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpVClJVRkRa +V1pXYW1vd2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwyUzJoU1Fq +ZzFNVEpRUWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dyVUdKck1I +VjVhM1JrWW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIzUWtzM2FF +UTRjRkIyWmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNLMGxhCmFY +QllOREY0UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFVRzVXTTJr +eGRIRXdOR3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNXVVZHU1hk +WU5IWnpPRUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJOMDFFYlVG +R1NYZFlOSFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RWSkJkMFJu +CldVUldVVkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldVUldVakJV +UWtGVmQwRjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNXaDJZMDVC +VVVWTVFsRkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQwaEZDamxI +UlZBdmRXOW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5VVNYZEpW +V00zCmQyazNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5KT1EwOTBh +WE5rUW5FeWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhsT2JXMVdU +QW94Y1VKS2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhnMmVFMXVW +R3c0ZUVWWFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxXYUhwaFNF +b3hkVlk0Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5WnpGS1VD +dHNlRllLYlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQTDNSa1Rr +NTJRMWw2YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJKUmtsRFFW +UkZMUzB0TFMwSwotLXtib3VuZGFyeX0tLQo=
\ No newline at end of file diff --git a/wifi/tests/assets/hsr1/HSR1ProfileWithUpdateIdentifier.base64 b/wifi/tests/assets/hsr1/HSR1ProfileWithUpdateIdentifier.base64 index f4d2abb08e36..bab7607512c8 100644 --- a/wifi/tests/assets/hsr1/HSR1ProfileWithUpdateIdentifier.base64 +++ b/wifi/tests/assets/hsr1/HSR1ProfileWithUpdateIdentifier.base64 @@ -14,75 +14,75 @@ MVpUNEsKSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVTVoYldV K2FUQXdNVHd2VG05a1pVNWhiV1UrQ2lBZwpJQ0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJS bFRtRnRaVDVJYjIxbFUxQThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJRHhPCmIyUmxQZ29nSUNB Z0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGtaeWFXVnVaR3g1VG1GdFpUd3ZUbTlrWlU1aGJXVStDaUFn -SUNBZ0lDQWcKSUNBOFZtRnNkV1UrUTJWdWRIVnllU0JJYjNWelpUd3ZWbUZzZFdVK0NpQWdJQ0Fn -SUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUR4TwpiMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZP -WVcxbFBrWlJSRTQ4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ1BGWmhiSFZsClBtMXBOaTVq -Ynk1MWF6d3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUR4T2IyUmxQ -Z29nSUNBZ0lDQWcKSUNBZ1BFNXZaR1ZPWVcxbFBsSnZZVzFwYm1kRGIyNXpiM0owYVhWdFQwazhM -MDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnUEZaaApiSFZsUGpFeE1qSXpNeXcwTkRVMU5qWThM -MVpoYkhWbFBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nCklDQWdJ -Q0E4VG05a1pUNEtJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStRM0psWkdWdWRHbGhiRHd2VG05a1pV -NWhiV1UrQ2lBZ0lDQWcKSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVTVoYldVK1Vt -VmhiRzA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZwpQRlpoYkhWbFBuTm9ZV3RsYmk1emRH -bHljbVZrTG1OdmJUd3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnCklE -eE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBsVnpaWEp1WVcxbFVHRnpjM2R2Y21R -OEwwNXZaR1ZPWVcxbFBnb2cKSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4 -T2IyUmxUbUZ0WlQ1VmMyVnlibUZ0WlR3dlRtOWtaVTVoYldVKwpDaUFnSUNBZ0lDQWdJQ0FnSUR4 -V1lXeDFaVDVxWVcxbGN6d3ZWbUZzZFdVK0NpQWdJQ0FnSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0Fn -CklDQWdJQ0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk9ZVzFsUGxCaGMzTjNiM0pr -UEM5T2IyUmxUbUZ0WlQ0S0lDQWcKSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQbGx0T1hWYVJFRjNUbmM5 -UFR3dlZtRnNkV1UrQ2lBZ0lDQWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZwpJQ0FnSUNBZ0lDQThUbTlr -WlQ0S0lDQWdJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQa1ZCVUUxbGRHaHZaRHd2VG05a1pVNWhi -V1UrCkNpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJSbFBnb2dJQ0FnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxU -bUZ0WlQ1RlFWQlVlWEJsUEM5T2IyUmwKVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnSUNBOFZtRnNk -V1UrTWpFOEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThMMDV2WkdVKwpDaUFnSUNBZ0lDQWdJ -Q0FnSUR4T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJsVG1GdFpUNUpibTVsY2sxbGRH -aHZaRHd2ClRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQazFUTFVOSVFW -QXRWakk4TDFaaGJIVmxQZ29nSUNBZ0lDQWcKSUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZ0lD -QThMMDV2WkdVK0NpQWdJQ0FnSUNBZ1BDOU9iMlJsUGdvZ0lDQWdJQ0FnSUR4TwpiMlJsUGdvZ0lD -QWdJQ0FnSUNBZ1BFNXZaR1ZPWVcxbFBrUnBaMmwwWVd4RFpYSjBhV1pwWTJGMFpUd3ZUbTlrWlU1 -aGJXVStDaUFnCklDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BFNXZaR1ZPWVcx -bFBrTmxjblJwWm1sallYUmxWSGx3WlR3dlRtOWsKWlU1aGJXVStDaUFnSUNBZ0lDQWdJQ0FnSUR4 -V1lXeDFaVDU0TlRBNWRqTThMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbApQZ29nSUNB -Z0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1RFpYSjBVMGhC -TWpVMlJtbHVaMlZ5CmNISnBiblE4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZz -ZFdVK01XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXgKWmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4 -WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaand2Vm1Gc2RXVStDaUFnSUNBZwpJQ0Fn -SUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHhPYjJSbFBnb2dJ -Q0FnSUNBZ0lDQWdQRTV2ClpHVk9ZVzFsUGxOSlRUd3ZUbTlrWlU1aGJXVStDaUFnSUNBZ0lDQWdJ -Q0E4VG05a1pUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEU1dlpHVk8KWVcxbFBrbE5VMGs4TDA1dlpHVk9Z -VzFsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThWbUZzZFdVK2FXMXphVHd2Vm1Gc2RXVStDaUFnSUNBZwpJ -Q0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ1BF -NXZaR1ZPWVcxbFBrVkJVRlI1CmNHVThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBOFZt -RnNkV1UrTWpROEwxWmhiSFZsUGdvZ0lDQWdJQ0FnSUNBZ1BDOU8KYjJSbFBnb2dJQ0FnSUNBZ0lE -d3ZUbTlrWlQ0S0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ1BDOU9iMlJsUGdvZ0lEd3ZUbTlrWlQ0 -SwpQQzlOWjIxMFZISmxaVDRLCgotLXtib3VuZGFyeX0KQ29udGVudC1UeXBlOiBhcHBsaWNhdGlv -bi94LXg1MDktY2EtY2VydApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBiYXNlNjQKCkxTMHRM -UzFDUlVkSlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVVJMUkVORFFXaERaMEYzU1VKQlow -bEtRVWxNYkVaa2QzcE0KVm5WeVRVRXdSME5UY1VkVFNXSXpSRkZGUWtOM1ZVRk5Ra2w0UlVSQlQw -Sm5UbFlLUWtGTlZFSXdWa0pWUTBKRVVWUkZkMGhvWTA1TgpWRmwzVFZSRmVVMVVSVEZOUkVVeFYy -aGpUazFxV1hkTlZFRTFUVlJGTVUxRVJURlhha0ZUVFZKQmR3cEVaMWxFVmxGUlJFVjNaRVpSClZr -Rm5VVEJGZUUxSlNVSkpha0ZPUW1kcmNXaHJhVWM1ZHpCQ1FWRkZSa0ZCVDBOQlVUaEJUVWxKUWtO -blMwTkJVVVZCQ25wdVFWQlYKZWpJMlRYTmhaVFIzY3pRelkzcFNOREV2U2pKUmRISlRTVnBWUzIx -V1ZYTldkVzFFWWxsSWNsQk9kbFJZUzFOTldFRmpaWGRQVWtSUgpXVmdLVW5GMlNIWndiamhEYzJO -Q01TdHZSMWhhZGtoM2VHbzBlbFl3VjB0dlN6SjZaVmhyWVhVemRtTjViRE5JU1V0MWNFcG1jVEpV -ClJVRkRaV1pXYW1vd2RBcEtWeXRZTXpWUVIxZHdPUzlJTlhwSlZVNVdUbFpxVXpkVmJYTTRORWwy -UzJoU1FqZzFNVEpRUWpsVmVVaGgKWjFoWlZsZzFSMWR3UVdOV2NIbG1jbXhTQ2taSk9WRmthR2dy -VUdKck1IVjVhM1JrWW1ZdlEyUm1aMGhQYjJWaWNsUjBkMUpzYWswdwpiMFIwV0NzeVEzWTJhakIz -UWtzM2FFUTRjRkIyWmpFcmRYa0tSM3BqZW1sblFWVXZORXQzTjJWYWNYbGtaamxDS3pWU2RYQlNL -MGxhCmFYQllOREY0UldsSmNrdFNkM0ZwTlRFM1YxZDZXR05xWVVjeVkwNWlaalExTVFwNGNFZzFV -RzVXTTJreGRIRXdOR3BOUjFGVmVrWjMKU1VSQlVVRkNielJIUVUxSU5IZElVVmxFVmxJd1QwSkNX -VVZHU1hkWU5IWnpPRUpwUW1OVFkyOWtDalZ1YjFwSVVrMDRSVFFyYVUxRgpTVWRCTVZWa1NYZFJO -MDFFYlVGR1NYZFlOSFp6T0VKcFFtTlRZMjlrTlc1dldraFNUVGhGTkN0cGIxSmhhMFpFUVZNS1RW -SkJkMFJuCldVUldVVkZFUlhka1JsRldRV2RSTUVWNFoyZHJRV2QxVlZZelJFMTBWelp6ZDBSQldV -UldVakJVUWtGVmQwRjNSVUl2ZWtGTVFtZE8KVmdwSVVUaEZRa0ZOUTBGUldYZEVVVmxLUzI5YVNX -aDJZMDVCVVVWTVFsRkJSR2RuUlVKQlJtWlJjVTlVUVRkU2RqZExLMngxVVRkdwpibUZ6TkVKWmQw -aEZDamxIUlZBdmRXOW9kalpMVDNrd1ZFZFJSbUp5VWxScVJtOU1WazVDT1VKYU1YbHRUVVJhTUM5 -VVNYZEpWV00zCmQyazNZVGgwTlcxRmNWbElNVFV6ZDFjS1lWZHZiMmxUYW5sTVRHaDFTVFJ6VG5K -T1EwOTBhWE5rUW5FeWNqSk5SbGgwTm1nd2JVRlIKV1U5UWRqaFNPRXMzTDJablUzaEhSbkY2YUhs -T2JXMVdUQW94Y1VKS2JHUjRNelJUY0hkelZFRk1VVlpRWWpSb1IzZEtlbHBtY2pGUQpZM0JGVVhn -MmVFMXVWR3c0ZUVWWFdrVXpUWE01T1hWaFZYaGlVWEZKZDFKMUNreG5RVTlyVGtOdFdUSnRPRGxX -YUhwaFNFb3hkVlk0Ck5VRmtUUzkwUkN0WmMyMXNibTVxZERsTVVrTmxhbUpDYVhCcVNVZHFUMWh5 -WnpGS1VDdHNlRllLYlhWTk5IWklLMUF2Yld4dGVITlEKVUhvd1pEWTFZaXRGUjIxS1duQnZUR3RQ -TDNSa1RrNTJRMWw2YWtwd1ZFVlhjRVZ6VHpaT1RXaExXVzg5Q2kwdExTMHRSVTVFSUVORgpVbFJK -UmtsRFFWUkZMUzB0TFMwSwotLXtib3VuZGFyeX0tLQo=
\ No newline at end of file +SUNBZ0lDQWcKSUNBOFZtRnNkV1UrUlhoaGJYQnNaU0JPWlhSM2IzSnJQQzlXWVd4MVpUNEtJQ0Fn +SUNBZ0lDQThMMDV2WkdVK0NpQWdJQ0FnSUNBZwpQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQThUbTlr +WlU1aGJXVStSbEZFVGp3dlRtOWtaVTVoYldVK0NpQWdJQ0FnSUNBZ0lDQThWbUZzCmRXVSthRzkw +YzNCdmRDNWxlR0Z0Y0d4bExtNWxkRHd2Vm1Gc2RXVStDaUFnSUNBZ0lDQWdQQzlPYjJSbFBnb2dJ +Q0FnSUNBZ0lEeE8KYjJSbFBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdWT1lXMWxQbEp2WVcxcGJtZERi +MjV6YjNKMGFYVnRUMGs4TDA1dlpHVk9ZVzFsUGdvZwpJQ0FnSUNBZ0lDQWdQRlpoYkhWbFBqRXhN +akl6TXl3ME5EVTFOalk4TDFaaGJIVmxQZ29nSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnCklDQWdQ +QzlPYjJSbFBnb2dJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrUTNKbFpH +VnVkR2xoYkR3dlRtOWsKWlU1aGJXVStDaUFnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lD +QThUbTlrWlU1aGJXVStVbVZoYkcwOEwwNXZaR1ZPWVcxbApQZ29nSUNBZ0lDQWdJQ0FnUEZaaGJI +VmxQbVY0WVcxd2JHVXVZMjl0UEM5V1lXeDFaVDRLSUNBZ0lDQWdJQ0E4TDA1dlpHVStDaUFnCklD +QWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrVlhObGNtNWhiV1ZRWVhO +emQyOXlaRHd2VG05a1pVNWgKYldVK0NpQWdJQ0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNB +Z0lDQWdQRTV2WkdWT1lXMWxQbFZ6WlhKdVlXMWxQQzlPYjJSbApUbUZ0WlQ0S0lDQWdJQ0FnSUNB +Z0lDQWdQRlpoYkhWbFBuVnpaWEk4TDFaaGJIVmxQZ29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29n +CklDQWdJQ0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE9iMlJsVG1GdFpUNVFZWE56 +ZDI5eVpEd3ZUbTlrWlU1aGJXVSsKQ2lBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1alIwWjZZek5r +ZG1OdFVUMDhMMVpoYkhWbFBnb2dJQ0FnSUNBZ0lDQWdQQzlPYjJSbApQZ29nSUNBZ0lDQWdJQ0Fn +UEU1dlpHVStDaUFnSUNBZ0lDQWdJQ0FnSUR4T2IyUmxUbUZ0WlQ1RlFWQk5aWFJvYjJROEwwNXZa +R1ZPCllXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBOFRtOWtaVDRLSUNBZ0lDQWdJQ0FnSUNBZ0lDQThU +bTlrWlU1aGJXVStSVUZRVkhsd1pUd3YKVG05a1pVNWhiV1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lDQWdQ +RlpoYkhWbFBqSXhQQzlXWVd4MVpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEM5TwpiMlJsUGdvZ0lDQWdJ +Q0FnSUNBZ0lDQThUbTlrWlQ0S0lDQWdJQ0FnSUNBZ0lDQWdJQ0E4VG05a1pVNWhiV1UrU1c1dVpY +Sk5aWFJvCmIyUThMMDV2WkdWT1lXMWxQZ29nSUNBZ0lDQWdJQ0FnSUNBZ0lEeFdZV3gxWlQ1TlV5 +MURTRUZRTFZZeVBDOVdZV3gxWlQ0S0lDQWcKSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lD +QWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUNBZwpJQ0E4VG05a1pU +NEtJQ0FnSUNBZ0lDQWdJRHhPYjJSbFRtRnRaVDVFYVdkcGRHRnNRMlZ5ZEdsbWFXTmhkR1U4TDA1 +dlpHVk9ZVzFsClBnb2dJQ0FnSUNBZ0lDQWdQRTV2WkdVK0NpQWdJQ0FnSUNBZ0lDQWdJRHhPYjJS +bFRtRnRaVDVEWlhKMGFXWnBZMkYwWlZSNWNHVTgKTDA1dlpHVk9ZVzFsUGdvZ0lDQWdJQ0FnSUNB +Z0lDQThWbUZzZFdVK2VEVXdPWFl6UEM5V1lXeDFaVDRLSUNBZ0lDQWdJQ0FnSUR3dgpUbTlrWlQ0 +S0lDQWdJQ0FnSUNBZ0lEeE9iMlJsUGdvZ0lDQWdJQ0FnSUNBZ0lDQThUbTlrWlU1aGJXVStRMlZ5 +ZEZOSVFUSTFOa1pwCmJtZGxjbkJ5YVc1MFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0Fn +UEZaaGJIVmxQakZtTVdZeFpqRm1NV1l4WmpGbU1XWXgKWmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4 +WmpGbU1XWXhaakZtTVdZeFpqRm1NV1l4WmpGbU1XWXhaakZtTVdZOEwxWmhiSFZsUGdvZwpJQ0Fn +SUNBZ0lDQWdQQzlPYjJSbFBnb2dJQ0FnSUNBZ0lEd3ZUbTlrWlQ0S0lDQWdJQ0FnSUNBOFRtOWta +VDRLSUNBZ0lDQWdJQ0FnCklEeE9iMlJsVG1GdFpUNVRTVTA4TDA1dlpHVk9ZVzFsUGdvZ0lDQWdJ +Q0FnSUNBZ1BFNXZaR1UrQ2lBZ0lDQWdJQ0FnSUNBZ0lEeE8KYjJSbFRtRnRaVDVKVFZOSlBDOU9i +MlJsVG1GdFpUNEtJQ0FnSUNBZ0lDQWdJQ0FnUEZaaGJIVmxQakV5TXpRMU5pbzhMMVpoYkhWbApQ +Z29nSUNBZ0lDQWdJQ0FnUEM5T2IyUmxQZ29nSUNBZ0lDQWdJQ0FnUEU1dlpHVStDaUFnSUNBZ0lD +QWdJQ0FnSUR4T2IyUmxUbUZ0ClpUNUZRVkJVZVhCbFBDOU9iMlJsVG1GdFpUNEtJQ0FnSUNBZ0lD +QWdJQ0FnUEZaaGJIVmxQakl6UEM5V1lXeDFaVDRLSUNBZ0lDQWcKSUNBZ0lEd3ZUbTlrWlQ0S0lD +QWdJQ0FnSUNBOEwwNXZaR1UrQ2lBZ0lDQWdJRHd2VG05a1pUNEtJQ0FnSUR3dlRtOWtaVDRLSUNB +OApMMDV2WkdVK0Nqd3ZUV2R0ZEZSeVpXVSsKCi0te2JvdW5kYXJ5fQpDb250ZW50LVR5cGU6IGFw +cGxpY2F0aW9uL3gteDUwOS1jYS1jZXJ0CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2 +NAoKTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVUkxSRU5EUVdoRFow +RjNTVUpCWjBsS1FVbE1iRVprZDNwTQpWblZ5VFVFd1IwTlRjVWRUU1dJelJGRkZRa04zVlVGTlFr +bDRSVVJCVDBKblRsWUtRa0ZOVkVJd1ZrSlZRMEpFVVZSRmQwaG9ZMDVOClZGbDNUVlJGZVUxVVJU +Rk5SRVV4VjJoalRrMXFXWGROVkVFMVRWUkZNVTFFUlRGWGFrRlRUVkpCZHdwRVoxbEVWbEZSUkVW +M1pFWlIKVmtGblVUQkZlRTFKU1VKSmFrRk9RbWRyY1docmFVYzVkekJDUVZGRlJrRkJUME5CVVRo +QlRVbEpRa05uUzBOQlVVVkJDbnB1UVZCVgplakkyVFhOaFpUUjNjelF6WTNwU05ERXZTakpSZEhK +VFNWcFZTMjFXVlhOV2RXMUVZbGxJY2xCT2RsUllTMU5OV0VGalpYZFBVa1JSCldWZ0tVbkYyU0ha +d2JqaERjMk5DTVN0dlIxaGFka2gzZUdvMGVsWXdWMHR2U3pKNlpWaHJZWFV6ZG1ONWJETklTVXQx +Y0VwbWNUSlUKUlVGRFpXWldhbW93ZEFwS1Z5dFlNelZRUjFkd09TOUlOWHBKVlU1V1RsWnFVemRW +YlhNNE5FbDJTMmhTUWpnMU1USlFRamxWZVVoaApaMWhaVmxnMVIxZHdRV05XY0hsbWNteFNDa1pK +T1ZGa2FHZ3JVR0pyTUhWNWEzUmtZbVl2UTJSbVowaFBiMlZpY2xSMGQxSnNhazB3CmIwUjBXQ3N5 +UTNZMmFqQjNRa3MzYUVRNGNGQjJaakVyZFhrS1IzcGplbWxuUVZVdk5FdDNOMlZhY1hsa1pqbENL +elZTZFhCU0swbGEKYVhCWU5ERjRSV2xKY2t0U2QzRnBOVEUzVjFkNldHTnFZVWN5WTA1aVpqUTFN +UXA0Y0VnMVVHNVdNMmt4ZEhFd05HcE5SMUZWZWtaMwpTVVJCVVVGQ2J6UkhRVTFJTkhkSVVWbEVW +bEl3VDBKQ1dVVkdTWGRZTkhaek9FSnBRbU5UWTI5a0NqVnViMXBJVWswNFJUUXJhVTFGClNVZEJN +VlZrU1hkUk4wMUViVUZHU1hkWU5IWnpPRUpwUW1OVFkyOWtOVzV2V2toU1RUaEZOQ3RwYjFKaGEw +WkVRVk1LVFZKQmQwUm4KV1VSV1VWRkVSWGRrUmxGV1FXZFJNRVY0WjJkclFXZDFWVll6UkUxMFZ6 +WnpkMFJCV1VSV1VqQlVRa0ZWZDBGM1JVSXZla0ZNUW1kTwpWZ3BJVVRoRlFrRk5RMEZSV1hkRVVW +bEtTMjlhU1doMlkwNUJVVVZNUWxGQlJHZG5SVUpCUm1aUmNVOVVRVGRTZGpkTEsyeDFVVGR3CmJt +RnpORUpaZDBoRkNqbEhSVkF2ZFc5b2RqWkxUM2t3VkVkUlJtSnlVbFJxUm05TVZrNUNPVUphTVhs +dFRVUmFNQzlVU1hkSlZXTTMKZDJrM1lUaDBOVzFGY1ZsSU1UVXpkMWNLWVZkdmIybFRhbmxNVEdo +MVNUUnpUbkpPUTA5MGFYTmtRbkV5Y2pKTlJsaDBObWd3YlVGUgpXVTlRZGpoU09FczNMMlpuVTNo +SFJuRjZhSGxPYlcxV1RBb3hjVUpLYkdSNE16UlRjSGR6VkVGTVVWWlFZalJvUjNkS2VscG1jakZR +ClkzQkZVWGcyZUUxdVZHdzRlRVZYV2tVelRYTTVPWFZoVlhoaVVYRkpkMUoxQ2t4blFVOXJUa050 +V1RKdE9EbFdhSHBoU0VveGRWWTQKTlVGa1RTOTBSQ3RaYzIxc2JtNXFkRGxNVWtObGFtSkNhWEJx +U1VkcVQxaHlaekZLVUN0c2VGWUtiWFZOTkhaSUsxQXZiV3h0ZUhOUQpVSG93WkRZMVlpdEZSMjFL +V25CdlRHdFBMM1JrVGs1MlExbDZha3B3VkVWWGNFVnpUelpPVFdoTFdXODlDaTB0TFMwdFJVNUVJ +RU5GClVsUkpSa2xEUVZSRkxTMHRMUzBLCi0te2JvdW5kYXJ5fS0tCg==
\ No newline at end of file diff --git a/wifi/tests/assets/hsr1/README.txt b/wifi/tests/assets/hsr1/README.txt index d1f8384fc979..9f3cdc274ee1 100644 --- a/wifi/tests/assets/hsr1/README.txt +++ b/wifi/tests/assets/hsr1/README.txt @@ -2,4 +2,5 @@ HSR1ProfileWithCACert.conf - unencoded installation file that contains a Passpoi HSR1ProfileWithCACert.base64 - base64 encoded of the data contained in HSR1ProfileWithCAWith.conf HSR1ProfileWithNonBase64Part.base64 - base64 encoded installation file that contains a part of non-base64 encoding type HSR1ProfileWithMissingBoundary.base64 - base64 encoded installation file with missing end-boundary in the MIME data -HSR1ProfileWithInvalidContentType.base64 - base64 encoded installation file with that contains a MIME part with an invalid content type. +HSR1ProfileWithInvalidContentType.base64 - base64 encoded installation file with that contains a MIME part with an invalid content type +HSR1ProfileWithUpdateIdentifier.base64 - base64 encoded installation file with that contains an R2 update identifier diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index f8a0c8f5fab8..881dcbb80492 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -1489,6 +1489,16 @@ i * Verify that a call to cancel WPS immediately returns a failure. } /** + * Test behavior of {@link WifiManager#allowAutojoin(int, boolean)} + * @throws Exception + */ + @Test + public void testAllowAutojoin() throws Exception { + mWifiManager.allowAutojoin(1, true); + verify(mWifiService).allowAutojoin(eq(1), eq(true)); + } + + /** * Test behavior of {@link WifiManager#disconnect()} * @throws Exception */ diff --git a/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java b/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java index c815d7519c4c..439e67259cb9 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/ConfigParserTest.java @@ -87,17 +87,17 @@ public class ConfigParserTest { // HomeSP configuration. HomeSp homeSp = new HomeSp(); - homeSp.setFriendlyName("Century House"); - homeSp.setFqdn("mi6.co.uk"); + homeSp.setFriendlyName("Example Network"); + homeSp.setFqdn("hotspot.example.net"); homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L}); config.setHomeSp(homeSp); // Credential configuration. Credential credential = new Credential(); - credential.setRealm("shaken.stirred.com"); + credential.setRealm("example.com"); Credential.UserCredential userCredential = new Credential.UserCredential(); - userCredential.setUsername("james"); - userCredential.setPassword("Ym9uZDAwNw=="); + userCredential.setUsername("user"); + userCredential.setPassword("cGFzc3dvcmQ="); userCredential.setEapType(21); userCredential.setNonEapInnerMethod("MS-CHAP-V2"); credential.setUserCredential(userCredential); @@ -108,8 +108,8 @@ public class ConfigParserTest { certCredential.setCertSha256Fingerprint(certSha256Fingerprint); credential.setCertCredential(certCredential); Credential.SimCredential simCredential = new Credential.SimCredential(); - simCredential.setImsi("imsi"); - simCredential.setEapType(24); + simCredential.setImsi("123456*"); + simCredential.setEapType(23); credential.setSimCredential(simCredential); credential.setCaCertificate(FakeKeys.CA_CERT0); config.setCredential(credential); @@ -220,5 +220,4 @@ public class ConfigParserTest { // Expected configuration does not contain an update identifier assertTrue(actualConfig.equals(expectedConfig)); } - }
\ No newline at end of file |