diff options
771 files changed, 16721 insertions, 5596 deletions
@@ -1 +1 @@ -Ember Rose <emberr@google.com> <ashleyrose@google.com> +Ember Rose <emberrose@google.com> <ashleyrose@google.com> diff --git a/Android.bp b/Android.bp index 594126fcc157..1eba3e2711f1 100644 --- a/Android.bp +++ b/Android.bp @@ -170,6 +170,15 @@ filegroup { } filegroup { + name: "framework-mms-sources", + srcs: [ + "mms/java/**/*.java", + "mms/java/**/*.aidl", + ], + path: "mms/java", +} + +filegroup { name: "framework-wifi-sources", srcs: [ "wifi/java/**/*.java", @@ -193,6 +202,7 @@ filegroup { ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", ":framework-mime-sources", + ":framework-mms-sources", ":framework-opengl-sources", ":framework-rs-sources", ":framework-sax-sources", @@ -252,6 +262,7 @@ java_defaults { "media/mca/effect/java", "media/mca/filterfw/java", "media/mca/filterpacks/java", + "mms/java", "opengl/java", "rs/java", "sax/java", @@ -415,7 +426,7 @@ java_library { java_library { name: "framework-annotation-proc", - defaults: ["framework-defaults"], + defaults: ["framework-aidl-export-defaults"], srcs: [":framework-all-sources"], installable: false, plugins: [ @@ -820,6 +831,7 @@ frameworks_base_subdirs = [ "media/mca/filterfw/java", "media/mca/filterpacks/java", "drm/java", + "mms/java", "opengl/java", "sax/java", "telecomm/java", @@ -941,6 +953,7 @@ stubs_defaults { "test-base/src/**/*.java", ":opt-telephony-srcs", ":opt-net-voip-srcs", + ":core-current-stubs-source", ":core_public_api_files", ":updatable-media-srcs", "test-mock/src/**/*.java", @@ -1005,6 +1018,7 @@ stubs_defaults { "core/java/**/*.logtags", ":opt-telephony-srcs", ":opt-net-voip-srcs", + ":core-current-stubs-source", ":core_public_api_files", ":updatable-media-srcs", ":jobscheduler-framework-source", @@ -1558,3 +1572,14 @@ filegroup { ], } +// Avoid including Parcelable classes as we don't want to have two copies of +// Parcelable cross the process. +filegroup { + name: "framework-cellbroadcast-shared-srcs", + srcs: [ + "core/java/android/util/LocalLog.java", + "core/java/android/util/Slog.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + ], +}
\ No newline at end of file diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java index 65aaf20ecacb..3dc9a28ac965 100644 --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java @@ -48,7 +48,6 @@ import android.os.BatteryStats; import android.os.Binder; import android.os.Bundle; import android.os.Environment; -import android.os.FileUtils; import android.os.Handler; import android.os.IDeviceIdleController; import android.os.Looper; @@ -1684,7 +1683,7 @@ public class DeviceIdleController extends SystemService static class Injector { private final Context mContext; - private ConnectivityService mConnectivityService; + private ConnectivityManager mConnectivityManager; private Constants mConstants; private LocationManager mLocationManager; @@ -1705,12 +1704,11 @@ public class DeviceIdleController extends SystemService return new AppStateTracker(ctx, looper); } - ConnectivityService getConnectivityService() { - if (mConnectivityService == null) { - mConnectivityService = (ConnectivityService) ServiceManager.getService( - Context.CONNECTIVITY_SERVICE); + ConnectivityManager getConnectivityManager() { + if (mConnectivityManager == null) { + mConnectivityManager = mContext.getSystemService(ConnectivityManager.class); } - return mConnectivityService; + return mConnectivityManager; } Constants getConstants(DeviceIdleController controller, Handler handler, @@ -1909,7 +1907,7 @@ public class DeviceIdleController extends SystemService if (getContext().getResources().getBoolean( com.android.internal.R.bool.config_autoPowerModePrefetchLocation)) { - mLocationRequest = new LocationRequest() + mLocationRequest = LocationRequest.create() .setQuality(LocationRequest.ACCURACY_FINE) .setInterval(0) .setFastestInterval(0) @@ -2497,9 +2495,9 @@ public class DeviceIdleController extends SystemService } void updateConnectivityState(Intent connIntent) { - ConnectivityService cm; + ConnectivityManager cm; synchronized (this) { - cm = mInjector.getConnectivityService(); + cm = mInjector.getConnectivityManager(); } if (cm == null) { return; @@ -3598,9 +3596,6 @@ public class DeviceIdleController extends SystemService try { stream = mConfigFile.startWrite(); memStream.writeTo(stream); - stream.flush(); - FileUtils.sync(stream); - stream.close(); mConfigFile.finishWrite(stream); } catch (IOException e) { Slog.w(TAG, "Error writing config file", e); 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 329d4b7c8f1e..14d5a683ce83 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -109,6 +109,9 @@ import libcore.util.EmptyArray; import java.io.FileDescriptor; import java.io.PrintWriter; import java.time.Clock; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -144,10 +147,53 @@ public class JobSchedulerService extends com.android.server.SystemService @VisibleForTesting public static Clock sSystemClock = Clock.systemUTC(); + + private abstract static class MySimpleClock extends Clock { + private final ZoneId mZoneId; + + MySimpleClock(ZoneId zoneId) { + this.mZoneId = zoneId; + } + + @Override + public ZoneId getZone() { + return mZoneId; + } + + @Override + public Clock withZone(ZoneId zone) { + return new MySimpleClock(zone) { + @Override + public long millis() { + return MySimpleClock.this.millis(); + } + }; + } + + @Override + public abstract long millis(); + + @Override + public Instant instant() { + return Instant.ofEpochMilli(millis()); + } + } + @VisibleForTesting - public static Clock sUptimeMillisClock = SystemClock.uptimeClock(); + public static Clock sUptimeMillisClock = new MySimpleClock(ZoneOffset.UTC) { + @Override + public long millis() { + return SystemClock.uptimeMillis(); + } + }; + @VisibleForTesting - public static Clock sElapsedRealtimeClock = SystemClock.elapsedRealtimeClock(); + public static Clock sElapsedRealtimeClock = new MySimpleClock(ZoneOffset.UTC) { + @Override + public long millis() { + return SystemClock.elapsedRealtime(); + } + }; /** Global local for all job scheduler state. */ final Object mLock = new Object(); @@ -979,17 +1025,18 @@ public class JobSchedulerService extends com.android.server.SystemService // This may throw a SecurityException. jobStatus.prepareLocked(); - if (work != null) { - // If work has been supplied, enqueue it into the new job. - jobStatus.enqueueWorkLocked(work); - } - if (toCancel != null) { // Implicitly replaces the existing job record with the new instance cancelJobImplLocked(toCancel, jobStatus, "job rescheduled by app"); } else { startTrackingJobLocked(jobStatus, null); } + + if (work != null) { + // If work has been supplied, enqueue it into the new job. + jobStatus.enqueueWorkLocked(work); + } + StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_STATE_CHANGED, uId, null, jobStatus.getBatteryName(), StatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__SCHEDULED, @@ -2126,7 +2173,7 @@ public class JobSchedulerService extends com.android.server.SystemService job.getServiceComponent(), PackageManager.MATCH_DEBUG_TRIAGED_MISSING, job.getUserId()); } catch (RemoteException e) { - throw e.rethrowAsRuntimeException(); + throw new RuntimeException(e); } if (service == null) { diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java index 782e6463d845..26db4a30ebda 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java @@ -251,7 +251,7 @@ public final class JobServiceContext implements ServiceConnection { binding = mContext.bindServiceAsUser(intent, this, Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_PERCEPTIBLE, - new UserHandle(job.getUserId())); + UserHandle.of(job.getUserId())); } catch (SecurityException e) { // Some permission policy, for example INTERACT_ACROSS_USERS and // android:singleUser, can result in a SecurityException being thrown from diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java index 43e8dfb6bab6..7d3630338fc1 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java @@ -34,6 +34,7 @@ import android.os.Looper; import android.os.Message; import android.os.UserHandle; import android.text.format.DateUtils; +import android.util.ArrayMap; import android.util.ArraySet; import android.util.DataUnit; import android.util.Log; @@ -441,7 +442,7 @@ public final class ConnectivityController extends StateController implements synchronized (mLock) { // Since this is a really hot codepath, temporarily cache any // answers that we get from ConnectivityManager. - final SparseArray<NetworkCapabilities> networkToCapabilities = new SparseArray<>(); + final ArrayMap<Network, NetworkCapabilities> networkToCapabilities = new ArrayMap<>(); boolean changed = false; if (filterUid == -1) { @@ -460,17 +461,16 @@ public final class ConnectivityController extends StateController implements } private boolean updateTrackedJobsLocked(ArraySet<JobStatus> jobs, Network filterNetwork, - SparseArray<NetworkCapabilities> networkToCapabilities) { + ArrayMap<Network, NetworkCapabilities> networkToCapabilities) { if (jobs == null || jobs.size() == 0) { return false; } final Network network = mConnManager.getActiveNetworkForUid(jobs.valueAt(0).getSourceUid()); - final int netId = network != null ? network.netId : -1; - NetworkCapabilities capabilities = networkToCapabilities.get(netId); + NetworkCapabilities capabilities = networkToCapabilities.get(network); if (capabilities == null) { capabilities = mConnManager.getNetworkCapabilities(network); - networkToCapabilities.put(netId, capabilities); + networkToCapabilities.put(network, capabilities); } final boolean networkMatch = (filterNetwork == null || Objects.equals(filterNetwork, network)); diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java index adb43141b9c1..c76346ffd996 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java +++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java @@ -28,7 +28,7 @@ import android.net.Network; import android.net.Uri; import android.os.RemoteException; import android.os.UserHandle; -import android.text.format.TimeMigrationUtils; +import android.text.format.DateFormat; import android.util.ArraySet; import android.util.Pair; import android.util.Slog; @@ -1518,7 +1518,7 @@ public final class JobStatus { if (job.getClipData() != null) { pw.print(prefix); pw.print(" Clip data: "); StringBuilder b = new StringBuilder(128); - job.getClipData().toShortString(b); + b.append(job.getClipData()); pw.println(b); } if (uriPerms != null) { @@ -1659,14 +1659,18 @@ public final class JobStatus { } if (mLastSuccessfulRunTime != 0) { pw.print(prefix); pw.print("Last successful run: "); - pw.println(TimeMigrationUtils.formatMillisWithFixedFormat(mLastSuccessfulRunTime)); + pw.println(formatTime(mLastSuccessfulRunTime)); } if (mLastFailedRunTime != 0) { pw.print(prefix); pw.print("Last failed run: "); - pw.println(TimeMigrationUtils.formatMillisWithFixedFormat(mLastFailedRunTime)); + pw.println(formatTime(mLastFailedRunTime)); } } + private static CharSequence formatTime(long time) { + return DateFormat.format("yyyy-MM-dd HH:mm:ss", time); + } + public void dump(ProtoOutputStream proto, long fieldId, boolean full, long elapsedRealtimeMillis) { final long token = proto.start(fieldId); 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 df5d6aeb8ee5..7c472a9813aa 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -872,64 +872,66 @@ public class AppStandbyController implements AppStandbyInternal { public void reportEvent(UsageEvents.Event event, long elapsedRealtime, int userId) { if (!mAppIdleEnabled) return; synchronized (mAppIdleLock) { + final String pkg = event.getPackageName(); + final int eventType = event.getEventType(); // TODO: Ideally this should call isAppIdleFiltered() to avoid calling back // about apps that are on some kind of whitelist anyway. final boolean previouslyIdle = mAppIdleHistory.isIdle( - event.mPackage, userId, elapsedRealtime); + pkg, userId, elapsedRealtime); // Inform listeners if necessary - if ((event.mEventType == UsageEvents.Event.ACTIVITY_RESUMED - || event.mEventType == UsageEvents.Event.ACTIVITY_PAUSED - || event.mEventType == UsageEvents.Event.SYSTEM_INTERACTION - || event.mEventType == UsageEvents.Event.USER_INTERACTION - || event.mEventType == UsageEvents.Event.NOTIFICATION_SEEN - || event.mEventType == UsageEvents.Event.SLICE_PINNED - || event.mEventType == UsageEvents.Event.SLICE_PINNED_PRIV - || event.mEventType == UsageEvents.Event.FOREGROUND_SERVICE_START)) { + if ((eventType == UsageEvents.Event.ACTIVITY_RESUMED + || eventType == UsageEvents.Event.ACTIVITY_PAUSED + || eventType == UsageEvents.Event.SYSTEM_INTERACTION + || eventType == UsageEvents.Event.USER_INTERACTION + || eventType == UsageEvents.Event.NOTIFICATION_SEEN + || eventType == UsageEvents.Event.SLICE_PINNED + || eventType == UsageEvents.Event.SLICE_PINNED_PRIV + || eventType == UsageEvents.Event.FOREGROUND_SERVICE_START)) { final AppUsageHistory appHistory = mAppIdleHistory.getAppUsageHistory( - event.mPackage, userId, elapsedRealtime); + pkg, userId, elapsedRealtime); final int prevBucket = appHistory.currentBucket; final int prevBucketReason = appHistory.bucketingReason; final long nextCheckTime; - final int subReason = usageEventToSubReason(event.mEventType); + final int subReason = usageEventToSubReason(eventType); final int reason = REASON_MAIN_USAGE | subReason; - if (event.mEventType == UsageEvents.Event.NOTIFICATION_SEEN - || event.mEventType == UsageEvents.Event.SLICE_PINNED) { + if (eventType == UsageEvents.Event.NOTIFICATION_SEEN + || eventType == UsageEvents.Event.SLICE_PINNED) { // Mild usage elevates to WORKING_SET but doesn't change usage time. - mAppIdleHistory.reportUsage(appHistory, event.mPackage, + mAppIdleHistory.reportUsage(appHistory, pkg, STANDBY_BUCKET_WORKING_SET, subReason, 0, elapsedRealtime + mNotificationSeenTimeoutMillis); nextCheckTime = mNotificationSeenTimeoutMillis; - } else if (event.mEventType == UsageEvents.Event.SYSTEM_INTERACTION) { - mAppIdleHistory.reportUsage(appHistory, event.mPackage, + } else if (eventType == UsageEvents.Event.SYSTEM_INTERACTION) { + mAppIdleHistory.reportUsage(appHistory, pkg, STANDBY_BUCKET_ACTIVE, subReason, 0, elapsedRealtime + mSystemInteractionTimeoutMillis); nextCheckTime = mSystemInteractionTimeoutMillis; - } else if (event.mEventType == UsageEvents.Event.FOREGROUND_SERVICE_START) { + } else if (eventType == UsageEvents.Event.FOREGROUND_SERVICE_START) { // Only elevate bucket if this is the first usage of the app if (prevBucket != STANDBY_BUCKET_NEVER) return; - mAppIdleHistory.reportUsage(appHistory, event.mPackage, + mAppIdleHistory.reportUsage(appHistory, pkg, STANDBY_BUCKET_ACTIVE, subReason, 0, elapsedRealtime + mInitialForegroundServiceStartTimeoutMillis); nextCheckTime = mInitialForegroundServiceStartTimeoutMillis; } else { - mAppIdleHistory.reportUsage(appHistory, event.mPackage, + mAppIdleHistory.reportUsage(appHistory, pkg, STANDBY_BUCKET_ACTIVE, subReason, elapsedRealtime, elapsedRealtime + mStrongUsageTimeoutMillis); nextCheckTime = mStrongUsageTimeoutMillis; } mHandler.sendMessageDelayed(mHandler.obtainMessage - (MSG_CHECK_PACKAGE_IDLE_STATE, userId, -1, event.mPackage), + (MSG_CHECK_PACKAGE_IDLE_STATE, userId, -1, pkg), nextCheckTime); final boolean userStartedInteracting = appHistory.currentBucket == STANDBY_BUCKET_ACTIVE && prevBucket != appHistory.currentBucket && (prevBucketReason & REASON_MAIN_MASK) != REASON_MAIN_USAGE; - maybeInformListeners(event.mPackage, userId, elapsedRealtime, + maybeInformListeners(pkg, userId, elapsedRealtime, appHistory.currentBucket, reason, userStartedInteracting); if (previouslyIdle) { - notifyBatteryStats(event.mPackage, userId, false); + notifyBatteryStats(pkg, userId, false); } } } @@ -1849,16 +1851,6 @@ public class AppStandbyController implements AppStandbyInternal { * Observe settings changes for {@link Global#APP_IDLE_CONSTANTS}. */ private class SettingsObserver extends ContentObserver { - /** - * This flag has been used to disable app idle on older builds with bug b/26355386. - */ - @Deprecated - private static final String KEY_IDLE_DURATION_OLD = "idle_duration"; - @Deprecated - private static final String KEY_IDLE_DURATION = "idle_duration2"; - @Deprecated - private static final String KEY_WALLCLOCK_THRESHOLD = "wallclock_threshold"; - private static final String KEY_PAROLE_INTERVAL = "parole_interval"; private static final String KEY_PAROLE_WINDOW = "parole_window"; private static final String KEY_PAROLE_DURATION = "parole_duration"; @@ -1993,7 +1985,7 @@ public class AppStandbyController implements AppStandbyInternal { : DEFAULT_EXEMPTED_SYNC_START_TIMEOUT); mUnexemptedSyncScheduledTimeoutMillis = mParser.getDurationMillis( - KEY_EXEMPTED_SYNC_SCHEDULED_DOZE_HOLD_DURATION, + KEY_UNEXEMPTED_SYNC_SCHEDULED_HOLD_DURATION, COMPRESS_TIME ? ONE_MINUTE : DEFAULT_UNEXEMPTED_SYNC_SCHEDULED_TIMEOUT); // TODO diff --git a/api/current.txt b/api/current.txt index 02e822e1738d..677e8c2209c2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8,7 +8,6 @@ package android { public static final class Manifest.permission { ctor public Manifest.permission(); field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER"; - field public static final String ACCESSIBILITY_SHORTCUT_TARGET = "android.permission.ACCESSIBILITY_SHORTCUT_TARGET"; field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION"; field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES"; field public static final String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION"; @@ -2834,6 +2833,7 @@ package android.accessibilityservice { method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo(); method @NonNull public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController(); method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows(); + method @NonNull public final android.util.SparseArray<java.util.List<android.view.accessibility.AccessibilityWindowInfo>> getWindowsOnAllDisplays(); method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent); method public final android.os.IBinder onBind(android.content.Intent); method @Deprecated protected boolean onGesture(int); @@ -6363,6 +6363,7 @@ package android.app { method public android.view.WindowAnimationFrameStats getWindowAnimationFrameStats(); method public android.view.WindowContentFrameStats getWindowContentFrameStats(int); method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows(); + method @NonNull public android.util.SparseArray<java.util.List<android.view.accessibility.AccessibilityWindowInfo>> getWindowsOnAllDisplays(); method public void grantRuntimePermission(String, String); method public void grantRuntimePermissionAsUser(String, String, android.os.UserHandle); method public boolean injectInputEvent(android.view.InputEvent, boolean); @@ -9678,6 +9679,7 @@ package android.content { field public static final String QUERY_ARG_SORT_COLLATION = "android:query-arg-sort-collation"; field public static final String QUERY_ARG_SORT_COLUMNS = "android:query-arg-sort-columns"; field public static final String QUERY_ARG_SORT_DIRECTION = "android:query-arg-sort-direction"; + field public static final String QUERY_ARG_SORT_LOCALE = "android:query-arg-sort-locale"; field public static final String QUERY_ARG_SQL_SELECTION = "android:query-arg-sql-selection"; field public static final String QUERY_ARG_SQL_SELECTION_ARGS = "android:query-arg-sql-selection-args"; field public static final String QUERY_ARG_SQL_SORT_ORDER = "android:query-arg-sql-sort-order"; @@ -10414,6 +10416,7 @@ package android.content { field public static final String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND"; field @Deprecated public static final String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED"; field public static final String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH"; + field public static final String CATEGORY_ACCESSIBILITY_SHORTCUT_TARGET = "android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET"; field public static final String CATEGORY_ALTERNATIVE = "android.intent.category.ALTERNATIVE"; field public static final String CATEGORY_APP_BROWSER = "android.intent.category.APP_BROWSER"; field public static final String CATEGORY_APP_CALCULATOR = "android.intent.category.APP_CALCULATOR"; @@ -23965,6 +23968,7 @@ package android.media { ctor public ExifInterface(@NonNull String) throws java.io.IOException; ctor public ExifInterface(@NonNull java.io.FileDescriptor) throws java.io.IOException; ctor public ExifInterface(@NonNull java.io.InputStream) throws java.io.IOException; + method @NonNull public static android.media.ExifInterface fromStandalone(@NonNull java.io.InputStream) throws java.io.IOException; method public double getAltitude(double); method @Nullable public String getAttribute(@NonNull String); method @Nullable public byte[] getAttributeBytes(@NonNull String); @@ -24352,6 +24356,7 @@ package android.media { field public static final int INFO_OUTPUT_FORMAT_CHANGED = -2; // 0xfffffffe field public static final int INFO_TRY_AGAIN_LATER = -1; // 0xffffffff field public static final String PARAMETER_KEY_HDR10_PLUS_INFO = "hdr10-plus-info"; + field public static final String PARAMETER_KEY_LOW_LATENCY = "low-latency"; field public static final String PARAMETER_KEY_OFFSET_TIME = "time-offset-us"; field public static final String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync"; field public static final String PARAMETER_KEY_SUSPEND = "drop-input-frames"; @@ -24525,6 +24530,7 @@ package android.media { field public static final String FEATURE_DynamicTimestamp = "dynamic-timestamp"; field public static final String FEATURE_FrameParsing = "frame-parsing"; field public static final String FEATURE_IntraRefresh = "intra-refresh"; + field public static final String FEATURE_LowLatency = "low-latency"; field public static final String FEATURE_MultipleFrames = "multiple-frames"; field public static final String FEATURE_PartialFrame = "partial-frame"; field public static final String FEATURE_SecurePlayback = "secure-playback"; @@ -25235,6 +25241,7 @@ package android.media { field public static final String KEY_LANGUAGE = "language"; field public static final String KEY_LATENCY = "latency"; field public static final String KEY_LEVEL = "level"; + field public static final String KEY_LOW_LATENCY = "low-latency"; field public static final String KEY_MAX_B_FRAMES = "max-bframes"; field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder"; field public static final String KEY_MAX_HEIGHT = "max-height"; @@ -25383,6 +25390,7 @@ package android.media { method public android.graphics.Bitmap getFrameAtIndex(int, @NonNull android.media.MediaMetadataRetriever.BitmapParams); method public android.graphics.Bitmap getFrameAtIndex(int); method public android.graphics.Bitmap getFrameAtTime(long, int); + method public android.graphics.Bitmap getFrameAtTime(long, int, @NonNull android.media.MediaMetadataRetriever.BitmapParams); method public android.graphics.Bitmap getFrameAtTime(long); method public android.graphics.Bitmap getFrameAtTime(); method @NonNull public java.util.List<android.graphics.Bitmap> getFramesAtIndex(int, int, @NonNull android.media.MediaMetadataRetriever.BitmapParams); @@ -25392,6 +25400,7 @@ package android.media { method public android.graphics.Bitmap getPrimaryImage(@NonNull android.media.MediaMetadataRetriever.BitmapParams); method public android.graphics.Bitmap getPrimaryImage(); method public android.graphics.Bitmap getScaledFrameAtTime(long, int, int, int); + method public android.graphics.Bitmap getScaledFrameAtTime(long, int, int, int, @NonNull android.media.MediaMetadataRetriever.BitmapParams); method public void release(); method public void setDataSource(String) throws java.lang.IllegalArgumentException; method public void setDataSource(String, java.util.Map<java.lang.String,java.lang.String>) throws java.lang.IllegalArgumentException; @@ -28805,6 +28814,7 @@ package android.net { method @Nullable public String getPrivateDnsServerName(); method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(); method public boolean isPrivateDnsActive(); + method public boolean isWakeOnLanSupported(); method public void setDnsServers(@NonNull java.util.Collection<java.net.InetAddress>); method public void setDomains(@Nullable String); method public void setHttpProxy(@Nullable android.net.ProxyInfo); @@ -40800,6 +40810,7 @@ package android.security { field public static final String EXTRA_KEY_ALIAS = "android.security.extra.KEY_ALIAS"; field public static final String EXTRA_NAME = "name"; field public static final String EXTRA_PKCS12 = "PKCS12"; + field public static final String KEY_ALIAS_SELECTION_DENIED = "alias-selection-denied-ef829e15-210a-409d-96c9-ee684fc41972"; } public interface KeyChainAliasCallback { @@ -45105,7 +45116,7 @@ package android.telephony { method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid(int); method public String getMmsUAProfUrl(); method public String getMmsUserAgent(); - method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getNai(); + method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getNai(); method public String getNetworkCountryIso(); method public String getNetworkOperator(); method public String getNetworkOperatorName(); @@ -45164,6 +45175,7 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler); method public void sendVisualVoicemailSms(String, int, String, android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setForbiddenPlmns(@NonNull java.util.List<java.lang.String>); method public boolean setLine1NumberForDisplay(String, String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setNetworkSelectionModeAutomatic(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(String, boolean); @@ -45178,6 +45190,7 @@ package android.telephony { method public void updateAvailableNetworks(@NonNull java.util.List<android.telephony.AvailableNetworkInfo>, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); field public static final String ACTION_CARRIER_MESSAGING_CLIENT_SERVICE = "android.telephony.action.CARRIER_MESSAGING_CLIENT_SERVICE"; field public static final String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL"; + field public static final String ACTION_MULTI_SIM_CONFIG_CHANGED = "android.telephony.action.MULTI_SIM_CONFIG_CHANGED"; field public static final String ACTION_NETWORK_COUNTRY_CHANGED = "android.telephony.action.NETWORK_COUNTRY_CHANGED"; field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; @@ -45218,6 +45231,7 @@ package android.telephony { field public static final String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT"; field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY"; field public static final String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT"; + field public static final String EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED = "android.telephony.extra.NUM_OF_ACTIVE_SIM_SUPPORTED"; field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE"; field public static final String EXTRA_SPECIFIC_CARRIER_ID = "android.telephony.extra.SPECIFIC_CARRIER_ID"; field public static final String EXTRA_SPECIFIC_CARRIER_NAME = "android.telephony.extra.SPECIFIC_CARRIER_NAME"; @@ -47129,7 +47143,9 @@ package android.text.style { public abstract class ReplacementSpan extends android.text.style.MetricAffectingSpan { ctor public ReplacementSpan(); method public abstract void draw(@NonNull android.graphics.Canvas, CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, float, int, int, int, @NonNull android.graphics.Paint); + method @Nullable public CharSequence getContentDescription(); method public abstract int getSize(@NonNull android.graphics.Paint, CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @Nullable android.graphics.Paint.FontMetricsInt); + method public void setContentDescription(@Nullable CharSequence); method public void updateDrawState(android.text.TextPaint); method public void updateMeasureState(android.text.TextPaint); } @@ -47903,6 +47919,7 @@ package android.util { ctor public ArraySet(int); ctor public ArraySet(android.util.ArraySet<E>); ctor public ArraySet(java.util.Collection<? extends E>); + ctor public ArraySet(@Nullable E[]); method public boolean add(E); method public void addAll(android.util.ArraySet<? extends E>); method public boolean addAll(java.util.Collection<? extends E>); diff --git a/api/system-current.txt b/api/system-current.txt index c25daa20be4f..447ba30382a8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1359,8 +1359,9 @@ package android.content { public abstract class Context { method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean bindServiceAsUser(@RequiresPermission android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle); + method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle); method public abstract android.content.Context createCredentialProtectedStorageContext(); - method public android.content.Context createPackageContextAsUser(String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; method @Nullable public abstract java.io.File getPreloadsFileCache(); method public abstract boolean isCredentialProtectedStorage(); method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle); @@ -5521,7 +5522,7 @@ package android.os { public class UpdateEngine { ctor public UpdateEngine(); method public void applyPayload(String, long, long, String[]); - method public void applyPayload(@NonNull java.io.FileDescriptor, long, long, @NonNull String[]); + method public void applyPayload(@NonNull android.os.ParcelFileDescriptor, long, long, @NonNull String[]); method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler); method public boolean bind(android.os.UpdateEngineCallback); method public void cancel(); @@ -5876,6 +5877,7 @@ package android.provider { method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(@NonNull String, @NonNull String, float); method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(@NonNull String, @NonNull String, int); method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(@NonNull String, @NonNull String, long); + method @NonNull @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static android.provider.DeviceConfig.Properties getProperties(@NonNull String, @NonNull java.lang.String...); method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(@NonNull String, @NonNull String); method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(@NonNull String, @NonNull String, @Nullable String); method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); @@ -6558,7 +6560,8 @@ package android.service.euicc { method public abstract int onDeleteSubscription(int, String); method public android.service.euicc.DownloadSubscriptionResult onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean, @Nullable android.os.Bundle); method @Deprecated public int onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean); - method public abstract int onEraseSubscriptions(int); + method @Deprecated public abstract int onEraseSubscriptions(int); + method public int onEraseSubscriptionsWithOptions(int, @android.telephony.euicc.EuiccCardManager.ResetOption int); method public abstract android.service.euicc.GetDefaultDownloadableSubscriptionListResult onGetDefaultDownloadableSubscriptionList(int, boolean); method public abstract android.service.euicc.GetDownloadableSubscriptionMetadataResult onGetDownloadableSubscriptionMetadata(int, android.telephony.euicc.DownloadableSubscription, boolean); method public abstract String onGetEid(int); @@ -7886,8 +7889,8 @@ package android.telephony { field public static final int LISTEN_CALL_ATTRIBUTES_CHANGED = 67108864; // 0x4000000 field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000 field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000 - field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000 - field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000 + field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000 + field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000 field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_CALL_STATE = 2048; // 0x800 field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000 field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000 @@ -8115,7 +8118,7 @@ package android.telephony { } public final class SmsCbMessage implements android.os.Parcelable { - ctor public SmsCbMessage(int, int, int, @NonNull android.telephony.SmsCbLocation, int, @Nullable String, @Nullable String, int, @Nullable android.telephony.SmsCbEtwsInfo, @Nullable android.telephony.SmsCbCmasInfo); + ctor public SmsCbMessage(int, int, int, @NonNull android.telephony.SmsCbLocation, int, @Nullable String, @Nullable String, int, @Nullable android.telephony.SmsCbEtwsInfo, @Nullable android.telephony.SmsCbCmasInfo, int); method @NonNull public static android.telephony.SmsCbMessage createFromCursor(@NonNull android.database.Cursor); method public int describeContents(); method @Nullable public android.telephony.SmsCbCmasInfo getCmasWarningInfo(); @@ -8130,6 +8133,7 @@ package android.telephony { method public long getReceivedTime(); method public int getSerialNumber(); method public int getServiceCategory(); + method public int getSlotIndex(); method public boolean isCmasMessage(); method public boolean isEmergencyMessage(); method public boolean isEtwsMessage(); @@ -8277,6 +8281,7 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int); method public boolean isDataConnectivityPossible(); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle(); method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook(); @@ -8619,7 +8624,8 @@ package android.telephony.euicc { public class EuiccManager { method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void continueOperation(android.content.Intent, android.os.Bundle); - method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(android.app.PendingIntent); + method @Deprecated @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(@NonNull android.app.PendingIntent); + method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptionsWithOptions(@android.telephony.euicc.EuiccCardManager.ResetOption int, @NonNull android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDefaultDownloadableSubscriptionList(android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDownloadableSubscriptionMetadata(android.telephony.euicc.DownloadableSubscription, android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public int getOtaStatus(); diff --git a/api/test-current.txt b/api/test-current.txt index 5cf2d0bf49a8..478540599fbd 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -659,7 +659,8 @@ package android.content { } public abstract class Context { - method public android.content.Context createPackageContextAsUser(String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; + method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle); + method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract android.view.Display getDisplay(); method public abstract int getDisplayId(); method public android.os.UserHandle getUser(); @@ -2034,10 +2035,18 @@ package android.os { public final class UserHandle implements android.os.Parcelable { method public static int getAppId(int); method public int getIdentifier(); + method public static int getUid(int, int); + method public static int getUserId(int); method public static boolean isApp(int); + method public static int myUserId(); + method public static android.os.UserHandle of(int); field @NonNull public static final android.os.UserHandle ALL; field @NonNull public static final android.os.UserHandle CURRENT; + field public static final int MIN_SECONDARY_USER_ID = 10; // 0xa field @NonNull public static final android.os.UserHandle SYSTEM; + field public static final int USER_ALL = -1; // 0xffffffff + field public static final int USER_NULL = -10000; // 0xffffd8f0 + field public static final int USER_SYSTEM = 0; // 0x0 } public class UserManager { @@ -2405,7 +2414,6 @@ package android.provider { field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis"; field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis"; field public static final String NOTIFICATION_BADGING = "notification_badging"; - field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds"; field public static final String USER_SETUP_COMPLETE = "user_setup_complete"; field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service"; @@ -2904,8 +2912,8 @@ package android.telephony { public class PhoneStateListener { method public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber); method public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber); - field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000 - field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000 + field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000 + field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000 } public class ServiceState implements android.os.Parcelable { diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h index f0db1b0128a1..3d002d2efdd0 100644 --- a/cmds/statsd/src/StatsLogProcessor.h +++ b/cmds/statsd/src/StatsLogProcessor.h @@ -248,19 +248,6 @@ private: FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm); FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation); - FRIEND_TEST(DimensionInConditionE2eTest, TestCreateCountMetric_NoLink_OR_CombinationCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestCreateCountMetric_Link_OR_CombinationCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_NoLink_OR_CombinationCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_Link_OR_CombinationCondition); - - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_NoLink_SimpleCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_Link_SimpleCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_PartialLink_SimpleCondition); - - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_PartialLink_AND_CombinationCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_NoLink_AND_CombinationCondition); - FRIEND_TEST(DimensionInConditionE2eTest, TestDurationMetric_Link_AND_CombinationCondition); - FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_single_bucket); FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_multiple_buckets); FRIEND_TEST(AnomalyDetectionE2eTest, TestDurationMetric_SUM_single_bucket); diff --git a/cmds/statsd/src/metrics/CountMetricProducer.cpp b/cmds/statsd/src/metrics/CountMetricProducer.cpp index 23d025f82c26..b5c8e35accad 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.cpp +++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp @@ -37,6 +37,7 @@ using std::map; using std::string; using std::unordered_map; using std::vector; +using std::shared_ptr; namespace android { namespace os { @@ -67,8 +68,13 @@ const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6; CountMetricProducer::CountMetricProducer(const ConfigKey& key, const CountMetric& metric, const int conditionIndex, const sp<ConditionWizard>& wizard, - const int64_t timeBaseNs, const int64_t startTimeNs) - : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard) { + const int64_t timeBaseNs, const int64_t startTimeNs, + const unordered_map<int, shared_ptr<Activation>>& + eventActivationMap, + const unordered_map<int, vector<shared_ptr<Activation>>>& + eventDeactivationMap) + : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard, eventActivationMap, + eventDeactivationMap) { if (metric.has_bucket()) { mBucketSizeNs = TimeUnitToBucketSizeInMillisGuardrailed(key.GetUid(), metric.bucket()) * 1000000; @@ -251,6 +257,7 @@ bool CountMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey) { if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { ALOGE("CountMetric %lld dropping data for dimension key %s", (long long)mMetricId, newKey.toString().c_str()); + StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId); return true; } } diff --git a/cmds/statsd/src/metrics/CountMetricProducer.h b/cmds/statsd/src/metrics/CountMetricProducer.h index b4a910c6f410..61913c71cdcc 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.h +++ b/cmds/statsd/src/metrics/CountMetricProducer.h @@ -42,7 +42,11 @@ class CountMetricProducer : public MetricProducer { public: CountMetricProducer(const ConfigKey& key, const CountMetric& countMetric, const int conditionIndex, const sp<ConditionWizard>& wizard, - const int64_t timeBaseNs, const int64_t startTimeNs); + const int64_t timeBaseNs, const int64_t startTimeNs, + const std::unordered_map<int, std::shared_ptr<Activation>>& + eventActivationMap = {}, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap = {}); virtual ~CountMetricProducer(); diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp index cca793b2146a..31b90f3b13b1 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp +++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp @@ -36,6 +36,7 @@ using android::util::ProtoOutputStream; using std::string; using std::unordered_map; using std::vector; +using std::shared_ptr; namespace android { namespace os { @@ -62,14 +63,15 @@ const int FIELD_ID_BUCKET_NUM = 4; const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5; const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6; -DurationMetricProducer::DurationMetricProducer(const ConfigKey& key, const DurationMetric& metric, - const int conditionIndex, const size_t startIndex, - const size_t stopIndex, const size_t stopAllIndex, - const bool nesting, - const sp<ConditionWizard>& wizard, - const FieldMatcher& internalDimensions, - const int64_t timeBaseNs, const int64_t startTimeNs) - : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard), +DurationMetricProducer::DurationMetricProducer( + const ConfigKey& key, const DurationMetric& metric, const int conditionIndex, + const size_t startIndex, const size_t stopIndex, const size_t stopAllIndex, + const bool nesting, const sp<ConditionWizard>& wizard, + const FieldMatcher& internalDimensions, const int64_t timeBaseNs, const int64_t startTimeNs, + const unordered_map<int, shared_ptr<Activation>>& eventActivationMap, + const unordered_map<int, vector<shared_ptr<Activation>>>& eventDeactivationMap) + : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard, eventActivationMap, + eventDeactivationMap), mAggregationType(metric.aggregation_type()), mStartIndex(startIndex), mStopIndex(stopIndex), @@ -491,6 +493,7 @@ bool DurationMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { ALOGE("DurationMetric %lld dropping data for condition dimension key %s", (long long)mMetricId, newKey.getDimensionKeyInCondition().toString().c_str()); + StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId); return true; } } @@ -504,6 +507,7 @@ bool DurationMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { ALOGE("DurationMetric %lld dropping data for what dimension key %s", (long long)mMetricId, newKey.getDimensionKeyInWhat().toString().c_str()); + StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId); return true; } } diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.h b/cmds/statsd/src/metrics/DurationMetricProducer.h index 56c9fd68eac5..0592b1808f52 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.h +++ b/cmds/statsd/src/metrics/DurationMetricProducer.h @@ -42,7 +42,12 @@ public: const int conditionIndex, const size_t startIndex, const size_t stopIndex, const size_t stopAllIndex, const bool nesting, const sp<ConditionWizard>& wizard, - const FieldMatcher& internalDimensions, const int64_t timeBaseNs, const int64_t startTimeNs); + const FieldMatcher& internalDimensions, const int64_t timeBaseNs, + const int64_t startTimeNs, + const unordered_map<int, shared_ptr<Activation>>& + eventActivationMap = {}, + const unordered_map<int, vector<shared_ptr<Activation>>>& + eventDeactivationMap = {}); virtual ~DurationMetricProducer(); diff --git a/cmds/statsd/src/metrics/EventMetricProducer.cpp b/cmds/statsd/src/metrics/EventMetricProducer.cpp index 96133bd0a38d..a60a9161bdbb 100644 --- a/cmds/statsd/src/metrics/EventMetricProducer.cpp +++ b/cmds/statsd/src/metrics/EventMetricProducer.cpp @@ -36,6 +36,7 @@ using std::map; using std::string; using std::unordered_map; using std::vector; +using std::shared_ptr; namespace android { namespace os { @@ -54,8 +55,13 @@ const int FIELD_ID_ATOMS = 2; EventMetricProducer::EventMetricProducer(const ConfigKey& key, const EventMetric& metric, const int conditionIndex, const sp<ConditionWizard>& wizard, - const int64_t startTimeNs) - : MetricProducer(metric.id(), key, startTimeNs, conditionIndex, wizard) { + const int64_t startTimeNs, + const unordered_map<int, shared_ptr<Activation>>& + eventActivationMap, + const unordered_map<int, vector<shared_ptr<Activation>>>& + eventDeactivationMap) + : MetricProducer(metric.id(), key, startTimeNs, conditionIndex, wizard, eventActivationMap, + eventDeactivationMap) { if (metric.links().size() > 0) { for (const auto& link : metric.links()) { Metric2Condition mc; diff --git a/cmds/statsd/src/metrics/EventMetricProducer.h b/cmds/statsd/src/metrics/EventMetricProducer.h index 74e6bc845c04..aab53c8b6816 100644 --- a/cmds/statsd/src/metrics/EventMetricProducer.h +++ b/cmds/statsd/src/metrics/EventMetricProducer.h @@ -35,7 +35,11 @@ class EventMetricProducer : public MetricProducer { public: EventMetricProducer(const ConfigKey& key, const EventMetric& eventMetric, const int conditionIndex, const sp<ConditionWizard>& wizard, - const int64_t startTimeNs); + const int64_t startTimeNs, + const std::unordered_map<int, std::shared_ptr<Activation>>& + eventActivationMap = {}, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap = {}); virtual ~EventMetricProducer(); diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp index 1f423cd384ef..e409b6fbb9e9 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp @@ -72,8 +72,11 @@ GaugeMetricProducer::GaugeMetricProducer( const sp<ConditionWizard>& wizard, const int whatMatcherIndex, const sp<EventMatcherWizard>& matcherWizard, const int pullTagId, const int triggerAtomId, const int atomId, const int64_t timeBaseNs, const int64_t startTimeNs, - const sp<StatsPullerManager>& pullerManager) - : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard), + const sp<StatsPullerManager>& pullerManager, + const unordered_map<int, shared_ptr<Activation>>& eventActivationMap, + const unordered_map<int, vector<shared_ptr<Activation>>>& eventDeactivationMap) + : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, wizard, eventActivationMap, + eventDeactivationMap), mWhatMatcherIndex(whatMatcherIndex), mEventMatcherWizard(matcherWizard), mPullerManager(pullerManager), @@ -133,8 +136,11 @@ GaugeMetricProducer::GaugeMetricProducer( mBucketSizeNs); } - // Adjust start for partial bucket + // Adjust start for partial first bucket and then pull if needed mCurrentBucketStartTimeNs = startTimeNs; + if (mIsActive && mIsPulled && mSamplingType == GaugeMetric::RANDOM_ONE_SAMPLE) { + pullAndMatchEventsLocked(mCurrentBucketStartTimeNs); + } VLOG("Gauge metric %lld created. bucket size %lld start_time: %lld sliced %d", (long long)metric.id(), (long long)mBucketSizeNs, (long long)mTimeBaseNs, @@ -295,11 +301,6 @@ void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs, } } -void GaugeMetricProducer::prepareFirstBucketLocked() { - if (mIsActive && mIsPulled && mSamplingType == GaugeMetric::RANDOM_ONE_SAMPLE) { - pullAndMatchEventsLocked(mCurrentBucketStartTimeNs); - } -} void GaugeMetricProducer::pullAndMatchEventsLocked(const int64_t timestampNs) { bool triggerPuller = false; @@ -439,6 +440,7 @@ bool GaugeMetricProducer::hitGuardRailLocked(const MetricDimensionKey& newKey) { if (newTupleCount > mDimensionHardLimit) { ALOGE("GaugeMetric %lld dropping data for dimension key %s", (long long)mMetricId, newKey.toString().c_str()); + StatsdStats::getInstance().noteHardDimensionLimitReached(mMetricId); return true; } } diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.h b/cmds/statsd/src/metrics/GaugeMetricProducer.h index a612adf8a38b..dfe1d56c61c7 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.h +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.h @@ -58,11 +58,14 @@ class GaugeMetricProducer : public virtual MetricProducer, public virtual PullDa public: GaugeMetricProducer(const ConfigKey& key, const GaugeMetric& gaugeMetric, const int conditionIndex, const sp<ConditionWizard>& conditionWizard, - const int whatMatcherIndex, - const sp<EventMatcherWizard>& matcherWizard, + const int whatMatcherIndex,const sp<EventMatcherWizard>& matcherWizard, const int pullTagId, const int triggerAtomId, const int atomId, const int64_t timeBaseNs, const int64_t startTimeNs, - const sp<StatsPullerManager>& pullerManager); + const sp<StatsPullerManager>& pullerManager, + const std::unordered_map<int, std::shared_ptr<Activation>>& + eventActivationMap = {}, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap = {}); virtual ~GaugeMetricProducer(); @@ -125,8 +128,6 @@ private: void flushCurrentBucketLocked(const int64_t& eventTimeNs, const int64_t& nextBucketStartTimeNs) override; - void prepareFirstBucketLocked() override; - void pullAndMatchEventsLocked(const int64_t timestampNs); const int mWhatMatcherIndex; diff --git a/cmds/statsd/src/metrics/MetricProducer.cpp b/cmds/statsd/src/metrics/MetricProducer.cpp index 1ab4fdf6e90c..3426a195a748 100644 --- a/cmds/statsd/src/metrics/MetricProducer.cpp +++ b/cmds/statsd/src/metrics/MetricProducer.cpp @@ -40,6 +40,29 @@ const int FIELD_ID_ACTIVE_EVENT_ACTIVATION_ATOM_MATCHER_INDEX = 1; const int FIELD_ID_ACTIVE_EVENT_ACTIVATION_REMAINING_TTL_NANOS = 2; const int FIELD_ID_ACTIVE_EVENT_ACTIVATION_STATE = 3; +MetricProducer::MetricProducer( + const int64_t& metricId, const ConfigKey& key, const int64_t timeBaseNs, + const int conditionIndex, const sp<ConditionWizard>& wizard, + const std::unordered_map<int, std::shared_ptr<Activation>>& eventActivationMap, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap) + : mMetricId(metricId), + mConfigKey(key), + mTimeBaseNs(timeBaseNs), + mCurrentBucketStartTimeNs(timeBaseNs), + mCurrentBucketNum(0), + mCondition(initialCondition(conditionIndex)), + mConditionTrackerIndex(conditionIndex), + mConditionSliced(false), + mWizard(wizard), + mContainANYPositionInDimensionsInWhat(false), + mSliceByPositionALL(false), + mHasLinksToAllConditionDimensionsInTracker(false), + mEventActivationMap(eventActivationMap), + mEventDeactivationMap(eventDeactivationMap), + mIsActive(mEventActivationMap.empty()) { + } + void MetricProducer::onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event) { if (!mIsActive) { return; @@ -97,24 +120,6 @@ void MetricProducer::flushIfExpire(int64_t elapsedTimestampNs) { } } -void MetricProducer::addActivation(int activationTrackerIndex, const ActivationType& activationType, - int64_t ttl_seconds, int deactivationTrackerIndex) { - std::lock_guard<std::mutex> lock(mMutex); - // When a metric producer does not depend on any activation, its mIsActive is true. - // Therefore, if this is the 1st activation, mIsActive will turn to false. Otherwise it does not - // change. - if (mEventActivationMap.empty()) { - mIsActive = false; - } - std::shared_ptr<Activation> activation = - std::make_shared<Activation>(activationType, ttl_seconds * NS_PER_SEC); - mEventActivationMap.emplace(activationTrackerIndex, activation); - if (-1 != deactivationTrackerIndex) { - auto& deactivationList = mEventDeactivationMap[deactivationTrackerIndex]; - deactivationList.push_back(activation); - } -} - void MetricProducer::activateLocked(int activationTrackerIndex, int64_t elapsedTimestampNs) { auto it = mEventActivationMap.find(activationTrackerIndex); if (it == mEventActivationMap.end()) { diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h index fdbdc83fb66e..1e1eb69aa8f0 100644 --- a/cmds/statsd/src/metrics/MetricProducer.h +++ b/cmds/statsd/src/metrics/MetricProducer.h @@ -69,6 +69,19 @@ enum DumpLatency { NO_TIME_CONSTRAINTS = 2 }; +struct Activation { + Activation(const ActivationType& activationType, const int64_t ttlNs) + : ttl_ns(ttlNs), + start_ns(0), + state(ActivationState::kNotActive), + activationType(activationType) {} + + const int64_t ttl_ns; + int64_t start_ns; + ActivationState state; + const ActivationType activationType; +}; + // A MetricProducer is responsible for compute one single metrics, creating stats log report, and // writing the report to dropbox. MetricProducers should respond to package changes as required in // PackageInfoListener, but if none of the metrics are slicing by package name, then the update can @@ -76,21 +89,10 @@ enum DumpLatency { class MetricProducer : public virtual PackageInfoListener { public: MetricProducer(const int64_t& metricId, const ConfigKey& key, const int64_t timeBaseNs, - const int conditionIndex, const sp<ConditionWizard>& wizard) - : mMetricId(metricId), - mConfigKey(key), - mTimeBaseNs(timeBaseNs), - mCurrentBucketStartTimeNs(timeBaseNs), - mCurrentBucketNum(0), - mCondition(initialCondition(conditionIndex)), - mConditionTrackerIndex(conditionIndex), - mConditionSliced(false), - mWizard(wizard), - mContainANYPositionInDimensionsInWhat(false), - mSliceByPositionALL(false), - mHasLinksToAllConditionDimensionsInTracker(false), - mIsActive(true) { - } + const int conditionIndex, const sp<ConditionWizard>& wizard, + const std::unordered_map<int, std::shared_ptr<Activation>>& eventActivationMap, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap); virtual ~MetricProducer(){}; @@ -188,11 +190,6 @@ public: dropDataLocked(dropTimeNs); } - void prepareFirstBucket() { - std::lock_guard<std::mutex> lock(mMutex); - prepareFirstBucketLocked(); - } - void loadActiveMetric(const ActiveMetric& activeMetric, int64_t currentTimeNs) { std::lock_guard<std::mutex> lock(mMutex); loadActiveMetricLocked(activeMetric, currentTimeNs); @@ -215,9 +212,6 @@ public: void flushIfExpire(int64_t elapsedTimestampNs); - void addActivation(int activationTrackerIndex, const ActivationType& activationType, - int64_t ttl_seconds, int deactivationTrackerIndex = -1); - void writeActiveMetricToProtoOutputStream( int64_t currentTimeNs, const DumpReportReason reason, ProtoOutputStream* proto); @@ -310,7 +304,6 @@ protected: virtual size_t byteSizeLocked() const = 0; virtual void dumpStatesLocked(FILE* out, bool verbose) const = 0; virtual void dropDataLocked(const int64_t dropTimeNs) = 0; - virtual void prepareFirstBucketLocked() {}; void loadActiveMetricLocked(const ActiveMetric& activeMetric, int64_t currentTimeNs); void activateLocked(int activationTrackerIndex, int64_t elapsedTimestampNs); void cancelEventActivationLocked(int deactivationTrackerIndex); @@ -379,19 +372,6 @@ protected: mutable std::mutex mMutex; - struct Activation { - Activation(const ActivationType& activationType, const int64_t ttlNs) - : ttl_ns(ttlNs), - start_ns(0), - state(ActivationState::kNotActive), - activationType(activationType) {} - - const int64_t ttl_ns; - int64_t start_ns; - ActivationState state; - const ActivationType activationType; - }; - // When the metric producer has multiple activations, these activations are ORed to determine // whether the metric producer is ready to generate metrics. std::unordered_map<int, std::shared_ptr<Activation>> mEventActivationMap; diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp index bc1602497c39..7fe5a834f412 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp +++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp @@ -81,8 +81,11 @@ ValueMetricProducer::ValueMetricProducer( const ConfigKey& key, const ValueMetric& metric, const int conditionIndex, const sp<ConditionWizard>& conditionWizard, const int whatMatcherIndex, const sp<EventMatcherWizard>& matcherWizard, const int pullTagId, const int64_t timeBaseNs, - const int64_t startTimeNs, const sp<StatsPullerManager>& pullerManager) - : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, conditionWizard), + const int64_t startTimeNs, const sp<StatsPullerManager>& pullerManager, + const unordered_map<int, shared_ptr<Activation>>& eventActivationMap, + const unordered_map<int, vector<shared_ptr<Activation>>>& eventDeactivationMap) + : MetricProducer(metric.id(), key, timeBaseNs, conditionIndex, conditionWizard, + eventActivationMap, eventDeactivationMap), mWhatMatcherIndex(whatMatcherIndex), mEventMatcherWizard(matcherWizard), mPullerManager(pullerManager), @@ -108,7 +111,7 @@ ValueMetricProducer::ValueMetricProducer( mMaxPullDelayNs(metric.max_pull_delay_sec() > 0 ? metric.max_pull_delay_sec() * NS_PER_SEC : StatsdStats::kPullMaxDelayNs), mSplitBucketForAppUpgrade(metric.split_bucket_for_app_upgrade()), - // Condition timer will be set in prepareFirstBucketLocked. + // Condition timer will be set later within the constructor after pulling events mConditionTimer(false, timeBaseNs) { int64_t bucketSizeMills = 0; if (metric.has_bucket()) { @@ -154,6 +157,15 @@ ValueMetricProducer::ValueMetricProducer( // Adjust start for partial bucket mCurrentBucketStartTimeNs = startTimeNs; mConditionTimer.newBucketStart(mCurrentBucketStartTimeNs); + + // Kicks off the puller immediately if condition is true and diff based. + if (mIsActive && mIsPulled && mCondition == ConditionState::kTrue && mUseDiff) { + pullAndMatchEventsLocked(mCurrentBucketStartTimeNs, mCondition); + } + // Now that activations are processed, start the condition timer if needed. + mConditionTimer.onConditionChanged(mIsActive && mCondition == ConditionState::kTrue, + mCurrentBucketStartTimeNs); + VLOG("value metric %lld created. bucket size %lld start_time: %lld", (long long)metric.id(), (long long)mBucketSizeNs, (long long)mTimeBaseNs); } @@ -165,16 +177,6 @@ ValueMetricProducer::~ValueMetricProducer() { } } -void ValueMetricProducer::prepareFirstBucketLocked() { - // Kicks off the puller immediately if condition is true and diff based. - if (mIsActive && mIsPulled && mCondition == ConditionState::kTrue && mUseDiff) { - pullAndMatchEventsLocked(mCurrentBucketStartTimeNs, mCondition); - } - // Now that activations are processed, start the condition timer if needed. - mConditionTimer.onConditionChanged(mIsActive && mCondition == ConditionState::kTrue, - mCurrentBucketStartTimeNs); -} - void ValueMetricProducer::onSlicedConditionMayChangeLocked(bool overallCondition, const int64_t eventTime) { VLOG("Metric %lld onSlicedConditionMayChange", (long long)mMetricId); diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.h b/cmds/statsd/src/metrics/ValueMetricProducer.h index 739f6ef07cc4..d7cd397da2c0 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.h +++ b/cmds/statsd/src/metrics/ValueMetricProducer.h @@ -54,10 +54,13 @@ class ValueMetricProducer : public virtual MetricProducer, public virtual PullDa public: ValueMetricProducer(const ConfigKey& key, const ValueMetric& valueMetric, const int conditionIndex, const sp<ConditionWizard>& conditionWizard, - const int whatMatcherIndex, - const sp<EventMatcherWizard>& matcherWizard, + const int whatMatcherIndex, const sp<EventMatcherWizard>& matcherWizard, const int pullTagId, const int64_t timeBaseNs, const int64_t startTimeNs, - const sp<StatsPullerManager>& pullerManager); + const sp<StatsPullerManager>& pullerManager, + const std::unordered_map<int, std::shared_ptr<Activation>>& + eventActivationMap = {}, + const std::unordered_map<int, std::vector<std::shared_ptr<Activation>>>& + eventDeactivationMap = {}); virtual ~ValueMetricProducer(); @@ -116,8 +119,6 @@ private: void flushCurrentBucketLocked(const int64_t& eventTimeNs, const int64_t& nextBucketStartTimeNs) override; - void prepareFirstBucketLocked() override; - void dropDataLocked(const int64_t dropTimeNs) override; // Calculate previous bucket end time based on current time. diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp index 40484f4fb86b..0fee71e1fe2c 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.cpp +++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp @@ -18,6 +18,7 @@ #include "Log.h" #include "metrics_manager_util.h" +#include "MetricProducer.h" #include "../condition/CombinationConditionTracker.h" #include "../condition/SimpleConditionTracker.h" @@ -137,6 +138,62 @@ bool handleMetricWithConditions( return true; } +// Validates a metricActivation and populates state. +// EventActivationMap and EventDeactivationMap are supplied to a MetricProducer +// to provide the producer with state about its activators and deactivators. +// Returns false if there are errors. +bool handleMetricActivation( + const StatsdConfig& config, + const int64_t metricId, + const int metricIndex, + const unordered_map<int64_t, int>& metricToActivationMap, + const unordered_map<int64_t, int>& logTrackerMap, + unordered_map<int, vector<int>>& activationAtomTrackerToMetricMap, + unordered_map<int, vector<int>>& deactivationAtomTrackerToMetricMap, + vector<int>& metricsWithActivation, + unordered_map<int, shared_ptr<Activation>>& eventActivationMap, + unordered_map<int, vector<shared_ptr<Activation>>>& eventDeactivationMap) { + // Check if metric has an associated activation + auto itr = metricToActivationMap.find(metricId); + if (itr == metricToActivationMap.end()) return true; + + int activationIndex = itr->second; + const MetricActivation& metricActivation = config.metric_activation(activationIndex); + + for (int i = 0; i < metricActivation.event_activation_size(); i++) { + const EventActivation& activation = metricActivation.event_activation(i); + + auto itr = logTrackerMap.find(activation.atom_matcher_id()); + if (itr == logTrackerMap.end()) { + ALOGE("Atom matcher not found for event activation."); + return false; + } + + ActivationType activationType = (activation.has_activation_type()) ? + activation.activation_type() : metricActivation.activation_type(); + std::shared_ptr<Activation> activationWrapper = std::make_shared<Activation>( + activationType, activation.ttl_seconds() * NS_PER_SEC); + + int atomMatcherIndex = itr->second; + activationAtomTrackerToMetricMap[atomMatcherIndex].push_back(metricIndex); + eventActivationMap.emplace(atomMatcherIndex, activationWrapper); + + if (activation.has_deactivation_atom_matcher_id()) { + itr = logTrackerMap.find(activation.deactivation_atom_matcher_id()); + if (itr == logTrackerMap.end()) { + ALOGE("Atom matcher not found for event deactivation."); + return false; + } + int deactivationAtomMatcherIndex = itr->second; + deactivationAtomTrackerToMetricMap[deactivationAtomMatcherIndex].push_back(metricIndex); + eventDeactivationMap[deactivationAtomMatcherIndex].push_back(activationWrapper); + } + } + + metricsWithActivation.push_back(metricIndex); + return true; +} + bool initLogTrackers(const StatsdConfig& config, const UidMap& uidMap, unordered_map<int64_t, int>& logTrackerMap, vector<sp<LogMatchingTracker>>& allAtomMatchers, set<int>& allTagIds) { @@ -293,16 +350,33 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t const vector<sp<LogMatchingTracker>>& allAtomMatchers, vector<sp<ConditionTracker>>& allConditionTrackers, vector<sp<MetricProducer>>& allMetricProducers, - unordered_map<int, std::vector<int>>& conditionToMetricMap, - unordered_map<int, std::vector<int>>& trackerToMetricMap, - unordered_map<int64_t, int>& metricMap, std::set<int64_t>& noReportMetricIds) { + unordered_map<int, vector<int>>& conditionToMetricMap, + unordered_map<int, vector<int>>& trackerToMetricMap, + unordered_map<int64_t, int>& metricMap, std::set<int64_t>& noReportMetricIds, + unordered_map<int, vector<int>>& activationAtomTrackerToMetricMap, + unordered_map<int, vector<int>>& deactivationAtomTrackerToMetricMap, + vector<int>& metricsWithActivation) { sp<ConditionWizard> wizard = new ConditionWizard(allConditionTrackers); sp<EventMatcherWizard> matcherWizard = new EventMatcherWizard(allAtomMatchers); const int allMetricsCount = config.count_metric_size() + config.duration_metric_size() + - config.event_metric_size() + config.value_metric_size(); + config.event_metric_size() + config.gauge_metric_size() + + config.value_metric_size(); allMetricProducers.reserve(allMetricsCount); StatsPullerManager statsPullerManager; + // Construct map from metric id to metric activation index. The map will be used to determine + // the metric activation corresponding to a metric. + unordered_map<int64_t, int> metricToActivationMap; + for (int i = 0; i < config.metric_activation_size(); i++) { + const MetricActivation& metricActivation = config.metric_activation(i); + int64_t metricId = metricActivation.metric_id(); + if (metricToActivationMap.find(metricId) != metricToActivationMap.end()) { + ALOGE("Metric %lld has multiple MetricActivations", (long long) metricId); + return false; + } + metricToActivationMap.insert({metricId, i}); + } + // Build MetricProducers for each metric defined in config. // build CountMetricProducer for (int i = 0; i < config.count_metric_size(); i++) { @@ -337,8 +411,17 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t } } - sp<MetricProducer> countProducer = - new CountMetricProducer(key, metric, conditionIndex, wizard, timeBaseTimeNs, currentTimeNs); + unordered_map<int, shared_ptr<Activation>> eventActivationMap; + unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap; + bool success = handleMetricActivation(config, metric.id(), metricIndex, + metricToActivationMap, logTrackerMap, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation, eventActivationMap, + eventDeactivationMap); + if (!success) return false; + + sp<MetricProducer> countProducer = new CountMetricProducer( + key, metric, conditionIndex, wizard, timeBaseTimeNs, currentTimeNs, + eventActivationMap, eventDeactivationMap); allMetricProducers.push_back(countProducer); } @@ -406,9 +489,18 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t } } + unordered_map<int, shared_ptr<Activation>> eventActivationMap; + unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap; + bool success = handleMetricActivation(config, metric.id(), metricIndex, + metricToActivationMap, logTrackerMap, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation, eventActivationMap, + eventDeactivationMap); + if (!success) return false; + sp<MetricProducer> durationMetric = new DurationMetricProducer( key, metric, conditionIndex, trackerIndices[0], trackerIndices[1], - trackerIndices[2], nesting, wizard, internalDimensions, timeBaseTimeNs, currentTimeNs); + trackerIndices[2], nesting, wizard, internalDimensions, timeBaseTimeNs, + currentTimeNs, eventActivationMap, eventDeactivationMap); allMetricProducers.push_back(durationMetric); } @@ -443,8 +535,17 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t } } - sp<MetricProducer> eventMetric = - new EventMetricProducer(key, metric, conditionIndex, wizard, timeBaseTimeNs); + unordered_map<int, shared_ptr<Activation>> eventActivationMap; + unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap; + bool success = handleMetricActivation(config, metric.id(), metricIndex, + metricToActivationMap, logTrackerMap, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation, eventActivationMap, + eventDeactivationMap); + if (!success) return false; + + sp<MetricProducer> eventMetric = new EventMetricProducer( + key, metric, conditionIndex, wizard, timeBaseTimeNs, eventActivationMap, + eventDeactivationMap); allMetricProducers.push_back(eventMetric); } @@ -500,9 +601,18 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t } } + unordered_map<int, shared_ptr<Activation>> eventActivationMap; + unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap; + bool success = handleMetricActivation(config, metric.id(), metricIndex, + metricToActivationMap, logTrackerMap, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation, eventActivationMap, + eventDeactivationMap); + if (!success) return false; + sp<MetricProducer> valueProducer = new ValueMetricProducer( key, metric, conditionIndex, wizard, trackerIndex, matcherWizard, pullTagId, - timeBaseTimeNs, currentTimeNs, pullerManager); + timeBaseTimeNs, currentTimeNs, pullerManager, eventActivationMap, + eventDeactivationMap); allMetricProducers.push_back(valueProducer); } @@ -586,10 +696,19 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, const int64_t } } + unordered_map<int, shared_ptr<Activation>> eventActivationMap; + unordered_map<int, vector<shared_ptr<Activation>>> eventDeactivationMap; + bool success = handleMetricActivation(config, metric.id(), metricIndex, + metricToActivationMap, logTrackerMap, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation, eventActivationMap, + eventDeactivationMap); + if (!success) return false; + sp<MetricProducer> gaugeProducer = new GaugeMetricProducer( key, metric, conditionIndex, wizard, trackerIndex, matcherWizard, pullTagId, triggerAtomId, atomTagId, - timeBaseTimeNs, currentTimeNs, pullerManager); + timeBaseTimeNs, currentTimeNs, pullerManager, + eventActivationMap, eventDeactivationMap); allMetricProducers.push_back(gaugeProducer); } for (int i = 0; i < config.no_report_metric_size(); ++i) { @@ -707,73 +826,6 @@ bool initAlarms(const StatsdConfig& config, const ConfigKey& key, return true; } -bool initMetricActivations(const ConfigKey& key, const StatsdConfig& config, - const int64_t currentTimeNs, - const unordered_map<int64_t, int> &logEventTrackerMap, - const unordered_map<int64_t, int> &metricProducerMap, - vector<sp<MetricProducer>>& allMetricProducers, - unordered_map<int, std::vector<int>>& activationAtomTrackerToMetricMap, - unordered_map<int, std::vector<int>>& deactivationAtomTrackerToMetricMap, - vector<int>& metricsWithActivation) { - for (int i = 0; i < config.metric_activation_size(); ++i) { - const MetricActivation& metric_activation = config.metric_activation(i); - auto itr = metricProducerMap.find(metric_activation.metric_id()); - if (itr == metricProducerMap.end()) { - ALOGE("Metric id not found in metric activation: %lld", - (long long)metric_activation.metric_id()); - return false; - } - const int metricTrackerIndex = itr->second; - if (metricTrackerIndex < 0 || metricTrackerIndex >= (int)allMetricProducers.size()) { - ALOGE("Invalid metric tracker index."); - return false; - } - const sp<MetricProducer>& metric = allMetricProducers[metricTrackerIndex]; - metricsWithActivation.push_back(metricTrackerIndex); - for (int j = 0; j < metric_activation.event_activation_size(); ++j) { - const EventActivation& activation = metric_activation.event_activation(j); - auto logTrackerIt = logEventTrackerMap.find(activation.atom_matcher_id()); - if (logTrackerIt == logEventTrackerMap.end()) { - ALOGE("Atom matcher not found for event activation."); - return false; - } - const int atomMatcherIndex = logTrackerIt->second; - activationAtomTrackerToMetricMap[atomMatcherIndex].push_back( - metricTrackerIndex); - - ActivationType activationType; - if (activation.has_activation_type()) { - activationType = activation.activation_type(); - } else { - activationType = metric_activation.activation_type(); - } - - if (activation.has_deactivation_atom_matcher_id()) { - auto deactivationAtomMatcherIt = - logEventTrackerMap.find(activation.deactivation_atom_matcher_id()); - if (deactivationAtomMatcherIt == logEventTrackerMap.end()) { - ALOGE("Atom matcher not found for event deactivation."); - return false; - } - const int deactivationMatcherIndex = deactivationAtomMatcherIt->second; - deactivationAtomTrackerToMetricMap[deactivationMatcherIndex] - .push_back(metricTrackerIndex); - metric->addActivation(atomMatcherIndex, activationType, activation.ttl_seconds(), - deactivationMatcherIndex); - } else { - metric->addActivation(atomMatcherIndex, activationType, activation.ttl_seconds()); - } - } - } - return true; -} - -void prepareFirstBucket(const vector<sp<MetricProducer>>& allMetricProducers) { - for (const auto& metric: allMetricProducers) { - metric->prepareFirstBucket(); - } -} - bool initStatsdConfig(const ConfigKey& key, const StatsdConfig& config, UidMap& uidMap, const sp<StatsPullerManager>& pullerManager, const sp<AlarmMonitor>& anomalyAlarmMonitor, @@ -810,7 +862,8 @@ bool initStatsdConfig(const ConfigKey& key, const StatsdConfig& config, UidMap& if (!initMetrics(key, config, timeBaseNs, currentTimeNs, uidMap, pullerManager, logTrackerMap, conditionTrackerMap, allAtomMatchers, allConditionTrackers, allMetricProducers, conditionToMetricMap, trackerToMetricMap, metricProducerMap, - noReportMetricIds)) { + noReportMetricIds, activationAtomTrackerToMetricMap, + deactivationAtomTrackerToMetricMap, metricsWithActivation)) { ALOGE("initMetricProducers failed"); return false; } @@ -824,14 +877,6 @@ bool initStatsdConfig(const ConfigKey& key, const StatsdConfig& config, UidMap& ALOGE("initAlarms failed"); return false; } - if (!initMetricActivations(key, config, currentTimeNs, logTrackerMap, metricProducerMap, - allMetricProducers, activationAtomTrackerToMetricMap, - deactivationAtomTrackerToMetricMap, metricsWithActivation)) { - ALOGE("initMetricActivations failed"); - return false; - } - - prepareFirstBucket(allMetricProducers); return true; } diff --git a/cmds/statsd/src/metrics/metrics_manager_util.h b/cmds/statsd/src/metrics/metrics_manager_util.h index 3704969039c4..3802948f64da 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.h +++ b/cmds/statsd/src/metrics/metrics_manager_util.h @@ -91,7 +91,10 @@ bool initMetrics( std::vector<sp<MetricProducer>>& allMetricProducers, std::unordered_map<int, std::vector<int>>& conditionToMetricMap, std::unordered_map<int, std::vector<int>>& trackerToMetricMap, - std::set<int64_t>& noReportMetricIds); + std::set<int64_t>& noReportMetricIds, + std::unordered_map<int, std::vector<int>>& activationAtomTrackerToMetricMap, + std::unordered_map<int, std::vector<int>>& deactivationAtomTrackerToMetricMap, + std::vector<int>& metricsWithActivation); // Initialize MetricsManager from StatsdConfig. // Parameters are the members of MetricsManager. See MetricsManager for declaration. diff --git a/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp b/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp index 47c21aa8f1df..b027e8e687db 100644 --- a/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp @@ -79,8 +79,6 @@ TEST(GaugeMetricProducerTest, TestFirstBucket) { logEventMatcherIndex, eventMatcherWizard, -1, -1, tagId, 5, 600 * NS_PER_SEC + NS_PER_SEC / 2, pullerManager); - gaugeProducer.prepareFirstBucket(); - EXPECT_EQ(600500000000, gaugeProducer.mCurrentBucketStartTimeNs); EXPECT_EQ(10, gaugeProducer.mCurrentBucketNum); @@ -126,8 +124,6 @@ TEST(GaugeMetricProducerTest, TestPulledEventsNoCondition) { tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); - vector<shared_ptr<LogEvent>> allData; allData.clear(); shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 1); @@ -211,7 +207,6 @@ TEST(GaugeMetricProducerTest, TestPushedEventsWithUpgrade) { logEventMatcherIndex, eventMatcherWizard, -1 /* -1 means no pulling */, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); sp<AnomalyTracker> anomalyTracker = gaugeProducer.addAnomalyTracker(alert, alarmMonitor); EXPECT_TRUE(anomalyTracker != nullptr); @@ -303,7 +298,6 @@ TEST(GaugeMetricProducerTest, TestPulledWithUpgrade) { GaugeMetricProducer gaugeProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 1); @@ -370,7 +364,6 @@ TEST(GaugeMetricProducerTest, TestPulledWithAppUpgradeDisabled) { logEventMatcherIndex, eventMatcherWizard, tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 1); @@ -431,7 +424,6 @@ TEST(GaugeMetricProducerTest, TestPulledEventsWithCondition) { GaugeMetricProducer gaugeProducer(kConfigKey, metric, 1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); gaugeProducer.onConditionChanged(true, bucketStartTimeNs + 8); EXPECT_EQ(1UL, gaugeProducer.mCurrentSlicedBucket->size()); @@ -521,7 +513,6 @@ TEST(GaugeMetricProducerTest, TestPulledEventsWithSlicedCondition) { GaugeMetricProducer gaugeProducer(kConfigKey, metric, 1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); gaugeProducer.onSlicedConditionMayChange(true, bucketStartTimeNs + 8); @@ -572,7 +563,6 @@ TEST(GaugeMetricProducerTest, TestPulledEventsAnomalyDetection) { logEventMatcherIndex, eventMatcherWizard, tagId, -1, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); Alert alert; alert.set_id(101); @@ -681,7 +671,6 @@ TEST(GaugeMetricProducerTest, TestPullOnTrigger) { logEventMatcherIndex, eventMatcherWizard, tagId, triggerId, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; @@ -766,7 +755,6 @@ TEST(GaugeMetricProducerTest, TestRemoveDimensionInOutput) { logEventMatcherIndex, eventMatcherWizard, tagId, triggerId, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - gaugeProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; diff --git a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp index 2262c76e64f9..4b9d0c0ca718 100644 --- a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp @@ -105,7 +105,6 @@ class ValueMetricProducerTestHelper { kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer->prepareFirstBucket(); return valueProducer; } @@ -125,7 +124,6 @@ class ValueMetricProducerTestHelper { new ValueMetricProducer(kConfigKey, metric, 1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer->prepareFirstBucket(); valueProducer->mCondition = ConditionState::kFalse; return valueProducer; } @@ -169,7 +167,6 @@ TEST(ValueMetricProducerTest, TestCalcPreviousBucketEndTime) { ValueMetricProducer valueProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, -1, startTimeBase, 22, pullerManager); - valueProducer.prepareFirstBucket(); EXPECT_EQ(startTimeBase, valueProducer.calcPreviousBucketEndTime(60 * NS_PER_SEC + 10)); EXPECT_EQ(startTimeBase, valueProducer.calcPreviousBucketEndTime(60 * NS_PER_SEC + 10)); @@ -199,7 +196,6 @@ TEST(ValueMetricProducerTest, TestFirstBucket) { ValueMetricProducer valueProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, -1, 5, 600 * NS_PER_SEC + NS_PER_SEC / 2, pullerManager); - valueProducer.prepareFirstBucket(); EXPECT_EQ(600500000000, valueProducer.mCurrentBucketStartTimeNs); EXPECT_EQ(10, valueProducer.mCurrentBucketNum); @@ -381,7 +377,6 @@ TEST(ValueMetricProducerTest, TestPulledEventsWithFiltering) { kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer->prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; allData.clear(); @@ -670,7 +665,6 @@ TEST(ValueMetricProducerTest, TestPushedEventsWithUpgrade) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -728,7 +722,6 @@ TEST(ValueMetricProducerTest, TestPulledValueWithUpgrade) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; allData.clear(); @@ -779,7 +772,6 @@ TEST(ValueMetricProducerTest, TestPulledWithAppUpgradeDisabled) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; allData.clear(); @@ -854,7 +846,6 @@ TEST(ValueMetricProducerTest, TestPushedEventsWithoutCondition) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -897,7 +888,6 @@ TEST(ValueMetricProducerTest, TestPushedEventsWithCondition) { ValueMetricProducer valueProducer(kConfigKey, metric, 1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); valueProducer.mCondition = ConditionState::kFalse; shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); @@ -972,7 +962,6 @@ TEST(ValueMetricProducerTest, TestAnomalyDetection) { ValueMetricProducer valueProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, logEventMatcherIndex, eventMatcherWizard, -1 /*not pulled*/, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); sp<AnomalyTracker> anomalyTracker = valueProducer.addAnomalyTracker(alert, alarmMonitor); @@ -1269,7 +1258,6 @@ TEST(ValueMetricProducerTest, TestPushedAggregateMin) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -1314,7 +1302,6 @@ TEST(ValueMetricProducerTest, TestPushedAggregateMax) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -1361,7 +1348,6 @@ TEST(ValueMetricProducerTest, TestPushedAggregateAvg) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -1412,7 +1398,6 @@ TEST(ValueMetricProducerTest, TestPushedAggregateSum) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -1458,7 +1443,6 @@ TEST(ValueMetricProducerTest, TestSkipZeroDiffOutput) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -1532,7 +1516,6 @@ TEST(ValueMetricProducerTest, TestSkipZeroDiffOutputMultiValue) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, -1, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); shared_ptr<LogEvent> event1 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); event1->write(1); @@ -2081,7 +2064,6 @@ TEST(ValueMetricProducerTest, TestResetBaseOnPullTooLate) { ValueMetricProducer valueProducer(kConfigKey, metric, 1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucket2StartTimeNs, bucket2StartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); valueProducer.mCondition = ConditionState::kFalse; // Event should be skipped since it is from previous bucket. @@ -2862,7 +2844,6 @@ TEST(ValueMetricProducerTest, TestPullNeededFastDump) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); ProtoOutputStream output; std::set<string> strSet; @@ -2905,7 +2886,6 @@ TEST(ValueMetricProducerTest, TestFastDumpWithoutCurrentBucket) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); vector<shared_ptr<LogEvent>> allData; allData.clear(); @@ -2969,7 +2949,6 @@ TEST(ValueMetricProducerTest, TestPullNeededNoTimeConstraints) { ValueMetricProducer valueProducer(kConfigKey, metric, -1, wizard, logEventMatcherIndex, eventMatcherWizard, tagId, bucketStartTimeNs, bucketStartTimeNs, pullerManager); - valueProducer.prepareFirstBucket(); ProtoOutputStream output; std::set<string> strSet; diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index d3c274f4bdfe..4603f08c765f 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -605,7 +605,7 @@ public abstract class AccessibilityService extends Service { } /** - * Gets the windows on the screen. This method returns only the windows + * Gets the windows on the screen of the default display. This method returns only the windows * that a sighted user can interact with, as opposed to all windows. * For example, if there is a modal dialog shown and the user cannot touch * anything behind it, then only the modal window will be reported @@ -632,6 +632,34 @@ public abstract class AccessibilityService extends Service { } /** + * Gets the windows on the screen of all displays. This method returns only the windows + * that a sighted user can interact with, as opposed to all windows. + * For example, if there is a modal dialog shown and the user cannot touch + * anything behind it, then only the modal window will be reported + * (assuming it is the top one). For convenience the returned windows + * are ordered in a descending layer order, which is the windows that + * are on top are reported first. Since the user can always + * interact with the window that has input focus by typing, the focused + * window is always returned (even if covered by a modal window). + * <p> + * <strong>Note:</strong> In order to access the windows your service has + * to declare the capability to retrieve window content by setting the + * {@link android.R.styleable#AccessibilityService_canRetrieveWindowContent} + * property in its meta-data. For details refer to {@link #SERVICE_META_DATA}. + * Also the service has to opt-in to retrieve the interactive windows by + * setting the {@link AccessibilityServiceInfo#FLAG_RETRIEVE_INTERACTIVE_WINDOWS} + * flag. + * </p> + * + * @return The windows of all displays if there are windows and the service is can retrieve + * them, otherwise an empty list. The key of SparseArray is display ID. + */ + @NonNull + public final SparseArray<List<AccessibilityWindowInfo>> getWindowsOnAllDisplays() { + return AccessibilityInteractionClient.getInstance().getWindowsOnAllDisplays(mConnectionId); + } + + /** * Gets the root node in the currently active window if this service * can retrieve window content. The active window is the one that the user * is currently touching or the window with input focus, if the user is not diff --git a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java new file mode 100644 index 000000000000..f4cadfd8bbc1 --- /dev/null +++ b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java @@ -0,0 +1,225 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.accessibilityservice; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.content.res.XmlResourceParser; +import android.util.AttributeSet; +import android.util.Xml; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.IOException; + +/** + * Activities of interest to users with accessibility needs may request to be targets of the + * accessibility shortcut. These activities must handle the + * {@link Intent#ACTION_MAIN} intent with category + * {@link Intent#CATEGORY_ACCESSIBILITY_SHORTCUT_TARGET}, which will be dispatched by the system + * when the user activates the shortcut when it is configured to point at this target. + * + * @see Intent#CATEGORY_ACCESSIBILITY_SHORTCUT_TARGET + * + * @hide + */ +public final class AccessibilityShortcutInfo { + private static final String TAG_ACCESSIBILITY_SHORTCUT = "accessibility-shortcut-target"; + + /** + * Name under which an activity component of the accessibility shortcut publishes information + * about itself. This meta-data must reference an XML resource containing an + * <code><accessibility-shortcut-target></code> tag. + */ + public static final String META_DATA = "android.accessibilityshortcut.target"; + + /** + * The component name of the accessibility shortcut target. + */ + private final ComponentName mComponentName; + + /** + * The activity info of the accessibility shortcut target. + */ + private final ActivityInfo mActivityInfo; + + /** + * Resource id of the summary of the accessibility shortcut target. + */ + private final int mSummaryResId; + + /** + * Resource id of the description of the accessibility shortcut target. + */ + private final int mDescriptionResId; + + /** + * Creates a new instance. + * + * @param context Context for accessing resources. + * @param activityInfo The activity info. + * @throws XmlPullParserException If a XML parsing error occurs. + * @throws IOException If a XML parsing error occurs. + */ + public AccessibilityShortcutInfo(@NonNull Context context, @NonNull ActivityInfo activityInfo) + throws XmlPullParserException, IOException { + final PackageManager packageManager = context.getPackageManager(); + mComponentName = activityInfo.getComponentName(); + mActivityInfo = activityInfo; + + try (XmlResourceParser parser = mActivityInfo.loadXmlMetaData( + packageManager, META_DATA)) { + if (parser == null) { + throw new XmlPullParserException("Meta-data " + + TAG_ACCESSIBILITY_SHORTCUT + " does not exist"); + } + + int type = 0; + while (type != XmlPullParser.END_DOCUMENT && type != XmlPullParser.START_TAG) { + type = parser.next(); + } + + final String nodeName = parser.getName(); + if (!TAG_ACCESSIBILITY_SHORTCUT.equals(nodeName)) { + throw new XmlPullParserException("Meta-data does not start with" + + TAG_ACCESSIBILITY_SHORTCUT + " tag"); + } + + final AttributeSet allAttributes = Xml.asAttributeSet(parser); + final Resources resources = packageManager.getResourcesForApplication( + mActivityInfo.applicationInfo); + final TypedArray asAttributes = resources.obtainAttributes(allAttributes, + com.android.internal.R.styleable.AccessibilityShortcutTarget); + + // Gets description + mDescriptionResId = asAttributes.getResourceId( + com.android.internal.R.styleable.AccessibilityShortcutTarget_description, 0); + // Gets summary + mSummaryResId = asAttributes.getResourceId( + com.android.internal.R.styleable.AccessibilityShortcutTarget_summary, 0); + asAttributes.recycle(); + + if (mDescriptionResId == 0 || mSummaryResId == 0) { + throw new XmlPullParserException("No description or summary in meta-data"); + } + } catch (PackageManager.NameNotFoundException e) { + throw new XmlPullParserException("Unable to create context for: " + + mActivityInfo.packageName); + } + } + + /** + * The {@link ActivityInfo} of accessibility shortcut target. + * + * @return The activity info. + */ + @NonNull + public ActivityInfo getActivityInfo() { + return mActivityInfo; + } + + /** + * The localized summary of the accessibility shortcut target. + * + * @return The localized summary if available, and {@code null} if a summary + * has not been provided. + */ + @Nullable + public String loadSummary(@NonNull PackageManager packageManager) { + return loadResourceString(packageManager, mActivityInfo, mSummaryResId); + } + + /** + * The localized description of the accessibility shortcut target. + * + * @return The localized description. + */ + @Nullable + public String loadDescription(@NonNull PackageManager packageManager) { + return loadResourceString(packageManager, mActivityInfo, mDescriptionResId); + } + + /** + * Gets string resource by the given activity and resource id. + */ + @Nullable + private String loadResourceString(@NonNull PackageManager packageManager, + @NonNull ActivityInfo activityInfo, int resId) { + if (resId == 0) { + return null; + } + final CharSequence text = packageManager.getText(activityInfo.packageName, + resId, activityInfo.applicationInfo); + if (text != null) { + return text.toString().trim(); + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + return 31 * 1 + ((mComponentName == null) ? 0 : mComponentName.hashCode()); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final AccessibilityShortcutInfo other = (AccessibilityShortcutInfo) obj; + if (mComponentName == null) { + if (other.mComponentName != null) { + return false; + } + } else if (!mComponentName.equals(other.mComponentName)) { + return false; + } + return true; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("AccessibilityShortcutInfo["); + stringBuilder.append("activityInfo: ").append(mActivityInfo); + stringBuilder.append("]"); + return stringBuilder.toString(); + } +} diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl index 1ca07dd6ed23..4841781170e1 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl @@ -60,7 +60,7 @@ interface IAccessibilityServiceConnection { AccessibilityWindowInfo getWindow(int windowId); - List<AccessibilityWindowInfo> getWindows(); + AccessibilityWindowInfo.WindowListSparseArray getWindows(); AccessibilityServiceInfo getServiceInfo(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 38aac1b47f65..7f27368e017e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1163,6 +1163,10 @@ public final class ActivityThread extends ClientTransactionHandler { sendMessage(H.ATTACH_AGENT, agent); } + public void attachStartupAgents(String dataDir) { + sendMessage(H.ATTACH_STARTUP_AGENTS, dataDir); + } + public void setSchedulingGroup(int group) { // Note: do this immediately, since going into the foreground // should happen regardless of what pending work we have to do @@ -1812,6 +1816,7 @@ public final class ActivityThread extends ClientTransactionHandler { public static final int EXECUTE_TRANSACTION = 159; public static final int RELAUNCH_ACTIVITY = 160; public static final int PURGE_RESOURCES = 161; + public static final int ATTACH_STARTUP_AGENTS = 162; String codeToString(int code) { if (DEBUG_MESSAGES) { @@ -1855,6 +1860,7 @@ public final class ActivityThread extends ClientTransactionHandler { case EXECUTE_TRANSACTION: return "EXECUTE_TRANSACTION"; case RELAUNCH_ACTIVITY: return "RELAUNCH_ACTIVITY"; case PURGE_RESOURCES: return "PURGE_RESOURCES"; + case ATTACH_STARTUP_AGENTS: return "ATTACH_STARTUP_AGENTS"; } } return Integer.toString(code); @@ -2043,6 +2049,9 @@ public final class ActivityThread extends ClientTransactionHandler { case PURGE_RESOURCES: schedulePurgeIdler(); break; + case ATTACH_STARTUP_AGENTS: + handleAttachStartupAgents((String) msg.obj); + break; } Object obj = msg.obj; if (obj instanceof SomeArgs) { @@ -3779,6 +3788,27 @@ public final class ActivityThread extends ClientTransactionHandler { } } + static void handleAttachStartupAgents(String dataDir) { + try { + Path code_cache = ContextImpl.getCodeCacheDirBeforeBind(new File(dataDir)).toPath(); + if (!Files.exists(code_cache)) { + return; + } + Path startup_path = code_cache.resolve("startup_agents"); + if (Files.exists(startup_path)) { + for (Path p : Files.newDirectoryStream(startup_path)) { + handleAttachAgent( + p.toAbsolutePath().toString() + + "=" + + dataDir, + null); + } + } + } catch (Exception e) { + // Ignored. + } + } + private static final ThreadLocal<Intent> sCurrentBroadcastIntent = new ThreadLocal<Intent>(); /** @@ -6427,26 +6457,6 @@ public final class ActivityThread extends ClientTransactionHandler { NetworkSecurityConfigProvider.install(appContext); Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); - - if (isAppDebuggable) { - try { - // Load all the agents in the code_cache/startup_agents directory. - // We pass the absolute path to the data_dir as an argument. - Path startup_path = appContext.getCodeCacheDir().toPath().resolve("startup_agents"); - if (Files.exists(startup_path)) { - for (Path p : Files.newDirectoryStream(startup_path)) { - handleAttachAgent( - p.toAbsolutePath().toString() - + "=" - + appContext.getDataDir().toPath().toAbsolutePath().toString(), - data.info); - } - } - } catch (Exception e) { - // Ignored. - } - } - // Continue loading instrumentation. if (ii != null) { ApplicationInfo instrApp; diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index a2013075b379..86bf20a57eec 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -3169,6 +3169,15 @@ public class ApplicationPackageManager extends PackageManager { } @Override + public String getSetupWizardPackageName() { + try { + return mPM.getSetupWizardPackageName(); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } + + @Override public String getIncidentReportApproverPackageName() { try { return mPM.getIncidentReportApproverPackageName(); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index ef23d5e7a424..39fab634f03c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -741,12 +741,21 @@ class ContextImpl extends Context { public File getCodeCacheDir() { synchronized (mSync) { if (mCodeCacheDir == null) { - mCodeCacheDir = new File(getDataDir(), "code_cache"); + mCodeCacheDir = getCodeCacheDirBeforeBind(getDataDir()); } return ensurePrivateCacheDirExists(mCodeCacheDir, XATTR_INODE_CODE_CACHE); } } + /** + * Helper for getting code-cache dir potentially before application bind. + * + * @hide + */ + static File getCodeCacheDirBeforeBind(File dataDir) { + return new File(dataDir, "code_cache"); + } + @Override public File getExternalCacheDir() { // Operates on primary external storage @@ -2203,6 +2212,15 @@ class ContextImpl extends Context { } @Override + public Context createContextAsUser(UserHandle user) { + try { + return createPackageContextAsUser(getPackageName(), mFlags, user); + } catch (NameNotFoundException e) { + throw new IllegalStateException("Own package not found: package=" + getPackageName()); + } + } + + @Override public Context createContextForSplit(String splitName) throws NameNotFoundException { if (!mPackageInfo.getApplicationInfo().requestsIsolatedSplitLoading()) { // All Splits are always loaded. diff --git a/core/java/android/app/IApplicationThread.aidl b/core/java/android/app/IApplicationThread.aidl index cfa065ba5bc9..51a64fff7c45 100644 --- a/core/java/android/app/IApplicationThread.aidl +++ b/core/java/android/app/IApplicationThread.aidl @@ -137,6 +137,7 @@ oneway interface IApplicationThread { IVoiceInteractor voiceInteractor); void handleTrustStorageUpdate(); void attachAgent(String path); + void attachStartupAgents(String dataDir); void scheduleApplicationInfoChanged(in ApplicationInfo ai); void setNetworkBlockSeq(long procStateSeq); void scheduleTransaction(in ClientTransaction transaction); diff --git a/core/java/android/app/ITaskStackListener.aidl b/core/java/android/app/ITaskStackListener.aidl index 750020eb5bb8..0ba1989e681c 100644 --- a/core/java/android/app/ITaskStackListener.aidl +++ b/core/java/android/app/ITaskStackListener.aidl @@ -197,4 +197,11 @@ oneway interface ITaskStackListener { * Called when any additions or deletions to the recent tasks list have been made. */ void onRecentTaskListUpdated(); + + /** + * Called when Recent Tasks list is frozen or unfrozen. + * + * @param frozen if true, Recents Tasks list is currently frozen, false otherwise + */ + void onRecentTaskListFrozenChanged(boolean frozen); } diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 9b667a118ebc..b1565ab8a501 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -87,12 +87,6 @@ public class KeyguardManager { "android.app.action.CONFIRM_FRP_CREDENTIAL"; /** - * @hide - */ - public static final String EXTRA_BIOMETRIC_PROMPT_BUNDLE = - "android.app.extra.BIOMETRIC_PROMPT_BUNDLE"; - - /** * A CharSequence dialog title to show to the user when used with a * {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}. * @hide diff --git a/core/java/android/app/TaskStackListener.java b/core/java/android/app/TaskStackListener.java index 46045faecbd4..f21aaf3867fd 100644 --- a/core/java/android/app/TaskStackListener.java +++ b/core/java/android/app/TaskStackListener.java @@ -190,4 +190,8 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { @Override public void onRecentTaskListUpdated() throws RemoteException { } + + @Override + public void onRecentTaskListFrozenChanged(boolean frozen) { + } } diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index fd93450c29f0..13d566c0e04b 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -42,6 +42,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.util.Log; +import android.util.SparseArray; import android.view.Display; import android.view.InputEvent; import android.view.KeyEvent; @@ -535,7 +536,7 @@ public final class UiAutomation { } /** - * Gets the windows on the screen. This method returns only the windows + * Gets the windows on the screen of the default display. This method returns only the windows * that a sighted user can interact with, as opposed to all windows. * For example, if there is a modal dialog shown and the user cannot touch * anything behind it, then only the modal window will be reported @@ -562,6 +563,35 @@ public final class UiAutomation { } /** + * Gets the windows on the screen of all displays. This method returns only the windows + * that a sighted user can interact with, as opposed to all windows. + * For example, if there is a modal dialog shown and the user cannot touch + * anything behind it, then only the modal window will be reported + * (assuming it is the top one). For convenience the returned windows + * are ordered in a descending layer order, which is the windows that + * are higher in the Z-order are reported first. + * <p> + * <strong>Note:</strong> In order to access the windows you have to opt-in + * to retrieve the interactive windows by setting the + * {@link AccessibilityServiceInfo#FLAG_RETRIEVE_INTERACTIVE_WINDOWS} flag. + * </p> + * + * @return The windows of all displays if there are windows and the service is can retrieve + * them, otherwise an empty list. The key of SparseArray is display ID. + */ + @NonNull + public SparseArray<List<AccessibilityWindowInfo>> getWindowsOnAllDisplays() { + final int connectionId; + synchronized (mLock) { + throwIfNotConnectedLocked(); + connectionId = mConnectionId; + } + // Calling out without a lock held. + return AccessibilityInteractionClient.getInstance() + .getWindowsOnAllDisplays(connectionId); + } + + /** * Gets the root {@link AccessibilityNodeInfo} in the active window. * * @return The root info. diff --git a/core/java/android/app/admin/DelegatedAdminReceiver.java b/core/java/android/app/admin/DelegatedAdminReceiver.java index f66de8d238ed..25b8eab452bf 100644 --- a/core/java/android/app/admin/DelegatedAdminReceiver.java +++ b/core/java/android/app/admin/DelegatedAdminReceiver.java @@ -63,6 +63,10 @@ public class DelegatedAdminReceiver extends BroadcastReceiver { * Allows this receiver to select the alias for a private key and certificate pair for * authentication. If this method returns null, the default {@link android.app.Activity} will * be shown that lets the user pick a private key and certificate pair. + * If this method returns {@link KeyChain#KEY_ALIAS_SELECTION_DENIED}, + * the default {@link android.app.Activity} will not be shown and the user will not be allowed + * to pick anything. And the app, that called {@link KeyChain#choosePrivateKeyAlias}, will + * receive {@code null} back. * * <p> This callback is only applicable if the delegated app has * {@link DevicePolicyManager#DELEGATION_CERT_SELECTION} capability. Additionally, it must diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 0c500da0294a..d175a66e90ea 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -791,6 +791,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * Allows this receiver to select the alias for a private key and certificate pair for * authentication. If this method returns null, the default {@link android.app.Activity} will be * shown that lets the user pick a private key and certificate pair. + * If this method returns {@link KeyChain#KEY_ALIAS_SELECTION_DENIED}, + * the default {@link android.app.Activity} will not be shown and the user will not be allowed + * to pick anything. And the app, that called {@link KeyChain#choosePrivateKeyAlias}, will + * receive {@code null} back. * * @param context The running context as per {@link #onReceive}. * @param intent The received intent as per {@link #onReceive}. diff --git a/core/java/android/app/admin/DevicePolicyManagerInternal.java b/core/java/android/app/admin/DevicePolicyManagerInternal.java index b873be3e7042..713126ee9341 100644 --- a/core/java/android/app/admin/DevicePolicyManagerInternal.java +++ b/core/java/android/app/admin/DevicePolicyManagerInternal.java @@ -24,6 +24,10 @@ import java.util.List; /** * Device policy manager local system service interface. * + * Maintenance note: if you need to expose information from DPMS to lower level services such as + * PM/UM/AM/etc, then exposing it from DevicePolicyManagerInternal is not safe because it may cause + * lock order inversion. Consider using {@link DevicePolicyCache} instead. + * * @hide Only for use within the system server. */ public abstract class DevicePolicyManagerInternal { @@ -81,6 +85,16 @@ public abstract class DevicePolicyManagerInternal { public abstract boolean isActiveAdminWithPolicy(int uid, int reqPolicy); /** + * Checks if an app with given uid is the active supervision admin. + * + * <p>This takes the DPMS lock. DO NOT call from PM/UM/AM with their lock held. + * + * @param uid App uid. + * @return true if the uid is the active supervision app. + */ + public abstract boolean isActiveSupervisionApp(int uid); + + /** * Creates an intent to show the admin support dialog to say that an action is disallowed by * the device/profile owner. * diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 656f474f72ce..1f13a1e13d13 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -801,8 +801,8 @@ public final class UsageStatsManager { * {@link #EXTRA_TIME_USED}. Cannot be {@code null} unless the observer is * being registered with a {@code timeUsed} equal to or greater than * {@code timeLimit}. - * @throws SecurityException if the caller doesn't have both SUSPEND_APPS and OBSERVE_APP_USAGE - * permissions. + * @throws SecurityException if the caller is neither the active supervision app nor does it + * have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions. * @hide */ @SystemApi @@ -827,8 +827,8 @@ public final class UsageStatsManager { * an observer that was already unregistered or never registered will have no effect. * * @param observerId The id of the observer that was previously registered. - * @throws SecurityException if the caller doesn't have both SUSPEND_APPS and OBSERVE_APP_USAGE - * permissions. + * @throws SecurityException if the caller is neither the active supervision app nor does it + * have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions. * @hide */ @SystemApi diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 1f4839380178..7c279fe5781d 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -265,6 +265,7 @@ public abstract class ContentResolver implements ContentInterface { * @see #QUERY_ARG_SORT_COLUMNS * @see #QUERY_ARG_SORT_DIRECTION * @see #QUERY_ARG_SORT_COLLATION + * @see #QUERY_ARG_SORT_LOCALE */ public static final String QUERY_ARG_SQL_SELECTION = "android:query-arg-sql-selection"; @@ -282,6 +283,7 @@ public abstract class ContentResolver implements ContentInterface { * @see #QUERY_ARG_SORT_COLUMNS * @see #QUERY_ARG_SORT_DIRECTION * @see #QUERY_ARG_SORT_COLLATION + * @see #QUERY_ARG_SORT_LOCALE */ public static final String QUERY_ARG_SQL_SELECTION_ARGS = "android:query-arg-sql-selection-args"; @@ -297,6 +299,7 @@ public abstract class ContentResolver implements ContentInterface { * @see #QUERY_ARG_SORT_COLUMNS * @see #QUERY_ARG_SORT_DIRECTION * @see #QUERY_ARG_SORT_COLLATION + * @see #QUERY_ARG_SORT_LOCALE */ public static final String QUERY_ARG_SQL_SORT_ORDER = "android:query-arg-sql-sort-order"; @@ -351,20 +354,22 @@ public abstract class ContentResolver implements ContentInterface { /** * Allows client to specify a hint to the provider declaring which collation - * to use when sorting text values. - * - * <p>Providers may support custom collators. When specifying a custom collator + * to use when sorting values. + * <p> + * Providers may support custom collators. When specifying a custom collator * the value is determined by the Provider. - * - * <li>{@link ContentProvider} implementations: When preparing data in - * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}, if sort collation - * is reflected in the returned Cursor, it is strongly recommended that - * {@link #QUERY_ARG_SORT_COLLATION} then be included in the array of honored arguments - * reflected in {@link Cursor} extras {@link Bundle} under {@link #EXTRA_HONORED_ARGS}. - * - * <li>When querying a provider, where no QUERY_ARG_SQL* otherwise exists in the - * arguments {@link Bundle}, the Content framework will attempt to synthesize - * a QUERY_ARG_SQL* argument using the corresponding QUERY_ARG_SORT* values. + * <p> + * {@link ContentProvider} implementations: When preparing data in + * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}, + * if sort collation is reflected in the returned Cursor, it is strongly + * recommended that {@link #QUERY_ARG_SORT_COLLATION} then be included in + * the array of honored arguments reflected in {@link Cursor} extras + * {@link Bundle} under {@link #EXTRA_HONORED_ARGS}. + * <p> + * When querying a provider, where no QUERY_ARG_SQL* otherwise exists in the + * arguments {@link Bundle}, the Content framework will attempt to + * synthesize a QUERY_ARG_SQL* argument using the corresponding + * QUERY_ARG_SORT* values. * * @see java.text.Collator#PRIMARY * @see java.text.Collator#SECONDARY @@ -374,6 +379,28 @@ public abstract class ContentResolver implements ContentInterface { public static final String QUERY_ARG_SORT_COLLATION = "android:query-arg-sort-collation"; /** + * Allows client to specify a hint to the provider declaring which locale to + * use when sorting values. + * <p> + * The value is defined as a RFC 3066 locale ID followed by an optional + * keyword list, which is the locale format used to configure ICU through + * classes like {@link android.icu.util.ULocale}. This supports requesting + * advanced sorting options, such as {@code de@collation=phonebook}, + * {@code zh@collation=pinyin}, etc. + * <p> + * {@link ContentProvider} implementations: When preparing data in + * {@link ContentProvider#query(Uri, String[], Bundle, CancellationSignal)}, + * if sort locale is reflected in the returned Cursor, it is strongly + * recommended that {@link #QUERY_ARG_SORT_LOCALE} then be included in the + * array of honored arguments reflected in {@link Cursor} extras + * {@link Bundle} under {@link #EXTRA_HONORED_ARGS}. + * + * @see java.util.Locale#Locale(String) + * @see android.icu.util.ULocale#ULocale(String) + */ + public static final String QUERY_ARG_SORT_LOCALE = "android:query-arg-sort-locale"; + + /** * Allows provider to report back to client which query keys are honored in a Cursor. * * <p>Key identifying a {@code String[]} containing all QUERY_ARG_SORT* arguments @@ -386,6 +413,7 @@ public abstract class ContentResolver implements ContentInterface { * @see #QUERY_ARG_SORT_COLUMNS * @see #QUERY_ARG_SORT_DIRECTION * @see #QUERY_ARG_SORT_COLLATION + * @see #QUERY_ARG_SORT_LOCALE */ public static final String EXTRA_HONORED_ARGS = "android.content.extra.HONORED_ARGS"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 08817e05e0a5..2dde3ae5909c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -5217,8 +5217,9 @@ public abstract class Context { */ @SystemApi @TestApi + @NonNull public Context createPackageContextAsUser( - String packageName, @CreatePackageOptions int flags, UserHandle user) + @NonNull String packageName, @CreatePackageOptions int flags, @NonNull UserHandle user) throws PackageManager.NameNotFoundException { if (Build.IS_ENG) { throw new IllegalStateException("createPackageContextAsUser not overridden!"); @@ -5227,6 +5228,23 @@ public abstract class Context { } /** + * Similar to {@link #createPackageContext(String, int)}, but for the own package with a + * different {@link UserHandle}. For example, {@link #getContentResolver()} + * will open any {@link Uri} as the given user. + * + * @hide + */ + @SystemApi + @TestApi + @NonNull + public Context createContextAsUser(@NonNull UserHandle user) { + if (Build.IS_ENG) { + throw new IllegalStateException("createContextAsUser not overridden!"); + } + return this; + } + + /** * Creates a context given an {@link android.content.pm.ApplicationInfo}. * * @hide diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 0859f97e81a1..f7cd51e7ffbc 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -885,6 +885,12 @@ public class ContextWrapper extends Context { /** @hide */ @Override + public Context createContextAsUser(UserHandle user) { + return mBase.createContextAsUser(user); + } + + /** @hide */ + @Override @UnsupportedAppUsage public Context createApplicationContext(ApplicationInfo application, int flags) throws PackageManager.NameNotFoundException { diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 39ddc82e9269..efb1c6ad7b36 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4654,6 +4654,59 @@ public class Intent implements Parcelable, Cloneable { */ @SdkConstant(SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_VR_HOME = "android.intent.category.VR_HOME"; + + /** + * The accessibility shortcut is a global gesture for users with disabilities to trigger an + * important for them accessibility feature to help developers determine whether they want to + * make their activity a shortcut target. + * <p> + * An activity of interest to users with accessibility needs may request to be the target of + * the accessibility shortcut. It handles intent {@link #ACTION_MAIN} with this category, + * which will be dispatched by the system when the user activates the shortcut when it is + * configured to point at this target. + * </p> + * <p> + * An activity declared itself to be a target of the shortcut in AndroidManifest.xml. It must + * also do two things: + * <ul> + * <ol> + * Specify that it handles the <code>android.intent.action.MAIN</code> + * {@link android.content.Intent} + * with category <code>android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET</code>. + * </ol> + * <ol> + * Provide a meta-data entry <code>android.accessibilityshortcut.target</code> in the + * manifest when declaring the activity. + * </ol> + * </ul> + * If either of these items is missing, the system will ignore the accessibility shortcut + * target. Following is an example declaration: + * </p> + * <pre> + * <activity android:name=".MainActivity" + * . . . + * <intent-filter> + * <action android:name="android.intent.action.MAIN" /> + * <category android:name="android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET" /> + * </intent-filter> + * <meta-data android:name="android.accessibilityshortcut.target" + * android:resource="@xml/accessibilityshortcut" /> + * </activity> + * </pre> + * <p> This is a sample XML file configuring a accessibility shortcut target: </p> + * <pre> + * <accessibility-shortcut-target + * android:description="@string/shortcut_target_description" + * android:summary="@string/shortcut_target_summary" /> + * </pre> + * <p> + * Both description and summary are necessary. The system will ignore the accessibility + * shortcut target if they are missing. + * </p> + */ + @SdkConstant(SdkConstantType.INTENT_CATEGORY) + public static final String CATEGORY_ACCESSIBILITY_SHORTCUT_TARGET = + "android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET"; // --------------------------------------------------------------------- // --------------------------------------------------------------------- // Application launch intent categories (see addCategory()). diff --git a/core/java/android/content/pm/AndroidTestBaseUpdater.java b/core/java/android/content/pm/AndroidTestBaseUpdater.java index da1a693b13c3..8fcfe711a882 100644 --- a/core/java/android/content/pm/AndroidTestBaseUpdater.java +++ b/core/java/android/content/pm/AndroidTestBaseUpdater.java @@ -18,10 +18,17 @@ package android.content.pm; import static android.content.pm.SharedLibraryNames.ANDROID_TEST_BASE; import static android.content.pm.SharedLibraryNames.ANDROID_TEST_RUNNER; +import android.compat.annotation.ChangeId; +import android.compat.annotation.EnabledAfter; +import android.content.Context; import android.content.pm.PackageParser.Package; import android.os.Build; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.compat.IPlatformCompat; /** * Updates a package to ensure that if it targets <= Q that the android.test.base library is @@ -37,10 +44,26 @@ import com.android.internal.annotations.VisibleForTesting; */ @VisibleForTesting public class AndroidTestBaseUpdater extends PackageSharedLibraryUpdater { + private static final String TAG = "AndroidTestBaseUpdater"; - private static boolean apkTargetsApiLevelLessThanOrEqualToQ(Package pkg) { - int targetSdkVersion = pkg.applicationInfo.targetSdkVersion; - return targetSdkVersion <= Build.VERSION_CODES.Q; + /** + * Remove android.test.base library for apps that target SDK R or more and do not depend on + * android.test.runner (as it depends on classes from the android.test.base library). + */ + @ChangeId + @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q) + private static final long REMOVE_ANDROID_TEST_BASE = 133396946L; + + private static boolean isChangeEnabled(Package pkg) { + IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface( + ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); + try { + return platformCompat.isChangeEnabled(REMOVE_ANDROID_TEST_BASE, pkg.applicationInfo); + } catch (RemoteException | NullPointerException e) { + Log.e(TAG, "Failed to get a response from PLATFORM_COMPAT_SERVICE", e); + } + // Fall back to previous behaviour. + return pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.Q; } @Override @@ -48,7 +71,7 @@ public class AndroidTestBaseUpdater extends PackageSharedLibraryUpdater { // Packages targeted at <= Q expect the classes in the android.test.base library // to be accessible so this maintains backward compatibility by adding the // android.test.base library to those packages. - if (apkTargetsApiLevelLessThanOrEqualToQ(pkg)) { + if (!isChangeEnabled(pkg)) { prefixRequiredLibrary(pkg, ANDROID_TEST_BASE); } else { // If a package already depends on android.test.runner then add a dependency on diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 4d7c43ace923..19d8edfa3884 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -686,6 +686,8 @@ interface IPackageManager { String getSystemCaptionsServicePackageName(); + String getSetupWizardPackageName(); + String getIncidentReportApproverPackageName(); boolean isPackageStateProtected(String packageName, int userId); diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 1099d8bdc7dd..69ce3bd55071 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -101,19 +101,6 @@ import java.util.concurrent.Executor; * <p> * The ApiDemos project contains examples of using this API: * <code>ApiDemos/src/com/example/android/apis/content/InstallApk*.java</code>. - * <p> - * On Android Q or above, an app installed notification will be posted - * by system after a new app is installed. - * To customize installer's notification icon, you should declare the following in the manifest - * <application> as follows: </p> - * <pre> - * <meta-data android:name="com.android.packageinstaller.notification.smallIcon" - * android:resource="@drawable/installer_notification_icon"/> - * </pre> - * <pre> - * <meta-data android:name="com.android.packageinstaller.notification.color" - * android:resource="@color/installer_notification_color"/> - * </pre> */ public class PackageInstaller { private static final String TAG = "PackageInstaller"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index fd14d235a044..9513ce802813 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -7427,6 +7427,17 @@ public abstract class PackageManager { } /** + * @return the system defined setup wizard package name, or null if there's none. + * + * @hide + */ + @Nullable + public String getSetupWizardPackageName() { + throw new UnsupportedOperationException( + "getSetupWizardPackageName not implemented in subclass"); + } + + /** * @return the incident report approver app package name, or null if it's not defined * by the OEM. * diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java index 9f0bade9bd29..ccfa1843200c 100644 --- a/core/java/android/content/pm/UserInfo.java +++ b/core/java/android/content/pm/UserInfo.java @@ -350,7 +350,7 @@ public class UserInfo implements Parcelable { @UnsupportedAppUsage public UserHandle getUserHandle() { - return new UserHandle(id); + return UserHandle.of(id); } @Override diff --git a/core/java/android/hardware/biometrics/Authenticator.java b/core/java/android/hardware/biometrics/Authenticator.java new file mode 100644 index 000000000000..6d7e7488f2d0 --- /dev/null +++ b/core/java/android/hardware/biometrics/Authenticator.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.biometrics; + +/** + * Type of authenticators defined on a granularity that the BiometricManager / BiometricPrompt + * supports. + * @hide + */ +public class Authenticator { + + /** + * Device credential, e.g. Pin/Pattern/Password. + */ + public static final int TYPE_CREDENTIAL = 1 << 0; + /** + * Encompasses all biometrics on the device, e.g. Fingerprint/Iris/Face. + */ + public static final int TYPE_BIOMETRIC = 1 << 1; + +} diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java index d8110f33d723..cbe8a052db2f 100644 --- a/core/java/android/hardware/biometrics/BiometricManager.java +++ b/core/java/android/hardware/biometrics/BiometricManager.java @@ -201,55 +201,5 @@ public class BiometricManager { } } - /** - * TODO(b/123378871): Remove when moved. - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public void onConfirmDeviceCredentialSuccess() { - if (mService != null) { - try { - mService.onConfirmDeviceCredentialSuccess(); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } else { - Slog.w(TAG, "onConfirmDeviceCredentialSuccess(): Service not connected"); - } - } - - /** - * TODO(b/123378871): Remove when moved. - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public void onConfirmDeviceCredentialError(int error, String message) { - if (mService != null) { - try { - mService.onConfirmDeviceCredentialError(error, message); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } else { - Slog.w(TAG, "onConfirmDeviceCredentialError(): Service not connected"); - } - } - - /** - * TODO(b/123378871): Remove when moved. - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public void registerCancellationCallback(IBiometricConfirmDeviceCredentialCallback callback) { - if (mService != null) { - try { - mService.registerCancellationCallback(callback); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } else { - Slog.w(TAG, "registerCancellationCallback(): Service not connected"); - } - } } diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java index fb6b231632f1..cf86e25112d2 100644 --- a/core/java/android/hardware/biometrics/BiometricPrompt.java +++ b/core/java/android/hardware/biometrics/BiometricPrompt.java @@ -69,24 +69,21 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan /** * @hide */ - public static final String KEY_POSITIVE_TEXT = "positive_text"; - /** - * @hide - */ public static final String KEY_NEGATIVE_TEXT = "negative_text"; /** * @hide */ public static final String KEY_REQUIRE_CONFIRMATION = "require_confirmation"; /** + * This is deprecated. Internally we should use {@link #KEY_AUTHENTICATORS_ALLOWED} * @hide */ public static final String KEY_ALLOW_DEVICE_CREDENTIAL = "allow_device_credential"; /** + * If this key is set, we will ignore {@link #KEY_ALLOW_DEVICE_CREDENTIAL} * @hide */ - public static final String KEY_FROM_CONFIRM_DEVICE_CREDENTIAL - = "from_confirm_device_credential"; + public static final String KEY_AUTHENTICATORS_ALLOWED = "authenticators_allowed"; /** * Error/help message will show for this amount of time. @@ -100,7 +97,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan /** * @hide */ - public static final int DISMISSED_REASON_CONFIRMED = 1; + public static final int DISMISSED_REASON_BIOMETRIC_CONFIRMED = 1; /** * Dialog is done animating away after user clicked on the button set via @@ -119,7 +116,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan * Authenticated, confirmation not required. Dialog animated away. * @hide */ - public static final int DISMISSED_REASON_CONFIRM_NOT_REQUIRED = 4; + public static final int DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED = 4; /** * Error message shown on SystemUI. When BiometricService receives this, the UI is already @@ -134,6 +131,11 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan */ public static final int DISMISSED_REASON_SERVER_REQUESTED = 6; + /** + * @hide + */ + public static final int DISMISSED_REASON_CREDENTIAL_CONFIRMED = 7; + private static class ButtonInfo { Executor executor; DialogInterface.OnClickListener listener; @@ -203,30 +205,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan } /** - * Optional: Set the text for the positive button. If not set, the positive button - * will not show. - * @param text - * @return - * @hide - */ - @NonNull public Builder setPositiveButton(@NonNull CharSequence text, - @NonNull @CallbackExecutor Executor executor, - @NonNull DialogInterface.OnClickListener listener) { - if (TextUtils.isEmpty(text)) { - throw new IllegalArgumentException("Text must be set and non-empty"); - } - if (executor == null) { - throw new IllegalArgumentException("Executor must not be null"); - } - if (listener == null) { - throw new IllegalArgumentException("Listener must not be null"); - } - mBundle.putCharSequence(KEY_POSITIVE_TEXT, text); - mPositiveButtonInfo = new ButtonInfo(executor, listener); - return this; - } - - /** * Required: Set the text for the negative button. This would typically be used as a * "Cancel" button, but may be also used to show an alternative method for authentication, * such as screen that asks for a backup password. @@ -298,17 +276,6 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan } /** - * TODO(123378871): Remove when moved. - * @return - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - @NonNull public Builder setFromConfirmDeviceCredential() { - mBundle.putBoolean(KEY_FROM_CONFIRM_DEVICE_CREDENTIAL, true); - return this; - } - - /** * Creates a {@link BiometricPrompt}. * @return a {@link BiometricPrompt} * @throws IllegalArgumentException if any of the required fields are not set. @@ -317,15 +284,19 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan final CharSequence title = mBundle.getCharSequence(KEY_TITLE); final CharSequence negative = mBundle.getCharSequence(KEY_NEGATIVE_TEXT); final boolean useDefaultTitle = mBundle.getBoolean(KEY_USE_DEFAULT_TITLE); - final boolean enableFallback = mBundle.getBoolean(KEY_ALLOW_DEVICE_CREDENTIAL); + final boolean allowCredential = mBundle.getBoolean(KEY_ALLOW_DEVICE_CREDENTIAL); + final Object authenticatorsAllowed = mBundle.get(KEY_AUTHENTICATORS_ALLOWED); if (TextUtils.isEmpty(title) && !useDefaultTitle) { throw new IllegalArgumentException("Title must be set and non-empty"); - } else if (TextUtils.isEmpty(negative) && !enableFallback) { + } else if (TextUtils.isEmpty(negative) && !allowCredential) { throw new IllegalArgumentException("Negative text must be set and non-empty"); - } else if (!TextUtils.isEmpty(negative) && enableFallback) { + } else if (!TextUtils.isEmpty(negative) && allowCredential) { throw new IllegalArgumentException("Can't have both negative button behavior" + " and device credential enabled"); + } else if (authenticatorsAllowed != null && allowCredential) { + throw new IllegalArgumentException("setAuthenticatorsAllowed and" + + " setDeviceCredentialAllowed should not be used simultaneously"); } return new BiometricPrompt(mContext, mBundle, mPositiveButtonInfo, mNegativeButtonInfo); } @@ -384,7 +355,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan @Override public void onDialogDismissed(int reason) throws RemoteException { // Check the reason and invoke OnClickListener(s) if necessary - if (reason == DISMISSED_REASON_CONFIRMED) { + if (reason == DISMISSED_REASON_BIOMETRIC_CONFIRMED) { mPositiveButtonInfo.executor.execute(() -> { mPositiveButtonInfo.listener.onClick(null, DialogInterface.BUTTON_POSITIVE); }); @@ -532,8 +503,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan public void authenticateUser(@NonNull CancellationSignal cancel, @NonNull @CallbackExecutor Executor executor, @NonNull AuthenticationCallback callback, - int userId, - IBiometricConfirmDeviceCredentialCallback confirmDeviceCredentialCallback) { + int userId) { if (cancel == null) { throw new IllegalArgumentException("Must supply a cancellation signal"); } @@ -543,8 +513,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan if (callback == null) { throw new IllegalArgumentException("Must supply a callback"); } - authenticateInternal(null /* crypto */, cancel, executor, callback, userId, - confirmDeviceCredentialCallback); + authenticateInternal(null /* crypto */, cancel, executor, callback, userId); } /** @@ -595,8 +564,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan if (mBundle.getBoolean(KEY_ALLOW_DEVICE_CREDENTIAL)) { throw new IllegalArgumentException("Device credential not supported with crypto"); } - authenticateInternal(crypto, cancel, executor, callback, mContext.getUserId(), - null /* confirmDeviceCredentialCallback */); + authenticateInternal(crypto, cancel, executor, callback, mContext.getUserId()); } /** @@ -638,8 +606,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan if (callback == null) { throw new IllegalArgumentException("Must supply a callback"); } - authenticateInternal(null /* crypto */, cancel, executor, callback, mContext.getUserId(), - null /* confirmDeviceCredentialCallback */); + authenticateInternal(null /* crypto */, cancel, executor, callback, mContext.getUserId()); } private void cancelAuthentication() { @@ -656,8 +623,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan @NonNull CancellationSignal cancel, @NonNull @CallbackExecutor Executor executor, @NonNull AuthenticationCallback callback, - int userId, - IBiometricConfirmDeviceCredentialCallback confirmDeviceCredentialCallback) { + int userId) { try { if (cancel.isCanceled()) { Log.w(TAG, "Authentication already canceled"); @@ -672,7 +638,7 @@ public class BiometricPrompt implements BiometricAuthenticator, BiometricConstan final long sessionId = crypto != null ? crypto.getOpId() : 0; if (BiometricManager.hasBiometrics(mContext)) { mService.authenticate(mToken, sessionId, userId, mBiometricServiceReceiver, - mContext.getOpPackageName(), mBundle, confirmDeviceCredentialCallback); + mContext.getOpPackageName(), mBundle); } else { mExecutor.execute(() -> { callback.onAuthenticationError(BiometricPrompt.BIOMETRIC_ERROR_HW_NOT_PRESENT, diff --git a/core/java/android/hardware/biometrics/IBiometricService.aidl b/core/java/android/hardware/biometrics/IBiometricService.aidl index f0a0b2f0235f..6a3bf38a97e1 100644 --- a/core/java/android/hardware/biometrics/IBiometricService.aidl +++ b/core/java/android/hardware/biometrics/IBiometricService.aidl @@ -17,7 +17,6 @@ package android.hardware.biometrics; import android.os.Bundle; -import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback; import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback; import android.hardware.biometrics.IBiometricServiceReceiver; @@ -31,10 +30,8 @@ import android.hardware.biometrics.IBiometricServiceReceiver; interface IBiometricService { // Requests authentication. The service choose the appropriate biometric to use, and show // the corresponding BiometricDialog. - // TODO(b/123378871): Remove callback when moved. void authenticate(IBinder token, long sessionId, int userId, - IBiometricServiceReceiver receiver, String opPackageName, in Bundle bundle, - IBiometricConfirmDeviceCredentialCallback callback); + IBiometricServiceReceiver receiver, String opPackageName, in Bundle bundle); // Cancel authentication for the given sessionId void cancelAuthentication(IBinder token, String opPackageName); @@ -57,16 +54,4 @@ interface IBiometricService { // Reset the lockout when user authenticates with strong auth (e.g. PIN, pattern or password) void resetLockout(in byte [] token); - - // TODO(b/123378871): Remove when moved. - // CDCA needs to send results to BiometricService if it was invoked using BiometricPrompt's - // setAllowDeviceCredential method, since there's no way for us to intercept onActivityResult. - // CDCA is launched from BiometricService (startActivityAsUser) instead of *ForResult. - void onConfirmDeviceCredentialSuccess(); - // TODO(b/123378871): Remove when moved. - void onConfirmDeviceCredentialError(int error, String message); - // TODO(b/123378871): Remove when moved. - // When ConfirmLock* is invoked from BiometricPrompt, it needs to register a callback so that - // it can receive the cancellation signal. - void registerCancellationCallback(IBiometricConfirmDeviceCredentialCallback callback); } diff --git a/core/java/android/hardware/biometrics/IBiometricServiceReceiverInternal.aidl b/core/java/android/hardware/biometrics/IBiometricServiceReceiverInternal.aidl index ca6114e4d842..66b6e896fc13 100644 --- a/core/java/android/hardware/biometrics/IBiometricServiceReceiverInternal.aidl +++ b/core/java/android/hardware/biometrics/IBiometricServiceReceiverInternal.aidl @@ -38,4 +38,6 @@ oneway interface IBiometricServiceReceiverInternal { void onDialogDismissed(int reason); // Notifies that the user has pressed the "try again" button on SystemUI void onTryAgainPressed(); + // Notifies that the user has pressed the "use password" button on SystemUI + void onDeviceCredentialPressed(); } diff --git a/core/java/android/hardware/usb/UsbDevice.java b/core/java/android/hardware/usb/UsbDevice.java index 43336682e45f..11f4ffb4c225 100644 --- a/core/java/android/hardware/usb/UsbDevice.java +++ b/core/java/android/hardware/usb/UsbDevice.java @@ -62,7 +62,7 @@ public class UsbDevice implements Parcelable { private final int mProtocol; private final boolean mHasAudioPlayback; private final boolean mHasAudioCapture; - + private final boolean mHasMidi; /** All interfaces on the device. Initialized on first call to getInterfaceList */ @UnsupportedAppUsage @@ -77,7 +77,7 @@ public class UsbDevice implements Parcelable { int protocol, @Nullable String manufacturerName, @Nullable String productName, @NonNull String version, @NonNull UsbConfiguration[] configurations, @NonNull IUsbSerialReader serialNumberReader, - boolean hasAudioPlayback, boolean hasAudioCapture) { + boolean hasAudioPlayback, boolean hasAudioCapture, boolean hasMidi) { mName = Preconditions.checkNotNull(name); mVendorId = vendorId; mProductId = productId; @@ -91,6 +91,7 @@ public class UsbDevice implements Parcelable { mSerialNumberReader = Preconditions.checkNotNull(serialNumberReader); mHasAudioPlayback = hasAudioPlayback; mHasAudioCapture = hasAudioCapture; + mHasMidi = hasMidi; // Make sure the binder belongs to the system if (ActivityThread.isSystem()) { @@ -230,6 +231,11 @@ public class UsbDevice implements Parcelable { return mHasAudioCapture; } + /** @hide */ + public boolean getHasMidi() { + return mHasMidi; + } + /** * Returns the {@link UsbConfiguration} at the given index. * @@ -309,6 +315,7 @@ public class UsbDevice implements Parcelable { + ",mVersion=" + mVersion + ",mSerialNumberReader=" + mSerialNumberReader + ", mHasAudioPlayback=" + mHasAudioPlayback + ", mHasAudioCapture=" + mHasAudioCapture + + ", mHasMidi=" + mHasMidi + ", mConfigurations=["); for (int i = 0; i < mConfigurations.length; i++) { builder.append("\n"); @@ -337,9 +344,11 @@ public class UsbDevice implements Parcelable { // Capabilities boolean hasAudioPlayback = in.readInt() == 1; boolean hasAudioCapture = in.readInt() == 1; + boolean hasMidi = in.readInt() == 1; + UsbDevice device = new UsbDevice(name, vendorId, productId, clasz, subClass, protocol, manufacturerName, productName, version, configurations, serialNumberReader, - hasAudioPlayback, hasAudioCapture); + hasAudioPlayback, hasAudioCapture, hasMidi); return device; } @@ -367,7 +376,8 @@ public class UsbDevice implements Parcelable { parcel.writeParcelableArray(mConfigurations, 0); parcel.writeInt(mHasAudioPlayback ? 1 : 0); parcel.writeInt(mHasAudioCapture ? 1 : 0); - } + parcel.writeInt(mHasMidi ? 1 : 0); + } public static int getDeviceId(String name) { return native_get_device_id(name); @@ -396,6 +406,7 @@ public class UsbDevice implements Parcelable { private final @NonNull UsbConfiguration[] mConfigurations; private final boolean mHasAudioPlayback; private final boolean mHasAudioCapture; + private final boolean mHasMidi; // Temporary storage for serial number. Serial number reader need to be wrapped in a // IUsbSerialReader as they might be used as PII. @@ -405,7 +416,7 @@ public class UsbDevice implements Parcelable { int protocol, @Nullable String manufacturerName, @Nullable String productName, @NonNull String version, @NonNull UsbConfiguration[] configurations, @Nullable String serialNumber, - boolean hasAudioPlayback, boolean hasAudioCapture) { + boolean hasAudioPlayback, boolean hasAudioCapture, boolean hasMidi) { mName = Preconditions.checkNotNull(name); mVendorId = vendorId; mProductId = productId; @@ -419,6 +430,7 @@ public class UsbDevice implements Parcelable { this.serialNumber = serialNumber; mHasAudioPlayback = hasAudioPlayback; mHasAudioCapture = hasAudioCapture; + mHasMidi = hasMidi; } /** @@ -431,7 +443,7 @@ public class UsbDevice implements Parcelable { public UsbDevice build(@NonNull IUsbSerialReader serialReader) { return new UsbDevice(mName, mVendorId, mProductId, mClass, mSubclass, mProtocol, mManufacturerName, mProductName, mVersion, mConfigurations, serialReader, - mHasAudioPlayback, mHasAudioCapture); + mHasAudioPlayback, mHasAudioCapture, mHasMidi); } } } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 111a8c48a46c..5c65238b3ef1 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3265,42 +3265,77 @@ public class ConnectivityManager { /** * Called when the framework connects and has declared a new network ready for use. - * This callback may be called more than once if the {@link Network} that is - * satisfying the request changes. This will always immediately be followed by a - * call to {@link #onCapabilitiesChanged(Network, NetworkCapabilities)} then by a - * call to {@link #onLinkPropertiesChanged(Network, LinkProperties)}, and a call to - * {@link #onBlockedStatusChanged(Network, boolean)}. + * + * <p>For callbacks registered with {@link #registerNetworkCallback}, multiple networks may + * be available at the same time, and onAvailable will be called for each of these as they + * appear. + * + * <p>For callbacks registered with {@link #requestNetwork} and + * {@link #registerDefaultNetworkCallback}, this means the network passed as an argument + * is the new best network for this request and is now tracked by this callback ; this + * callback will no longer receive method calls about other networks that may have been + * passed to this method previously. The previously-best network may have disconnected, or + * it may still be around and the newly-best network may simply be better. + * + * <p>Starting with {@link android.os.Build.VERSION_CODES#O}, this will always immediately + * be followed by a call to {@link #onCapabilitiesChanged(Network, NetworkCapabilities)} + * then by a call to {@link #onLinkPropertiesChanged(Network, LinkProperties)}, and a call + * to {@link #onBlockedStatusChanged(Network, boolean)}. + * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions (there is no guarantee the objects + * returned by these methods will be current). Instead, wait for a call to + * {@link #onCapabilitiesChanged(Network, NetworkCapabilities)} and + * {@link #onLinkPropertiesChanged(Network, LinkProperties)} whose arguments are guaranteed + * to be well-ordered with respect to other callbacks. * * @param network The {@link Network} of the satisfying network. */ public void onAvailable(@NonNull Network network) {} /** - * Called when the network is about to be disconnected. Often paired with an - * {@link NetworkCallback#onAvailable} call with the new replacement network - * for graceful handover. This may not be called if we have a hard loss - * (loss without warning). This may be followed by either a - * {@link NetworkCallback#onLost} call or a - * {@link NetworkCallback#onAvailable} call for this network depending - * on whether we lose or regain it. + * Called when the network is about to be lost, typically because there are no outstanding + * requests left for it. This may be paired with a {@link NetworkCallback#onAvailable} call + * with the new replacement network for graceful handover. This method is not guaranteed + * to be called before {@link NetworkCallback#onLost} is called, for example in case a + * network is suddenly disconnected. + * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions ; calling these methods while in a + * callback may return an outdated or even a null object. * - * @param network The {@link Network} that is about to be disconnected. - * @param maxMsToLive The time in ms the framework will attempt to keep the - * network connected. Note that the network may suffer a - * hard loss at any time. + * @param network The {@link Network} that is about to be lost. + * @param maxMsToLive The time in milliseconds the system intends to keep the network + * connected for graceful handover; note that the network may still + * suffer a hard loss at any time. */ public void onLosing(@NonNull Network network, int maxMsToLive) {} /** - * Called when the framework has a hard loss of the network or when the - * graceful failure ends. + * Called when a network disconnects or otherwise no longer satisfies this request or + * callback. + * + * <p>If the callback was registered with requestNetwork() or + * registerDefaultNetworkCallback(), it will only be invoked against the last network + * returned by onAvailable() when that network is lost and no other network satisfies + * the criteria of the request. + * + * <p>If the callback was registered with registerNetworkCallback() it will be called for + * each network which no longer satisfies the criteria of the callback. + * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions ; calling these methods while in a + * callback may return an outdated or even a null object. * * @param network The {@link Network} lost. */ public void onLost(@NonNull Network network) {} /** - * Called if no network is found in the timeout time specified in + * Called if no network is found within the timeout time specified in * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)} call or if the * requested network request cannot be fulfilled (whether or not a timeout was * specified). When this callback is invoked the associated @@ -3310,8 +3345,15 @@ public class ConnectivityManager { public void onUnavailable() {} /** - * Called when the network the framework connected to for this request - * changes capabilities but still satisfies the stated need. + * Called when the network corresponding to this request changes capabilities but still + * satisfies the requested criteria. + * + * <p>Starting with {@link android.os.Build.VERSION_CODES#O} this method is guaranteed + * to be called immediately after {@link #onAvailable}. + * + * <p>Do NOT call {@link #getLinkProperties(Network)} or other synchronous + * ConnectivityManager methods in this callback as this is prone to race conditions : + * calling these methods while in a callback may return an outdated or even a null object. * * @param network The {@link Network} whose capabilities have changed. * @param networkCapabilities The new {@link android.net.NetworkCapabilities} for this @@ -3321,8 +3363,14 @@ public class ConnectivityManager { @NonNull NetworkCapabilities networkCapabilities) {} /** - * Called when the network the framework connected to for this request - * changes {@link LinkProperties}. + * Called when the network corresponding to this request changes {@link LinkProperties}. + * + * <p>Starting with {@link android.os.Build.VERSION_CODES#O} this method is guaranteed + * to be called immediately after {@link #onAvailable}. + * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or other synchronous + * ConnectivityManager methods in this callback as this is prone to race conditions : + * calling these methods while in a callback may return an outdated or even a null object. * * @param network The {@link Network} whose link properties have changed. * @param linkProperties The new {@link LinkProperties} for this network. @@ -3331,12 +3379,20 @@ public class ConnectivityManager { @NonNull LinkProperties linkProperties) {} /** - * Called when the network the framework connected to for this request - * goes into {@link NetworkInfo.State#SUSPENDED}. - * This generally means that while the TCP connections are still live, - * temporarily network data fails to transfer. Specifically this is used - * on cellular networks to mask temporary outages when driving through - * a tunnel, etc. + * Called when the network the framework connected to for this request suspends data + * transmission temporarily. + * + * <p>This generally means that while the TCP connections are still live temporarily + * network data fails to transfer. To give a specific example, this is used on cellular + * networks to mask temporary outages when driving through a tunnel, etc. In general this + * means read operations on sockets on this network will block once the buffers are + * drained, and write operations will block once the buffers are full. + * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions (there is no guarantee the objects + * returned by these methods will be current). + * * @hide */ public void onNetworkSuspended(@NonNull Network network) {} @@ -3345,6 +3401,12 @@ public class ConnectivityManager { * Called when the network the framework connected to for this request * returns from a {@link NetworkInfo.State#SUSPENDED} state. This should always be * preceded by a matching {@link NetworkCallback#onNetworkSuspended} call. + + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions : calling these methods while in a + * callback may return an outdated or even a null object. + * * @hide */ public void onNetworkResumed(@NonNull Network network) {} @@ -3352,6 +3414,11 @@ public class ConnectivityManager { /** * Called when access to the specified network is blocked or unblocked. * + * <p>Do NOT call {@link #getNetworkCapabilities(Network)} or + * {@link #getLinkProperties(Network)} or other synchronous ConnectivityManager methods in + * this callback as this is prone to race conditions : calling these methods while in a + * callback may return an outdated or even a null object. + * * @param network The {@link Network} whose blocked status has changed. * @param blocked The blocked status of this {@link Network}. */ @@ -3588,13 +3655,51 @@ public class ConnectivityManager { /** * Request a network to satisfy a set of {@link android.net.NetworkCapabilities}. * - * This {@link NetworkRequest} will live until released via - * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A - * version of the method which takes a timeout is - * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)}. - * Status of the request can be followed by listening to the various - * callbacks described in {@link NetworkCallback}. The {@link Network} - * can be used to direct traffic to the network. + * <p>This method will attempt to find the best network that matches the passed + * {@link NetworkRequest}, and to bring up one that does if none currently satisfies the + * criteria. The platform will evaluate which network is the best at its own discretion. + * Throughput, latency, cost per byte, policy, user preference and other considerations + * may be factored in the decision of what is considered the best network. + * + * <p>As long as this request is outstanding, the platform will try to maintain the best network + * matching this request, while always attempting to match the request to a better network if + * possible. If a better match is found, the platform will switch this request to the now-best + * network and inform the app of the newly best network by invoking + * {@link NetworkCallback#onAvailable(Network)} on the provided callback. Note that the platform + * will not try to maintain any other network than the best one currently matching the request: + * a network not matching any network request may be disconnected at any time. + * + * <p>For example, an application could use this method to obtain a connected cellular network + * even if the device currently has a data connection over Ethernet. This may cause the cellular + * radio to consume additional power. Or, an application could inform the system that it wants + * a network supporting sending MMSes and have the system let it know about the currently best + * MMS-supporting network through the provided {@link NetworkCallback}. + * + * <p>The status of the request can be followed by listening to the various callbacks described + * in {@link NetworkCallback}. The {@link Network} object passed to the callback methods can be + * used to direct traffic to the network (although accessing some networks may be subject to + * holding specific permissions). Callers will learn about the specific characteristics of the + * network through + * {@link NetworkCallback#onCapabilitiesChanged(Network, NetworkCapabilities)} and + * {@link NetworkCallback#onLinkPropertiesChanged(Network, LinkProperties)}. The methods of the + * provided {@link NetworkCallback} will only be invoked due to changes in the best network + * matching the request at any given time; therefore when a better network matching the request + * becomes available, the {@link NetworkCallback#onAvailable(Network)} method is called + * with the new network after which no further updates are given about the previously-best + * network, unless it becomes the best again at some later time. All callbacks are invoked + * in order on the same thread, which by default is a thread created by the framework running + * in the app. + * {@see #requestNetwork(NetworkRequest, NetworkCallback, Handler)} to change where the + * callbacks are invoked. + * + * <p>This{@link NetworkRequest} will live until released via + * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits, at + * which point the system may let go of the network at any time. + * + * <p>A version of this method which takes a timeout is + * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)}, that an app can use to only + * wait for a limited amount of time for the network to become unavailable. + * * <p>It is presently unsupported to request a network with mutable * {@link NetworkCapabilities} such as * {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED} or @@ -3602,7 +3707,7 @@ public class ConnectivityManager { * as these {@code NetworkCapabilities} represent states that a particular * network may never attain, and whether a network will attain these states * is unknown prior to bringing up the network so the framework does not - * know how to go about satisfing a request with these capabilities. + * know how to go about satisfying a request with these capabilities. * * <p>This method requires the caller to hold either the * {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission @@ -3625,34 +3730,17 @@ public class ConnectivityManager { /** * Request a network to satisfy a set of {@link android.net.NetworkCapabilities}. * - * This {@link NetworkRequest} will live until released via - * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A - * version of the method which takes a timeout is - * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)}. - * Status of the request can be followed by listening to the various - * callbacks described in {@link NetworkCallback}. The {@link Network} - * can be used to direct traffic to the network. - * <p>It is presently unsupported to request a network with mutable - * {@link NetworkCapabilities} such as - * {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED} or - * {@link NetworkCapabilities#NET_CAPABILITY_CAPTIVE_PORTAL} - * as these {@code NetworkCapabilities} represent states that a particular - * network may never attain, and whether a network will attain these states - * is unknown prior to bringing up the network so the framework does not - * know how to go about satisfying a request with these capabilities. + * This method behaves identically to {@link #requestNetwork(NetworkRequest, NetworkCallback)} + * but runs all the callbacks on the passed Handler. * - * <p>This method requires the caller to hold either the - * {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission - * or the ability to modify system settings as determined by - * {@link android.provider.Settings.System#canWrite}.</p> + * <p>This method has the same permission requirements as + * {@link #requestNetwork(NetworkRequest, NetworkCallback)} and throws the same exceptions in + * the same conditions. * * @param request {@link NetworkRequest} describing this request. * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note * the callback must not be shared - it uniquely specifies this request. * @param handler {@link Handler} to specify the thread upon which the callback will be invoked. - * @throws IllegalArgumentException if {@code request} contains invalid network capabilities. - * @throws SecurityException if missing the appropriate permissions. - * @throws RuntimeException if request limit per UID is exceeded. */ public void requestNetwork(@NonNull NetworkRequest request, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) { @@ -3677,10 +3765,9 @@ public class ConnectivityManager { * timeout) - {@link #registerNetworkCallback(NetworkRequest, NetworkCallback)} is provided * for that purpose. Calling this method will attempt to bring up the requested network. * - * <p>This method requires the caller to hold either the - * {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission - * or the ability to modify system settings as determined by - * {@link android.provider.Settings.System#canWrite}.</p> + * <p>This method has the same permission requirements as + * {@link #requestNetwork(NetworkRequest, NetworkCallback)} and throws the same exceptions in + * the same conditions. * * @param request {@link NetworkRequest} describing this request. * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note @@ -3688,9 +3775,6 @@ public class ConnectivityManager { * @param timeoutMs The time in milliseconds to attempt looking for a suitable network * before {@link NetworkCallback#onUnavailable()} is called. The timeout must * be a positive value (i.e. >0). - * @throws IllegalArgumentException if {@code request} contains invalid network capabilities. - * @throws SecurityException if missing the appropriate permissions. - * @throws RuntimeException if request limit per UID is exceeded. */ public void requestNetwork(@NonNull NetworkRequest request, @NonNull NetworkCallback networkCallback, int timeoutMs) { @@ -3703,21 +3787,13 @@ public class ConnectivityManager { * Request a network to satisfy a set of {@link android.net.NetworkCapabilities}, limited * by a timeout. * - * This function behaves identically to the version without timeout, but if a suitable - * network is not found within the given time (in milliseconds) the - * {@link NetworkCallback#onUnavailable} callback is called. The request can still be - * released normally by calling {@link #unregisterNetworkCallback(NetworkCallback)} but does - * not have to be released if timed-out (it is automatically released). Unregistering a - * request that timed out is not an error. + * This method behaves identically to + * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)} but runs all the callbacks + * on the passed Handler. * - * <p>Do not use this method to poll for the existence of specific networks (e.g. with a small - * timeout) - {@link #registerNetworkCallback(NetworkRequest, NetworkCallback)} is provided - * for that purpose. Calling this method will attempt to bring up the requested network. - * - * <p>This method requires the caller to hold either the - * {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission - * or the ability to modify system settings as determined by - * {@link android.provider.Settings.System#canWrite}.</p> + * <p>This method has the same permission requirements as + * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)} and throws the same exceptions + * in the same conditions. * * @param request {@link NetworkRequest} describing this request. * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note @@ -3725,9 +3801,6 @@ public class ConnectivityManager { * @param handler {@link Handler} to specify the thread upon which the callback will be invoked. * @param timeoutMs The time in milliseconds to attempt looking for a suitable network * before {@link NetworkCallback#onUnavailable} is called. - * @throws IllegalArgumentException if {@code request} contains invalid network capabilities. - * @throws SecurityException if missing the appropriate permissions. - * @throws RuntimeException if request limit per UID is exceeded. */ public void requestNetwork(@NonNull NetworkRequest request, @NonNull NetworkCallback networkCallback, @NonNull Handler handler, int timeoutMs) { diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index d3f48acdd40e..3ec0aeac472b 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -68,6 +68,7 @@ public final class LinkProperties implements Parcelable { // in the format "rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max" private String mTcpBufferSizes; private IpPrefix mNat64Prefix; + private boolean mWakeOnLanSupported; private static final int MIN_MTU = 68; private static final int MIN_MTU_V6 = 1280; @@ -193,6 +194,7 @@ public final class LinkProperties implements Parcelable { setMtu(source.mMtu); mTcpBufferSizes = source.mTcpBufferSizes; mNat64Prefix = source.mNat64Prefix; + mWakeOnLanSupported = source.mWakeOnLanSupported; } } @@ -852,6 +854,7 @@ public final class LinkProperties implements Parcelable { mMtu = 0; mTcpBufferSizes = null; mNat64Prefix = null; + mWakeOnLanSupported = false; } /** @@ -913,6 +916,10 @@ public final class LinkProperties implements Parcelable { resultJoiner.add("MTU:"); resultJoiner.add(Integer.toString(mMtu)); + if (mWakeOnLanSupported) { + resultJoiner.add("WakeOnLanSupported: true"); + } + if (mTcpBufferSizes != null) { resultJoiner.add("TcpBufferSizes:"); resultJoiner.add(mTcpBufferSizes); @@ -1425,6 +1432,37 @@ public final class LinkProperties implements Parcelable { } /** + * Compares this {@code LinkProperties} WakeOnLan supported against the target. + * + * @param target LinkProperties to compare. + * @return {@code true} if both are identical, {@code false} otherwise. + * @hide + */ + public boolean isIdenticalWakeOnLan(LinkProperties target) { + return isWakeOnLanSupported() == target.isWakeOnLanSupported(); + } + + /** + * Set whether the network interface supports WakeOnLAN + * + * @param supported WakeOnLAN supported value + * + * @hide + */ + public void setWakeOnLanSupported(boolean supported) { + mWakeOnLanSupported = supported; + } + + /** + * Returns whether the network interface supports WakeOnLAN + * + * @return {@code true} if interface supports WakeOnLAN, {@code false} otherwise. + */ + public boolean isWakeOnLanSupported() { + return mWakeOnLanSupported; + } + + /** * Compares this {@code LinkProperties} instance against the target * LinkProperties in {@code obj}. Two LinkPropertieses are equal if * all their fields are equal in values. @@ -1461,7 +1499,8 @@ public final class LinkProperties implements Parcelable { && isIdenticalStackedLinks(target) && isIdenticalMtu(target) && isIdenticalTcpBufferSizes(target) - && isIdenticalNat64Prefix(target); + && isIdenticalNat64Prefix(target) + && isIdenticalWakeOnLan(target); } /** @@ -1577,7 +1616,8 @@ public final class LinkProperties implements Parcelable { + (mUsePrivateDns ? 57 : 0) + mPcscfs.size() * 67 + ((null == mPrivateDnsServerName) ? 0 : mPrivateDnsServerName.hashCode()) - + Objects.hash(mNat64Prefix); + + Objects.hash(mNat64Prefix) + + (mWakeOnLanSupported ? 71 : 0); } /** @@ -1622,6 +1662,8 @@ public final class LinkProperties implements Parcelable { ArrayList<LinkProperties> stackedLinks = new ArrayList<>(mStackedLinks.values()); dest.writeList(stackedLinks); + + dest.writeBoolean(mWakeOnLanSupported); } /** @@ -1677,6 +1719,7 @@ public final class LinkProperties implements Parcelable { for (LinkProperties stackedLink: stackedLinks) { netProp.addStackedLink(stackedLink); } + netProp.setWakeOnLanSupported(in.readBoolean()); return netProp; } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index b3125d89a1a7..6a709b56f35a 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -243,7 +243,8 @@ public class Build { public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", ""); /** - * The user-visible security patch level. + * The user-visible security patch level. This value represents the date when the device + * most recently applied a security patch. */ public static final String SECURITY_PATCH = SystemProperties.get( "ro.build.version.security_patch", ""); diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 7a70e93b69d5..947b0a1efebd 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -69,6 +69,8 @@ public class GraphicsEnvironment { private static final String METADATA_DRIVER_BUILD_TIME = "com.android.gamedriver.build_time"; private static final String METADATA_DEVELOPER_DRIVER_ENABLE = "com.android.graphics.developerdriver.enable"; + private static final String METADATA_INJECT_LAYERS_ENABLE = + "com.android.graphics.injectLayers.enable"; private static final String ANGLE_RULES_FILE = "a4a_rules.json"; private static final String ANGLE_TEMP_RULES = "debug.angle.rules"; private static final String ACTION_ANGLE_FOR_ANDROID = "android.app.action.ANGLE_FOR_ANDROID"; @@ -100,14 +102,16 @@ public class GraphicsEnvironment { public void setup(Context context, Bundle coreSettings) { final PackageManager pm = context.getPackageManager(); final String packageName = context.getPackageName(); + final ApplicationInfo appInfoWithMetaData = + getAppInfoWithMetadata(context, pm, packageName); Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setupGpuLayers"); - setupGpuLayers(context, coreSettings, pm, packageName); + setupGpuLayers(context, coreSettings, pm, packageName, appInfoWithMetaData); Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS); Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setupAngle"); setupAngle(context, coreSettings, pm, packageName); Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS); Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "chooseDriver"); - if (!chooseDriver(context, coreSettings, pm, packageName)) { + if (!chooseDriver(context, coreSettings, pm, packageName, appInfoWithMetaData)) { setGpuStats(SYSTEM_DRIVER_NAME, SYSTEM_DRIVER_VERSION_NAME, SYSTEM_DRIVER_VERSION_CODE, SystemProperties.getLong(PROPERTY_GFX_DRIVER_BUILD_TIME, 0), packageName, getVulkanVersion(pm)); @@ -180,6 +184,14 @@ public class GraphicsEnvironment { } /** + * Check whether application is has set the manifest metadata for layer injection. + */ + private static boolean canInjectLayers(ApplicationInfo ai) { + return (ai.metaData != null && ai.metaData.getBoolean(METADATA_INJECT_LAYERS_ENABLE) + && setInjectLayersPrSetDumpable()); + } + + /** * Store the layer paths available to the loader. */ public void setLayerPaths(ClassLoader classLoader, @@ -225,15 +237,16 @@ public class GraphicsEnvironment { * If debuggable, check for additional debug settings */ private void setupGpuLayers( - Context context, Bundle coreSettings, PackageManager pm, String packageName) { + Context context, Bundle coreSettings, PackageManager pm, String packageName, + ApplicationInfo ai) { String layerPaths = ""; // Only enable additional debug functionality if the following conditions are met: - // 1. App is debuggable or device is rooted + // 1. App is debuggable or device is rooted or layer injection metadata flag is true // 2. ENABLE_GPU_DEBUG_LAYERS is true // 3. Package name is equal to GPU_DEBUG_APP - if (isDebuggable(context) || (getCanLoadSystemLibraries() == 1)) { + if (isDebuggable(context) || (getCanLoadSystemLibraries() == 1) || canInjectLayers(ai)) { final int enable = coreSettings.getInt(Settings.Global.ENABLE_GPU_DEBUG_LAYERS, 0); @@ -343,6 +356,20 @@ public class GraphicsEnvironment { return -1; } + private static ApplicationInfo getAppInfoWithMetadata(Context context, + PackageManager pm, String packageName) { + ApplicationInfo ai; + try { + // Get the ApplicationInfo from PackageManager so that metadata fields present. + ai = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA); + } catch (PackageManager.NameNotFoundException e) { + // Unlikely to fail for applications, but in case of failure, fall back to use the + // ApplicationInfo from context directly. + ai = context.getApplicationInfo(); + } + return ai; + } + private static String getDriverForPkg(Context context, Bundle bundle, String packageName) { final String allUseAngle; if (bundle != null) { @@ -693,8 +720,7 @@ public class GraphicsEnvironment { /** * Return the driver package name to use. Return null for system driver. */ - private static String chooseDriverInternal( - Context context, Bundle coreSettings, PackageManager pm, String packageName) { + private static String chooseDriverInternal(Bundle coreSettings, ApplicationInfo ai) { final String gameDriver = SystemProperties.get(PROPERTY_GFX_DRIVER); final boolean hasGameDriver = gameDriver != null && !gameDriver.isEmpty(); @@ -709,15 +735,6 @@ public class GraphicsEnvironment { // To minimize risk of driver updates crippling the device beyond user repair, never use an // updated driver for privileged or non-updated system apps. Presumably pre-installed apps // were tested thoroughly with the pre-installed driver. - ApplicationInfo ai; - try { - // Get the ApplicationInfo from PackageManager so that metadata fields present. - ai = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA); - } catch (PackageManager.NameNotFoundException e) { - // Unlikely to fail for applications, but in case of failure, fall back to use the - // ApplicationInfo from context directly. - ai = context.getApplicationInfo(); - } if (ai.isPrivilegedApp() || (ai.isSystemApp() && !ai.isUpdatedSystemApp())) { if (DEBUG) Log.v(TAG, "Ignoring driver package for privileged/non-updated system app."); return null; @@ -797,9 +814,9 @@ public class GraphicsEnvironment { * Choose whether the current process should use the builtin or an updated driver. */ private static boolean chooseDriver( - Context context, Bundle coreSettings, PackageManager pm, String packageName) { - final String driverPackageName = chooseDriverInternal(context, coreSettings, pm, - packageName); + Context context, Bundle coreSettings, PackageManager pm, String packageName, + ApplicationInfo ai) { + final String driverPackageName = chooseDriverInternal(coreSettings, ai); if (driverPackageName == null) { return false; } @@ -911,4 +928,5 @@ public class GraphicsEnvironment { private static native void setAngleInfo(String path, String appPackage, String devOptIn, FileDescriptor rulesFd, long rulesOffset, long rulesLength); private static native boolean getShouldUseAngle(String packageName); + private static native boolean setInjectLayersPrSetDumpable(); } diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java index cfb582ef442e..5e8929c6c999 100644 --- a/core/java/android/os/HwParcel.java +++ b/core/java/android/os/HwParcel.java @@ -23,6 +23,8 @@ import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; +import dalvik.annotation.optimization.FastNative; + import libcore.util.NativeAllocationRegistry; import java.lang.annotation.Retention; @@ -72,46 +74,54 @@ public class HwParcel { /** * Writes an interface token into the parcel used to verify that - * a transaction has made it to the write type of interface. + * a transaction has made it to the right type of interface. * * @param interfaceName fully qualified name of interface message * is being sent to. */ + @FastNative public native final void writeInterfaceToken(String interfaceName); /** * Writes a boolean value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeBool(boolean val); /** * Writes a byte value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeInt8(byte val); /** * Writes a short value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeInt16(short val); /** * Writes a int value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeInt32(int val); /** * Writes a long value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeInt64(long val); /** * Writes a float value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeFloat(float val); /** * Writes a double value to the end of the parcel. * @param val to write */ + @FastNative public native final void writeDouble(double val); /** * Writes a String value to the end of the parcel. @@ -120,6 +130,7 @@ public class HwParcel { * * @param val to write */ + @FastNative public native final void writeString(String val); /** * Writes a native handle (without duplicating the underlying @@ -127,42 +138,50 @@ public class HwParcel { * * @param val to write */ + @FastNative public native final void writeNativeHandle(@Nullable NativeHandle val); /** * Writes an array of boolean values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeBoolVector(boolean[] val); /** * Writes an array of byte values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeInt8Vector(byte[] val); /** * Writes an array of short values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeInt16Vector(short[] val); /** * Writes an array of int values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeInt32Vector(int[] val); /** * Writes an array of long values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeInt64Vector(long[] val); /** * Writes an array of float values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeFloatVector(float[] val); /** * Writes an array of double values to the end of the parcel. * @param val to write */ + @FastNative private native final void writeDoubleVector(double[] val); /** * Writes an array of String values to the end of the parcel. @@ -171,6 +190,7 @@ public class HwParcel { * * @param val to write */ + @FastNative private native final void writeStringVector(String[] val); /** * Writes an array of native handles to the end of the parcel. @@ -179,6 +199,7 @@ public class HwParcel { * * @param val array of {@link NativeHandle} objects to write */ + @FastNative private native final void writeNativeHandleVector(NativeHandle[] val); /** @@ -299,6 +320,7 @@ public class HwParcel { * Write a hwbinder object to the end of the parcel. * @param binder value to write */ + @FastNative public native final void writeStrongBinder(IHwBinder binder); /** @@ -314,48 +336,56 @@ public class HwParcel { * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final boolean readBool(); /** * Reads a byte value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final byte readInt8(); /** * Reads a short value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final short readInt16(); /** * Reads a int value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final int readInt32(); /** * Reads a long value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final long readInt64(); /** * Reads a float value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final float readFloat(); /** * Reads a double value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final double readDouble(); /** * Reads a String value from the current location in the parcel. * @return value parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final String readString(); /** * Reads a native handle (without duplicating the underlying file @@ -366,6 +396,7 @@ public class HwParcel { * @return a {@link NativeHandle} instance parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final @Nullable NativeHandle readNativeHandle(); /** * Reads an embedded native handle (without duplicating the underlying @@ -379,6 +410,7 @@ public class HwParcel { * @return a {@link NativeHandle} instance parsed from the parcel * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final @Nullable NativeHandle readEmbeddedNativeHandle( long parentHandle, long offset); @@ -387,54 +419,63 @@ public class HwParcel { * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final boolean[] readBoolVectorAsArray(); /** * Reads an array of byte values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final byte[] readInt8VectorAsArray(); /** * Reads an array of short values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final short[] readInt16VectorAsArray(); /** * Reads an array of int values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final int[] readInt32VectorAsArray(); /** * Reads an array of long values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final long[] readInt64VectorAsArray(); /** * Reads an array of float values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final float[] readFloatVectorAsArray(); /** * Reads an array of double values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final double[] readDoubleVectorAsArray(); /** * Reads an array of String values from the parcel. * @return array of parsed values * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final String[] readStringVectorAsArray(); /** * Reads an array of native handles from the parcel. * @return array of {@link NativeHandle} objects * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative private native final NativeHandle[] readNativeHandleAsArray(); /** @@ -537,6 +578,7 @@ public class HwParcel { * @return binder object read from parcel or null if no binder can be read * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final IHwBinder readStrongBinder(); /** @@ -544,6 +586,7 @@ public class HwParcel { * @return blob of size expectedSize * @throws IllegalArgumentException if the parcel has no more data */ + @FastNative public native final HwBlob readBuffer(long expectedSize); /** @@ -559,6 +602,7 @@ public class HwParcel { * @throws NullPointerException if the transaction specified the blob to be null * but nullable is false */ + @FastNative public native final HwBlob readEmbeddedBuffer( long expectedSize, long parentHandle, long offset, boolean nullable); @@ -567,26 +611,31 @@ public class HwParcel { * Write a buffer into the transaction. * @param blob blob to write into the parcel. */ + @FastNative public native final void writeBuffer(HwBlob blob); /** * Write a status value into the blob. * @param status value to write */ + @FastNative public native final void writeStatus(int status); /** * @throws IllegalArgumentException if a success vaue cannot be read * @throws RemoteException if success value indicates a transaction error */ + @FastNative public native final void verifySuccess(); /** * Should be called to reduce memory pressure when this object no longer needs * to be written to. */ + @FastNative public native final void releaseTemporaryStorage(); /** * Should be called when object is no longer needed to reduce possible memory * pressure if the Java GC does not get to this object in time. */ + @FastNative public native final void release(); /** @@ -597,6 +646,7 @@ public class HwParcel { // Returns address of the "freeFunction". private static native final long native_init(); + @FastNative private native final void native_setup(boolean allocate); static { diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index b568f157c01d..e371df001151 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -1,2 +1,4 @@ # Zygote per-file ZygoteProcess.java = chriswailes@google.com, ngeoffray@google.com, sehr@google.com, narayan@google.com, maco@google.com + +per-file GraphicsEnvironment.java = chrisforbes@google.com, cnorthrop@google.com, lpy@google.com, timvp@google.com, zzyiwei@google.com diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 50487e9e7a99..783ab44bc4e2 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -305,8 +305,11 @@ public final class Parcel { private static native void nativeWriteFloat(long nativePtr, float val); @FastNative private static native void nativeWriteDouble(long nativePtr, double val); + @FastNative static native void nativeWriteString(long nativePtr, String val); + @FastNative private static native void nativeWriteStrongBinder(long nativePtr, IBinder val); + @FastNative private static native long nativeWriteFileDescriptor(long nativePtr, FileDescriptor val); private static native byte[] nativeCreateByteArray(long nativePtr); @@ -320,8 +323,11 @@ public final class Parcel { private static native float nativeReadFloat(long nativePtr); @CriticalNative private static native double nativeReadDouble(long nativePtr); + @FastNative static native String nativeReadString(long nativePtr); + @FastNative private static native IBinder nativeReadStrongBinder(long nativePtr); + @FastNative private static native FileDescriptor nativeReadFileDescriptor(long nativePtr); private static native long nativeCreate(); diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 76e728a11e83..43b9c6728868 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -420,10 +420,9 @@ public class Process { * Background thread group - All threads in * this group are scheduled with a reduced share of the CPU. * Value is same as constant SP_BACKGROUND of enum SchedPolicy. - * FIXME rename to THREAD_GROUP_BACKGROUND. * @hide */ - public static final int THREAD_GROUP_BG_NONINTERACTIVE = 0; + public static final int THREAD_GROUP_BACKGROUND = 0; /** * Foreground thread group - All threads in @@ -809,7 +808,7 @@ public class Process { * * group == THREAD_GROUP_DEFAULT means to move all non-background priority * threads to the foreground scheduling group, but to leave background - * priority threads alone. group == THREAD_GROUP_BG_NONINTERACTIVE moves all + * priority threads alone. group == THREAD_GROUP_BACKGROUND moves all * threads, regardless of priority, to the background scheduling group. * group == THREAD_GROUP_FOREGROUND is not allowed. * diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index dd5e20e39904..a9ddffe7d55c 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -22,8 +22,6 @@ import android.os.IUpdateEngine; import android.os.IUpdateEngineCallback; import android.os.RemoteException; -import java.io.FileDescriptor; - /** * UpdateEngine handles calls to the update engine which takes care of A/B OTA * updates. It wraps up the update engine Binder APIs and exposes them as @@ -315,16 +313,16 @@ public class UpdateEngine { } /** - * Applies the payload passed as file descriptor {@code fd} instead of + * Applies the payload passed as ParcelFileDescriptor {@code pfd} instead of * using the {@code file://} scheme. * * <p>See {@link #applyPayload(String)} for {@code offset}, {@code size} and * {@code headerKeyValuePairs} parameters. */ - public void applyPayload(@NonNull FileDescriptor fd, long offset, long size, + public void applyPayload(@NonNull ParcelFileDescriptor pfd, long offset, long size, @NonNull String[] headerKeyValuePairs) { try { - mUpdateEngine.applyPayloadFd(fd, offset, size, headerKeyValuePairs); + mUpdateEngine.applyPayloadFd(pfd, offset, size, headerKeyValuePairs); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 0754dc78a629..3558fcd24993 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -39,6 +39,7 @@ public final class UserHandle implements Parcelable { /** @hide A user id to indicate all users on the device */ @UnsupportedAppUsage + @TestApi public static final @UserIdInt int USER_ALL = -1; /** @hide A user handle to indicate all users on the device */ @@ -69,8 +70,11 @@ public final class UserHandle implements Parcelable { /** @hide An undefined user id */ @UnsupportedAppUsage + @TestApi public static final @UserIdInt int USER_NULL = -10000; + private static final @NonNull UserHandle NULL = new UserHandle(USER_NULL); + /** * @hide A user id constant to indicate the "owner" user of the device * @deprecated Consider using either {@link UserHandle#USER_SYSTEM} constant or @@ -91,6 +95,7 @@ public final class UserHandle implements Parcelable { /** @hide A user id constant to indicate the "system" user of the device */ @UnsupportedAppUsage + @TestApi public static final @UserIdInt int USER_SYSTEM = 0; /** @hide A user serial constant to indicate the "system" user of the device */ @@ -110,6 +115,27 @@ public final class UserHandle implements Parcelable { public static final boolean MU_ENABLED = true; /** @hide */ + @TestApi + public static final int MIN_SECONDARY_USER_ID = 10; + + /** + * Arbitrary user handle cache size. We use the cache even when {@link #MU_ENABLED} is false + * anyway, so we can always assume in CTS that UserHandle.of(10) returns a cached instance + * even on non-multiuser devices. + */ + private static final int NUM_CACHED_USERS = 4; + + private static final UserHandle[] CACHED_USER_INFOS = new UserHandle[NUM_CACHED_USERS]; + + static { + // Not lazily initializing the cache, so that we can share them across processes. + // (We'll create them in zygote.) + for (int i = 0; i < CACHED_USER_INFOS.length; i++) { + CACHED_USER_INFOS[i] = new UserHandle(MIN_SECONDARY_USER_ID + i); + } + } + + /** @hide */ @UnsupportedAppUsage public static final int ERR_GID = -1; /** @hide */ @@ -209,6 +235,7 @@ public final class UserHandle implements Parcelable { * @hide */ @UnsupportedAppUsage + @TestApi public static @UserIdInt int getUserId(int uid) { if (MU_ENABLED) { return uid / PER_USER_RANGE; @@ -229,9 +256,31 @@ public final class UserHandle implements Parcelable { } /** @hide */ + @TestApi @SystemApi public static UserHandle of(@UserIdInt int userId) { - return userId == USER_SYSTEM ? SYSTEM : new UserHandle(userId); + if (userId == USER_SYSTEM) { + return SYSTEM; // Most common. + } + // These are sequential; so use a switch. Maybe they'll be optimized to a table lookup. + switch (userId) { + case USER_ALL: + return ALL; + + case USER_CURRENT: + return CURRENT; + + case USER_CURRENT_OR_SELF: + return CURRENT_OR_SELF; + } + if (userId >= MIN_SECONDARY_USER_ID + && userId < (MIN_SECONDARY_USER_ID + CACHED_USER_INFOS.length)) { + return CACHED_USER_INFOS[userId - MIN_SECONDARY_USER_ID]; + } + if (userId == USER_NULL) { // Not common. + return NULL; + } + return new UserHandle(userId); } /** @@ -239,6 +288,7 @@ public final class UserHandle implements Parcelable { * @hide */ @UnsupportedAppUsage + @TestApi public static int getUid(@UserIdInt int userId, @AppIdInt int appId) { if (MU_ENABLED) { return userId * PER_USER_RANGE + (appId % PER_USER_RANGE); @@ -404,6 +454,7 @@ public final class UserHandle implements Parcelable { * @hide */ @SystemApi + @TestApi public static @UserIdInt int myUserId() { return getUserId(Process.myUid()); } @@ -513,7 +564,9 @@ public final class UserHandle implements Parcelable { public static final @android.annotation.NonNull Parcelable.Creator<UserHandle> CREATOR = new Parcelable.Creator<UserHandle>() { public UserHandle createFromParcel(Parcel in) { - return new UserHandle(in); + // Try to avoid allocation; use of() here. Keep this and the constructor below + // in sync. + return UserHandle.of(in.readInt()); } public UserHandle[] newArray(int size) { @@ -532,6 +585,6 @@ public final class UserHandle implements Parcelable { * positioned at the location in the buffer where it was written. */ public UserHandle(Parcel in) { - mHandle = in.readInt(); + mHandle = in.readInt(); // Keep this and createFromParcel() in sync. } } diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index fd1381a36f00..e456c8a42e19 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -403,9 +403,37 @@ public final class DeviceConfig { @TestApi @RequiresPermission(READ_DEVICE_CONFIG) public static String getProperty(@NonNull String namespace, @NonNull String name) { + // Fetch all properties for the namespace at once and cache them in the local process, so we + // incur the cost of the IPC less often. Lookups happen much more frequently than updates, + // and we want to optimize the former. + return getProperties(namespace, name).getString(name, null); + } + + /** + * Look up the values of multiple properties for a particular namespace. The lookup is atomic, + * such that the values of these properties cannot change between the time when the first is + * fetched and the time when the last is fetched. + * + * TODO: reference setProperties when it is added. + * + * @param namespace The namespace containing the properties to look up. + * @param names The names of properties to look up, or empty to fetch all properties for the + * given namespace. + * @return {@link Properties} object containing the requested properties. This reflects the + * state of these properties at the time of the lookup, and is not updated to reflect any + * future changes. The keyset of this Properties object will contain only the intersection + * of properties already set and properties requested via the names parameter. Properties + * that are already set but were not requested will not be contained here. Properties that + * are not set, but were requested will not be contained here either. + * @hide + */ + @SystemApi + @NonNull + @RequiresPermission(READ_DEVICE_CONFIG) + public static Properties getProperties(@NonNull String namespace, @NonNull String ... names) { ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); - String compositeName = createCompositeName(namespace, name); - return Settings.Config.getString(contentResolver, compositeName); + return new Properties(namespace, + Settings.Config.getStrings(contentResolver, namespace, Arrays.asList(names))); } /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3c26df3c560b..457dcc0ea42c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -84,8 +84,10 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -2248,7 +2250,7 @@ public final class Settings { private static final String NAME_EQ_PLACEHOLDER = "name=?"; // Must synchronize on 'this' to access mValues and mValuesVersion. - private final HashMap<String, String> mValues = new HashMap<>(); + private final ArrayMap<String, String> mValues = new ArrayMap<>(); private final Uri mUri; @UnsupportedAppUsage @@ -2258,15 +2260,22 @@ public final class Settings { // for the fast path of retrieving settings. private final String mCallGetCommand; private final String mCallSetCommand; + private final String mCallListCommand; @GuardedBy("this") private GenerationTracker mGenerationTracker; public NameValueCache(Uri uri, String getCommand, String setCommand, ContentProviderHolder providerHolder) { + this(uri, getCommand, setCommand, null, providerHolder); + } + + NameValueCache(Uri uri, String getCommand, String setCommand, String listCommand, + ContentProviderHolder providerHolder) { mUri = uri; mCallGetCommand = getCommand; mCallSetCommand = setCommand; + mCallListCommand = listCommand; mProviderHolder = providerHolder; } @@ -2448,8 +2457,8 @@ public final class Settings { String value = c.moveToNext() ? c.getString(0) : null; synchronized (NameValueCache.this) { - if(mGenerationTracker != null && - currentGeneration == mGenerationTracker.getCurrentGeneration()) { + if (mGenerationTracker != null + && currentGeneration == mGenerationTracker.getCurrentGeneration()) { mValues.put(name, value); } } @@ -2466,6 +2475,141 @@ public final class Settings { } } + public ArrayMap<String, String> getStringsForPrefix(ContentResolver cr, String prefix, + List<String> names) { + ArrayMap<String, String> keyValues = new ArrayMap<>(); + int currentGeneration = -1; + + synchronized (NameValueCache.this) { + if (mGenerationTracker != null) { + if (mGenerationTracker.isGenerationChanged()) { + if (DEBUG) { + Log.i(TAG, "Generation changed for type:" + mUri.getPath() + + " in package:" + cr.getPackageName()); + } + mValues.clear(); + } else { + boolean prefixCached = false; + int size = mValues.size(); + for (int i = 0; i < size; ++i) { + if (mValues.keyAt(i).startsWith(prefix + "/")) { + prefixCached = true; + break; + } + } + if (prefixCached) { + if (!names.isEmpty()) { + for (String name : names) { + if (mValues.containsKey(name)) { + keyValues.put(name, mValues.get(name)); + } + } + } else { + for (int i = 0; i < size; ++i) { + String key = mValues.keyAt(i); + if (key.startsWith(prefix + "/")) { + keyValues.put(key, mValues.get(key)); + } + } + } + return keyValues; + } + } + if (mGenerationTracker != null) { + currentGeneration = mGenerationTracker.getCurrentGeneration(); + } + } + } + + if (mCallListCommand == null) { + // No list command specified, return empty map + return keyValues; + } + IContentProvider cp = mProviderHolder.getProvider(cr); + + try { + Bundle args = new Bundle(); + args.putString(Settings.CALL_METHOD_PREFIX_KEY, prefix); + boolean needsGenerationTracker = false; + synchronized (NameValueCache.this) { + if (mGenerationTracker == null) { + needsGenerationTracker = true; + args.putString(CALL_METHOD_TRACK_GENERATION_KEY, null); + if (DEBUG) { + Log.i(TAG, "Requested generation tracker for type: " + + mUri.getPath() + " in package:" + cr.getPackageName()); + } + } + } + + // Fetch all flags for the namespace at once for caching purposes + Bundle b = cp.call(cr.getPackageName(), mProviderHolder.mUri.getAuthority(), + mCallListCommand, null, args); + if (b == null) { + // Invalid response, return an empty map + return keyValues; + } + + // All flags for the namespace + Map<String, String> flagsToValues = + (HashMap) b.getSerializable(Settings.NameValueTable.VALUE); + // Only the flags requested by the caller + if (!names.isEmpty()) { + for (Map.Entry<String, String> flag : flagsToValues.entrySet()) { + if (names.contains(flag.getKey())) { + keyValues.put(flag.getKey(), flag.getValue()); + } + } + } else { + keyValues.putAll(flagsToValues); + } + + synchronized (NameValueCache.this) { + if (needsGenerationTracker) { + MemoryIntArray array = b.getParcelable( + CALL_METHOD_TRACK_GENERATION_KEY); + final int index = b.getInt( + CALL_METHOD_GENERATION_INDEX_KEY, -1); + if (array != null && index >= 0) { + final int generation = b.getInt( + CALL_METHOD_GENERATION_KEY, 0); + if (DEBUG) { + Log.i(TAG, "Received generation tracker for type:" + + mUri.getPath() + " in package:" + + cr.getPackageName() + " with index:" + index); + } + if (mGenerationTracker != null) { + mGenerationTracker.destroy(); + } + mGenerationTracker = new GenerationTracker(array, index, + generation, () -> { + synchronized (NameValueCache.this) { + Log.e(TAG, "Error accessing generation tracker" + + " - removing"); + if (mGenerationTracker != null) { + GenerationTracker generationTracker = + mGenerationTracker; + mGenerationTracker = null; + generationTracker.destroy(); + mValues.clear(); + } + } + }); + } + } + if (mGenerationTracker != null && currentGeneration + == mGenerationTracker.getCurrentGeneration()) { + // cache the complete list of flags for the namespace + mValues.putAll(flagsToValues); + } + } + return keyValues; + } catch (RemoteException e) { + // Not supported by the remote side, return an empty map + return keyValues; + } + } + public void clearGenerationTrackerForTest() { synchronized (NameValueCache.this) { if (mGenerationTracker != null) { @@ -7908,16 +8052,6 @@ public final class Settings { public static final String NOTIFICATION_BADGING = "notification_badging"; /** - * Whether the notification bubbles are globally enabled - * The value is boolean (1 or 0). - * @hide - * @deprecated use {@link Global#NOTIFICATION_BUBBLES} instead. - */ - @TestApi - @Deprecated - public static final String NOTIFICATION_BUBBLES = "notification_bubbles"; - - /** * Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right * swipe). * @@ -13509,6 +13643,7 @@ public final class Settings { DeviceConfig.CONTENT_URI, CALL_METHOD_GET_CONFIG, CALL_METHOD_PUT_CONFIG, + CALL_METHOD_LIST_CONFIG, sProviderHolder); /** @@ -13525,6 +13660,37 @@ public final class Settings { } /** + * Look up a list of names in the database, based on a common prefix. + * + * @param resolver to access the database with + * @param prefix to apply to all of the names which will be fetched + * @param names to look up in the table + * @return a non null, but possibly empty, map from name to value for any of the names that + * were found during lookup. + * + * @hide + */ + @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG) + static Map<String, String> getStrings(@NonNull ContentResolver resolver, + @NonNull String prefix, @NonNull List<String> names) { + List<String> concatenatedNames = new ArrayList<>(names.size()); + for (String name : names) { + concatenatedNames.add(prefix + "/" + name); + } + + ArrayMap<String, String> rawKeyValues = sNameValueCache.getStringsForPrefix( + resolver, prefix, concatenatedNames); + int size = rawKeyValues.size(); + int substringLength = prefix.length() + 1; + ArrayMap<String, String> keyValues = new ArrayMap<>(size); + for (int i = 0; i < size; ++i) { + keyValues.put(rawKeyValues.keyAt(i).substring(substringLength), + rawKeyValues.valueAt(i)); + } + return keyValues; + } + + /** * Store a name/value pair into the database. * <p> * Also the method takes an argument whether to make the value the default for this setting. diff --git a/core/java/android/service/euicc/EuiccService.java b/core/java/android/service/euicc/EuiccService.java index ff8b13506201..8a9f68942e9d 100644 --- a/core/java/android/service/euicc/EuiccService.java +++ b/core/java/android/service/euicc/EuiccService.java @@ -15,6 +15,8 @@ */ package android.service.euicc; +import static android.telephony.euicc.EuiccCardManager.ResetOption; + import android.annotation.CallSuper; import android.annotation.IntDef; import android.annotation.NonNull; @@ -503,7 +505,7 @@ public abstract class EuiccService extends Service { String nickname); /** - * Erase all of the subscriptions on the device. + * Erase all operational subscriptions on the device. * * <p>This is intended to be used for device resets. As such, the reset should be performed even * if an active SIM must be deactivated in order to access the eUICC. @@ -512,10 +514,31 @@ public abstract class EuiccService extends Service { * @return the result of the erase operation. May be one of the predefined {@code RESULT_} * constants or any implementation-specific code starting with {@link #RESULT_FIRST_USER}. * @see android.telephony.euicc.EuiccManager#eraseSubscriptions + * + * @deprecated From R, callers should specify a flag for specific set of subscriptions to erase + * and use @link{onEraseSubscriptionsWithOptions} instead */ + @Deprecated public abstract int onEraseSubscriptions(int slotId); /** + * Erase specific subscriptions on the device. + * + * <p>This is intended to be used for device resets. As such, the reset should be performed even + * if an active SIM must be deactivated in order to access the eUICC. + * + * @param slotIndex index of the SIM slot to use for the operation. + * @param options flag for specific group of subscriptions to erase + * @return the result of the erase operation. May be one of the predefined {@code RESULT_} + * constants or any implementation-specific code starting with {@link #RESULT_FIRST_USER}. + * @see android.telephony.euicc.EuiccManager#eraseSubscriptionsWithOptions + */ + public int onEraseSubscriptionsWithOptions(int slotIndex, @ResetOption int options) { + throw new UnsupportedOperationException( + "This method must be overridden to enable the ResetOption parameter"); + } + + /** * Ensure that subscriptions will be retained on the next factory reset. * * <p>Called directly before a factory reset. Assumes that a normal factory reset will lead to @@ -751,6 +774,23 @@ public abstract class EuiccService extends Service { } @Override + public void eraseSubscriptionsWithOptions( + int slotIndex, @ResetOption int options, IEraseSubscriptionsCallback callback) { + mExecutor.execute(new Runnable() { + @Override + public void run() { + int result = EuiccService.this.onEraseSubscriptionsWithOptions( + slotIndex, options); + try { + callback.onComplete(result); + } catch (RemoteException e) { + // Can't communicate with the phone process; ignore. + } + } + }); + } + + @Override public void retainSubscriptionsForFactoryReset(int slotId, IRetainSubscriptionsForFactoryResetCallback callback) { mExecutor.execute(new Runnable() { diff --git a/core/java/android/service/euicc/IEuiccService.aidl b/core/java/android/service/euicc/IEuiccService.aidl index c2cdf093706f..2acc47aae919 100644 --- a/core/java/android/service/euicc/IEuiccService.aidl +++ b/core/java/android/service/euicc/IEuiccService.aidl @@ -52,6 +52,8 @@ oneway interface IEuiccService { void updateSubscriptionNickname(int slotId, String iccid, String nickname, in IUpdateSubscriptionNicknameCallback callback); void eraseSubscriptions(int slotId, in IEraseSubscriptionsCallback callback); + void eraseSubscriptionsWithOptions( + int slotIndex, int options, in IEraseSubscriptionsCallback callback); void retainSubscriptionsForFactoryReset( int slotId, in IRetainSubscriptionsForFactoryResetCallback callback); }
\ No newline at end of file diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 81643e90428f..5bda86704d88 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -36,6 +36,7 @@ import android.os.Parcelable; import android.sysprop.DisplayProperties; import android.text.style.AbsoluteSizeSpan; import android.text.style.AccessibilityClickableSpan; +import android.text.style.AccessibilityReplacementSpan; import android.text.style.AccessibilityURLSpan; import android.text.style.AlignmentSpan; import android.text.style.BackgroundColorSpan; @@ -735,6 +736,8 @@ public class TextUtils { /** @hide */ public static final int LINE_HEIGHT_SPAN = 28; /** @hide */ + public static final int ACCESSIBILITY_REPLACEMENT_SPAN = 29; + /** @hide */ public static final int LAST_SPAN = LINE_HEIGHT_SPAN; /** @@ -860,7 +863,7 @@ public class TextUtils { case LEADING_MARGIN_SPAN: readSpan(p, sp, new LeadingMarginSpan.Standard(p)); - break; + break; case URL_SPAN: readSpan(p, sp, new URLSpan(p)); @@ -933,7 +936,11 @@ public class TextUtils { case LINE_HEIGHT_SPAN: readSpan(p, sp, new LineHeightSpan.Standard(p)); break; - + + case ACCESSIBILITY_REPLACEMENT_SPAN: + readSpan(p, sp, new AccessibilityReplacementSpan(p)); + break; + default: throw new RuntimeException("bogus span encoding " + kind); } diff --git a/core/java/android/text/style/AccessibilityReplacementSpan.java b/core/java/android/text/style/AccessibilityReplacementSpan.java new file mode 100644 index 000000000000..07b0975846aa --- /dev/null +++ b/core/java/android/text/style/AccessibilityReplacementSpan.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.text.style; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.os.Parcel; +import android.os.Parcelable; +import android.text.ParcelableSpan; +import android.text.TextUtils; + +/** + * This class serves as a parcelable placeholder for the ReplacementSpans. + * + * This span contains content description of original span to let Accessibility service to do the + * substitution for it. + * + * @hide + */ +public class AccessibilityReplacementSpan extends ReplacementSpan + implements ParcelableSpan { + // The content description of the span this one replaces + private CharSequence mContentDescription; + + /** + * @param contentDescription The content description of the span this one replaces + */ + public AccessibilityReplacementSpan(CharSequence contentDescription) { + this.setContentDescription(contentDescription); + mContentDescription = contentDescription; + } + + public AccessibilityReplacementSpan(Parcel p) { + mContentDescription = p.readCharSequence(); + } + + @Override + public int getSpanTypeId() { + return getSpanTypeIdInternal(); + } + + @Override + public int getSpanTypeIdInternal() { + return TextUtils.ACCESSIBILITY_REPLACEMENT_SPAN; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + writeToParcelInternal(dest, flags); + } + + @Override + public void writeToParcelInternal(Parcel dest, int flags) { + dest.writeCharSequence(mContentDescription); + } + + @Override + public int getSize(Paint paint, CharSequence text, int start, int end, + Paint.FontMetricsInt fm) { + return 0; + } + + @Override + public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, + int bottom, Paint paint) { + } + + public static final @android.annotation.NonNull + Parcelable.Creator<AccessibilityReplacementSpan> CREATOR = + new Parcelable.Creator<AccessibilityReplacementSpan>() { + @Override + public AccessibilityReplacementSpan createFromParcel(Parcel parcel) { + return new AccessibilityReplacementSpan(parcel); + } + + @Override + public AccessibilityReplacementSpan[] newArray(int size) { + return new AccessibilityReplacementSpan[size]; + } + }; +} diff --git a/core/java/android/text/style/ReplacementSpan.java b/core/java/android/text/style/ReplacementSpan.java index 5f94ad054b63..05532326cd84 100644 --- a/core/java/android/text/style/ReplacementSpan.java +++ b/core/java/android/text/style/ReplacementSpan.java @@ -25,6 +25,8 @@ import android.text.TextPaint; public abstract class ReplacementSpan extends MetricAffectingSpan { + private CharSequence mContentDescription = null; + /** * Returns the width of the span. Extending classes can set the height of the span by updating * attributes of {@link android.graphics.Paint.FontMetricsInt}. If the span covers the whole @@ -61,6 +63,27 @@ public abstract class ReplacementSpan extends MetricAffectingSpan { int top, int y, int bottom, @NonNull Paint paint); /** + * Gets a brief description of this ImageSpan for use in accessibility support. + * + * @return The content description. + */ + @Nullable + public CharSequence getContentDescription() { + return mContentDescription; + } + + /** + * Sets the specific content description into ImageSpan. + * ReplacementSpans are shared with accessibility services, + * but only the content description is available from them. + * + * @param contentDescription content description. The default value is null. + */ + public void setContentDescription(@Nullable CharSequence contentDescription) { + mContentDescription = contentDescription; + } + + /** * This method does nothing, since ReplacementSpans are measured * explicitly instead of affecting Paint properties. */ diff --git a/core/java/android/util/ArraySet.java b/core/java/android/util/ArraySet.java index 44c5af20d891..4dda709f285d 100644 --- a/core/java/android/util/ArraySet.java +++ b/core/java/android/util/ArraySet.java @@ -16,6 +16,7 @@ package android.util; +import android.annotation.Nullable; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; @@ -329,6 +330,18 @@ public final class ArraySet<E> implements Collection<E>, Set<E> { } /** + * Create a new ArraySet with items from the given array + */ + public ArraySet(@Nullable E[] array) { + this(); + if (array != null) { + for (E value : array) { + add(value); + } + } + } + + /** * Make the array map empty. All storage is released. */ @Override diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index b66764e81e8f..1be57dd489cf 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -59,6 +59,7 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put("settings_wifi_details_datausage_header", "false"); DEFAULT_FLAGS.put("settings_skip_direction_mutable", "true"); DEFAULT_FLAGS.put(SETTINGS_WIFITRACKER2, "false"); + DEFAULT_FLAGS.put("settings_work_profile", "false"); } /** diff --git a/core/java/android/util/OWNERS b/core/java/android/util/OWNERS index 98297fba8ef3..8f3d9f6f5881 100644 --- a/core/java/android/util/OWNERS +++ b/core/java/android/util/OWNERS @@ -1,3 +1,3 @@ per-file FeatureFlagUtils.java = sbasi@google.com -per-file FeatureFlagUtils.java = zhfan@google.com +per-file FeatureFlagUtils.java = tmfang@google.com per-file FeatureFlagUtils.java = asapperstein@google.com diff --git a/core/java/android/util/StatsEvent.java b/core/java/android/util/StatsEvent.java new file mode 100644 index 000000000000..91a5ec0303f7 --- /dev/null +++ b/core/java/android/util/StatsEvent.java @@ -0,0 +1,331 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.util; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import android.annotation.NonNull; +import android.annotation.Nullable; + +import com.android.internal.annotations.GuardedBy; + +/** + * StatsEvent builds and stores the buffer sent over the statsd socket. + * This class defines and encapsulates the socket protocol. + * @hide + **/ +public final class StatsEvent implements AutoCloseable { + private static final int POS_NUM_ELEMENTS = 1; + private static final int POS_TIMESTAMP = POS_NUM_ELEMENTS + 1; + + private static final int LOGGER_ENTRY_MAX_PAYLOAD = 4068; + + // Max payload size is 4 KB less 4 bytes which are reserved for statsEventTag. + // See android_util_StatsLog.cpp. + private static final int MAX_EVENT_PAYLOAD = LOGGER_ENTRY_MAX_PAYLOAD - 4; + + private static final byte INT_TYPE = 0; + private static final byte LONG_TYPE = 1; + private static final byte STRING_TYPE = 2; + private static final byte LIST_TYPE = 3; + private static final byte FLOAT_TYPE = 4; + + private static final int INT_TYPE_SIZE = 5; + private static final int FLOAT_TYPE_SIZE = 5; + private static final int LONG_TYPE_SIZE = 9; + + private static final int STRING_TYPE_OVERHEAD = 5; + private static final int LIST_TYPE_OVERHEAD = 2; + + public static final int SUCCESS = 0; + public static final int ERROR_BUFFER_LIMIT_EXCEEDED = -1; + public static final int ERROR_NO_TIMESTAMP = -2; + public static final int ERROR_TIMESTAMP_ALREADY_WRITTEN = -3; + public static final int ERROR_NO_ATOM_ID = -4; + public static final int ERROR_ATOM_ID_ALREADY_WRITTEN = -5; + public static final int ERROR_UID_TAG_COUNT_MISMATCH = -6; + + private static Object sLock = new Object(); + + @GuardedBy("sLock") + private static StatsEvent sPool; + + private final byte[] mBuffer = new byte[MAX_EVENT_PAYLOAD]; + private int mPos; + private int mNumElements; + private int mAtomId; + + private StatsEvent() { + // Write LIST_TYPE to buffer + mBuffer[0] = LIST_TYPE; + reset(); + } + + private void reset() { + // Reset state. + mPos = POS_TIMESTAMP; + mNumElements = 0; + mAtomId = 0; + } + + /** + * Returns a StatsEvent object from the pool. + **/ + @NonNull + public static StatsEvent obtain() { + final StatsEvent statsEvent; + synchronized (sLock) { + statsEvent = null == sPool ? new StatsEvent() : sPool; + sPool = null; + } + statsEvent.reset(); + return statsEvent; + } + + @Override + public void close() { + synchronized (sLock) { + if (null == sPool) { + sPool = this; + } + } + } + + /** + * Writes the event timestamp to the buffer. + **/ + public int writeTimestampNs(final long timestampNs) { + if (hasTimestamp()) { + return ERROR_TIMESTAMP_ALREADY_WRITTEN; + } + return writeLong(timestampNs); + } + + private boolean hasTimestamp() { + return mPos > POS_TIMESTAMP; + } + + private boolean hasAtomId() { + return mAtomId != 0; + } + + /** + * Writes the atom id to the buffer. + **/ + public int writeAtomId(final int atomId) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (hasAtomId()) { + return ERROR_ATOM_ID_ALREADY_WRITTEN; + } + + final int writeResult = writeInt(atomId); + if (SUCCESS == writeResult) { + mAtomId = atomId; + } + return writeResult; + } + + /** + * Appends the given int to the StatsEvent buffer. + **/ + public int writeInt(final int value) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (!hasAtomId()) { + return ERROR_NO_ATOM_ID; + } else if (mPos + INT_TYPE_SIZE > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + mBuffer[mPos] = INT_TYPE; + copyInt(mBuffer, mPos + 1, value); + mPos += INT_TYPE_SIZE; + mNumElements++; + return SUCCESS; + } + + /** + * Appends the given long to the StatsEvent buffer. + **/ + public int writeLong(final long value) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (!hasAtomId()) { + return ERROR_NO_ATOM_ID; + } else if (mPos + LONG_TYPE_SIZE > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + mBuffer[mPos] = LONG_TYPE; + copyLong(mBuffer, mPos + 1, value); + mPos += LONG_TYPE_SIZE; + mNumElements++; + return SUCCESS; + } + + /** + * Appends the given float to the StatsEvent buffer. + **/ + public int writeFloat(final float value) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (!hasAtomId()) { + return ERROR_NO_ATOM_ID; + } else if (mPos + FLOAT_TYPE_SIZE > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + mBuffer[mPos] = FLOAT_TYPE; + copyInt(mBuffer, mPos + 1, Float.floatToIntBits(value)); + mPos += FLOAT_TYPE_SIZE; + mNumElements++; + return SUCCESS; + } + + /** + * Appends the given boolean to the StatsEvent buffer. + **/ + public int writeBoolean(final boolean value) { + return writeInt(value ? 1 : 0); + } + + /** + * Appends the given byte array to the StatsEvent buffer. + **/ + public int writeByteArray(@NonNull final byte[] value) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (!hasAtomId()) { + return ERROR_NO_ATOM_ID; + } else if (mPos + STRING_TYPE_OVERHEAD + value.length > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + mBuffer[mPos] = STRING_TYPE; + copyInt(mBuffer, mPos + 1, value.length); + System.arraycopy(value, 0, mBuffer, mPos + STRING_TYPE_OVERHEAD, value.length); + mPos += STRING_TYPE_OVERHEAD + value.length; + mNumElements++; + return SUCCESS; + } + + /** + * Appends the given String to the StatsEvent buffer. + **/ + public int writeString(@NonNull final String value) { + final byte[] valueBytes = stringToBytes(value); + return writeByteArray(valueBytes); + } + + /** + * Appends the AttributionNode specified as array of uids and array of tags. + **/ + public int writeAttributionNode(@NonNull final int[] uids, @NonNull final String[] tags) { + if (!hasTimestamp()) { + return ERROR_NO_TIMESTAMP; + } else if (!hasAtomId()) { + return ERROR_NO_ATOM_ID; + } else if (mPos + LIST_TYPE_OVERHEAD > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + final int numTags = tags.length; + final int numUids = uids.length; + if (numTags != numUids) { + return ERROR_UID_TAG_COUNT_MISMATCH; + } + + int pos = mPos; + mBuffer[pos] = LIST_TYPE; + mBuffer[pos + 1] = (byte) numTags; + pos += LIST_TYPE_OVERHEAD; + for (int i = 0; i < numTags; i++) { + final byte[] tagBytes = stringToBytes(tags[i]); + + if (pos + LIST_TYPE_OVERHEAD + INT_TYPE_SIZE + + STRING_TYPE_OVERHEAD + tagBytes.length > MAX_EVENT_PAYLOAD) { + return ERROR_BUFFER_LIMIT_EXCEEDED; + } + + mBuffer[pos] = LIST_TYPE; + mBuffer[pos + 1] = 2; + pos += LIST_TYPE_OVERHEAD; + mBuffer[pos] = INT_TYPE; + copyInt(mBuffer, pos + 1, uids[i]); + pos += INT_TYPE_SIZE; + mBuffer[pos] = STRING_TYPE; + copyInt(mBuffer, pos + 1, tagBytes.length); + System.arraycopy(tagBytes, 0, mBuffer, pos + STRING_TYPE_OVERHEAD, tagBytes.length); + pos += STRING_TYPE_OVERHEAD + tagBytes.length; + } + mPos = pos; + mNumElements++; + return SUCCESS; + } + + /** + * Returns the byte array containing data in the statsd socket format. + * @hide + **/ + @NonNull + public byte[] getBuffer() { + // Encode number of elements in the buffer. + mBuffer[POS_NUM_ELEMENTS] = (byte) mNumElements; + return mBuffer; + } + + /** + * Returns number of bytes used by the buffer. + * @hide + **/ + public int size() { + return mPos; + } + + /** + * Getter for atom id. + * @hide + **/ + public int getAtomId() { + return mAtomId; + } + + @NonNull + private static byte[] stringToBytes(@Nullable final String value) { + return (null == value ? "" : value).getBytes(UTF_8); + } + + // Helper methods for copying primitives + private static void copyInt(@NonNull byte[] buff, int pos, int value) { + buff[pos] = (byte) (value); + buff[pos + 1] = (byte) (value >> 8); + buff[pos + 2] = (byte) (value >> 16); + buff[pos + 3] = (byte) (value >> 24); + } + + private static void copyLong(@NonNull byte[] buff, int pos, long value) { + buff[pos] = (byte) (value); + buff[pos + 1] = (byte) (value >> 8); + buff[pos + 2] = (byte) (value >> 16); + buff[pos + 3] = (byte) (value >> 24); + buff[pos + 4] = (byte) (value >> 32); + buff[pos + 5] = (byte) (value >> 40); + buff[pos + 6] = (byte) (value >> 48); + buff[pos + 7] = (byte) (value >> 56); + } +} diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index b685cf098b33..8dd475e0c306 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -181,7 +181,6 @@ public final class SurfaceControl implements Parcelable { private static native void nativeSeverChildren(long transactionObj, long nativeObject); private static native void nativeSetOverrideScalingMode(long transactionObj, long nativeObject, int scalingMode); - private static native boolean nativeGetTransformToDisplayInverse(long nativeObject); private static native Display.HdrCapabilities nativeGetHdrCapabilities(IBinder displayToken); @@ -200,7 +199,10 @@ public final class SurfaceControl implements Parcelable { private final CloseGuard mCloseGuard = CloseGuard.get(); private String mName; - long mNativeObject; // package visibility only for Surface.java access + /** + * @hide + */ + public long mNativeObject; // TODO: Move this to native. private final Object mSizeLock = new Object(); @@ -303,8 +305,8 @@ public final class SurfaceControl implements Parcelable { /** * Surface creation flag: Creates a Dim surface. * Everything behind this surface is dimmed by the amount specified - * in {@link #setAlpha}. It is an error to lock a Dim surface, since it - * doesn't have a backing store. + * in {@link Transaction#setAlpha(SurfaceControl, float)}. It is an error to lock a Dim + * surface, since it doesn't have a backing store. * * @hide */ @@ -319,6 +321,11 @@ public final class SurfaceControl implements Parcelable { public static final int FX_SURFACE_CONTAINER = 0x00080000; /** + * @hide + */ + public static final int FX_SURFACE_BLAST = 0x00040000; + + /** * Mask used for FX values above. * * @hide @@ -694,6 +701,14 @@ public final class SurfaceControl implements Parcelable { } /** + * @hide + */ + public Builder setBLASTLayer() { + unsetBufferSize(); + return setFlags(FX_SURFACE_BLAST, FX_SURFACE_MASK); + } + + /** * Indicates whether a 'ContainerLayer' is to be constructed. * * Container layers will not be rendered in any fashion and instead are used @@ -740,20 +755,20 @@ public final class SurfaceControl implements Parcelable { * <p> * Good practice is to first create the surface with the {@link #HIDDEN} flag * specified, open a transaction, set the surface layer, layer stack, alpha, - * and position, call {@link #show} if appropriate, and close the transaction. + * and position, call {@link Transaction#show(SurfaceControl)} if appropriate, and close the + * transaction. * <p> * Bounds of the surface is determined by its crop and its buffer size. If the * surface has no buffer or crop, the surface is boundless and only constrained * by the size of its parent bounds. * - * @param session The surface session, must not be null. - * @param name The surface name, must not be null. - * @param w The surface initial width. - * @param h The surface initial height. - * @param flags The surface creation flags. Should always include {@link #HIDDEN} - * in the creation flags. + * @param session The surface session, must not be null. + * @param name The surface name, must not be null. + * @param w The surface initial width. + * @param h The surface initial height. + * @param flags The surface creation flags. Should always include {@link #HIDDEN} + * in the creation flags. * @param metadata Initial metadata. - * * @throws throws OutOfResourcesException If the SurfaceControl cannot be created. */ private SurfaceControl(SurfaceSession session, String name, int w, int h, int format, int flags, @@ -1014,15 +1029,6 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - public void deferTransactionUntil(Surface barrier, long frame) { - synchronized(SurfaceControl.class) { - sGlobalTransaction.deferTransactionUntilSurface(this, barrier, frame); - } - } - - /** - * @hide - */ public void reparentChildren(SurfaceControl newParent) { synchronized(SurfaceControl.class) { sGlobalTransaction.reparentChildren(this, newParent); @@ -1032,15 +1038,6 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - public void reparent(SurfaceControl newParent) { - synchronized(SurfaceControl.class) { - sGlobalTransaction.reparent(this, newParent); - } - } - - /** - * @hide - */ public void detachChildren() { synchronized(SurfaceControl.class) { sGlobalTransaction.detachChildren(this); @@ -1060,15 +1057,6 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - public static void setAnimationTransaction() { - synchronized (SurfaceControl.class) { - sGlobalTransaction.setAnimationTransaction(); - } - } - - /** - * @hide - */ @UnsupportedAppUsage public void setLayer(int zorder) { checkNotReleased(); @@ -1080,16 +1068,6 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - public void setRelativeLayer(SurfaceControl relativeTo, int zorder) { - checkNotReleased(); - synchronized(SurfaceControl.class) { - sGlobalTransaction.setRelativeLayer(this, relativeTo, zorder); - } - } - - /** - * @hide - */ @UnsupportedAppUsage public void setPosition(float x, float y) { checkNotReleased(); @@ -1183,16 +1161,6 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - public void setColor(@Size(3) float[] color) { - checkNotReleased(); - synchronized (SurfaceControl.class) { - sGlobalTransaction.setColor(this, color); - } - } - - /** - * @hide - */ public void setMatrix(float dsdx, float dtdx, float dtdy, float dsdy) { checkNotReleased(); synchronized(SurfaceControl.class) { @@ -1201,36 +1169,6 @@ public final class SurfaceControl implements Parcelable { } /** - * Sets the transform and position of a {@link SurfaceControl} from a 3x3 transformation matrix. - * - * @param matrix The matrix to apply. - * @param float9 An array of 9 floats to be used to extract the values from the matrix. - * @hide - */ - public void setMatrix(Matrix matrix, float[] float9) { - checkNotReleased(); - matrix.getValues(float9); - synchronized (SurfaceControl.class) { - sGlobalTransaction.setMatrix(this, float9[MSCALE_X], float9[MSKEW_Y], - float9[MSKEW_X], float9[MSCALE_Y]); - sGlobalTransaction.setPosition(this, float9[MTRANS_X], float9[MTRANS_Y]); - } - } - - /** - * Sets the color transform for the Surface. - * @param matrix A float array with 9 values represents a 3x3 transform matrix - * @param translation A float array with 3 values represents a translation vector - * @hide - */ - public void setColorTransform(@Size(9) float[] matrix, @Size(3) float[] translation) { - checkNotReleased(); - synchronized (SurfaceControl.class) { - sGlobalTransaction.setColorTransform(this, matrix, translation); - } - } - - /** * Sets the Surface to be color space agnostic. If a surface is color space agnostic, * the color can be interpreted in any color space. * @param agnostic A boolean to indicate whether the surface is color space agnostic @@ -1260,43 +1198,6 @@ public final class SurfaceControl implements Parcelable { } /** - * Same as {@link SurfaceControl#setWindowCrop(Rect)} but sets the crop rect top left at 0, 0. - * - * @param width width of crop rect - * @param height height of crop rect - * @hide - */ - public void setWindowCrop(int width, int height) { - checkNotReleased(); - synchronized (SurfaceControl.class) { - sGlobalTransaction.setWindowCrop(this, width, height); - } - } - - /** - * Sets the corner radius of a {@link SurfaceControl}. - * - * @param cornerRadius Corner radius in pixels. - * @hide - */ - public void setCornerRadius(float cornerRadius) { - checkNotReleased(); - synchronized (SurfaceControl.class) { - sGlobalTransaction.setCornerRadius(this, cornerRadius); - } - } - - /** - * @hide - */ - public void setLayerStack(int layerStack) { - checkNotReleased(); - synchronized(SurfaceControl.class) { - sGlobalTransaction.setLayerStack(this, layerStack); - } - } - - /** * @hide */ public void setOpaque(boolean isOpaque) { @@ -2066,7 +1967,10 @@ public final class SurfaceControl implements Parcelable { public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( Transaction.class.getClassLoader(), nativeGetNativeTransactionFinalizer(), 512); - private long mNativeObject; + /** + * @hide + */ + public long mNativeObject; private final ArrayMap<SurfaceControl, Point> mResizedSurfaces = new ArrayMap<>(); Runnable mFreeNativeResources; @@ -2302,6 +2206,12 @@ public final class SurfaceControl implements Parcelable { } /** + * Sets the transform and position of a {@link SurfaceControl} from a 3x3 transformation + * matrix. + * + * @param sc SurfaceControl to set matrix of + * @param matrix The matrix to apply. + * @param float9 An array of 9 floats to be used to extract the values from the matrix. * @hide */ @UnsupportedAppUsage @@ -2315,7 +2225,9 @@ public final class SurfaceControl implements Parcelable { /** * Sets the color transform for the Surface. - * @param matrix A float array with 9 values represents a 3x3 transform matrix + * + * @param sc SurfaceControl to set color transform of + * @param matrix A float array with 9 values represents a 3x3 transform matrix * @param translation A float array with 3 values represents a translation vector * @hide */ @@ -2339,6 +2251,13 @@ public final class SurfaceControl implements Parcelable { } /** + * Bounds the surface and its children to the bounds specified. Size of the surface will be + * ignored and only the crop and buffer size will be used to determine the bounds of the + * surface. If no crop is specified and the surface has no buffer, the surface bounds is + * only constrained by the size of its parent bounds. + * + * @param sc SurfaceControl to set crop of. + * @param crop Bounds of the crop to apply. * @hide */ @UnsupportedAppUsage @@ -2355,6 +2274,12 @@ public final class SurfaceControl implements Parcelable { } /** + * Same as {@link Transaction#setWindowCrop(SurfaceControl, Rect)} but sets the crop rect + * top left at 0, 0. + * + * @param sc SurfaceControl to set crop of. + * @param width width of crop rect + * @param height height of crop rect * @hide */ public Transaction setWindowCrop(SurfaceControl sc, int width, int height) { diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index a85830009f58..2f0a4ebb84f8 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -418,12 +418,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall Log.d(TAG, System.identityHashCode(this) + " updateSurfaceAlpha: set alpha=" + alpha); } - SurfaceControl.openTransaction(); - try { - mSurfaceControl.setAlpha(alpha); - } finally { - SurfaceControl.closeTransaction(); - } + mTmpTransaction.setAlpha(mSurfaceControl, alpha).apply(); } mSurfaceAlpha = alpha; } @@ -701,17 +696,18 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall } } - private void updateBackgroundVisibilityInTransaction() { + private void updateBackgroundVisibility(Transaction t) { if (mBackgroundControl == null) { return; } if ((mSubLayer < 0) && ((mSurfaceFlags & SurfaceControl.OPAQUE) != 0)) { - mBackgroundControl.show(); + t.show(mBackgroundControl); } else { - mBackgroundControl.hide(); + t.hide(mBackgroundControl); } } + private void releaseSurfaces() { mSurfaceAlpha = 1f; @@ -853,61 +849,61 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall if (DEBUG) Log.i(TAG, System.identityHashCode(this) + " " + "Cur surface: " + mSurface); - SurfaceControl.openTransaction(); - try { - // If we are creating the surface control or the parent surface has not - // changed, then set relative z. Otherwise allow the parent - // SurfaceChangedCallback to update the relative z. This is needed so that - // we do not change the relative z before the server is ready to swap the - // parent surface. - if (creating || (mParentSurfaceGenerationId - == viewRoot.mSurface.getGenerationId())) { - SurfaceControl.mergeToGlobalTransaction(updateRelativeZ()); - } - mParentSurfaceGenerationId = viewRoot.mSurface.getGenerationId(); + // If we are creating the surface control or the parent surface has not + // changed, then set relative z. Otherwise allow the parent + // SurfaceChangedCallback to update the relative z. This is needed so that + // we do not change the relative z before the server is ready to swap the + // parent surface. + if (creating || (mParentSurfaceGenerationId + == viewRoot.mSurface.getGenerationId())) { + updateRelativeZ(mTmpTransaction); + } + mParentSurfaceGenerationId = viewRoot.mSurface.getGenerationId(); - if (mViewVisibility) { - mSurfaceControl.show(); - } else { - mSurfaceControl.hide(); - } - updateBackgroundVisibilityInTransaction(); - if (mUseAlpha) { - mSurfaceControl.setAlpha(alpha); - mSurfaceAlpha = alpha; - } + if (mViewVisibility) { + mTmpTransaction.show(mSurfaceControl); + } else { + mTmpTransaction.hide(mSurfaceControl); + } + updateBackgroundVisibility(mTmpTransaction); + if (mUseAlpha) { + mTmpTransaction.setAlpha(mSurfaceControl, alpha); + mSurfaceAlpha = alpha; + } - // While creating the surface, we will set it's initial - // geometry. Outside of that though, we should generally - // leave it to the RenderThread. - // - // There is one more case when the buffer size changes we aren't yet - // prepared to sync (as even following the transaction applying - // we still need to latch a buffer). - // b/28866173 - if (sizeChanged || creating || !mRtHandlingPositionUpdates) { - mSurfaceControl.setPosition(mScreenRect.left, mScreenRect.top); - mSurfaceControl.setMatrix(mScreenRect.width() / (float) mSurfaceWidth, - 0.0f, 0.0f, - mScreenRect.height() / (float) mSurfaceHeight); - // Set a window crop when creating the surface or changing its size to - // crop the buffer to the surface size since the buffer producer may - // use SCALING_MODE_SCALE and submit a larger size than the surface - // size. - if (mClipSurfaceToBounds && mClipBounds != null) { - mSurfaceControl.setWindowCrop(mClipBounds); - } else { - mSurfaceControl.setWindowCrop(mSurfaceWidth, mSurfaceHeight); - } - } - mSurfaceControl.setCornerRadius(mCornerRadius); - if (sizeChanged && !creating) { - mSurfaceControl.setBufferSize(mSurfaceWidth, mSurfaceHeight); + // While creating the surface, we will set it's initial + // geometry. Outside of that though, we should generally + // leave it to the RenderThread. + // + // There is one more case when the buffer size changes we aren't yet + // prepared to sync (as even following the transaction applying + // we still need to latch a buffer). + // b/28866173 + if (sizeChanged || creating || !mRtHandlingPositionUpdates) { + mTmpTransaction.setPosition(mSurfaceControl, mScreenRect.left, + mScreenRect.top); + mTmpTransaction.setMatrix(mSurfaceControl, + mScreenRect.width() / (float) mSurfaceWidth, 0.0f, 0.0f, + mScreenRect.height() / (float) mSurfaceHeight); + // Set a window crop when creating the surface or changing its size to + // crop the buffer to the surface size since the buffer producer may + // use SCALING_MODE_SCALE and submit a larger size than the surface + // size. + if (mClipSurfaceToBounds && mClipBounds != null) { + mTmpTransaction.setWindowCrop(mSurfaceControl, mClipBounds); + } else { + mTmpTransaction.setWindowCrop(mSurfaceControl, mSurfaceWidth, + mSurfaceHeight); } - } finally { - SurfaceControl.closeTransaction(); + } + mTmpTransaction.setCornerRadius(mSurfaceControl, mCornerRadius); + if (sizeChanged && !creating) { + mTmpTransaction.setBufferSize(mSurfaceControl, mSurfaceWidth, + mSurfaceHeight); } + mTmpTransaction.apply(); + if (sizeChanged || creating) { redrawNeeded = true; } @@ -1260,12 +1256,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall final float[] colorComponents = new float[] { Color.red(bgColor) / 255.f, Color.green(bgColor) / 255.f, Color.blue(bgColor) / 255.f }; - SurfaceControl.openTransaction(); - try { - mBackgroundControl.setColor(colorComponents); - } finally { - SurfaceControl.closeTransaction(); - } + mTmpTransaction.setColor(mBackgroundControl, colorComponents).apply(); } @UnsupportedAppUsage @@ -1480,15 +1471,13 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall @Override public void surfaceReplaced(Transaction t) { if (mSurfaceControl != null && mBackgroundControl != null) { - t.merge(updateRelativeZ()); + updateRelativeZ(t); } } - private Transaction updateRelativeZ() { - Transaction t = new Transaction(); + private void updateRelativeZ(Transaction t) { SurfaceControl viewRoot = getViewRootImpl().getSurfaceControl(); t.setRelativeLayer(mBackgroundControl, viewRoot, Integer.MIN_VALUE); t.setRelativeLayer(mSurfaceControl, viewRoot, mSubLayer); - return t; } } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index cfb6a79a674c..1599afb358e0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -75,6 +75,7 @@ import android.graphics.RenderNode; import android.graphics.Shader; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.graphics.drawable.GradientDrawable; import android.hardware.display.DisplayManagerGlobal; import android.net.Uri; import android.os.Build; @@ -4496,8 +4497,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * When non-null and valid, this is expected to contain an up-to-date copy * of the background drawable. It is cleared on temporary detach, and reset * on cleanup. + * @hide */ - private RenderNode mBackgroundRenderNode; + RenderNode mBackgroundRenderNode; @UnsupportedAppUsage private int mBackgroundResource; @@ -5228,6 +5230,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, sBrokenWindowBackground = targetSdkVersion < Build.VERSION_CODES.Q; + GradientDrawable.sWrapNegativeAngleMeasurements = + targetSdkVersion >= Build.VERSION_CODES.Q; sCompatibilityDone = true; } } diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 82a5fa979fd2..853a30226982 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2615,7 +2615,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager || actionMasked == MotionEvent.ACTION_CANCEL; // Update list of touch targets for pointer down, if needed. - final boolean split = (mGroupFlags & FLAG_SPLIT_MOTION_EVENTS) != 0; + final boolean isMouseEvent = ev.getSource() == InputDevice.SOURCE_MOUSE; + final boolean split = (mGroupFlags & FLAG_SPLIT_MOTION_EVENTS) != 0 + && !isMouseEvent; TouchTarget newTouchTarget = null; boolean alreadyDispatchedToNewTouchTarget = false; if (!canceled && !intercepted) { @@ -2632,8 +2634,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager final int childrenCount = mChildrenCount; if (newTouchTarget == null && childrenCount != 0) { - final float x = ev.getX(actionIndex); - final float y = ev.getY(actionIndex); + final float x = + isMouseEvent ? ev.getXCursorPosition() : ev.getX(actionIndex); + final float y = + isMouseEvent ? ev.getYCursorPosition() : ev.getY(actionIndex); // Find a child that can receive the event. // Scan children from front to back. final ArrayList<View> preorderedList = buildTouchDispatchChildList(); diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index fedd6fbe56ed..9ddd84f1943c 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -45,6 +45,7 @@ import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; +import android.graphics.BLASTBufferQueue; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.FrameInfo; @@ -170,6 +171,8 @@ public final class ViewRootImpl implements ViewParent, */ private static final boolean MT_RENDERER_AVAILABLE = true; + private static final boolean USE_BLAST_BUFFERQUEUE = false; + /** * If set to 2, the view system will switch from using rectangles retrieved from window to * dispatch to the view hierarchy to using {@link InsetsController}, that derives the insets @@ -475,6 +478,9 @@ public final class ViewRootImpl implements ViewParent, @UnsupportedAppUsage public final Surface mSurface = new Surface(); private final SurfaceControl mSurfaceControl = new SurfaceControl(); + private SurfaceControl mBlastSurfaceControl; + + private BLASTBufferQueue mBlastBufferQueue; /** * Transaction object that can be used to synchronize child SurfaceControl changes with @@ -1282,6 +1288,11 @@ public final class ViewRootImpl implements ViewParent, } mWindowAttributes.privateFlags |= compatibleWindowFlag; + if (USE_BLAST_BUFFERQUEUE) { + mWindowAttributes.privateFlags = + WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST; + } + if (mWindowAttributes.preservePreviousSurfaceInsets) { // Restore old surface insets. mWindowAttributes.surfaceInsets.set( @@ -1629,6 +1640,29 @@ public final class ViewRootImpl implements ViewParent, return mBoundsLayer; } + Surface getOrCreateBLASTSurface(int width, int height) { + if (mSurfaceControl == null || !mSurfaceControl.isValid()) { + return null; + } + if (mBlastSurfaceControl == null) { + mBlastSurfaceControl = new SurfaceControl.Builder(mSurfaceSession) + .setParent(mSurfaceControl) + .setName("BLAST") + .setBLASTLayer() + .build(); + mBlastBufferQueue = new BLASTBufferQueue( + mBlastSurfaceControl, width, height); + + } + mBlastBufferQueue.update(mSurfaceControl, width, height); + + mTransaction.show(mBlastSurfaceControl) + .reparent(mBlastSurfaceControl, mSurfaceControl) + .apply(); + + return mBlastBufferQueue.getSurface(); + } + private void setBoundsLayerCrop() { // mWinFrame is already adjusted for surface insets. So offset it and use it as // the cropping bounds. @@ -1658,6 +1692,13 @@ public final class ViewRootImpl implements ViewParent, } mSurface.release(); mSurfaceControl.release(); + + if (mBlastBufferQueue != null) { + mTransaction.remove(mBlastSurfaceControl).apply(); + mBlastSurfaceControl = null; + // We should probably add an explicit dispose. + mBlastBufferQueue = null; + } } /** @@ -2413,10 +2454,9 @@ public final class ViewRootImpl implements ViewParent, // will be transparent if (mAttachInfo.mThreadedRenderer != null) { try { - hwInitialized = mAttachInfo.mThreadedRenderer.initialize( - mSurface); + hwInitialized = mAttachInfo.mThreadedRenderer.initialize(mSurface); if (hwInitialized && (host.mPrivateFlags - & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0) { + & View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0) { // Don't pre-allocate if transparent regions // are requested as they may not be needed mAttachInfo.mThreadedRenderer.allocateBuffers(); @@ -7139,7 +7179,13 @@ public final class ViewRootImpl implements ViewParent, mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, mPendingDisplayCutout, mPendingMergedConfiguration, mSurfaceControl, mTempInsets); if (mSurfaceControl.isValid()) { - mSurface.copyFrom(mSurfaceControl); + if (USE_BLAST_BUFFERQUEUE == false) { + mSurface.copyFrom(mSurfaceControl); + } else { + mSurface.transferFrom(getOrCreateBLASTSurface( + (int) (mView.getMeasuredWidth() * appScale + 0.5f), + (int) (mView.getMeasuredHeight() * appScale + 0.5f))); + } } else { destroySurface(); } @@ -7297,26 +7343,42 @@ public final class ViewRootImpl implements ViewParent, } } - public void dumpGfxInfo(int[] info) { - info[0] = info[1] = 0; - if (mView != null) { - getGfxInfo(mView, info); + static final class GfxInfo { + public int viewCount; + public long renderNodeMemoryUsage; + public long renderNodeMemoryAllocated; + + void add(GfxInfo other) { + viewCount += other.viewCount; + renderNodeMemoryUsage += other.renderNodeMemoryUsage; + renderNodeMemoryAllocated += other.renderNodeMemoryAllocated; } } - private static void getGfxInfo(View view, int[] info) { - RenderNode renderNode = view.mRenderNode; - info[0]++; - if (renderNode != null) { - info[1] += (int) renderNode.computeApproximateMemoryUsage(); + GfxInfo getGfxInfo() { + GfxInfo info = new GfxInfo(); + if (mView != null) { + appendGfxInfo(mView, info); } + return info; + } + + private static void computeRenderNodeUsage(RenderNode node, GfxInfo info) { + if (node == null) return; + info.renderNodeMemoryUsage += node.computeApproximateMemoryUsage(); + info.renderNodeMemoryAllocated += node.computeApproximateMemoryAllocated(); + } + private static void appendGfxInfo(View view, GfxInfo info) { + info.viewCount++; + computeRenderNodeUsage(view.mRenderNode, info); + computeRenderNodeUsage(view.mBackgroundRenderNode, info); if (view instanceof ViewGroup) { ViewGroup group = (ViewGroup) view; int count = group.getChildCount(); for (int i = 0; i < count; i++) { - getGfxInfo(group.getChildAt(i), info); + appendGfxInfo(group.getChildAt(i), info); } } } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 001ab6650551..4a6ef987a642 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1834,6 +1834,13 @@ public interface WindowManager extends ViewManager { public static final int PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC = 0x01000000; /** + * Flag to request creation of a BLAST (Buffer as LayerState) Layer. + * If not specified the client will receive a BufferQueue layer. + * @hide + */ + public static final int PRIVATE_FLAG_USE_BLAST = 0x02000000; + + /** * An internal annotation for flags that can be specified to {@link #softInputMode}. * * @hide diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java index 379acbecb613..55b2a2a4033a 100644 --- a/core/java/android/view/WindowManagerGlobal.java +++ b/core/java/android/view/WindowManagerGlobal.java @@ -604,26 +604,24 @@ public final class WindowManagerGlobal { pw.println("\nView hierarchy:\n"); - int viewsCount = 0; - int displayListsSize = 0; - int[] info = new int[2]; + ViewRootImpl.GfxInfo totals = new ViewRootImpl.GfxInfo(); for (int i = 0; i < count; i++) { ViewRootImpl root = mRoots.get(i); - root.dumpGfxInfo(info); + ViewRootImpl.GfxInfo info = root.getGfxInfo(); + totals.add(info); String name = getWindowName(root); - pw.printf(" %s\n %d views, %.2f kB of display lists", - name, info[0], info[1] / 1024.0f); + pw.printf(" %s\n %d views, %.2f kB of render nodes", + name, info.viewCount, info.renderNodeMemoryUsage / 1024.f); pw.printf("\n\n"); - - viewsCount += info[0]; - displayListsSize += info[1]; } - pw.printf("\nTotal ViewRootImpl: %d\n", count); - pw.printf("Total Views: %d\n", viewsCount); - pw.printf("Total DisplayList: %.2f kB\n\n", displayListsSize / 1024.0f); + pw.printf("\nTotal %-15s: %d\n", "ViewRootImpl", count); + pw.printf("Total %-15s: %d\n", "attached Views", totals.viewCount); + pw.printf("Total %-15s: %.2f kB (used) / %.2f kB (capacity)\n\n", "RenderNode", + totals.renderNodeMemoryUsage / 1024.0f, + totals.renderNodeMemoryAllocated / 1024.0f); } } finally { pw.flush(); diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index d9fa9f24f1ae..bb10ef10d79e 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -259,23 +259,38 @@ public final class AccessibilityInteractionClient } /** - * Gets the info for all windows. + * Gets the info for all windows of the default display. * * @param connectionId The id of a connection for interacting with the system. * @return The {@link AccessibilityWindowInfo} list. */ public List<AccessibilityWindowInfo> getWindows(int connectionId) { + final SparseArray<List<AccessibilityWindowInfo>> windows = + getWindowsOnAllDisplays(connectionId); + if (windows.size() > 0) { + return windows.valueAt(Display.DEFAULT_DISPLAY); + } + return Collections.emptyList(); + } + + /** + * Gets the info for all windows of all displays. + * + * @param connectionId The id of a connection for interacting with the system. + * @return The SparseArray of {@link AccessibilityWindowInfo} list. + * The key of SparseArray is display ID. + */ + public SparseArray<List<AccessibilityWindowInfo>> getWindowsOnAllDisplays(int connectionId) { try { IAccessibilityServiceConnection connection = getConnection(connectionId); if (connection != null) { - SparseArray<List<AccessibilityWindowInfo>> allWindows = + SparseArray<List<AccessibilityWindowInfo>> windows = sAccessibilityCache.getWindowsOnAllDisplays(); - List<AccessibilityWindowInfo> windows; - if (allWindows != null) { + if (windows != null) { if (DEBUG) { Log.i(LOG_TAG, "Windows cache hit"); } - return allWindows.valueAt(Display.DEFAULT_DISPLAY); + return windows; } if (DEBUG) { Log.i(LOG_TAG, "Windows cache miss"); @@ -287,9 +302,7 @@ public final class AccessibilityInteractionClient Binder.restoreCallingIdentity(identityToken); } if (windows != null) { - allWindows = new SparseArray<>(); - allWindows.put(Display.DEFAULT_DISPLAY, windows); - sAccessibilityCache.setWindowsOnAllDisplays(allWindows); + sAccessibilityCache.setWindowsOnAllDisplays(windows); return windows; } } else { @@ -298,9 +311,11 @@ public final class AccessibilityInteractionClient } } } catch (RemoteException re) { - Log.e(LOG_TAG, "Error while calling remote getWindows", re); + Log.e(LOG_TAG, "Error while calling remote getWindowsOnAllDisplays", re); } - return Collections.emptyList(); + + final SparseArray<List<AccessibilityWindowInfo>> emptyWindows = new SparseArray<>(); + return emptyWindows; } /** diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 2e9d881f72f9..0817452718b5 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -21,6 +21,7 @@ import static android.accessibilityservice.AccessibilityServiceInfo.FLAG_ENABLE_ import android.Manifest; import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.AccessibilityServiceInfo.FeedbackType; +import android.accessibilityservice.AccessibilityShortcutInfo; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -30,9 +31,13 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; +import android.annotation.UserIdInt; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.os.Binder; @@ -56,6 +61,9 @@ import android.view.accessibility.AccessibilityEvent.EventType; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IntPair; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -1257,6 +1265,64 @@ public final class AccessibilityManager { return null; } + /** + * Returns the {@link AccessibilityShortcutInfo}s of the installed accessibility shortcut + * targets, for specific user. + * + * @param context The context of the application. + * @param userId The user id. + * @return A list with {@link AccessibilityShortcutInfo}s. + * @hide + */ + @NonNull + public List<AccessibilityShortcutInfo> getInstalledAccessibilityShortcutListAsUser( + @NonNull Context context, @UserIdInt int userId) { + final List<AccessibilityShortcutInfo> shortcutInfos = new ArrayList<>(); + final int flags = PackageManager.GET_ACTIVITIES + | PackageManager.GET_META_DATA + | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS + | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE; + final Intent actionMain = new Intent(Intent.ACTION_MAIN); + actionMain.addCategory(Intent.CATEGORY_ACCESSIBILITY_SHORTCUT_TARGET); + + final PackageManager packageManager = context.getPackageManager(); + final List<ResolveInfo> installedShortcutList = + packageManager.queryIntentActivitiesAsUser(actionMain, flags, userId); + for (int i = 0; i < installedShortcutList.size(); i++) { + final AccessibilityShortcutInfo shortcutInfo = + getShortcutInfo(context, installedShortcutList.get(i)); + if (shortcutInfo != null) { + shortcutInfos.add(shortcutInfo); + } + } + return shortcutInfos; + } + + /** + * Returns an {@link AccessibilityShortcutInfo} according to the given {@link ResolveInfo} of + * an activity. + * + * @param context The context of the application. + * @param resolveInfo The resolve info of an activity. + * @return The AccessibilityShortcutInfo. + */ + @Nullable + private AccessibilityShortcutInfo getShortcutInfo(@NonNull Context context, + @NonNull ResolveInfo resolveInfo) { + final ActivityInfo activityInfo = resolveInfo.activityInfo; + if (activityInfo == null || activityInfo.metaData == null + || activityInfo.metaData.getInt(AccessibilityShortcutInfo.META_DATA) == 0) { + return null; + } + try { + return new AccessibilityShortcutInfo(context, activityInfo); + } catch (XmlPullParserException | IOException exp) { + Log.e(LOG_TAG, "Error while initializing AccessibilityShortcutInfo", exp); + } + return null; + } + private IAccessibilityManager getServiceLocked() { if (mService == null) { tryConnectToServiceLocked(null); diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index cf29ed712793..06e9d0dbf6d6 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -39,8 +39,10 @@ import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; import android.text.style.AccessibilityClickableSpan; +import android.text.style.AccessibilityReplacementSpan; import android.text.style.AccessibilityURLSpan; import android.text.style.ClickableSpan; +import android.text.style.ReplacementSpan; import android.text.style.URLSpan; import android.util.ArrayMap; import android.util.ArraySet; @@ -2641,37 +2643,86 @@ public class AccessibilityNodeInfo implements Parcelable { public void setText(CharSequence text) { enforceNotSealed(); mOriginalText = text; - // Replace any ClickableSpans in mText with placeholders if (text instanceof Spanned) { - ClickableSpan[] spans = - ((Spanned) text).getSpans(0, text.length(), ClickableSpan.class); - if (spans.length > 0) { - Spannable spannable = new SpannableStringBuilder(text); - for (int i = 0; i < spans.length; i++) { - ClickableSpan span = spans[i]; - if ((span instanceof AccessibilityClickableSpan) - || (span instanceof AccessibilityURLSpan)) { - // We've already done enough - break; - } - int spanToReplaceStart = spannable.getSpanStart(span); - int spanToReplaceEnd = spannable.getSpanEnd(span); - int spanToReplaceFlags = spannable.getSpanFlags(span); - spannable.removeSpan(span); - ClickableSpan replacementSpan = (span instanceof URLSpan) - ? new AccessibilityURLSpan((URLSpan) span) - : new AccessibilityClickableSpan(span.getId()); - spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd, - spanToReplaceFlags); - } - mText = spannable; - return; - } + CharSequence tmpText = text; + tmpText = replaceClickableSpan(tmpText); + tmpText = replaceReplacementSpan(tmpText); + mText = tmpText; + return; } mText = (text == null) ? null : text.subSequence(0, text.length()); } /** + * Replaces any ClickableSpans in mText with placeholders. + * + * @param text The text. + * + * @return The spannable with ClickableSpan replacement. + */ + private CharSequence replaceClickableSpan(CharSequence text) { + ClickableSpan[] clickableSpans = + ((Spanned) text).getSpans(0, text.length(), ClickableSpan.class); + Spannable spannable = new SpannableStringBuilder(text); + if (clickableSpans.length == 0) { + return text; + } + for (int i = 0; i < clickableSpans.length; i++) { + ClickableSpan span = clickableSpans[i]; + if ((span instanceof AccessibilityClickableSpan) + || (span instanceof AccessibilityURLSpan)) { + // We've already done enough + break; + } + int spanToReplaceStart = spannable.getSpanStart(span); + int spanToReplaceEnd = spannable.getSpanEnd(span); + int spanToReplaceFlags = spannable.getSpanFlags(span); + spannable.removeSpan(span); + ClickableSpan replacementSpan = (span instanceof URLSpan) + ? new AccessibilityURLSpan((URLSpan) span) + : new AccessibilityClickableSpan(span.getId()); + spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd, + spanToReplaceFlags); + } + return spannable; + } + + /** + * Replace any ImageSpans in mText with its content description. + * + * @param text The text. + * + * @return The spannable with ReplacementSpan replacement. + */ + private CharSequence replaceReplacementSpan(CharSequence text) { + ReplacementSpan[] replacementSpans = + ((Spanned) text).getSpans(0, text.length(), ReplacementSpan.class); + SpannableStringBuilder spannable = new SpannableStringBuilder(text); + if (replacementSpans.length == 0) { + return text; + } + for (int i = 0; i < replacementSpans.length; i++) { + ReplacementSpan span = replacementSpans[i]; + CharSequence replacementText = span.getContentDescription(); + if (span instanceof AccessibilityReplacementSpan) { + // We've already done enough + break; + } + if (replacementText == null) { + continue; + } + int spanToReplaceStart = spannable.getSpanStart(span); + int spanToReplaceEnd = spannable.getSpanEnd(span); + int spanToReplaceFlags = spannable.getSpanFlags(span); + spannable.removeSpan(span); + ReplacementSpan replacementSpan = new AccessibilityReplacementSpan(replacementText); + spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd, + spanToReplaceFlags); + } + return spannable; + } + + /** * Gets the hint text of this node. Only applies to nodes where text can be entered. * * @return The hint text. diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl b/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl index fdb25fb1ee61..c36c4aa5b00a 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl @@ -17,3 +17,4 @@ package android.view.accessibility; parcelable AccessibilityWindowInfo; +parcelable AccessibilityWindowInfo.WindowListSparseArray; diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java index 6a3af3478449..5fa8a6e0e06b 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java @@ -26,9 +26,12 @@ import android.os.Parcelable; import android.text.TextUtils; import android.util.LongArray; import android.util.Pools.SynchronizedPool; +import android.util.SparseArray; import android.view.Display; import android.view.accessibility.AccessibilityEvent.WindowsChangeTypes; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; @@ -797,4 +800,49 @@ public final class AccessibilityWindowInfo implements Parcelable { return new AccessibilityWindowInfo[size]; } }; + + /** + * Transfers a sparsearray with lists having {@link AccessibilityWindowInfo}s across an IPC. + * The key of this sparsearray is display Id. + * + * @hide + */ + public static final class WindowListSparseArray + extends SparseArray<List<AccessibilityWindowInfo>> implements Parcelable { + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + final int count = size(); + dest.writeInt(count); + for (int i = 0; i < count; i++) { + dest.writeParcelableList(valueAt(i), 0); + dest.writeInt(keyAt(i)); + } + } + + public static final Parcelable.Creator<WindowListSparseArray> CREATOR = + new Parcelable.Creator<WindowListSparseArray>() { + public WindowListSparseArray createFromParcel( + Parcel source) { + final WindowListSparseArray array = new WindowListSparseArray(); + final ClassLoader loader = array.getClass().getClassLoader(); + final int count = source.readInt(); + for (int i = 0; i < count; i++) { + List<AccessibilityWindowInfo> windows = new ArrayList<>(); + source.readParcelableList(windows, loader); + array.put(source.readInt(), windows); + } + return array; + } + + public WindowListSparseArray[] newArray(int size) { + return new WindowListSparseArray[size]; + } + }; + } } diff --git a/core/java/android/view/inspector/OWNERS b/core/java/android/view/inspector/OWNERS index 4554fdc2bfa0..c2827cc31592 100644 --- a/core/java/android/view/inspector/OWNERS +++ b/core/java/android/view/inspector/OWNERS @@ -1,3 +1,3 @@ alanv@google.com aurimas@google.com -emberr@google.com +emberrose@google.com diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index fe88a9140b37..6d60366dc72d 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2569,7 +2569,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (isItemClickable(view)) { addAccessibilityActionIfEnabled(info, isItemEnabled, AccessibilityAction.ACTION_CLICK); - info.setClickable(true); + // A disabled item is a separator which should not be clickable. + info.setClickable(isItemEnabled); } if (isLongClickable()) { diff --git a/core/java/com/android/internal/app/ResolverListController.java b/core/java/com/android/internal/app/ResolverListController.java index 5f92cddbaa38..a390611be20b 100644 --- a/core/java/com/android/internal/app/ResolverListController.java +++ b/core/java/com/android/internal/app/ResolverListController.java @@ -115,14 +115,6 @@ public class ResolverListController { flags |= PackageManager.MATCH_INSTANT; } final List<ResolveInfo> infos = mpm.queryIntentActivities(intent, flags); - // Remove any activities that are not exported. - int totalSize = infos.size(); - for (int j = totalSize - 1; j >= 0 ; j--) { - ResolveInfo info = infos.get(j); - if (info.activityInfo != null && !info.activityInfo.exported) { - infos.remove(j); - } - } if (infos != null) { if (resolvedComponents == null) { resolvedComponents = new ArrayList<>(); diff --git a/core/java/com/android/internal/compat/ChangeReporter.java b/core/java/com/android/internal/compat/ChangeReporter.java index 8283eb749376..72b0ad7a02bc 100644 --- a/core/java/com/android/internal/compat/ChangeReporter.java +++ b/core/java/com/android/internal/compat/ChangeReporter.java @@ -22,7 +22,9 @@ import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Objects; import java.util.Set; @@ -36,12 +38,10 @@ public final class ChangeReporter { private int mSource; private final class ChangeReport { - int mUid; long mChangeId; int mState; - ChangeReport(int uid, long changeId, int state) { - mUid = uid; + ChangeReport(long changeId, int state) { mChangeId = changeId; mState = state; } @@ -51,40 +51,62 @@ public final class ChangeReporter { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; ChangeReport that = (ChangeReport) o; - return mUid == that.mUid - && mChangeId == that.mChangeId + return mChangeId == that.mChangeId && mState == that.mState; } @Override public int hashCode() { - return Objects.hash(mUid, mChangeId, mState); + return Objects.hash(mChangeId, mState); } } + // Maps uid to a set of ChangeReports (that were reported for that uid). @GuardedBy("mReportedChanges") - private Set<ChangeReport> mReportedChanges = new HashSet<>(); + private final Map<Integer, Set<ChangeReport>> mReportedChanges; public ChangeReporter(int source) { mSource = source; + mReportedChanges = new HashMap<>(); } /** - * Report the change to stats log. + * Report the change to stats log and to the debug log if the change was not previously + * logged already. * * @param uid affected by the change * @param changeId the reported change id * @param state of the reported change - enabled/disabled/only logged */ public void reportChange(int uid, long changeId, int state) { - ChangeReport report = new ChangeReport(uid, changeId, state); + ChangeReport report = new ChangeReport(changeId, state); synchronized (mReportedChanges) { - if (!mReportedChanges.contains(report)) { + Set<ChangeReport> reportedChangesForUid = mReportedChanges.get(uid); + if (reportedChangesForUid == null) { + mReportedChanges.put(uid, new HashSet<ChangeReport>()); + reportedChangesForUid = mReportedChanges.get(uid); + } + if (!reportedChangesForUid.contains(report)) { debugLog(uid, changeId, state); StatsLog.write(StatsLog.APP_COMPATIBILITY_CHANGE_REPORTED, uid, changeId, state, mSource); - mReportedChanges.add(report); + reportedChangesForUid.add(report); } + + } + } + + /** + * Clears the saved information about a given uid. Requests to report uid again will be reported + * regardless to the past reports. + * + * <p> Only intended to be called from PlatformCompat. + * + * @param uid to reset + */ + public void resetReportedChanges(int uid) { + synchronized (mReportedChanges) { + mReportedChanges.remove(uid); } } diff --git a/core/java/com/android/internal/compat/OWNERS b/core/java/com/android/internal/compat/OWNERS new file mode 100644 index 000000000000..2b7cdb0cbce9 --- /dev/null +++ b/core/java/com/android/internal/compat/OWNERS @@ -0,0 +1,7 @@ +# Use this reviewer by default. +platform-compat-eng+reviews@google.com + +andreionea@google.com +atrost@google.com +mathewi@google.com +satayev@google.com diff --git a/core/java/com/android/internal/os/KernelWakelockReader.java b/core/java/com/android/internal/os/KernelWakelockReader.java index e09e0e609380..cffb0ad9fdb9 100644 --- a/core/java/com/android/internal/os/KernelWakelockReader.java +++ b/core/java/com/android/internal/os/KernelWakelockReader.java @@ -29,6 +29,7 @@ import com.android.internal.annotations.VisibleForTesting; import java.io.File; import java.io.FileInputStream; +import java.util.Arrays; import java.util.Iterator; /** @@ -66,6 +67,7 @@ public class KernelWakelockReader { private final String[] mProcWakelocksName = new String[3]; private final long[] mProcWakelocksData = new long[3]; private ISuspendControlService mSuspendControlService = null; + private byte[] mKernelWakelockBuffer = new byte[32 * 1024]; /** * Reads kernel wakelock stats and updates the staleStats with the new information. @@ -84,7 +86,7 @@ public class KernelWakelockReader { } return removeOldStats(staleStats); } else { - byte[] buffer = new byte[32*1024]; + Arrays.fill(mKernelWakelockBuffer, (byte) 0); int len = 0; boolean wakeup_sources; final long startTime = SystemClock.uptimeMillis(); @@ -107,7 +109,8 @@ public class KernelWakelockReader { } int cnt; - while ((cnt = is.read(buffer, len, buffer.length - len)) > 0) { + while ((cnt = is.read(mKernelWakelockBuffer, len, + mKernelWakelockBuffer.length - len)) > 0) { len += cnt; } @@ -125,12 +128,13 @@ public class KernelWakelockReader { } if (len > 0) { - if (len >= buffer.length) { - Slog.wtf(TAG, "Kernel wake locks exceeded buffer size " + buffer.length); + if (len >= mKernelWakelockBuffer.length) { + Slog.wtf(TAG, "Kernel wake locks exceeded mKernelWakelockBuffer size " + + mKernelWakelockBuffer.length); } int i; for (i=0; i<len; i++) { - if (buffer[i] == '\0') { + if (mKernelWakelockBuffer[i] == '\0') { len = i; break; } @@ -143,7 +147,7 @@ public class KernelWakelockReader { Slog.w(TAG, "Failed to get Native wakelock stats from SystemSuspend"); } // Get kernel wakelock stats - parseProcWakelocks(buffer, len, wakeup_sources, staleStats); + parseProcWakelocks(mKernelWakelockBuffer, len, wakeup_sources, staleStats); return removeOldStats(staleStats); } } diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl index 9441825a1ed6..c8ba52a63151 100644 --- a/core/java/com/android/internal/statusbar/IStatusBar.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl @@ -151,17 +151,17 @@ oneway interface IStatusBar void showShutdownUi(boolean isReboot, String reason); - // Used to show the dialog when BiometricService starts authentication - void showBiometricDialog(in Bundle bundle, IBiometricServiceReceiverInternal receiver, int type, - boolean requireConfirmation, int userId, String opPackageName); - // Used to hide the dialog when a biometric is authenticated + // Used to show the authentication dialog (Biometrics, Device Credential) + void showAuthenticationDialog(in Bundle bundle, IBiometricServiceReceiverInternal receiver, + int biometricModality, boolean requireConfirmation, int userId, String opPackageName); + // Used to notify the authentication dialog that a biometric has been authenticated or rejected void onBiometricAuthenticated(boolean authenticated, String failureReason); // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc void onBiometricHelp(String message); // Used to set a message - the dialog will dismiss after a certain amount of time - void onBiometricError(String error); - // Used to hide the biometric dialog when the AuthenticationClient is stopped - void hideBiometricDialog(); + void onBiometricError(int errorCode, String error); + // Used to hide the authentication dialog, e.g. when the application cancels authentication + void hideAuthenticationDialog(); /** * Notifies System UI that the display is ready to show system decorations. diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl index 4c3a177a013b..a845b587c49f 100644 --- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl +++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl @@ -99,15 +99,15 @@ interface IStatusBarService void showPinningEnterExitToast(boolean entering); void showPinningEscapeToast(); - // Used to show the dialog when BiometricService starts authentication - void showBiometricDialog(in Bundle bundle, IBiometricServiceReceiverInternal receiver, int type, - boolean requireConfirmation, int userId, String opPackageName); - // Used to hide the dialog when a biometric is authenticated + // Used to show the authentication dialog (Biometrics, Device Credential) + void showAuthenticationDialog(in Bundle bundle, IBiometricServiceReceiverInternal receiver, + int biometricModality, boolean requireConfirmation, int userId, String opPackageName); + // Used to notify the authentication dialog that a biometric has been authenticated or rejected void onBiometricAuthenticated(boolean authenticated, String failureReason); // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc void onBiometricHelp(String message); // Used to set a message - the dialog will dismiss after a certain amount of time - void onBiometricError(String error); - // Used to hide the biometric dialog when the AuthenticationClient is stopped - void hideBiometricDialog(); + void onBiometricError(int errorCode, String error); + // Used to hide the authentication dialog, e.g. when the application cancels authentication + void hideAuthenticationDialog(); } diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 0505fe30c55c..ce405feb5985 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -117,6 +117,7 @@ cc_library_shared { "android_view_RenderNodeAnimator.cpp", "android_view_Surface.cpp", "android_view_SurfaceControl.cpp", + "android_graphics_BLASTBufferQueue.cpp", "android_view_SurfaceSession.cpp", "android_view_TextureView.cpp", "android_view_VelocityTracker.cpp", @@ -257,8 +258,6 @@ cc_library_shared { "libnativeloader_lazy", "libmemunreachable", "libhidlbase", - "libhidltransport", - "libhwbinder", "libvintf", "libnativewindow", "libdl", diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index d476d2d2c35c..3497f920e6a4 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -115,6 +115,7 @@ extern int register_android_util_MemoryIntArray(JNIEnv* env); extern int register_android_content_StringBlock(JNIEnv* env); extern int register_android_content_XmlBlock(JNIEnv* env); extern int register_android_content_res_ApkAssets(JNIEnv* env); +extern int register_android_graphics_BLASTBufferQueue(JNIEnv* env); extern int register_android_view_DisplayEventReceiver(JNIEnv* env); extern int register_android_view_InputApplicationHandle(JNIEnv* env); extern int register_android_view_InputWindowHandle(JNIEnv* env); @@ -1458,10 +1459,9 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_opengl_jni_GLES31), REG_JNI(register_android_opengl_jni_GLES31Ext), REG_JNI(register_android_opengl_jni_GLES32), - REG_JNI(register_android_graphics_classes), + REG_JNI(register_android_graphics_BLASTBufferQueue), REG_JNI(register_android_graphics_GraphicBuffer), - REG_JNI(register_android_database_CursorWindow), REG_JNI(register_android_database_SQLiteConnection), REG_JNI(register_android_database_SQLiteGlobal), diff --git a/core/jni/android_graphics_BLASTBufferQueue.cpp b/core/jni/android_graphics_BLASTBufferQueue.cpp new file mode 100644 index 000000000000..185e58160adf --- /dev/null +++ b/core/jni/android_graphics_BLASTBufferQueue.cpp @@ -0,0 +1,82 @@ +/* + * 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_TAG "BLASTBufferQueue" + +#include <nativehelper/JNIHelp.h> + +#include <android_runtime/AndroidRuntime.h> +#include <android_runtime/android_view_Surface.h> +#include <utils/Log.h> +#include <utils/RefBase.h> + +#include <gui/BLASTBufferQueue.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> + +namespace android { + +static jlong nativeCreate(JNIEnv* env, jclass clazz, jlong surfaceControl, jlong width, jlong height) { + sp<BLASTBufferQueue> queue = new BLASTBufferQueue( + reinterpret_cast<SurfaceControl*>(surfaceControl), width, height); + queue->incStrong((void*)nativeCreate); + return reinterpret_cast<jlong>(queue.get()); +} + +static void nativeDestroy(JNIEnv* env, jclass clazz, jlong ptr) { + sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr); + queue->decStrong((void*)nativeCreate); +} + +static jobject nativeGetSurface(JNIEnv* env, jclass clazz, jlong ptr) { + sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr); + return android_view_Surface_createFromIGraphicBufferProducer(env, queue->getIGraphicBufferProducer()); +} + +static void nativeSetNextTransaction(JNIEnv* env, jclass clazz, jlong ptr, jlong transactionPtr) { + sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr); + auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionPtr); + queue->setNextTransaction(transaction); +} + +static void nativeUpdate(JNIEnv*env, jclass clazz, jlong ptr, jlong surfaceControl, jlong width, jlong height) { + sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr); + queue->update(reinterpret_cast<SurfaceControl*>(surfaceControl), width, height); +} + +static const JNINativeMethod gMethods[] = { + /* name, signature, funcPtr */ + { "nativeCreate", "(JJJ)J", + (void*)nativeCreate }, + { "nativeGetSurface", "(J)Landroid/view/Surface;", + (void*)nativeGetSurface }, + { "nativeDestroy", "(J)V", + (void*)nativeDestroy }, + { "nativeSetNextTransaction", "(JJ)V", + (void*)nativeSetNextTransaction }, + { "nativeUpdate", "(JJJJ)V", + (void*)nativeUpdate } +}; + +int register_android_graphics_BLASTBufferQueue(JNIEnv* env) { + int res = jniRegisterNativeMethods(env, "android/graphics/BLASTBufferQueue", + gMethods, NELEM(gMethods)); + LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); + + return 0; +} + +} // namespace android diff --git a/core/jni/android_os_GraphicsEnvironment.cpp b/core/jni/android_os_GraphicsEnvironment.cpp index be9aee410d40..7582cae1a761 100644 --- a/core/jni/android_os_GraphicsEnvironment.cpp +++ b/core/jni/android_os_GraphicsEnvironment.cpp @@ -85,6 +85,10 @@ void setDebugLayersGLES_native(JNIEnv* env, jobject clazz, jstring layers) { } } +bool setInjectLayersPrSetDumpable_native() { + return android::GraphicsEnv::getInstance().setInjectLayersPrSetDumpable(); +} + void hintActivityLaunch_native(JNIEnv* env, jobject clazz) { android::GraphicsEnv::getInstance().hintActivityLaunch(); } @@ -93,6 +97,7 @@ const JNINativeMethod g_methods[] = { { "getCanLoadSystemLibraries", "()I", reinterpret_cast<void*>(getCanLoadSystemLibraries_native) }, { "setDriverPathAndSphalLibraries", "(Ljava/lang/String;Ljava/lang/String;)V", reinterpret_cast<void*>(setDriverPathAndSphalLibraries_native) }, { "setGpuStats", "(Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;I)V", reinterpret_cast<void*>(setGpuStats_native) }, + { "setInjectLayersPrSetDumpable", "()Z", reinterpret_cast<void*>(setInjectLayersPrSetDumpable_native) }, { "setAngleInfo", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/FileDescriptor;JJ)V", reinterpret_cast<void*>(setAngleInfo_native) }, { "getShouldUseAngle", "(Ljava/lang/String;)Z", reinterpret_cast<void*>(shouldUseAngle_native) }, { "setLayerPaths", "(Ljava/lang/ClassLoader;Ljava/lang/String;)V", reinterpret_cast<void*>(setLayerPaths_native) }, diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index d80c071c3e26..483b455965f7 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -721,8 +721,11 @@ static const JNINativeMethod gParcelMethods[] = { {"nativeWriteFloat", "(JF)V", (void*)android_os_Parcel_writeFloat}, // @FastNative {"nativeWriteDouble", "(JD)V", (void*)android_os_Parcel_writeDouble}, + // @FastNative {"nativeWriteString", "(JLjava/lang/String;)V", (void*)android_os_Parcel_writeString}, + // @FastNative {"nativeWriteStrongBinder", "(JLandroid/os/IBinder;)V", (void*)android_os_Parcel_writeStrongBinder}, + // @FastNative {"nativeWriteFileDescriptor", "(JLjava/io/FileDescriptor;)J", (void*)android_os_Parcel_writeFileDescriptor}, {"nativeCreateByteArray", "(J)[B", (void*)android_os_Parcel_createByteArray}, @@ -736,8 +739,11 @@ static const JNINativeMethod gParcelMethods[] = { {"nativeReadFloat", "(J)F", (void*)android_os_Parcel_readFloat}, // @CriticalNative {"nativeReadDouble", "(J)D", (void*)android_os_Parcel_readDouble}, + // @FastNative {"nativeReadString", "(J)Ljava/lang/String;", (void*)android_os_Parcel_readString}, + // @FastNative {"nativeReadStrongBinder", "(J)Landroid/os/IBinder;", (void*)android_os_Parcel_readStrongBinder}, + // @FastNative {"nativeReadFileDescriptor", "(J)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_readFileDescriptor}, {"nativeCreate", "()J", (void*)android_os_Parcel_create}, diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 0afbaa0e174c..e406e2257c67 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -697,6 +697,9 @@ BinderProxyNativeData* getBPNativeData(JNIEnv* env, jobject obj) { // same IBinder, and the original BinderProxy is still alive, return the same BinderProxy. jobject javaObjectForIBinder(JNIEnv* env, const sp<IBinder>& val) { + // N.B. This function is called from a @FastNative JNI method, so don't take locks around + // calls to Java code or block the calling thread for a long time for any reason. + if (val == NULL) return NULL; if (val->checkSubclass(&gBinderOffsets)) { diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 3cefeea68406..0fada1bae8ed 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -35,6 +35,7 @@ #include <limits> #include <memory> #include <string> +#include <unordered_map> #include <vector> #include "core_jni_helpers.h" @@ -81,6 +82,25 @@ Mutex gKeyCreateMutex; static pthread_key_t gBgKey = -1; #endif +/* + * cpuset/sched aggregate profile mappings + */ +static const std::unordered_map<int, std::string> kCpusetProfileMap = { + {SP_DEFAULT, "CPUSET_SP_DEFAULT"}, {SP_BACKGROUND, "CPUSET_SP_BACKGROUND"}, + {SP_FOREGROUND, "CPUSET_SP_FOREGROUND"},{SP_SYSTEM, "CPUSET_SP_SYSTEM"}, + {SP_AUDIO_APP, "CPUSET_SP_FOREGROUND"}, {SP_AUDIO_SYS, "CPUSET_SP_FOREGROUND"}, + {SP_TOP_APP, "CPUSET_SP_TOP_APP"}, {SP_RT_APP, "CPUSET_SP_DEFAULT"}, + {SP_RESTRICTED, "CPUSET_SP_RESTRICTED"} +}; + +static const std::unordered_map<int, std::string> kSchedProfileMap = { + {SP_DEFAULT, "SCHED_SP_DEFAULT"}, {SP_BACKGROUND, "SCHED_SP_BACKGROUND"}, + {SP_FOREGROUND, "SCHED_SP_FOREGROUND"}, {SP_SYSTEM, "SCHED_SP_DEFAULT"}, + {SP_AUDIO_APP, "SCHED_SP_FOREGROUND"}, {SP_AUDIO_SYS, "SCHED_SP_FOREGROUND"}, + {SP_TOP_APP, "SCHED_SP_TOP_APP"}, {SP_RT_APP, "SCHED_SP_RT_APP"}, + {SP_RESTRICTED, "SCHED_SP_DEFAULT"} +}; + // For both of these, err should be in the errno range (positive), not a status_t (negative) static void signalExceptionForError(JNIEnv* env, int err, int tid) { switch (err) { @@ -206,8 +226,9 @@ void android_os_Process_setThreadGroup(JNIEnv* env, jobject clazz, int tid, jint if (!verifyGroup(env, grp)) { return; } - SchedPolicy sp = (SchedPolicy) grp; - int res = set_sched_policy(tid, sp); + + int res = SetTaskProfiles(tid, {kSchedProfileMap.at(grp)}, true) ? 0 : -1; + if (res != NO_ERROR) { signalExceptionForGroupError(env, -res, tid); } @@ -219,14 +240,9 @@ void android_os_Process_setThreadGroupAndCpuset(JNIEnv* env, jobject clazz, int if (!verifyGroup(env, grp)) { return; } - SchedPolicy sp = (SchedPolicy) grp; - int res = set_sched_policy(tid, sp); - if (res != NO_ERROR) { - signalExceptionForGroupError(env, -res, tid); - } + int res = SetTaskProfiles(tid, {kCpusetProfileMap.at(grp)}, true) ? 0 : -1; - res = set_cpuset_policy(tid, sp); if (res != NO_ERROR) { signalExceptionForGroupError(env, -res, tid); } @@ -239,7 +255,11 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin char proc_path[255]; struct dirent *de; - if ((grp == SP_FOREGROUND) || (grp > SP_MAX)) { + if (!verifyGroup(env, grp)) { + return; + } + + if (grp == SP_FOREGROUND) { signalExceptionForGroupError(env, EINVAL, pid); return; } @@ -249,10 +269,6 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin grp = SP_FOREGROUND; isDefault = true; } - if (!verifyGroup(env, grp)) { - return; - } - SchedPolicy sp = (SchedPolicy) grp; if (kDebugPolicy) { char cmdline[32]; @@ -268,7 +284,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin close(fd); } - if (sp == SP_BACKGROUND) { + if (grp == SP_BACKGROUND) { ALOGD("setProcessGroup: vvv pid %d (%s)", pid, cmdline); } else { ALOGD("setProcessGroup: ^^^ pid %d (%s)", pid, cmdline); @@ -286,6 +302,7 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin while ((de = readdir(d))) { int t_pid; int t_pri; + int err; if (de->d_name[0] == '.') continue; @@ -311,28 +328,16 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin if (t_pri >= ANDROID_PRIORITY_BACKGROUND) { // This task wants to stay at background // update its cpuset so it doesn't only run on bg core(s) - if (cpusets_enabled()) { - int err = set_cpuset_policy(t_pid, sp); - if (err != NO_ERROR) { - signalExceptionForGroupError(env, -err, t_pid); - break; - } + err = SetTaskProfiles(t_pid, {kCpusetProfileMap.at(grp)}, true) ? 0 : -1; + if (err != NO_ERROR) { + signalExceptionForGroupError(env, -err, t_pid); + break; } continue; } } - int err; - - if (cpusets_enabled()) { - // set both cpuset and cgroup for general threads - err = set_cpuset_policy(t_pid, sp); - if (err != NO_ERROR) { - signalExceptionForGroupError(env, -err, t_pid); - break; - } - } - err = set_sched_policy(t_pid, sp); + err = SetTaskProfiles(t_pid, {kCpusetProfileMap.at(grp)}, true) ? 0 : -1; if (err != NO_ERROR) { signalExceptionForGroupError(env, -err, t_pid); break; diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp index 222a87321aa4..538861e21d96 100644 --- a/core/jni/android_view_RenderNode.cpp +++ b/core/jni/android_view_RenderNode.cpp @@ -52,9 +52,14 @@ static void android_view_RenderNode_output(JNIEnv* env, jobject clazz, jlong ren renderNode->output(); } -static jint android_view_RenderNode_getDebugSize(JNIEnv* env, jobject clazz, jlong renderNodePtr) { +static jint android_view_RenderNode_getUsageSize(JNIEnv* env, jobject clazz, jlong renderNodePtr) { RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); - return renderNode->getDebugSize(); + return renderNode->getUsageSize(); +} + +static jint android_view_RenderNode_getAllocatedSize(JNIEnv* env, jobject clazz, jlong renderNodePtr) { + RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); + return renderNode->getAllocatedSize(); } static jlong android_view_RenderNode_create(JNIEnv* env, jobject, jstring name) { @@ -647,7 +652,8 @@ static const JNINativeMethod gMethods[] = { { "nCreate", "(Ljava/lang/String;)J", (void*) android_view_RenderNode_create }, { "nGetNativeFinalizer", "()J", (void*) android_view_RenderNode_getNativeFinalizer }, { "nOutput", "(J)V", (void*) android_view_RenderNode_output }, - { "nGetDebugSize", "(J)I", (void*) android_view_RenderNode_getDebugSize }, + { "nGetUsageSize", "(J)I", (void*) android_view_RenderNode_getUsageSize }, + { "nGetAllocatedSize", "(J)I", (void*) android_view_RenderNode_getAllocatedSize }, { "nAddAnimator", "(JJ)V", (void*) android_view_RenderNode_addAnimator }, { "nEndAllAnimators", "(J)V", (void*) android_view_RenderNode_endAllAnimators }, { "nRequestPositionUpdates", "(JLandroid/graphics/RenderNode$PositionUpdateListener;)V", (void*) android_view_RenderNode_requestPositionUpdates }, diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto index d54b6b0b00e5..d01a45c2002a 100644 --- a/core/proto/android/server/activitymanagerservice.proto +++ b/core/proto/android/server/activitymanagerservice.proto @@ -118,13 +118,15 @@ message TaskRecordProto { message ActivityRecordProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; + // To be removed soon. + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1 [deprecated=true]; optional .com.android.server.wm.IdentifierProto identifier = 2; optional string state = 3; optional bool visible = 4; optional bool front_of_task = 5; optional int32 proc_id = 6; optional bool translucent = 7; + optional .com.android.server.wm.AppWindowTokenProto app_window_token = 8; } message KeyguardControllerProto { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7ce370ff52be..b030b33daf5e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -798,7 +798,7 @@ broadcast module. This is required in order to bind to the cell broadcast service, and ensures that only the system can forward messages to it. - <p>Protection level: signature|privileged + <p>Protection level: signature @hide --> <permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" @@ -2564,19 +2564,6 @@ android:label="@string/permlab_readSyncStats" android:protectionLevel="normal" /> - <!-- ==================================================== --> - <!-- Permissions related to accessibility --> - <!-- ==================================================== --> - <eat-comment /> - - <!-- Allows applications to define the accessibility shortcut target. - <p>Protection level: normal - --> - <permission android:name="android.permission.ACCESSIBILITY_SHORTCUT_TARGET" - android:description="@string/permdesc_accessibilityShortcutTarget" - android:label="@string/permlab_accessibilityShortcutTarget" - android:protectionLevel="normal" /> - <!-- ============================================ --> <!-- Permissions for low-level system interaction --> <!-- ============================================ --> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 0e0f34a2d6e1..dd9eafe44185 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Laat die program toe om SMS-boodskappe te ontvang en te verwerk. Dit beteken dat die program boodskappe wat na jou toestel gestuur is, kan monitor of uitvee, sonder dat jy dit gesien het."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ontvang teksboodskappe (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Laat die program toe om MMS-boodskappe te ontvang en te verwerk. Dit beteken dat die program boodskappe wat na jou toestel gestuur is kan monitor of uitvee, sonder dat jy dit gesien het."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lees seluitsending-boodskappe"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Laat die program toe om seluitsending-boodskappe te lees wat deur jou toestel ontvang word. Seluitsending-waarskuwings word in sommige plekke afgelewer om jou van noodsituasies te waarsku. Kwaadwillige programme mag inmeng met die prestasie of die werking van jou toestel wanneer \'n noodgeval se seluitsending ontvang word."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lees ingetekende nuus"</string> @@ -1077,7 +1081,7 @@ <string name="Midnight" msgid="5630806906897892201">"Middernag"</string> <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> - <string name="selectAll" msgid="6876518925844129331">"Kies alle"</string> + <string name="selectAll" msgid="6876518925844129331">"Kies alles"</string> <string name="cut" msgid="3092569408438626261">"Sny"</string> <string name="copy" msgid="2681946229533511987">"Kopieer"</string> <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"Kon nie na knipbord toe kopieer nie"</string> @@ -1358,7 +1362,7 @@ <string name="usb_power_notification_message" msgid="4647527153291917218">"Laai tans gekoppelde toestel. Tik vir meer opsies."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Analoë oudiobykomstigheid bespeur"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"Die aangehegde toestel is nie met hierdie foon versoenbaar nie. Tik om meer te wete te kom."</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-ontfouter gekoppel"</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-ontfouting gekoppel"</string> <string name="adb_active_notification_message" msgid="7463062450474107752">"Tik om USB-ontfouting af te skakel"</string> <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Kies om USB-ontfouting te deaktiveer."</string> <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"Toetsraamwerkmodus is geaktiveer"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index eec1b221eac6..a007c9dd85c4 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"መተግበሪያው የኤስ.ኤም.ኤስ. መልዕክቶችን እንዲያነብ እና እንዲያካሂድ ይፈቅዳል። ይህ ማለት መተግበሪያው ወደ መሳሪያህ የተላኩ መልዕክቶችን ላንተ ሳያሳይህ ሊቆጣጠር ወይም ሊሰርዝ ይችላል።"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"የፅሁፍ መልዕክቶችን ተቀበል (ኤም.ኤም.ኤስ.)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"መተግበሪያው የኤም.ኤም.ኤስ. መልዕክቶችን እንዲያነብ እና እንዲያካሂድ ይፈቅዳል። ይህ ማለት መተግበሪያው ወደ መሳሪያህ የተላኩ መልዕክቶችን ላንተ ሳያሳይህ ሊቆጣጠር ወይም ሊሰርዝ ይችላል።"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"የህዋስ ስርጭት መልዕክቶችን አንብብ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"መሣሪያህ የህዋስ ስርጭት መልዕክቶች ሲቀበል መተግበሪያው እንዲያነበው ይፈቅድለታል። የህዋስ ስርጭት ማንቂያዎች አስቸኳይ ሁኔታዎች ሲያጋጥሙ አንዳንድ አካባቢዎች ላይ የሚላኩ ናቸው። የህዋስ ስርጭት ሲደርስ ተንኮል አዘል መተግበሪያዎች በመሣሪያህ አፈጻጸም ወይም አሰራር ላይ ጣልቃ ሊገቡ ይችላሉ።"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"የምዝገባ መግቦች አንበብ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index d195d7482790..2e272eec634b 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -356,6 +356,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"للسماح للتطبيق بتلقي ومعالجة الرسائل القصيرة SMS. وهذا يعني أنه يمكن للتطبيق مراقبة الرسائل التي يتم إرسالها إلى جهازك أو حذفها بدون عرضها لك."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"تلقي رسائل نصية (رسائل وسائط متعددة)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"للسماح للتطبيق بتلقي ومعالجة رسائل الوسائط المتعددة. وهذا يعني أنه يمكن للتطبيق مراقبة الرسائل التي يتم إرسالها لجهازك أو حذفها بدون عرضها لك."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"قراءة رسائل بث الخلية"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"السماح للتطبيق بقراءة رسائل بث الخلية التي يتلقاها هذا الجهاز. يتم تسليم اشعارات بث الخلية في بعض المواقع لتحذيرك من حالات طارئة. يمكن أن تتداخل التطبيقات الضارة مع أداء أو تشغيل الجهاز عندما يتم تلقي بث خلية طارئ."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"قراءة الخلاصات المشتركة"</string> @@ -1157,7 +1161,7 @@ <string name="Midnight" msgid="5630806906897892201">"منتصف الليل"</string> <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> - <string name="selectAll" msgid="6876518925844129331">"تحديد الكل"</string> + <string name="selectAll" msgid="6876518925844129331">"اختيار الكل"</string> <string name="cut" msgid="3092569408438626261">"قص"</string> <string name="copy" msgid="2681946229533511987">"نسخ"</string> <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"تعذّر النسخ في الحافظة"</string> @@ -1446,8 +1450,8 @@ <string name="usb_power_notification_message" msgid="4647527153291917218">"جارٍ شحن الجهاز المتصل. انقر لعرض خيارات أكثر."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"تم اكتشاف ملحق صوتي تناظري"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"الجهاز الذي تم توصيله بالهاتف غير متوافق معه. انقر للحصول على المزيد من المعلومات."</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"تم توصيل تصحيح أخطاء USB"</string> - <string name="adb_active_notification_message" msgid="7463062450474107752">"انقر لإيقاف تصحيح أخطاء USB."</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"تم توصيل تصحيح أخطاء الجهاز عبر USB"</string> + <string name="adb_active_notification_message" msgid="7463062450474107752">"انقر لإيقاف تصحيح أخطاء الجهاز عبر USB."</string> <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"اختيار إيقاف تصحيح أخطاء USB."</string> <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"تم تفعيل وضع \"مفعّل الاختبار\""</string> <string name="test_harness_mode_notification_message" msgid="1343197173054407119">"يمكنك إجراء إعادة ضبط على إعدادات المصنع لإيقاف وضع \"مفعِّل اختبار\"."</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index aa2fbc570021..70d9713b8fa9 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"এপটোক এছএমএছ বাৰ্তাবোৰ পাবলৈ আৰু প্ৰক্ৰিয়া সম্পন্ন কৰিবলৈ অনুমতি দিয়ে৷ ইয়াৰ অৰ্থ এইটোৱেই যে এপটোৱে আপোনাক বাৰ্তাবোৰ নেদেখুৱাকৈয়ে আপোনাৰ ডিভাইচলৈ পঠিওৱা বাৰ্তাবোৰ নিৰীক্ষণ কৰিব বা মচিব পাৰে৷"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"পাঠ বার্তা (এমএমএছ) বোৰ লাভ কৰক"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"এমএমএছ বার্তাবোৰ লাভ আৰু ইয়াৰ প্ৰক্ৰিয়া সম্পন্ন কৰিবলৈ এপক অনুমতি দিয়ে। ইয়াৰ অৰ্থ হৈছে এই এপে আপোনাৰ ডিভাইচলৈ প্ৰেৰণ কৰা বার্তাসমূহ আপোনাক নেদেখুৱাকৈয়ে পৰ্যবেক্ষণ আৰু মচিব পাৰে।"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"চেল সম্প্ৰচাৰৰ বার্তাবোৰ পঢ়ক"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"আপোনাৰ ডিভাইচে লাভ কৰা চেল সম্প্ৰচাৰৰ বার্তাবোৰ পঢ়িবলৈ এপক অনুমতি দিয়ে। আপোনাক জৰুৰীকালীন পৰিস্থিতিবোৰত সর্তক কৰিবলৈ চেল সম্প্ৰচাৰৰ বার্তাবোৰ প্ৰেৰণ কৰা হয়। জৰুৰীকালীন চেল সম্প্ৰচাৰ লাভ কৰাৰ সময়ত আপোনাৰ ডিভাইচৰ কাৰ্যদক্ষতা বা কাৰ্যপ্ৰণালীত ক্ষতিকাৰক এপবোৰে হস্তক্ষেপ কৰিব পাৰে।"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"আপুনি সদস্যভুক্ত হোৱা ফীডসমূহ পঢ়ক"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 5709bfdc2126..5d092504c83d 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Tətbiqə MMS mesajlarını almaq və emal etmək icazəsi verir. Bu o deməkdir ki, tətbiq sizin mesajlarınızı sizə göstərmədən monitorinq edə və ya silə bilər."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"mətn mesajlarını qəbul edir (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Tətbiqə MMS mesajlarını qəbul və emal üçün imkan verir. Bu o deməkdir ki, bu tətbiq sizə göstərmədən cihazınıza göndərilən mesajları silə bilər."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"mobil yayım mesajlarını oxuyur"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tətbiqə telefonunuz tərəfindən alınmış yayım mesajlarını oxuma icazəsi verir. Telefon yayımı bəzi məkanlarda olan fövqəladə hadisələrlə bağlı sizi xəbərdar etmək üçün qəbul edilir. Zərərli tətbiqlər təcili mobil yayım qəbul edildiyi zaman telefonunun performansına və əməliyyatına müdaxilə edə bilər."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"abunə olunmuş xəbərləri oxuyur"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 0e3332968375..5891baee1e93 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Dozvoljava aplikaciji da prima i obrađuje SMS poruke. To znači da aplikacija može da nadgleda ili briše poruke koje se šalju uređaju, a da vam ih ne prikaže."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"prijem tekstualnih poruka (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Dozvoljava aplikaciji da prima i obrađuje MMS poruke. To znači da aplikacija može da nadgleda ili briše poruke koje se šalju uređaju, a da vam ih ne prikaže."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čitanje poruka info servisa"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Omogućava aplikaciji da čita poruke info servisa koje uređaj prima. Upozorenja info servisa se na nekim lokacijama primaju kao upozorenja na hitne slučajeve. Zlonamerne aplikacije mogu da utiču na učinak ili ometaju funkcionisanje uređaja kada se primi poruka info servisa o hitnom slučaju."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"čitanje prijavljenih fidova"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 662290d8f7e6..6fdc8f121486 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Дазваляе прыкладанням атрымліваць і апрацоўваць SMS-паведамленні. Гэта значыць, што прыкладанне можа кантраляваць або выдаляць паведамленні, адпраўленыя на прыладу, не паказваючы іх вам."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"атрыманне тэкставых паведамленняў (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Дазваляе прыкладанням атрымліваць і апрацоўваць MMS-паведамленнi. Гэта значыць, што прыкладанне можа кантраляваць або выдаляць паведамленні, адпраўленыя на прыладу, не паказваючы іх вам."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"чытаць паведамленні базавай станцыі"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Дазваляе прыкладанню чытаць паведамленні базавай станцыі, атрыманыя прыладай. Папярэджанні базавай станцыі дасылаюцца ў некаторыя месцы, каб папярэдзіць вас аб надзвычайных сітуацыях. Шкоднасныя прыкладанні могуць уплываць на прадукцыйнасць ці працу прылады пры атрыманні паведамлення базавай станцыі аб надзвычайнай сітуацыі."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"чытаць падпісаныя каналы"</string> @@ -1408,7 +1412,7 @@ <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"Тэставы рэжым уключаны"</string> <string name="test_harness_mode_notification_message" msgid="1343197173054407119">"Каб выключыць тэставы рэжым, скіньце налады да заводскіх значэнняў."</string> <string name="console_running_notification_title" msgid="4955436518220103382">"Паслядоўная кансоль уключана"</string> - <string name="console_running_notification_message" msgid="1331995933976263865">"Змянілася эфектыўнасць. Каб выключыць, праверце загрузчык."</string> + <string name="console_running_notification_message" msgid="1331995933976263865">"Паказчык эфектыўнасці змяніўся. Каб выключыць кансоль, праверце загрузчык."</string> <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Вадкасць або смецце ў порце USB"</string> <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Порт USB аўтаматычна адключаны. Каб даведацца больш, націсніце тут."</string> <string name="usb_contaminant_not_detected_title" msgid="7708281124088684821">"Порт USB можна выкарыстоўваць"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 28949d184d63..e5fb7e85882d 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Разрешава на приложението да получава и обработва SMS съобщения. Това означава, че то може да наблюдава или изтрива изпратените до устройството ви, без да ви ги покаже."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"получаване на текстови съобщения (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Разрешава на приложението да получава и обработва MMS съобщения. Това означава, че то може да наблюдава или изтрива изпратените до устройството ви, без да ви ги покаже."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"четене на съобщения с клетъчно излъчване"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Разрешава на приложението да чете съобщения с клетъчно излъчване, получени от устройството ви. Сигналите с клетъчно излъчване се получават на някои местоположения, за да ви предупредят за спешни ситуации. Злонамерените приложения могат да възпрепятстват изпълнението или работата на устройството ви при получаване на такова спешно излъчване."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"четене на емисиите с абонамент"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index f88e778273be..651ed4d981a2 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"অ্যাপ্লিকেশানটিকে এসএমএস প্রাপ্ত করার এবং প্রক্রিয়া করার অনুমতি দেয়৷ এর মানে হল অ্যাপ্লিকেশানটি আপনার ডিভাইস থেকে পাঠানো বার্তাগুলিকে পর্যবেক্ষণ করতে পারে এবং মুছতে পারে সেগুলিকে আপনাকে না দেখিয়ে৷"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"টেক্সট মেসেজ পান (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"অ্যাপ্লিকেশানটিকে MMS মেসেজ প্রাপ্ত করার এবং প্রক্রিয়া করার অনুমতি দেয়৷ এর মানে হল অ্যাপ্লিকেশানটি আপনার ডিভাইস থেকে পাঠানো মেসেজগুলিকে পর্যবেক্ষণ করতে পারে এবং মুছতে পারে সেগুলিকে আপনাকে না দেখিয়ে৷"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"সেল সম্প্রচার মেসেজ পড়ুন"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"আপনার ডিভাইস দ্বারা প্রাপ্ত সেল সম্প্রচার পড়তে অ্যাপ্লিকেশানটিকে অনুমতি দেয়৷ কয়েকটি স্থানে আপনাকে জরুরি অবস্থার জন্য সতর্ক করতে জরুরি সতর্কতাগুলি বিতরণ করা হয়৷ যখন একটি জরুরি সেল সম্প্রচার প্রাপ্ত হয় তখন ক্ষতিকারক অ্যাপ্লিকেশানগুলি আপনার ডিভাইসের কার্য সম্পাদনা বা কার্যকলাপে প্রতিবন্ধকতার সৃষ্টি করতে পারে৷"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"গ্রাহক হিসেবে নেওয়া ফিডগুলি পড়ে"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index ae075cc8de6f..0695fb8890db 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Omogućava aplikaciji primanje i obradu SMS poruka. Ovo znači da aplikacija može pratiti ili brisati poruke poslane na vaš uređaj, a da vam ih pritom ne prikazuje."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"primanje tekstualnih poruka (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Omogućava aplikaciji prijem i obradu MMS poruka. Ovo znači da aplikacija može pratiti ili brisati poruke poslane na vaš uređaj, a da vam ih pritom ne prikazuje."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čitanje poruka info servisa"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Omogućava aplikaciji čitanje poruka info servisa koje je primio vaš uređaj. Upozorenja koja emitira info servis se isporučuju na nekim lokacijama kako bi vas upozorila na vanredne situacije. Zlonamjerne aplikacije mogu ometati performanse ili rad vašeg uređaja kada primite informaciju o vanrednoj situaciji od info servisa."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"čitanje sadržaja na koje ste pretplaćeni"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 0427569a6056..8ef9a17162f9 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permet que l\'aplicació rebi i processi missatges SMS. Això vol dir que l\'aplicació pot controlar o suprimir missatges que s\'han enviat al teu dispositiu sense mostrar-te\'ls."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recepció de missatges de text (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permet que l\'aplicació rebi i processi missatges MMS. Això vol dir que l\'aplicació pot controlar o suprimir missatges que s\'han enviat al teu dispositiu sense mostrar-te\'ls."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"llegir missatges de difusió mòbil"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permet que l\'aplicació llegeixi missatges de difusió mòbil rebuts pel dispositiu. Les alertes de difusió mòbil s\'entreguen en algunes ubicacions per alertar de situacions d\'emergència. És possible que les aplicacions malicioses interfereixin en el rendiment o en el funcionament del dispositiu quan es rep una difusió mòbil d\'emergència."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"llegir els feeds als quals esteu subscrit"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 32dac4d34727..72e7a86d0a05 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Umožňuje aplikaci přijmout a zpracovat zprávy SMS. Znamená to, že aplikace může sledovat zprávy odeslané do vašeho zařízení nebo je smazat, aniž by se vám zobrazily."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"příjem textových zpráv (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Umožňuje aplikaci přijmout a zpracovat zprávy MMS. Znamená to, že aplikace může sledovat zprávy odeslané do vašeho zařízení nebo je smazat, aniž by se vám zobrazily."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čtení zpráv informačních služeb"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Umožňuje aplikaci číst zprávy informačních služeb přijaté ve vašem zařízení. Výstražná upozornění informačních služeb jsou v některých oblastech odesílána za účelem varování před výjimečnými událostmi. Škodlivé aplikace mohou narušit výkon či provoz vašeho zařízení během přijímání zpráv informačních služeb."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"čtení zdrojů přihlášených k odběru"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 3d7958817b27..88900a0b2fd2 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Tillader, at appen kan modtage og behandle sms-beskeder. Det betyder, at appen kan overvåge eller slette de beskeder, der sendes til din enhed, uden at vise dem til dig."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"modtage tekstbeskeder (mms)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Tillader, at appen kan modtage og behandle mms-beskeder. Det betyder, at appen kan overvåge eller slette de beskeder, der sendes til din enhed, uden at vise dem til dig."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"læse Cell Broadcast-meddelelser"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-underretninger, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-underretninger for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-meddelelse om en nødsituation."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læse feeds, jeg abonnerer på"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index cbba324f3a78..6bf54040e5c5 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Ermöglicht der App, SMS zu empfangen und zu verarbeiten. Das bedeutet, dass die App an dein Gerät gesendete Nachrichten überwachen und löschen kann, ohne sie dir anzuzeigen."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"MMS empfangen"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Ermöglicht der App, MMS zu empfangen und zu verarbeiten. Das bedeutet, dass die App an dein Gerät gesendete Nachrichten überwachen und löschen kann, ohne sie dir anzuzeigen."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"Cell Broadcast-Nachrichten lesen"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Ermöglicht der App, von deinem Gerät empfangene Cell Broadcast-Nachrichten zu lesen. Cell Broadcast-Benachrichtigungen werden an einigen Standorten gesendet, um dich über Notfallsituationen zu informieren. Schädliche Apps können die Leistung oder den Betrieb deines Geräts beeinträchtigen, wenn eine Cell Broadcast-Notfallbenachrichtigung eingeht."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"Abonnierte Feeds lesen"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index e162d6b9d5de..3570fc151a28 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Επιτρέπει στην εφαρμογή τη λήψη και την επεξεργασία μηνυμάτων SMS. Αυτό σημαίνει ότι η εφαρμογή θα μπορούσε να παρακολουθήσει ή να διαγράψει τα μηνύματα που αποστέλλονται στη συσκευή σας χωρίς αυτά να εμφανιστούν σε εσάς."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"λαμβάνει μηνύματα κειμένου (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Επιτρέπει στην εφαρμογή τη λήψη και την επεξεργασία μηνυμάτων MMS. Αυτό σημαίνει ότι η εφαρμογή θα μπορούσε να παρακολουθήσει ή να διαγράψει τα μηνύματα που αποστέλλονται στη συσκευή σας χωρίς αυτά να εμφανιστούν σε εσάς."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"διαβάζει μηνύματα που έχουν μεταδοθεί μέσω κινητού τηλεφώνου"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Επιτρέπει στην εφαρμογή την ανάγνωση μηνυμάτων που έχουν μεταδοθεί μέσω κινητού τηλεφώνου και έχουν ληφθεί από τη συσκευή σας. Ειδοποιήσεις που μεταδίδονται μέσω κινητού παραδίδονται σε ορισμένες τοποθεσίες για να σας προειδοποιήσουν για καταστάσεις έκτακτης ανάγκης. Κακόβουλες εφαρμογές ενδέχεται να παρεμποδίσουν την απόδοση ή τη λειτουργία της συσκευής σας κατά τη λήψη μετάδοσης μέσω κινητού σχετικά με μια επείγουσα κατάσταση."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"διαβάζει ροές δεδομένων στις οποίες έχετε εγγραφεί"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 56d09f3d7b59..e1d9875e2fea 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read mobile broadcast messages"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read mobile broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency mobile broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 2aafb7a40793..56b54d9b6109 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read mobile broadcast messages"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read mobile broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency mobile broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 56d09f3d7b59..e1d9875e2fea 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read mobile broadcast messages"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read mobile broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency mobile broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 56d09f3d7b59..e1d9875e2fea 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means that the app could monitor or delete messages sent to your device without showing them to you."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read mobile broadcast messages"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read mobile broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency mobile broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 9844b6704d8f..c4d315743b7e 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read cell broadcast messages"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read cell broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency cell broadcast is received."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 7289f4b5cdf6..30f8ba71bf47 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite que la aplicación reciba y procese mensajes SMS, lo que significa que podría controlar o eliminar mensajes enviados al dispositivo sin mostrártelos."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recibir mensajes de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite que la aplicación reciba y procese mensajes MMS, lo que significa que podría controlar o eliminar mensajes enviados al dispositivo sin mostrártelos."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"Leer mensajes de difusión móvil"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite a la aplicación leer los mensajes de difusión móvil que recibe tu dispositivo. En algunas ubicaciones, las alertas de difusión móvil se envían para informar situaciones de emergencia. Las aplicaciones maliciosas pueden afectar el rendimiento o funcionamiento de tu dispositivo cuando se recibe un un mensaje de difusión móvil de emergencia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"leer canales suscritos"</string> @@ -1359,7 +1363,7 @@ <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Se detectó un accesorio de audio analógico"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"El dispositivo adjunto no es compatible con este teléfono. Presiona para obtener más información."</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración por USB conectada"</string> - <string name="adb_active_notification_message" msgid="7463062450474107752">"Presiona para desactivar la depuración USB"</string> + <string name="adb_active_notification_message" msgid="7463062450474107752">"Presiona para desactivar la depuración por USB"</string> <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Seleccionar para desactivar la depuración por USB"</string> <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"Se habilitó el modo de agente de prueba"</string> <string name="test_harness_mode_notification_message" msgid="1343197173054407119">"Restablece la configuración de fábrica para inhabilitar el modo de agente de prueba."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index c513b3970f49..15e662c60aad 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite que la aplicación reciba y procese mensajes MMS, lo que significa que podría utilizar este permiso para controlar o eliminar mensajes enviados al dispositivo sin mostrárselos al usuario."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recibir mensajes de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite que la aplicación reciba y procese mensajes MMS, lo que significa que podría utilizar este permiso para controlar o eliminar mensajes enviados al dispositivo sin mostrárselos al usuario."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"leer mensajes de difusión móvil"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite que la aplicación lea mensajes de difusión móvil que haya recibido el dispositivo. Las alertas de difusión móvil se envían en algunas ubicaciones para avisar de situaciones de emergencia. Es posible que las aplicaciones malintencionadas interfieran en el rendimiento o en el funcionamiento del dispositivo si se recibe una alerta de difusión móvil de emergencia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"leer feeds a los que está suscrito el usuario"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index d70a5804c37a..093f7d767dc6 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Võimaldab rakendusel vastu võtta ja töödelda SMS-sõnumeid. See tähendab, et rakendus võib jälgida või kustutada teie seadmele saadetud sõnumeid neid teile näitamata."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"võtke vastu tekstisõnumeid (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Võimaldab rakendusel vastu võtta ja töödelda multimeediumsõnumeid. See tähendab, et rakendus võib jälgida või kustutada teie seadmele saadetud sõnumeid neid teile näitamata."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"mobiilsidesõnumite lugemine"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Võimaldab rakendusel lugeda seadme vastu võetud mobiilsidesõnumeid. Mobiilsidemärguandeid edastatakse mõnes asukohas eriolukorrast teavitamiseks. Pahatahtlikud rakendused võivad segada seadme toimivust või tööd eriolukorra sõnumi vastuvõtmisel."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"loe tellitud kanaleid"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 3a9cb13cd37b..53b1a38bcf6e 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -280,37 +280,37 @@ <string name="managed_profile_label" msgid="8947929265267690522">"Aldatu laneko profilera"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Kontaktuak"</string> <string name="permgroupdesc_contacts" msgid="6951499528303668046">"atzitu kontaktuak"</string> - <string name="permgrouprequest_contacts" msgid="6032805601881764300">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari kontaktuak atzitzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_contacts" msgid="6032805601881764300">"Kontaktuak atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Kokapena"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"atzitu gailuaren kokapena"</string> - <string name="permgrouprequest_location" msgid="3788275734953323491">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari gailuaren kokapena atzitzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_location" msgid="3788275734953323491">"Gailuaren kokapena atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouprequestdetail_location" msgid="1347189607421252902">"Hura erabiltzen ari zarenean soilik atzituko du aplikazioak kokapena"</string> - <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari gailuaren kokapena <b>beti</b> atzitzeko baimena eman nahi diozu?"</string> + <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"Gailuaren kokapena <b>beti</b> atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="4597006851453417387">"Aplikazioak hura darabilzunean atzi dezake kokapena"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Egutegia"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"atzitu egutegia"</string> - <string name="permgrouprequest_calendar" msgid="289900767793189421">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari egutegia atzitzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_calendar" msgid="289900767793189421">"Egutegia atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS mezuak"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"bidali eta ikusi SMS mezuak"</string> - <string name="permgrouprequest_sms" msgid="7168124215838204719">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari SMS mezuak bidaltzeko eta ikusteko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_sms" msgid="7168124215838204719">"SMS mezuak bidaltzeko eta ikusteko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Memoria"</string> <string name="permgroupdesc_storage" msgid="637758554581589203">"atzitu gailuko argazkiak, multimedia-edukia eta fitxategiak"</string> - <string name="permgrouprequest_storage" msgid="7885942926944299560">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari gailuko argazkiak, multimedia-edukia eta fitxategiak atzitzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_storage" msgid="7885942926944299560">"Gailuko argazkiak, multimedia-edukia eta fitxategiak atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Mikrofonoa"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"grabatu audioa"</string> - <string name="permgrouprequest_microphone" msgid="9167492350681916038">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari audioa grabatzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_microphone" msgid="9167492350681916038">"Audioa grabatzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"Ariketa fisikoa"</string> <string name="permgroupdesc_activityRecognition" msgid="6949472038320473478">"ariketa fisikoak atzitu"</string> <string name="permgrouprequest_activityRecognition" msgid="7626438016904799383">"Zure ariketa fisikoak atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"Kamera"</string> <string name="permgroupdesc_camera" msgid="3250611594678347720">"atera argazkiak eta grabatu bideoak"</string> - <string name="permgrouprequest_camera" msgid="1299833592069671756">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari argazkiak ateratzeko eta bideoak grabatzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_camera" msgid="1299833592069671756">"Argazkiak ateratzeko eta bideoak grabatzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_calllog" msgid="8798646184930388160">"Deien erregistroa"</string> <string name="permgroupdesc_calllog" msgid="3006237336748283775">"irakurri telefonoko deien erregistroa eta idatzi bertan"</string> - <string name="permgrouprequest_calllog" msgid="8487355309583773267">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari telefonoko deien erregistroa atzitzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_calllog" msgid="8487355309583773267">"Telefonoko deien erregistroa atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"Telefonoa"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"egin eta kudeatu telefono-deiak"</string> - <string name="permgrouprequest_phone" msgid="9166979577750581037">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari telefono-deiak egiteko eta kudeatzeko baimena eman nahi diozu?"</string> + <string name="permgrouprequest_phone" msgid="9166979577750581037">"Telefono-deiak egiteko eta kudeatzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> <string name="permgrouplab_sensors" msgid="4838614103153567532">"Gorputz-sentsoreak"</string> <string name="permgroupdesc_sensors" msgid="7147968539346634043">"atzitu bizi-konstanteei buruzko sentsorearen datuak"</string> <string name="permgrouprequest_sensors" msgid="6349806962814556786">"Bizi-konstanteei buruzko sentsorearen datuak atzitzeko baimena eman nahi diozu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari?"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS mezuak jasotzeko eta prozesatzeko baimena ematen die aplikazioei. Horrela, aplikazioak gailura bidalitako mezuak kontrola eta ezaba ditzake zuri erakutsi gabe."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"jaso testu-mezuak (MMSak)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS mezuak jasotzeko eta prozesatzeko baimena ematen die aplikazioei. Horrela, aplikazioak gailura bidalitako mezuak kontrola eta ezaba ditzake zuri erakutsi gabe."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"irakurri sare mugikor bidezko igorpen-mezuak"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Gailuak jasotako sare mugikor bidezko igorpenen mezuak irakurtzeko baimena ematen die aplikazioei. Sare mugikor bidezko igorpen-alertak kokapen batzuetan ematen dira larrialdi-egoeren berri emateko. Aplikazio gaiztoek gailuaren errendimendua edo funtzionamendua oztopa dezakete larrialdi-igorpen horietako bat jasotzen denean."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"irakurri harpidetutako jarioak"</string> @@ -1895,8 +1899,8 @@ <string name="default_notification_channel_label" msgid="5929663562028088222">"Kategoriarik gabea"</string> <string name="importance_from_user" msgid="7318955817386549931">"Zuk ezarri duzu jakinarazpen hauen garrantzia."</string> <string name="importance_from_person" msgid="9160133597262938296">"Garrantzitsua da eragiten dien pertsonengatik."</string> - <string name="user_creation_account_exists" msgid="6559477114648176531">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari <xliff:g id="ACCOUNT">%2$s</xliff:g> kontua duen erabiltzailea sortzeko baimena eman nahi diozu? (Badago kontu hori duen erabiltzaile bat)"</string> - <string name="user_creation_adding" msgid="9089159170398841763">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari <xliff:g id="ACCOUNT">%2$s</xliff:g> kontua duen erabiltzailea sortzeko baimena eman nahi diozu?"</string> + <string name="user_creation_account_exists" msgid="6559477114648176531">"<xliff:g id="ACCOUNT">%2$s</xliff:g> kontua duen erabiltzailea sortzeko baimena eman nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari? (Badago kontu hori duen erabiltzaile bat)"</string> + <string name="user_creation_adding" msgid="9089159170398841763">"<xliff:g id="ACCOUNT">%2$s</xliff:g> kontua duen erabiltzailea sortzeko baimena eman nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string> <string name="language_selection_title" msgid="2680677278159281088">"Gehitu hizkuntza"</string> <string name="country_selection_title" msgid="2954859441620215513">"Lurralde-hobespena"</string> <string name="search_language_hint" msgid="7042102592055108574">"Adierazi hizkuntza"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index f0ea22d14d3f..2b849d57df87 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"به برنامه اجازه میدهد پیامکها را دریافت و پردازش کند. این یعنی برنامه میتواند پیامهای ارسالی به دستگاه شما را بدون نمایش آنها به شما حذف یا کنترل کند."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"دریافت پیامهای نوشتاری (فراپیام)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"به برنامه اجازه میدهد پیامهای فراپیام را دریافت و پردازش کند. این یعنی برنامه میتواند پیامهای ارسالی به دستگاه شما را بدون نمایش آنها به شما حذف یا کنترل کند."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"خواندن پیامهای پخش سلولی"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"به برنامه اجازه میدهد پیامهای پخش سلولی دستگاه شما را بخواند. هشدارهای پخش سلولی در برخی از موقعیتهای مکانی تحویل داده میشوند تا موقعیتهای اضطراری را به شما اعلام کنند. وقتی پخش سلولی دریافت میشود، ممکن است برنامههای مخرب در عملکرد یا کارکرد دستگاه شما اختلال ایجاد کنند."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"خواندن فیدهای مشترک"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index b1648f5af1df..c18e5bff10bf 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Antaa sovelluksen vastaanottaa ja käsitellä tekstiviestejä. Sovellus voi valvoa tai poistaa laitteeseesi lähetettyjä viestejä näyttämättä niitä sinulle."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"vastaanota tekstiviestejä (multimedia)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Antaa sovelluksen vastaanottaa ja käsitellä multimediaviestejä. Sovellus voi valvoa tai poistaa laitteeseesi lähetettyjä viestejä näyttämättä niitä sinulle."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lue tiedotteita"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Antaa sovelluksen lukea laitteesi vastaanottamia tiedotteita. Tiedotteiden avulla ilmoitetaan hätätilanteista joissakin paikoissa. Haitalliset sovellukset voivat häiritä laitteen toimintaa laitteen vastaanottaessa hätätiedotteen."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lukea tilattuja syötteitä"</string> @@ -1633,7 +1637,7 @@ <string name="kg_pattern_instructions" msgid="398978611683075868">"Piirrä kuvio"</string> <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Anna SIM-kortin PIN-koodi"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Anna PIN-koodi"</string> - <string name="kg_password_instructions" msgid="5753646556186936819">"Anna salasana"</string> + <string name="kg_password_instructions" msgid="5753646556186936819">"Lisää salasana"</string> <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-kortti on nyt poistettu käytöstä. Jatka antamalla PUK-koodi. Saat lisätietoja ottamalla yhteyttä operaattoriin."</string> <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Anna haluamasi PIN-koodi"</string> <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Vahvista haluamasi PIN-koodi"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 384f5fa1026b..3bd5c23001af 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permet à l\'application de recevoir et de traiter les messages texte. Cette autorisation lui donne la possibilité de surveiller ou de supprimer les messages envoyés à votre appareil sans vous les montrer."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recevoir des messages multimédias"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permet à l\'application de recevoir et de traiter les messages multimédias. Cette autorisation lui donne la possibilité de surveiller ou de supprimer les messages envoyés à votre appareil sans vous les montrer."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lire les messages de diffusion cellulaire"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permet à l\'application de lire les messages de diffusion cellulaire que votre appareil reçoit. Dans certaines zones géographiques, des alertes vous sont envoyées afin de vous prévenir en cas de situation d\'urgence. Des applications malveillantes peuvent venir perturber les performances ou le fonctionnement de votre appareil lors de la réception d\'un message de diffusion cellulaire."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lire les flux auxquels vous êtes abonné"</string> @@ -530,9 +534,9 @@ <string name="biometric_not_recognized" msgid="5770511773560736082">"Données biométriques non reconnues"</string> <string name="biometric_error_canceled" msgid="349665227864885880">"Authentification annulée"</string> <string name="biometric_error_device_not_secured" msgid="6583143098363528349">"Aucun NIP, schéma ou mot de passe défini"</string> - <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Empreinte digitale partielle détectée. Veuillez essayer de nouveau."</string> + <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Empreinte digitale partielle détectée. Veuillez réessayer."</string> <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Impossible de reconnaître l\'empreinte digitale. Veuillez réessayer."</string> - <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Le capteur d\'empreintes digitales est sale. Veuillez le nettoyer et essayer de nouveau."</string> + <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Le capteur d\'empreintes digitales est sale. Veuillez le nettoyer et réessayer."</string> <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Vous avez déplacé votre doigt trop rapidement. Veuillez réessayer."</string> <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Vous avez déplacé votre doigt trop lentement. Veuillez réessayer."</string> <string-array name="fingerprint_acquired_vendor"> @@ -540,10 +544,10 @@ <string name="fingerprint_authenticated" msgid="5309333983002526448">"Empreinte digitale authentifiée"</string> <string name="face_authenticated_no_confirmation_required" msgid="4018680978348659031">"Visage authentifié"</string> <string name="face_authenticated_confirmation_required" msgid="8778347003507633610">"Visage authentifié, veuillez appuyer sur le bouton Confirmer"</string> - <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Matériel d\'empreinte numérique indisponible."</string> + <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Matériel d\'empreinte digitale numérique indisponible."</string> <string name="fingerprint_error_no_space" msgid="1055819001126053318">"L\'empreinte digitale ne peut pas être enregistrée. Veuillez supprimer une empreinte existante."</string> - <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Le temps attribué pour lire l\'empreinte est écoulé. Veuillez essayer de nouveau."</string> - <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Opération d\'empreinte numérique annulée."</string> + <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Le temps attribué pour lire l\'empreinte digitale est écoulé. Veuillez réessayer."</string> + <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Opération d\'empreinte digitale numérique annulée."</string> <string name="fingerprint_error_user_canceled" msgid="7999639584615291494">"L\'opération d\'empreinte digitale a été annulée par l\'utilisateur."</string> <string name="fingerprint_error_lockout" msgid="5536934748136933450">"Trop de tentatives. Veuillez réessayer plus tard."</string> <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Trop de tentatives. Capteur d\'empreintes digitales désactivé."</string> @@ -1583,8 +1587,8 @@ <string name="expires_on" msgid="3676242949915959821">"Expire le :"</string> <string name="serial_number" msgid="758814067660862493">"Numéro de série :"</string> <string name="fingerprints" msgid="4516019619850763049">"Empreintes :"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"Empreinte SHA-256 :"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"Empreinte SHA-1 :"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"Empreinte digitale SHA-256 :"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"Empreinte digitale SHA-1 :"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Tout afficher"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Sélectionnez une activité"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Partagez avec"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d204ac1a5188..8520c13ed409 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permet à l\'application de recevoir et de traiter les SMS. Cette autorisation lui donne la possibilité de surveiller ou supprimer les messages envoyés à votre appareil sans vous les montrer."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recevoir des messages texte (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permet à l\'application de recevoir et de traiter les MMS. Cette autorisation lui donne la possibilité de surveiller ou supprimer les messages envoyés à votre appareil sans vous les montrer."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lire les messages reçus via un canal de diffusion cellulaire"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permet à l\'application de lire les messages que votre appareil reçoit via un canal de diffusion cellulaire. Dans certaines zones géographiques, des alertes vous sont envoyées afin de vous prévenir en cas de situation d\'urgence. Les applications malveillantes peuvent venir perturber les performances ou le fonctionnement de votre appareil lorsqu\'un message est reçu via un canal de diffusion cellulaire."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lire les flux auxquels vous êtes abonné"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index b798bc540daa..78c7d03cb982 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite á aplicación recibir e procesar mensaxes SMS. Isto significa que a aplicación pode supervisar ou eliminar mensaxes enviadas ao teu dispositivo sen mostrarchas."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"recibir mensaxes de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite á aplicación recibir e procesar mensaxes MMS. Isto significa que a aplicación pode supervisar ou eliminar mensaxes enviadas ao teu dispositivo sen mostrarchas."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ler mensaxes de difusión móbil"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite á aplicación ler mensaxes de difusión móbil recibidas polo teu dispositivo. As alertas de difusión móbil envíanse nalgunhas localizacións para avisar de situacións de emerxencia. É posible que aplicacións maliciosas afecten ao rendemento ou funcionamento do teu dispositivo cando se recibe unha difusión móbil de emerxencia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ler feeds subscritos"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 5a415037d553..340245ae14e5 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -295,10 +295,10 @@ <string name="permgrouprequest_sms" msgid="7168124215838204719">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને SMS સંદેશા મોકલવા અને જોવાની મંજૂરી આપીએ?"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"સ્ટોરેજ"</string> <string name="permgroupdesc_storage" msgid="637758554581589203">"તમારા ઉપકરણ પર ફોટો, મીડિયા અને ફાઇલો ઍક્સેસ કરવાની"</string> - <string name="permgrouprequest_storage" msgid="7885942926944299560">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને તમારા ઉપકરણ પર ફોટા, મીડિયા અને ફાઇલોને ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string> + <string name="permgrouprequest_storage" msgid="7885942926944299560">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને તમારા ડિવાઇસ પર ફોટા, મીડિયા અને ફાઇલોને ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"માઇક્રોફોન"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ઑડિઓ રેકોર્ડ કરવાની"</string> - <string name="permgrouprequest_microphone" msgid="9167492350681916038">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને ઑડિઓ રેકૉર્ડ કરવાની મંજૂરી આપીએ?"</string> + <string name="permgrouprequest_microphone" msgid="9167492350681916038">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને ઑડિયો રેકૉર્ડ કરવાની મંજૂરી આપીએ?"</string> <string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"શારીરિક પ્રવૃત્તિ"</string> <string name="permgroupdesc_activityRecognition" msgid="6949472038320473478">"તમારી શારીરિક પ્રવૃત્તિને ઍક્સેસ કરવી"</string> <string name="permgrouprequest_activityRecognition" msgid="7626438016904799383">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ને તમારી શારીરિક પ્રવૃત્તિને ઍક્સેસ કરવાની મંજૂરી આપવી છે?"</string> @@ -325,7 +325,7 @@ <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"હાવભાવ કરો"</string> <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ટૅપ, સ્વાઇપ, પિંચ કરી અને અન્ય હાવભાવ કરી શકે છે."</string> <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"ફિંગરપ્રિન્ટ સંકેતો"</string> - <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"ઉપકરણના ફિંગરપ્રિન્ટ સેન્સર પર કરવામાં આવેલા સંકેતો કૅપ્ચર કરી શકે છે."</string> + <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"ડિવાઇસના ફિંગરપ્રિન્ટ સેન્સર પર કરવામાં આવેલા સંકેતો કૅપ્ચર કરી શકે છે."</string> <string name="permlab_statusBar" msgid="7417192629601890791">"સ્ટેટસ બારને અક્ષમ કરો અથવા તેમાં ફેરફાર કરો"</string> <string name="permdesc_statusBar" msgid="8434669549504290975">"ઍપ્લિકેશનને સ્ટેટસ બાર અક્ષમ કરવાની અથવા સિસ્ટમ આયકન્સ ઉમેરવા અને દૂર કરવાની મંજૂરી આપે છે."</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"સ્ટેટસ બારમાં બતાવો"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"ઍપ્લિકેશનને SMS સંદેશા પ્રાપ્ત કરવાની અને તેના પર પ્રક્રિયા કરવાની મંજૂરી આપે છે. આનો અર્થ એ કે ઍપ્લિકેશન તમને દર્શાવ્યા વિના તમારા ઉપકરણ પર મોકલેલ સંદેશાઓનું નિરીક્ષણ કરી શકે છે અથવા કાઢી નાખી શકે છે."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ટેક્સ્ટ સંદેશા (MMS) પ્રાપ્ત કરો"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ઍપ્લિકેશનને MMS સંદેશા પ્રાપ્ત કરવાની અને તેના પર પ્રક્રિયા કરવાની મંજૂરી આપે છે. આનો અર્થ એ કે ઍપ્લિકેશન તમને દર્શાવ્યા વિના તમારા ઉપકરણ પર મોકલેલ સંદેશાઓનું નિરીક્ષણ કરી શકે છે અથવા કાઢી નાખી શકે છે."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"સેલ બ્રોડકાસ્ટ સંદેશા વાંચો"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"એપ્લિકેશનને તમારા ઉપકરણ દ્વારા પ્રાપ્ત થયેલ સેલ બ્રોડકાસ્ટ સંદેશાને વાંચવાની મંજૂરી આપે છે. સેલ બ્રોડકાસ્ટ ચેતવણીઓ તમને કટોકટીની સ્થિતિઓ અંગે ચેતવવા માટે કેટલાક સ્થાનોમાં વિતરિત થાય છે. જ્યારે કટોકટીનો સેલ બ્રોડકાસ્ટ પ્રાપ્ત થાય ત્યારે દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો તમારા ઉપકરણના પ્રદર્શન અથવા ઓપરેશનમાં હસ્તક્ષેપ કરી શકે છે."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"સબ્સ્ક્રાઇબ કરેલ ફીડ્સ વાંચો"</string> @@ -513,9 +517,9 @@ <string name="permlab_useBiometric" msgid="8837753668509919318">"બાયોમેટ્રિક હાર્ડવેરનો ઉપયોગ કરો"</string> <string name="permdesc_useBiometric" msgid="8389855232721612926">"ઍપને પ્રમાણીકરણ માટે બાયોમેટ્રિક હાર્ડવેરનો ઉપયોગ કરવાની મંજૂરી આપે છે"</string> <string name="permlab_manageFingerprint" msgid="5640858826254575638">"ફિંગરપ્રિન્ટ હાર્ડવેરને સંચાલિત કરો"</string> - <string name="permdesc_manageFingerprint" msgid="178208705828055464">"એપ્લિકેશનને ઉપયોગ માટે ફિંગરપ્રિન્ટ નમૂના ઉમેરવા અને કાઢી નાખવા માટે પદ્ધતિઓની વિનંતી કરવાની મંજૂરી આપે છે."</string> + <string name="permdesc_manageFingerprint" msgid="178208705828055464">"ઍપને ઉપયોગ માટે ફિંગરપ્રિન્ટ નમૂના ઉમેરવા અને કાઢી નાખવા માટે પદ્ધતિઓની વિનંતી કરવાની મંજૂરી આપે છે."</string> <string name="permlab_useFingerprint" msgid="3150478619915124905">"ફિંગરપ્રિન્ટ હાર્ડવેરનો ઉપયોગ કરો"</string> - <string name="permdesc_useFingerprint" msgid="9165097460730684114">"એપ્લિકેશનને પ્રમાણીકરણ માટે ફિંગરપ્રિન્ટ હાર્ડવેરનો ઉપયોગ કરવાની મંજૂરી આપે છે"</string> + <string name="permdesc_useFingerprint" msgid="9165097460730684114">"ઍપને પ્રમાણીકરણ માટે ફિંગરપ્રિન્ટ હાર્ડવેરનો ઉપયોગ કરવાની મંજૂરી આપે છે"</string> <string name="permlab_audioWrite" msgid="2661772059799779292">"આપનો સંગીત સંગ્રહ સંશોધિત કરવો"</string> <string name="permdesc_audioWrite" msgid="8888544708166230494">"એપને તમારો સંગીત સંગ્રહ સંશોધિત કરવાની મંજૂરી આપે છે."</string> <string name="permlab_videoWrite" msgid="128769316366746446">"આપનો વિડિઓ સંગ્રહ સંશોધિત કરવો"</string> @@ -1584,8 +1588,8 @@ <string name="expires_on" msgid="3676242949915959821">"આ રોજ સમાપ્ત:"</string> <string name="serial_number" msgid="758814067660862493">"શૃંખલા ક્રમાંક:"</string> <string name="fingerprints" msgid="4516019619850763049">"ફિંગરપ્રિંટ્સ:"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 ફિંગરપ્રિંટ:"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 ફિંગરપ્રિંટ:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 ફિંગરપ્રિન્ટ:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 ફિંગરપ્રિન્ટ:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"બધું જુઓ"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"પ્રવૃત્તિ પસંદ કરો"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"આની સાથે શેર કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 5b902345f5e4..8f78f9547eca 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"एप्लिकेशन को मैसेज (एसएमएस) पाने और प्रोसेस करने देता है. इसका मतलब है कि एप्लिकेशन आपके डिवाइस पर भेजे गए मैसेज की निगरानी आपको दिखाए बिना कर सकता है और उन्हें हटा सकता है."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"मैसेज (एमएमएस) पाएं"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ऐप को मल्टीमीडिया मैसेज (एमएमएस) को पाने और उन पर कार्रवाई करने देता है. इसका मतलब है कि ऐप आपके डिवाइस पर भेजे गए मैसेज की निगरानी आपको दिखाए बिना कर सकता है और उन्हें हटा सकता है."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"सेल ब्रॉडकास्ट (CBC) मैसेज पढ़ें"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ऐप को, वो सेल ब्रॉडकास्ट (CBC) मैसेज पढ़ने देता है जो आपके डिवाइस को मिले हैं. सेल ब्रॉडकास्ट (CBC) अलर्ट कुछ स्थानों (लोकेशन) पर आपको आपातकालीन स्थितियों की चेतावनी देने के लिए दिए जाते हैं. आपातकालीन सेल ब्रॉडकास्ट (CBC) मिलने पर, धोखा देने वाले ऐप आपके डिवाइस के परफ़ॉर्मेंस या कार्यवाही में दखल दे सकते हैं."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"सदस्यता वाली फ़ीड पढ़ें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 291b116ef44c..8ddd5f88d705 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Aplikaciji omogućuje primanje i obradu SMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj, a da vam ih ne prikaže."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"primanje tekstnih poruka (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Aplikaciji omogućuje primanje i obradu MMS poruka. To znači da aplikacija može nadzirati ili izbrisati poruke poslane na vaš uređaj, a da vam ih ne prikaže."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čitaj poruke koje se emitiraju unutar mobilne mreže"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Omogućuje aplikaciji čitanje poruka emitiranih unutar mobilne mreže koje prima vaš uređaj. Upozorenja koja se emitiraju na području mobilne mreže dostavljaju se na nekim lokacijama kako bi upozorila korisnike na hitne situacije. Zlonamjerne aplikacije mogu ometati izvršavanje ili rad vašeg uređaja kada stigne hitno upozorenje koje se emitira unutar mobilne mreže."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"čitanje pretplaćenih feedova"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index f83ac69de35c..d9100259c3f7 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Lehetővé teszi az alkalmazás számára, hogy SMS-eket fogadjon és dolgozzon fel. Ez azt jelenti, hogy az alkalmazás megfigyelheti vagy törölheti a beérkező üzeneteket anélkül, hogy Ön látná azokat."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"szöveges üzenetek (MMS) fogadása"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Lehetővé teszi az alkalmazás számára, hogy MMS-eket fogadjon és dolgozzon fel. Ez azt jelenti, hogy az alkalmazás megfigyelheti vagy törölheti a beérkező üzeneteket anélkül, hogy Ön látná azokat."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"cellán belüli üzenetek olvasása"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Lehetővé teszi az alkalmazás számára az eszközre érkező cellán belüli üzenetek olvasását. Bizonyos helyeken figyelmeztető üzeneteket kaphat a cellán belül a vészhelyzetekről. A rosszindulatú alkalmazások befolyásolhatják az eszköz teljesítményét vagy működését vészhelyzeti cellaüzenet érkezésekor."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"feliratkozott hírcsatornák olvasása"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 2c40a5a9732a..6f5507f74e8c 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Թույլ է տալիս հավելվածին ստանալ և մշակել SMS հաղորդագրությունները: Սա նշանակում է, որ հավելվածը կարող է ստուգել կամ ջնջել ձեր սարքին ուղարկված հաղորդագրությունները` առանց դրանք ձեզ ցուցադրելու:"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ստանալ տեքստային հաղորդագրություններ (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Թույլ է տալիս հավելվածին ստանալ և մշակել MMS հաղորդագրությունները: Սա նշանակում է, որ հավելվածը կարող է ստուգել կամ ջնջել ձեր սարքին ուղարկված հաղորդագրությունները` առանց դրանք ձեզ ցուցադրելու:"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"կարդալ բջջային զեկուցվող հաղորդագրությունները"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Թույլ է տալիս հավելվածին կարդալ ձեր սարքի կողմից ստացված բջջային հեռարձակվող հաղորդագրությունները: Բջջային հեռարձակվող զգուշացումները ուղարկվում են որոշ վայրերում` արտակարգ իրավիճակների մասին ձեզ զգուշացնելու համար: Վնասարար հավելվածները կարող են խանգարել ձեր սարքի արդյունավետությանը կամ շահագործմանը, երբ ստացվում է արտակարգ իրավիճակի մասին բջջային հաղորդում:"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"կարդալ բաժանորդագրված հոսքերը"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 4d0eea065dc4..88e396cb84fc 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Memungkinkan aplikasi menerima dan memproses pesan SMS. Ini artinya aplikasi dapat memantau atau menghapus pesan yang dikirim ke perangkat Anda tanpa menunjukkannya kepada Anda."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"terima pesan teks (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Memungkinkan aplikasi menerima dan memproses pesan MMS. Ini artinya aplikasi dapat memantau atau menghapus pesan yang dikirim ke perangkat Anda tanpa menunjukkannya kepada Anda."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"membaca pesan siaran seluler"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Mengizinkan aplikasi membaca pesan siaran seluler yang diterima perangkat Anda. Notifikasi siaran seluler dikirimkan di beberapa lokasi untuk memperingatkan Anda tentang situasi darurat. Aplikasi berbahaya dapat mengganggu kinerja atau operasi perangkat Anda saat siaran seluler darurat diterima."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"baca feed langganan"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 558f4afa22c8..32461d3bcb3d 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Leyfir forriti að taka á móti og vinna úr SMS-skilaboðum. Þetta þýðir að forritið getur fylgst með eða eytt skilaboðum sem send eru í tækið án þess að birta þér þau."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"taka á móti textaskilaboðum (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Leyfir forriti að taka á móti og vinna úr MMS-skilaboðum. Þetta þýðir að forritið getur fylgst með eða eytt skilaboðum sem send eru í tækið án þess að birta þér þau."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lesa skilaboð frá endurvarpa"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Leyfir forriti að lesa skilaboð frá endurvarpa sem tækið móttekur. Viðvaranir frá endurvarpa berast á tilteknum stöðum til að vara þig við neyðarástandi. Spilliforrit geta truflað afköst eða virkni tækisins þegar neyðarboð berast frá endurvarpa."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lesa strauma í áskrift"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index d0cded8fa33d..6e25563e3635 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -283,7 +283,7 @@ <string name="permgrouprequest_contacts" msgid="6032805601881764300">"Consentire all\'app <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> di accedere ai tuoi contatti?"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Geolocalizz."</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"accedere alla posizione di questo dispositivo"</string> - <string name="permgrouprequest_location" msgid="3788275734953323491">"Consentire all\'app <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> di accedere alla posizione di questo dispositivo?"</string> + <string name="permgrouprequest_location" msgid="3788275734953323491">"Consentire all\'app <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> di accedere alla posizione del dispositivo?"</string> <string name="permgrouprequestdetail_location" msgid="1347189607421252902">"L\'app avrà accesso alla posizione soltanto quando la usi"</string> <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"Consentire a <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> di accedere <b>sempre</b> alla posizione di questo dispositivo?"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="4597006851453417387">"L\'app al momento può accedere alla posizione soltanto mentre la usi"</string> @@ -324,8 +324,8 @@ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controlla il livello di zoom e la posizione del display."</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Eseguire gesti"</string> <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Consente di toccare, far scorrere, pizzicare ed eseguire altri gesti."</string> - <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Gesti con sensore di impronte digitali"</string> - <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"È in grado di rilevare i gesti compiuti con il sensore di impronte digitali dei dispositivi."</string> + <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Gesti con sensore di impronte"</string> + <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"È in grado di rilevare i gesti compiuti con il sensore di impronte dei dispositivi."</string> <string name="permlab_statusBar" msgid="7417192629601890791">"disattivazione o modifica della barra di stato"</string> <string name="permdesc_statusBar" msgid="8434669549504290975">"Consente all\'applicazione di disattivare la barra di stato o di aggiungere e rimuovere icone di sistema."</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"ruolo di barra di stato"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Consente all\'applicazione di ricevere ed elaborare messaggi SMS. Significa che l\'applicazione potrebbe monitorare o eliminare i messaggi inviati al tuo dispositivo senza mostrarteli."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ricezione messaggi di testo (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Consente all\'applicazione di ricevere ed elaborare messaggi MMS. Significa che l\'applicazione potrebbe monitorare o eliminare i messaggi inviati al tuo dispositivo senza mostrarteli."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lettura di messaggi cell broadcast"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Consente all\'applicazione di leggere i messaggi cell broadcast ricevuti dal dispositivo. Gli avvisi cell broadcast vengono trasmessi in alcune località per avvertire di eventuali situazioni di emergenza. Le applicazioni dannose potrebbero interferire con il rendimento o con il funzionamento del dispositivo quando si riceve un messaggio cell broadcast di emergenza."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lettura feed sottoscritti"</string> @@ -512,10 +516,10 @@ <string name="permdesc_requestPasswordComplexity" msgid="4730994229754212347">"Consente all\'app di conoscere il livello di complessità del blocco schermo (alto, medio, basso o nessuno), che indica l\'intervallo di caratteri possibile e il tipo di blocco schermo. L\'app può inoltre suggerire agli utenti di aggiornare il blocco schermo a un livello specifico di complessità, ma gli utenti possono ignorare liberamente il suggerimento e uscire. Tieni presente che il blocco schermo non viene memorizzato come testo non crittografato, quindi l\'app non conosce la password esatta."</string> <string name="permlab_useBiometric" msgid="8837753668509919318">"utilizzo di hardware biometrico"</string> <string name="permdesc_useBiometric" msgid="8389855232721612926">"Consente all\'app di utilizzare hardware biometrico per eseguire l\'autenticazione"</string> - <string name="permlab_manageFingerprint" msgid="5640858826254575638">"gestione di hardware per il riconoscimento delle impronte digitali"</string> - <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Consente all\'app di richiamare metodi per aggiungere e rimuovere modelli di impronte digitali da utilizzare."</string> - <string name="permlab_useFingerprint" msgid="3150478619915124905">"utilizzo di hardware per il riconoscimento delle impronte digitali"</string> - <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Consente all\'app di utilizzare l\'hardware per il riconoscimento delle impronte digitali per eseguire l\'autenticazione"</string> + <string name="permlab_manageFingerprint" msgid="5640858826254575638">"gestione di hardware per il riconoscimento delle impronte"</string> + <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Consente all\'app di richiamare metodi per aggiungere e rimuovere modelli di impronte da utilizzare."</string> + <string name="permlab_useFingerprint" msgid="3150478619915124905">"utilizzo di hardware per il riconoscimento delle impronte"</string> + <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Consente all\'app di utilizzare l\'hardware per il riconoscimento delle impronte per eseguire l\'autenticazione"</string> <string name="permlab_audioWrite" msgid="2661772059799779292">"modifica della tua raccolta musicale"</string> <string name="permdesc_audioWrite" msgid="8888544708166230494">"Consente all\'app di modificare la tua raccolta musicale."</string> <string name="permlab_videoWrite" msgid="128769316366746446">"modifica della tua raccolta di video"</string> @@ -530,30 +534,30 @@ <string name="biometric_not_recognized" msgid="5770511773560736082">"Non riconosciuto"</string> <string name="biometric_error_canceled" msgid="349665227864885880">"Autenticazione annullata"</string> <string name="biometric_error_device_not_secured" msgid="6583143098363528349">"Non hai impostato PIN, sequenza o password"</string> - <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Rilevata impronta digitale parziale. Riprova."</string> - <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Impossibile elaborare l\'impronta digitale. Riprova."</string> - <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Il sensore di impronte digitali è sporco. Puliscilo e riprova."</string> + <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Rilevata impronta parziale. Riprova."</string> + <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Impossibile elaborare l\'impronta. Riprova."</string> + <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Il sensore di impronte è sporco. Puliscilo e riprova."</string> <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Movimento del dito troppo rapido. Riprova."</string> <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Movimento del dito troppo lento. Riprova."</string> <string-array name="fingerprint_acquired_vendor"> </string-array> - <string name="fingerprint_authenticated" msgid="5309333983002526448">"Impronta digitale autenticata"</string> + <string name="fingerprint_authenticated" msgid="5309333983002526448">"Impronta autenticata"</string> <string name="face_authenticated_no_confirmation_required" msgid="4018680978348659031">"Volto autenticato"</string> <string name="face_authenticated_confirmation_required" msgid="8778347003507633610">"Volto autenticato, premi Conferma"</string> - <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Hardware per l\'impronta digitale non disponibile."</string> - <string name="fingerprint_error_no_space" msgid="1055819001126053318">"Impossibile memorizzare l\'impronta digitale. Rimuovi un\'impronta esistente."</string> - <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Timeout impronta digitale. Riprova."</string> - <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Operazione associata all\'impronta digitale annullata."</string> - <string name="fingerprint_error_user_canceled" msgid="7999639584615291494">"Operazione di autenticazione dell\'impronta digitale annullata dall\'utente."</string> + <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Hardware per l\'impronta non disponibile."</string> + <string name="fingerprint_error_no_space" msgid="1055819001126053318">"Impossibile memorizzare l\'impronta. Rimuovi un\'impronta esistente."</string> + <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Timeout impronta. Riprova."</string> + <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Operazione associata all\'impronta annullata."</string> + <string name="fingerprint_error_user_canceled" msgid="7999639584615291494">"Operazione di autenticazione dell\'impronta annullata dall\'utente."</string> <string name="fingerprint_error_lockout" msgid="5536934748136933450">"Troppi tentativi. Riprova più tardi."</string> - <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Troppi tentativi. Sensore di impronte digitali disattivato."</string> + <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Troppi tentativi. Sensore di impronte disattivato."</string> <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Riprova."</string> <string name="fingerprint_error_no_fingerprints" msgid="7654382120628334248">"Nessuna impronta digitale registrata."</string> - <string name="fingerprint_error_hw_not_present" msgid="409523969613176352">"Questo dispositivo non dispone di sensore di impronte digitali."</string> + <string name="fingerprint_error_hw_not_present" msgid="409523969613176352">"Questo dispositivo non dispone di sensore di impronte."</string> <string name="fingerprint_name_template" msgid="5870957565512716938">"Dito <xliff:g id="FINGERID">%d</xliff:g>"</string> <string-array name="fingerprint_error_vendor"> </string-array> - <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Icona dell\'impronta digitale"</string> + <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Icona dell\'impronta"</string> <string name="permlab_manageFace" msgid="7262837876352591553">"gestione dell\'hardware per Sblocco col sorriso"</string> <string name="permdesc_manageFace" msgid="8919637120670185330">"Consente all\'app di richiamare i metodi per aggiungere e rimuovere i modelli di volti."</string> <string name="permlab_useFaceAuthentication" msgid="2565716575739037572">"utilizzo dell\'hardware per Sblocco col sorriso"</string> @@ -1583,8 +1587,8 @@ <string name="expires_on" msgid="3676242949915959821">"Scade il:"</string> <string name="serial_number" msgid="758814067660862493">"Numero di serie:"</string> <string name="fingerprints" msgid="4516019619850763049">"Fingerprint:"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"Fingerprint SHA-256:"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"Fingerprint SHA-1:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"Impronta SHA-256:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"Impronta SHA-1:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Mostra tutto"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Scegli attività"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Condividi con"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 8b2b6257e19b..6e61213a5aae 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"מאפשר לאפליקציה לקבל ולעבד הודעות SMS. משמעות הדבר היא שהאפליקציה יכולה לעקוב אחר הודעות שנשלחו למכשיר או למחוק אותן מבלי להציג לך אותן."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"קבלת הודעות טקסט (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"מאפשר לאפליקציה לקבל ולעבד הודעות MMS. משמעות הדבר היא שהאפליקציה יכולה לעקוב אחר הודעות שנשלחו למכשיר או למחוק אותן מבלי להציג לך אותן."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"קריאת הודעות שידור סלולרי"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"מאפשר לאפליקציה לקרוא הודעות שידור סלולרי שהתקבלו במכשיר שלך. התראות שידור סלולרי נשלחות במקומות מסוימים על מנת להזהיר אותך מפני מצבי חירום. אפליקציות זדוניות עשויות להפריע לביצועים או לפעולה של המכשיר שלך כאשר מתקבל שידור חירום סלולרי."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"קרא עדכוני מנויים"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 39f05db96bcc..15e10e4c5fae 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMSメッセージの受信と処理をアプリに許可します。これにより、アプリがデバイスに届いたメッセージを表示することなく監視または削除できるようになります。"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"テキストメッセージ（MMS）の受信"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMSメッセージの受信と処理をアプリに許可します。これにより、アプリがデバイスに届いたメッセージを表示することなく監視または削除できるようになります。"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"緊急速報メール SMS の読み取り"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"デバイスで受信した緊急速報メール SMS の読み取りをアプリに許可します。緊急速報メールは、緊急事態を警告する目的で一部の地域に配信されます。緊急速報メールの受信時に、悪意のあるアプリによってデバイスの動作や処理が妨害される恐れがあります。"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"登録したフィードの読み取り"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 2f216f9e64f0..a66d897256ca 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"აპს შეეძლება SMS შეტყობინებების მიღება და დამუშავება. ეს ნიშნავს, რომ აპს შეეძლება თქვენ მოწყობილობაზე გამოგზავნილი შეტყობინებების მონიტორინგი და მათი წაშლა თქვენთვის ჩვენების გარეშე."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ტექსტური შეტყობინებების (MMS) მიღება"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"აპს შეეძლება MMS შეტყობინებების მიღება და დამუშავება. ეს ნიშნავს, რომ აპს შეეძლება შეტყობინებების მონიტორინგი და მათი წაშლა თქვენთვის ჩვენების გარეშე."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"მასიური დაგზავნის შეტყობინებების წაკითხვა"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"აპს შეეძლება, წაიკითხოს თქვენს მოწყობილობაზე გამოგზავნილი ქსელის სამაუწყებლო შეტყობინებები. სამაუწყებლო გაფრთხილებები მოგეწოდებათ ზოგიერთ ადგილზე ექსტრემალური სიტუაციების შესახებ გასაფრთხილებლად. ქსელის გადაუდებელი შეტყონიბენის მიღების დროს მავნე აპებმა შეიძლება ხელი შეუშალონ თქვენი მოწყობილობის ფუნქციონირებას ან ოპერაციებს."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"გამოწერილი არხების წაკითხვა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 8fb6eb7bf6f4..af6b7881f9a1 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Қолданбаға SMS хабарларын алу және өңдеу мүмкіндігін береді. Бұл қолданба құрылғыңызға жіберілген хабарларды сізге көрсетпестен қабылдай және жоя алады дегенді білдіреді."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"мәтін хабарларын алу (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Қолданбаға MMS хабарларын алу және өңдеу мүмкіндігін береді. Бұл қолданба құрылғыңызға жіберілген хабарларды сізге көрсетпестен қабылдай және жоя алады дегенді білдіреді."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ұялы хабар тарату хабарларын оқу"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Қолданбаға ұялы таратылым хабарларын оқу мүмкіндігін береді. Ұялы таратылым дабылдары кейбір аймақтарда төтенше жағдай туралы ескерту үшін қолданылады. Төтенше ұялы хабарлар келгенде залалды қолданбалар құрылғының жұмысына кедергі жасауы мүмкін."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"жазылған ағындарды оқу"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 6355289eead2..cf9b9d2b6d7e 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"ឲ្យកម្មវិធីទទួល និងដំណើរការសារ MMS ។ មានន័យថា កម្មវិធីអាចត្រួតពិនិត្យ ឬលុបសារដែលបានផ្ញើទៅឧបករណ៍របស់អ្នក ដោយមិនបង្ហាញអ្នក។"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ទទួលសារអត្ថបទ (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ឲ្យកម្មវិធីទទួល និងដំណើរការសារ MMS ។ វាមានន័យថា កម្មវិធីអាចតាមដាន ឬលុបសារដែលបានផ្ញើទៅឧបករណ៍របស់អ្នកដោយមិនបង្ហាញពួកវា។"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"អានសារប្រកាសចល័ត"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ឲ្យកម្មវិធីអានសារប្រកាសការហៅដែលឧបករណ៍របស់អ្នកបានទទួល។ ការជូនដំណឹងប្រកាសចល័តត្រូវបានបញ្ជូនទៅទីតាំងមួយចំនួន ដើម្បីព្រមានអ្នកអំពីស្ថានភាពអាសន្ន។ កម្មវិធីព្យាបាទអាចជ្រៀតជ្រែកការអនុវត្ត ឬប្រតិបត្តិការឧបករណ៍របស់អ្នកពេលទទួលការប្រកាសចល័តពេលអាសន្ន។"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"អានអត្ថបទព័ត៌មានបានជាវ"</string> @@ -1585,8 +1589,8 @@ <string name="expires_on" msgid="3676242949915959821">"ផុតកំណត់នៅ៖"</string> <string name="serial_number" msgid="758814067660862493">"លេខស៊េរី៖"</string> <string name="fingerprints" msgid="4516019619850763049">"ស្នាមម្រាមដៃ៖"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"ស្នាមម្រាមដៃ SHA-256 ៖"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"ស្នាមម្រាមដៃ SHA-1 ៖"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"ស្នាមម្រាមដៃ SHA-256៖"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"ស្នាមម្រាមដៃ SHA-1៖"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"មើលទាំងអស់"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"ជ្រើសសកម្មភាព"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"ចែករំលែកជាមួយ"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 7802129b580c..028d5633dc9a 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಮತ್ತು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಇದರರ್ಥ, ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಕಳುಹಿಸಲಾಗಿರುವ ಸಂದೇಶಗಳನ್ನು ನಿಮಗೆ ತೋರಿಸದೆಯೇ, ಅಪ್ಲಿಕೇಶನ್ ಅವುಗಳನ್ನು ಮಾನಿಟರ್ ಮಾಡಬಹುದು ಅಥವಾ ಅಳಿಸಬಹುದು."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಿ (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಮತ್ತು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಇದರರ್ಥ, ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಕಳುಹಿಸಲಾಗಿರುವ ಸಂದೇಶಗಳನ್ನು ನಿಮಗೆ ತೋರಿಸದೆಯೇ, ಅಪ್ಲಿಕೇಶನ್ ಅವುಗಳನ್ನು ಮಾನಿಟರ್ ಮಾಡಬಹುದು ಅಥವಾ ಅಳಿಸಬಹುದು."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ಸೆಲ್ ಪ್ರಸಾರದ ಸಂದೇಶಗಳನ್ನು ಓದಿರಿ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ನಿಮ್ಮ ಸಾಧನದಿಂದ ಸ್ವೀಕರಿಸಿದ ಸೆಲ್ ಪ್ರಸಾರ ಸಂದೇಶಗಳನ್ನು ರೀಡ್ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಸೆಲ್ ಪ್ರಸಾರ ಎಚ್ಚರಿಕೆಗಳನ್ನು ತುರ್ತು ಸಂದರ್ಭಗಳಲ್ಲಿ ನಿಮಗೆ ಎಚ್ಚರಿಸುವ ಸಲುವಾಗಿ ಕೆಲವು ಸ್ಥಳಗಳಲ್ಲಿ ವಿತರಿಸಲಾಗುತ್ತದೆ. ದುರುದ್ದೇಶಪೂರಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ತುರ್ತು ಸೆಲ್ ಪ್ರಸಾರವನ್ನು ಸ್ವೀಕರಿಸುವಾಗ, ನಿಮ್ಮ ಸಾಧನದ ಕಾರ್ಯಕ್ಷಮತೆ ಇಲ್ಲವೇ ಕಾರ್ಯಾಚರಣೆಯಲ್ಲಿ ಹಸ್ತಕ್ಷೇಪ ಮಾಡಬಹುದು."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ಚಂದಾದಾರ ಫೀಡ್ಗಳನ್ನು ಓದಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 72302c3cdf11..f81cc0015d3a 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"앱이 SMS 메시지를 수신하고 처리할 수 있도록 허용합니다. 앱이 사용자에게 표시하지 않고 기기로 전송된 메시지를 확인 또는 삭제할 수도 있습니다."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"문자 메시지 받기(MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"앱이 MMS 메시지를 수신하고 처리할 수 있도록 허용합니다. 앱이 사용자에게 표시하지 않고 기기로 전송된 메시지를 확인 또는 삭제할 수도 있습니다."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"셀 브로드캐스트 메시지 읽기"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"앱이 기기가 수신한 셀 브로드캐스트 메시지를 읽을 수 있도록 합니다. 비상 상황임을 알리기 위해 일부 지역에서 셀 브로드캐스트 경고가 전달됩니다. 비상 셀 브로드캐스트를 수신할 때 악성 앱이 기기의 성능이나 작동을 방해할 수 있습니다."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"가입된 피드 읽기"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 09ee99c1eb4f..c61992cd558e 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -283,7 +283,7 @@ <string name="permgrouprequest_contacts" msgid="6032805601881764300">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> колдонмосуна байланыштарыңызды пайдаланууга уруксат берилсинби?"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Жайгашкан жер"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"түзмөктүн жайгашкан жерин аныктоого"</string> - <string name="permgrouprequest_location" msgid="3788275734953323491">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> колдонмосу бул түзмөктүн кайда жүргөнүн көрүп турганга уруксат бересизби?"</string> + <string name="permgrouprequest_location" msgid="3788275734953323491">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> колдонмосу бул түзмөктүн кайда жүргөнүн көрүп турсунбу?"</string> <string name="permgrouprequestdetail_location" msgid="1347189607421252902">"Колдонмону колдонуп жаткан маалда гана, ал сиздин кайда жүргөнүңүздү билип турат."</string> <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> колдонмосу бул түзмөктүн жүргөн жерин <b>ар дайым</b> билип турсунбу?"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="4597006851453417387">"Колдонмону пайдаланып жаткан учурда гана ал жайгашкан жерди көрө алат"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Колдонмого SMS билдирүүлөрүн кабыл алууга жана аларды иштетип чыгууга уруксат берет. Бул, колдонмо сизге билгизбестен түзмөгүңүзгө жөнөтүлгөн билдирүүлөрдү мониторлой же жок кыла алат дегенди билдирет."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"билдирүүлөрдү (MMS) кабыл алуу"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Колдонмого MMS билдирүүлөрүн кабыл алууга жана аларды иштетип чыгууга уруксат берет. Бул, колдонмо сизге билгизбестен түзмөгүңүзгө жөнөтүлгөн билдирүүлөрдү мониторлой же жок кыла алат дегенди билдирет."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"уюктук берүү билдирүүлөрүн окуу"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Колдонмого түзмөгүңүз кабыл алган уюк берүүнүн билдирүүлөрүн окууга жол берет. Шашылыш эскертүү билдирүүлөрү кээ бир жерлердеги өзгөчө кырдаалдар тууралу сизди эскертүү үчүн жөнөтүлөт. Зыяндуу колдономолор шашылыш эскертүүлөр берилип жатканда, сиздин түзмөктүн иштешине жолтоо болушу мүмкүн."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"жазылган түрмөктөрдү окуу"</string> @@ -1077,7 +1081,7 @@ <string name="Midnight" msgid="5630806906897892201">"Түн ортосу"</string> <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> - <string name="selectAll" msgid="6876518925844129331">"Бардыгын тандоо"</string> + <string name="selectAll" msgid="6876518925844129331">"Баарын тандоо"</string> <string name="cut" msgid="3092569408438626261">"Кесүү"</string> <string name="copy" msgid="2681946229533511987">"Көчүрүү"</string> <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"Алмашуу буферине көчүрүлбөй калды"</string> @@ -1317,7 +1321,7 @@ <string name="sms_control_title" msgid="7296612781128917719">"SMS билдирүүлөр жөнөтүлүүдө"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> көп SMS билдирүүлөрдү жөнөтүп жатат. Бул колдонмо билдирүүлөрдү жөнөтө берсинби?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"Ооба"</string> - <string name="sms_control_no" msgid="625438561395534982">"Жок"</string> + <string name="sms_control_no" msgid="625438561395534982">"Тыюу салынат"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> номуруна билдирүү жөнөткөнү жатат."</string> <string name="sms_short_code_details" msgid="5873295990846059400">"Бул уюлдук эсебиңиздеги төлөмдөргө "<b>"алып келиши мүмкүн"</b>"."</string> <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"Бул уюлдук эсебиңиздеги төлөмдөргө алып келет."</b></string> @@ -1359,8 +1363,8 @@ <string name="usb_power_notification_message" msgid="4647527153291917218">"Туташкан түзмөк кубатталууда. Дагы параметрлерди көрүү үчүн таптап коюңуз."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Аналогдук аудио жабдуу табылды"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"Тиркелген түзмөк бул телефонго шайкеш келбейт. Көбүрөөк маалымат алуу үчүн таптап коюңуз."</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"Мүчүлүштүктөрдү USB аркылуу оңдоо иштетилген"</string> - <string name="adb_active_notification_message" msgid="7463062450474107752">"USB арклуу мүчүлштктрдү оңдоону өчрүү үчүн басып коюңуз"</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"Мүчүлүштүктөрдү USB аркылуу оңдоо иштеп жатат"</string> + <string name="adb_active_notification_message" msgid="7463062450474107752">"Өчүрүү үчүн тийип коюңуз"</string> <!-- no translation found for adb_active_notification_message (8470296818270110396) --> <skip /> <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"Сыноо программасынын режими иштетилди"</string> @@ -1455,7 +1459,7 @@ <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Бул өтүнүчкө уруксат бересизби?"</string> <string name="grant_permissions_header_text" msgid="6874497408201826708">"Жетки талабы"</string> <string name="allow" msgid="7225948811296386551">"Уруксат берүү"</string> - <string name="deny" msgid="2081879885755434506">"Жок"</string> + <string name="deny" msgid="2081879885755434506">"Уруксат берилбейт"</string> <string name="permission_request_notification_title" msgid="6486759795926237907">"Уруксат талап кылуу"</string> <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Кийинки эсепке\nуруксат талап кылынууда: <xliff:g id="ACCOUNT">%s</xliff:g>."</string> <string name="forward_intent_to_owner" msgid="1207197447013960896">"Бул колдонмо жумуш профилиңиздин сыртында колдонулуп жатат"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 00bfc0ea9226..fb3afb31d4a6 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"ອະນຸຍາດໃຫ້ແອັບຯຮັບ ແລະປະມວນຜົນຂໍ້ຄວາມ SMS. ນີ້ໝາຍຄວາມວ່າແອັບຯສາມາດຕິດຕາມ ຫຼືລຶບຂໍ້ຄວາມທີ່ສົ່ງເຂົ້າອຸປະກອນຂອງທ່ານ ໂດຍທີ່ບໍ່ສະແດງພວກມັນໃຫ້ທ່ານເຫັນ."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ຮັບຂໍ້ຄວາມ (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ອະນຸຍາດໃຫ້ແອັບຯ ຮັບແລະປະມວນຜົນຂໍ້ຄວາມ MMS. ນີ້ໝາຍຄວາມວ່າແອັບຯສາມາດຕິດຕາມ ຫຼືລຶບຂໍ້ຄວາມທີ່ສົ່ງເຂົ້າອຸປະກອນຂອງທ່ານ ໂດຍທີ່ບໍ່ສະແດງພວກມັນໃຫ້ທ່ານເຫັນ."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ອ່ານຂໍ້ຄວາມກະຈາຍສັນຍານຂອງເສົາສັນຍານ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ອະນຸຍາດໃຫ້ແອັບຯ ສາມາດອ່ານຂໍ້ຄວາມແຈ້ງເຕືອນເຫດສຸກເສີນ ທີ່ໄດ້ຮັບໂດຍອຸປະກອນຂອງທ່ານ. ການແຈ້ງເຕືອນສຸກເສີນທີ່ມີໃຫ້ບໍລິການໃນບາງພື້ນທີ່ ເພື່ອແຈ້ງເຕືອນໃຫ້ທ່ານຮູ້ເຖິງສະຖານະການສຸກເສີນ. ແອັບພລິເຄຊັນທີ່ເປັນອັນຕະລາຍອາດລົບກວນປະສິດທິພາບ ຫຼືການດຳເນີນງານຂອງອຸປະກອນຂອງທ່ານ ເມື່ອໄດ້ການຮັບແຈ້ງເຕືອນສຸກເສີນຈາກສະຖານີມືຖື."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ອ່ານຂໍ້ມູນຟີດທີ່ສະໝັກໄວ້"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index b615b247b7c9..be9e32f10ff1 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Leidžiama programai gauti ir apdoroti SMS pranešimus. Tai reiškia, kad programa gali stebėti ir ištrinti į jūsų įrenginį siunčiamus pranešimus jums jų neparodžiusi."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"gauti teksto pranešimus (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Leidžiama programai gauti ir apdoroti MMS pranešimus. Tai reiškia, kad programa gali stebėti ir ištrinti į jūsų įrenginį siunčiamus pranešimus jums jų neparodžiusi."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"skaityti mobiliuoju transliuojamus pranešimus"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Programai leidžiama skaityti mobiliuoju transliuojamus pranešimus, gaunamus jūsų įrenginyje. Mobiliuoju transliuojami įspėjimai pristatomi kai kuriose vietose, kad įspėtų apie kritines situacijas. Kai gaunamas mobiliuoju transliuojamas pranešimas apie kritinę situaciją, kenkėjiškos programos gali trukdyti įrenginiui veikti ar jį naudoti."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"skaityti prenumeruojamus tiekimus"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index acc14304e487..89575c619773 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Ļauj lietotnei saņemt un apstrādāt īsziņas. Tas nozīmē, ka lietotne var pārraudzīt vai dzēst uz jūsu ierīci nosūtītos ziņojumus, neparādot tos jums."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"saņemt ziņojumus (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Ļauj lietotnei saņemt un apstrādāt multiziņas. Tas nozīmē, ka lietotne var pārraudzīt vai dzēst uz jūsu ierīci nosūtītos ziņojumus, neparādot tos jums."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"šūnu apraides ziņojumu lasīšana"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Ļauj lietotnei lasīt ierīcē saņemtos šūnu apraides ziņojumus. Šūnu apraides brīdinājumi tiek piegādāti dažās atrašanās vietās, lai brīdinātu jūs par ārkārtas situācijām. Ļaunprātīgas lietotnes var traucēt ierīces veiktspēju vai darbības, kad ir saņemts ārkārtas šūnas apraides ziņojums."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lasīt abonētās plūsmas"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 761d965d3cf2..7144e4dd158d 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -283,7 +283,7 @@ <string name="permgrouprequest_contacts" msgid="6032805601881764300">"Дали да се дозволи <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> да пристапува до контактите?"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Локација"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"пристапува до локацијата на овој уред"</string> - <string name="permgrouprequest_location" msgid="3788275734953323491">"Дали да се дозволи <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> да пристапува до локацијата на уредот?"</string> + <string name="permgrouprequest_location" msgid="3788275734953323491">"Дали да се дозволи <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> да пристапува до локацијата на уредов?"</string> <string name="permgrouprequestdetail_location" msgid="1347189607421252902">"Апликацијата ќе има пристап до локацијата само додека ја користите"</string> <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"Да се дозволи <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> да пристапува до локацијата на уредов <b>во секое време</b>?"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="4597006851453417387">"Апликацијата во моментов може да пристапува до локацијата само додека ја користите"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Овозможува апликацијата да прима и да обработува SMS пораки. Тоа значи дека апликацијата може да следи или да брише пораки испратени до вашиот уред без да ви ги прикаже вам."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"прими текстуални пораки (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Овозможува апликацијата да прима и да обработува MMS пораки. Тоа значи дека апликацијата може да следи или да брише пораки испратени до вашиот уред без да ви ги прикаже вам."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"прочитај пораки за мобилно емитување"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Овозможува апликациите да ги читаат пораките за мобилно емитување што ги прима вашиот уред. Предупредувањата за мобилно емитување се доставуваат на некои локации, за да ве предупредат на итни ситуации. Злонамерните апликации може да пречат во ефикасноста или работењето на вашиот уред кога се прима емитување за итен случај."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"читај претплатени навестувања на содржина"</string> @@ -656,7 +660,7 @@ <string name="permlab_startViewPermissionUsage" msgid="5484728591597709944">"започнете со користење на дозволата за приказ"</string> <string name="permdesc_startViewPermissionUsage" msgid="4808345878203594428">"Дозволува сопственикот да почне со користење на дозволата за апликација. Не треба да се користи за стандардни апликации."</string> <string name="permlab_accessibilityShortcutTarget" msgid="1385930065395622809">"цел на кратенката за пристапност"</string> - <string name="permdesc_accessibilityShortcutTarget" msgid="562750894417800432">"Дозволува апликација да ја дефинира целта на кратенката за пристап."</string> + <string name="permdesc_accessibilityShortcutTarget" msgid="562750894417800432">"Дозволува апликација да одреди цел на кратенката за пристапност."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Постави правила за лозинката"</string> <string name="policydesc_limitPassword" msgid="2502021457917874968">"Контролирај ги должината и знаците што се дозволени за лозинки и PIN-броеви за отклучување екран."</string> <string name="policylab_watchLogin" msgid="5091404125971980158">"Следи ги обидите за отклучување на екранот"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 7876c2972e95..479bb3a21f8a 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS സന്ദേശങ്ങൾ നേടാനും പ്രോസസ്സുചെയ്യാനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. നിങ്ങളുടെ ഉപകരണത്തിലേക്ക് അയയ്ക്കുന്ന സന്ദേശങ്ങൾ നിങ്ങൾക്ക് ദൃശ്യമാക്കാതെ തന്നെ അപ്ലിക്കേഷന് നിരീക്ഷിക്കാനോ ഇല്ലാതാക്കാനോ കഴിയുമെന്നാണ് ഇതിനർത്ഥം."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"വാചക സന്ദേശം നേടുക (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS സന്ദേശങ്ങൾ നേടാനും പ്രോസസ്സുചെയ്യാനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. നിങ്ങളുടെ ഉപകരണത്തിലേക്ക് അയയ്ക്കുന്ന സന്ദേശങ്ങൾ നിങ്ങൾക്ക് ദൃശ്യമാക്കാതെ തന്നെ അപ്ലിക്കേഷന് നിരീക്ഷിക്കാനോ ഇല്ലാതാക്കാനോ കഴിയുമെന്നാണ് ഇതിനർത്ഥം."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"സെൽ പ്രക്ഷേപണ സന്ദേശങ്ങൾ റീഡുചെയ്യുക"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"നിങ്ങളുടെ ഉപകരണത്തിൽ ലഭിച്ച സെൽ പ്രക്ഷേപണ സന്ദേശങ്ങൾ റീഡുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. അടിയന്തര സാഹചര്യങ്ങളെക്കുറിച്ച് നിങ്ങൾക്ക് മുന്നറിയിപ്പ് നൽകാനായി ചില ലൊക്കേഷനുകളിൽ നൽകപ്പെടുന്നവയാണ് സെൽ പ്രക്ഷേപണ അലേർട്ടുകൾ. ഒരു അടിയന്തര സെൽ പ്രക്ഷേപണം ലഭിക്കുമ്പോൾ, ക്ഷുദ്രകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ ഉപകരണത്തിന്റെ പ്രകടനമോ പ്രവർത്തനമോ തടസ്സപ്പെടുത്താനിടയുണ്ട്."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"സബ്സ്ക്രൈബ് ചെയ്ത ഫീഡുകൾ വായിക്കുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 1a474038d7ca..1f2995678e46 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Апп нь SMS мессежийг хүлээн авах болон гүйцэтгэх боломжтой. Ингэснээр апп нь таны төхөөрөмжрүү илгээсэн мессежийг танд үзүүлэхгүйгээр хянах болон устгаж чадна."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"текст мессеж(МMS) хүлээж авах"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Апп нь MMS мессежийг хүлээн авах болон гүйцэтгэх боломжтой. Ингэснээр апп нь таны төхөөрөмжрүү илгээсэн мессежийг танд үзүүлэхгүйгээр хянах болон устгаж чадна."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"үүрэн өргөн дамжууллын мессеж унших"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Апп нь таны төхөөрөмжийн хүлээн авсан үүрэн өргөн дамжуулах мессежийг унших боломжтой. Үүрэн өргөн дамжууллын мэдэгдэл нь яаралтай нөхцөл байдлыг анхааруулах зорилгоор зарим байршлуудад хүрдэг. Хортой апп нь яаралтай үүрэн өргөн дамжууллыг хүлээн авсан үед таны төхөөрөмжийн ажиллагаа болон чадамжид нөлөөлөх боломжтой."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"бүртгүүлсэн хангамжийг унших"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 05638dfb4c61..5c6e358c5e4f 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS मेसेज प्राप्त करण्याची आणि त्यावर प्रक्रिया करण्याची अॅप ला अनुमती देते. म्हणजेच अॅप आपल्या डीव्हाइसवर पाठविलेले मेसेज तुम्हाला न दर्शवता त्यांचे परीक्षण करू किंवा ते हटवू शकतो."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"मजकूर मेसेज मिळवा (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS मेसेज प्राप्त करण्यास आणि त्यावर प्रक्रिया करण्यास अॅप ला अनुमती देते. म्हणजेच अॅप आपल्या डिव्हाइसवर पाठविलेले मेसेज तुम्हाला न दर्शवता त्यांचे परीक्षण करू किंवा ते हटवू शकतो."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"सेल प्रसारण मेसेज वाचा"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"आपल्या डिव्हाइसद्वारे प्राप्त केलेले सेल प्रसारण मेसेज वाचण्यासाठी अॅप ला अनुमती देते. काही स्थानांमध्ये तुम्हाला आणीबाणीच्या परिस्थितीची चेतावणी देण्यासाठी सेल प्रसारण सूचना वितरीत केल्या जातात. आणीबाणी सेल प्रसारण प्राप्त होते तेव्हा आपल्या डिव्हाइसच्या कार्यप्रदर्शनात किंवा कार्यात दुर्भावनापूर्ण अॅप्स व्यत्यय आणू शकतात."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"सदस्यता घेतलेली फीड वाचा"</string> @@ -1001,7 +1005,7 @@ <string name="weeks" msgid="6509623834583944518">"आठवडे"</string> <string name="year" msgid="4001118221013892076">"वर्ष"</string> <string name="years" msgid="6881577717993213522">"वर्षे"</string> - <string name="now_string_shortest" msgid="8912796667087856402">"आत्ता"</string> + <string name="now_string_shortest" msgid="8912796667087856402">"आता"</string> <plurals name="duration_minutes_shortest" formatted="false" msgid="3957499975064245495"> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>मि</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>मि</item> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index d5c5475c879a..a7a4c994c978 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Membenarkan apl menerima dan memproses mesej SMS. Ini bermakna apl boleh memantau atau memadam mesej yang dihantar ke peranti anda tanpa menunjukkannya kepada anda."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"terima mesej teks (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Membenarkan apl menerima dan memproses mesej MMS. Ini bermakna apl boleh memantau atau memadam mesej yang dihantar ke peranti anda tanpa menunjukkannya kepada anda."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"baca mesej siaran sel"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Membolehkan apl membaca mesej siaran sel yang diterima oleh peranti anda. Isyarat siaran sel dihantar di beberapa lokasi untuk memberi amaran kepada anda tentang situasi kecemasan. Apl hasad boleh mengganggu prestasi atau operasi peranti anda apabila siaran sel kecemasan diterima."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"baca suapan langganan"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 55061661c330..cbe8af496c74 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"အပလီကေးရှင်းအား စာတိုများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"စာပို့ခြင်းအား လက်ခံရယူခြင်း (ရုပ်သံစာ)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"အပလီကေးရှင်းအား ရုပ်သံစာများ လက်ခံခြင်း၊ ဆောင်ရွက်ခြင်း ခွင့်ပြုပါ။ ဤခွင့်ပြုချက်တွင် အပလီကေးရှင်းအနေဖြင့် သင် လက်ခံရရှိသော စာများအား သင့်အား မပြပဲစောင့်ကြည့်ခွင့်နှင့် ဖျက်ပစ်ခွင့်များ ပါဝင်ပါသည်။"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"စာတိုများ ဖြန့်ဝေခြင်းစနစ်အား ဖတ်ခြင်း"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"အပလီကေးရှင်းကို သင်၏ စက်ပစ္စည်းမှ လက်ခံရရှိသော အများလွှင့်ထုတ်ချက်များကို ဖတ်ရန် ခွင့်ပြုသည်။ အများလွှင့်ထုတ်ချက်များသည် အရေးပေါ်အခြေအနေများကို သင့်အား သတိပေးရန် အချို့ နေရာများတွင် ပို့ပေးသည်။ အရေးပေါ်သတိပေးချက် ထုတ်လွှင့်ချက်ကို လက်ခံရရှိချိန်တွင်အန္တရာယ် ဖြစ်စေနိုင်သော အပလီကေးရှင်းများသည် သင့်စက်ပစ္စည်း၏ လုပ်ငန်းလည်ပတ်မှုနှင့် စွမ်းဆောင်မှုကို ဝင်စွက်ဖက်နိုင်သည်။"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"အမည်သွင်းထားသောဖိဖ့်များကို ဖတ်ခြင်း"</string> @@ -1453,8 +1457,8 @@ <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"အောက်ပါထဲက အက်ပ်တစ်ခု သို့မဟုတ် ပိုလျက် သင်၏ အကောင့်ကို၊ ယခု နှင့် အနာဂတ်မှာ ရယူအသုံးချရန် ခွင့်ပြုချက်ကို တောင်းထားသည်။"</string> <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"ဤတောင်းခံမှုအားခွင့်ပြုမည်လား"</string> <string name="grant_permissions_header_text" msgid="6874497408201826708">"သုံးစွဲခွင့် တောင်းဆိုရန်"</string> - <string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string> - <string name="deny" msgid="2081879885755434506">"ငြင်းပယ်သည်"</string> + <string name="allow" msgid="7225948811296386551">"ခွင့်ပြုရန်"</string> + <string name="deny" msgid="2081879885755434506">"ငြင်းပယ်ရန်"</string> <string name="permission_request_notification_title" msgid="6486759795926237907">"ခွင့်ပြုချက် တောင်းခံထားခြင်း"</string> <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"အကောင့် <xliff:g id="ACCOUNT">%s</xliff:g> အတွက် \n ခွင့်ပြုချက် တောင်းခံထားပြီး"</string> <string name="forward_intent_to_owner" msgid="1207197447013960896">"သင်သည် ဒီအက်ပ်ကို သင့်အလုပ်ပရိုဖိုင် ပြင်ပတွင် အသုံးပြုနေ၏"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index f6bbaaad96d7..183e2e271bc3 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Lar appen motta og behandle tekstmeldinger. Dette betyr at appen kan overvåke eller slette meldinger som er sendt til enheten din uten at du har sett dem."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"motta tekstmeldinger (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Lar appen motta og behandle multimediemeldinger. Dette betyr at appen kan overvåke eller slette meldinger som er sendt til enheten din uten at du har sett dem."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lese kringkastede meldinger"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillater at appen kan lese kringkastede meldinger enheten din mottar. Kringkastede varsler leveres noen steder for å advare deg om nødssituasjoner. Skadelige apper kan forstyrre ytelsen eller funksjonen til enheten din når en kringkastet nødmelding mottas."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lese abonnement på nyhetskilder"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index c5608225df3e..4c4e1f0572b4 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"अनुप्रयोगलाई SMS सन्देशहरू प्राप्त गर्न र प्रक्रिया गर्न अनुमति दिन्छ। यसको मतलब अनुप्रयोगले तपाईंको उपकरणमा पठाइएको सन्देशहरू तपाईंलाई नदेखाईनै मोनिटर गर्न वा मेटाउन सक्दछ।"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"पाठ सन्देश (MMS) प्राप्त गर्नुहोस्"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"अनुप्रयोगलाई MMS सन्देशहरू प्राप्त गर्न र प्रकृया गर्न अनुमति दिन्छ। यसको मतलब अनुप्रयोगले तपाईंको उपकरणमा पठाइएको सन्देशहरू तपाईंलाई नदेखाईनै मोनिटर गर्न वा मेटाउन सक्दछ।"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"सेल प्रसारित सन्देशहरू पढ्नुहोस्"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"तपाईंको उपकरणद्वारा प्राप्त सेल प्रसारण सन्देशहरू अनुप्रयोगलाई पढ्न अनुमति दिन्छ। सेल प्रसारण चेतावनीहरू केही स्थानहरूमा तपाईंलाई आपतकालीन गतिविधिहरूको बारेमा सचेत गराउन गरिएका छन्। खराब अनुप्रयोगहरूले एउटा आपतकालीन सेल प्रसारण प्राप्त गर्दछ जब तपाईंको उपकरणको प्रदर्शन वा अपरेशनको साथ हस्तक्षेप गर्न सक्दछन्।"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"सदस्य बनाइका फिडहरू पढ्नुहोस्"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 6dc5a644cdd0..b3cc884b973b 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Hiermee kan de app sms-berichten ontvangen en verwerken. Dit betekent dat de app berichten die naar je apparaat zijn verzonden, kan bijhouden of verwijderen zonder deze aan u weer te geven."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"tekstberichten (MMS) ontvangen"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Hiermee kan de app MMS-berichten ontvangen en verwerken. Dit betekent dat de app berichten die naar je apparaat zijn verzonden, kan bijhouden of verwijderen zonder deze aan u weer te geven."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"infodienstberichten lezen"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Toestaan dat de app infodienstberichten leest die worden ontvangen op je apparaat. Infodienstberichten worden verzonden naar bepaalde locaties om u te waarschjeen voor noodsituaties. Schadelijke apps kunnen de prestaties of verwerking van je apparaat verstoren wanneer een infodienstbericht wordt ontvangen."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"Geabonneerde feeds lezen"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index bc3c400a3d2a..eb8f4c6ca4c3 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS ମେସେଜ୍ ପ୍ରାପ୍ତ କରିବାକୁ ତଥା ପ୍ରକ୍ରିୟା କରାଇବାକୁ ଆପ୍ଟିକୁ ଅନୁମତି ଦିଏ। ଏହାର ଅର୍ଥ ହେଉଛି, ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ପଠାଯାଇଥିବା ମେସେଜ୍ ଆପଣଙ୍କୁ ନଦେଖାଇ ଆପ୍ଟି ମନିଟର୍ କିମ୍ବା ଡିଲିଟ୍ କରିପାରେ।"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ଟେକ୍ସଟ୍ ମେସେଜ୍ (MMS) ପ୍ରାପ୍ତ କରନ୍ତୁ"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS ମେସେଜ୍ ପ୍ରାପ୍ତ କରିବାକୁ ତଥା ପ୍ରକ୍ରିୟା କରାଇବାକୁ ଆପ୍ଟିକୁ ଅନୁମତି ଦିଏ। ଏହାର ଅର୍ଥ, ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ପଠାଯାଇଥିବା ମେସେଜ୍ ଆପଣଙ୍କୁ ନଦେଖାଇ ଆପ୍ଟି ମନିଟର୍ କିମ୍ବା ଡିଲିଟ୍ କରିପାରେ।"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ସେଲ୍ ବ୍ରଡ୍କାଷ୍ଟ ମେସେଜ୍ ପଢ଼ନ୍ତୁ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ଆପଣଙ୍କ ଡିଭାଇସ୍ରେ ପ୍ରାପ୍ତ ହୋଇଥିବା ସେଲ୍ ବ୍ରଡ୍କାଷ୍ଟ ମେସେଜ୍ ପଢିବାକୁ ଆପ୍କୁ ଅନୁମତି ଦିଏ। ଜରୁରୀକାଳୀନ ଅବସ୍ଥା ବିଷୟରେ ଆପଣଙ୍କୁ ସତର୍କ କରାଇବାକୁ କିଛି ଲୋକେଶନ୍ରେ ସେଲ୍ ବ୍ରଡ୍କାଷ୍ଟ ସତର୍କ ଡେଲିଭର୍ କରାଯାଇଥାଏ। ଏକ ଜରୁରୀକାଳୀନ ସେଲ୍ ବ୍ରଡ୍କାଷ୍ଟ ପ୍ରାପ୍ତ ହେବାପରେ ହାନୀକାରକ ଆପ୍ ଆପଣଙ୍କ ଡିଭାଇସ୍ର କାର୍ଯ୍ୟକ୍ଷମତା କିମ୍ବା ସଞ୍ଚାଳନାରେ ବାଧା ପହଞ୍ଚାଇପାରନ୍ତି।"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ସବସ୍କ୍ରାଇବ୍ ହୋଇଥିବା ଫୀଡ୍କୁ ପଢ଼ନ୍ତୁ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 74deed1933d2..bc68885512cc 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"ਐਪ ਨੂੰ SMS ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਸਦਾ ਮਤਲਬ ਹੈ ਕਿ ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਭੇਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਤੁਹਾਨੂੰ ਦਿਖਾਏ ਬਿਨਾਂ ਨਿਰੀਖਣ ਕਰ ਸਕਦੀ ਹੈ ਜਾਂ ਮਿਟਾ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ਟੈਕਸਟ ਸੁਨੇਹੇ (MMS) ਪੜ੍ਹੋ"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ਐਪ ਨੂੰ MMS ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਸਦਾ ਮਤਲਬ ਹੈ ਕਿ ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਭੇਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਤੁਹਾਨੂੰ ਦਿਖਾਏ ਬਿਨਾਂ ਨਿਰੀਖਣ ਕਰ ਸਕਦੀ ਹੈ ਜਾਂ ਮਿਟਾ ਸਕਦੀ ਹੈ।"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ਸੈਲ ਪ੍ਰਸਾਰਨ ਸੁਨੇਹੇ ਪੜ੍ਹੋ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ਐਪ ਨੂੰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਵੱਲੋਂ ਪ੍ਰਾਪਤ ਕੀਤੇ ਸੈੱਲ ਪ੍ਰਸਾਰਣ ਸੁਨੇਹੇ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਸੈੱਲ ਪ੍ਰਸਾਰਣ ਚਿਤਾਵਨੀਆਂ ਤੁਹਾਨੂੰ ਸੰਕਟਕਾਲੀਨ ਸਥਿਤੀਆਂ ਦੀ ਚਿਤਾਵਨੀ ਦੇਣ ਲਈ ਕੁਝ ਨਿਰਧਾਰਤ ਟਿਕਾਣਿਆਂ ਤੇ ਪ੍ਰਦਾਨ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ। ਖਰਾਬ ਐਪਾਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੇ ਪ੍ਰਦਰਸ਼ਨ ਜਾਂ ਓਪਰੇਸ਼ਨ ਵਿੱਚ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਸੈੱਲ ਪ੍ਰਸਾਰਣ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ਸਬਸਕ੍ਰਾਈਬ ਕੀਤੇ ਫੀਡਸ ਪੜ੍ਹੋ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index b1369c7cde8d..1dbe1c1fd1c4 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Pozwala aplikacji na odbieranie i przetwarzanie SMS-ów. To oznacza, że aplikacja będzie mogła bez Twojej wiedzy monitorować i usuwać wiadomości wysyłane do Twojego urządzenia."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"odbieranie wiadomości tekstowych (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Pozwala aplikacji na odbieranie i przetwarzanie MMS-ów. To oznacza, że aplikacja będzie mogła bez Twojej wiedzy monitorować i usuwać wiadomości wysyłane do Twojego urządzenia."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"odczyt komunikatów z sieci komórkowej"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Zezwala aplikacji na odczyt komunikatów z sieci komórkowej odebranych na urządzeniu. Komunikaty alarmowe z sieci komórkowej są dostarczane w niektórych lokalizacjach w celu ostrzeżenia Cię o sytuacjach zagrożenia. Złośliwe aplikacje mogą wpływać na wydajność lub zakłócać działanie urządzenia po odebraniu komunikatu alarmowego z sieci komórkowej."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"czytanie subskrybowanych źródeł"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 4dc270094b63..c5bcb1da90fa 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite que o app receba e processe mensagens SMS. Isso significa que o app pode monitorar ou excluir mensagens enviadas para o dispositivo sem mostrá-las para você."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receber mensagens de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite que o app receba e processe mensagens MMS. Isso significa que o app pode monitorar ou excluir as mensagens enviadas para o dispositivo sem mostrá-las para você."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ler mensagens de difusão celular"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite que o app leia mensagens de difusão celular recebidas por seu dispositivo. Alertas de difusão celular são recebidos em alguns locais para avisar você de situações de emergência. Apps maliciosos podem interferir no desempenho ou funcionamento de seu dispositivo quando uma difusão celular de emergência é recebida."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ler feeds inscritos"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 141dca320ad9..29ef5493da53 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite que a aplicação receba e processe mensagens SMS. Isto significa que a aplicação poderá monitorizar ou eliminar mensagens enviadas para o seu dispositivo sem as apresentar."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receber mensagens de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite que a aplicação receba e processe mensagens MMS. Isto significa que a aplicação poderá monitorizar ou eliminar mensagens enviadas para o seu dispositivo sem as apresentar."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ler mensagens de transmissão celular"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite que a aplicação leia mensagens de transmissão celular recebidas pelo seu dispositivo. Os alertas de transmissão celular são fornecidos em algumas localizações para avisá-lo sobre situações de emergência. As aplicações maliciosas podem interferir com o desempenho ou funcionamento do seu dispositivo quando for recebida uma transmissão celular de emergência."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ler feeds subscritos"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 4dc270094b63..c5bcb1da90fa 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite que o app receba e processe mensagens SMS. Isso significa que o app pode monitorar ou excluir mensagens enviadas para o dispositivo sem mostrá-las para você."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"receber mensagens de texto (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite que o app receba e processe mensagens MMS. Isso significa que o app pode monitorar ou excluir as mensagens enviadas para o dispositivo sem mostrá-las para você."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"ler mensagens de difusão celular"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite que o app leia mensagens de difusão celular recebidas por seu dispositivo. Alertas de difusão celular são recebidos em alguns locais para avisar você de situações de emergência. Apps maliciosos podem interferir no desempenho ou funcionamento de seu dispositivo quando uma difusão celular de emergência é recebida."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"ler feeds inscritos"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 73f31c4b85bc..8ee45f963101 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Permite aplicației să primească și să proceseze mesaje SMS. Acest lucru înseamnă că aplicația ar putea monitoriza sau șterge mesajele trimise pe dispozitivul dvs. fără a vi le arăta."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"primește mesaje text (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Permite aplicației să primească și să proceseze mesaje MMS. Acest lucru înseamnă că aplicația ar putea monitoriza sau șterge mesajele trimise pe dispozitivul dvs. fără a vi le arăta."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"citește mesajele cu transmisie celulară"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Permite aplicației să citească mesajele primite prin transmisie celulară de dispozitivul dvs. Alertele cu transmisie celulară sunt difuzate în unele locații pentru a vă avertiza cu privire la situațiile de urgență. Aplicațiile rău intenționate pot afecta performanța sau funcționarea dispozitivului dvs. când este primită o transmisie celulară de urgență."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"citire feeduri abonat"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 9e43592d29e9..655cf1bc1275 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Приложение сможет получать и обрабатывать SMS. Это значит, что оно сможет отслеживать и удалять отправленные на ваше устройство сообщения, не показывая их."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"Прием MMS-сообщений"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Приложение сможет получать и обрабатывать MMS. Это значит, что оно сможет отслеживать и удалять отправленные на ваше устройство сообщения, не показывая их."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"Читать сообщения массовой рассылки"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Приложение получит доступ к сообщениям широковещательных SMS-служб, которые в некоторых странах используются для информирования населения об экстренных ситуациях. Вредоносные программы могут помешать работе устройства, на которое поступают такие сообщения."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"Просмотр фидов пользователя"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index cc2a2a89018d..5fc6b53375a3 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS පණිවිඩ ලැබීමට සහ ක්රියාත්මක කිරීමට යෙදුමට අවසර දෙන්න. මෙහි තේරුම යෙදුමට ඔබගේ උපාංගයට ලැබෙන පණිවිඩ අධීක්ෂණය කිරීමට හැකිවීම වන අතර, ඒවා ඔබට නොපෙන්වා මකා දැමීමටද හැකි වීමයි."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"පෙළ පණිවුඩ ලබාගන්න (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS පණිවිඩ සොයා ලබාගැනීමට සහ ක්රියාත්මක කිරීමට යෙදුමට අවසර දෙන්න. යෙදුම නිරීක්ෂණය කරනු ලබන අතර ඔබට ලැබුන පණිවිඩ පෙන්වීමෙන් තොරවම මකා දැමිය හැකි බව මෙමඟින් අදහස් කරයි."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"සෙල් ප්රචාරණ පණිවිඩ කියවීම"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ඔබගේ උපාංගයට ලැබුණු සෙල් විකාශන පණිවිඩ කියවීමට යෙදුමට අවසර දෙන්න. ඔබට හදිසි අවස්ථාවන් පිළිබඳ අනතුරු ඇඟවීමට සෙල් විකාශන පණිවිඩ ඇතැම් ස්ථානවල සිට යවනු ලබයි. හදිසි සෙල් විකාශන ලැබෙන අවස්ථාවකදී, අනිෂ්ට යෙදුම් මඟින් ඔබගේ උපාංගයට කාර්ය සාධනයට හෝ ක්රියකරණයට බාධා සිදුවිය හැක."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"දායක වූ සංග්රහ කියවීම"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 0e49c86c49c5..ce17331723ed 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Umožňuje aplikácii prijímať a spracovávať správy SMS. Znamená to, že aplikácia môže sledovať správy odoslané na vaše zariadenie alebo ich odstrániť bez toho, aby sa vám zobrazili."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"prijímať textové správy (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Umožňuje aplikácii prijímať a spracovávať správy MMS. Znamená to, že aplikácia môže sledovať správy odoslané na vaše zariadenie alebo ich odstrániť bez toho, aby sa vám zobrazili."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"čítať správy informačných služieb"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Umožňuje aplikácii čítať správy informačných služieb prijaté vaším zariadením. Správy informačných služieb sa doručujú na určitých miestach a upozorňujú na tiesňové situácie. Škodlivé aplikácie môžu pri prijatí správy informačnej služby narušiť výkonnosť alebo prevádzku vášho zariadenia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"čítať odoberané informačné kanály"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 83400469d86f..ec0863f646b0 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Aplikaciji omogoča prejemanje in obdelavo SMS-ov. S tem lahko aplikacija nadzoruje ali izbriše sporočila, poslana v napravo, ne da bi vam jih pokazala."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"prejemanje sporočil (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Aplikaciji omogoča prejemanje in obdelavo MMS-ov. S tem lahko aplikacija nadzoruje ali izbriše sporočila, poslana v napravo, ne da bi vam jih pokazala."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"branje sporočil oddaje v celici"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Omogoča aplikaciji branje sporočil oddaje v celici, ki jih prejme naprava. Opozorila oddaje v celici so dostavljena na nekaterih lokacijah, da vas opozorijo na izredne razmere. Zlonamerne aplikacije lahko vplivajo na delovanje naprave, ko dobi sporočilo oddaje v celici."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"branje naročenih virov"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 411d4586ad08..95359cc8916f 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Lejon aplikacionin të marrë dhe përpunojë mesazhe SMS. Kjo do të thotë se aplikacioni mund të monitorojë ose fshijë mesazhe të dërguara në pajisjen tënde, pa t\'i treguar ato."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"prano mesazhe në tekst (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Lejon aplikacionin të marrë dhe përpunojë mesazhe MMS. Kjo do të thotë se aplikacioni mund të monitorojë ose fshijë mesazhe të dërguara në pajisjen tënde, pa t\'i treguar ato."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"lexo mesazhet e transmetimit të qelizës"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Lejon aplikacionin të lexojë mesazhet e transmetimit të qelizës, të marra nga pajisja jote. Alarmet e transmetimit të qelizës dërgohen në disa vendndodhje për të të paralajmëruar në situata urgjente. Aplikacionet keqdashëse mund të ndërhyjnë në veprimtarinë ose operacionin e pajisjes tënde kur merret një transmetim urgjent i qelizës."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"lexo informacione të abonuara"</string> @@ -549,7 +553,7 @@ <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Shumë përpjekje. Sensori i gjurmës së gishtit u çaktivizua."</string> <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Provo përsëri."</string> <string name="fingerprint_error_no_fingerprints" msgid="7654382120628334248">"Nuk ka asnjë gjurmë gishti të regjistruar."</string> - <string name="fingerprint_error_hw_not_present" msgid="409523969613176352">"Kjo pajisje nuk ka një sensor të gjurmës së gishtit."</string> + <string name="fingerprint_error_hw_not_present" msgid="409523969613176352">"Kjo pajisje nuk ka sensor të gjurmës së gishtit."</string> <string name="fingerprint_name_template" msgid="5870957565512716938">"Gishti <xliff:g id="FINGERID">%d</xliff:g>"</string> <string-array name="fingerprint_error_vendor"> </string-array> @@ -1359,7 +1363,7 @@ <string name="usb_power_notification_message" msgid="4647527153291917218">"Pajisja e lidhur po karikohet. Trokit për opsione të tjera."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"U zbulua aksesor i audios analoge"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"Pajisja e bashkuar nuk është e pajtueshme me këtë telefon. Trokit për të mësuar më shumë."</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"Korrigjuesi i USB-së i lidhur"</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"Korrigjuesi i USB-së është i lidhur"</string> <string name="adb_active_notification_message" msgid="7463062450474107752">"Trokit për të çaktivizuar korrigjimin e USB-së"</string> <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Përzgjidhe për të çaktivizuar korrigjimin e gabimeve të USB-së"</string> <string name="test_harness_mode_notification_title" msgid="2216359742631914387">"Modaliteti i lidhjes së testimit është aktivizuar"</string> @@ -1584,8 +1588,8 @@ <string name="expires_on" msgid="3676242949915959821">"Skadon më:"</string> <string name="serial_number" msgid="758814067660862493">"Numri serik:"</string> <string name="fingerprints" msgid="4516019619850763049">"Shenjat e gishtave:"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"Shenja e gishtit SHA-256:"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"Shenja e gishtit SHA-1:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"Gjurma e gishtit SHA-256:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"Gjurma e gishtit SHA-1:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Shikoji të gjitha"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Zgjidh aktivitetin"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Shpërnda publikisht me"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index c2d636d0323e..39ad5f4db73b 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -347,6 +347,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Дозвољава апликацији да прима и обрађује SMS поруке. То значи да апликација може да надгледа или брише поруке које се шаљу уређају, а да вам их не прикаже."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"пријем текстуалних порука (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Дозвољава апликацији да прима и обрађује MMS поруке. То значи да апликација може да надгледа или брише поруке које се шаљу уређају, а да вам их не прикаже."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"читање порука инфо сервиса"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Омогућава апликацији да чита поруке инфо сервиса које уређај прима. Упозорења инфо сервиса се на неким локацијама примају као упозорења на хитне случајеве. Злонамерне апликације могу да утичу на учинак или ометају функционисање уређаја када се прими порука инфо сервиса о хитном случају."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"читање пријављених фидова"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 854e44f852fa..061d7b7b717f 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Tillåter att appen tar emot och hanterar SMS. Detta innebär att appen kan övervaka eller ta bort meddelanden som skickats till enheten utan att visa dem för dig."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"ta emot textmeddelanden (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Tillåter att appen tar emot och hanterar MMS-meddelanden. Detta innebär att appen kan övervaka eller ta bort meddelanden som skickats till enheten utan att visa dem för dig."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"läsa SMS-meddelanden"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Appen tillåts läsa SMS som skickas till din enhet. På vissa platser skickas SMS för att varna för nödsituationer. Skadliga appar kan påverka enhetens prestanda eller funktionalitet när du får ett meddelande om en nödsituation via SMS."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"läsa flöden som du prenumererar på"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 565cdf94080d..16df4e389632 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Inaruhusu programu kupokea na kuchakata ujumbe wa SMS. Hii inamaanisha programu hii inaweza kuchunguza na kufuta ujumbe uliotumwa katika kifaa chako bila ya kukuonyesha."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"pokea ujumbe wa maandishi wa MMS"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Inaruhusu programu kupokea na kuchakata ujumbe medianwai (MMS). Hii inamaanisha uwezo wa kuchunguza na kufuta ujumbe uliotumwa kwa kifaa chako bila ya kukuonyesha."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"soma mawasiliano ya matangazo ya simu"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Huruhusu programu kusoma mawasiliano ya matangazo ya simu yaliyoingia kwenye kifaa chako. Arifa za matangazo ya simu huwasilishwa katika maeneo mengine ili kukuonya juu ya hali za dharura. Huenda programu hasidi zikatatiza utendajikazi au shughuli ya kifaa chako wakati matangazo ya simu ya dharura yameingia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"kusoma mipasho kutoka vyanzo unavyofuatilia"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 9d6d4e14a0fb..3b80a43221dd 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS செய்திகளைப் பெற, செயற்படுத்தப் ஆப்ஸை அனுமதிக்கிறது. இதற்கு அர்த்தம் உங்கள் சாதனத்திற்கு அனுப்பப்படும் செய்திகளை உங்களுக்குக் காட்டாமல் கண்காணிப்பதற்கு அல்லது நீக்குவதற்கு ஆப்ஸால் முடியும் என்பதாகும்."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"உரைச் செய்திகளை (MMS) பெறுதல்"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS செய்திகளைப் பெற, செயற்படுத்தப் ஆப்ஸை அனுமதிக்கிறது. இதற்கு அர்த்தம் உங்கள் சாதனத்திற்கு அனுப்பப்படும் செய்திகளை உங்களுக்குக் காட்டாமல் கண்காணிக்கவோ, நீக்கவோ ஆப்ஸால் முடியும் என்பதாகும்."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"செல் அலைபரப்புச் செய்திகளைப் படித்தல்"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"உங்கள் சாதனத்தில் பெறப்படும் செல் அலைபரப்புச் செய்திகளைப் படிப்பதற்குப் ஆப்ஸை அனுமதிக்கிறது. அவசரநிலை சூழ்நிலைகளை உங்களுக்கு எச்சரிக்கைச் செய்வதற்கு சில இடங்களில் செல் அலைபரப்பு விழிப்பூட்டல்கள் வழங்கப்படும். அவசரநிலை மொபைல் அலைபரப்புப் பெறப்படும்போது உங்கள் சாதனத்தின் செயல்திறன் அல்லது செயல்பாட்டுடன் தீங்கிழைக்கும் ஆப்ஸ் அதைத் தடுக்கலாம்."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"குழுசேர்ந்த ஊட்டங்களைப் படித்தல்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index a14bcb99d08a..37e0590910a0 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"SMS సందేశాలను స్వీకరించడానికి మరియు ప్రాసెస్ చేయడానికి యాప్ను అనుమతిస్తుంది. యాప్ మీ డివైజ్కు పంపబడిన సందేశాలను మీకు చూపకుండానే పర్యవేక్షించగలదని లేదా తొలగించగలదని దీని అర్థం."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"వచన సందేశాలను (MMS) స్వీకరించడం"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"MMS సందేశాలను స్వీకరించడానికి మరియు ప్రాసెస్ చేయడానికి యాప్ను అనుమతిస్తుంది. యాప్ మీ డివైజ్కు పంపబడిన సందేశాలను మీకు చూపకుండానే పర్యవేక్షించగలదని లేదా తొలగించగలదని దీని అర్థం."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"సెల్ ప్రసార సందేశాలను చదవడం"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"మీ పరికరం స్వీకరించిన సెల్ ప్రసార సందేశాలను చదవడానికి యాప్ను అనుమతిస్తుంది. సెల్ ప్రసార హెచ్చరికలు అత్యవసర పరిస్థితుల గురించి మిమ్మల్ని హెచ్చరించడానికి కొన్ని స్థానాల్లో అందించబడతాయి. అత్యవసర సెల్ ప్రసారం స్వీకరించినప్పుడు హానికరమైన యాప్లు మీ పరికరం యొక్క పనితీరు లేదా నిర్వహణకు అంతరాయం కలిగించవచ్చు."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"చందా చేయబడిన ఫీడ్లను చదవడం"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 4210354f5da6..482288e7f3a0 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -283,7 +283,7 @@ <string name="permgrouprequest_contacts" msgid="6032805601881764300">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> เข้าถึงรายชื่อติดต่อไหม"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"ตำแหน่ง"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"เข้าถึงตำแหน่งของอุปกรณ์นี้"</string> - <string name="permgrouprequest_location" msgid="3788275734953323491">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> เข้าถึงตำแหน่งของอุปกรณ์นี้ไหม"</string> + <string name="permgrouprequest_location" msgid="3788275734953323491">"อนุญาตให้<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>เข้าถึงตำแหน่งของอุปกรณ์นี้ไหม"</string> <string name="permgrouprequestdetail_location" msgid="1347189607421252902">"แอปจะมีสิทธิ์เข้าถึงตำแหน่งในขณะที่คุณใช้แอปเท่านั้น"</string> <string name="permgroupbackgroundrequest_location" msgid="5039063878675613235">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> เข้าถึงตำแหน่งของอุปกรณ์นี้<b>ตลอดเวลา</b>ไหม"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="4597006851453417387">"ปัจจุบันแอปมีสิทธิ์เข้าถึงตำแหน่งในขณะที่คุณใช้แอปเท่านั้น"</string> @@ -298,7 +298,7 @@ <string name="permgrouprequest_storage" msgid="7885942926944299560">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> เข้าถึงรูปภาพ สื่อ และไฟล์ในอุปกรณ์ไหม"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"ไมโครโฟน"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"บันทึกเสียง"</string> - <string name="permgrouprequest_microphone" msgid="9167492350681916038">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> บันทึกเสียงไหม"</string> + <string name="permgrouprequest_microphone" msgid="9167492350681916038">"อนุญาตให้<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>บันทึกเสียงไหม"</string> <string name="permgrouplab_activityRecognition" msgid="1565108047054378642">"การเคลื่อนไหวร่างกาย"</string> <string name="permgroupdesc_activityRecognition" msgid="6949472038320473478">"เข้าถึงกิจกรรมการเคลื่อนไหวร่างกายของคุณ"</string> <string name="permgrouprequest_activityRecognition" msgid="7626438016904799383">"อนุญาตให้ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> เข้าถึงกิจกรรมการเคลื่อนไหวร่างกายของคุณไหม"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"อนุญาตให้แอปพลิเคชันรับและประมวลผลข้อความ SMS ซึ่งหมายความว่าแอปพลิเคชันจะสามารถตรวจสอบหรือลบข้อความที่ส่งมายังอุปกรณ์ของคุณได้โดยไม่ต้องแสดงให้คุณเห็น"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"รับข้อความ (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"อนุญาตให้แอปพลิเคชันรับและประมวลผลข้อความ MMS ซึ่งหมายความว่าแอปพลิเคชันจะสามารถตรวจสอบหรือลบข้อความที่ส่งมายังอุปกรณ์ของคุณได้โดยไม่ต้องแสดงให้คุณเห็น"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"อ่านข้อความที่ได้รับจากสถานีมือถือ"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"อนุญาตให้แอปอ่านข้อความจากสถานีมือถือที่อุปกรณ์ได้รับ การแจ้งเตือนทางมือถือมีให้บริการในบางพื้นที่ โดยจะแจ้งเตือนคุณเกี่ยวกับสถานการณ์ฉุกเฉิน แอปที่เป็นอันตรายอาจเข้าแทรกแซงการทำงานของอุปกรณ์เมื่อได้รับข้อความแจ้งเตือนฉุกเฉิน"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"อ่านฟีดข้อมูลที่สมัครไว้"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 70d2a2f62497..f2db658396a5 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Pinapayagan ang app na tumanggap at magproseso ng mga mensaheng SMS. Nangangahulugan ito na maaaring sumubaybay o magtanggal ang app ng mga mensaheng ipinapadala sa iyong device nang hindi ipinapakita ang mga ito sa iyo."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"tumanggap ng mga text message (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Pinapayagan ang app na tumanggap at magproseso ng mga mensaheng MMS. Nangangahulugan ito na maaaring sumubaybay o magtanggal ang app ng mga mensaheng ipinapadala sa iyong device nang hindi ipinapakita ang mga ito sa iyo."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"basahin ang mga mensahe ng cell broadcast"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Binibigyang-daan ang app na magbasa ng mga mensahe ng cell broadcast na natanggap ng iyong device. Inihahatid ang mga alerto ng cell broadcast sa ilang lokasyon upang balaan ka tungkol sa mga emergency na sitwasyon. Maaaring makaabala ang nakakahamak na apps sa performance o pagpapatakbo ng iyong device kapag nakatanggap ng emergency na cell broadcast."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"magbasa ng mga na-subscribe na feed"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 94e21dcd8cac..cf3fbfc075ae 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Uygulamaya SMS iletilerini alma ve işleme izni verir. Bu izin, uygulamanın cihazınıza gönderilen iletileri takip edip size göstermeden silebileceği anlamına gelir."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"kısa mesajları (MMS) al"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Uygulamaya MMS iletilerini alma ve işleme izni verir. Bu izin, uygulamanın cihazınıza gönderilen iletileri takip edip size göstermeden silebileceği anlamına gelir."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"hücre yayını mesajlarını oku"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Uygulamaya, cihazınız tarafından alınan hücre yayını mesajlarını okuma izni verir. Hücre yayını uyarıları bazı yerlerde acil durumlar konusunda sizi uyarmak için gönderilir. Kötü amaçlı uygulamalar acil hücre yayını alındığında cihazınızın performansına ya da çalışmasına engel olabilir."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"abone olunan yayınları okuma"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 3c306093e8bf..0ac716d7ffe0 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -350,6 +350,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Дозволяє програмі отримувати й обробляти SMS-повідомлення. Це означає, що програма може відстежувати чи видаляти повідомлення, надіслані на ваш пристрій, навіть не показуючи їх вам."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"отримувати текстові повідомлення (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Дозволяє програмі отримувати й обробляти MMS-повідомлення. Це означає, що програма може відстежувати чи видаляти повідомлення, надіслані на ваш пристрій, навіть не показуючи їх вам."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"читати широкомовні повідомлення мережі"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Дозволяє програмі читати широкомовні повідомлення мережі, отримані пристроєм. Широкомовні сповіщення мережі надсилаються в деяких країнах для попередження про надзвичайні ситуації. Шкідливі програми можуть втручатися у швидкодію чи роботу пристрою під час отримання широкомовного повідомлення мережі про надзвичайну ситуацію."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"читати підписані канали"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 59b30f09e845..43ecaf6080b4 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -324,7 +324,7 @@ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ڈسپلے کے زوم کی سطح اور پوزیشن کو کنٹرول کریں۔"</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"اشارے انجام دینے کی"</string> <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"تھپتھپانا، سوائپ کرنا، چٹکی بھرنا اور دیگر اشارے انجام دے سکتی ہے"</string> - <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"فنگرپرنٹ کے اشارے"</string> + <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"فنگر پرنٹ کے اشارے"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"آلہ کے فنگر پرنٹ سینسر پر کیے گئے اشاروں کو کیپچر کر سکتا ہے۔"</string> <string name="permlab_statusBar" msgid="7417192629601890791">"اسٹیٹس بار کو غیر فعال یا اس میں ترمیم کریں"</string> <string name="permdesc_statusBar" msgid="8434669549504290975">"ایپ کو اسٹیٹس بار غیر فعال کرنے یا سسٹم آئیکنز شامل کرنے اور ہٹانے کی اجازت دیتا ہے۔"</string> @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"ایپ کو SMS پیغامات حاصل اور ان پر کارروائی کرنے کی اجازت دیتا ہے۔ اس کا مطلب ہے کہ ایپ آپ کے آلے پر مرسلہ پیغامات آپ کو دکھائے بغیر ان پر نگاہ رکھ یا انہیں حذف کرسکتی ہے۔"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"متنی پیغامات (MMS) حاصل کریں"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"ایپ کو MMS پیغامات حاصل اور ان پر کارروائی کرنے کی اجازت دیتا ہے۔ اس کا مطلب ہے کہ ایپ آپ کے آلے پر مرسلہ پیغامات آپ کو دکھائے بغیر ان پر نگاہ رکھ یا انہیں حذف کرسکتی ہے۔"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"سیل کے نشریاتی پیغامات پڑھیں"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"ایپ کو آپ کے آلے کو موصولہ سیل کے نشریاتی پیغامات پڑھنے کی اجازت دیتا ہے۔ سیل کی نشریاتی الرٹس آپ کو ہنگامی حالات سے مطلع کرنے کیلئے کچھ مقامات میں مہیا کی جاتی ہیں۔ نقصان دہ ایپس کوئی ہنگامی سیل کا نشریہ موصول ہونے پر آپ کے آلے کی کارکردگی یا عمل میں خلل ڈال سکتی ہیں۔"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"سبسکرائب کردہ فیڈز پڑھیں"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 22655d00b785..5ebda2076c1d 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Ilovaga SMS xabarlarini qabul qilish va va ularni qayta ishlash uchun ruxsat beradi. Bu sizga yuborilgan xabarlarni ilova sizga ko‘rsatmasdan kuzatishi va o‘chirishi mumkinligini bildiradi."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"MMS xabarlarni olish"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Ilovaga MMS xabarlarini qabul qilish va ularni qayta ishlash uchun ruxsat beradi. Bu sizga yuborilgan xabarlarni ilova sizga ko‘rsatmasdan kuzatishi va o‘chirishi mumkinligini bildiradi."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"uyali tarmoq operatori xabarlarini o‘qish"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Ilovaga qurilmangiz tomonidan qabul qilingan uyali tarmoq operatori xabarlarini o‘qish uchun ruxsat beradi. Uyali tarmoq operatorining ogohlantiruvchi xabarlari ba’zi manzillarga favqulodda holatlar haqida ogohlantirish uchun jo‘natiladi. Zararli ilovalar uyali tarmoq orqali favqulodda xabar qabul qilinganda qurilmangizning ish faoliyati yoki amallariga xalaqit qilishi mumkin"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"obunalarni o‘qish"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index f36d993cfbdb..a34585bdafbb 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Cho phép ứng dụng nhận và xử lý tin nhắn SMS. Điều này có nghĩa là ứng dụng có thể theo dõi hoặc xóa tin nhắn được gửi đến thiết bị của bạn mà không hiển thị chúng cho bạn."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"nhận tin nhắn văn bản (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Cho phép ứng dụng nhận và xử lý tin nhắn MMS. Điều này có nghĩa là ứng dụng có thể theo dõi hoặc xóa tin nhắn được gửi đến thiết bị của bạn mà không hiển thị chúng cho bạn."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"đọc tin nhắn quảng bá"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Cho phép ứng dụng đọc tin nhắn quảng bá mà thiết bị của bạn nhận được. Tin nhắn quảng bá cảnh báo được gửi ở một số địa điểm nhằm cảnh báo cho bạn về các tình huống khẩn cấp. Các ứng dụng độc hại có thể gây ảnh hưởng đến hiệu suất hoặc hoạt động của thiết bị của bạn khi nhận được tin nhắn quảng bá khẩn cấp."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"đọc nguồn cấp dữ liệu đã đăng ký"</string> @@ -1583,8 +1587,8 @@ <string name="expires_on" msgid="3676242949915959821">"Hết hạn vào:"</string> <string name="serial_number" msgid="758814067660862493">"Số sê-ri:"</string> <string name="fingerprints" msgid="4516019619850763049">"Tệp tham chiếu:"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"Tệp tham chiếu SHA-256:"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"Tệp tham chiếu SHA-1:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"Vân tay SHA-256:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"Vân tay SHA-1:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Xem tất cả"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Chọn hoạt động"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Chia sẻ với"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 461bbb0531e2..64e0a1b0cc8b 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"允许该应用接收和处理短信。这就意味着，该应用可能会监视发送到您设备的短信，或删除发送到您设备的短信而不向您显示。"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"接收讯息（彩信）"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"允许该应用接收和处理彩信。这就意味着，该应用可能会监视发送到您设备的彩信，或删除发送到您设备的彩信而不向您显示。"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"读取小区广播消息"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"允许应用读取您的设备收到的小区广播消息。小区广播消息是在某些地区发送的、用于发布紧急情况警告的提醒信息。恶意应用可能会在您收到小区紧急广播时干扰您设备的性能或操作。"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"读取订阅的供稿"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index a57b4ebd9315..67a7dbb5bf24 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"允許應用程式接收和處理短訊。這表示應用程式可監控傳送至您裝置的訊息，或在您閱讀訊息前擅自刪除訊息。"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"接收短訊 (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"允許應用程式接收和處理 MMS 訊息。這表示應用程式可監控傳送至您裝置的訊息，或在您閱讀訊息前擅自刪除訊息。"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"讀取區域廣播訊息"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"允許應用程式讀取您裝置接收的區域廣播訊息。某些地點會發出區域廣播警報，警告您發生緊急狀況。惡意應用程式可能會在裝置收到緊急區域廣播時，干擾裝置的性能或運作。"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"讀取訂閱的資訊提供"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 34fee2bbc4a8..923a23fd8dc5 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"允許應用程式接收和處理簡訊。這項設定可讓應用程式監控傳送至你裝置的訊息，或在你閱讀訊息前擅自刪除訊息。"</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"接收簡訊 (MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"允許應用程式接收和處理多媒體訊息。這項設定可讓應用程式監控傳送至你裝置的訊息，或在你閱讀訊息前擅自刪除訊息。"</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"讀取區域廣播訊息"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"允許應用程式讀取你裝置收到的區域廣播訊息。某些地點會發出區域廣播警示，警告你有緊急狀況發生。請注意，惡意應用程式可能會在裝置收到緊急區域廣播時，干擾裝置的效能或運作。"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"讀取訂閱資訊提供"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index a5e0fed3b8e2..04091ff37ffa 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -344,6 +344,10 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Ivumela uhlelo lokusebenza ukuthola nokucubungula imilayezo ye-SMS. Loku kuchaza ukuthi uhlelo lokusebenza lungangamela noma lesuse imilayezo ethunyelwe kudivayisi yakho ngaphandle kokukubonisa yona."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"thola imiyalezo ebhaliwe (i-MMS)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Ivumela uhlelo lokusebenza ukuthola nokucubungula imilayezo ye-MMS. Loku kuchaza ukuthi uhlelo lokusebenza lungangamela noma lesuse imilayezo ethunyelwe kudivayisi yakho ngaphandle kokukubonisa yona."</string> + <!-- no translation found for permlab_bindCellBroadcastService (4468585041824555604) --> + <skip /> + <!-- no translation found for permdesc_bindCellBroadcastService (9073440260695196089) --> + <skip /> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"funda imilayezo yokusakaza yeselula"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Ivumela uhlelo lokusebenza ukufunda imilayezo yokusakaza yeselula etholwe idivayisi yakho. Izaziso zokusakaza zeselula zilethwa kwezinye izindawo ukukuxwayisa ngezimo ezisheshayo. Izinhlelo zokusebenza ezingalungile zingaphazamisana nokusebenza noma umsebenzi wedivayisi yakho uma ukusakaza kweselula kwesimo esisheshayo kutholwa."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"funda izifunzo ezikhokhelwayo"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 0c9ae85eab30..14f5d97b6481 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3755,6 +3755,16 @@ <attr name="summary" /> </declare-styleable> + <!-- Use <code>accessibility-shortcut-target</code> as the root tag of the XML resource that + describes an activity, which is referenced from the + <code>android.accessibilityshortcut.target</code> meta-data entry. --> + <declare-styleable name="AccessibilityShortcutTarget"> + <!-- Short description of the target of accessibility shortcut purpose or behavior.--> + <attr name="description" /> + <!-- Brief summary of the target of accessibility shortcut purpose or behavior. --> + <attr name="summary" /> + </declare-styleable> + <!-- Use <code>print-service</code> as the root tag of the XML resource that describes an {@link android.printservice.PrintService} service, which is referenced from its {@link android.printservice.PrintService#SERVICE_META_DATA} diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 8e5cb182868d..a301702e5f9b 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -349,10 +349,10 @@ will be given a single shared user ID, so they can for example run in the same process. Note that for them to actually get the same user ID, they must also be signed with the same signature. - @deprecated Shared user id's cause non-deterministic behaviour within the - package manager. As such, it's use is discouraged, deprecated, and will - be removed altogether in a future version of Android. Instead, proper - communication mechanisms such as services and providers should be used + @deprecated Shared user IDs cause non-deterministic behavior within the + package manager. As such, its use is strongly discouraged and may be + removed in a future version of Android. Instead, apps should use proper + communication mechanisms, such as services and content providers, to facilitate interoperability between shared components. --> <attr name="sharedUserId" format="string" /> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7eca699d9eca..3fef7a2dffae 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -433,6 +433,14 @@ --> </string-array> + <!-- Configuration of network interfaces that support WakeOnLAN --> + <string-array translatable="false" name="config_wakeonlan_supported_interfaces"> + <!-- + <item>wlan0</item> + <item>eth0</item> + --> + </string-array> + <!-- Package name for the default CellBroadcastService module [DO NOT TRANSLATE] --> <string name="cellbroadcast_default_package" translatable="false">com.android.cellbroadcastreceiver </string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 4e327082047b..bf5f706b1234 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1755,11 +1755,6 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_startViewPermissionUsage">Allows the holder to start the permission usage for an app. Should never be needed for normal apps.</string> - <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] --> - <string name="permlab_accessibilityShortcutTarget">accessibility shortcut target</string> - <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] --> - <string name="permdesc_accessibilityShortcutTarget">Allows an app to define the accessibility shortcut target.</string> - <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a8b534061aeb..363bc9ddd75c 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -747,6 +747,7 @@ <java-symbol type="string" name="config_default_dns_server" /> <java-symbol type="string" name="config_ethernet_iface_regex" /> <java-symbol type="array" name="config_ethernet_interfaces" /> + <java-symbol type="array" name="config_wakeonlan_supported_interfaces" /> <java-symbol type="string" name="cellbroadcast_default_package" /> <java-symbol type="string" name="config_forceVoiceInteractionServicePackage" /> <java-symbol type="string" name="config_mms_user_agent" /> diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index 24172098491d..c7e54f3fcd1b 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -1155,7 +1155,10 @@ <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" /> + <category android:name="android.intent.category.ACCESSIBILITY_SHORTCUT_TARGET" /> </intent-filter> + <meta-data android:name="android.accessibilityshortcut.target" + android:resource="@xml/accessibility_shortcut_test_activity"/> </activity> <!-- Activity-level metadata --> diff --git a/core/tests/coretests/res/values/strings.xml b/core/tests/coretests/res/values/strings.xml index ef915bba1013..f630188e54dc 100644 --- a/core/tests/coretests/res/values/strings.xml +++ b/core/tests/coretests/res/values/strings.xml @@ -142,4 +142,10 @@ <!-- ResourcesLocaleResolutionTest --> <string name="dummy_string">dummy string</string> + + <!-- Description of the accessibility shortcut [CHAR LIMIT=NONE] --> + <string name="accessibility_shortcut_description">Accessibility shortcut description</string> + + <!-- Summary of the accessibility shortcut [CHAR LIMIT=NONE] --> + <string name="accessibility_shortcut_summary">Accessibility shortcut summary</string> </resources> diff --git a/core/tests/coretests/res/xml/accessibility_shortcut_test_activity.xml b/core/tests/coretests/res/xml/accessibility_shortcut_test_activity.xml new file mode 100644 index 000000000000..60e29989ef0d --- /dev/null +++ b/core/tests/coretests/res/xml/accessibility_shortcut_test_activity.xml @@ -0,0 +1,22 @@ +<?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. + --> + +<accessibility-shortcut-target xmlns:android="http://schemas.android.com/apk/res/android" + android:description="@string/accessibility_shortcut_description" + android:summary="@string/accessibility_shortcut_summary" +/>
\ No newline at end of file diff --git a/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java b/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java new file mode 100644 index 000000000000..abaeb0a11a8d --- /dev/null +++ b/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.accessibilityservice; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + +import android.content.ComponentName; +import android.content.Context; +import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; +import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.AccessibilityTestActivity; + +import androidx.test.filters.SmallTest; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import com.android.frameworks.coretests.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.List; + +/** + * AccessibilityShortcutInfo can only be created by system. Verify the instance creation and + * basic function here. + */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class AccessibilityShortcutInfoTest { + private Context mTargetContext; + private PackageManager mPackageManager; + private AccessibilityShortcutInfo mShortcutInfo; + + @Before + public void setUp() { + mTargetContext = InstrumentationRegistry.getInstrumentation() + .getTargetContext(); + mPackageManager = mTargetContext.getPackageManager(); + + final ComponentName testShortcutName = new ComponentName(mTargetContext, + AccessibilityTestActivity.class); + final AccessibilityManager accessibilityManager = (AccessibilityManager) mTargetContext + .getSystemService(Context.ACCESSIBILITY_SERVICE); + final List<AccessibilityShortcutInfo> infoList = accessibilityManager + .getInstalledAccessibilityShortcutListAsUser( + mTargetContext, mTargetContext.getUserId()); + for (AccessibilityShortcutInfo info : infoList) { + final ActivityInfo activityInfo = info.getActivityInfo(); + final ComponentName name = new ComponentName( + activityInfo.packageName, activityInfo.name); + if (name.equals(testShortcutName)) { + mShortcutInfo = info; + break; + } + } + + assertNotNull("Can't find " + testShortcutName, mShortcutInfo); + } + + @Test + public void testDescription() { + final String description = mTargetContext.getResources() + .getString(R.string.accessibility_shortcut_description); + + assertNotNull("Can't find description string", description); + assertThat("Description is not correct", + mShortcutInfo.loadDescription(mPackageManager), is(description)); + } + + @Test + public void testSummary() { + final String summary = mTargetContext.getResources() + .getString(R.string.accessibility_shortcut_summary); + + assertNotNull("Can't find summary string", summary); + assertThat("Summary is not correct", + mShortcutInfo.loadSummary(mPackageManager), is(summary)); + } +} diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java index 51da0c871c4d..39bf7421b15e 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java @@ -611,6 +611,10 @@ public class TransactionParcelTests { } @Override + public void attachStartupAgents(String s) throws RemoteException { + } + + @Override public void scheduleApplicationInfoChanged(ApplicationInfo applicationInfo) throws RemoteException { } diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java index 23fabcec0c9b..77b7f2a3ce6c 100644 --- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java +++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java @@ -17,6 +17,7 @@ package android.provider; import static android.provider.DeviceConfig.OnPropertiesChangedListener; +import static android.provider.DeviceConfig.Properties; import static com.google.common.truth.Truth.assertThat; @@ -42,27 +43,33 @@ import java.util.concurrent.TimeUnit; @RunWith(AndroidJUnit4.class) @SmallTest public class DeviceConfigTest { - // TODO(b/109919982): Migrate tests to CTS - private static final String sNamespace = "namespace1"; - private static final String sKey = "key1"; - private static final String sValue = "value1"; private static final long WAIT_FOR_PROPERTY_CHANGE_TIMEOUT_MILLIS = 2000; // 2 sec + private static final String DEFAULT_VALUE = "test_default_value"; + private static final String NAMESPACE = "namespace1"; + private static final String KEY = "key1"; + private static final String KEY2 = "key2"; + private static final String KEY3 = "key3"; + private static final String VALUE = "value1"; + private static final String VALUE2 = "value2"; + private static final String VALUE3 = "value3"; @After public void cleanUp() { - deleteViaContentProvider(sNamespace, sKey); + deleteViaContentProvider(NAMESPACE, KEY); + deleteViaContentProvider(NAMESPACE, KEY2); + deleteViaContentProvider(NAMESPACE, KEY3); } @Test public void getProperty_empty() { - String result = DeviceConfig.getProperty(sNamespace, sKey); + String result = DeviceConfig.getProperty(NAMESPACE, KEY); assertThat(result).isNull(); } @Test public void getProperty_nullNamespace() { try { - DeviceConfig.getProperty(null, sKey); + DeviceConfig.getProperty(null, KEY); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -72,7 +79,7 @@ public class DeviceConfigTest { @Test public void getProperty_nullName() { try { - DeviceConfig.getProperty(sNamespace, null); + DeviceConfig.getProperty(NAMESPACE, null); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -82,13 +89,13 @@ public class DeviceConfigTest { @Test public void getString_empty() { final String default_value = "default_value"; - final String result = DeviceConfig.getString(sNamespace, sKey, default_value); + final String result = DeviceConfig.getString(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(default_value); } @Test public void getString_nullDefault() { - final String result = DeviceConfig.getString(sNamespace, sKey, null); + final String result = DeviceConfig.getString(NAMESPACE, KEY, null); assertThat(result).isNull(); } @@ -96,16 +103,16 @@ public class DeviceConfigTest { public void getString_nonEmpty() { final String value = "new_value"; final String default_value = "default"; - DeviceConfig.setProperty(sNamespace, sKey, value, false); + DeviceConfig.setProperty(NAMESPACE, KEY, value, false); - final String result = DeviceConfig.getString(sNamespace, sKey, default_value); + final String result = DeviceConfig.getString(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(value); } @Test public void getString_nullNamespace() { try { - DeviceConfig.getString(null, sKey, "default_value"); + DeviceConfig.getString(null, KEY, "default_value"); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -115,7 +122,7 @@ public class DeviceConfigTest { @Test public void getString_nullName() { try { - DeviceConfig.getString(sNamespace, null, "default_value"); + DeviceConfig.getString(NAMESPACE, null, "default_value"); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -125,7 +132,7 @@ public class DeviceConfigTest { @Test public void getBoolean_empty() { final boolean default_value = true; - final boolean result = DeviceConfig.getBoolean(sNamespace, sKey, default_value); + final boolean result = DeviceConfig.getBoolean(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(default_value); } @@ -133,18 +140,18 @@ public class DeviceConfigTest { public void getBoolean_valid() { final boolean value = true; final boolean default_value = false; - DeviceConfig.setProperty(sNamespace, sKey, String.valueOf(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY, String.valueOf(value), false); - final boolean result = DeviceConfig.getBoolean(sNamespace, sKey, default_value); + final boolean result = DeviceConfig.getBoolean(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(value); } @Test public void getBoolean_invalid() { final boolean default_value = true; - DeviceConfig.setProperty(sNamespace, sKey, "not_a_boolean", false); + DeviceConfig.setProperty(NAMESPACE, KEY, "not_a_boolean", false); - final boolean result = DeviceConfig.getBoolean(sNamespace, sKey, default_value); + final boolean result = DeviceConfig.getBoolean(NAMESPACE, KEY, default_value); // Anything non-null other than case insensitive "true" parses to false. assertThat(result).isFalse(); } @@ -152,7 +159,7 @@ public class DeviceConfigTest { @Test public void getBoolean_nullNamespace() { try { - DeviceConfig.getBoolean(null, sKey, false); + DeviceConfig.getBoolean(null, KEY, false); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -162,7 +169,7 @@ public class DeviceConfigTest { @Test public void getBoolean_nullName() { try { - DeviceConfig.getBoolean(sNamespace, null, false); + DeviceConfig.getBoolean(NAMESPACE, null, false); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -172,7 +179,7 @@ public class DeviceConfigTest { @Test public void getInt_empty() { final int default_value = 999; - final int result = DeviceConfig.getInt(sNamespace, sKey, default_value); + final int result = DeviceConfig.getInt(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(default_value); } @@ -180,18 +187,18 @@ public class DeviceConfigTest { public void getInt_valid() { final int value = 123; final int default_value = 999; - DeviceConfig.setProperty(sNamespace, sKey, String.valueOf(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY, String.valueOf(value), false); - final int result = DeviceConfig.getInt(sNamespace, sKey, default_value); + final int result = DeviceConfig.getInt(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(value); } @Test public void getInt_invalid() { final int default_value = 999; - DeviceConfig.setProperty(sNamespace, sKey, "not_an_int", false); + DeviceConfig.setProperty(NAMESPACE, KEY, "not_an_int", false); - final int result = DeviceConfig.getInt(sNamespace, sKey, default_value); + final int result = DeviceConfig.getInt(NAMESPACE, KEY, default_value); // Failure to parse results in using the default value assertThat(result).isEqualTo(default_value); } @@ -199,7 +206,7 @@ public class DeviceConfigTest { @Test public void getInt_nullNamespace() { try { - DeviceConfig.getInt(null, sKey, 0); + DeviceConfig.getInt(null, KEY, 0); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -209,7 +216,7 @@ public class DeviceConfigTest { @Test public void getInt_nullName() { try { - DeviceConfig.getInt(sNamespace, null, 0); + DeviceConfig.getInt(NAMESPACE, null, 0); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -219,7 +226,7 @@ public class DeviceConfigTest { @Test public void getLong_empty() { final long default_value = 123456; - final long result = DeviceConfig.getLong(sNamespace, sKey, default_value); + final long result = DeviceConfig.getLong(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(default_value); } @@ -227,18 +234,18 @@ public class DeviceConfigTest { public void getLong_valid() { final long value = 456789; final long default_value = 123456; - DeviceConfig.setProperty(sNamespace, sKey, String.valueOf(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY, String.valueOf(value), false); - final long result = DeviceConfig.getLong(sNamespace, sKey, default_value); + final long result = DeviceConfig.getLong(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(value); } @Test public void getLong_invalid() { final long default_value = 123456; - DeviceConfig.setProperty(sNamespace, sKey, "not_a_long", false); + DeviceConfig.setProperty(NAMESPACE, KEY, "not_a_long", false); - final long result = DeviceConfig.getLong(sNamespace, sKey, default_value); + final long result = DeviceConfig.getLong(NAMESPACE, KEY, default_value); // Failure to parse results in using the default value assertThat(result).isEqualTo(default_value); } @@ -246,7 +253,7 @@ public class DeviceConfigTest { @Test public void getLong_nullNamespace() { try { - DeviceConfig.getLong(null, sKey, 0); + DeviceConfig.getLong(null, KEY, 0); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -256,7 +263,7 @@ public class DeviceConfigTest { @Test public void getLong_nullName() { try { - DeviceConfig.getLong(sNamespace, null, 0); + DeviceConfig.getLong(NAMESPACE, null, 0); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -266,7 +273,7 @@ public class DeviceConfigTest { @Test public void getFloat_empty() { final float default_value = 123.456f; - final float result = DeviceConfig.getFloat(sNamespace, sKey, default_value); + final float result = DeviceConfig.getFloat(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(default_value); } @@ -274,18 +281,18 @@ public class DeviceConfigTest { public void getFloat_valid() { final float value = 456.789f; final float default_value = 123.456f; - DeviceConfig.setProperty(sNamespace, sKey, String.valueOf(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY, String.valueOf(value), false); - final float result = DeviceConfig.getFloat(sNamespace, sKey, default_value); + final float result = DeviceConfig.getFloat(NAMESPACE, KEY, default_value); assertThat(result).isEqualTo(value); } @Test public void getFloat_invalid() { final float default_value = 123.456f; - DeviceConfig.setProperty(sNamespace, sKey, "not_a_float", false); + DeviceConfig.setProperty(NAMESPACE, KEY, "not_a_float", false); - final float result = DeviceConfig.getFloat(sNamespace, sKey, default_value); + final float result = DeviceConfig.getFloat(NAMESPACE, KEY, default_value); // Failure to parse results in using the default value assertThat(result).isEqualTo(default_value); } @@ -293,7 +300,7 @@ public class DeviceConfigTest { @Test public void getFloat_nullNamespace() { try { - DeviceConfig.getFloat(null, sKey, 0); + DeviceConfig.getFloat(null, KEY, 0); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -303,7 +310,7 @@ public class DeviceConfigTest { @Test public void getFloat_nullName() { try { - DeviceConfig.getFloat(sNamespace, null, 0); + DeviceConfig.getFloat(NAMESPACE, null, 0); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -313,7 +320,7 @@ public class DeviceConfigTest { @Test public void setProperty_nullNamespace() { try { - DeviceConfig.setProperty(null, sKey, sValue, false); + DeviceConfig.setProperty(null, KEY, VALUE, false); Assert.fail("Null namespace should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -323,7 +330,7 @@ public class DeviceConfigTest { @Test public void setProperty_nullName() { try { - DeviceConfig.setProperty(sNamespace, null, sValue, false); + DeviceConfig.setProperty(NAMESPACE, null, VALUE, false); Assert.fail("Null name should have resulted in an NPE."); } catch (NullPointerException e) { // expected @@ -332,16 +339,16 @@ public class DeviceConfigTest { @Test public void setAndGetProperty_sameNamespace() { - DeviceConfig.setProperty(sNamespace, sKey, sValue, false); - String result = DeviceConfig.getProperty(sNamespace, sKey); - assertThat(result).isEqualTo(sValue); + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + String result = DeviceConfig.getProperty(NAMESPACE, KEY); + assertThat(result).isEqualTo(VALUE); } @Test public void setAndGetProperty_differentNamespace() { String newNamespace = "namespace2"; - DeviceConfig.setProperty(sNamespace, sKey, sValue, false); - String result = DeviceConfig.getProperty(newNamespace, sKey); + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + String result = DeviceConfig.getProperty(newNamespace, KEY); assertThat(result).isNull(); } @@ -349,41 +356,147 @@ public class DeviceConfigTest { public void setAndGetProperty_multipleNamespaces() { String newNamespace = "namespace2"; String newValue = "value2"; - DeviceConfig.setProperty(sNamespace, sKey, sValue, false); - DeviceConfig.setProperty(newNamespace, sKey, newValue, false); - String result = DeviceConfig.getProperty(sNamespace, sKey); - assertThat(result).isEqualTo(sValue); - result = DeviceConfig.getProperty(newNamespace, sKey); + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + DeviceConfig.setProperty(newNamespace, KEY, newValue, false); + String result = DeviceConfig.getProperty(NAMESPACE, KEY); + assertThat(result).isEqualTo(VALUE); + result = DeviceConfig.getProperty(newNamespace, KEY); assertThat(result).isEqualTo(newValue); // clean up - deleteViaContentProvider(newNamespace, sKey); + deleteViaContentProvider(newNamespace, KEY); } @Test public void setAndGetProperty_overrideValue() { String newValue = "value2"; - DeviceConfig.setProperty(sNamespace, sKey, sValue, false); - DeviceConfig.setProperty(sNamespace, sKey, newValue, false); - String result = DeviceConfig.getProperty(sNamespace, sKey); + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + DeviceConfig.setProperty(NAMESPACE, KEY, newValue, false); + String result = DeviceConfig.getProperty(NAMESPACE, KEY); assertThat(result).isEqualTo(newValue); } @Test + public void getProperties_fullNamespace() { + Properties properties = DeviceConfig.getProperties(NAMESPACE); + assertThat(properties.getKeyset()).isEmpty(); + + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false); + properties = DeviceConfig.getProperties(NAMESPACE); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE); + assertThat(properties.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2); + + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE3, false); + properties = DeviceConfig.getProperties(NAMESPACE); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE3); + assertThat(properties.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2); + } + + @Test + public void getProperties_getString() { + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE); + assertThat(properties.getString(KEY2, DEFAULT_VALUE)).isEqualTo(VALUE2); + } + + @Test + public void getProperties_getBoolean() { + DeviceConfig.setProperty(NAMESPACE, KEY, "true", false); + DeviceConfig.setProperty(NAMESPACE, KEY2, "false", false); + DeviceConfig.setProperty(NAMESPACE, KEY3, "not a valid boolean", false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2, KEY3); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2, KEY3); + assertThat(properties.getBoolean(KEY, true)).isTrue(); + assertThat(properties.getBoolean(KEY, false)).isTrue(); + assertThat(properties.getBoolean(KEY2, true)).isFalse(); + assertThat(properties.getBoolean(KEY2, false)).isFalse(); + // KEY3 was set to garbage, anything nonnull but "true" will parse as false + assertThat(properties.getBoolean(KEY3, true)).isFalse(); + assertThat(properties.getBoolean(KEY3, false)).isFalse(); + // If a key was not set, it will return the default value + assertThat(properties.getBoolean("missing_key", true)).isTrue(); + assertThat(properties.getBoolean("missing_key", false)).isFalse(); + } + + @Test + public void getProperties_getInt() { + final int value = 101; + + DeviceConfig.setProperty(NAMESPACE, KEY, Integer.toString(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY2, "not a valid int", false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getInt(KEY, -1)).isEqualTo(value); + // KEY2 was set to garbage, the default value is returned if an int cannot be parsed + assertThat(properties.getInt(KEY2, -1)).isEqualTo(-1); + } + + @Test + public void getProperties_getFloat() { + final float value = 101.010f; + + DeviceConfig.setProperty(NAMESPACE, KEY, Float.toString(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY2, "not a valid float", false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getFloat(KEY, -1.0f)).isEqualTo(value); + // KEY2 was set to garbage, the default value is returned if a float cannot be parsed + assertThat(properties.getFloat(KEY2, -1.0f)).isEqualTo(-1.0f); + } + + @Test + public void getProperties_getLong() { + final long value = 101; + + DeviceConfig.setProperty(NAMESPACE, KEY, Long.toString(value), false); + DeviceConfig.setProperty(NAMESPACE, KEY2, "not a valid long", false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2); + assertThat(properties.getKeyset()).containsExactly(KEY, KEY2); + assertThat(properties.getLong(KEY, -1)).isEqualTo(value); + // KEY2 was set to garbage, the default value is returned if a long cannot be parsed + assertThat(properties.getLong(KEY2, -1)).isEqualTo(-1); + } + + @Test + public void getProperties_defaults() { + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); + DeviceConfig.setProperty(NAMESPACE, KEY3, VALUE3, false); + + Properties properties = DeviceConfig.getProperties(NAMESPACE, KEY, KEY2); + assertThat(properties.getKeyset()).containsExactly(KEY); + assertThat(properties.getString(KEY, DEFAULT_VALUE)).isEqualTo(VALUE); + // not set in DeviceConfig, but requested in getProperties + assertThat(properties.getString(KEY2, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE); + // set in DeviceConfig, but not requested in getProperties + assertThat(properties.getString(KEY3, DEFAULT_VALUE)).isEqualTo(DEFAULT_VALUE); + } + + @Test public void testOnPropertiesChangedListener() throws InterruptedException { final CountDownLatch countDownLatch = new CountDownLatch(1); OnPropertiesChangedListener changeListener = (properties) -> { - assertThat(properties.getNamespace()).isEqualTo(sNamespace); - assertThat(properties.getKeyset()).contains(sKey); - assertThat(properties.getString(sKey, "default_value")).isEqualTo(sValue); + assertThat(properties.getNamespace()).isEqualTo(NAMESPACE); + assertThat(properties.getKeyset()).contains(KEY); + assertThat(properties.getString(KEY, "default_value")).isEqualTo(VALUE); countDownLatch.countDown(); }; try { - DeviceConfig.addOnPropertiesChangedListener(sNamespace, + DeviceConfig.addOnPropertiesChangedListener(NAMESPACE, ActivityThread.currentApplication().getMainExecutor(), changeListener); - DeviceConfig.setProperty(sNamespace, sKey, sValue, false); + DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false); assertThat(countDownLatch.await( WAIT_FOR_PROPERTY_CHANGE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue(); } catch (InterruptedException e) { diff --git a/core/tests/coretests/src/android/view/ViewGroupTest.java b/core/tests/coretests/src/android/view/ViewGroupTest.java index 979a839d2ffe..506cc2d3ff97 100644 --- a/core/tests/coretests/src/android/view/ViewGroupTest.java +++ b/core/tests/coretests/src/android/view/ViewGroupTest.java @@ -16,9 +16,14 @@ package android.view; -import static androidx.test.InstrumentationRegistry.getContext; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import android.content.Context; import android.graphics.Region; @@ -39,6 +44,60 @@ import org.junit.Test; @SmallTest public class ViewGroupTest { + @Test + public void testDispatchMouseEventsUnderCursor() { + final Context context = getInstrumentation().getContext(); + final TestView viewGroup = new TestView(context, 0 /* left */, 0 /* top */, + 200 /* right */, 200 /* bottom */); + final TestView viewA = spy(new TestView(context, 0 /* left */, 0 /* top */, + 100 /* right */, 200 /* bottom */)); + final TestView viewB = spy(new TestView(context, 100 /* left */, 0 /* top */, + 200 /* right */, 200 /* bottom */)); + + viewGroup.addView(viewA); + viewGroup.addView(viewB); + + // Make sure all of them handle touch events dispatched to them. + doReturn(true).when(viewA).dispatchTouchEvent(any()); + doReturn(true).when(viewB).dispatchTouchEvent(any()); + + MotionEvent.PointerProperties[] properties = new MotionEvent.PointerProperties[2]; + properties[0] = new MotionEvent.PointerProperties(); + properties[0].id = 0; + properties[0].toolType = MotionEvent.TOOL_TYPE_FINGER; + properties[1] = new MotionEvent.PointerProperties(); + properties[1].id = 1; + properties[1].toolType = MotionEvent.TOOL_TYPE_FINGER; + + MotionEvent.PointerCoords[] coords = new MotionEvent.PointerCoords[2]; + coords[0] = new MotionEvent.PointerCoords(); + coords[0].x = 80; + coords[0].y = 100; + coords[1] = new MotionEvent.PointerCoords(); + coords[1].x = 240; + coords[1].y = 100; + + MotionEvent event; + // Make sure the down event is active with a pointer which coordinate is different from the + // cursor position, which is the midpoint of all 2 pointers above. + event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, MotionEvent.ACTION_DOWN, + 2 /* pointerCount */, properties, coords, 0 /* metaState */, 0 /* buttonState */, + 0 /* xPrecision */, 0 /* yPrecision */, 0 /* deviceId */, 0 /* edgeFlags */, + InputDevice.SOURCE_MOUSE, 0 /* flags */); + viewGroup.dispatchTouchEvent(event); + verify(viewB).dispatchTouchEvent(event); + + event = MotionEvent.obtain(0 /* downTime */, 0 /* eventTime */, + MotionEvent.ACTION_POINTER_DOWN | (1 << MotionEvent.ACTION_POINTER_INDEX_SHIFT), + 2 /* pointerCount */, properties, coords, 0 /* metaState */, 0 /* buttonState */, + 0 /* xPrecision */, 0 /* yPrecision */, 0 /* deviceId */, 0 /* edgeFlags */, + InputDevice.SOURCE_MOUSE, 0 /* flags */); + viewGroup.dispatchTouchEvent(event); + verify(viewB).dispatchTouchEvent(event); + + verify(viewA, never()).dispatchTouchEvent(any()); + } + /** * Test if {@link ViewGroup#subtractObscuredTouchableRegion} works as expected. * @@ -59,7 +118,7 @@ public class ViewGroupTest { */ @Test public void testSubtractObscuredTouchableRegion() { - final Context context = getContext(); + final Context context = getInstrumentation().getContext(); final TestView viewA = new TestView(context, 8 /* right */); final TestView viewB = new TestView(context, 6 /* right */); final TestView viewC = new TestView(context, 10 /* right */); @@ -119,10 +178,14 @@ public class ViewGroupTest { (contain ? "" : " not"), x), contain, region.contains(x, 0 /* y */)); } - private static class TestView extends ViewGroup { + public static class TestView extends ViewGroup { TestView(Context context, int right) { + this(context, 0 /* left */, 0 /* top */, right, 1 /* bottom */); + } + + TestView(Context context, int left, int top, int right, int bottom) { super(context); - setFrame(0 /* left */, 0 /* top */, right, 1 /* bottom */); + setFrame(left, top, right, bottom); } @Override diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java index 682416c58c72..3586216ad421 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityServiceConnectionImpl.java @@ -23,8 +23,6 @@ import android.graphics.Region; import android.os.Bundle; import android.os.IBinder; -import java.util.List; - /** * Stub implementation of IAccessibilityServiceConnection so each test doesn't need to implement * all of the methods @@ -73,7 +71,7 @@ public class AccessibilityServiceConnectionImpl extends IAccessibilityServiceCon return null; } - public List<AccessibilityWindowInfo> getWindows() { + public AccessibilityWindowInfo.WindowListSparseArray getWindows() { return null; } diff --git a/core/tests/featureflagtests/OWNERS b/core/tests/featureflagtests/OWNERS index 1a8fd2b62f9a..2ff4f5ab8807 100644 --- a/core/tests/featureflagtests/OWNERS +++ b/core/tests/featureflagtests/OWNERS @@ -1,2 +1,2 @@ sbasi@google.com -zhfan@google.com
\ No newline at end of file +tmfang@google.com
\ No newline at end of file diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json index a2402e25c556..34b395196101 100644 --- a/data/etc/services.core.protolog.json +++ b/data/etc/services.core.protolog.json @@ -823,6 +823,12 @@ "group": "WM_DEBUG_ORIENTATION", "at": "com\/android\/server\/wm\/DisplayRotation.java" }, + "-415912575": { + "message": "setTask: %s at top.", + "level": "VERBOSE", + "group": "WM_DEBUG_ADD_REMOVE", + "at": "com\/android\/server\/wm\/ActivityRecord.java" + }, "-415865166": { "message": "findFocusedWindow: Found new focus @ %s", "level": "VERBOSE", @@ -925,12 +931,6 @@ "group": "WM_DEBUG_APP_TRANSITIONS", "at": "com\/android\/server\/wm\/WindowState.java" }, - "-117925665": { - "message": "addAppToken: %s task=%s at %d", - "level": "VERBOSE", - "group": "WM_DEBUG_ADD_REMOVE", - "at": "com\/android\/server\/wm\/ActivityRecord.java" - }, "-116086365": { "message": "******************** ENABLING SCREEN!", "level": "INFO", diff --git a/graphics/java/android/graphics/BLASTBufferQueue.java b/graphics/java/android/graphics/BLASTBufferQueue.java new file mode 100644 index 000000000000..8c6a9371d53b --- /dev/null +++ b/graphics/java/android/graphics/BLASTBufferQueue.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.graphics; + +import android.view.Surface; +import android.view.SurfaceControl; + +/** + * @hide + */ +public final class BLASTBufferQueue { + // Note: This field is accessed by native code. + private long mNativeObject; // BLASTBufferQueue* + + private static native long nativeCreate(long surfaceControl, long width, long height); + private static native void nativeDestroy(long ptr); + private static native Surface nativeGetSurface(long ptr); + private static native void nativeSetNextTransaction(long ptr, long transactionPtr); + private static native void nativeUpdate(long ptr, long surfaceControl, long width, long height); + + /** Create a new connection with the surface flinger. */ + public BLASTBufferQueue(SurfaceControl sc, int width, int height) { + mNativeObject = nativeCreate(sc.mNativeObject, width, height); + } + + public void destroy() { + nativeDestroy(mNativeObject); + } + + public Surface getSurface() { + return nativeGetSurface(mNativeObject); + } + + public void setNextTransaction(SurfaceControl.Transaction t) { + nativeSetNextTransaction(mNativeObject, t.mNativeObject); + } + + public void update(SurfaceControl sc, int width, int height) { + nativeUpdate(mNativeObject, sc.mNativeObject, width, height); + } + + @Override + protected void finalize() throws Throwable { + try { + if (mNativeObject != 0) { + nativeDestroy(mNativeObject); + } + } finally { + super.finalize(); + } + } +} + diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index 150a941c061e..6619dba159c2 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java @@ -286,6 +286,9 @@ public final class ImageDecoder implements AutoCloseable { return createFromStream(is, true, preferAnimation, this); } + if (assetFd == null) { + throw new FileNotFoundException(mUri.toString()); + } return createFromAssetFileDescriptor(assetFd, preferAnimation, this); } } @@ -341,6 +344,9 @@ public final class ImageDecoder implements AutoCloseable { @NonNull private static ImageDecoder createFromAssetFileDescriptor(@NonNull AssetFileDescriptor assetFd, boolean preferAnimation, Source source) throws IOException { + if (assetFd == null) { + throw new FileNotFoundException(); + } final FileDescriptor fd = assetFd.getFileDescriptor(); final long offset = assetFd.getStartOffset(); diff --git a/graphics/java/android/graphics/RenderNode.java b/graphics/java/android/graphics/RenderNode.java index 0e635c774c84..17e3b4465130 100644 --- a/graphics/java/android/graphics/RenderNode.java +++ b/graphics/java/android/graphics/RenderNode.java @@ -1380,7 +1380,22 @@ public final class RenderNode { * @return Approximate memory usage in bytes. */ public @BytesLong long computeApproximateMemoryUsage() { - return nGetDebugSize(mNativeRenderNode); + return nGetUsageSize(mNativeRenderNode); + } + + /** + * Gets the approximate amount of memory allocated for the RenderNode for debug purposes. + * Does not include the memory allocated by any child RenderNodes nor any bitmaps, only the + * memory allocated for this RenderNode and any data it owns. + * + * The difference between this and {@link #computeApproximateMemoryUsage()} is this includes + * memory allocated but not used. In particular structures such as DisplayLists are similar + * to things like ArrayLists - they need to resize as commands are added to them. As such, + * memory used can be less than memory allocated. + * + * @hide */ + public @BytesLong long computeApproximateMemoryAllocated() { + return nGetAllocatedSize(mNativeRenderNode); } /** @@ -1485,7 +1500,8 @@ public final class RenderNode { private static native void nOutput(long renderNode); - private static native int nGetDebugSize(long renderNode); + private static native int nGetUsageSize(long renderNode); + private static native int nGetAllocatedSize(long renderNode); private static native void nRequestPositionUpdates(long renderNode, PositionUpdateListener callback); diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 96ac0f9b38b5..c6586ecfceb9 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -97,6 +97,14 @@ import java.lang.annotation.RetentionPolicy; * @attr ref android.R.styleable#GradientDrawablePadding_bottom */ public class GradientDrawable extends Drawable { + + /** + * Flag to determine if we should wrap negative gradient angle measurements + * for API levels that support it + * @hide + */ + public static boolean sWrapNegativeAngleMeasurements = true; + /** * Shape is a rectangle, possibly with rounded corners */ @@ -151,6 +159,9 @@ public class GradientDrawable extends Drawable { /** Radius is a fraction of the bounds size. */ private static final int RADIUS_TYPE_FRACTION_PARENT = 2; + /** Default orientation for GradientDrawable **/ + private static final Orientation DEFAULT_ORIENTATION = Orientation.TOP_BOTTOM; + /** @hide */ @IntDef({RADIUS_TYPE_PIXELS, RADIUS_TYPE_FRACTION, RADIUS_TYPE_FRACTION_PARENT}) @Retention(RetentionPolicy.SOURCE) @@ -207,7 +218,7 @@ public class GradientDrawable extends Drawable { } public GradientDrawable() { - this(new GradientState(Orientation.TOP_BOTTOM, null), null); + this(new GradientState(DEFAULT_ORIENTATION, null), null); } /** @@ -1757,33 +1768,48 @@ public class GradientDrawable extends Drawable { } int angle = (int) a.getFloat(R.styleable.GradientDrawableGradient_angle, st.mAngle); - st.mAngle = ((angle % 360) + 360) % 360; // offset negative angle measures - switch (st.mAngle) { - case 0: - st.mOrientation = Orientation.LEFT_RIGHT; - break; - case 45: - st.mOrientation = Orientation.BL_TR; - break; - case 90: - st.mOrientation = Orientation.BOTTOM_TOP; - break; - case 135: - st.mOrientation = Orientation.BR_TL; - break; - case 180: - st.mOrientation = Orientation.RIGHT_LEFT; - break; - case 225: - st.mOrientation = Orientation.TR_BL; - break; - case 270: - st.mOrientation = Orientation.TOP_BOTTOM; - break; - case 315: - st.mOrientation = Orientation.TL_BR; - break; + // GradientDrawable historically has not parsed negative angle measurements and always + // stays on the default orientation for API levels older than Q. + // Only configure the orientation if the angle is greater than zero. + // Otherwise fallback on Orientation.TOP_BOTTOM + // In Android Q and later, actually wrap the negative angle measurement to the correct + // value + if (sWrapNegativeAngleMeasurements) { + st.mAngle = ((angle % 360) + 360) % 360; // offset negative angle measures + } else { + st.mAngle = angle % 360; + } + + if (st.mAngle >= 0) { + switch (st.mAngle) { + case 0: + st.mOrientation = Orientation.LEFT_RIGHT; + break; + case 45: + st.mOrientation = Orientation.BL_TR; + break; + case 90: + st.mOrientation = Orientation.BOTTOM_TOP; + break; + case 135: + st.mOrientation = Orientation.BR_TL; + break; + case 180: + st.mOrientation = Orientation.RIGHT_LEFT; + break; + case 225: + st.mOrientation = Orientation.TR_BL; + break; + case 270: + st.mOrientation = Orientation.TOP_BOTTOM; + break; + case 315: + st.mOrientation = Orientation.TL_BR; + break; + } + } else { + st.mOrientation = DEFAULT_ORIENTATION; } final TypedValue tv = a.peekValue(R.styleable.GradientDrawableGradient_gradientRadius); diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 1829d2f406b4..bf2363481f73 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -343,6 +343,16 @@ public final class KeyChain { public static final int KEY_ATTESTATION_FAILURE = 4; /** + * Used by DPC or delegated app in + * {@link android.app.admin.DeviceAdminReceiver#onChoosePrivateKeyAlias} or + * {@link android.app.admin.DelegatedAdminReceiver#onChoosePrivateKeyAlias} to identify that + * the requesting app is not granted access to any key, and nor will the user be able to grant + * access manually. + */ + public static final String KEY_ALIAS_SELECTION_DENIED = + "alias-selection-denied-ef829e15-210a-409d-96c9-ee684fc41972"; + + /** * Returns an {@code Intent} that can be used for credential * installation. The intent may be used without any extras, in * which case the user will be able to install credentials from diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h index a79b7c00ba04..322eff24dd34 100644 --- a/libs/hwui/RecordingCanvas.h +++ b/libs/hwui/RecordingCanvas.h @@ -69,6 +69,7 @@ public: bool hasText() const { return mHasText; } size_t usedSize() const { return fUsed; } + size_t allocatedSize() const { return fReserved; } private: friend class RecordingCanvas; diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 8eb5e3d3dfbc..6761435a8171 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -108,7 +108,7 @@ void RenderNode::output(std::ostream& output, uint32_t level) { output << std::endl; } -int RenderNode::getDebugSize() { +int RenderNode::getUsageSize() { int size = sizeof(RenderNode); if (mStagingDisplayList) { size += mStagingDisplayList->getUsedSize(); @@ -119,6 +119,18 @@ int RenderNode::getDebugSize() { return size; } +int RenderNode::getAllocatedSize() { + int size = sizeof(RenderNode); + if (mStagingDisplayList) { + size += mStagingDisplayList->getAllocatedSize(); + } + if (mDisplayList && mDisplayList != mStagingDisplayList) { + size += mDisplayList->getAllocatedSize(); + } + return size; +} + + void RenderNode::prepareTree(TreeInfo& info) { ATRACE_CALL(); LOG_ALWAYS_FATAL_IF(!info.damageAccumulator, "DamageAccumulator missing"); diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h index c6db7f1ba60d..d55e5b0ce836 100644 --- a/libs/hwui/RenderNode.h +++ b/libs/hwui/RenderNode.h @@ -102,7 +102,8 @@ public: ANDROID_API void setStagingDisplayList(DisplayList* newData); ANDROID_API void output(); - ANDROID_API int getDebugSize(); + ANDROID_API int getUsageSize(); + ANDROID_API int getAllocatedSize(); bool isRenderable() const { return mDisplayList && !mDisplayList->isEmpty(); } diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.h b/libs/hwui/pipeline/skia/SkiaDisplayList.h index e3c3273a726a..cdd00db9afdc 100644 --- a/libs/hwui/pipeline/skia/SkiaDisplayList.h +++ b/libs/hwui/pipeline/skia/SkiaDisplayList.h @@ -47,6 +47,7 @@ class FunctorDrawable; class SkiaDisplayList { public: size_t getUsedSize() { return allocator.usedSize() + mDisplayList.usedSize(); } + size_t getAllocatedSize() { return allocator.allocatedSize() + mDisplayList.allocatedSize(); } ~SkiaDisplayList() { /* Given that we are using a LinearStdAllocator to store some of the diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp index fc268138e071..8eb81533fda8 100644 --- a/libs/hwui/renderthread/CacheManager.cpp +++ b/libs/hwui/renderthread/CacheManager.cpp @@ -39,7 +39,7 @@ namespace renderthread { // to the screen resolution. This is meant to be a conservative default based on // that analysis. The 4.0f is used because the default pixel format is assumed to // be ARGB_8888. -#define SURFACE_SIZE_MULTIPLIER (12.0f * 4.0f) +#define SURFACE_SIZE_MULTIPLIER (5.0f * 4.0f) #define BACKGROUND_RETENTION_PERCENTAGE (0.5f) CacheManager::CacheManager(const DisplayInfo& display) diff --git a/libs/hwui/utils/LinearAllocator.h b/libs/hwui/utils/LinearAllocator.h index 9c4a1be4b269..539e6544ef02 100644 --- a/libs/hwui/utils/LinearAllocator.h +++ b/libs/hwui/utils/LinearAllocator.h @@ -115,6 +115,7 @@ public: * wasted) */ size_t usedSize() const { return mTotalAllocated - mWastedSpace; } + size_t allocatedSize() const { return mTotalAllocated; } private: LinearAllocator(const LinearAllocator& other); diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 68480ced0692..90e29df45e51 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -145,7 +145,7 @@ public class LocationManager { * Key used for an extra holding a boolean enabled/disabled status value when a provider * enabled/disabled event is broadcast using a PendingIntent. * - * @see #requestLocationUpdates(String, long, long, PendingIntent) + * @see #requestLocationUpdates(String, long, float, PendingIntent) */ public static final String KEY_PROVIDER_ENABLED = "providerEnabled"; @@ -153,7 +153,7 @@ public class LocationManager { * Key used for an extra holding a {@link Location} value when a location change is broadcast * using a PendingIntent. * - * @see #requestLocationUpdates(String, long, long, PendingIntent) + * @see #requestLocationUpdates(String, long, float, PendingIntent) */ public static final String KEY_LOCATION_CHANGED = "location"; @@ -940,9 +940,8 @@ public class LocationManager { @Nullable LocationRequest locationRequest, @NonNull LocationListener listener, @Nullable Looper looper) { - requestLocationUpdates(locationRequest, - new LocationListenerTransport(looper == null ? new Handler() : new Handler(looper), - listener)); + Handler handler = looper == null ? new Handler() : new Handler(looper); + requestLocationUpdates(locationRequest, new HandlerExecutor(handler), listener); } /** @@ -969,7 +968,31 @@ public class LocationManager { @Nullable LocationRequest locationRequest, @NonNull @CallbackExecutor Executor executor, @NonNull LocationListener listener) { - requestLocationUpdates(locationRequest, new LocationListenerTransport(executor, listener)); + synchronized (mListeners) { + LocationListenerTransport transport = mListeners.get(listener); + if (transport != null) { + transport.unregister(); + } else { + transport = new LocationListenerTransport(listener); + mListeners.put(listener, transport); + } + transport.register(executor); + + boolean registered = false; + try { + mService.requestLocationUpdates(locationRequest, transport, null, + mContext.getPackageName()); + registered = true; + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } finally { + if (!registered) { + // allow gc after exception + transport.unregister(); + mListeners.remove(listener); + } + } + } } /** @@ -1009,23 +1032,6 @@ public class LocationManager { } } - private void requestLocationUpdates(@Nullable LocationRequest request, - @NonNull LocationListenerTransport transport) { - synchronized (mListeners) { - LocationListenerTransport oldTransport = mListeners.put(transport.getKey(), transport); - if (oldTransport != null) { - oldTransport.unregisterListener(); - } - - try { - mService.requestLocationUpdates(request, transport, null, - mContext.getPackageName()); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - } - /** * Set the last known location with a new location. * @@ -1079,7 +1085,7 @@ public class LocationManager { if (transport == null) { return; } - transport.unregisterListener(); + transport.unregister(); try { mService.removeUpdates(transport, null, mContext.getPackageName()); @@ -1250,44 +1256,46 @@ public class LocationManager { } /** - * Creates a mock location provider and adds it to the set of active providers. + * Creates a test location provider and adds it to the set of active providers. This provider + * will replace any provider with the same name that exists prior to this call. * - * @param name the provider name + * @param provider the provider name * + * @throws IllegalArgumentException if provider is null * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED * allowed} for your app. - * @throws IllegalArgumentException if a provider with the given name already exists */ public void addTestProvider( - @NonNull String name, boolean requiresNetwork, boolean requiresSatellite, + @NonNull String provider, boolean requiresNetwork, boolean requiresSatellite, boolean requiresCell, boolean hasMonetaryCost, boolean supportsAltitude, boolean supportsSpeed, boolean supportsBearing, int powerRequirement, int accuracy) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + ProviderProperties properties = new ProviderProperties(requiresNetwork, requiresSatellite, requiresCell, hasMonetaryCost, supportsAltitude, supportsSpeed, supportsBearing, powerRequirement, accuracy); - if (name.matches(LocationProvider.BAD_CHARS_REGEX)) { - throw new IllegalArgumentException("provider name contains illegal character: " + name); - } - try { - mService.addTestProvider(name, properties, mContext.getOpPackageName()); + mService.addTestProvider(provider, properties, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Removes the mock location provider with the given name. + * Removes the test location provider with the given name or does nothing if no such test + * location provider exists. * * @param provider the provider name * + * @throws IllegalArgumentException if provider is null * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED * allowed} for your app. - * @throws IllegalArgumentException if no provider with the given name exists */ public void removeTestProvider(@NonNull String provider) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + try { mService.removeTestProvider(provider, mContext.getOpPackageName()); } catch (RemoteException e) { @@ -1296,60 +1304,53 @@ public class LocationManager { } /** - * Sets a mock location for the given provider. - * <p>This location will be used in place of any actual location from the provider. - * The location object must have a minimum number of fields set to be - * considered a valid LocationProvider Location, as per documentation - * on {@link Location} class. + * Sets a new location for the given test provider. This location will be identiable as a mock + * location to all clients via {@link Location#isFromMockProvider()}. + * + * <p>The location object must have a minimum number of fields set to be considered valid, as + * per documentation on {@link Location} class. * * @param provider the provider name - * @param loc the mock location + * @param location the mock location * * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED * allowed} for your app. - * @throws IllegalArgumentException if no provider with the given name exists - * @throws IllegalArgumentException if the location is incomplete + * @throws IllegalArgumentException if the provider is null or not a test provider + * @throws IllegalArgumentException if the location is null or incomplete */ - public void setTestProviderLocation(@NonNull String provider, @NonNull Location loc) { - if (!loc.isComplete()) { + public void setTestProviderLocation(@NonNull String provider, @NonNull Location location) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + Preconditions.checkArgument(location != null, "invalid null location"); + + if (!location.isComplete()) { IllegalArgumentException e = new IllegalArgumentException( - "Incomplete location object, missing timestamp or accuracy? " + loc); + "Incomplete location object, missing timestamp or accuracy? " + location); if (mContext.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.JELLY_BEAN) { - // just log on old platform (for backwards compatibility) Log.w(TAG, e); - loc.makeComplete(); + location.makeComplete(); } else { - // really throw it! throw e; } } try { - mService.setTestProviderLocation(provider, loc, mContext.getOpPackageName()); + mService.setTestProviderLocation(provider, location, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } } /** - * Removes any mock location associated with the given provider. - * - * @param provider the provider name - * - * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION - * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED - * allowed} for your app. - * @throws IllegalArgumentException if no provider with the given name exists + * Does nothing. * - * @deprecated This function has always been a no-op, and may be removed in the future. + * @deprecated This method has always been a no-op, and may be removed in the future. */ @Deprecated public void clearTestProviderLocation(@NonNull String provider) {} /** - * Sets a mock enabled value for the given provider. This value will be used in place - * of any actual value from the provider. + * Sets the given test provider to be enabled or disabled. * * @param provider the provider name * @param enabled the mock enabled value @@ -1357,9 +1358,11 @@ public class LocationManager { * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED * allowed} for your app. - * @throws IllegalArgumentException if no provider with the given name exists + * @throws IllegalArgumentException if provider is null or not a test provider */ public void setTestProviderEnabled(@NonNull String provider, boolean enabled) { + Preconditions.checkArgument(provider != null, "invalid null provider"); + try { mService.setTestProviderEnabled(provider, enabled, mContext.getOpPackageName()); } catch (RemoteException e) { @@ -1368,14 +1371,8 @@ public class LocationManager { } /** - * Removes any mock enabled value associated with the given provider. - * - * @param provider the provider name - * - * @throws SecurityException if {@link android.app.AppOpsManager#OPSTR_MOCK_LOCATION - * mock location app op} is not set to {@link android.app.AppOpsManager#MODE_ALLOWED - * allowed} for your app. - * @throws IllegalArgumentException if no provider with the given name exists + * Equivalent to calling {@link #setTestProviderEnabled(String, boolean)} to disable a test + * provider. * * @deprecated Use {@link #setTestProviderEnabled(String, boolean)} instead. */ @@ -2237,49 +2234,45 @@ public class LocationManager { private class LocationListenerTransport extends ILocationListener.Stub { - private final Executor mExecutor; - @Nullable private volatile LocationListener mListener; + private final LocationListener mListener; + @Nullable private volatile Executor mExecutor = null; - private LocationListenerTransport(@NonNull Handler handler, - @NonNull LocationListener listener) { - Preconditions.checkArgument(handler != null, "invalid null handler"); + private LocationListenerTransport(@NonNull LocationListener listener) { Preconditions.checkArgument(listener != null, "invalid null listener"); - - mExecutor = new HandlerExecutor(handler); mListener = listener; } - private LocationListenerTransport(@NonNull Executor executor, - @NonNull LocationListener listener) { - Preconditions.checkArgument(executor != null, "invalid null executor"); - Preconditions.checkArgument(listener != null, "invalid null listener"); - - mExecutor = executor; - mListener = listener; + public LocationListener getKey() { + return mListener; } - private LocationListener getKey() { - return mListener; + public void register(@NonNull Executor executor) { + Preconditions.checkArgument(executor != null, "invalid null executor"); + mExecutor = executor; } - private void unregisterListener() { - mListener = null; + public void unregister() { + mExecutor = null; } @Override public void onLocationChanged(Location location) { + Executor currentExecutor = mExecutor; + if (currentExecutor == null) { + return; + } + try { - mExecutor.execute(() -> { + currentExecutor.execute(() -> { try { - LocationListener listener = mListener; - if (listener == null) { + if (currentExecutor != mExecutor) { return; } // we may be under the binder identity if a direct executor is used long identity = Binder.clearCallingIdentity(); try { - listener.onLocationChanged(location); + mListener.onLocationChanged(location); } finally { Binder.restoreCallingIdentity(identity); } @@ -2295,18 +2288,22 @@ public class LocationManager { @Override public void onStatusChanged(String provider, int status, Bundle extras) { + Executor currentExecutor = mExecutor; + if (currentExecutor == null) { + return; + } + try { - mExecutor.execute(() -> { + currentExecutor.execute(() -> { try { - LocationListener listener = mListener; - if (listener == null) { + if (currentExecutor != mExecutor) { return; } // we may be under the binder identity if a direct executor is used long identity = Binder.clearCallingIdentity(); try { - listener.onStatusChanged(provider, status, extras); + mListener.onStatusChanged(provider, status, extras); } finally { Binder.restoreCallingIdentity(identity); } @@ -2322,18 +2319,22 @@ public class LocationManager { @Override public void onProviderEnabled(String provider) { + Executor currentExecutor = mExecutor; + if (currentExecutor == null) { + return; + } + try { - mExecutor.execute(() -> { + currentExecutor.execute(() -> { try { - LocationListener listener = mListener; - if (listener == null) { + if (currentExecutor != mExecutor) { return; } // we may be under the binder identity if a direct executor is used long identity = Binder.clearCallingIdentity(); try { - listener.onProviderEnabled(provider); + mListener.onProviderEnabled(provider); } finally { Binder.restoreCallingIdentity(identity); } @@ -2349,18 +2350,22 @@ public class LocationManager { @Override public void onProviderDisabled(String provider) { + Executor currentExecutor = mExecutor; + if (currentExecutor == null) { + return; + } + try { - mExecutor.execute(() -> { + currentExecutor.execute(() -> { try { - LocationListener listener = mListener; - if (listener == null) { + if (currentExecutor != mExecutor) { return; } // we may be under the binder identity if a direct executor is used long identity = Binder.clearCallingIdentity(); try { - listener.onProviderDisabled(provider); + mListener.onProviderDisabled(provider); } finally { Binder.restoreCallingIdentity(identity); } diff --git a/location/java/android/location/LocationProvider.java b/location/java/android/location/LocationProvider.java index b69a9d79e5b8..52a03b61d21c 100644 --- a/location/java/android/location/LocationProvider.java +++ b/location/java/android/location/LocationProvider.java @@ -53,28 +53,10 @@ public class LocationProvider { @Deprecated public static final int AVAILABLE = 2; - /** - * A regular expression matching characters that may not appear - * in the name of a LocationProvider - * @hide - */ - public static final String BAD_CHARS_REGEX = "[^a-zA-Z0-9]"; - private final String mName; private final ProviderProperties mProperties; - /** - * Constructs a LocationProvider with the given name. Provider names must - * consist only of the characters [a-zA-Z0-9]. - * - * @throws IllegalArgumentException if name contains an illegal character - * - * @hide - */ - public LocationProvider(String name, ProviderProperties properties) { - if (name.matches(BAD_CHARS_REGEX)) { - throw new IllegalArgumentException("provider name contains illegal character: " + name); - } + LocationProvider(String name, ProviderProperties properties) { mName = name; mProperties = properties; } diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index 53babcb32e4d..5341d072df23 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -1357,6 +1357,7 @@ public class ExifInterface { private AssetManager.AssetInputStream mAssetInputStream; private boolean mIsInputStream; private int mMimeType; + private boolean mIsStandalone; @UnsupportedAppUsage private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length]; private Set<Integer> mHandledIfdOffsets = new HashSet<>(EXIF_TAGS.length); @@ -1411,6 +1412,7 @@ public class ExifInterface { if (fileDescriptor == null) { throw new NullPointerException("fileDescriptor cannot be null"); } + mAssetInputStream = null; mFilename = null; // When FileDescriptor is duplicated and set to FileInputStream, ownership needs to be @@ -1442,26 +1444,61 @@ public class ExifInterface { /** * Reads Exif tags from the specified image input stream. Attribute mutation is not supported - * for input streams. The given input stream will proceed its current position. Developers + * for input streams. The given input stream will proceed from its current position. Developers * should close the input stream after use. */ public ExifInterface(@NonNull InputStream inputStream) throws IOException { + this(inputStream, false); + } + + /** + * Reads Exif tags from the specified standalone input stream. Standalone data refers to Exif + * data that exists by itself and is not contained in a file format such as jpeg or png. + * The format of the standalone data must follow the below structure: + * Exif Identifier Code ("Exif\0\0") + TIFF header + IFD data + * See JEITA CP-3451C Section 4.5.2 and 4.5.4 specifications for more details. + * <p> + * Attribute mutation is not supported for this constructor. The given input stream will proceed + * from its current position. Developers should close the input stream after use. This + * constructor is not intended to be used with an input stream that performs any networking + * operations. + * + * @throws IOException if the data does not follow the aforementioned structure. + */ + @NonNull + public static ExifInterface fromStandalone(@NonNull InputStream inputStream) + throws IOException { + if (isStandalone(inputStream)) { + return new ExifInterface(inputStream, true); + } + throw new IOException("Given data does not follow the structure of a standalone exif " + + "data."); + } + + private ExifInterface(@NonNull InputStream inputStream, boolean isFromStandalone) + throws IOException { if (inputStream == null) { throw new NullPointerException("inputStream cannot be null"); } mFilename = null; - if (inputStream instanceof AssetManager.AssetInputStream) { - mAssetInputStream = (AssetManager.AssetInputStream) inputStream; - mSeekableFileDescriptor = null; - } else if (inputStream instanceof FileInputStream - && isSeekableFD(((FileInputStream) inputStream).getFD())) { - mAssetInputStream = null; - mSeekableFileDescriptor = ((FileInputStream) inputStream).getFD(); - } else { + + if (isFromStandalone) { + mIsStandalone = true; mAssetInputStream = null; mSeekableFileDescriptor = null; + } else { + if (inputStream instanceof AssetManager.AssetInputStream) { + mAssetInputStream = (AssetManager.AssetInputStream) inputStream; + mSeekableFileDescriptor = null; + } else if (inputStream instanceof FileInputStream + && (isSeekableFD(((FileInputStream) inputStream).getFD()))) { + mAssetInputStream = null; + mSeekableFileDescriptor = ((FileInputStream) inputStream).getFD(); + } else { + mAssetInputStream = null; + mSeekableFileDescriptor = null; + } } - mIsInputStream = true; loadAttributes(inputStream); } @@ -1798,51 +1835,57 @@ public class ExifInterface { } // Check file type - in = new BufferedInputStream(in, SIGNATURE_CHECK_SIZE); - mMimeType = getMimeType((BufferedInputStream) in); + if (!mIsStandalone) { + in = new BufferedInputStream(in, SIGNATURE_CHECK_SIZE); + mMimeType = getMimeType((BufferedInputStream) in); + } // Create byte-ordered input stream ByteOrderedDataInputStream inputStream = new ByteOrderedDataInputStream(in); - switch (mMimeType) { - case IMAGE_TYPE_JPEG: { - getJpegAttributes(inputStream, 0, IFD_TYPE_PRIMARY); // 0 is offset - break; - } - case IMAGE_TYPE_RAF: { - getRafAttributes(inputStream); - break; - } - case IMAGE_TYPE_HEIF: { - getHeifAttributes(inputStream); - break; - } - case IMAGE_TYPE_ORF: { - getOrfAttributes(inputStream); - break; - } - case IMAGE_TYPE_RW2: { - getRw2Attributes(inputStream); - break; - } - case IMAGE_TYPE_PNG: { - getPngAttributes(inputStream); - break; - } - case IMAGE_TYPE_ARW: - case IMAGE_TYPE_CR2: - case IMAGE_TYPE_DNG: - case IMAGE_TYPE_NEF: - case IMAGE_TYPE_NRW: - case IMAGE_TYPE_PEF: - case IMAGE_TYPE_SRW: - case IMAGE_TYPE_UNKNOWN: { - getRawAttributes(inputStream); - break; - } - default: { - break; + if (!mIsStandalone) { + switch (mMimeType) { + case IMAGE_TYPE_JPEG: { + getJpegAttributes(inputStream, 0, IFD_TYPE_PRIMARY); // 0 is offset + break; + } + case IMAGE_TYPE_RAF: { + getRafAttributes(inputStream); + break; + } + case IMAGE_TYPE_HEIF: { + getHeifAttributes(inputStream); + break; + } + case IMAGE_TYPE_ORF: { + getOrfAttributes(inputStream); + break; + } + case IMAGE_TYPE_RW2: { + getRw2Attributes(inputStream); + break; + } + case IMAGE_TYPE_PNG: { + getPngAttributes(inputStream); + break; + } + case IMAGE_TYPE_ARW: + case IMAGE_TYPE_CR2: + case IMAGE_TYPE_DNG: + case IMAGE_TYPE_NEF: + case IMAGE_TYPE_NRW: + case IMAGE_TYPE_PEF: + case IMAGE_TYPE_SRW: + case IMAGE_TYPE_UNKNOWN: { + getRawAttributes(inputStream); + break; + } + default: { + break; + } } + } else { + getStandaloneAttributes(inputStream); } // Set thumbnail image offset and length setThumbnailData(inputStream); @@ -2124,6 +2167,9 @@ public class ExifInterface { } if (mHasThumbnail) { + if (mIsStandalone) { + return new long[] { mThumbnailOffset + mExifOffset, mThumbnailLength }; + } return new long[] { mThumbnailOffset, mThumbnailLength }; } else { return null; @@ -2368,6 +2414,7 @@ public class ExifInterface { // Checks the type of image file private int getMimeType(BufferedInputStream in) throws IOException { + // TODO (b/142218289): Need to handle case where input stream does not support mark in.mark(SIGNATURE_CHECK_SIZE); byte[] signatureCheckBytes = new byte[SIGNATURE_CHECK_SIZE]; in.read(signatureCheckBytes); @@ -2562,6 +2609,18 @@ public class ExifInterface { return true; } + private static boolean isStandalone(InputStream inputStream) throws IOException { + byte[] signatureCheckBytes = new byte[IDENTIFIER_EXIF_APP1.length]; + inputStream.read(signatureCheckBytes); + + for (int i = 0; i < IDENTIFIER_EXIF_APP1.length; i++) { + if (signatureCheckBytes[i] != IDENTIFIER_EXIF_APP1[i]) { + return false; + } + } + return true; + } + /** * Loads EXIF attributes from a JPEG input stream. * @@ -2633,7 +2692,6 @@ public class ExifInterface { final long offset = start + IDENTIFIER_EXIF_APP1.length; final byte[] value = Arrays.copyOfRange(bytes, IDENTIFIER_EXIF_APP1.length, bytes.length); - readExifSegment(value, imageType); // Save offset values for handleThumbnailFromJfif() function @@ -2953,6 +3011,16 @@ public class ExifInterface { } } + private void getStandaloneAttributes(ByteOrderedDataInputStream in) throws IOException { + // TODO: Need to handle potential OutOfMemoryError + byte[] data = new byte[in.available()]; + in.readFully(data); + readExifSegment(data, IFD_TYPE_PRIMARY); + + // Save offset values for handleThumbnailFromJfif() function + mExifOffset = IDENTIFIER_EXIF_APP1.length; + } + /** * ORF files contains a primary image data and a MakerNote data that contains preview/thumbnail * images. Both data takes the form of IFDs and can therefore be read with the @@ -3606,8 +3674,6 @@ public class ExifInterface { int thumbnailOffset = jpegInterchangeFormatAttribute.getIntValue(mExifByteOrder); int thumbnailLength = jpegInterchangeFormatLengthAttribute.getIntValue(mExifByteOrder); - // The following code limits the size of thumbnail size not to overflow EXIF data area. - thumbnailLength = Math.min(thumbnailLength, in.getLength() - thumbnailOffset); if (mMimeType == IMAGE_TYPE_JPEG || mMimeType == IMAGE_TYPE_RAF || mMimeType == IMAGE_TYPE_RW2) { thumbnailOffset += mExifOffset; @@ -3615,6 +3681,9 @@ public class ExifInterface { // Update offset value since RAF files have IFD data preceding MakerNote data. thumbnailOffset += mOrfMakerNoteOffset; } + // The following code limits the size of thumbnail size not to overflow EXIF data area. + thumbnailLength = Math.min(thumbnailLength, in.getLength() - thumbnailOffset); + if (DEBUG) { Log.d(TAG, "Setting thumbnail attributes with offset: " + thumbnailOffset + ", length: " + thumbnailLength); @@ -4123,6 +4192,7 @@ public class ExifInterface { mDataInputStream = new DataInputStream(in); mLength = mDataInputStream.available(); mPosition = 0; + // TODO (b/142218289): Need to handle case where input stream does not support mark mDataInputStream.mark(mLength); } @@ -4138,6 +4208,7 @@ public class ExifInterface { if (mPosition > byteCount) { mPosition = 0; mDataInputStream.reset(); + // TODO (b/142218289): Need to handle case where input stream does not support mark mDataInputStream.mark(mLength); } else { byteCount -= mPosition; diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 510ee442f852..b7a9ffe93bae 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -649,7 +649,7 @@ import java.util.concurrent.locks.ReentrantLock; are not consumed by the Surface in a timely manner). Or it may be configured to not drop excessive frames. In the latter mode if the Surface is not consuming output frames fast enough, it will eventually block the decoder. Prior to {@link android.os.Build.VERSION_CODES#Q} the exact behavior - was undefined, with the exception that View surfaces (SuerfaceView or TextureView) always dropped + was undefined, with the exception that View surfaces (SurfaceView or TextureView) always dropped excessive frames. Since {@link android.os.Build.VERSION_CODES#Q} the default behavior is to drop excessive frames. Applications can opt out of this behavior for non-View surfaces (such as ImageReader or SurfaceTexture) by targeting SDK {@link android.os.Build.VERSION_CODES#Q} and @@ -3513,6 +3513,19 @@ final public class MediaCodec { public static final String PARAMETER_KEY_HDR10_PLUS_INFO = MediaFormat.KEY_HDR10_PLUS_INFO; /** + * Enable/disable low latency decoding mode. + * When enabled, the decoder doesn't hold input and output data more than + * required by the codec standards. + * The value is an Integer object containing the value 1 to enable + * or the value 0 to disable. + * + * @see #setParameters(Bundle) + * @see MediaFormat#KEY_LOW_LATENCY + */ + public static final String PARAMETER_KEY_LOW_LATENCY = + MediaFormat.KEY_LOW_LATENCY; + + /** * Communicate additional parameter changes to the component instance. * <b>Note:</b> Some of these parameter changes may silently fail to apply. * diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index f304f7cc5981..26e79364bb02 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -559,6 +559,14 @@ public final class MediaCodecInfo { public static final String FEATURE_IntraRefresh = "intra-refresh"; /** + * <b>decoder only</b>: codec supports low latency decoding. + * If supported, clients can enable the low latency mode for the decoder. + * When the mode is enabled, the decoder doesn't hold input and output data more than + * required by the codec standards. + */ + public static final String FEATURE_LowLatency = "low-latency"; + + /** * Query codec feature capabilities. * <p> * These features are supported to be used by the codec. These @@ -587,6 +595,7 @@ public final class MediaCodecInfo { new Feature(FEATURE_FrameParsing, (1 << 4), false), new Feature(FEATURE_MultipleFrames, (1 << 5), false), new Feature(FEATURE_DynamicTimestamp, (1 << 6), false), + new Feature(FEATURE_LowLatency, (1 << 7), true), }; private static final Feature[] encoderFeatures = { diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 8b667f772867..8080f45642dc 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -211,6 +211,15 @@ public final class MediaFormat { public static final String KEY_MIME = "mime"; /** + * An optional key describing the low latency decoding mode. This is an optional parameter + * that applies only to decoders. If enabled, the decoder doesn't hold input and output + * data more than required by the codec standards. + * The associated value is an integer (0 or 1): 1 when low-latency decoding is enabled, + * 0 otherwise. The default value is 0. + */ + public static final String KEY_LOW_LATENCY = "low-latency"; + + /** * A key describing the language of the content, using either ISO 639-1 * or 639-2/T codes. The associated value is a string. */ diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 0346010f4587..f421029909bd 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -227,6 +227,44 @@ public class MediaMetadataRetriever implements AutoCloseable { public native String extractMetadata(int keyCode); /** + * This method is similar to {@link #getFrameAtTime(long, int, BitmapParams)} + * except that the device will choose the actual {@link Bitmap.Config} to use. + * + * @param timeUs The time position where the frame will be retrieved. + * When retrieving the frame at the given time position, there is no + * guarantee that the data source has a frame located at the position. + * When this happens, a frame nearby will be returned. If timeUs is + * negative, time position and option will ignored, and any frame + * that the implementation considers as representative may be returned. + * + * @param option a hint on how the frame is found. Use + * {@link #OPTION_PREVIOUS_SYNC} if one wants to retrieve a sync frame + * that has a timestamp earlier than or the same as timeUs. Use + * {@link #OPTION_NEXT_SYNC} if one wants to retrieve a sync frame + * that has a timestamp later than or the same as timeUs. Use + * {@link #OPTION_CLOSEST_SYNC} if one wants to retrieve a sync frame + * that has a timestamp closest to or the same as timeUs. Use + * {@link #OPTION_CLOSEST} if one wants to retrieve a frame that may + * or may not be a sync frame but is closest to or the same as timeUs. + * {@link #OPTION_CLOSEST} often has larger performance overhead compared + * to the other options if there is no sync frame located at timeUs. + * + * @return A Bitmap containing a representative video frame, which can be null, + * if such a frame cannot be retrieved. {@link Bitmap#getConfig()} can + * be used to query the actual {@link Bitmap.Config}. + * + * @see {@link #getFrameAtTime(long, int, BitmapParams)} + */ + public Bitmap getFrameAtTime(long timeUs, @Option int option) { + if (option < OPTION_PREVIOUS_SYNC || + option > OPTION_CLOSEST) { + throw new IllegalArgumentException("Unsupported option: " + option); + } + + return _getFrameAtTime(timeUs, option, -1 /*dst_width*/, -1 /*dst_height*/, null); + } + + /** * Call this method after setDataSource(). This method finds a * representative frame close to the given time position by considering * the given option if possible, and returns it as a bitmap. @@ -255,16 +293,60 @@ public class MediaMetadataRetriever implements AutoCloseable { * {@link #OPTION_CLOSEST} often has larger performance overhead compared * to the other options if there is no sync frame located at timeUs. * + * @param params BitmapParams that controls the returned bitmap config + * (such as pixel formats). + * * @return A Bitmap containing a representative video frame, which * can be null, if such a frame cannot be retrieved. + * + * @see {@link #getFrameAtTime(long, int)} */ - public Bitmap getFrameAtTime(long timeUs, @Option int option) { + public Bitmap getFrameAtTime( + long timeUs, @Option int option, @NonNull BitmapParams params) { if (option < OPTION_PREVIOUS_SYNC || option > OPTION_CLOSEST) { throw new IllegalArgumentException("Unsupported option: " + option); } - return _getFrameAtTime(timeUs, option, -1 /*dst_width*/, -1 /*dst_height*/); + return _getFrameAtTime(timeUs, option, -1 /*dst_width*/, -1 /*dst_height*/, params); + } + + /** + * This method is similar to {@link #getScaledFrameAtTime(long, int, int, int, BitmapParams)} + * except that the device will choose the actual {@link Bitmap.Config} to use. + * + * @param timeUs The time position in microseconds where the frame will be retrieved. + * When retrieving the frame at the given time position, there is no + * guarantee that the data source has a frame located at the position. + * When this happens, a frame nearby will be returned. If timeUs is + * negative, time position and option will ignored, and any frame + * that the implementation considers as representative may be returned. + * + * @param option a hint on how the frame is found. Use + * {@link #OPTION_PREVIOUS_SYNC} if one wants to retrieve a sync frame + * that has a timestamp earlier than or the same as timeUs. Use + * {@link #OPTION_NEXT_SYNC} if one wants to retrieve a sync frame + * that has a timestamp later than or the same as timeUs. Use + * {@link #OPTION_CLOSEST_SYNC} if one wants to retrieve a sync frame + * that has a timestamp closest to or the same as timeUs. Use + * {@link #OPTION_CLOSEST} if one wants to retrieve a frame that may + * or may not be a sync frame but is closest to or the same as timeUs. + * {@link #OPTION_CLOSEST} often has larger performance overhead compared + * to the other options if there is no sync frame located at timeUs. + * + * @param dstWidth expected output bitmap width + * @param dstHeight expected output bitmap height + * @return A Bitmap containing a representative video frame, which can be null, + * if such a frame cannot be retrieved. {@link Bitmap#getConfig()} can + * be used to query the actual {@link Bitmap.Config}. + * @throws IllegalArgumentException if passed in invalid option or width by height + * is less than or equal to 0. + * @see {@link #getScaledFrameAtTime(long, int, int, int, BitmapParams)} + */ + public Bitmap getScaledFrameAtTime( + long timeUs, @Option int option, int dstWidth, int dstHeight) { + validate(option, dstWidth, dstHeight); + return _getFrameAtTime(timeUs, option, dstWidth, dstHeight, null); } /** @@ -297,15 +379,23 @@ public class MediaMetadataRetriever implements AutoCloseable { * * @param dstWidth expected output bitmap width * @param dstHeight expected output bitmap height + * @param params BitmapParams that controls the returned bitmap config + * (such as pixel formats). + * * @return A Bitmap of size not larger than dstWidth by dstHeight containing a * scaled video frame, which can be null, if such a frame cannot be retrieved. * @throws IllegalArgumentException if passed in invalid option or width by height * is less than or equal to 0. + * @see {@link #getScaledFrameAtTime(long, int, int, int)} */ - public Bitmap getScaledFrameAtTime( - long timeUs, @Option int option, int dstWidth, int dstHeight) { - if (option < OPTION_PREVIOUS_SYNC || - option > OPTION_CLOSEST) { + public Bitmap getScaledFrameAtTime(long timeUs, @Option int option, + int dstWidth, int dstHeight, @NonNull BitmapParams params) { + validate(option, dstWidth, dstHeight); + return _getFrameAtTime(timeUs, option, dstWidth, dstHeight, params); + } + + private void validate(@Option int option, int dstWidth, int dstHeight) { + if (option < OPTION_PREVIOUS_SYNC || option > OPTION_CLOSEST) { throw new IllegalArgumentException("Unsupported option: " + option); } if (dstWidth <= 0) { @@ -314,8 +404,6 @@ public class MediaMetadataRetriever implements AutoCloseable { if (dstHeight <= 0) { throw new IllegalArgumentException("Invalid height: " + dstHeight); } - - return _getFrameAtTime(timeUs, option, dstWidth, dstHeight); } /** @@ -365,10 +453,12 @@ public class MediaMetadataRetriever implements AutoCloseable { * @see #getFrameAtTime(long, int) */ public Bitmap getFrameAtTime() { - return _getFrameAtTime(-1, OPTION_CLOSEST_SYNC, -1 /*dst_width*/, -1 /*dst_height*/); + return _getFrameAtTime( + -1, OPTION_CLOSEST_SYNC, -1 /*dst_width*/, -1 /*dst_height*/, null); } - private native Bitmap _getFrameAtTime(long timeUs, int option, int width, int height); + private native Bitmap _getFrameAtTime( + long timeUs, int option, int width, int height, @Nullable BitmapParams params); public static final class BitmapParams { private Bitmap.Config inPreferredConfig = Bitmap.Config.ARGB_8888; diff --git a/media/java/android/media/MediaRoute2Info.java b/media/java/android/media/MediaRoute2Info.java index 5dcbb05184fe..abd774d2bb00 100644 --- a/media/java/android/media/MediaRoute2Info.java +++ b/media/java/android/media/MediaRoute2Info.java @@ -46,6 +46,21 @@ public final class MediaRoute2Info implements Parcelable { } }; + /** + * Playback information indicating the playback volume is fixed, i.e. it cannot be + * controlled from this object. An example of fixed playback volume is a remote player, + * playing over HDMI where the user prefers to control the volume on the HDMI sink, rather + * than attenuate at the source. + * @see #getVolumeHandling() + */ + public static final int PLAYBACK_VOLUME_FIXED = 0; + /** + * Playback information indicating the playback volume is variable and can be controlled + * from this object. + * @see #getVolumeHandling() + */ + public static final int PLAYBACK_VOLUME_VARIABLE = 1; + @NonNull final String mId; @Nullable @@ -58,6 +73,9 @@ public final class MediaRoute2Info implements Parcelable { final String mClientPackageName; @NonNull final List<String> mSupportedCategories; + final int mVolume; + final int mVolumeMax; + final int mVolumeHandling; @Nullable final Bundle mExtras; @@ -68,6 +86,9 @@ public final class MediaRoute2Info implements Parcelable { mDescription = builder.mDescription; mClientPackageName = builder.mClientPackageName; mSupportedCategories = builder.mSupportedCategories; + mVolume = builder.mVolume; + mVolumeMax = builder.mVolumeMax; + mVolumeHandling = builder.mVolumeHandling; mExtras = builder.mExtras; } @@ -78,6 +99,9 @@ public final class MediaRoute2Info implements Parcelable { mDescription = in.readString(); mClientPackageName = in.readString(); mSupportedCategories = in.createStringArrayList(); + mVolume = in.readInt(); + mVolumeMax = in.readInt(); + mVolumeHandling = in.readInt(); mExtras = in.readBundle(); } @@ -111,6 +135,9 @@ public final class MediaRoute2Info implements Parcelable { && Objects.equals(mDescription, other.mDescription) && Objects.equals(mClientPackageName, other.mClientPackageName) && Objects.equals(mSupportedCategories, other.mSupportedCategories) + && (mVolume == other.mVolume) + && (mVolumeMax == other.mVolumeMax) + && (mVolumeHandling == other.mVolumeHandling) //TODO: This will be evaluated as false in most cases. Try not to. && Objects.equals(mExtras, other.mExtras); } @@ -162,6 +189,29 @@ public final class MediaRoute2Info implements Parcelable { return mSupportedCategories; } + /** + * Gets the current volume of the route. This may be invalid if the route is not selected. + */ + public int getVolume() { + return mVolume; + } + + /** + * Gets the maximum volume of the route. + */ + public int getVolumeMax() { + return mVolumeMax; + } + + /** + * Gets information about how volume is handled on the route. + * + * @return {@link #PLAYBACK_VOLUME_FIXED} or {@link #PLAYBACK_VOLUME_VARIABLE} + */ + public int getVolumeHandling() { + return mVolumeHandling; + } + @Nullable public Bundle getExtras() { return mExtras; @@ -199,6 +249,9 @@ public final class MediaRoute2Info implements Parcelable { dest.writeString(mDescription); dest.writeString(mClientPackageName); dest.writeStringList(mSupportedCategories); + dest.writeInt(mVolume); + dest.writeInt(mVolumeMax); + dest.writeInt(mVolumeHandling); dest.writeBundle(mExtras); } @@ -209,6 +262,9 @@ public final class MediaRoute2Info implements Parcelable { .append("id=").append(getId()) .append(", name=").append(getName()) .append(", description=").append(getDescription()) + .append(", volume=").append(getVolume()) + .append(", volumeMax=").append(getVolumeMax()) + .append(", volumeHandling=").append(getVolumeHandling()) .append(", providerId=").append(getProviderId()) .append(" }"); return result.toString(); @@ -224,6 +280,9 @@ public final class MediaRoute2Info implements Parcelable { String mDescription; String mClientPackageName; List<String> mSupportedCategories; + int mVolume; + int mVolumeMax; + int mVolumeHandling; Bundle mExtras; public Builder(@NonNull String id, @NonNull String name) { @@ -251,6 +310,9 @@ public final class MediaRoute2Info implements Parcelable { mDescription = routeInfo.mDescription; setClientPackageName(routeInfo.mClientPackageName); setSupportedCategories(routeInfo.mSupportedCategories); + setVolume(routeInfo.mVolume); + setVolumeMax(routeInfo.mVolumeMax); + setVolumeHandling(routeInfo.mVolumeHandling); if (routeInfo.mExtras != null) { mExtras = new Bundle(routeInfo.mExtras); } @@ -345,6 +407,32 @@ public final class MediaRoute2Info implements Parcelable { } /** + * Sets the route's current volume, or 0 if unknown. + */ + @NonNull + public Builder setVolume(int volume) { + mVolume = volume; + return this; + } + + /** + * Sets the route's maximum volume, or 0 if unknown. + */ + @NonNull + public Builder setVolumeMax(int volumeMax) { + mVolumeMax = volumeMax; + return this; + } + + /** + * Sets the route's volume handling. + */ + @NonNull + public Builder setVolumeHandling(int volumeHandling) { + mVolumeHandling = volumeHandling; + return this; + } + /** * Sets a bundle of extras for the route. */ @NonNull diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index 18fd1a01cfd6..bc4bcebaf560 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -350,9 +350,10 @@ static jobject getBitmapFromVideoFrame( return jBitmap; } -static int getColorFormat(JNIEnv *env, jobject options) { +static int getColorFormat(JNIEnv *env, jobject options, + int defaultPreferred = HAL_PIXEL_FORMAT_RGBA_8888) { if (options == NULL) { - return HAL_PIXEL_FORMAT_RGBA_8888; + return defaultPreferred; } ScopedLocalRef<jobject> inConfig(env, env->GetObjectField(options, fields.inPreferredConfig)); @@ -383,7 +384,8 @@ static SkColorType setOutColorType(JNIEnv *env, int colorFormat, jobject options } static jobject android_media_MediaMetadataRetriever_getFrameAtTime( - JNIEnv *env, jobject thiz, jlong timeUs, jint option, jint dst_width, jint dst_height) + JNIEnv *env, jobject thiz, jlong timeUs, jint option, + jint dst_width, jint dst_height, jobject params) { ALOGV("getFrameAtTime: %lld us option: %d dst width: %d heigh: %d", (long long)timeUs, option, dst_width, dst_height); @@ -392,10 +394,13 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime( jniThrowException(env, "java/lang/IllegalStateException", "No retriever available"); return NULL; } + // For getFrameAtTime family of calls, default to HAL_PIXEL_FORMAT_RGB_565 + // to keep the behavior consistent with older releases + int colorFormat = getColorFormat(env, params, HAL_PIXEL_FORMAT_RGB_565); // Call native method to retrieve a video frame VideoFrame *videoFrame = NULL; - sp<IMemory> frameMemory = retriever->getFrameAtTime(timeUs, option); + sp<IMemory> frameMemory = retriever->getFrameAtTime(timeUs, option, colorFormat); // TODO: Using unsecurePointer() has some associated security pitfalls // (see declaration for details). // Either document why it is safe in this case or address the @@ -408,7 +413,9 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime( return NULL; } - return getBitmapFromVideoFrame(env, videoFrame, dst_width, dst_height, kRGB_565_SkColorType); + SkColorType outColorType = setOutColorType(env, colorFormat, params); + + return getBitmapFromVideoFrame(env, videoFrame, dst_width, dst_height, outColorType); } static jobject android_media_MediaMetadataRetriever_getImageAtIndex( @@ -739,7 +746,7 @@ static const JNINativeMethod nativeMethods[] = { (void *)android_media_MediaMetadataRetriever_setDataSourceFD}, {"_setDataSource", "(Landroid/media/MediaDataSource;)V", (void *)android_media_MediaMetadataRetriever_setDataSourceCallback}, - {"_getFrameAtTime", "(JIII)Landroid/graphics/Bitmap;", + {"_getFrameAtTime", "(JIIILandroid/media/MediaMetadataRetriever$BitmapParams;)Landroid/graphics/Bitmap;", (void *)android_media_MediaMetadataRetriever_getFrameAtTime}, { "_getImageAtIndex", diff --git a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java index 1267aa88a939..8d39a930a8f2 100644 --- a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java +++ b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java @@ -36,6 +36,12 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService public static final String ROUTE_ID_SPECIAL_CATEGORY = "route_special_category"; public static final String ROUTE_NAME_SPECIAL_CATEGORY = "Special Category Route"; + public static final int VOLUME_MAX = 100; + public static final String ROUTE_ID_FIXED_VOLUME = "route_fixed_volume"; + public static final String ROUTE_NAME_FIXED_VOLUME = "Fixed Volume Route"; + public static final String ROUTE_ID_VARIABLE_VOLUME = "route_variable_volume"; + public static final String ROUTE_NAME_VARIABLE_VOLUME = "Variable Volume Route"; + public static final String ACTION_REMOVE_ROUTE = "com.android.mediarouteprovider.action_remove_route"; @@ -58,9 +64,23 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService .addSupportedCategory(CATEGORY_SAMPLE) .addSupportedCategory(CATEGORY_SPECIAL) .build(); + MediaRoute2Info fixedVolumeRoute = + new MediaRoute2Info.Builder(ROUTE_ID_FIXED_VOLUME, ROUTE_NAME_FIXED_VOLUME) + .addSupportedCategory(CATEGORY_SAMPLE) + .setVolumeHandling(MediaRoute2Info.PLAYBACK_VOLUME_FIXED) + .build(); + MediaRoute2Info variableVolumeRoute = + new MediaRoute2Info.Builder(ROUTE_ID_VARIABLE_VOLUME, ROUTE_NAME_VARIABLE_VOLUME) + .addSupportedCategory(CATEGORY_SAMPLE) + .setVolumeHandling(MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE) + .setVolumeMax(VOLUME_MAX) + .build(); + mRoutes.put(route1.getId(), route1); mRoutes.put(route2.getId(), route2); mRoutes.put(routeSpecial.getId(), routeSpecial); + mRoutes.put(fixedVolumeRoute.getId(), fixedVolumeRoute); + mRoutes.put(variableVolumeRoute.getId(), variableVolumeRoute); } @Override diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java index a3ed07a6dee3..da832ac5241d 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java @@ -16,6 +16,9 @@ package com.android.mediaroutertest; +import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_FIXED; +import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -61,6 +64,12 @@ public class MediaRouterManagerTest { public static final String ROUTE_ID_SPECIAL_CATEGORY = "route_special_category"; public static final String ROUTE_NAME_SPECIAL_CATEGORY = "Special Category Route"; + public static final int VOLUME_MAX = 100; + public static final String ROUTE_ID_FIXED_VOLUME = "route_fixed_volume"; + public static final String ROUTE_NAME_FIXED_VOLUME = "Fixed Volume Route"; + public static final String ROUTE_ID_VARIABLE_VOLUME = "route_variable_volume"; + public static final String ROUTE_NAME_VARIABLE_VOLUME = "Variable Volume Route"; + public static final String ACTION_REMOVE_ROUTE = "com.android.mediarouteprovider.action_remove_route"; @@ -98,7 +107,7 @@ public class MediaRouterManagerTest { mPackageName = mContext.getPackageName(); } - //TODO: Move to a seperate file + //TODO: Move to a separate file @Test public void testMediaRoute2Info() { MediaRoute2Info routeInfo1 = new MediaRoute2Info.Builder("id", "name") @@ -281,6 +290,26 @@ public class MediaRouterManagerTest { mManager.unregisterCallback(managerCallback); } + @Test + public void testVolumeHandling() { + MediaRouter2.Callback mockCallback = mock(MediaRouter2.Callback.class); + + mRouter2.setControlCategories(CONTROL_CATEGORIES_ALL); + mRouter2.registerCallback(mExecutor, mockCallback); + verify(mockCallback, timeout(TIMEOUT_MS).atLeastOnce()) + .onRoutesChanged(argThat(routes -> routes.size() > 0)); + Map<String, MediaRoute2Info> routes = createRouteMap(mRouter2.getRoutes()); + + MediaRoute2Info fixedVolumeRoute = routes.get(ROUTE_ID_FIXED_VOLUME); + MediaRoute2Info variableVolumeRoute = routes.get(ROUTE_ID_VARIABLE_VOLUME); + + assertEquals(PLAYBACK_VOLUME_FIXED, fixedVolumeRoute.getVolumeHandling()); + assertEquals(PLAYBACK_VOLUME_VARIABLE, variableVolumeRoute.getVolumeHandling()); + assertEquals(VOLUME_MAX, variableVolumeRoute.getVolumeMax()); + + mRouter2.unregisterCallback(mockCallback); + } + // Helper for getting routes easily static Map<String, MediaRoute2Info> createRouteMap(List<MediaRoute2Info> routes) { Map<String, MediaRoute2Info> routeMap = new HashMap<>(); diff --git a/mime/Android.bp b/mime/Android.bp index 8b2b05958b6f..23a8fbf5059c 100644 --- a/mime/Android.bp +++ b/mime/Android.bp @@ -60,7 +60,7 @@ java_genrule { tools: [ "soong_zip", ], - srcs: [":mime.types"], + srcs: [":mime.types.minimized"], out: ["mimemap-res.jar"], cmd: "mkdir $(genDir)/res/ && cp $(in) $(genDir)/res/ && $(location soong_zip) -C $(genDir) -o $(out) -D $(genDir)/res/", } @@ -73,42 +73,49 @@ java_genrule { tools: [ "soong_zip", ], - srcs: [":mime.types"], + srcs: [":mime.types.minimized"], out: ["mimemap-testing-res.jar"], cmd: "mkdir $(genDir)/testres/ && cp $(in) $(genDir)/testres/ && $(location soong_zip) -C $(genDir) -o $(out) -D $(genDir)/testres/", } -// Combination of all *mime.types resources. +// Combination of all *mime.types.minimized resources. filegroup { - name: "mime.types", + name: "mime.types.minimized", visibility: [ "//visibility:private", ], srcs: [ - ":debian.mime.types", - ":android.mime.types", - ":vendor.mime.types", + ":debian.mime.types.minimized", + ":android.mime.types.minimized", + ":vendor.mime.types.minimized", ], } -filegroup { - name: "android.mime.types", +java_genrule { + name: "android.mime.types.minimized", visibility: [ "//visibility:private", ], - path: "java-res/", + out: ["android.mime.types"], srcs: [ "java-res/android.mime.types", ], + // strip comments normalize whitepace drop empty lines + cmd: "awk '{gsub(/#.*$$/,\"\"); $$1=$$1; print;}' $(in) | grep ' ' > $(out)", } -filegroup { - name: "vendor.mime.types", +// Unlike the other *mime.types files, vendor.mime.types gets '?' prepended to +// every field so that its mappings will never overwrite earlier mappings by +// the other resource files. http://b/141842825 +java_genrule { + name: "vendor.mime.types.minimized", visibility: [ "//visibility:private", ], - path: "java-res/", + out: ["vendor.mime.types"], srcs: [ "java-res/vendor.mime.types", ], + // strip comments normalize whitepace drop empty lines prepend ? to fields that are missing it + cmd: "awk '{gsub(/#.*$$/,\"\"); $$1=$$1; print;}' $(in) | grep ' ' | awk '{for(i=1;i<=NF;i++) { sub(/^\\??/, \"?\", $$i); }; print}' > $(out)", } diff --git a/mime/java/android/content/type/DefaultMimeMapFactory.java b/mime/java/android/content/type/DefaultMimeMapFactory.java index 03b685df644e..11d20d4d6c80 100644 --- a/mime/java/android/content/type/DefaultMimeMapFactory.java +++ b/mime/java/android/content/type/DefaultMimeMapFactory.java @@ -23,11 +23,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.function.Function; -import java.util.regex.Pattern; /** * Creates the framework default {@link MimeMap}, a bidirectional mapping @@ -53,8 +51,6 @@ public class DefaultMimeMapFactory { return create(resourceName -> c.getResourceAsStream("/res/" + resourceName)); } - private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+"); - /** * Creates a {@link MimeMap} instance whose resources are loaded from the * InputStreams looked up in {@code resourceSupplier}. @@ -63,33 +59,43 @@ public class DefaultMimeMapFactory { */ public static MimeMap create(Function<String, InputStream> resourceSupplier) { MimeMap.Builder builder = MimeMap.builder(); - parseTypes(builder, true, resourceSupplier, "mime.types"); - parseTypes(builder, true, resourceSupplier, "android.mime.types"); - parseTypes(builder, false, resourceSupplier, "vendor.mime.types"); + // The files loaded here must be in minimized format with lines of the + // form "mime/type ext1 ext2 ext3", i.e. no comments, no empty lines, no + // leading/trailing whitespace and with a single space between entries on + // each line. See http://b/142267887 + // + // Note: the order here matters - later entries can overwrite earlier ones + // (except that vendor.mime.types entries are prefixed with '?' which makes + // them never overwrite). + parseTypes(builder, resourceSupplier, "debian.mime.types"); + parseTypes(builder, resourceSupplier, "android.mime.types"); + parseTypes(builder, resourceSupplier, "vendor.mime.types"); return builder.build(); } - private static void parseTypes(MimeMap.Builder builder, boolean allowOverwrite, + private static void parseTypes(MimeMap.Builder builder, Function<String, InputStream> resourceSupplier, String resourceName) { try (InputStream inputStream = Objects.requireNonNull(resourceSupplier.apply(resourceName)); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) { String line; + List<String> specs = new ArrayList<>(10); // re-use for each line while ((line = reader.readLine()) != null) { - int commentPos = line.indexOf('#'); - if (commentPos >= 0) { - line = line.substring(0, commentPos); - } - line = line.trim(); - if (line.isEmpty()) { - continue; - } - List<String> specs = Arrays.asList(SPLIT_PATTERN.split(line)); - if (!allowOverwrite) { - // Pretend that the mimeType and each file extension listed in the line - // carries a "?" prefix, which means that it can add new mappings but - // not modify existing mappings (putIfAbsent() semantics). - specs = ensurePrefix("?", specs); - } + specs.clear(); + // Lines are of the form "mimeSpec extSpec extSpec[...]" with a single space + // separating them and no leading/trailing spaces and no empty lines. + int startIdx = 0; + do { + int endIdx = line.indexOf(' ', startIdx); + if (endIdx < 0) { + endIdx = line.length(); + } + String spec = line.substring(startIdx, endIdx); + if (spec.isEmpty()) { + throw new IllegalArgumentException("Malformed line: " + line); + } + specs.add(spec); + startIdx = endIdx + 1; // skip over the space + } while (startIdx < line.length()); builder.put(specs.get(0), specs.subList(1, specs.size())); } } catch (IOException | RuntimeException e) { @@ -97,15 +103,4 @@ public class DefaultMimeMapFactory { } } - private static List<String> ensurePrefix(String prefix, List<String> strings) { - List<String> result = new ArrayList<>(strings.size()); - for (String s : strings) { - if (!s.startsWith(prefix)) { - s = prefix + s; - } - result.add(s); - } - return result; - } - } diff --git a/mms/OWNERS b/mms/OWNERS new file mode 100644 index 000000000000..ba00d5d75010 --- /dev/null +++ b/mms/OWNERS @@ -0,0 +1,14 @@ +set noparent + +tgunn@google.com +breadley@google.com +hallliu@google.com +rgreenwalt@google.com +amitmahajan@google.com +fionaxu@google.com +jackyu@google.com +jminjie@google.com +satk@google.com +shuoq@google.com +refuhoo@google.com +nazaninb@google.com diff --git a/telephony/java/android/telephony/MmsManager.java b/mms/java/android/telephony/MmsManager.java index 4bcf04691652..4bcf04691652 100644 --- a/telephony/java/android/telephony/MmsManager.java +++ b/mms/java/android/telephony/MmsManager.java diff --git a/telephony/java/com/android/internal/telephony/IMms.aidl b/mms/java/com/android/internal/telephony/IMms.aidl index fa5073ef1c7e..fa5073ef1c7e 100644 --- a/telephony/java/com/android/internal/telephony/IMms.aidl +++ b/mms/java/com/android/internal/telephony/IMms.aidl diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/StreamUtils.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/StreamUtils.java index 91b292666756..66be25b53a62 100644 --- a/packages/BackupEncryption/src/com/android/server/backup/encryption/StreamUtils.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/StreamUtils.java @@ -18,9 +18,13 @@ package com.android.server.backup.encryption; import java.io.Closeable; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** Utility methods for dealing with Streams */ public class StreamUtils { + private static final int MAX_COPY_BUFFER_SIZE = 1024; // 1k copy buffer size. + /** * Close a Closeable and silently ignore any IOExceptions. * @@ -33,4 +37,28 @@ public class StreamUtils { // Silently ignore } } + + /** + * Copy data from an InputStream to an OutputStream upto a given number of bytes. + * + * @param in The source InputStream + * @param out The destination OutputStream + * @param limit The maximum number of bytes to copy + * @throws IOException Thrown if there is a problem performing the copy. + */ + public static void copyStream(InputStream in, OutputStream out, int limit) throws IOException { + int bufferSize = Math.min(MAX_COPY_BUFFER_SIZE, limit); + byte[] buffer = new byte[bufferSize]; + + int copied = 0; + while (copied < limit) { + int maxReadSize = Math.min(bufferSize, limit - copied); + int read = in.read(buffer, 0, maxReadSize); + if (read < 0) { + return; // Reached the stream end before the limit + } + out.write(buffer, 0, read); + copied += read; + } + } } diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTask.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTask.java new file mode 100644 index 000000000000..8f35db69f11e --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTask.java @@ -0,0 +1,71 @@ +/* + * 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.backup.encryption.tasks; + +import android.content.Context; +import android.util.Slog; + +import com.android.server.backup.encryption.CryptoSettings; +import com.android.server.backup.encryption.chunking.ProtoStore; +import com.android.server.backup.encryption.storage.BackupEncryptionDb; +import com.android.server.backup.encryption.storage.EncryptionDbException; + +import java.io.IOException; + +/** + * Task to clear local crypto state. + * + * <p>Needs to run whenever the user changes their backup account. + */ +public class ClearCryptoStateTask { + private static final String TAG = "ClearCryptoStateTask"; + + private final Context mContext; + private final CryptoSettings mCryptoSettings; + + /** + * A new instance. + * + * @param context for finding local storage. + * @param cryptoSettings to clear + */ + public ClearCryptoStateTask(Context context, CryptoSettings cryptoSettings) { + mContext = context; + mCryptoSettings = cryptoSettings; + } + + /** Deletes all local state for backup (not restore). */ + public void run() { + Slog.d(TAG, "Clearing local crypto state."); + try { + BackupEncryptionDb.newInstance(mContext).clear(); + } catch (EncryptionDbException e) { + Slog.e(TAG, "Error clearing encryption database", e); + } + mCryptoSettings.clearAllSettingsForBackup(); + try { + ProtoStore.createChunkListingStore(mContext).deleteAllProtos(); + } catch (IOException e) { + Slog.e(TAG, "Error clearing chunk listing store", e); + } + try { + ProtoStore.createKeyValueListingStore(mContext).deleteAllProtos(); + } catch (IOException e) { + Slog.e(TAG, "Error clearing key-value store", e); + } + } +} diff --git a/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessor.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessor.java new file mode 100644 index 000000000000..0baec8b0a450 --- /dev/null +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessor.java @@ -0,0 +1,210 @@ +/* + * 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.backup.encryption.tasks; + +import static com.android.internal.util.Preconditions.checkNotNull; +import static com.android.internal.util.Preconditions.checkState; + +import android.annotation.Nullable; +import android.app.backup.BackupTransport; +import android.content.Context; +import android.util.Slog; + +import com.android.server.backup.encryption.FullBackupDataProcessor; +import com.android.server.backup.encryption.StreamUtils; +import com.android.server.backup.encryption.client.CryptoBackupServer; +import com.android.server.backup.encryption.keys.RecoverableKeyStoreSecondaryKey; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.security.SecureRandom; +import java.util.Optional; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; + +/** + * Accepts backup data from a {@link InputStream} and passes it to the encrypted full data backup + * path. + */ +public class EncryptedFullBackupDataProcessor implements FullBackupDataProcessor { + + private static final String TAG = "EncryptedFullBackupDP"; + + private final Context mContext; + private final ExecutorService mExecutorService; + private final CryptoBackupServer mCryptoBackupServer; + private final SecureRandom mSecureRandom; + private final RecoverableKeyStoreSecondaryKey mSecondaryKey; + private final String mPackageName; + + @Nullable private InputStream mInputStream; + @Nullable private PipedOutputStream mOutputStream; + @Nullable private EncryptedFullBackupTask mBackupTask; + @Nullable private Future<Void> mBackupTaskFuture; + @Nullable private FullBackupCallbacks mFullBackupCallbacks; + + public EncryptedFullBackupDataProcessor( + Context context, + ExecutorService executorService, + CryptoBackupServer cryptoBackupServer, + SecureRandom secureRandom, + RecoverableKeyStoreSecondaryKey secondaryKey, + String packageName) { + mContext = checkNotNull(context); + mExecutorService = checkNotNull(executorService); + mCryptoBackupServer = checkNotNull(cryptoBackupServer); + mSecureRandom = checkNotNull(secureRandom); + mSecondaryKey = checkNotNull(secondaryKey); + mPackageName = checkNotNull(packageName); + } + + @Override + public boolean initiate(InputStream inputStream) throws IOException { + checkState(mBackupTask == null, "initiate() twice"); + + this.mInputStream = inputStream; + mOutputStream = new PipedOutputStream(); + + mBackupTask = + EncryptedFullBackupTask.newInstance( + mContext, + mCryptoBackupServer, + mSecureRandom, + mSecondaryKey, + mPackageName, + new PipedInputStream(mOutputStream)); + + return true; + } + + @Override + public void start() { + checkState(mBackupTask != null, "start() before initiate()"); + mBackupTaskFuture = mExecutorService.submit(mBackupTask); + } + + @Override + public int pushData(int numBytes) { + checkState( + mBackupTaskFuture != null && mInputStream != null && mOutputStream != null, + "pushData() before start()"); + + // If the upload has failed then stop without pushing any more bytes. + if (mBackupTaskFuture.isDone()) { + Optional<Exception> exception = getTaskException(); + Slog.e(TAG, "Encrypted upload failed", exception.orElse(null)); + if (exception.isPresent()) { + reportNetworkFailureIfNecessary(exception.get()); + + if (exception.get().getCause() instanceof SizeQuotaExceededException) { + return BackupTransport.TRANSPORT_QUOTA_EXCEEDED; + } + } + + return BackupTransport.TRANSPORT_ERROR; + } + + try { + StreamUtils.copyStream(mInputStream, mOutputStream, numBytes); + } catch (IOException e) { + Slog.e(TAG, "IOException when processing backup", e); + return BackupTransport.TRANSPORT_ERROR; + } + + return BackupTransport.TRANSPORT_OK; + } + + @Override + public void cancel() { + checkState(mBackupTaskFuture != null && mBackupTask != null, "cancel() before start()"); + mBackupTask.cancel(); + closeStreams(); + } + + @Override + public int finish() { + checkState(mBackupTaskFuture != null, "finish() before start()"); + + // getTaskException() waits for the task to finish. We must close the streams first, which + // causes the task to finish, otherwise it will block forever. + closeStreams(); + Optional<Exception> exception = getTaskException(); + + if (exception.isPresent()) { + Slog.e(TAG, "Exception during encrypted full backup", exception.get()); + reportNetworkFailureIfNecessary(exception.get()); + + if (exception.get().getCause() instanceof SizeQuotaExceededException) { + return BackupTransport.TRANSPORT_QUOTA_EXCEEDED; + } + return BackupTransport.TRANSPORT_ERROR; + + } else { + if (mFullBackupCallbacks != null) { + mFullBackupCallbacks.onSuccess(); + } + + return BackupTransport.TRANSPORT_OK; + } + } + + private void closeStreams() { + StreamUtils.closeQuietly(mInputStream); + StreamUtils.closeQuietly(mOutputStream); + } + + @Override + public void handleCheckSizeRejectionZeroBytes() { + cancel(); + } + + @Override + public void handleCheckSizeRejectionQuotaExceeded() { + cancel(); + } + + @Override + public void handleSendBytesQuotaExceeded() { + cancel(); + } + + @Override + public void attachCallbacks(FullBackupCallbacks fullBackupCallbacks) { + this.mFullBackupCallbacks = fullBackupCallbacks; + } + + private void reportNetworkFailureIfNecessary(Exception exception) { + if (!(exception.getCause() instanceof SizeQuotaExceededException) + && mFullBackupCallbacks != null) { + mFullBackupCallbacks.onTransferFailed(); + } + } + + private Optional<Exception> getTaskException() { + if (mBackupTaskFuture != null) { + try { + mBackupTaskFuture.get(); + } catch (InterruptedException | ExecutionException e) { + return Optional.of(e); + } + } + return Optional.empty(); + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/StreamUtilsTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/StreamUtilsTest.java new file mode 100644 index 000000000000..a95e87e3a8b7 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/StreamUtilsTest.java @@ -0,0 +1,75 @@ +/* + * 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.backup.encryption; + +import static com.google.common.truth.Truth.assertThat; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + +@RunWith(RobolectricTestRunner.class) +public class StreamUtilsTest { + private static final int SOURCE_DATA_SIZE = 64; + + private byte[] mSourceData; + + private InputStream mSource; + private ByteArrayOutputStream mDestination; + + @Before + public void setUp() { + mSourceData = new byte[SOURCE_DATA_SIZE]; + for (byte i = 0; i < SOURCE_DATA_SIZE; i++) { + mSourceData[i] = i; + } + mSource = new ByteArrayInputStream(mSourceData); + mDestination = new ByteArrayOutputStream(); + } + + @Test + public void copyStream_copiesAllBytesIfAsked() throws IOException { + StreamUtils.copyStream(mSource, mDestination, mSourceData.length); + assertOutputHasBytes(mSourceData.length); + } + + @Test + public void copyStream_stopsShortIfAsked() throws IOException { + StreamUtils.copyStream(mSource, mDestination, mSourceData.length - 10); + assertOutputHasBytes(mSourceData.length - 10); + } + + @Test + public void copyStream_stopsShortIfAskedToCopyMoreThanAvailable() throws IOException { + StreamUtils.copyStream(mSource, mDestination, mSourceData.length + 10); + assertOutputHasBytes(mSourceData.length); + } + + private void assertOutputHasBytes(int count) { + byte[] output = mDestination.toByteArray(); + assertThat(output.length).isEqualTo(count); + for (int i = 0; i < count; i++) { + assertThat(output[i]).isEqualTo(mSourceData[i]); + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTaskTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTaskTest.java new file mode 100644 index 000000000000..81bfce1da294 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/ClearCryptoStateTaskTest.java @@ -0,0 +1,109 @@ +/* + * 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.backup.encryption.tasks; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + +import android.content.Context; +import android.platform.test.annotations.Presubmit; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.server.backup.encryption.CryptoSettings; +import com.android.server.backup.encryption.chunking.ProtoStore; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto.ChunkListing; +import com.android.server.backup.encryption.protos.nano.KeyValueListingProto.KeyValueListing; +import com.android.server.backup.encryption.storage.BackupEncryptionDb; +import com.android.server.backup.encryption.storage.TertiaryKey; +import com.android.server.backup.encryption.storage.TertiaryKeysTable; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +public class ClearCryptoStateTaskTest { + private static final String TEST_PACKAGE_NAME = "com.android.example"; + + private ClearCryptoStateTask mClearCryptoStateTask; + private CryptoSettings mCryptoSettings; + private Context mApplication; + + @Before + public void setUp() { + mApplication = ApplicationProvider.getApplicationContext(); + mCryptoSettings = spy(CryptoSettings.getInstanceForTesting(mApplication)); + mClearCryptoStateTask = new ClearCryptoStateTask(mApplication, mCryptoSettings); + } + + @Test + public void run_clearsChunkListingProtoState() throws Exception { + String packageName = TEST_PACKAGE_NAME; + ChunkListing chunkListing = new ChunkListing(); + ProtoStore.createChunkListingStore(mApplication).saveProto(packageName, chunkListing); + + mClearCryptoStateTask.run(); + + assertThat( + ProtoStore.createChunkListingStore(mApplication) + .loadProto(packageName) + .isPresent()) + .isFalse(); + } + + @Test + public void run_clearsKeyValueProtoState() throws Exception { + String packageName = TEST_PACKAGE_NAME; + KeyValueListing keyValueListing = new KeyValueListing(); + ProtoStore.createKeyValueListingStore(mApplication).saveProto(packageName, keyValueListing); + + mClearCryptoStateTask.run(); + + assertThat( + ProtoStore.createKeyValueListingStore(mApplication) + .loadProto(packageName) + .isPresent()) + .isFalse(); + } + + @Test + public void run_clearsTertiaryKeysTable() throws Exception { + String secondaryKeyAlias = "bob"; + TertiaryKeysTable tertiaryKeysTable = + BackupEncryptionDb.newInstance(mApplication).getTertiaryKeysTable(); + tertiaryKeysTable.addKey( + new TertiaryKey( + secondaryKeyAlias, "packageName", /*wrappedKeyBytes=*/ new byte[0])); + + mClearCryptoStateTask.run(); + + assertThat(tertiaryKeysTable.getAllKeys(secondaryKeyAlias)).isEmpty(); + } + + @Test + public void run_clearsSettings() { + mCryptoSettings.setSecondaryLastRotated(100001); + + mClearCryptoStateTask.run(); + + assertThat(mCryptoSettings.getSecondaryLastRotated().isPresent()).isFalse(); + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessorTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessorTest.java new file mode 100644 index 000000000000..675d03fb9869 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/EncryptedFullBackupDataProcessorTest.java @@ -0,0 +1,387 @@ +/* + * 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.backup.encryption.tasks; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.testng.Assert.assertThrows; + +import android.annotation.Nullable; +import android.app.backup.BackupTransport; +import android.platform.test.annotations.Presubmit; + +import androidx.test.core.app.ApplicationProvider; + +import com.android.server.backup.encryption.FullBackupDataProcessor; +import com.android.server.backup.encryption.chunking.ProtoStore; +import com.android.server.backup.encryption.client.CryptoBackupServer; +import com.android.server.backup.encryption.keys.RecoverableKeyStoreSecondaryKey; +import com.android.server.backup.encryption.keys.TertiaryKeyManager; +import com.android.server.backup.encryption.protos.nano.ChunksMetadataProto; +import com.android.server.backup.encryption.testing.QueuingNonAutomaticExecutorService; + +import com.google.common.io.ByteStreams; +import com.google.common.primitives.Bytes; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.security.SecureRandom; + +import javax.crypto.spec.SecretKeySpec; + +@RunWith(RobolectricTestRunner.class) +@Presubmit +@Config( + shadows = { + EncryptedFullBackupDataProcessorTest.ShadowEncryptedFullBackupTask.class, + }) +public class EncryptedFullBackupDataProcessorTest { + + private static final String KEY_GENERATOR_ALGORITHM = "AES"; + + private static final String TEST_PACKAGE = "com.example.app1"; + private static final byte[] TEST_DATA_1 = {1, 2, 3, 4}; + private static final byte[] TEST_DATA_2 = {5, 6, 7, 8}; + + private final RecoverableKeyStoreSecondaryKey mTestSecondaryKey = + new RecoverableKeyStoreSecondaryKey( + /*alias=*/ "test_key", + new SecretKeySpec( + new byte[] { + 1, 2, 3, + }, + KEY_GENERATOR_ALGORITHM)); + + private QueuingNonAutomaticExecutorService mExecutorService; + private FullBackupDataProcessor mFullBackupDataProcessor; + @Mock private FullBackupDataProcessor.FullBackupCallbacks mFullBackupCallbacks; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mExecutorService = new QueuingNonAutomaticExecutorService(); + mFullBackupDataProcessor = + new EncryptedFullBackupDataProcessor( + ApplicationProvider.getApplicationContext(), + mExecutorService, + mock(CryptoBackupServer.class), + new SecureRandom(), + mTestSecondaryKey, + TEST_PACKAGE); + } + + @After + public void tearDown() { + ShadowEncryptedFullBackupTask.reset(); + } + + @Test + public void initiate_callTwice_throws() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(new byte[10])); + + assertThrows( + IllegalStateException.class, + () -> mFullBackupDataProcessor.initiate(new ByteArrayInputStream(new byte[10]))); + } + + @Test + public void pushData_writesDataToTask() throws Exception { + byte[] inputData = Bytes.concat(TEST_DATA_1, TEST_DATA_2); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(inputData)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + mFullBackupDataProcessor.pushData(TEST_DATA_2.length); + finishBackupTask(); + mFullBackupDataProcessor.finish(); + + byte[] result = ByteStreams.toByteArray(ShadowEncryptedFullBackupTask.sInputStream); + assertThat(result).isEqualTo(Bytes.concat(TEST_DATA_1, TEST_DATA_2)); + } + + @Test + public void pushData_noError_returnsOk() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + int result = mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTask(); + mFullBackupDataProcessor.finish(); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_OK); + } + + @Test + public void pushData_ioExceptionOnCopy_returnsError() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + + // Close the stream so there's an IO error when the processor tries to write to it. + ShadowEncryptedFullBackupTask.sInputStream.close(); + int result = mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + + finishBackupTask(); + mFullBackupDataProcessor.finish(); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_ERROR); + } + + @Test + public void pushData_exceptionDuringUpload_returnsError() throws Exception { + byte[] inputData = Bytes.concat(TEST_DATA_1, TEST_DATA_2); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(inputData)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new IOException("Test exception")); + int result = mFullBackupDataProcessor.pushData(TEST_DATA_2.length); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_ERROR); + } + + @Test + public void pushData_quotaExceptionDuringUpload_doesNotLogAndReturnsQuotaExceeded() + throws Exception { + mFullBackupDataProcessor.attachCallbacks(mFullBackupCallbacks); + byte[] inputData = Bytes.concat(TEST_DATA_1, TEST_DATA_2); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(inputData)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new SizeQuotaExceededException()); + int result = mFullBackupDataProcessor.pushData(TEST_DATA_2.length); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_QUOTA_EXCEEDED); + + verify(mFullBackupCallbacks, never()).onSuccess(); + verify(mFullBackupCallbacks, never()) + .onTransferFailed(); // FullBackupSession will handle this. + } + + @Test + public void pushData_unexpectedEncryptedBackup_logs() throws Exception { + byte[] inputData = Bytes.concat(TEST_DATA_1, TEST_DATA_2); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(inputData)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new GeneralSecurityException()); + int result = mFullBackupDataProcessor.pushData(TEST_DATA_2.length); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_ERROR); + } + + @Test + public void pushData_permanentExceptionDuringUpload_callsErrorCallback() throws Exception { + mFullBackupDataProcessor.attachCallbacks(mFullBackupCallbacks); + byte[] inputData = Bytes.concat(TEST_DATA_1, TEST_DATA_2); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(inputData)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new IOException()); + mFullBackupDataProcessor.pushData(TEST_DATA_2.length); + + verify(mFullBackupCallbacks, never()).onSuccess(); + verify(mFullBackupCallbacks).onTransferFailed(); + } + + @Test + public void pushData_beforeInitiate_throws() { + assertThrows( + IllegalStateException.class, + () -> mFullBackupDataProcessor.pushData(/*numBytes=*/ 10)); + } + + @Test + public void cancel_cancelsTask() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + mFullBackupDataProcessor.cancel(); + + assertThat(ShadowEncryptedFullBackupTask.sCancelled).isTrue(); + } + + @Test + public void cancel_beforeInitiate_throws() { + assertThrows(IllegalStateException.class, () -> mFullBackupDataProcessor.cancel()); + } + + @Test + public void finish_noException_returnsTransportOk() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTask(); + int result = mFullBackupDataProcessor.finish(); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_OK); + } + + @Test + public void finish_exceptionDuringUpload_returnsTransportError() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new IOException("Test exception")); + int result = mFullBackupDataProcessor.finish(); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_ERROR); + } + + @Test + public void finish_successfulBackup_callsSuccessCallback() throws Exception { + mFullBackupDataProcessor.attachCallbacks(mFullBackupCallbacks); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTask(); + mFullBackupDataProcessor.finish(); + + verify(mFullBackupCallbacks).onSuccess(); + verify(mFullBackupCallbacks, never()).onTransferFailed(); + } + + @Test + public void finish_backupFailedWithPermanentError_callsErrorCallback() throws Exception { + mFullBackupDataProcessor.attachCallbacks(mFullBackupCallbacks); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new IOException()); + mFullBackupDataProcessor.finish(); + + verify(mFullBackupCallbacks, never()).onSuccess(); + verify(mFullBackupCallbacks).onTransferFailed(); + } + + @Test + public void finish_backupFailedWithQuotaException_doesNotCallbackAndReturnsQuotaExceeded() + throws Exception { + mFullBackupDataProcessor.attachCallbacks(mFullBackupCallbacks); + + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + finishBackupTaskWithException(new SizeQuotaExceededException()); + int result = mFullBackupDataProcessor.finish(); + + assertThat(result).isEqualTo(BackupTransport.TRANSPORT_QUOTA_EXCEEDED); + verify(mFullBackupCallbacks, never()).onSuccess(); + verify(mFullBackupCallbacks, never()) + .onTransferFailed(); // FullBackupSession will handle this. + } + + @Test + public void finish_beforeInitiate_throws() { + assertThrows(IllegalStateException.class, () -> mFullBackupDataProcessor.finish()); + } + + @Test + public void handleCheckSizeRejectionZeroBytes_cancelsTask() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(new byte[10])); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.handleCheckSizeRejectionZeroBytes(); + + assertThat(ShadowEncryptedFullBackupTask.sCancelled).isTrue(); + } + + @Test + public void handleCheckSizeRejectionQuotaExceeded_cancelsTask() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + mFullBackupDataProcessor.handleCheckSizeRejectionQuotaExceeded(); + + assertThat(ShadowEncryptedFullBackupTask.sCancelled).isTrue(); + } + + @Test + public void handleSendBytesQuotaExceeded_cancelsTask() throws Exception { + mFullBackupDataProcessor.initiate(new ByteArrayInputStream(TEST_DATA_1)); + mFullBackupDataProcessor.start(); + mFullBackupDataProcessor.pushData(TEST_DATA_1.length); + mFullBackupDataProcessor.handleSendBytesQuotaExceeded(); + + assertThat(ShadowEncryptedFullBackupTask.sCancelled).isTrue(); + } + + private void finishBackupTask() { + mExecutorService.runNext(); + } + + private void finishBackupTaskWithException(Exception exception) { + ShadowEncryptedFullBackupTask.sOnCallException = exception; + finishBackupTask(); + } + + @Implements(EncryptedFullBackupTask.class) + public static class ShadowEncryptedFullBackupTask { + + private static InputStream sInputStream; + @Nullable private static Exception sOnCallException; + private static boolean sCancelled; + + public void __constructor__( + ProtoStore<ChunksMetadataProto.ChunkListing> chunkListingStore, + TertiaryKeyManager tertiaryKeyManager, + EncryptedBackupTask task, + InputStream inputStream, + String packageName, + SecureRandom secureRandom) { + sInputStream = inputStream; + } + + @Implementation + public Void call() throws Exception { + if (sOnCallException != null) { + throw sOnCallException; + } + + return null; + } + + @Implementation + public void cancel() { + sCancelled = true; + } + + public static void reset() { + sOnCallException = null; + sCancelled = false; + } + } +} diff --git a/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/QueuingNonAutomaticExecutorService.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/QueuingNonAutomaticExecutorService.java new file mode 100644 index 000000000000..9d2272e29945 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/testing/QueuingNonAutomaticExecutorService.java @@ -0,0 +1,83 @@ +/* + * 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.backup.encryption.testing; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.AbstractExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * ExecutorService which needs to be stepped through the jobs in its' queue. + * + * <p>This is a deliberately simple implementation because it's only used in testing. The queued + * jobs are run on the main thread to eliminate any race condition bugs. + */ +public class QueuingNonAutomaticExecutorService extends AbstractExecutorService { + + private List<Runnable> mWaitingJobs = new ArrayList<>(); + private int mWaitingJobCount = 0; + + @Override + public void shutdown() { + mWaitingJobCount = mWaitingJobs.size(); + mWaitingJobs = null; // This will force an error if jobs are submitted after shutdown + } + + @Override + public List<Runnable> shutdownNow() { + List<Runnable> queuedJobs = mWaitingJobs; + shutdown(); + return queuedJobs; + } + + @Override + public boolean isShutdown() { + return mWaitingJobs == null; + } + + @Override + public boolean isTerminated() { + return mWaitingJobs == null && mWaitingJobCount == 0; + } + + @Override + public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException { + long expiry = System.currentTimeMillis() + unit.toMillis(timeout); + for (Runnable job : mWaitingJobs) { + if (System.currentTimeMillis() > expiry) { + return false; + } + + job.run(); + } + return true; + } + + @Override + public void execute(Runnable command) { + mWaitingJobs.add(command); + } + + public void runNext() { + if (mWaitingJobs.isEmpty()) { + throw new IllegalStateException("Attempted to run jobs on an empty paused executor"); + } + + mWaitingJobs.remove(0).run(); + } +} diff --git a/packages/BackupRestoreConfirmation/res/values-fi/strings.xml b/packages/BackupRestoreConfirmation/res/values-fi/strings.xml index 4517410333c3..bc9dbde20292 100644 --- a/packages/BackupRestoreConfirmation/res/values-fi/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-fi/strings.xml @@ -27,7 +27,7 @@ <string name="current_password_text" msgid="8268189555578298067">"Kirjoita nykyinen varmuuskopioinnin salasana alla:"</string> <string name="device_encryption_restore_text" msgid="1570864916855208992">"Kirjoita laitteen salauksen salasana alle."</string> <string name="device_encryption_backup_text" msgid="5866590762672844664">"Kirjoita laitteen salauksen salasana alle. Salasanaa käytetään myös varmuuskopioarkiston salaamiseen."</string> - <string name="backup_enc_password_text" msgid="4981585714795233099">"Anna salasana kaikkien varmuuskopiotietojen salaamiseksi. Jos tämä jätetään tyhjäksi, nykyistä varmuuskopioinnin salasanaa käytetään:"</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Lisää salasana kaikkien varmuuskopiotietojen salaamiseksi. Jos tämä jätetään tyhjäksi, nykyistä varmuuskopioinnin salasanaa käytetään:"</string> <string name="backup_enc_password_optional" msgid="1350137345907579306">"Jos haluat salata kaikki varmuuskopiotiedot, kirjoita salasana alle:"</string> <string name="backup_enc_password_required" msgid="7889652203371654149">"Koska laite on salattu, myös varmuuskopiointi on salattava. Kirjoita salasana alle:"</string> <string name="restore_enc_password_text" msgid="6140898525580710823">"Jos palautustiedot on salattu, anna salasana alla:"</string> diff --git a/packages/CarSystemUI/res/layout/super_status_bar.xml b/packages/CarSystemUI/res/layout/super_status_bar.xml index e1bcc2e5f86c..08d48bfb1230 100644 --- a/packages/CarSystemUI/res/layout/super_status_bar.xml +++ b/packages/CarSystemUI/res/layout/super_status_bar.xml @@ -93,7 +93,7 @@ android:layout_height="match_parent" android:visibility="invisible"/> - <include layout="@layout/status_bar_expanded" + <ViewStub android:id="@+id/status_bar_expanded" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible"/> diff --git a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java b/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java index c205bb49228c..53a88a9a54e9 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/CarNotificationEntryManager.java @@ -20,6 +20,7 @@ import android.service.notification.StatusBarNotification; import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.collection.NotificationData; +import com.android.systemui.statusbar.notification.logging.NotifLog; import javax.inject.Inject; import javax.inject.Singleton; @@ -34,8 +35,8 @@ import javax.inject.Singleton; public class CarNotificationEntryManager extends NotificationEntryManager { @Inject - public CarNotificationEntryManager(NotificationData notificationData) { - super(notificationData); + public CarNotificationEntryManager(NotificationData notificationData, NotifLog notifLog) { + super(notificationData, notifLog); } @Override 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 d21f09ce160a..681d8f543575 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -108,6 +108,7 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager; import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider; import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; import com.android.systemui.statusbar.notification.VisualStabilityManager; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.phone.AutoHideController; @@ -120,6 +121,7 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.phone.StatusBarWindowController; +import com.android.systemui.statusbar.phone.StatusBarWindowViewController; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.DeviceProvisionedController; @@ -294,7 +296,9 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt AssistManager assistManager, NotificationListener notificationListener, ConfigurationController configurationController, - StatusBarWindowController statusBarWindowController) { + StatusBarWindowController statusBarWindowController, + StatusBarWindowViewController.Builder statusBarWindowViewControllerBuild, + NotifLog notifLog) { super( lightBarController, autoHideController, @@ -347,7 +351,9 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt assistManager, notificationListener, configurationController, - statusBarWindowController); + statusBarWindowController, + statusBarWindowViewControllerBuild, + notifLog); mNavigationBarController = navigationBarController; } @@ -778,7 +784,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt return; } mStatusBarWindowController.setStatusBarFocusable(false); - mStatusBarWindow.cancelExpandHelper(); + mStatusBarWindowViewController.cancelExpandHelper(); mStatusBarView.collapsePanel(true /* animate */, delayed, speedUpFactor); animateNotificationPanel(mClosingVelocity, true); 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 743ab4737bfb..886162f249a1 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java @@ -183,11 +183,9 @@ public class UserGridRecyclerView extends RecyclerView { filter.addAction(Intent.ACTION_USER_ADDED); filter.addAction(Intent.ACTION_USER_INFO_CHANGED); filter.addAction(Intent.ACTION_USER_SWITCHED); - filter.addAction(Intent.ACTION_USER_STOPPED); - filter.addAction(Intent.ACTION_USER_UNLOCKED); mContext.registerReceiverAsUser( mUserUpdateReceiver, - UserHandle.ALL, + UserHandle.ALL, // Necessary because CarSystemUi lives in User 0 filter, /* broadcastPermission= */ null, /* scheduler= */ null); diff --git a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/ActivityTile.java b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/ActivityTile.java new file mode 100644 index 000000000000..06a4a45b4853 --- /dev/null +++ b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/ActivityTile.java @@ -0,0 +1,81 @@ +/* + * 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.settingslib.drawer; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.ComponentInfo; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.os.Parcel; +import android.util.Log; + +import java.util.List; +import java.util.Objects; + +/** + * Description of a single dashboard tile which is generated from an activity. + */ +public class ActivityTile extends Tile { + private static final String TAG = "ActivityTile"; + + public ActivityTile(ComponentInfo info, String category) { + super(info, category); + setMetaData(info.metaData); + } + + ActivityTile(Parcel in) { + super(in); + } + + @Override + public int getId() { + return Objects.hash(getPackageName(), getComponentName()); + } + + @Override + public String getDescription() { + return getPackageName() + "/" + getComponentName(); + } + + @Override + protected CharSequence getComponentLabel(Context context) { + final PackageManager pm = context.getPackageManager(); + final ComponentInfo info = getComponentInfo(context); + return info == null + ? null + : info.loadLabel(pm); + } + + @Override + protected ComponentInfo getComponentInfo(Context context) { + if (mComponentInfo == null) { + final PackageManager pm = context.getApplicationContext().getPackageManager(); + final Intent intent = getIntent(); + final List<ResolveInfo> infoList = + pm.queryIntentActivities(intent, PackageManager.GET_META_DATA); + if (infoList != null && !infoList.isEmpty()) { + mComponentInfo = infoList.get(0).activityInfo; + setMetaData(mComponentInfo.metaData); + } else { + Log.e(TAG, "Cannot find package info for " + + intent.getComponent().flattenToString()); + } + } + return mComponentInfo; + } +} diff --git a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java index ca2d1ed122f9..722f734b8021 100644 --- a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java +++ b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java @@ -30,9 +30,8 @@ import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY; import android.content.Context; import android.content.Intent; -import android.content.pm.ActivityInfo; +import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Icon; @@ -47,13 +46,11 @@ import androidx.annotation.VisibleForTesting; import java.util.ArrayList; import java.util.Comparator; -import java.util.List; -import java.util.Objects; /** * Description of a single dashboard tile that the user can select. */ -public class Tile implements Parcelable { +public abstract class Tile implements Parcelable { private static final String TAG = "Tile"; @@ -64,28 +61,27 @@ public class Tile implements Parcelable { @VisibleForTesting long mLastUpdateTime; - private final String mActivityPackage; - private final String mActivityName; + private final String mComponentPackage; + private final String mComponentName; private final Intent mIntent; - private ActivityInfo mActivityInfo; + protected ComponentInfo mComponentInfo; private CharSequence mSummaryOverride; private Bundle mMetaData; private String mCategory; - public Tile(ActivityInfo activityInfo, String category) { - mActivityInfo = activityInfo; - mActivityPackage = mActivityInfo.packageName; - mActivityName = mActivityInfo.name; - mMetaData = activityInfo.metaData; + public Tile(ComponentInfo info, String category) { + mComponentInfo = info; + mComponentPackage = mComponentInfo.packageName; + mComponentName = mComponentInfo.name; mCategory = category; - mIntent = new Intent().setClassName(mActivityPackage, mActivityName); + mIntent = new Intent().setClassName(mComponentPackage, mComponentName); } Tile(Parcel in) { - mActivityPackage = in.readString(); - mActivityName = in.readString(); - mIntent = new Intent().setClassName(mActivityPackage, mActivityName); + mComponentPackage = in.readString(); + mComponentName = in.readString(); + mIntent = new Intent().setClassName(mComponentPackage, mComponentName); final int number = in.readInt(); for (int i = 0; i < number; i++) { userHandle.add(UserHandle.CREATOR.createFromParcel(in)); @@ -101,8 +97,8 @@ public class Tile implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeString(mActivityPackage); - dest.writeString(mActivityName); + dest.writeString(mComponentPackage); + dest.writeString(mComponentName); final int size = userHandle.size(); dest.writeInt(size); for (int i = 0; i < size; i++) { @@ -112,16 +108,22 @@ public class Tile implements Parcelable { dest.writeBundle(mMetaData); } - public int getId() { - return Objects.hash(mActivityPackage, mActivityName); - } + /** + * Unique ID of the tile + */ + public abstract int getId(); - public String getDescription() { - return mActivityPackage + "/" + mActivityName; - } + /** + * Human-readable description of the tile + */ + public abstract String getDescription(); public String getPackageName() { - return mActivityPackage; + return mComponentPackage; + } + + public String getComponentName() { + return mComponentName; } /** @@ -154,7 +156,7 @@ public class Tile implements Parcelable { } /** - * Check whether title has order. + * Check whether tile has order. */ public boolean hasOrder() { return mMetaData.containsKey(META_DATA_KEY_ORDER) @@ -170,14 +172,14 @@ public class Tile implements Parcelable { final PackageManager packageManager = context.getPackageManager(); if (mMetaData.containsKey(META_DATA_PREFERENCE_TITLE)) { if (mMetaData.containsKey(META_DATA_PREFERENCE_TITLE_URI)) { - // If has as uri to provide dynamic summary, skip loading here. UI will later load + // If has as uri to provide dynamic title, skip loading here. UI will later load // at tile binding time. return null; } if (mMetaData.get(META_DATA_PREFERENCE_TITLE) instanceof Integer) { try { final Resources res = - packageManager.getResourcesForApplication(mActivityPackage); + packageManager.getResourcesForApplication(mComponentPackage); title = res.getString(mMetaData.getInt(META_DATA_PREFERENCE_TITLE)); } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) { Log.w(TAG, "Couldn't find info", e); @@ -186,18 +188,15 @@ public class Tile implements Parcelable { title = mMetaData.getString(META_DATA_PREFERENCE_TITLE); } } - // Set the preference title to the activity's label if no - // meta-data is found + // Set the preference title by the component if no meta-data is found if (title == null) { - final ActivityInfo activityInfo = getActivityInfo(context); - if (activityInfo == null) { - return null; - } - title = activityInfo.loadLabel(packageManager); + title = getComponentLabel(context); } return title; } + protected abstract CharSequence getComponentLabel(Context context); + /** * Overrides the summary. This can happen when injected tile wants to provide dynamic summary. */ @@ -225,7 +224,7 @@ public class Tile implements Parcelable { if (mMetaData.get(META_DATA_PREFERENCE_SUMMARY) instanceof Integer) { try { final Resources res = - packageManager.getResourcesForApplication(mActivityPackage); + packageManager.getResourcesForApplication(mComponentPackage); summary = res.getString(mMetaData.getInt(META_DATA_PREFERENCE_SUMMARY)); } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) { Log.d(TAG, "Couldn't find info", e); @@ -281,24 +280,24 @@ public class Tile implements Parcelable { return null; } ensureMetadataNotStale(context); - final ActivityInfo activityInfo = getActivityInfo(context); - if (activityInfo == null) { - Log.w(TAG, "Cannot find ActivityInfo for " + getDescription()); + final ComponentInfo componentInfo = getComponentInfo(context); + if (componentInfo == null) { + Log.w(TAG, "Cannot find ComponentInfo for " + getDescription()); return null; } int iconResId = mMetaData.getInt(META_DATA_PREFERENCE_ICON); // Set the icon if (iconResId == 0) { - // Only fallback to activityinfo.icon if metadata does not contain ICON_URI. + // Only fallback to componentInfo.icon if metadata does not contain ICON_URI. // ICON_URI should be loaded in app UI when need the icon object. Handling IPC at this // level is too complex because we don't have a strong threading contract for this class if (!mMetaData.containsKey(META_DATA_PREFERENCE_ICON_URI)) { - iconResId = activityInfo.icon; + iconResId = componentInfo.icon; } } if (iconResId != 0) { - final Icon icon = Icon.createWithResource(activityInfo.packageName, iconResId); + final Icon icon = Icon.createWithResource(componentInfo.packageName, iconResId); if (isIconTintable(context)) { final TypedArray a = context.obtainStyledAttributes(new int[]{ android.R.attr.colorControlNormal}); @@ -331,41 +330,26 @@ public class Tile implements Parcelable { final PackageManager pm = context.getApplicationContext().getPackageManager(); try { - final long lastUpdateTime = pm.getPackageInfo(mActivityPackage, + final long lastUpdateTime = pm.getPackageInfo(mComponentPackage, PackageManager.GET_META_DATA).lastUpdateTime; if (lastUpdateTime == mLastUpdateTime) { // All good. Do nothing return; } // App has been updated since we load metadata last time. Reload metadata. - mActivityInfo = null; - getActivityInfo(context); + mComponentInfo = null; + getComponentInfo(context); mLastUpdateTime = lastUpdateTime; } catch (PackageManager.NameNotFoundException e) { Log.d(TAG, "Can't find package, probably uninstalled."); } } - private ActivityInfo getActivityInfo(Context context) { - if (mActivityInfo == null) { - final PackageManager pm = context.getApplicationContext().getPackageManager(); - final Intent intent = new Intent().setClassName(mActivityPackage, mActivityName); - final List<ResolveInfo> infoList = - pm.queryIntentActivities(intent, PackageManager.GET_META_DATA); - if (infoList != null && !infoList.isEmpty()) { - mActivityInfo = infoList.get(0).activityInfo; - mMetaData = mActivityInfo.metaData; - } else { - Log.e(TAG, "Cannot find package info for " - + intent.getComponent().flattenToString()); - } - } - return mActivityInfo; - } + protected abstract ComponentInfo getComponentInfo(Context context); public static final Creator<Tile> CREATOR = new Creator<Tile>() { public Tile createFromParcel(Parcel source) { - return new Tile(source); + return new ActivityTile(source); } public Tile[] newArray(int size) { diff --git a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/TileUtils.java index aced5ef9429a..c4df2e8860b4 100644 --- a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/TileUtils.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.IContentProvider; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; @@ -127,6 +128,7 @@ public class TileUtils { */ public static final String META_DATA_PREFERENCE_ICON_BACKGROUND_HINT = "com.android.settings.bg.hint"; + /** * Name of the meta-data item that should be set in the AndroidManifest.xml * to specify the icon background color as raw ARGB. @@ -220,10 +222,11 @@ public class TileUtils { public static List<DashboardCategory> getCategories(Context context, Map<Pair<String, String>, Tile> cache) { final long startTime = System.currentTimeMillis(); - boolean setup = Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) - != 0; - ArrayList<Tile> tiles = new ArrayList<>(); - UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + final boolean setup = + Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) != 0; + final ArrayList<Tile> tiles = new ArrayList<>(); + final UserManager userManager = (UserManager) context.getSystemService( + Context.USER_SERVICE); for (UserHandle user : userManager.getUserProfiles()) { // TODO: Needs much optimization, too many PM queries going on here. if (user.getIdentifier() == ActivityManager.getCurrentUser()) { @@ -240,7 +243,7 @@ public class TileUtils { } } - HashMap<String, DashboardCategory> categoryMap = new HashMap<>(); + final HashMap<String, DashboardCategory> categoryMap = new HashMap<>(); for (Tile tile : tiles) { final String categoryKey = tile.getCategory(); DashboardCategory category = categoryMap.get(categoryKey); @@ -255,7 +258,7 @@ public class TileUtils { } category.addTile(tile); } - ArrayList<DashboardCategory> categories = new ArrayList<>(categoryMap.values()); + final ArrayList<DashboardCategory> categories = new ArrayList<>(categoryMap.values()); for (DashboardCategory category : categories) { category.sortTiles(); } @@ -275,63 +278,90 @@ public class TileUtils { if (requireSettings) { intent.setPackage(SETTING_PKG); } + getActivityTiles(context, user, addedCache, defaultCategory, outTiles, intent); + } + + private static void getActivityTiles(Context context, + UserHandle user, Map<Pair<String, String>, Tile> addedCache, + String defaultCategory, List<Tile> outTiles, Intent intent) { final PackageManager pm = context.getPackageManager(); - List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent, + final List<ResolveInfo> results = pm.queryIntentActivitiesAsUser(intent, PackageManager.GET_META_DATA, user.getIdentifier()); for (ResolveInfo resolved : results) { if (!resolved.system) { // Do not allow any app to add to settings, only system ones. continue; } - ActivityInfo activityInfo = resolved.activityInfo; - Bundle metaData = activityInfo.metaData; - String categoryKey = defaultCategory; - - // Load category - if ((metaData == null || !metaData.containsKey(EXTRA_CATEGORY_KEY)) - && categoryKey == null) { - Log.w(LOG_TAG, "Found " + resolved.activityInfo.name + " for intent " - + intent + " missing metadata " - + (metaData == null ? "" : EXTRA_CATEGORY_KEY)); - continue; - } else { - categoryKey = metaData.getString(EXTRA_CATEGORY_KEY); - } + final ActivityInfo activityInfo = resolved.activityInfo; + final Bundle metaData = activityInfo.metaData; + getTile(user, addedCache, defaultCategory, outTiles, intent, metaData, activityInfo); + } + } - Pair<String, String> key = new Pair<>(activityInfo.packageName, activityInfo.name); - Tile tile = addedCache.get(key); - if (tile == null) { - tile = new Tile(activityInfo, categoryKey); - addedCache.put(key, tile); - } else { - tile.setMetaData(metaData); - } + private static void getTile(UserHandle user, Map<Pair<String, String>, Tile> addedCache, + String defaultCategory, List<Tile> outTiles, Intent intent, Bundle metaData, + ComponentInfo componentInfo) { + String categoryKey = defaultCategory; + // Load category + if ((metaData == null || !metaData.containsKey(EXTRA_CATEGORY_KEY)) + && categoryKey == null) { + Log.w(LOG_TAG, "Found " + componentInfo.name + " for intent " + + intent + " missing metadata " + + (metaData == null ? "" : EXTRA_CATEGORY_KEY)); + return; + } else { + categoryKey = metaData.getString(EXTRA_CATEGORY_KEY); + } - if (!tile.userHandle.contains(user)) { - tile.userHandle.add(user); - } - if (!outTiles.contains(tile)) { - outTiles.add(tile); - } + final Pair<String, String> key = new Pair<>(componentInfo.packageName, componentInfo.name); + Tile tile = addedCache.get(key); + if (tile == null) { + tile = new ActivityTile(componentInfo, categoryKey); + addedCache.put(key, tile); + } else { + tile.setMetaData(metaData); + } + + if (!tile.userHandle.contains(user)) { + tile.userHandle.add(user); + } + if (!outTiles.contains(tile)) { + outTiles.add(tile); } } /** + * Returns the complete uri from the meta data key of the tile. + + * @param tile Tile which contains meta data + * @param metaDataKey Key mapping to the uri in meta data + * @return Uri associated with the key + */ + public static Uri getCompleteUri(Tile tile, String metaDataKey) { + final String uriString = tile.getMetaData().getString(metaDataKey); + if (TextUtils.isEmpty(uriString)) { + return null; + } + + return Uri.parse(uriString); + } + + /** * Gets the icon package name and resource id from content provider. * * @param context context * @param packageName package name of the target activity - * @param uriString URI for the content provider + * @param uri URI for the content provider * @param providerMap Maps URI authorities to providers * @return package name and resource id of the icon specified */ public static Pair<String, Integer> getIconFromUri(Context context, String packageName, - String uriString, Map<String, IContentProvider> providerMap) { - Bundle bundle = getBundleFromUri(context, uriString, providerMap); + Uri uri, Map<String, IContentProvider> providerMap) { + final Bundle bundle = getBundleFromUri(context, uri, providerMap, null); if (bundle == null) { return null; } - String iconPackageName = bundle.getString(EXTRA_PREFERENCE_ICON_PACKAGE); + final String iconPackageName = bundle.getString(EXTRA_PREFERENCE_ICON_PACKAGE); if (TextUtils.isEmpty(iconPackageName)) { return null; } @@ -342,7 +372,7 @@ public class TileUtils { // Icon can either come from the target package or from the Settings app. if (iconPackageName.equals(packageName) || iconPackageName.equals(context.getPackageName())) { - return Pair.create(iconPackageName, bundle.getInt(META_DATA_PREFERENCE_ICON, 0)); + return Pair.create(iconPackageName, resId); } return null; } @@ -351,34 +381,33 @@ public class TileUtils { * Gets text associated with the input key from the content provider. * * @param context context - * @param uriString URI for the content provider + * @param uri URI for the content provider * @param providerMap Maps URI authorities to providers * @param key Key mapping to the text in bundle returned by the content provider * @return Text associated with the key, if returned by the content provider */ - public static String getTextFromUri(Context context, String uriString, + public static String getTextFromUri(Context context, Uri uri, Map<String, IContentProvider> providerMap, String key) { - Bundle bundle = getBundleFromUri(context, uriString, providerMap); + final Bundle bundle = getBundleFromUri(context, uri, providerMap, null); return (bundle != null) ? bundle.getString(key) : null; } - private static Bundle getBundleFromUri(Context context, String uriString, - Map<String, IContentProvider> providerMap) { - if (TextUtils.isEmpty(uriString)) { + private static Bundle getBundleFromUri(Context context, Uri uri, + Map<String, IContentProvider> providerMap, Bundle bundle) { + if (uri == null) { return null; } - Uri uri = Uri.parse(uriString); - String method = getMethodFromUri(uri); + final String method = getMethodFromUri(uri); if (TextUtils.isEmpty(method)) { return null; } - IContentProvider provider = getProviderFromUri(context, uri, providerMap); + final IContentProvider provider = getProviderFromUri(context, uri, providerMap); if (provider == null) { return null; } try { return provider.call(context.getPackageName(), uri.getAuthority(), - method, uriString, null); + method, uri.toString(), bundle); } catch (RemoteException e) { return null; } @@ -389,7 +418,7 @@ public class TileUtils { if (uri == null) { return null; } - String authority = uri.getAuthority(); + final String authority = uri.getAuthority(); if (TextUtils.isEmpty(authority)) { return null; } @@ -400,7 +429,7 @@ public class TileUtils { } /** Returns the first path segment of the uri if it exists as the method, otherwise null. */ - static String getMethodFromUri(Uri uri) { + private static String getMethodFromUri(Uri uri) { if (uri == null) { return null; } diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index 4cedc93f4680..245ca140b4f0 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet kan binnekort afgaan (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Toestel kan binnekort afgaan (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> oor tot vol gelaai"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tot vol gelaai"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> oor tot battery gelaai is"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tot battery gelaai is"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Onbekend"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Laai"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"laai tans"</string> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index 3b7abdbf1eec..bfd31968bd6c 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ጡባዊው በቅርቡ ሊዘጋ ይችላል (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"መሣሪያው በቅርቡ ሊዘጋ ይችላል (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"ሙሉ ኃይል እስኪሞላ ድረስ <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - ሙሉ ለሙሉ እስኪሞላ ድረስ <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> ኃይል እስከሚሞላ ድረስ ይቀራል"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ኃይል እስከሚሞላ ድረስ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ያልታወቀ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ኃይል በመሙላት ላይ"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ኃይል በመሙላት ላይ"</string> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index df1ec30a0718..8b67b0b1347e 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"قد يتم إغلاق الجهاز اللوحي بعد قليل (<xliff:g id="LEVEL">%1$s</xliff:g>)."</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"قد يتم إغلاق الجهاز بعد قليل (<xliff:g id="LEVEL">%1$s</xliff:g>)."</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"يتبقى <xliff:g id="TIME">%1$s</xliff:g> لشحن البطارية بالكامل"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى يكتمل الشحن"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> إلى أن يتم شحن الجهاز بالكامل"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> إلى أن يتم شحن الجهاز بالكامل"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"غير معروف"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"جارٍ الشحن"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"جارٍ الشحن"</string> diff --git a/packages/SettingsLib/res/values-as/strings.xml b/packages/SettingsLib/res/values-as/strings.xml index 9c25b66cb6aa..f3ca337b261d 100644 --- a/packages/SettingsLib/res/values-as/strings.xml +++ b/packages/SettingsLib/res/values-as/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"টেবলেটটো সোনকালেই বন্ধ হ\'ব পাৰে (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ডিভাইচটো সোনকালেই বন্ধ হ\'ব পাৰে (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"সম্পূৰ্ণকৈ চ্চাৰ্জ হ\'বলৈ <xliff:g id="TIME">%1$s</xliff:g> বাকী"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> সম্পূৰ্ণৰূপে চ্চাৰ্জ হোৱা পৰ্যন্ত"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"চাৰ্জ হ’বলৈ <xliff:g id="TIME">%1$s</xliff:g> বাকী আছে"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> চাৰ্জ হ\'বলৈ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"অজ্ঞাত"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"চাৰ্জ কৰি থকা হৈছে"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"চ্চাৰ্জ হৈ আছে"</string> diff --git a/packages/SettingsLib/res/values-az/strings.xml b/packages/SettingsLib/res/values-az/strings.xml index 3a6d301b6f8d..d35dfe8255d2 100644 --- a/packages/SettingsLib/res/values-az/strings.xml +++ b/packages/SettingsLib/res/values-az/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Planşet tezliklə sönə bilər (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Cihaz tezliklə sönə bilər (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Tam enerji yığmağına <xliff:g id="TIME">%1$s</xliff:g> qalıb"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tam enerji yığana kimi"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Enerjinin dolmasına <xliff:g id="TIME">%1$s</xliff:g> qalıb"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - Enerjinin dolmasına <xliff:g id="TIME">%2$s</xliff:g> qalıb"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Naməlum"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Enerji doldurma"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"enerji yığır"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index a8808fa42cca..448de4b8b7dd 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet će se uskoro isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Uređaj će se uskoro isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> do potpunog punjenja"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do potpunog punjenja"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Napuniće se za <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – napuniće se za <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Puni se"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"puni se"</string> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 05d9a5d2f5db..d68c0f3e02ab 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Узровень зараду батарэі: <xliff:g id="LEVEL">%1$s</xliff:g>. Планшэт хутка спыніць працу."</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Узровень зараду батарэі: <xliff:g id="LEVEL">%1$s</xliff:g>. Прылада хутка спыніць працу."</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Да поўнай зарадкі засталося <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Засталося <xliff:g id="TIME">%1$s</xliff:g> да поўнай зарадкі"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Невядома"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарадка"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ідзе зарадка"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 7fa5b0639073..cb99f64ba498 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Възможно е таблетът да се изключи скоро (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Възможно е устройството да се изключи скоро (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Оставащо време до пълно зареждане: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Оставащо време до пълно зареждане: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Неизвестно"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарежда се"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"зарежда се"</string> diff --git a/packages/SettingsLib/res/values-bn/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml index f1fc9f9e3d4e..f2f4f5249b74 100644 --- a/packages/SettingsLib/res/values-bn/strings.xml +++ b/packages/SettingsLib/res/values-bn/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ট্যাবলেটটি শীঘ্রই বন্ধ হয়ে যেতে পারে (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ডিভাইসটি শীঘ্রই বন্ধ হয়ে যেতে পারে (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"সম্পূর্ণ চার্জ হতে <xliff:g id="TIME">%1$s</xliff:g> বাকি"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - সম্পূর্ণ চার্জ হতে <xliff:g id="TIME">%2$s</xliff:g> লাগবে"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"সম্পূর্ণ চার্জ হতে <xliff:g id="TIME">%1$s</xliff:g> বাকি আছে"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>-এ সম্পূর্ণ চার্জ হয়ে যাবে"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"অজানা"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"চার্জ হচ্ছে"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"চার্জ হচ্ছে"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 02b2a8bd8480..45b8dd99ec70 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet će se uskoro isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Uređaj će se uskoro isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Još <xliff:g id="TIME">%1$s</xliff:g> do potpune napunjenosti"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> do potpune napunjenosti"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Napunit će se za <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – napunit će se za <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"punjenje"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 264954465981..bd1ed6ae941f 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"És possible que la tauleta s\'apagui aviat (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"És possible que el dispositiu s\'apagui aviat (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> per completar la càrrega"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> per completar la càrrega"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconegut"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"S\'està carregant"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"s\'està carregant"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index 525639985c5b..042e12a14967 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet se brzy vypne (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Zařízení se brzy vypne (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Plně se nabije za <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – plně se nabije za <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Do nabití zbývá: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do nabití"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznámé"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjí se"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"nabíjení"</string> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index 1884f645fcf1..4723293f302d 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Denne tablet lukker muligvis snart ned (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Enheden lukker muligvis snart ned (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"fuldt opladet om <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – fuldt opladet om <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Opladet om <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – opladet om <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukendt"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Oplader"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"oplader"</string> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index d8da638fcd2b..4f5a965f9ce0 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet wird eventuell bald ausgeschaltet (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Gerät wird eventuell bald ausgeschaltet (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> bis zur vollständigen Aufladung"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> bis vollständig geladen"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Noch <xliff:g id="TIME">%1$s</xliff:g> bis zur Aufladung"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> bis zur Aufladung"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unbekannt"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Wird aufgeladen"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"wird aufgeladen..."</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index b1b1be642eba..753dea8855dd 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Το tablet μπορεί να απενεργοποιηθεί σύντομα (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Η συσκευή μπορεί να απενεργοποιηθεί σύντομα (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Απομένουν <xliff:g id="TIME">%1$s</xliff:g> έως την πλήρη φόρτιση"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Απομένουν <xliff:g id="TIME">%1$s</xliff:g> για ολοκλήρωση της φόρτισης"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> για την ολοκλήρωση της φόρτισης"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Άγνωστο"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Φόρτιση"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"φόρτιση"</string> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index 63463b1b31f1..dd3d27803db3 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Device may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> left until fully charged"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> until fully charged"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> left until charged"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until charged"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string> diff --git a/packages/SettingsLib/res/values-en-rCA/strings.xml b/packages/SettingsLib/res/values-en-rCA/strings.xml index 63463b1b31f1..dd3d27803db3 100644 --- a/packages/SettingsLib/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/res/values-en-rCA/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Device may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> left until fully charged"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> until fully charged"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> left until charged"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until charged"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index 63463b1b31f1..dd3d27803db3 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Device may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> left until fully charged"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> until fully charged"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> left until charged"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until charged"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index 63463b1b31f1..dd3d27803db3 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Device may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> left until fully charged"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> until fully charged"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> left until charged"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until charged"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string> diff --git a/packages/SettingsLib/res/values-en-rXC/strings.xml b/packages/SettingsLib/res/values-en-rXC/strings.xml index e5a0bda2fee4..d9f61d8188f1 100644 --- a/packages/SettingsLib/res/values-en-rXC/strings.xml +++ b/packages/SettingsLib/res/values-en-rXC/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Device may shutdown soon (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> left until fully charged"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until fully charged"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> left until charged"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until charged"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index 7874aeb02996..30cb0a1f113f 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Es posible que pronto se apague la tablet (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Es posible que pronto se apague el dispositivo (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> para completar la carga"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> (<xliff:g id="TIME">%2$s</xliff:g> para completar la carga)"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> para completar la carga"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar la carga"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"cargando"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index 8baf7a21c1ae..32905dfb9213 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Es posible que el tablet se apague pronto (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Es posible que el dispositivo se apague pronto (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Tiempo restante hasta carga completa: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar la carga"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> hasta que termine de cargarse"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> (<xliff:g id="TIME">%2$s</xliff:g> hasta que termine de cargarse)"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"cargando"</string> diff --git a/packages/SettingsLib/res/values-et/strings.xml b/packages/SettingsLib/res/values-et/strings.xml index 090b28da22f0..79b8a848f870 100644 --- a/packages/SettingsLib/res/values-et/strings.xml +++ b/packages/SettingsLib/res/values-et/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tahvelarvuti võib peagi välja lülituda (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Seade võib peagi välja lülituda (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> täislaadimiseni"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> täislaadimiseni"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Täislaadimiseni on jäänud <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> täislaadimiseni"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Tundmatu"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Laadimine"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"laadimine"</string> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index fd3936d39ed3..bab4cde86d91 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Baliteke tableta laster itzaltzea (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Baliteke gailua laster itzaltzea (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> falta dira guztiz kargatu arte"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> guztiz kargatu arte"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Ezezaguna"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Kargatzen"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"kargatzen"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 352c27683834..9d84090f682b 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ممکن است رایانه لوحی بهزودی خاموش شود (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ممکن است دستگاه بهزودی خاموش شود (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> تا شارژ شدن کامل باقی مانده است"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> مانده تا شارژ کامل"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> تا شارژ کامل"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ناشناس"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"در حال شارژ شدن"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"درحال شارژ شدن"</string> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index 0d522c4015a4..929e101bf610 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tabletti voi pian sammua (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Laite voi pian sammua (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> kunnes täynnä"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> täyteen lataukseen"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> jäljellä täyteen lataukseen"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> täyteen lataukseen"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Tuntematon"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Ladataan"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ladataan"</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index 1dde8632fbc9..d3bfc96ea473 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Il se peut que la tablette s\'éteigne bientôt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Il se peut que l\'appareil s\'éteigne bientôt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> jusqu\'à la charge complète"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> : <xliff:g id="TIME">%2$s</xliff:g> jusqu\'à la charge complète"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> jusqu\'à la charge complète"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> : <xliff:g id="TIME">%2$s</xliff:g> jusqu\'à la charge complète"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Inconnu"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Charge en cours…"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"en cours de charge"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index cf4ee1302872..b5706cea932d 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Il est possible que la tablette s\'éteigne bientôt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Il est possible que l\'appareil s\'éteigne bientôt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> avant charge complète"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> jusqu\'à la charge complète"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> jusqu\'à ce que la batterie soit chargée"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> jusqu\'à la charge complète"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Inconnu"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"en charge…"</string> diff --git a/packages/SettingsLib/res/values-gl/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml index b998a74700b5..2aa1604cca21 100644 --- a/packages/SettingsLib/res/values-gl/strings.xml +++ b/packages/SettingsLib/res/values-gl/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"É posible que a tableta se apague en breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"É posible que o dispositivo se apague en breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Tempo que queda para completar a carga: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> para completar a carga"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> para completar a carga"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Descoñecido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"cargando"</string> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index cf0e2016736b..c2cc4c5d9410 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ટૅબ્લેટ થોડીક જ વારમાં બંધ થઈ શકે છે (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ઉપકરણ થોડીક જ વારમાં બંધ થઈ શકે છે (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"સંપૂર્ણપણે ચાર્જ થવામાં <xliff:g id="TIME">%1$s</xliff:g> બાકી"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - સંપૂર્ણપણે ચાર્જ થવા માટે <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ચાર્જ થવામાં <xliff:g id="TIME">%1$s</xliff:g> બાકી છે"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - ચાર્જ થવા માટે <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"અજાણ્યું"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ચાર્જ થઈ રહ્યું છે"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ચાર્જ થઈ રહ્યું છે"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 3a20d04d7ab2..61e1997d0dd0 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"टैबलेट जल्दी ही बंद हो सकता है (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"डिवाइस जल्दी ही बंद हो सकता है (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"पूरी तरह से चार्ज होने में <xliff:g id="TIME">%1$s</xliff:g> शेष"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> पूरी तरह से चार्ज होने तक"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"चार्ज पूरा होने में <xliff:g id="TIME">%1$s</xliff:g> बचा है"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> में पूरा चार्ज हो जाएगा"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हो रही है"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"चार्ज किया जा रहा है"</string> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index 6d957dcf60f8..0fc16f847822 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet bi se uskoro mogao isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Uređaj bi se uskoro mogao isključiti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Još <xliff:g id="TIME">%1$s</xliff:g> do potpune napunjenosti"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do potpune napunjenosti"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Napunit će se za <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – napunit će se za <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"punjenje"</string> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index 39b5da26f55f..45cd3796fb3e 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Előfordulhat, hogy a táblagép hamarosan leáll (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Előfordulhat, hogy az eszköz hamarosan leáll (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> a teljes töltöttségig"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> a teljes feltöltésig"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> van hátra a feltöltésig"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> a feltöltésig"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Ismeretlen"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Töltés"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"töltés"</string> diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml index 16d7ea4352cf..2145adb1036e 100644 --- a/packages/SettingsLib/res/values-hy/strings.xml +++ b/packages/SettingsLib/res/values-hy/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Պլանշետը շուտով կանջատվի (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Սարքը շուտով կանջատվի (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Մինչև լրիվ լիցքավորումը մնացել է <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> մինչև լրիվ լիցքավորումը"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> մինչև լիցքավորումը"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> մինչև լիցքավորումը"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Անհայտ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Լիցքավորում"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"լիցքավորում"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 02c4c8c6f44d..15b6da5fb2c3 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet mungkin segera dimatikan (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Perangkat mungkin segera dimatikan (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> lagi hingga terisi penuh"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> lagi terisi penuh"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Sisa <xliff:g id="TIME">%1$s</xliff:g> hingga terisi penuh"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> lagi terisi penuh"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengisi daya"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"mengisi daya baterai"</string> diff --git a/packages/SettingsLib/res/values-is/strings.xml b/packages/SettingsLib/res/values-is/strings.xml index 11d69571aeeb..eede11756e9e 100644 --- a/packages/SettingsLib/res/values-is/strings.xml +++ b/packages/SettingsLib/res/values-is/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Spjaldtölvan gæti slökkt á sér fljótlega (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Tækið gæti slökkt á sér fljótlega (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> þar til hleðslu er lokið"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> þar til fullri hleðslu er náð"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> að fullri hleðslu"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> að fullri hleðslu"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Óþekkt"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Í hleðslu"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"í hleðslu"</string> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index a43e8d6aa4e4..2c64ec2e6705 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Il tablet potrebbe spegnersi a breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Il dispositivo potrebbe spegnersi a breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Tempo rimanente alla carica completa: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Tempo rimanente alla carica completa: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Sconosciuta"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"In carica"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"in carica"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index a3e049c8b144..30d6a4aa1d5e 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ייתכן שהטאבלט ייכבה בקרוב (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ייתכן שהמכשיר ייכבה בקרוב (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> עד לטעינה מלאה"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> עד לטעינה מלאה"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"נשארו <xliff:g id="TIME">%1$s</xliff:g> עד הטעינה"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> עד הטעינה"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"לא ידוע"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"בטעינה"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"בטעינה"</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index 50543d8bfbee..6cb5514cc582 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"タブレットの電源がもうすぐ切れます（<xliff:g id="LEVEL">%1$s</xliff:g>）"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"デバイスの電源がもうすぐ切れます（<xliff:g id="LEVEL">%1$s</xliff:g>）"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"フル充電まであと <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - フル充電まで <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"充電完了まであと <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - 充電完了まで <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"不明"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"充電しています"</string> diff --git a/packages/SettingsLib/res/values-ka/strings.xml b/packages/SettingsLib/res/values-ka/strings.xml index 8b9b6b653c6c..4c78a3864562 100644 --- a/packages/SettingsLib/res/values-ka/strings.xml +++ b/packages/SettingsLib/res/values-ka/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ტაბლეტი შეიძლება მალე გაითიშოს (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"მოწყობილობა შეიძლება მალე გაითიშოს (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"სრულ დატენვამდე დარჩენილია <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> — სრულ დატენვამდე დარჩა <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"დატენვამდე დარჩა <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> დატენვამდე"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"უცნობი"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"იტენება"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"იტენება"</string> diff --git a/packages/SettingsLib/res/values-kk/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml index 246e3eb3c532..ce086577ec00 100644 --- a/packages/SettingsLib/res/values-kk/strings.xml +++ b/packages/SettingsLib/res/values-kk/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Планшет көп ұзамай өшуі мүмкін (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Құрылғы көп ұзамай өшуі мүмкін (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Толық зарядталуына <xliff:g id="TIME">%1$s</xliff:g> қалды"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – толық зарядталғанға дейін <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Зарядталғанға дейін <xliff:g id="TIME">%1$s</xliff:g> қалды"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – зарядталғанға дейін <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Белгісіз"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядталуда"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"зарядталуда"</string> diff --git a/packages/SettingsLib/res/values-km/strings.xml b/packages/SettingsLib/res/values-km/strings.xml index 36cf2d473faa..43c92824015b 100644 --- a/packages/SettingsLib/res/values-km/strings.xml +++ b/packages/SettingsLib/res/values-km/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ថេប្លេតអាចនឹងបិទក្នុងពេលបន្តិចទៀត (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ឧបករណ៍អាចនឹងបិទក្នុងពេលបន្តិចទៀត (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> ទៀតទើបសាកថ្មពេញ"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ទៀតទើបសាកថ្មពេញ"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> ទៀតទើបត្រូវសាក"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ទៀតទើបត្រូវសាក"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"មិនស្គាល់"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"កំពុងបញ្ចូលថ្ម"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"កំពុងសាកថ្ម"</string> diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml index 97eed0fb40a4..3fe9855a49e5 100644 --- a/packages/SettingsLib/res/values-kn/strings.xml +++ b/packages/SettingsLib/res/values-kn/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ಟ್ಯಾಬ್ಲೆಟ್ ಶೀಘ್ರದಲ್ಲೇ ಶಟ್ ಡೌನ್ ಆಗಬಹುದು (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ಸಾಧನವು ಶೀಘ್ರದಲ್ಲೇ ಶಟ್ ಡೌನ್ ಆಗಬಹುದು (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆಗಲು <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆಗಲು <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ಚಾರ್ಜ್ ಆಗಲು <xliff:g id="TIME">%1$s</xliff:g> ಸಮಯ ಬಾಕಿ ಇದೆ"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - ಚಾರ್ಜ್ ಆಗಲು <xliff:g id="TIME">%2$s</xliff:g> ಸಮಯ ಬೇಕು"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ಅಪರಿಚಿತ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 8f8bbc1a4721..ac44c0db62a3 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"태블릿이 곧 종료될 수 있음(<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"기기가 곧 종료될 수 있음(<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"충전 완료까지 <xliff:g id="TIME">%1$s</xliff:g> 남음"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - 충전 완료까지 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"충전 완료까지 <xliff:g id="TIME">%1$s</xliff:g> 남음"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - 충전 완료까지 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"알 수 없음"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"충전 중"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"충전 중"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index 435ce5357b60..72b21591c609 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Планшет бир аздан кийин өчүп калышы мүмкүн (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Түзмөк бир аздан кийин өчүп калышы мүмкүн (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Батарея толгонго чейин калган убакыт: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> кийин толук кубатталат"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> кийин кубатталат"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> кийин кубатталат"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Белгисиз"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Кубатталууда"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"кубатталууда"</string> diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml index 1cee8fbe5a04..28e811153ea1 100644 --- a/packages/SettingsLib/res/values-lo/strings.xml +++ b/packages/SettingsLib/res/values-lo/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ແທັບເລັດອາດຈະປິດໃນໄວໆນີ້ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ອຸປະກອນອາດຈະປິດໃນໄວໆນີ້ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> ຈົນກວ່າຈະສາກເຕັມ"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ຈົນກວ່າຈະສາກເຕັມ"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> ຈົນກວ່າຈະສາກເຕັມ"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ຈົນກວ່າຈະສາກເຕັມ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ບໍ່ຮູ້ຈັກ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ກຳລັງສາກໄຟ"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ກຳລັງສາກໄຟ"</string> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index c10bd002eae7..93fcaa798998 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Planšetinis kompiuteris netrukus gali būti išjungtas (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Įrenginys netrukus gali būti išjungtas (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Iki visiškos įkrovos liko <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Iki visiškos įkrovos liko <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – iki visiškos įkrovos liko <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nežinomas"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Kraunasi..."</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"įkraunama"</string> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index 96aebc59c556..c12d097232f4 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Iespējams, planšetdators drīz izslēgsies (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Iespējams, ierīce drīz izslēgsies (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Atlikušais laiks līdz pilnai uzlādei: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> līdz pilnīgai uzlādei"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Vēl <xliff:g id="TIME">%1$s</xliff:g> līdz pilnai uzlādei"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai uzlādei"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nezināms"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Uzlāde"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"notiek uzlāde"</string> diff --git a/packages/SettingsLib/res/values-mk/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml index d93304fc3bf6..9a76a0a8e04c 100644 --- a/packages/SettingsLib/res/values-mk/strings.xml +++ b/packages/SettingsLib/res/values-mk/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Таблетот може да се исклучи наскоро (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Уредот може да се исклучи наскоро (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Преостануваат <xliff:g id="TIME">%1$s</xliff:g> дури се наполни целосно"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> дури се наполни целосно"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Уште <xliff:g id="TIME">%1$s</xliff:g> до целосно полнење"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> до целосно полнење"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Непознато"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Се полни"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"се полни"</string> diff --git a/packages/SettingsLib/res/values-ml/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml index 7016b7f1a6e8..bb762951d437 100644 --- a/packages/SettingsLib/res/values-ml/strings.xml +++ b/packages/SettingsLib/res/values-ml/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ടാബ്ലെറ്റ് ഉടൻ ഷട്ട് ഡൗൺ ആയേക്കാം (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ഉപകരണം ഉടൻ ഷട്ട്ഡൗൺ ആയേക്കാം (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"മുഴുവൻ ചാർജാകാൻ <xliff:g id="TIME">%1$s</xliff:g> ശേഷിക്കുന്നു"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - ഫുൾ ചാർജാകാൻ <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"പൂർണ്ണമായി ചാർജാവാൻ <xliff:g id="TIME">%1$s</xliff:g> ശേഷിക്കുന്നു"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - പൂർണ്ണമായി ചാർജാവാൻ <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"അജ്ഞാതം"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ചാർജ് ചെയ്യുന്നു"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ചാർജ് ചെയ്യുന്നു"</string> diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml index 80e78a364db1..65a8ca6c1253 100644 --- a/packages/SettingsLib/res/values-mn/strings.xml +++ b/packages/SettingsLib/res/values-mn/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Таблет удахгүй унтарна (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Төхөөрөмж удахгүй унтарна (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Бүрэн цэнэглэх хүртэл <xliff:g id="TIME">%1$s</xliff:g> үлдсэн"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"бүрэн цэнэглэх хүртэл <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Цэнэглэх хүртэл үлдсэн <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - цэнэглэх хүртэл <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Тодорхойгүй"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Цэнэглэж байна"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"цэнэглэж байна"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index 54723a80b51c..3d75ad6d158f 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"टॅबलेट लवकरच बंद होऊ शकतो (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"डिव्हाइस लवकरच बंद पडू शकते (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"पूर्णपणे चार्ज होण्यास <xliff:g id="TIME">%1$s</xliff:g> शिल्लक"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - पूर्णपणे चार्ज होण्यात <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> पर्यंत पूर्ण चार्ज होईल"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> पर्यंत पूर्ण चार्ज होईल"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज होत आहे"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"चार्ज होत आहे"</string> diff --git a/packages/SettingsLib/res/values-ms/strings.xml b/packages/SettingsLib/res/values-ms/strings.xml index 3841a3b3f6b5..0b2a4b0879c4 100644 --- a/packages/SettingsLib/res/values-ms/strings.xml +++ b/packages/SettingsLib/res/values-ms/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet mungkin ditutup tidak lama lagi (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Peranti mungkin ditutup tidak lama lagi (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> lagi sehingga dicas penuh"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sehingga dicas penuh"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> lagi sehingga dicas penuh"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sehingga dicas"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengecas"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"mengecas"</string> diff --git a/packages/SettingsLib/res/values-my/strings.xml b/packages/SettingsLib/res/values-my/strings.xml index 38f128a8cb46..6fde69a38767 100644 --- a/packages/SettingsLib/res/values-my/strings.xml +++ b/packages/SettingsLib/res/values-my/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"မကြာမီ တက်ဘလက် ပိတ်သွားနိုင်သည် (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"မကြာမီ စက်ပိတ်သွားနိုင်သည် (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"အားပြည့်ရန် <xliff:g id="TIME">%1$s</xliff:g> လိုပါသည်"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> − အားပြည့်ရန် <xliff:g id="TIME">%2$s</xliff:g> ကျန်သည်"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"အားပြည့်ရန် <xliff:g id="TIME">%1$s</xliff:g> ကျန်သည်"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - အားပြည့်ရန် <xliff:g id="TIME">%2$s</xliff:g> ကျန်သည်"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"မသိ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"အားသွင်းနေပါသည်"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"အားသွင်းနေပါသည်"</string> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 144d4c249dac..66ad20e18839 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Nettbrettet slås kanskje av snart (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Enheten slås kanskje av snart (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> til det er fulladet"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til det er fulladet"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> til batteriet er fulladet"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til batteriet er fulladet"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukjent"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Lader"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"lader"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index b2e1cd62b963..860e9bf6b1b7 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ट्याब्लेट चाँडै बन्द हुन सक्छ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"यन्त्र चाँडै बन्द हुन सक्छ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"पूर्णरूपमा चार्ज हुन <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - पूर्णरूपमा चार्ज हुन <xliff:g id="TIME">%2$s</xliff:g> बाँकी"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"पूर्ण चार्ज हुन <xliff:g id="TIME">%1$s</xliff:g> बाँकी"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"पूर्ण चार्ज हुन <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> लाग्छ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हुँदै"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"चार्ज हुँदै"</string> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index c50b43a04724..2fff3283d5fd 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet wordt binnenkort mogelijk uitgeschakeld (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Apparaat wordt binnenkort mogelijk uitgeschakeld (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Nog <xliff:g id="TIME">%1$s</xliff:g> tot volledig opgeladen"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tot volledig opgeladen"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Nog <xliff:g id="TIME">%1$s</xliff:g> tot opgeladen"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tot opgeladen"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Onbekend"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Opladen"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"opladen"</string> diff --git a/packages/SettingsLib/res/values-or/strings.xml b/packages/SettingsLib/res/values-or/strings.xml index f9e0d39f60c1..ff2a5349f40f 100644 --- a/packages/SettingsLib/res/values-or/strings.xml +++ b/packages/SettingsLib/res/values-or/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ଖୁବ୍ ଶୀଘ୍ର ଟାବଲେଟ୍ଟି ବନ୍ଦ ହୋଇଯାଇପାରେ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ଖୁବ୍ ଶୀଘ୍ର ଡିଭାଇସ୍ଟି ବନ୍ଦ ହୋଇଯାଇପାରେ(<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବାପାଇଁ <xliff:g id="TIME">%1$s</xliff:g> ବାକି ଅଛି"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପର୍ଯ୍ୟନ୍ତ"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ଚାର୍ଜ ହେବା ପାଇଁ <xliff:g id="TIME">%1$s</xliff:g> ବାକି ଅଛି"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ଚାର୍ଜ ହେବା ପର୍ଯ୍ୟନ୍ତ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ଅଜ୍ଞାତ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ଚାର୍ଜ ହେଉଛି"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ଚାର୍ଜ ହେଉଛି"</string> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index b5acd8e15acd..0cf95753ae18 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ਟੈਬਲੈੱਟ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"ਡੀਵਾਈਸ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"ਪੂਰੀ ਤਰ੍ਹਾਂ ਚਾਰਜ ਹੋਣ ਲਈ <xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - ਪੂਰੀ ਤਰ੍ਹਾਂ ਚਾਰਜ ਹੋਣ ਵਿੱਚ <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ਚਾਰਜ ਹੋਣ ਵਿੱਚ <xliff:g id="TIME">%1$s</xliff:g> ਬਾਕੀ"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ਤੱਕ ਚਾਰਜ ਹੋ ਜਾਵੇਗੀ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ਅਗਿਆਤ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index 60a4c53c6a62..caed8c349af7 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet może się wkrótce wyłączyć (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Urządzenie może się wkrótce wyłączyć (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> do pełnego naładowania"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Do naładowania <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – do naładowania <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Nieznane"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Ładowanie"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ładowanie"</string> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index dd0a75bbbc62..04a24f1a9175 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"O tablet pode ser desligado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"O dispositivo pode ser desligado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> restante(s) até a carga completa"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até a carga completa"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Tempo restante até a carga completa: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> até a carga completa"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"carregando"</string> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index c076d328155b..a206d1ad787c 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"O tablet poderá ser encerrado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)."</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"O dispositivo poderá ser encerrado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)."</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Falta(m) <xliff:g id="TIME">%1$s</xliff:g> para concluir o carregamento"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> até ficar totalmente carregada"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Falta(m) <xliff:g id="TIME">%1$s</xliff:g> até ficar carregada"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> até ficar carregada"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"A carregar"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"a carregar…"</string> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index dd0a75bbbc62..04a24f1a9175 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"O tablet pode ser desligado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"O dispositivo pode ser desligado em breve (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> restante(s) até a carga completa"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até a carga completa"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Tempo restante até a carga completa: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> até a carga completa"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"carregando"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index fb020e219cd1..76a56e51ef88 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tableta se poate închide în curând (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Dispozitivul se poate închide în curând (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Timp rămas până la încărcarea completă: <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> până la încărcarea completă"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Au mai rămas <xliff:g id="TIME">%1$s</xliff:g> până la încărcare"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> până la încărcare"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Necunoscut"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Se încarcă"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"se încarcă"</string> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index 806be6e5cdd6..3e3768a2d7b3 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Уровень заряда батареи: <xliff:g id="LEVEL">%1$s</xliff:g>. Планшет скоро завершит работу."</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Уровень заряда батареи: <xliff:g id="LEVEL">%1$s</xliff:g>. Устройство скоро завершит работу."</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Ещё <xliff:g id="TIME">%1$s</xliff:g> до полной зарядки"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> до полной зарядки"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Неизвестно"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Идет зарядка"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"заряжается"</string> diff --git a/packages/SettingsLib/res/values-si/strings.xml b/packages/SettingsLib/res/values-si/strings.xml index 925d5b48ac21..186c23adaec1 100644 --- a/packages/SettingsLib/res/values-si/strings.xml +++ b/packages/SettingsLib/res/values-si/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ටැබ්ලටය ඉක්මනින් වැසිය හැකිය (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"උපාංගය ඉක්මනින් වැසිය හැකිය (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"පූර්ණව ආරෝපණය වන තෙක් <xliff:g id="TIME">%1$s</xliff:g> ඉතිරියි"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> සම්පූර්ණයෙන් ආරෝපණය වන තෙක්"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ආරෝපණය වන තෙක් <xliff:g id="TIME">%1$s</xliff:g> ඇත"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - ආරෝපණය වන තෙක් <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"නොදනී"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ආරෝපණය වෙමින්"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ආරෝපණය වේ"</string> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index d77e1eb2a713..9559975cb156 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet sa môže čoskoro vypnúť (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Zariadenie sa môže čoskoro vypnúť (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> do úplného nabitia"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g> do úplného nabitia"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Zostávajúci čas do úplného nabitia: <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabitia"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznáme"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíja sa"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"nabíja sa"</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 263b4d0e2eef..62e4ad1f91f4 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablični računalnik se bo morda kmalu zaustavil (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Naprava se bo morda kmalu zaustavila (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Še <xliff:g id="TIME">%1$s</xliff:g> do polne napolnjenosti"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Še <xliff:g id="TIME">%1$s</xliff:g> do polne napolnjenosti"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do polne napolnjenosti"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznano"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Polnjenje"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"polnjenje"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index 7a054bbec646..0498f3123543 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tableti mund të fiket së shpejti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Pajisja mund të fiket së shpejti (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> të mbetura deri në ngarkimin e plotë"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> derisa të mbushet plotësisht"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> të mbetura për karikimin"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> deri sa të karikohen"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"I panjohur"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Po karikohet"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"po karikohet"</string> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 0edc9850a26b..3157deed7127 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Таблет ће се ускоро искључити (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Уређај ће се ускоро искључити (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> до потпуног пуњења"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до потпуног пуњења"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Напуниће се за <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – напуниће се за <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Непознато"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Пуни се"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"пуни се"</string> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index 862fc6cad0d4..31517b8ab00a 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Surfplattan kan stängas av snart (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Enheten kan stängas av snart (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Batteriet är fulladdat om <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tills det är fulladdat"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> kvar till full laddning"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> till full laddning"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Okänd"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Laddar"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"laddas"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 12922ca2b13e..d73084ffd3e8 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Kompyuta kibao inakaribia kuzimika (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Kifaa kinakaribia kuzimika (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Imebaki <xliff:g id="TIME">%1$s</xliff:g> chaji ijae"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> hadi ijae chaji"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Zimesalia <xliff:g id="TIME">%1$s</xliff:g> hadi ijae chaji"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> hadi ijae chaji"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Haijulikani"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Inachaji"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"inachaji"</string> diff --git a/packages/SettingsLib/res/values-ta/strings.xml b/packages/SettingsLib/res/values-ta/strings.xml index 8f72ab6f2a6c..de70d085d491 100644 --- a/packages/SettingsLib/res/values-ta/strings.xml +++ b/packages/SettingsLib/res/values-ta/strings.xml @@ -138,8 +138,8 @@ <string name="accessibility_wifi_security_type_none" msgid="1223747559986205423">"கடவுச்சொல் தேவைப்படாத திறந்த நெட்வொர்க்"</string> <string name="accessibility_wifi_security_type_secured" msgid="862921720418885331">"கடவுச்சொல் தேவைப்படும் பாதுகாப்பான நெட்வொர்க்"</string> <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string> - <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"அகற்றப்பட்ட பயன்பாடுகள்"</string> - <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"அகற்றப்பட்ட பயன்பாடுகள் மற்றும் பயனர்கள்"</string> + <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"அகற்றப்பட்ட ஆப்ஸ்"</string> + <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"அகற்றப்பட்ட ஆப்ஸ் மற்றும் பயனர்கள்"</string> <string name="data_usage_ota" msgid="5377889154805560860">"சிஸ்டம் புதுப்பிப்புகள்"</string> <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB டெதெரிங்"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"போர்ட்டபிள் ஹாட்ஸ்பாட்"</string> @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"டேப்லெட் விரைவில் ஆஃப் ஆகக்கூடும் (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"சாதனம் விரைவில் ஆஃப் ஆகக்கூடும் (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"முழு சார்ஜாக <xliff:g id="TIME">%1$s</xliff:g>ம் ஆகும்"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"முழு சார்ஜாக <xliff:g id="TIME">%1$s</xliff:g> ஆகும்"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - முழு சார்ஜாக <xliff:g id="TIME">%2$s</xliff:g> ஆகும்"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"அறியப்படாத"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"சார்ஜ் ஆகிறது"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"சார்ஜ் ஆகிறது"</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index e591121d4b59..35916703a353 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"టాబ్లెట్ షట్డౌన్ కావచ్చు (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"పరికరం త్వరలో షట్డౌన్ కావచ్చు (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"పూర్తిగా ఛార్జ్ కావడానికి <xliff:g id="TIME">%1$s</xliff:g> పడుతుంది"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>లో పూర్తిగా ఛార్జ్ అవుతుంది"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"ఛార్జ్ అవ్వడానికి <xliff:g id="TIME">%1$s</xliff:g> సమయం మిగిలి ఉంది"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - ఛార్జ్ అవ్వడానికి <xliff:g id="TIME">%2$s</xliff:g> పడుతుంది"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"తెలియదు"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"ఛార్జ్ అవుతోంది"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"ఛార్జ్ అవుతోంది"</string> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index b3bef9de2dcc..1cfe45e72a9e 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"แท็บเล็ตอาจปิดเครื่องในไม่ช้า (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"อุปกรณ์อาจปิดเครื่องในไม่ช้า (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"อีก <xliff:g id="TIME">%1$s</xliff:g> จึงจะชาร์จเต็ม"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>จนกว่าจะชาร์จเต็ม"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"เหลือ <xliff:g id="TIME">%1$s</xliff:g> จนกว่าจะชาร์จ"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะชาร์จ"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"ไม่ทราบ"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"กำลังชาร์จ"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"กำลังชาร์จ"</string> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index 85b64381308f..8b3118b333d1 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Malapit nang mag-shutdown ang tablet (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Malapit nang mag-shut down ang device (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> ang natitira bago makumpleto ang charge"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> hanggang sa makumpleto ang charge"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> ang natitira bago matapos mag-charge"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> hanggang matapos mag-charge"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Hindi Kilala"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Nagcha-charge"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"nagcha-charge"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index 6031ecaf6ed4..5891c791cec9 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Tablet kısa süre içinde kapanabilir (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Cihaz kısa süre içinde kapanabilir (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Tam olarak şarj olmasına <xliff:g id="TIME">%1$s</xliff:g> kaldı"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - Tam şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Şarj olmaya <xliff:g id="TIME">%1$s</xliff:g> kaldı"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - şarj olmaya <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Bilinmiyor"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Şarj oluyor"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"şarj oluyor"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index 5f3c6a6b20a3..0bca3077a6ad 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Планшет може невдовзі вимкнутися (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Пристрій може невдовзі вимкнутися (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"До повного зарядження залишилося <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного заряду"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> до повного заряду"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного заряду"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Невідомо"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Заряджається"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"заряджається"</string> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index 82d9b3fb57f8..1e27b487ca27 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"ٹیبلیٹ جلد ہی بند ہو سکتا ہے (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"آلہ جلد ہی بند ہو سکتا ہے (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"پوری طرح چارج ہونے میں <xliff:g id="TIME">%1$s</xliff:g> باقی ہے"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> پوری طرح چارج ہونے تک"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"چارج ہونے میں <xliff:g id="TIME">%1$s</xliff:g> باقی"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> چارج ہونے تک"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"نامعلوم"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"چارج ہو رہا ہے"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"چارج ہو رہا ہے"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 0d3e8de0559d..487100c94feb 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Planshet tez orada o‘chib qolishi mumkin (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Qurilma tez orada o‘chib qolishi mumkin (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"To‘lishiga <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> ichida to‘ladi"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> ichida toʻliq quvvat oladi"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> ichida toʻliq quvvat oladi"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Noma’lum"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Quvvat olmoqda"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"quvvat olmoqda"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 003c45751ecc..c247617b31dc 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Máy tính bảng có thể sắp tắt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Thiết bị có thể sắp tắt (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> nữa sẽ được sạc đầy"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> nữa sẽ được sạc đầy"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"Còn <xliff:g id="TIME">%1$s</xliff:g> nữa là sạc xong"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> nữa là sạc xong"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Không xác định"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Đang sạc"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"đang sạc"</string> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index bcf1f2df2849..dddc1071dd9b 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"平板电脑可能即将关机 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"设备可能即将关机 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"还需 <xliff:g id="TIME">%1$s</xliff:g>充满电"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还需 <xliff:g id="TIME">%2$s</xliff:g>充满"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"还剩 <xliff:g id="TIME">%1$s</xliff:g>充满电"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>后充满电"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"正在充电"</string> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index 286765d99282..8560e22c587b 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"平板電腦可能即將關機 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"裝置可能即將關機 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g>後就能充滿電"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - 還需 <xliff:g id="TIME">%2$s</xliff:g>才能充滿電"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"還需 <xliff:g id="TIME">%1$s</xliff:g>才能充滿電"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - 還需 <xliff:g id="TIME">%2$s</xliff:g>才能充滿電"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"正在充電"</string> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index c64130210d37..404aa19c87c6 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"平板電腦可能即將關機 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"裝置可能即將關機 (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"再過 <xliff:g id="TIME">%1$s</xliff:g>就能完成充電"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>後充飽"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g>後充飽電"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>後充飽電"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"不明"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"充電中"</string> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index 1bfbf07d49ef..542332f10454 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -402,8 +402,8 @@ <string name="power_remaining_duration_shutdown_imminent" product="tablet" msgid="7466484148515796216">"Ithebhulethi ingacisha maduze (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_remaining_duration_shutdown_imminent" product="device" msgid="603933521600231649">"Idivayisi ingacisha maduze (<xliff:g id="LEVEL">%1$s</xliff:g>)"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> kushiywe ishaja"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> kuze ligcwale ngokuphelele"</string> + <string name="power_remaining_charging_duration_only" msgid="6672239353042034265">"<xliff:g id="TIME">%1$s</xliff:g> esele ize ishaje"</string> + <string name="power_charging_duration" msgid="5850751284103249125">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ize igcwale"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Akwaziwa"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"Iyashaja"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"iyashaja"</string> diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java index 5da6205d45bd..2664ecd17dd3 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java @@ -23,7 +23,6 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowPackageManager; -import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) public class TileTest { @@ -41,7 +40,7 @@ public class TileTest { mActivityInfo.name = "abc"; mActivityInfo.icon = com.android.internal.R.drawable.ic_plus; mActivityInfo.metaData = new Bundle(); - mTile = new Tile(mActivityInfo, "category"); + mTile = new ActivityTile(mActivityInfo, "category"); } @Test @@ -70,7 +69,7 @@ public class TileTest { @Test public void getIcon_noContextOrMetadata_returnNull() { mActivityInfo.metaData = null; - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); assertThat(tile.getIcon(null)).isNull(); assertThat(tile.getIcon(RuntimeEnvironment.application)).isNull(); } @@ -100,7 +99,7 @@ public class TileTest { @Test public void isIconTintable_hasMetadata_shouldReturnIconTintableMetadata() { - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); mActivityInfo.metaData.putBoolean(TileUtils.META_DATA_PREFERENCE_ICON_TINTABLE, false); assertThat(tile.isIconTintable(RuntimeEnvironment.application)).isFalse(); @@ -111,14 +110,14 @@ public class TileTest { @Test public void isIconTintable_noIcon_shouldReturnFalse() { - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); assertThat(tile.isIconTintable(RuntimeEnvironment.application)).isFalse(); } @Test public void isIconTintable_noTintableMetadata_shouldReturnFalse() { - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON, android.R.drawable.ic_info); assertThat(tile.isIconTintable(RuntimeEnvironment.application)).isFalse(); @@ -126,7 +125,7 @@ public class TileTest { @Test public void getPriority_noMetadata_return0() { - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); assertThat(tile.getOrder()).isEqualTo(0); } @@ -135,7 +134,7 @@ public class TileTest { public void getPriority_badMetadata_return0() { mActivityInfo.metaData.putString(META_DATA_KEY_ORDER, "1"); - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); assertThat(tile.getOrder()).isEqualTo(0); } @@ -144,7 +143,7 @@ public class TileTest { public void getPriority_validMetadata_returnMetadataValue() { mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, 1); - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); assertThat(tile.getOrder()).isEqualTo(1); } @@ -157,7 +156,7 @@ public class TileTest { spm.addResolveInfoForIntent( new Intent().setClassName(mActivityInfo.packageName, mActivityInfo.name), info); - final Tile tile = new Tile(mActivityInfo, "category"); + final Tile tile = new ActivityTile(mActivityInfo, "category"); final long staleTimeStamp = -10000; tile.mLastUpdateTime = staleTimeStamp; @@ -173,8 +172,8 @@ public class TileTest { final ShadowPackageManager spm = Shadow.extract(mContext.getPackageManager()); spm.removePackage(mActivityInfo.packageName); - final Tile tile = new Tile(mActivityInfo, "category"); - ReflectionHelpers.setField(tile, "mActivityInfo", null); + final Tile tile = new ActivityTile(mActivityInfo, "category"); + tile.mComponentInfo = null; assertThat(tile.getTitle(RuntimeEnvironment.application)).isNull(); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java index ed6b9b0a135e..6cbae05ce9a5 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AdaptiveIconTest.java @@ -37,6 +37,7 @@ import android.graphics.drawable.ShapeDrawable; import android.os.Bundle; import com.android.settingslib.R; +import com.android.settingslib.drawer.ActivityTile; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; @@ -84,7 +85,7 @@ public class AdaptiveIconTest { @Test public void setBackgroundColor_externalTileWithBackgroundColorRawValue_shouldUpdateIcon() { - final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); + final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB, 0xff0000); doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update)) .when(tile).getIcon(mContext); @@ -97,7 +98,7 @@ public class AdaptiveIconTest { @Test public void setBackgroundColor_tileWithoutBackgroundColor_shouldSetDefaultBackgroundColor() { - final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); + final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update)) .when(tile).getIcon(mContext); final AdaptiveIcon icon = new AdaptiveIcon(mContext, new ColorDrawable(Color.BLACK)); @@ -110,7 +111,7 @@ public class AdaptiveIconTest { @Test public void onBindTile_externalTileWithBackgroundColorHint_shouldUpdateIcon() { - final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); + final Tile tile = spy(new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE)); mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_HINT, R.color.bt_outline_color); doReturn(Icon.createWithResource(mContext, R.drawable.ic_system_update)) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 8c2e43170cc2..8c9705753dec 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -100,8 +100,6 @@ public class SecureSettings { Settings.Secure.DOZE_PICK_UP_GESTURE, Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, Settings.Secure.DOZE_TAP_SCREEN_GESTURE, - Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, - Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, Settings.Secure.FACE_UNLOCK_KEYGUARD_ENABLED, @@ -109,12 +107,8 @@ public class SecureSettings { Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, Settings.Secure.FACE_UNLOCK_APP_ENABLED, Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, - Settings.Secure.ASSIST_GESTURE_ENABLED, - Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, - Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED, Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.NOTIFICATION_BADGING, - Settings.Secure.NOTIFICATION_BUBBLES, Settings.Secure.NOTIFICATION_DISMISS_RTL, Settings.Secure.QS_AUTO_ADDED_TILES, Settings.Secure.SCREENSAVER_ENABLED, @@ -145,12 +139,9 @@ public class SecureSettings { Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, Settings.Secure.UI_NIGHT_MODE, Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, - Settings.Secure.SKIP_GESTURE, Settings.Secure.SKIP_DIRECTION, - Settings.Secure.SILENCE_GESTURE, Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, Settings.Secure.NAVIGATION_MODE, - Settings.Secure.AWARE_ENABLED, Settings.Secure.SKIP_GESTURE_COUNT, Settings.Secure.SKIP_TOUCH_COUNT, Settings.Secure.SILENCE_ALARMS_GESTURE_COUNT, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index f160edc6e446..976f3365ab98 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -157,7 +157,6 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"})); VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR); - VALIDATORS.put(Secure.NOTIFICATION_BUBBLES, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.QS_AUTO_ADDED_TILES, TILE_LIST_VALIDATOR); VALIDATORS.put(Secure.SCREENSAVER_ENABLED, BOOLEAN_VALIDATOR); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java index d0ffe7ae8c7e..8fb879d3606b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java @@ -16,7 +16,6 @@ package com.android.providers.settings; -import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.ActivityManager; import android.content.IContentProvider; @@ -195,8 +194,15 @@ public final class DeviceConfigService extends Binder { : "Failed to delete " + key + " from " + namespace); break; case LIST: - for (String line : list(iprovider, namespace)) { - pout.println(line); + if (namespace != null) { + DeviceConfig.Properties properties = DeviceConfig.getProperties(namespace); + for (String name : properties.getKeyset()) { + pout.println(name + "=" + properties.getString(name, null)); + } + } else { + for (String line : listAll(iprovider)) { + pout.println(line); + } } break; case RESET: @@ -251,16 +257,13 @@ public final class DeviceConfigService extends Binder { return success; } - private List<String> list(IContentProvider provider, @Nullable String namespace) { + private List<String> listAll(IContentProvider provider) { final ArrayList<String> lines = new ArrayList<>(); try { Bundle args = new Bundle(); args.putInt(Settings.CALL_METHOD_USER_KEY, ActivityManager.getService().getCurrentUser().id); - if (namespace != null) { - args.putString(Settings.CALL_METHOD_PREFIX_KEY, namespace); - } Bundle b = provider.call(resolveCallingPackage(), Settings.AUTHORITY, Settings.CALL_METHOD_LIST_CONFIG, null, args); if (b != null) { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 720266a72423..a9c466ed7e9f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -439,10 +439,8 @@ public class SettingsProvider extends ContentProvider { case Settings.CALL_METHOD_LIST_CONFIG: { String prefix = getSettingPrefix(args); - Bundle result = new Bundle(); - result.putSerializable( - Settings.NameValueTable.VALUE, (HashMap) getAllConfigFlags(prefix)); - return result; + return packageValuesForCallResult(getAllConfigFlags(prefix), + isTrackingGeneration(args)); } case Settings.CALL_METHOD_LIST_GLOBAL: { @@ -1076,7 +1074,7 @@ public class SettingsProvider extends ContentProvider { return false; } - private Map<String, String> getAllConfigFlags(@Nullable String prefix) { + private HashMap<String, String> getAllConfigFlags(@Nullable String prefix) { if (DEBUG) { Slog.v(LOG_TAG, "getAllConfigFlags() for " + prefix); } @@ -1085,12 +1083,11 @@ public class SettingsProvider extends ContentProvider { // Get the settings. SettingsState settingsState = mSettingsRegistry.getSettingsLocked( SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM); - List<String> names = getSettingsNamesLocked(SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM); final int nameCount = names.size(); - Map<String, String> flagsToValues = new HashMap<>(names.size()); + HashMap<String, String> flagsToValues = new HashMap<>(names.size()); for (int i = 0; i < nameCount; i++) { String name = names.get(i); @@ -2057,8 +2054,7 @@ public class SettingsProvider extends ContentProvider { "get/set setting for user", null); } - private Bundle packageValueForCallResult(Setting setting, - boolean trackingGeneration) { + private Bundle packageValueForCallResult(Setting setting, boolean trackingGeneration) { if (!trackingGeneration) { if (setting == null || setting.isNull()) { return NULL_SETTING_BUNDLE; @@ -2073,6 +2069,21 @@ public class SettingsProvider extends ContentProvider { return result; } + private Bundle packageValuesForCallResult(HashMap<String, String> keyValues, + boolean trackingGeneration) { + Bundle result = new Bundle(); + result.putSerializable(Settings.NameValueTable.VALUE, keyValues); + if (trackingGeneration) { + synchronized (mLock) { + mSettingsRegistry.mGenerationRegistry.addGenerationData(result, + mSettingsRegistry.getSettingsLocked( + SETTINGS_TYPE_CONFIG, UserHandle.USER_SYSTEM).mKey); + } + } + + return result; + } + private static int getRequestingUserId(Bundle args) { final int callingUserId = UserHandle.getCallingUserId(); return (args != null) ? args.getInt(Settings.CALL_METHOD_USER_KEY, callingUserId) @@ -4385,8 +4396,7 @@ public class SettingsProvider extends ContentProvider { if (currentVersion == 182) { // Remove secure bubble settings. - getSecureSettingsLocked(userId).deleteSettingLocked( - Secure.NOTIFICATION_BUBBLES); + getSecureSettingsLocked(userId).deleteSettingLocked("notification_bubbles"); // Add global bubble settings. getGlobalSettingsLocked().insertSettingLocked(Global.NOTIFICATION_BUBBLES, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index c05c4cdf72d7..de6a3a8840a4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.PackageManagerInternal; import android.content.pm.Signature; import android.os.Binder; import android.os.Build; @@ -49,7 +48,6 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.ArrayUtils; -import com.android.server.LocalServices; import libcore.io.IoUtils; @@ -1175,9 +1173,8 @@ final class SettingsState { } // If SetupWizard, done. - PackageManagerInternal packageManagerInternal = LocalServices.getService( - PackageManagerInternal.class); - if (packageName.equals(packageManagerInternal.getSetupWizardPackageName())) { + String setupWizPackage = context.getPackageManager().getSetupWizardPackageName(); + if (packageName.equals(setupWizPackage)) { sSystemUids.put(uid, uid); return true; } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 86625faab4d6..8437eae20637 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -594,7 +594,10 @@ public class SettingsBackupTest { Settings.Secure.ANR_SHOW_BACKGROUND, Settings.Secure.ASSISTANT, Settings.Secure.ASSIST_DISCLOSURE_ENABLED, + Settings.Secure.ASSIST_GESTURE_ENABLED, Settings.Secure.ASSIST_GESTURE_SENSITIVITY, + Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED, + Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, Settings.Secure.ASSIST_GESTURE_SETUP_COMPLETE, Settings.Secure.ASSIST_SCREENSHOT_ENABLED, Settings.Secure.ASSIST_STRUCTURE_ENABLED, @@ -720,6 +723,11 @@ public class SettingsBackupTest { Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED, Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED, Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED, + Settings.Secure.AWARE_ENABLED, + Settings.Secure.SKIP_GESTURE, + Settings.Secure.SILENCE_GESTURE, + Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, + Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, Settings.Secure.FACE_UNLOCK_RE_ENROLL); @Test diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 2a41aa6bb8f6..a0972498ab2a 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -375,23 +375,27 @@ public class BugreportProgressService extends Service { } } + private static String getFileName(BugreportInfo info, String suffix) { + return String.format("%s-%s%s", info.baseName, info.name, suffix); + } + private final class BugreportCallbackImpl extends BugreportCallback { + @GuardedBy("mLock") private final BugreportInfo mInfo; - BugreportCallbackImpl(String name, @Nullable String title, @Nullable String description, - @BugreportParams.BugreportMode int type) { - // pid not used in this workflow, so setting default = 0 - mInfo = new BugreportInfo(mContext, 0 /* pid */, name, - 100 /* max progress*/, title, description, type); + BugreportCallbackImpl(BugreportInfo info) { + mInfo = info; } @Override public void onProgress(float progress) { - if (progress == 0) { - trackInfoWithId(); + synchronized (mLock) { + if (progress == 0) { + trackInfoWithIdLocked(); + } + checkProgressUpdatedLocked(mInfo, (int) progress); } - checkProgressUpdated(mInfo, (int) progress); } /** @@ -400,17 +404,21 @@ public class BugreportProgressService extends Service { */ @Override public void onError(@BugreportErrorCode int errorCode) { - trackInfoWithId(); - stopProgress(mInfo.id); + synchronized (mLock) { + trackInfoWithIdLocked(); + stopProgressLocked(mInfo.id); + } Log.e(TAG, "Bugreport API callback onError() errorCode = " + errorCode); return; } @Override public void onFinished() { - // TODO: Make all callback functions lock protected. - trackInfoWithId(); - sendBugreportFinishedBroadcast(); + mInfo.renameBugreportFile(); + mInfo.renameScreenshots(mScreenshotsDir); + synchronized (mLock) { + sendBugreportFinishedBroadcastLocked(); + } } /** @@ -419,7 +427,8 @@ public class BugreportProgressService extends Service { * when dumpstate calls one of the callback functions (onProgress, onFinished, onError) * after the id has been incremented. */ - private void trackInfoWithId() { + @GuardedBy("mLock") + private void trackInfoWithIdLocked() { final int id = SystemProperties.getInt(PROPERTY_LAST_ID, 1); if (mBugreportInfos.get(id) == null) { mInfo.id = id; @@ -428,75 +437,75 @@ public class BugreportProgressService extends Service { return; } - private void sendBugreportFinishedBroadcast() { - final String bugreportFileName = mInfo.name + ".zip"; - final File bugreportFile = new File(BUGREPORT_DIR, bugreportFileName); - final String bugreportFilePath = bugreportFile.getAbsolutePath(); - if (bugreportFile.length() == 0) { + @GuardedBy("mLock") + private void sendBugreportFinishedBroadcastLocked() { + final String bugreportFilePath = mInfo.bugreportFile.getAbsolutePath(); + if (mInfo.bugreportFile.length() == 0) { Log.e(TAG, "Bugreport file empty. File path = " + bugreportFilePath); return; } if (mInfo.type == BugreportParams.BUGREPORT_MODE_REMOTE) { - sendRemoteBugreportFinishedBroadcast(bugreportFilePath, bugreportFile); + sendRemoteBugreportFinishedBroadcast(mContext, bugreportFilePath, + mInfo.bugreportFile); } else { + trackInfoWithIdLocked(); cleanupOldFiles(MIN_KEEP_COUNT, MIN_KEEP_AGE); final Intent intent = new Intent(INTENT_BUGREPORT_FINISHED); intent.putExtra(EXTRA_BUGREPORT, bugreportFilePath); - addScreenshotToIntent(intent); + addScreenshotToIntent(intent, mInfo); mContext.sendBroadcast(intent, android.Manifest.permission.DUMP); onBugreportFinished(mInfo.id); } } + } - private void sendRemoteBugreportFinishedBroadcast(String bugreportFileName, - File bugreportFile) { - cleanupOldFiles(REMOTE_BUGREPORT_FILES_AMOUNT, REMOTE_MIN_KEEP_AGE); - final Intent intent = new Intent(DevicePolicyManager.ACTION_REMOTE_BUGREPORT_DISPATCH); - final Uri bugreportUri = getUri(mContext, bugreportFile); - final String bugreportHash = generateFileHash(bugreportFileName); - if (bugreportHash == null) { - Log.e(TAG, "Error generating file hash for remote bugreport"); - return; - } - intent.setDataAndType(bugreportUri, BUGREPORT_MIMETYPE); - intent.putExtra(DevicePolicyManager.EXTRA_REMOTE_BUGREPORT_HASH, bugreportHash); - intent.putExtra(EXTRA_BUGREPORT, bugreportFileName); - mContext.sendBroadcastAsUser(intent, UserHandle.SYSTEM, - android.Manifest.permission.DUMP); - } - - private void addScreenshotToIntent(Intent intent) { - final String screenshotFileName = mInfo.name + ".png"; - final File screenshotFile = new File(BUGREPORT_DIR, screenshotFileName); - final String screenshotFilePath = screenshotFile.getAbsolutePath(); - if (screenshotFile.length() > 0) { - intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath); - } - return; + private static void sendRemoteBugreportFinishedBroadcast(Context context, + String bugreportFileName, File bugreportFile) { + cleanupOldFiles(REMOTE_BUGREPORT_FILES_AMOUNT, REMOTE_MIN_KEEP_AGE); + final Intent intent = new Intent(DevicePolicyManager.ACTION_REMOTE_BUGREPORT_DISPATCH); + final Uri bugreportUri = getUri(context, bugreportFile); + final String bugreportHash = generateFileHash(bugreportFileName); + if (bugreportHash == null) { + Log.e(TAG, "Error generating file hash for remote bugreport"); } + intent.setDataAndType(bugreportUri, BUGREPORT_MIMETYPE); + intent.putExtra(DevicePolicyManager.EXTRA_REMOTE_BUGREPORT_HASH, bugreportHash); + intent.putExtra(EXTRA_BUGREPORT, bugreportFileName); + context.sendBroadcastAsUser(intent, UserHandle.SYSTEM, + android.Manifest.permission.DUMP); + } - private String generateFileHash(String fileName) { - String fileHash = null; - try { - MessageDigest md = MessageDigest.getInstance("SHA-256"); - FileInputStream input = new FileInputStream(new File(fileName)); - byte[] buffer = new byte[65536]; - int size; - while ((size = input.read(buffer)) > 0) { - md.update(buffer, 0, size); - } - input.close(); - byte[] hashBytes = md.digest(); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < hashBytes.length; i++) { - sb.append(String.format("%02x", hashBytes[i])); - } - fileHash = sb.toString(); - } catch (IOException | NoSuchAlgorithmException e) { - Log.e(TAG, "generating file hash for bugreport file failed " + fileName, e); + private static void addScreenshotToIntent(Intent intent, BugreportInfo info) { + final String screenshotFileName = info.name + ".png"; + final File screenshotFile = new File(BUGREPORT_DIR, screenshotFileName); + final String screenshotFilePath = screenshotFile.getAbsolutePath(); + if (screenshotFile.length() > 0) { + intent.putExtra(EXTRA_SCREENSHOT, screenshotFilePath); + } + return; + } + + private static String generateFileHash(String fileName) { + String fileHash = null; + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + FileInputStream input = new FileInputStream(new File(fileName)); + byte[] buffer = new byte[65536]; + int size; + while ((size = input.read(buffer)) > 0) { + md.update(buffer, 0, size); + } + input.close(); + byte[] hashBytes = md.digest(); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < hashBytes.length; i++) { + sb.append(String.format("%02x", hashBytes[i])); } - return fileHash; + fileHash = sb.toString(); + } catch (IOException | NoSuchAlgorithmException e) { + Log.e(TAG, "generating file hash for bugreport file failed " + fileName, e); } + return fileHash; } static void cleanupOldFiles(final int minCount, final long minAge) { @@ -670,34 +679,44 @@ public class BugreportProgressService extends Service { } } - private String getBugreportName() { + private String getBugreportBaseName(@BugreportParams.BugreportMode int type) { String buildId = SystemProperties.get("ro.build.id", "UNKNOWN_BUILD"); String deviceName = SystemProperties.get("ro.product.name", "UNKNOWN_DEVICE"); - String currentTimestamp = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()); - return String.format("bugreport-%s-%s-%s", deviceName, buildId, currentTimestamp); + String typeSuffix = null; + if (type == BugreportParams.BUGREPORT_MODE_WIFI) { + typeSuffix = "wifi"; + } else if (type == BugreportParams.BUGREPORT_MODE_TELEPHONY) { + typeSuffix = "telephony"; + } else { + return String.format("bugreport-%s-%s", deviceName, buildId); + } + return String.format("bugreport-%s-%s-%s", deviceName, buildId, typeSuffix); } private void startBugreportAPI(Intent intent) { mUsingBugreportApi = true; - String bugreportName = getBugreportName(); + String shareTitle = intent.getStringExtra(EXTRA_TITLE); + String shareDescription = intent.getStringExtra(EXTRA_DESCRIPTION); + int bugreportType = intent.getIntExtra(EXTRA_BUGREPORT_TYPE, + BugreportParams.BUGREPORT_MODE_INTERACTIVE); + String baseName = getBugreportBaseName(bugreportType); + String name = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()); + + // pid not used in this workflow, so setting default = 0 + BugreportInfo info = new BugreportInfo(mContext, 0 /* pid */, baseName, name, + 100 /* max progress*/, shareTitle, shareDescription, bugreportType, + mUsingBugreportApi); - ParcelFileDescriptor bugreportFd = createReadWriteFile(BUGREPORT_DIR, - bugreportName + ".zip"); + ParcelFileDescriptor bugreportFd = info.createBugreportFd(); if (bugreportFd == null) { Log.e(TAG, "Bugreport parcel file descriptor is null."); return; } - int bugreportType = intent.getIntExtra(EXTRA_BUGREPORT_TYPE, - BugreportParams.BUGREPORT_MODE_INTERACTIVE); - String shareTitle = intent.getStringExtra(EXTRA_TITLE); - String shareDescription = intent.getStringExtra(EXTRA_DESCRIPTION); - - ParcelFileDescriptor screenshotFd = createReadWriteFile(BUGREPORT_DIR, - bugreportName + ".png"); + ParcelFileDescriptor screenshotFd = info.createScreenshotFd(); if (screenshotFd == null) { Log.e(TAG, "Screenshot parcel file descriptor is null. Deleting bugreport file"); FileUtils.closeQuietly(bugreportFd); - new File(BUGREPORT_DIR, String.format("%s.zip", bugreportName)).delete(); + info.bugreportFile.delete(); return; } mBugreportManager = (BugreportManager) mContext.getSystemService( @@ -708,8 +727,7 @@ public class BugreportProgressService extends Service { + " bugreport file fd: " + bugreportFd + " screenshot file fd: " + screenshotFd); - BugreportCallbackImpl bugreportCallback = new BugreportCallbackImpl(bugreportName, - shareTitle, shareDescription, bugreportType); + BugreportCallbackImpl bugreportCallback = new BugreportCallbackImpl(info); try { mBugreportManager.startBugreport(bugreportFd, screenshotFd, new BugreportParams(bugreportType), executor, bugreportCallback); @@ -722,14 +740,13 @@ public class BugreportProgressService extends Service { } } - private ParcelFileDescriptor createReadWriteFile(String dirName, String fileName) { + private static ParcelFileDescriptor createReadWriteFile(File file) { try { - File f = new File(dirName, fileName); - f.createNewFile(); - f.setReadable(true, true); - f.setWritable(true, true); + file.createNewFile(); + file.setReadable(true, true); + file.setWritable(true, true); - ParcelFileDescriptor fd = ParcelFileDescriptor.open(f, + ParcelFileDescriptor fd = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_WRITE_ONLY | ParcelFileDescriptor.MODE_APPEND); return fd; } catch (IOException e) { @@ -843,7 +860,8 @@ public class BugreportProgressService extends Service { /** * Finalizes the progress on a given bugreport and cancel its notification. */ - private void stopProgress(int id) { + @GuardedBy("mLock") + private void stopProgressLocked(int id) { if (mBugreportInfos.indexOfKey(id) < 0) { Log.w(TAG, "ID not watched: " + id); } else { @@ -874,7 +892,9 @@ public class BugreportProgressService extends Service { } deleteScreenshots(info); } - stopProgress(id); + synchronized (mLock) { + stopProgressLocked(id); + } } /** @@ -1088,15 +1108,19 @@ public class BugreportProgressService extends Service { */ private void onBugreportFinished(int id) { BugreportInfo info = getInfo(id); - final File bugreportFile = new File(BUGREPORT_DIR, info.name + ".zip"); + final File bugreportFile = info.bugreportFile; final int max = -1; // this is to log metrics for dumpstate duration. - File screenshotFile = new File(BUGREPORT_DIR, info.name + ".png"); + File screenshotFile = info.screenshotFiles.isEmpty() + ? null : info.screenshotFiles.get(0); // If the screenshot file did not get populated implies this type of bugreport does not // need the screenshot file; setting the file to null so that empty file doesnt get shared - if (screenshotFile.length() == 0) { + if (screenshotFile != null && screenshotFile.length() == 0) { if (screenshotFile.delete()) { Log.d(TAG, "screenshot file deleted successfully."); } + info.screenshotFiles.remove(0); + // TODO(b/136066578): Will soon stop using the below variable as it is a no-op in + // API flow and the screenshotFile value is read from info.screenshotFiles screenshotFile = null; } // TODO: Since we are passing id to the function, it should be able to find the info linked @@ -1120,10 +1144,18 @@ public class BugreportProgressService extends Service { DumpstateListener dumpstateListener = new DumpstateListener(info); mBugreportInfos.put(id, info); } - info.renameScreenshots(mScreenshotsDir); - info.bugreportFile = bugreportFile; - if (screenshotFile != null) { - info.addScreenshot(screenshotFile); + if (!mUsingBugreportApi) { + // Rename in API flow happens before sending the broadcast for remote bugreport (to + // handle renaming before sending broadcasts) + info.renameScreenshots(mScreenshotsDir); + // API workflow already has the bugreport file. This was required in legacy flow, when + // FINISHED broadcast would send the final bugreport files. + // TODO(b/136066578): Change function definition to not include bugreport/screenshot + // file in params + info.bugreportFile = bugreportFile; + if (screenshotFile != null) { + info.addScreenshot(screenshotFile); + } } if (max != -1) { @@ -1157,7 +1189,9 @@ public class BugreportProgressService extends Service { if (!info.bugreportFile.exists() || !info.bugreportFile.canRead()) { Log.e(TAG, "Could not read bugreport file " + info.bugreportFile); Toast.makeText(context, R.string.bugreport_unreadable_text, Toast.LENGTH_LONG).show(); - stopProgress(info.id); + synchronized (mLock) { + stopProgressLocked(info.id); + } return; } @@ -1269,7 +1303,9 @@ public class BugreportProgressService extends Service { final Intent sendIntent = buildSendIntent(mContext, info); if (sendIntent == null) { Log.w(TAG, "Stopping progres on ID " + id + " because share intent could not be built"); - stopProgress(id); + synchronized (mLock) { + stopProgressLocked(id); + } return; } @@ -1292,9 +1328,10 @@ public class BugreportProgressService extends Service { } else { mContext.startActivity(notifIntent); } - - // ... and stop watching this process. - stopProgress(id); + synchronized (mLock) { + // ... and stop watching this process. + stopProgressLocked(id); + } } static void sendShareIntent(Context context, Intent intent) { @@ -1784,7 +1821,7 @@ public class BugreportProgressService extends Service { if (hasFocus) { return; } - sanitizeName(); + sanitizeName(info); } }); @@ -1803,9 +1840,13 @@ public class BugreportProgressService extends Service { MetricsLogger.action(context, MetricsEvent.ACTION_BUGREPORT_DETAILS_CANCELED); if (!mTempName.equals(mSavedName)) { - // Must restore dumpstate's name since it was changed + // Must restore bugreport's name since it was changed // before user clicked OK. - setBugreportNameProperty(mPid, mSavedName); + if (mUsingBugreportApi) { + info.name = mSavedName; + } else { + setBugreportNameProperty(mPid, mSavedName); + } } } }) @@ -1854,7 +1895,7 @@ public class BugreportProgressService extends Service { @Override public void onClick(View view) { MetricsLogger.action(context, MetricsEvent.ACTION_BUGREPORT_DETAILS_SAVED); - sanitizeName(); + sanitizeName(info); final String name = mInfoName.getText().toString(); final String title = mInfoTitle.getText().toString(); final String description = mInfoDescription.getText().toString(); @@ -1870,7 +1911,7 @@ public class BugreportProgressService extends Service { * Sanitizes the user-provided value for the {@code name} field, automatically replacing * invalid characters if necessary. */ - private void sanitizeName() { + private void sanitizeName(BugreportInfo info) { String name = mInfoName.getText().toString(); if (name.equals(mTempName)) { if (DEBUG) Log.v(TAG, "name didn't change, no need to sanitize: " + name); @@ -1892,23 +1933,15 @@ public class BugreportProgressService extends Service { name = safeName.toString(); mInfoName.setText(name); } + mTempName = name; if (mUsingBugreportApi) { - File prevFile = new File(BUGREPORT_DIR, mTempName + ".zip"); - File newFile = new File(BUGREPORT_DIR, name + ".zip"); - if (!prevFile.renameTo(newFile)) { - Log.e(TAG, "File rename from : " + mTempName - + " to : " + name + " from the UI failed."); - } else { - Log.d(TAG, "File rename from : " + mTempName - + " to : " + name + " from the UI succeeded."); - } + info.name = name; + } else { + // Must update system property for the cases where dumpstate finishes + // while the user is still entering other fields (like title or + // description) + setBugreportNameProperty(mPid, name); } - mTempName = name; - - // Must update system property for the cases where dumpstate finishes - // while the user is still entering other fields (like title or - // description) - setBugreportNameProperty(mPid, name); } /** @@ -1944,14 +1977,23 @@ public class BugreportProgressService extends Service { /** * {@code pid} of the {@code dumpstate} process generating the bugreport. + * pid is unused in the API flow + * TODO(b/136066578): Remove pid */ final int pid; /** - * Name of the bugreport, will be used to rename the final files. - * <p> - * Initial value is the bugreport filename reported by {@code dumpstate}, but user can - * change it later to a more meaningful name. + * Prefix name of the bugreport, this is uneditable. + * The baseName consists of the string "bugreport" + deviceName + buildID + * This will end with the string "wifi"/"telephony" for wifi/telephony bugreports. + * Bugreport zip file name = "<baseName>-<name>.zip" + * Bugreport png file name = "<baseName>-<name>.png" + */ + String baseName; + + /** + * Suffix name of the bugreport/screenshot, is set to timestamp initially. User can make + * modifications to this using interface. */ String name; @@ -2021,6 +2063,12 @@ public class BugreportProgressService extends Service { boolean finished; /** + * Whether this bugreport is using API workflow. + * TODO(b/136066578): Remove when legacy bugreport methods are removed + */ + boolean usingApi; + + /** * Whether the details entries have been added to the bugreport yet. */ boolean addingDetailsToZip; @@ -2051,15 +2099,17 @@ public class BugreportProgressService extends Service { // onFinished() callback method is the only function where type is used. // Set type to -1 as it is unused in this workflow. // This constructor will soon be removed. - this(context, pid, name, max, null, null, -1); + this(context, pid, "" /* dumpstate handles basename */, name, max, null, null, -1, + false); this.id = id; } /** * Constructor for tracked bugreports - typically called upon receiving BUGREPORT_REQUESTED. */ - BugreportInfo(Context context, int pid, String name, int max, @Nullable String shareTitle, - @Nullable String shareDescription, int type) { + BugreportInfo(Context context, int pid, String baseName, String name, int max, + @Nullable String shareTitle, @Nullable String shareDescription, + @BugreportParams.BugreportMode int type, boolean usingApi) { this.context = context; this.pid = pid; this.name = name; @@ -2067,6 +2117,8 @@ public class BugreportProgressService extends Service { this.shareTitle = shareTitle == null ? "" : shareTitle; this.shareDescription = shareDescription == null ? "" : shareDescription; this.type = type; + this.baseName = baseName; + this.usingApi = usingApi; } /** @@ -2078,6 +2130,17 @@ public class BugreportProgressService extends Service { this.finished = true; } + ParcelFileDescriptor createBugreportFd() { + bugreportFile = new File(BUGREPORT_DIR, getFileName(this, ".zip")); + return createReadWriteFile(bugreportFile); + } + + ParcelFileDescriptor createScreenshotFd() { + File screenshotFile = new File(BUGREPORT_DIR, getFileName(this, ".png")); + addScreenshot(screenshotFile); + return createReadWriteFile(screenshotFile); + } + /** * Gets the name for next screenshot file. */ @@ -2103,7 +2166,12 @@ public class BugreportProgressService extends Service { final List<File> renamedFiles = new ArrayList<>(screenshotFiles.size()); for (File oldFile : screenshotFiles) { final String oldName = oldFile.getName(); - final String newName = oldName.replaceFirst(Integer.toString(pid), name); + final String newName; + if (usingApi) { + newName = getFileName(this, ".png"); + } else { + newName = oldName.replaceFirst(Integer.toString(pid), name); + } final File newFile; if (!newName.equals(oldName)) { final File renamedFile = new File(screenshotDir, newName); @@ -2118,6 +2186,18 @@ public class BugreportProgressService extends Service { screenshotFiles = renamedFiles; } + /** + * Rename bugreport file to include the name given by user via UI + */ + void renameBugreportFile() { + File newBugreportFile = new File(BUGREPORT_DIR, getFileName(this, ".zip")); + if (!newBugreportFile.getPath().equals(bugreportFile.getPath())) { + if (bugreportFile.renameTo(newBugreportFile)) { + bugreportFile = newBugreportFile; + } + } + } + String getFormattedLastUpdate() { if (context == null) { // Restored from Parcel @@ -2136,8 +2216,10 @@ public class BugreportProgressService extends Service { final StringBuilder builder = new StringBuilder() .append("\tid: ").append(id) .append(", pid: ").append(pid) + .append(", baseName: ").append(baseName) .append(", name: ").append(name) .append(", finished: ").append(finished) + .append(", usingApi: ").append(usingApi) .append("\n\ttitle: ").append(title) .append("\n\tdescription: "); if (description == null) { @@ -2169,6 +2251,7 @@ public class BugreportProgressService extends Service { context = null; id = in.readInt(); pid = in.readInt(); + baseName = in.readString(); name = in.readString(); title = in.readString(); description = in.readString(); @@ -2186,6 +2269,7 @@ public class BugreportProgressService extends Service { } finished = in.readInt() == 1; + usingApi = in.readInt() == 1; screenshotCounter = in.readInt(); shareDescription = in.readString(); shareTitle = in.readString(); @@ -2195,6 +2279,7 @@ public class BugreportProgressService extends Service { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(id); dest.writeInt(pid); + dest.writeString(baseName); dest.writeString(name); dest.writeString(title); dest.writeString(description); @@ -2212,6 +2297,7 @@ public class BugreportProgressService extends Service { } dest.writeInt(finished ? 1 : 0); + dest.writeInt(usingApi ? 1 : 0); dest.writeInt(screenshotCounter); dest.writeString(shareDescription); dest.writeString(shareTitle); @@ -2291,14 +2377,18 @@ public class BugreportProgressService extends Service { // The right, long-term solution is to provide an onFinished() callback // on IDumpstateListener and call it instead of using a broadcast. Log.w(TAG, "Dumpstate process died:\n" + info); - stopProgress(info.id); + synchronized (mLock) { + stopProgressLocked(info.id); + } } token.asBinder().unlinkToDeath(this, 0); } @Override public void onProgress(int progress) throws RemoteException { - checkProgressUpdated(info, progress); + synchronized (mLock) { + checkProgressUpdatedLocked(info, progress); + } } @Override @@ -2317,7 +2407,8 @@ public class BugreportProgressService extends Service { } - private void checkProgressUpdated(BugreportInfo info, int progress) { + @GuardedBy("mLock") + private void checkProgressUpdatedLocked(BugreportInfo info, int progress) { if (progress > CAPPED_PROGRESS) { progress = CAPPED_PROGRESS; } diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 403e894a68e4..b288eb7b5070 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -243,6 +243,9 @@ <!-- Permission to change the display color --> <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" /> + <!-- Query all packages on device on R+ --> + <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> + <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.UNREGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settings.flashlight.action.FLASHLIGHT_CHANGED" /> diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml index 11bcc8876b27..b9122d2a6ea5 100644 --- a/packages/SystemUI/res-keyguard/values-af/strings.xml +++ b/packages/SystemUI/res-keyguard/values-af/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Voer jou wagwoord in"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Verkeerde PIN-kode."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ongeldige kaart."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Volgelaai"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Gelaai"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laai tans draadloos"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laai tans"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laai tans vinnig"</string> diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml index 4feb9f1d2c13..4cabacaf7270 100644 --- a/packages/SystemUI/res-keyguard/values-am/strings.xml +++ b/packages/SystemUI/res-keyguard/values-am/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ይለፍ ቃልዎን ያስገቡ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ትክክል ያልሆነ ፒን ኮድ።"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ልክ ያልሆነ ካርድ።"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ሙሉ በሙሉ ኃይል ተሞልቷል"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ባትሪ ሞልቷል"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • በገመድ አልባ ኃይል በመሙላት ላይ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ኃይል በመሙላት ላይ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • በፍጥነት ኃይልን በመሙላት ላይ"</string> diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml index 4e163a2d331c..d0179537d860 100644 --- a/packages/SystemUI/res-keyguard/values-ar/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"أدخل كلمة المرور"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"رمز رقم التعريف الشخصي غير صحيح."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"بطاقة غير صالحة."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"تم شحن البطارية بالكامل"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"تم الشحن"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • جارٍ الشحن لاسلكيًا"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • جارٍ الشحن"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • جارٍ الشحن سريعًا"</string> diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml index e225675804d2..0c7dec3ae91d 100644 --- a/packages/SystemUI/res-keyguard/values-as/strings.xml +++ b/packages/SystemUI/res-keyguard/values-as/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"আপোনাৰ পাছৱর্ড দিয়ক"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ভুল পিন ক\'ড।"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ব্যৱহাৰৰ অযোগ্য ছিম কাৰ্ড"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"পূৰ্ণৰূপে চ্চাৰ্জ হৈছে"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"চ্চার্জ কৰা হ’ল"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • বেতাঁৰৰ জৰিয়তে চাৰ্জ কৰি থকা হৈছে"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • চ্চার্জ কৰি থকা হৈছে"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • দ্ৰুত গতিৰে চ্চাৰ্জ কৰি থকা হৈছে"</string> diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml index c0cf129a9408..8cdf2f0e1bf8 100644 --- a/packages/SystemUI/res-keyguard/values-az/strings.xml +++ b/packages/SystemUI/res-keyguard/values-az/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Şifrənizi daxil edin"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Yanlış PIN kod."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Yanlış Kart."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Tam dolub"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Enerji yığdı"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Simsiz şəkildə batareya yığır"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Enerji yığır"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Sürətlə enerji yığır"</string> diff --git a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml index 88ca77b4a977..eeda7cecc4ee 100644 --- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Unesite lozinku"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN kôd je netačan."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Nevažeća kartica."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Napunjena je u potpunosti"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Napunjena je"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bežično punjenje"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Puni se"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Brzo se puni"</string> diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml index a897fb2fbf92..09cda6b05147 100644 --- a/packages/SystemUI/res-keyguard/values-be/strings.xml +++ b/packages/SystemUI/res-keyguard/values-be/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Увядзіце пароль"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Няправільны PIN-код."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Несапраўдная картка."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Акумулятар поўнасцю зараджаны"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Зараджаны"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ідзе бесправадная зарадка"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ідзе зарадка"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ідзе хуткая зарадка"</string> diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml index eebdb9edc7f1..75942ea46da5 100644 --- a/packages/SystemUI/res-keyguard/values-bg/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Въведете паролата си"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Неправилен ПИН код."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Картата е невалидна."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Напълно заредено"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Заредена"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зарежда се безжично"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зарежда се"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зарежда се бързо"</string> diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml index b544c14fb0b0..0e8189f948fe 100644 --- a/packages/SystemUI/res-keyguard/values-bn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"পাসওয়ার্ড লিখুন"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ভুল পিন কোড দেওয়া হয়েছে।"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ভুল কার্ড।"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"সম্পূর্ণ চার্জ আছে"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"চার্জ হয়েছে"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ওয়্যারলেস পদ্ধতিতে চার্জ হচ্ছে"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • চার্জ হচ্ছে"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • দ্রুত চার্জ হচ্ছে"</string> diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml index 8547bc87a5d3..33fe43ffc1d2 100644 --- a/packages/SystemUI/res-keyguard/values-bs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Unesite lozinku"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Pogrešan PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Nevažeća kartica."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Potpuno napunjen"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Napunjeno"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bežično punjenje"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Punjenje"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Brzo punjenje"</string> diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml index ccde138c10b6..6c85fd3fe99f 100644 --- a/packages/SystemUI/res-keyguard/values-ca/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Introdueix la contrasenya"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"El codi PIN no és correcte."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"La targeta no és vàlida."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Completament carregada"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Bateria carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • S\'està carregant sense fil"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • S\'està carregant"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • S\'està carregant ràpidament"</string> diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml index 3adc2792ef10..e9443127d536 100644 --- a/packages/SystemUI/res-keyguard/values-cs/strings.xml +++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Zadejte heslo"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Nesprávný kód PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Neplatná karta."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Plně nabito"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Nabito"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bezdrátové nabíjení"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nabíjení"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Rychlé nabíjení"</string> diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml index 0e6a1f349d93..ac1791b9bef7 100644 --- a/packages/SystemUI/res-keyguard/values-da/strings.xml +++ b/packages/SystemUI/res-keyguard/values-da/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Angiv din adgangskode"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Forkert pinkode."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ugyldigt kort."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fuldt opladet"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Opladet"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Trådløs opladning"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Oplader"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Oplader hurtigt"</string> diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml index d44bfbc670a1..0607c8afd62e 100644 --- a/packages/SystemUI/res-keyguard/values-de/strings.xml +++ b/packages/SystemUI/res-keyguard/values-de/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Passwort eingeben"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Falscher PIN-Code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ungültige Karte."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Vollständig aufgeladen"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Aufgeladen"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kabelloses Laden"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Wird geladen"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Wird schnell geladen"</string> diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml index 46b1d30b865c..6997b16c03f2 100644 --- a/packages/SystemUI/res-keyguard/values-el/strings.xml +++ b/packages/SystemUI/res-keyguard/values-el/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Εισαγάγετε κωδικό πρόσβασης"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Λανθασμένος κωδικός PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Μη έγκυρη κάρτα."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Πλήρως φορτισμένη"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Φορτίστηκε"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ασύρματη φόρτιση"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Φόρτιση"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Γρήγορη φόρτιση"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml index 5640b6d3050a..19dd191ff899 100644 --- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index 5836b72a0cda..acfb7e294315 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml index 5640b6d3050a..19dd191ff899 100644 --- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml index 5640b6d3050a..19dd191ff899 100644 --- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml index fb968b76e24b..b29bd600b029 100644 --- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid Card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Charged"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging wirelessly"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string> diff --git a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml index 727cbad82ad2..aa5c4e0067ac 100644 --- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Ingresa tu contraseña"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Código PIN incorrecto"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Tarjeta no válida"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Carga completa"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Cargada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando de manera inalámbrica"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando rápidamente"</string> diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml index 870741ea0202..5f9a4568567f 100644 --- a/packages/SystemUI/res-keyguard/values-es/strings.xml +++ b/packages/SystemUI/res-keyguard/values-es/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Introduce tu contraseña"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"El código PIN es incorrecto."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Tarjeta no válida."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Carga completa"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Cargada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando sin cables"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando rápidamente"</string> diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml index b6cac13a728d..c555cedbd317 100644 --- a/packages/SystemUI/res-keyguard/values-et/strings.xml +++ b/packages/SystemUI/res-keyguard/values-et/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Sisestage parool"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Vale PIN-kood."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Kehtetu kaart."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Täielikult laetud"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Laetud"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Juhtmeta laadimine"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laadimine"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kiirlaadimine"</string> diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml index 8ad942b5c8ce..612b2de1b037 100644 --- a/packages/SystemUI/res-keyguard/values-eu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Idatzi pasahitza"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN kode hori ez da zuzena."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Txartelak ez du balio."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Erabat kargatuta"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Kargatuta"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Hari gabe kargatzen"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kargatzen"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Bizkor kargatzen"</string> diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml index 9c9de22b96d9..0bf01d999524 100644 --- a/packages/SystemUI/res-keyguard/values-fa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"گذرواژهتان را وارد کنید"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"کد پین اشتباه است."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"کارت نامعتبر"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"شارژ کامل است"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"شارژ کامل شد"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ بیسیم"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ شدن"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ سریع"</string> diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml index 66f1de5b292d..9b727a4daefd 100644 --- a/packages/SystemUI/res-keyguard/values-fi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Kirjoita salasana"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Väärä PIN-koodi"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Virheellinen kortti"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Täyteen ladattu"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Ladattu"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ladataan langattomasti"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ladataan"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ladataan nopeasti"</string> @@ -74,7 +74,7 @@ <string name="kg_sim_pin_instructions_multi" msgid="1643757228644271861">"Anna operaattorin <xliff:g id="CARRIER">%1$s</xliff:g> SIM-kortin PIN-koodi."</string> <string name="kg_sim_lock_esim_instructions" msgid="4416732549172148542">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Poista eSIM käytöstä, jos haluat käyttää laitetta ilman mobiililiittymää."</string> <string name="kg_pin_instructions" msgid="4069609316644030034">"Anna PIN-koodi."</string> - <string name="kg_password_instructions" msgid="136952397352976538">"Anna salasana"</string> + <string name="kg_password_instructions" msgid="136952397352976538">"Lisää salasana"</string> <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"SIM-kortti on nyt poistettu käytöstä. Jatka antamalla PUK-koodi. Saat lisätietoja ottamalla yhteyttä operaattoriin."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="1373131883510840794">"Operaattorin <xliff:g id="CARRIER">%1$s</xliff:g> SIM-kortti on nyt lukittu. Jatka antamalla PUK-koodi. Saat lisätietoja operaattoriltasi."</string> <string name="kg_puk_enter_pin_hint" msgid="3137789674920391087">"Anna haluamasi PIN-koodi."</string> diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml index 66c7c86f363e..a86cdbe8117b 100644 --- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Entrez votre mot de passe"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"NIP erroné."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Cette carte n\'est pas valide."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Complètement chargé"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Chargé"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • En recharge sans fil"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"En recharge : <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"En recharge rapide : <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml index d6aa5d262821..70075ecbe6f8 100644 --- a/packages/SystemUI/res-keyguard/values-fr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Saisissez votre mot de passe"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Le code est incorrect."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Carte non valide."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Complètement chargée"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Chargé"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Recharge sans fil"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Recharge…"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Recharge rapide…"</string> diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml index e6b10a00ba72..9504a3e5fd96 100644 --- a/packages/SystemUI/res-keyguard/values-gl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Introduce o contrasinal"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Código PIN incorrecto"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"A tarxeta non é válida."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Batería totalmente cargada"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Cargada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando sen fíos"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Cargando rapidamente"</string> diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml index 025462e37813..a2370d0fcfa4 100644 --- a/packages/SystemUI/res-keyguard/values-gu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"તમારો પાસવર્ડ દાખલ કરો"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ખોટો પિન કોડ."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"અમાન્ય કાર્ડ."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"સંપૂર્ણપણે ચાર્જ થયેલ"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ચાર્જ થઈ ગયું"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • વાયરલેસથી ચાર્જિંગ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ચાર્જિંગ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ઝડપથી ચાર્જિંગ"</string> diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml index 2de75e479334..f8e99a6fe3c2 100644 --- a/packages/SystemUI/res-keyguard/values-hi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"अपना पासवर्ड डालें"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"गलत पिन कोड."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"गलत कार्ड."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"पूरी तरह चार्ज हो गया"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"चार्ज हो गई है"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • वायरलेस तरीके से चार्ज हो रहा है"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • चार्ज हो रहा है"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • तेज़ चार्ज हो रहा है"</string> diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml index c4f7bba86002..1c9396af8ec3 100644 --- a/packages/SystemUI/res-keyguard/values-hr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Unesite zaporku"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN kôd nije točan."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Nevažeća kartica."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Potpuno napunjena baterija"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Napunjeno"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • bežično punjenje"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • punjenje"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • brzo punjenje"</string> diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml index 06142bc738b0..ea5ab940f6fe 100644 --- a/packages/SystemUI/res-keyguard/values-hu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Adja meg jelszavát"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Helytelen PIN-kód."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Érvénytelen kártya."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Teljesen feltöltve"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Feltöltve"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Vezeték nélküli töltés"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Töltés"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Gyors töltés"</string> diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml index f501fcc7c347..b34eced8b521 100644 --- a/packages/SystemUI/res-keyguard/values-hy/strings.xml +++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Մուտքագրեք գաղտնաբառը"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN կոդը սխալ է։"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Սխալ քարտ"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Ամբողջությամբ լիցքավորված է"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Լիցքավորված է"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Անլար լիցքավորում"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Լիցքավորում"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Արագ լիցքավորում"</string> diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml index 64f396edfef8..3dd6c915bb8a 100644 --- a/packages/SystemUI/res-keyguard/values-in/strings.xml +++ b/packages/SystemUI/res-keyguard/values-in/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Masukkan sandi"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Kode PIN salah."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Kartu Tidak Valid"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Terisi penuh"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Terisi"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengisi daya secara nirkabel"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengisi daya"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengisi daya dengan cepat"</string> diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml index aa33215fc124..c09dcc6f0b4e 100644 --- a/packages/SystemUI/res-keyguard/values-is/strings.xml +++ b/packages/SystemUI/res-keyguard/values-is/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Sláðu inn aðgangsorðið þitt"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Rangt PIN-númer."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ógilt kort."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fullhlaðin"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Fullhlaðin"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Í þráðlausri hleðslu"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Í hleðslu"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Hröð hleðsla"</string> diff --git a/packages/SystemUI/res-keyguard/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml index 761640c72010..3f5cfbb24380 100644 --- a/packages/SystemUI/res-keyguard/values-it/strings.xml +++ b/packages/SystemUI/res-keyguard/values-it/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Inserisci la password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Codice PIN errato."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Scheda non valida."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Completamente carica"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Carico"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • In carica wireless"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • In carica"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ricarica veloce"</string> diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml index e72c8081873a..95caf917e4d4 100644 --- a/packages/SystemUI/res-keyguard/values-iw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"יש להזין סיסמה"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"קוד הגישה שגוי"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"כרטיס לא חוקי."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"טעונה במלואה"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"הסוללה טעונה"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • בטעינה אלחוטית"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • בטעינה"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • בטעינה מהירה"</string> diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml index 27adb8c165eb..9872a076e816 100644 --- a/packages/SystemUI/res-keyguard/values-ja/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"パスワードを入力してください"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN コードが無効です。"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"無効なカードです。"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"充電完了"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"充電が完了しました"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ワイヤレス充電中"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 充電中"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 急速充電中"</string> diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml index d165230613c1..c3b5047b79b5 100644 --- a/packages/SystemUI/res-keyguard/values-ka/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"შეიყვანეთ პაროლი"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN-კოდი არასწორია."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ბარათი არასწორია."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ბოლომდე დატენილი"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"დატენილია"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • იტენება უსადენოდ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • იტენება"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • სწრაფად იტენება"</string> diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml index 85223468a0c2..e8741f9e1c32 100644 --- a/packages/SystemUI/res-keyguard/values-kk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Құпия сөзді енгізіңіз"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN коды қате"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Жарамсыз карта."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Толық зарядталды"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Зарядталды"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Сымсыз зарядталуда"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зарядталуда"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Жылдам зарядталуда"</string> diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml index 7b4266a1b816..d48de152b608 100644 --- a/packages/SystemUI/res-keyguard/values-km/strings.xml +++ b/packages/SystemUI/res-keyguard/values-km/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"បញ្ចូលពាក្យសម្ងាត់របស់អ្នក"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"កូដ PIN មិនត្រឹមត្រូវទេ។"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"បណ្ណមិនត្រឹមត្រូវទេ។"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"បានសាកថ្មពេញ"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"បានសាកថ្ម"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • កំពុងសាកថ្មឥតខ្សែ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • កំពុងសាកថ្ម"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • កំពុងសាកថ្មយ៉ាងឆាប់រហ័ស"</string> diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml index eaaa8298c8c6..7a6a0bfa8a68 100644 --- a/packages/SystemUI/res-keyguard/values-kn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ನಮೂದಿಸಿ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ತಪ್ಪಾದ ಪಿನ್ ಕೋಡ್."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ಅಮಾನ್ಯ ಕಾರ್ಡ್."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ಪೂರ್ಣವಾಗಿ ಚಾರ್ಜ್ ಆಗಿದೆ"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ಚಾರ್ಜ್ ಆಗಿದೆ"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ವೈರ್ಲೆಸ್ ಆಗಿ ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ವೇಗವಾಗಿ ಚಾರ್ಜ್ಮಾಡಲಾಗುತ್ತಿದೆ"</string> diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml index ca849372f202..9c1ffc8d0ae8 100644 --- a/packages/SystemUI/res-keyguard/values-ko/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"비밀번호 입력"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"잘못된 PIN 코드입니다."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"유효하지 않은 카드"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"충전 완료"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"충전됨"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 무선 충전 중"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 충전 중"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 고속 충전 중"</string> diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml index 805a567c7639..a1060004c5c3 100644 --- a/packages/SystemUI/res-keyguard/values-ky/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Сырсөзүңүздү киргизиңиз"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN-код туура эмес."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"SIM-карта жараксыз."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Толук кубатталды"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Кубатталды"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Зымсыз кубатталууда"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Кубатталууда"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Тез кубатталууда"</string> diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml index 1418d2750e83..e4d66a7c9774 100644 --- a/packages/SystemUI/res-keyguard/values-lo/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ປ້ອນລະຫັດຜ່ານຂອງທ່ານ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ລະຫັດ PIN ບໍ່ຖືກຕ້ອງ."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ບັດບໍ່ຖືກຕ້ອງ."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ສາກເຕັມແລ້ວ"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ສາກເຕັມແລ້ວ."</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ກຳລັງສາກໄຟໄຮ້ສາຍ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ກຳລັງສາກ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ກຳລັງສາກແບບດ່ວນ"</string> diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml index bbd25b2a6f9e..30e7cadffd8e 100644 --- a/packages/SystemUI/res-keyguard/values-lt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Įveskite slaptažodį"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Netinkamas PIN kodas."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Netinkama kortelė."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Visiškai įkrautas"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Įkrauta"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kraunama be laidų"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Įkraunama"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Greitai įkraunama"</string> diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml index 58ca8ce3fd11..8cafcd344ff1 100644 --- a/packages/SystemUI/res-keyguard/values-lv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Ievadiet paroli"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN kods nav pareizs."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Nederīga karte."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Pilnībā uzlādēts"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Akumulators uzlādēts"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Notiek bezvadu uzlāde"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Notiek uzlāde"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Notiek ātrā uzlāde"</string> diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml index 1ffd8a4ecec9..e2ab170b1aef 100644 --- a/packages/SystemUI/res-keyguard/values-mk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Внесете ја лозинката"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Погрешен PIN-код."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Неважечка картичка."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Целосно полна"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Полна"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Се полни безжично"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Се полни"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Брзо полнење"</string> diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml index 1f60c7365c31..33765b4ec001 100644 --- a/packages/SystemUI/res-keyguard/values-ml/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"നിങ്ങളുടെ പാസ്വേഡ് നല്കുക"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"പിൻ കോഡ് തെറ്റാണ്."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"അസാധുവായ കാർഡ്."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"പൂർണ്ണമായി ചാർജ് ചെയ്തു"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ചാർജായി"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • വയർലെസ്സ് ആയി ചാർജ് ചെയ്യുന്നു"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ചാർജ് ചെയ്യുന്നു"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • വേഗത്തിൽ ചാർജ് ചെയ്യുന്നു"</string> diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml index 55dd70c35b66..3451fb8ef6b6 100644 --- a/packages/SystemUI/res-keyguard/values-mn/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Нууц үгээ оруулна уу"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ПИН код буруу байна."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Карт хүчингүй байна."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Бүрэн цэнэглэсэн"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Цэнэглэсэн"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Утасгүй цэнэглэж байна"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Цэнэглэж байна"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Хурдан цэнэглэж байна"</string> diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index 0ba82e0d3d90..e86fa1069276 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"तुमचा पासवर्ड एंटर करा"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"चुकीचा पिन कोड."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"अवैध कार्ड."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"पूर्णपणे चार्ज"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"चार्ज झाली"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • वायरलेस पद्धतीने चार्ज करत आहे"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • चार्ज होत आहे"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • वेगाने चार्ज होत आहे"</string> diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml index 17e105619f96..80ccd3e463e9 100644 --- a/packages/SystemUI/res-keyguard/values-ms/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Masukkan kata laluan anda"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Kod PIN salah."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Kad Tidak Sah."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Dicas penuh"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Sudah dicas"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengecas secara wayarles"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengecas"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mengecas dengan cepat"</string> diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml index 28fe2b210cea..c1fa6be55cba 100644 --- a/packages/SystemUI/res-keyguard/values-my/strings.xml +++ b/packages/SystemUI/res-keyguard/values-my/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"သင့်စကားဝှက် ထည့်ပါ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ပင်နံပါတ် မှားနေသည်။"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ကတ် မမှန်ကန်ပါ။"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"အားအပြည့်သွင်းထားသည်"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"အားသွင်းပြီးပါပြီ"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ကြိုးမဲ့ အားသွင်းနေသည်"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • အားသွင်းနေသည်"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • အမြန်အားသွင်းနေသည်"</string> diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml index 692dcad14e6e..af99aa795625 100644 --- a/packages/SystemUI/res-keyguard/values-nb/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Skriv inn passordet ditt"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Feil PIN-kode."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ugyldig kort."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fulladet"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Oppladet"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Lader trådløst"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Lader"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Lader raskt"</string> diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml index 8102021247b3..82a4a198fa13 100644 --- a/packages/SystemUI/res-keyguard/values-ne/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"आफ्नो पासवर्ड प्रविष्ट गर्नु…"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN कोड गलत छ।"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"अमान्य कार्ड।"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"पूर्ण चार्ज भएको"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"चार्ज भयो"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • तारविनै चार्ज गर्दै"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • चार्ज गरिँदै"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • द्रुत गतिमा चार्ज गरिँदै"</string> diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml index c79f2f7a536b..c533956b1368 100644 --- a/packages/SystemUI/res-keyguard/values-nl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Geef je wachtwoord op"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Onjuiste pincode."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ongeldige kaart."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Volledig opgeladen"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Opgeladen"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Draadloos opladen"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Opladen"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Snel opladen"</string> diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml index c28561a07fe7..258c2a8d271b 100644 --- a/packages/SystemUI/res-keyguard/values-or/strings.xml +++ b/packages/SystemUI/res-keyguard/values-or/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ନିଜ ପାସ୍ୱର୍ଡ ଲେଖନ୍ତୁ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ଭୁଲ PIN କୋଡ୍।"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ଅମାନ୍ୟ କାର୍ଡ।"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ସମ୍ପୂର୍ଣ୍ଣ ଭାବରେ ଚାର୍ଜ ହୋଇଗଲା"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ଚାର୍ଜ ହୋଇଗଲା"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"ୱାୟାର୍ଲେସ୍ଭାବରେ <xliff:g id="PERCENTAGE">%s</xliff:g> • ଚାର୍ଜ ହୋଇଛି"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ଚାର୍ଜ ହେଉଛି"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ଦ୍ରୁତ ଭାବେ ଚାର୍ଜ ହେଉଛି"</string> diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml index 01b5d8ef4ba6..2c3f64ee3cbb 100644 --- a/packages/SystemUI/res-keyguard/values-pa/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"ਗਲਤ ਪਿੰਨ ਕੋਡ।"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"ਅਵੈਧ ਕਾਰਡ।"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ਪੂਰਾ ਚਾਰਜ"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ਚਾਰਜ ਹੋ ਗਿਆ"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ਬਿਨਾਂ ਤਾਰ ਤੋਂ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ਤੇਜ਼ੀ ਨਾਲ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml index f86a0824b8aa..b88440f987e9 100644 --- a/packages/SystemUI/res-keyguard/values-pl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Wpisz hasło"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Nieprawidłowy kod PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Nieprawidłowa karta."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Bateria w pełni naładowana"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Naładowana"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ładowanie bezprzewodowe"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ładowanie"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Szybkie ładowanie"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml index 436dd551df7e..ed552d49302c 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Digite sua senha"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Código PIN incorreto."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Cartão inválido."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Carga completa"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando sem fio"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando rapidamente"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index 2ba4268168c0..5dd0beb77328 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Introduza a palavra-passe."</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Código PIN incorreto."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Cartão inválido."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Totalmente carregada"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • A carregar sem fios"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • A carregar…"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • A carregar rapidamente…"</string> diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml index 436dd551df7e..ed552d49302c 100644 --- a/packages/SystemUI/res-keyguard/values-pt/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Digite sua senha"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Código PIN incorreto."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Cartão inválido."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Carga completa"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Carregada"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando sem fio"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Carregando rapidamente"</string> diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml index 6fdc95804129..13e15e33eb98 100644 --- a/packages/SystemUI/res-keyguard/values-ro/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Introduceți parola"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Cod PIN incorect."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Card nevalid"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Complet încărcată"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Încărcată"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Se încarcă wireless"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Se încarcă"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Se încarcă rapid"</string> diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml index f9bd05bb3e21..781a3e41f0db 100644 --- a/packages/SystemUI/res-keyguard/values-ru/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Введите пароль"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Неверный PIN-код."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ошибка SIM-карты."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Аккумулятор полностью заряжен"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Батарея заряжена"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Беспроводная зарядка"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"Идет зарядка (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"Идет быстрая зарядка (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string> diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml index e40be057dca6..e51aa966a7e6 100644 --- a/packages/SystemUI/res-keyguard/values-si/strings.xml +++ b/packages/SystemUI/res-keyguard/values-si/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ඔබේ මුරපදය ඇතුළු කරන්න"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"වැරදි PIN කේතයකි."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"වලංගු නොවන කාඩ්පත."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"සම්පූර්ණයෙන් ආරෝපණය වී ඇත"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"අරෝපිතයි"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • නොරැහැන්ව ආරෝපණ කෙරේ"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ආරෝපණය වෙමින්"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • වේගයෙන් ආරෝපණය වෙමින්"</string> diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml index e7800e955d08..4fe1e4fb8542 100644 --- a/packages/SystemUI/res-keyguard/values-sk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Zadajte heslo"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Nesprávny kód PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Neplatná karta."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Úplne nabité"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Nabité"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nabíja sa bezdrôtovo"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nabíja sa"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nabíja sa rýchlo"</string> diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml index cce3a3132477..822e1627b9ea 100644 --- a/packages/SystemUI/res-keyguard/values-sl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Vnesite geslo"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Napačna koda PIN."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Neveljavna kartica"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Popolnoma napolnjen"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Akumulator napolnjen"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • brezžično polnjenje"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • polnjenje"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • hitro polnjenje"</string> diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml index e4b37d0f1119..4636e6a653d2 100644 --- a/packages/SystemUI/res-keyguard/values-sq/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Fut fjalëkalimin"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Kodi PIN është i pasaktë."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Karta e pavlefshme."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"I ngarkuar plotësisht"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"I ngarkuar"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet me valë"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Po karikohet me shpejtësi"</string> diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml index 1e6de94125dd..033e93ba5ecb 100644 --- a/packages/SystemUI/res-keyguard/values-sr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Унесите лозинку"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN кôд је нетачан."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Неважећа картица."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Напуњена је у потпуности"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Напуњена је"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Бежично пуњење"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Пуни се"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Брзо се пуни"</string> diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml index 4cca1767a89d..8d7be977094f 100644 --- a/packages/SystemUI/res-keyguard/values-sv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Ange ditt lösenord"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Fel pinkod."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ogiltigt kort."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Fulladdad"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Laddat"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laddas trådlöst"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laddas"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Laddas snabbt"</string> diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml index df518596ebfa..5ab4d07224d3 100644 --- a/packages/SystemUI/res-keyguard/values-sw/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Weka nenosiri lako"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Nambari ya PIN si sahihi."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Kadi si Sahihi."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Imejaa chaji"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Betri imejaa"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Inachaji bila kutumia waya"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Inachaji"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Inachaji kwa kasi"</string> diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml index 9aa1972c9954..fa75b4d74c0f 100644 --- a/packages/SystemUI/res-keyguard/values-ta/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"கடவுச்சொல்லை உள்ளிடுக"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"தவறான பின் குறியீடு."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"செல்லாத சிம் கார்டு."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"முழுவதுமாகச் சார்ஜ் ஆகிவிட்டது"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"சார்ஜ் செய்யப்பட்டது"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • வயர்லெஸ் முறையில் சார்ஜாகிறது"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • சார்ஜாகிறது"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • வேகமாகச் சார்ஜாகிறது"</string> diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml index 925d67302b86..ad89ba786571 100644 --- a/packages/SystemUI/res-keyguard/values-te/strings.xml +++ b/packages/SystemUI/res-keyguard/values-te/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"మీ పాస్వర్డ్ను నమోదు చేయండి"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"పిన్ కోడ్ తప్పు."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"చెల్లని కార్డ్."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"పూర్తిగా ఛార్జ్ చేయబడింది"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ఛార్జ్ చేయబడింది"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • వైర్ లేకుండా ఛార్జ్ అవుతోంది"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • ఛార్జ్ అవుతోంది"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • వేగంగా ఛార్జ్ అవుతోంది"</string> diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml index c439c3279e93..caa60f388970 100644 --- a/packages/SystemUI/res-keyguard/values-th/strings.xml +++ b/packages/SystemUI/res-keyguard/values-th/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"ป้อนรหัสผ่าน"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"รหัส PIN ไม่ถูกต้อง"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"การ์ดไม่ถูกต้อง"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"ชาร์จเต็มแล้ว"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"ชาร์จแล้ว"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • กำลังชาร์จแบบไร้สาย"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • กำลังชาร์จ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • กำลังชาร์จอย่างเร็ว"</string> diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml index a9ca1b627019..65b87e3382ca 100644 --- a/packages/SystemUI/res-keyguard/values-tl/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Ilagay ang iyong password"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Mali ang PIN code."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Di-wasto ang Card."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Puno na ang baterya"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Tapos nang mag-charge"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Wireless na nagcha-charge"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Nagcha-charge"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Mabilis na nagcha-charge"</string> diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml index 4e8150501ff0..c35e99e5e940 100644 --- a/packages/SystemUI/res-keyguard/values-tr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Şifrenizi girin"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Yanlış PIN kodu."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Geçersiz Kart."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Tamamen şarj edildi"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Şarj oldu"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Kablosuz olarak şarj ediliyor"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Şarj oluyor"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Hızlı şarj oluyor"</string> diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml index c683e329f17b..c2b9419d47e8 100644 --- a/packages/SystemUI/res-keyguard/values-uk/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Введіть пароль"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Неправильний PIN-код."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Недійсна картка."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Повністю заряджений"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Заряджено"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Бездротове заряджання"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Заряджання"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Швидке заряджання"</string> diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml index 96b949bccc3d..8a7409385a95 100644 --- a/packages/SystemUI/res-keyguard/values-ur/strings.xml +++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"اپنا پاس ورڈ درج کریں"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"غلط PIN کوڈ۔"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"غلط کارڈ۔"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"مکمل طور پر چارج ہو گيا"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"چارج ہوگئی"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • وائرلیس طریقے سے چارج ہو رہا ہے"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • چارج ہو رہا ہے"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • تیزی سے چارج ہو رہا ہے"</string> diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml index 80509ac2fab2..5bf38eca9990 100644 --- a/packages/SystemUI/res-keyguard/values-uz/strings.xml +++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml @@ -33,9 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Parolni kiriting"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN kodi xato."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"SIM karta yaroqsiz."</string> - <!-- String.format failed for translation --> - <!-- no translation found for keyguard_charged (3316115607283493413) --> - <skip /> + <string name="keyguard_charged" msgid="2222329688813033109">"Batareya quvvati to‘ldi"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Simsiz quvvatlanyapti"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Quvvat olmoqda"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Tezkor quvvat olmoqda"</string> diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml index b8c199897daa..c50891eb65ef 100644 --- a/packages/SystemUI/res-keyguard/values-vi/strings.xml +++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Nhập mật khẩu của bạn"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Mã PIN không chính xác."</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Thẻ không hợp lệ."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Đã sạc đầy"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Đã sạc đầy"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Đang sạc không dây"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Đang sạc"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Đang sạc nhanh"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml index 88fc36335f1e..e4438f976d26 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"输入您的密码"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN 码有误。"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"SIM 卡无效。"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"充电完成"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"已充满电"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在无线充电"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在充电"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在快速充电"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml index 2d84106f9ba2..4134527891b7 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"請輸入密碼"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN 碼不正確。"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"SIM 卡無效。"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"充電完成"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"已完成充電"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 無線充電中"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在充電"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 正在快速充電"</string> diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml index 18b94795eee4..fd95559f9da6 100644 --- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"輸入密碼"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"PIN 碼不正確。"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"卡片無效。"</string> - <string name="keyguard_charged" msgid="3316115607283493413">"充電完成"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"充電完成"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 無線充電"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 充電中"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • 快速充電中"</string> diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml index 6a7f6475809e..f60599df8c86 100644 --- a/packages/SystemUI/res-keyguard/values-zu/strings.xml +++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml @@ -33,7 +33,7 @@ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Faka iphasiwedi yakho"</string> <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Ikhodi ye-PIN engalungile!"</string> <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Ikhadi elingavumelekile."</string> - <string name="keyguard_charged" msgid="3316115607283493413">"Ishaje ngokuphelele"</string> + <string name="keyguard_charged" msgid="2222329688813033109">"Kushajiwe"</string> <string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Iyashaja ngaphandle kwentambo"</string> <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Iyashaja"</string> <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Ishaja kaningi"</string> diff --git a/packages/SystemUI/res/drawable/auth_dialog_lock.xml b/packages/SystemUI/res/drawable/auth_dialog_lock.xml new file mode 100644 index 000000000000..8146c16e4aaf --- /dev/null +++ b/packages/SystemUI/res/drawable/auth_dialog_lock.xml @@ -0,0 +1,27 @@ +<!-- + ~ Copyright (C) 2019 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="32dp" + android:height="32dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="?android:attr/colorAccent" + android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/> + <path + android:fillColor="?android:attr/colorAccent" + android:pathData="M18,8h-1.5V5.5C16.5,3.01 14.49,1 12,1S7.5,3.01 7.5,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9.5,5.5C9.5,4.12 10.62,3 12,3c1.38,0 2.5,1.12 2.5,2.5V8h-5V5.5zM18,20H6V10h1.5h9H18V20z"/> +</vector> diff --git a/packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml b/packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml new file mode 100644 index 000000000000..c3fa39e5a87f --- /dev/null +++ b/packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml @@ -0,0 +1,113 @@ +<!-- + ~ Copyright (C) 2019 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<com.android.systemui.biometrics.AuthCredentialPatternView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" + android:elevation="@dimen/biometric_dialog_elevation"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical"> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + <ImageView + android:layout_width="32dp" + android:layout_height="32dp" + android:background="@drawable/auth_dialog_lock"/> + + <TextView + android:id="@+id/title" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="12dp" + android:textSize="20sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:gravity="center" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + <TextView + android:id="@+id/error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/colorError"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + </LinearLayout> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + android:gravity="center"> + + <com.android.internal.widget.LockPatternView + android:id="@+id/lockPattern" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="40dp" + android:layout_marginRight="40dp" + android:layout_gravity="center" + android:clipChildren="false" + android:clipToPadding="false" + style="@style/LockPatternStyleBiometricPrompt"/> + + </LinearLayout> + +</com.android.systemui.biometrics.AuthCredentialPatternView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/auth_container_view.xml b/packages/SystemUI/res/layout/auth_container_view.xml index 23199aacc093..3db01a4e7f3a 100644 --- a/packages/SystemUI/res/layout/auth_container_view.xml +++ b/packages/SystemUI/res/layout/auth_container_view.xml @@ -34,7 +34,7 @@ android:elevation="@dimen/biometric_dialog_elevation"/> <ScrollView - android:id="@+id/scrollview" + android:id="@+id/biometric_scrollview" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" diff --git a/packages/SystemUI/res/layout/auth_credential_password_view.xml b/packages/SystemUI/res/layout/auth_credential_password_view.xml new file mode 100644 index 000000000000..4aed0333e9ca --- /dev/null +++ b/packages/SystemUI/res/layout/auth_credential_password_view.xml @@ -0,0 +1,101 @@ +<!-- + ~ Copyright (C) 2019 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<com.android.systemui.biometrics.AuthCredentialPasswordView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center_horizontal" + android:elevation="@dimen/biometric_dialog_elevation"> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + <ImageView + android:layout_width="32dp" + android:layout_height="32dp" + android:background="@drawable/auth_dialog_lock"/> + + <TextView + android:id="@+id/title" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="12dp" + android:textSize="20sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:gravity="center" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + <TextView + android:id="@+id/error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/colorError"/> + + <EditText + android:id="@+id/lockPassword" + android:layout_marginBottom="20dp" + android:layout_marginLeft="100dp" + android:layout_marginRight="100dp" + android:layout_width="208dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:inputType="textPassword" + android:maxLength="500" + android:textSize="16sp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:imeOptions="flagForceAscii" + style="@style/LockPatternStyleBiometricPrompt"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="5"/> + +</com.android.systemui.biometrics.AuthCredentialPasswordView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/auth_credential_pattern_view.xml b/packages/SystemUI/res/layout/auth_credential_pattern_view.xml new file mode 100644 index 000000000000..c9edcd606277 --- /dev/null +++ b/packages/SystemUI/res/layout/auth_credential_pattern_view.xml @@ -0,0 +1,97 @@ +<!-- + ~ Copyright (C) 2019 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<com.android.systemui.biometrics.AuthCredentialPatternView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center_horizontal" + android:elevation="@dimen/biometric_dialog_elevation"> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + + <ImageView + android:layout_width="32dp" + android:layout_height="32dp" + android:background="@drawable/auth_dialog_lock"/> + + <TextView + android:id="@+id/title" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="12dp" + android:textSize="20sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary"/> + + <TextView + android:id="@+id/description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginTop="8dp" + android:gravity="center" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="3"/> + + <TextView + android:id="@+id/error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textSize="16sp" + android:gravity="center" + android:textColor="?android:attr/colorError"/> + + <com.android.internal.widget.LockPatternView + android:id="@+id/lockPattern" + android:layout_marginBottom="20dp" + android:layout_marginLeft="40dp" + android:layout_marginRight="40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:clipChildren="false" + android:clipToPadding="false" + style="@style/LockPatternStyleBiometricPrompt"/> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1"/> + +</com.android.systemui.biometrics.AuthCredentialPatternView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index e7c6b2574f5f..0e59a41a8e2c 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -17,14 +17,9 @@ */ --> -<com.android.systemui.statusbar.phone.NotificationPanelView +<merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" - android:id="@+id/notification_panel" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/transparent" > - + xmlns:systemui="http://schemas.android.com/apk/res-auto"> <FrameLayout android:id="@+id/big_clock_container" android:layout_width="match_parent" @@ -112,5 +107,4 @@ android:background="@drawable/qs_navbar_scrim" /> <include layout="@layout/status_bar_expanded_plugin_frame"/> - -</com.android.systemui.statusbar.phone.NotificationPanelView> +</merge>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 9716a00a7f72..57834da76285 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -64,7 +64,7 @@ sysui:ignoreRightInset="true" /> - <include layout="@layout/status_bar_expanded" + <ViewStub android:id="@+id/status_bar_expanded" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 4d451bc62efa..b0b46154613a 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Stel invoer metodes op"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fisiese sleutelbord"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> te hanteer?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bevestig"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tik op Bevestig om te voltooi"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Gestaaf"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Raak die vingerafdruksensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Vingerafdrukikoon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Soek tans vir jou …"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Kennisgewings"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flitslig"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiele data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datagebruik"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Oorblywende data"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 4d0a62eeabbc..e423c6ab93d3 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"የግቤት ስልቶችን አዘጋጅ"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"የሚዳሰስ የቁልፍ ሰሌዳ"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> <xliff:g id="USB_DEVICE">%2$s</xliff:g>ን እንዲደርስበት ይፈቀድለት?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ን እንዲደርስበት ይፈቀድለት?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ን እንዲይዘው <xliff:g id="APPLICATION">%1$s</xliff:g> ይክፈት?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ን እንዲይዘው <xliff:g id="APPLICATION">%1$s</xliff:g> ይክፈት?"</string> @@ -108,7 +110,7 @@ <string name="accessibility_phone_button" msgid="6738112589538563574">"ስልክ"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"የድምጽ እርዳታ"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"ክፈት"</string> - <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"አሻራን በመጠባበቅ ላይ"</string> + <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"የጣት አሻራን በመጠባበቅ ላይ"</string> <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"የጣት አሻራዎን ሳይጠቀሙ ይክፈቱ"</string> <string name="accessibility_scanning_face" msgid="769545173211758586">"የቅኝት ፊት"</string> <string name="accessibility_send_smart_reply" msgid="7766727839703044493">"ላክ"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ተረጋግጧል"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ለማጠናቀቅ አረጋግጥን መታ ያድርጉ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"የተረጋገጠ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"የጣት አሻራ ዳሳሹን ይንኩ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"የጣት አሻራ አዶ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"እርስዎን በመፈለግ ላይ…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ማሳወቂያዎች"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"የባትሪ ብርሃን"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"የተንቀሳቃሽ ስልክ ውሂብ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"የውሂብ አጠቃቀም"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ቀሪ ውሂብ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 787fc8d48e8f..3b145105683a 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"إعداد أسلوب الإدخال"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"لوحة مفاتيح فعلية"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"هل تريد السماح لتطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> بالدخول إلى <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"هل تريد السماح لتطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> بالدخول إلى <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>؟"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"هل تريد فتح <xliff:g id="APPLICATION">%1$s</xliff:g> للتعامل مع <xliff:g id="USB_DEVICE">%2$s</xliff:g>؟"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"هل تريد فتح تطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> للتعامل مع <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>؟"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"تمّ التأكيد."</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"يمكنك النقر على \"تأكيد\" لإكمال المهمة."</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"مصادقة"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"المس زر استشعار بصمة الإصبع"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"رمز بصمة الإصبع"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"جارٍ البحث عن وجهك…"</string> @@ -372,6 +388,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"الإشعارات"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"الفلاش"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"بيانات الجوّال"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"استخدام البيانات"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"البيانات المتبقية"</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index d7feb0cc7f12..c3ca88a64890 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ইনপুট পদ্ধতি ছেট আপ কৰক"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"বাস্তৱিক কীব\'ৰ্ড"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ত প্ৰৱেশ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g>ক অনুমতি দিবনে?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g>ক <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ত প্ৰৱেশ কৰিবলৈ অনুমতি দিবনে?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ক ব্যৱহাৰ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g>ক খোলেনে?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ক ব্যৱহাৰ কৰিবলৈ <xliff:g id="APPLICATION">%1$s</xliff:g>ক খোলেনে?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"নিশ্চিত কৰিলে"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"সম্পূৰ্ণ কৰিবলৈ নিশ্চিত কৰক-ত টিপক"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ কৰা হ’ল"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো স্পৰ্শ কৰক"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ফিংগাৰপ্ৰিণ্ট আইকন"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"আপোনাৰ মুখমণ্ডল বিচাৰি আছে…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"জাননীসমূহ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ফ্লাশ্বলাইট"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ম’বাইল ডেটা"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ডেটা ব্যৱহাৰ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"বাকী থকা ডেটা"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index f6cd5dc2fd4a..67e24c515526 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Daxiletmə metodlarını ayarlayın"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fiziki klaviatura"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına giriş icazəsi verilsin?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqinə <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> cihazına giriş icazəsi verilsin?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> cihazını idarə etmək üçün <xliff:g id="APPLICATION">%1$s</xliff:g> tətbiqi açılsın?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Təsdiqləndi"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tamamlamaq üçün \"Təsdiq edin\" seçiminə toxunun"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Doğrulandı"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Barmaq izi sensoruna klikləyin"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Barmaq izi ikonası"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Siz axtarılırsınız…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Bildirişlər"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"İşartı"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobil data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data istifadəsi"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Qalan data"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 2196c15354f5..3def744d51e2 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Podesi metode unosa"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizička tastatura"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Želite li da dozvolite da <xliff:g id="APPLICATION">%1$s</xliff:g> pristupa uređaju <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Želite li da dozvolite da <xliff:g id="APPLICATION">%1$s</xliff:g> pristupa uređaju <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Želite li da otvorite aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> da biste koristili uređaj <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Želite li da otvorite aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> da biste koristili uređaj <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Dodirnite Potvrdi da biste završili"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Identitet je potvrđen"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor za otisak prsta"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otiska prsta"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obaveštenja"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lampa"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilni podaci"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Potrošnja podataka"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Preostala količina podataka"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index 06ee3e19c735..cdb4ddb000ed 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Налада метадаў уводу"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Фізічная клавіятура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Дазволіць праграме <xliff:g id="APPLICATION">%1$s</xliff:g> доступ да прылады <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Дазволіць праграме <xliff:g id="APPLICATION">%1$s</xliff:g> доступ да прылады <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Адкрыць праграму <xliff:g id="APPLICATION">%1$s</xliff:g> для працы з прыладай <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Адкрыць праграму <xliff:g id="APPLICATION">%1$s</xliff:g> для працы з прыладай <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Пацверджана"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Націсніце \"Пацвердзіць\", каб завяршыць"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Распазнана"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Дакраніцеся да сканера адбіткаў пальцаў"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок адбіткаў пальцаў"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ідзе пошук вашага твару…"</string> @@ -370,6 +386,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Апавяшчэнні"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Ліхтарык"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мабільная перадача даных"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Выкарыстанне трафіка"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Засталося трафіку"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 6f37a7568ea7..cd222909a234 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Методи на въвеждане: Настройка"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Физическа клавиатура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Да се разреши ли на <xliff:g id="APPLICATION">%1$s</xliff:g> достъп до <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Да се разреши ли на <xliff:g id="APPLICATION">%1$s</xliff:g> достъп до <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Да се използва ли <xliff:g id="APPLICATION">%1$s</xliff:g> за работата с/ъс <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Да се използва ли <xliff:g id="APPLICATION">%1$s</xliff:g> за работата с/ъс <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Потвърдено"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Докоснете „Потвърждаване“ за завършване"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Удостоверено"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Докоснете сензора за отпечатъци"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона за отпечатък"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Търсим ви…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Известия"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Фенерче"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобилни данни"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Пренос на данни"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Оставащи данни"</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 9c33f2be5aea..11a6e90a9504 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ইনপুট পদ্ধতিগুলি সেট-আপ করুন"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ফিজিক্যাল কীবোর্ড"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> কে <xliff:g id="USB_DEVICE">%2$s</xliff:g> অ্যাক্সেস করতে দেবেন?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> কে <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> অ্যাক্সেস করতে দেবেন?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ব্যবহার করার জন্য <xliff:g id="APPLICATION">%1$s</xliff:g> চালু করবেন?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ব্যবহার করার জন্য <xliff:g id="APPLICATION">%1$s</xliff:g> চালু করবেন?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"কনফার্ম করা হয়েছে"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"সম্পূর্ণ করতে \'কনফার্ম করুন\' বোতামে ট্যাপ করুন"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"প্রমাণীকৃত"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"আঙ্গুলের ছাপের সেন্সর স্পর্শ করুন"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"আঙ্গুলের ছাপের আইকন"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"আপনার জন্য খোঁজা হচ্ছে…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"বিজ্ঞপ্তি"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ফ্ল্যাশলাইট"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"মোবাইল ডেটা"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ডেটার ব্যবহার"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"অবশিষ্ট ডেটা"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 2d776265df66..7eaa9c462fc1 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Postavljanje načina unosa"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizička tastatura"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup uređaju: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Dozvoliti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup dodatku: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje uređajem: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje dodatkom: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Dodirnite Potvrdi da završite"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentificirano"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor za otisak prsta"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona za otisak prsta"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obavještenja"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Svjetiljka"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Prijenos podataka na mobilnoj mreži"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Prijenos podataka"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Preostala količina podataka"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index ee16c58909ea..3bd72b36026d 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configura els mètodes d\'entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclat físic"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vols permetre que <xliff:g id="APPLICATION">%1$s</xliff:g> accedeixi a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vols permetre que <xliff:g id="APPLICATION">%1$s</xliff:g> accedeixi a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vols obrir <xliff:g id="APPLICATION">%1$s</xliff:g> per gestionar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vols obrir <xliff:g id="APPLICATION">%1$s</xliff:g> per gestionar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmat"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toca Confirma per completar"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticat"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor d\'empremtes digitals"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona d\'empremta digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"S\'està cercant la teva cara…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificacions"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Llanterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dades mòbils"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Ús de dades"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dades restants"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index bed63db83d1a..b3a8596409d8 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Nastavit metody zadávání"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fyzická klávesnice"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Povolit aplikaci <xliff:g id="APPLICATION">%1$s</xliff:g> přístup k zařízení <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Povolit aplikaci <xliff:g id="APPLICATION">%1$s</xliff:g> přístup k zařízení <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Otevřít aplikaci <xliff:g id="APPLICATION">%1$s</xliff:g> ke správě zařízení <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Otevřít aplikaci <xliff:g id="APPLICATION">%1$s</xliff:g> ke správě zařízení <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potvrzeno"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Ověření dokončíte klepnutím na Potvrdit"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Ověřeno"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotkněte se snímače otisků prstů"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otisku prstu"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hledáme vás…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Oznámení"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Svítilna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilní data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Využití dat"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Zbývající data"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 45ef5b14f2e9..f0e589891c81 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfigurer inputmetoder"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fysisk tastatur"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vil du give <xliff:g id="APPLICATION">%1$s</xliff:g> adgang til <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vil du give <xliff:g id="APPLICATION">%1$s</xliff:g> adgang til <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vil du åbne <xliff:g id="APPLICATION">%1$s</xliff:g> til håndtering af <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vil du åbne <xliff:g id="APPLICATION">%1$s</xliff:g> til håndtering af <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bekræftet"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tryk på Bekræft for at udføre"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Godkendt"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sæt fingeren på fingeraftrykslæseren"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon for fingeraftryk"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Forsøger at finde dig…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifikationer"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lommelygte"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobildata"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Dataforbrug"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Resterende data"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 1deceb17bf01..f32c5773f629 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Eingabemethoden festlegen"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physische Tastatur"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_DEVICE">%2$s</xliff:g> gewähren?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> den Zugriff auf <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> gewähren?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Für <xliff:g id="USB_DEVICE">%2$s</xliff:g> <xliff:g id="APPLICATION">%1$s</xliff:g> öffnen?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Für <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> <xliff:g id="APPLICATION">%1$s</xliff:g> öffnen?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bestätigt"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Zum Abschließen auf \"Bestätigen\" tippen"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authentifiziert"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Berühre den Fingerabdrucksensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerabdruck-Symbol"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Wir suchen nach dir…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Benachrichtigungen"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Taschenlampe"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile Daten"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datennutzung"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Verbleibende Daten"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 2b57ab58bc77..ce693ee15993 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Ρύθμιση μεθόδων εισαγωγής"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Φυσικό πληκτρολόγιο"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Να επιτρέπεται η πρόσβαση της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> στη συσκευή <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Να επιτρέπεται η πρόσβαση της εφαρμογής <xliff:g id="APPLICATION">%1$s</xliff:g> στο αξεσουάρ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>;"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Να ανοίγει η εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> για τη διαχείριση της συσκευής <xliff:g id="USB_DEVICE">%2$s</xliff:g>;"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Να ανοίγει η εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> για τη διαχείριση του αξεσουάρ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>;"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Επιβεβαιώθηκε"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Πατήστε Επιβεβαίωση για ολοκλήρωση"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Ολοκληρώθηκε ο έλεγχος ταυτότητας"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Αγγίξτε τον αισθητήρα δακτυλικών αποτυπωμάτων"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Εικονίδιο δακτυλικών αποτυπωμάτων"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Αναζήτηση για εσάς…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ειδοποιήσεις"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Φακός"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Δεδομένα κινητής τηλεφωνίας"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Χρήση δεδομένων"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Υπολειπόμενα δεδομένα"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 7a6271f9710b..013b4cb23063 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -47,6 +47,7 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_permission_prompt_warn" msgid="1842558472039505091">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +127,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tap Confirm to complete"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authenticated"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string> @@ -364,6 +379,7 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Torch"</string> + <string name="quick_settings_flashlight_camera_in_use" msgid="6120370795890963385">"Camera in use"</string> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index fe19e7c21d8c..a21ecb494bad 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -47,6 +47,7 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_permission_prompt_warn" msgid="1842558472039505091">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +127,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tap Confirm to complete"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authenticated"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string> @@ -364,6 +379,7 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flashlight"</string> + <string name="quick_settings_flashlight_camera_in_use" msgid="6120370795890963385">"Camera in use"</string> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 7a6271f9710b..013b4cb23063 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -47,6 +47,7 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_permission_prompt_warn" msgid="1842558472039505091">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +127,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tap Confirm to complete"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authenticated"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string> @@ -364,6 +379,7 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Torch"</string> + <string name="quick_settings_flashlight_camera_in_use" msgid="6120370795890963385">"Camera in use"</string> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 7a6271f9710b..013b4cb23063 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -47,6 +47,7 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_permission_prompt_warn" msgid="1842558472039505091">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +127,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tap Confirm to complete"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authenticated"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string> @@ -364,6 +379,7 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Torch"</string> + <string name="quick_settings_flashlight_camera_in_use" msgid="6120370795890963385">"Camera in use"</string> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string> diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml index 32469f20ca6b..d8cfb3049a6c 100644 --- a/packages/SystemUI/res/values-en-rXC/strings.xml +++ b/packages/SystemUI/res/values-en-rXC/strings.xml @@ -47,6 +47,7 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <string name="usb_device_permission_prompt_warn" msgid="1842558472039505091">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?\nThis app has not been granted record permission but could capture audio through this USB device."</string> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +127,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmed"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tap Confirm to complete"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authenticated"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string> @@ -364,6 +379,7 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flashlight"</string> + <string name="quick_settings_flashlight_camera_in_use" msgid="6120370795890963385">"Camera in use"</string> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index f29aa1e0beae..4b2943c394e1 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos de intro."</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"¿Deseas permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"¿Deseas permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"¿Deseas abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para usar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"¿Deseas abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para usar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmado"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Presiona Confirmar para completarla"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor de huellas digitales"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícono de huella digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Autenticando tu rostro…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificaciones"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Linterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Datos móviles"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Uso de datos"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Datos restantes"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 308809849bbb..903c50a3b344 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"¿Quieres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"¿Quieres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"¿Quieres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"¿Quieres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toca Confirmar para completar la acción"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Se ha autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca el sensor de huellas digitales"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icono de huella digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Buscando tu cara…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificaciones"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Linterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Datos móviles"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Uso de datos"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Datos restantes"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index 51226abf1e84..113b2073ca2e 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Seadista sisestusmeetodeid"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Füüsiline klaviatuur"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Kas lubada rakendusele <xliff:g id="APPLICATION">%1$s</xliff:g> juurdepääs seadmele <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Kas lubada rakendusele <xliff:g id="APPLICATION">%1$s</xliff:g> juurdepääs seadmele <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Kas avada rakendus <xliff:g id="APPLICATION">%1$s</xliff:g> seadme <xliff:g id="USB_DEVICE">%2$s</xliff:g> kasutamiseks?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Kas avada rakendus <xliff:g id="APPLICATION">%1$s</xliff:g> seadme <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> kasutamiseks?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Kinnitatud"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Lõpuleviimiseks puudutage nuppu Kinnita"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenditud"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Puudutage sõrmejäljeandurit"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Sõrmejälje ikoon"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Otsitakse teid …"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Märguanded"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Taskulamp"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiilne andmeside"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Andmeside kasutus"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Järelejäänud andmemaht"</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 0d2863e265fb..e541329fc81d 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfiguratu idazketa-metodoak"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teklatu fisikoa"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> atzitzeko baimena eman nahi diozu <xliff:g id="APPLICATION">%1$s</xliff:g> aplikazioari?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> atzitzeko baimena eman nahi diozu <xliff:g id="APPLICATION">%1$s</xliff:g> aplikazioari?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="APPLICATION">%1$s</xliff:g> ireki nahi duzu <xliff:g id="USB_DEVICE">%2$s</xliff:g> kudeatzeko?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="APPLICATION">%1$s</xliff:g> ireki nahi duzu <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> kudeatzeko?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Berretsita"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Amaitzeko, sakatu \"Berretsi\""</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentifikatuta"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sakatu hatz-marken sentsorea"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Hatz-markaren ikonoa"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Zure bila…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Jakinarazpenak"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Linterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Datu-konexioa"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datuen erabilera"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Geratzen diren datuak"</string> @@ -897,7 +915,7 @@ <string name="mobile_data_disable_message" msgid="4756541658791493506">"<xliff:g id="CARRIER">%s</xliff:g> erabilita ezingo dituzu erabili datuak edo Internet. Wifi-sare baten bidez soilik konektatu ahal izango zara Internetera."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6078110473451946831">"Uneko operadorea"</string> <string name="touch_filtered_warning" msgid="8671693809204767551">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string> - <string name="slice_permission_title" msgid="7465009437851044444">"<xliff:g id="APP_0">%1$s</xliff:g> aplikazioari <xliff:g id="APP_2">%2$s</xliff:g> aplikazioaren zatiak erakusteko baimena eman nahi diozu?"</string> + <string name="slice_permission_title" msgid="7465009437851044444">"<xliff:g id="APP_2">%2$s</xliff:g> aplikazioaren zatiak erakusteko baimena eman nahi diozu <xliff:g id="APP_0">%1$s</xliff:g> aplikazioari?"</string> <string name="slice_permission_text_1" msgid="3514586565609596523">"- <xliff:g id="APP">%1$s</xliff:g> aplikazioaren informazioa irakur dezake."</string> <string name="slice_permission_text_2" msgid="3146758297471143723">"- <xliff:g id="APP">%1$s</xliff:g> aplikazioan ekintzak gauza ditzake."</string> <string name="slice_permission_checkbox" msgid="7986504458640562900">"Baimendu <xliff:g id="APP">%1$s</xliff:g> aplikazioari edozein aplikazioren zatiak erakustea"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index e649d809db98..232f7a27ec86 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"تنظیم روشهای ورودی"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"صفحهکلید فیزیکی"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"به <xliff:g id="APPLICATION">%1$s</xliff:g> برای دسترسی به <xliff:g id="USB_DEVICE">%2$s</xliff:g> اجازه داده شود؟"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"به <xliff:g id="APPLICATION">%1$s</xliff:g> برای دسترسی به <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> اجازه داده شود؟"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"برای استفاده از <xliff:g id="USB_DEVICE">%2$s</xliff:g>، <xliff:g id="APPLICATION">%1$s</xliff:g> باز شود؟"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"برای استفاده از <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>، <xliff:g id="APPLICATION">%1$s</xliff:g> باز شود؟"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"تأیید شد"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"برای تکمیل، روی تأیید ضربه بزنید"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"راستیآزماییشده"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"حسگر اثر انگشت را لمس کنید"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"نماد اثر انگشت"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"درحال جستجوی شما…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"اعلانها"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"چراغ قوه"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"داده تلفن همراه"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"مصرف داده"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"دادههای باقیمانده"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index e19575428211..5767c3c543fc 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Määritä syöttötavat"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fyysinen näppäimistö"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Saako <xliff:g id="APPLICATION">%1$s</xliff:g> käyttöoikeuden (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Saako <xliff:g id="APPLICATION">%1$s</xliff:g> käyttöoikeuden (<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>)?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Avataanko <xliff:g id="APPLICATION">%1$s</xliff:g>, jotta <xliff:g id="USB_DEVICE">%2$s</xliff:g> voidaan ottaa käyttöön?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Avataanko <xliff:g id="APPLICATION">%1$s</xliff:g>, jotta <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> voidaan ottaa käyttöön?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Vahvistettu"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Valitse lopuksi Vahvista"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Todennettu"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Kosketa sormenjälkitunnistinta"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Sormenjälkikuvake"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Etsitään kasvoja…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ilmoitukset"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Taskulamppu"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiilidata"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datakäyttö"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Käytettävissä"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 4f28efa325a7..04138c0957de 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurer les modes de saisie"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Clavier physique"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Autoriser <xliff:g id="APPLICATION">%1$s</xliff:g> à accéder à <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Autoriser <xliff:g id="APPLICATION">%1$s</xliff:g> à accéder à <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> pour utiliser <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> pour utiliser <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"Toujours ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> lorsque <xliff:g id="USB_DEVICE">%2$s</xliff:g> est connecté"</string> <string name="always_use_accessory" msgid="3257892669444535154">"Toujours ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> lorsque <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> est connecté"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Autoriser le débogage USB?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"Empreinte numérique de la clé RSA de l\'ordinateur : \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Empreinte digitale numérique de la clé RSA de l\'ordinateur : \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Toujours autoriser sur cet ordinateur"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"Autoriser"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Débogage USB non autorisé"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmé"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Touchez Confirmer pour terminer"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authentifié"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touchez le capteur d\'empreintes digitales"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icône d\'empreinte digitale"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Recherche de votre visage…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lampe de poche"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Données cellulaires"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Utilisation de données"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Données restantes"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index a51ebb1087ea..71914264a42c 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurer les modes de saisie"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Clavier physique"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Autoriser <xliff:g id="APPLICATION">%1$s</xliff:g> à accéder à <xliff:g id="USB_DEVICE">%2$s</xliff:g> ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Autoriser <xliff:g id="APPLICATION">%1$s</xliff:g> à accéder à <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> pour utiliser <xliff:g id="USB_DEVICE">%2$s</xliff:g> ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Ouvrir <xliff:g id="APPLICATION">%1$s</xliff:g> pour utiliser <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmé"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Appuyez sur \"Confirmer\" pour terminer"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Authentifié"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Appuyez sur le lecteur d\'empreinte digitale"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icône d\'empreinte digitale"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Recherche de votre visage…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lampe de poche"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Données mobiles"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Conso des données"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Données restantes"</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index 7a7ebf2d57c8..4262d888d163 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Queres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Queres permitir que <xliff:g id="APPLICATION">%1$s</xliff:g> acceda a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Queres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Queres abrir <xliff:g id="APPLICATION">%1$s</xliff:g> para utilizar <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toca Confirmar para completar o proceso"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toca o sensor de impresión dixital"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona de impresión dixital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Buscándote…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificacións"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lanterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Datos móbiles"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Uso de datos"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Datos restantes"</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 10aba2491be7..66f9a7afa585 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ઇનપુટ પદ્ધતિઓ સેટ કરો"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ભૌતિક કીબોર્ડ"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ના ઍક્સેસ માટે <xliff:g id="APPLICATION">%1$s</xliff:g>ને મંજૂરી આપીએ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ના ઍક્સેસ માટે <xliff:g id="APPLICATION">%1$s</xliff:g>ને મંજૂરી આપીએ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ને હૅન્ડલ કરવા માટે <xliff:g id="APPLICATION">%1$s</xliff:g>ને ખોલીએ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ને હૅન્ડલ કરવા માટે <xliff:g id="APPLICATION">%1$s</xliff:g>ને ખોલીએ?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"જ્યારે <xliff:g id="USB_DEVICE">%2$s</xliff:g> કનેક્ટેડ હોય ત્યારે <xliff:g id="APPLICATION">%1$s</xliff:g>ને હંમેશા ખોલો"</string> <string name="always_use_accessory" msgid="3257892669444535154">"જ્યારે <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> કનેક્ટેડ હોય ત્યારે <xliff:g id="APPLICATION">%1$s</xliff:g>ને હંમેશા ખોલો"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"USB ડિબગિંગને મંજૂરી આપીએ?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"કમ્પ્યુટરની RSA મુખ્ય ફિંગરપ્રિંટ આ છે:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"કમ્પ્યુટરની RSA મુખ્ય ફિંગરપ્રિન્ટ આ છે:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"હંમેશા આ કમ્પ્યુટરથી મંજૂરી આપો"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"મંજૂરી આપો"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ડીબગિંગની મંજૂરી નથી"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"પુષ્ટિ કરી"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"પરીક્ષણ પૂર્ણ કરવા કન્ફર્મ કરોને ટૅપ કરો"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"પ્રમાણિત"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ફિંગરપ્રિન્ટના સેન્સરને સ્પર્શ કરો"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ફિંગરપ્રિન્ટનું આઇકન"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"તમારા માટે શોધી રહ્યાં છે..."</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"નોટિફિકેશનો"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ફ્લેશલાઇટ"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"મોબાઇલ ડેટા"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ડેટા વપરાશ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"બાકી ડેટા"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 9ce8e7d016ef..c49cae401ea8 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"इनपुट का तरीका सेट करें"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"सामान्य कीबोर्ड"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_DEVICE">%2$s</xliff:g> के ऐक्सेस की अनुमति दें?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> को <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> के ऐक्सेस की अनुमति दें?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> के लिए <xliff:g id="APPLICATION">%1$s</xliff:g> खोलें?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> के लिए <xliff:g id="APPLICATION">%1$s</xliff:g> खोलें?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"पुष्टि हो गई"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"\'पुष्टि करें\' पर टैप करके पूरा करें"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"पुष्टि हो गई"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फ़िंगरप्रिंट सेंसर को छुएं"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फ़िंगरप्रिंट आइकॉन"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"आपको पहचान रहा है…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"सूचनाएं"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"फ़्लैशलाइट"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"मोबाइल डेटा"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"डेटा खर्च"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"शेष डेटा"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 9c9b0b035f0d..60867647cd36 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Postavljanje načina unosa"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizička tipkovnica"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Želite li dopustiti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup uređaju <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Želite li dopustiti aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> pristup uređaju <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Želite li otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> radi upravljanja uređajem <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Želite li otvoriti aplikaciju <xliff:g id="APPLICATION">%1$s</xliff:g> radi upravljanja uređajem <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potvrđeno"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Dodirnite Potvrdi za dovršetak"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentičnost provjerena"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dodirnite senzor otiska prsta"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona otiska prsta"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Tražimo vas…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obavijesti"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Svjetiljka"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilni podaci"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Potrošnja podataka"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Preostali podaci"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 99a049ee190b..be039c73daaa 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Beviteli módok beállítása"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizikai billentyűzet"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Engedélyezi a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> számára, hogy hozzáférjen a következőhöz: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Engedélyezi a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> számára, hogy hozzáférjen a következőhöz: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Megnyitja a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazást a(z) <xliff:g id="USB_DEVICE">%2$s</xliff:g> kezeléséhez?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Megnyitja a(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazást a(z) <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> kezeléséhez?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Megerősítve"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Koppintson a Megerősítés lehetőségre"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Hitelesítve"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Érintse meg az ujjlenyomat-érzékelőt"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ujjlenyomat ikonja"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Keresem az Ön arcát…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Értesítések"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Zseblámpa"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiladatok"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Adathasználat"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Fennmaradó adatmennyiség"</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 9ac0afb7cbb2..0f84b500103c 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Կարգավորել մուտքագրման եղանակները"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Ֆիզիկական ստեղնաշար"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Թույլատրե՞լ <xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածին օգտագործել <xliff:g id="USB_DEVICE">%2$s</xliff:g> լրասարքը։"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Թույլատրե՞լ <xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածին օգտագործել <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> լրասարքը։"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Բացե՞լ <xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածը <xliff:g id="USB_DEVICE">%2$s</xliff:g> լրասարքը մշակելու համար։"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Բացե՞լ <xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածը <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> լրասարքը մշակելու համար։"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Հաստատվեց"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Ավարտելու համար հպեք «Հաստատել»"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Նույնականացված է"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Հպեք մատնահետքի սկաներին"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Մատնահետքի պատկերակ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Դեմքի ճանաչում…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ծանուցումներ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Լապտեր"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Բջջային ինտերնետ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Տվյալների օգտագործումը"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Մնացած տվյալները"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 443e3b380094..0b3ef7081d9f 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Menyiapkan metode masukan"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Keyboard fisik"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Izinkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Izinkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk menangani <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk menangani <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Dikonfirmasi"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Ketuk Konfirmasi untuk menyelesaikan"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Diautentikasi"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sentuh sensor sidik jari"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon sidik jari"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Mencari wajah Anda…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifikasi"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lampu senter"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Data seluler"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Penggunaan kuota"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Data tersisa"</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index f481e48638b4..7a8d290d04c5 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Setja upp innsláttaraðferðir"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Vélbúnaðarlyklaborð"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Viltu veita <xliff:g id="APPLICATION">%1$s</xliff:g> aðgang að <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Viltu veita <xliff:g id="APPLICATION">%1$s</xliff:g> aðgang að <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Viltu opna <xliff:g id="APPLICATION">%1$s</xliff:g> til að sjá um <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Viltu opna <xliff:g id="APPLICATION">%1$s</xliff:g> til að sjá um <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Staðfest"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Ýttu á „Staðfesta“ til að ljúka"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Auðkennt"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Snertu fingrafaralesarann"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingrafaratákn"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Leitar að þér ..."</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Tilkynningar"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Vasaljós"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Farsímagögn"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Gagnanotkun"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Gögn eftir"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 718608ab3964..cc053be32db6 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configura metodi di immissione"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Tastiera fisica"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Consentire a <xliff:g id="APPLICATION">%1$s</xliff:g> di accedere a <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Consentire a <xliff:g id="APPLICATION">%1$s</xliff:g> di accedere a <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vuoi aprire <xliff:g id="APPLICATION">%1$s</xliff:g> per gestire <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vuoi aprire <xliff:g id="APPLICATION">%1$s</xliff:g> per gestire <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"Apri sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quando si collega <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="3257892669444535154">"Apri sempre <xliff:g id="APPLICATION">%1$s</xliff:g> quando si collega <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Consentire debug USB?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"Fingerprint della chiave RSA del computer: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Impronta della chiave RSA del computer: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Consenti sempre da questo computer"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"Consenti"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Debug USB non consentito"</string> @@ -108,8 +110,8 @@ <string name="accessibility_phone_button" msgid="6738112589538563574">"Telefono"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Voice Assist"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"Sblocca"</string> - <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"In attesa dell\'impronta digitale"</string> - <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Sblocca senza utilizzare l\'impronta digitale"</string> + <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"In attesa dell\'impronta"</string> + <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Sblocca senza utilizzare l\'impronta"</string> <string name="accessibility_scanning_face" msgid="769545173211758586">"Scansione del viso"</string> <string name="accessibility_send_smart_reply" msgid="7766727839703044493">"Invia"</string> <string name="accessibility_manage_notification" msgid="2026361503393549753">"Gestisci notifiche"</string> @@ -126,8 +128,22 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confermato"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tocca Conferma per completare"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticazione eseguita"</string> - <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Tocca il sensore di impronte digitali"</string> - <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona dell\'impronta digitale"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> + <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Tocca il sensore di impronte"</string> + <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icona dell\'impronta"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"In attesa del volto…"</string> <string name="accessibility_face_dialog_face_icon" msgid="2658119009870383490">"Icona volto"</string> <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"Pulsante zoom compatibilità."</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifiche"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Torcia"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dati mobili"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Utilizzo dati"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dati rimanenti"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 606a0978fd99..09e4f0e02cca 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"הגדר שיטות קלט"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"מקלדת פיזית"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"האם לתת לאפליקציה <xliff:g id="APPLICATION">%1$s</xliff:g> גישה אל <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"האם לתת לאפליקציה <xliff:g id="APPLICATION">%1$s</xliff:g> גישה אל <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"האם לפתוח את <xliff:g id="APPLICATION">%1$s</xliff:g> כדי לעבוד עם <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"האם לפתוח את <xliff:g id="APPLICATION">%1$s</xliff:g> כדי לעבוד עם <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"מאושר"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"יש להקיש על \'אישור\' לסיום"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"מאומת"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"יש לגעת בחיישן טביעות האצבע"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"סמל טביעת אצבע"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"מחפש אותך…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"התראות"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"פנס"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"חבילת גלישה"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"שימוש בנתונים"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"מכסת נתונים נותרת"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 0bc500c2df71..3dc9fb7a562d 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"入力方法をセットアップ"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"物理キーボード"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> に <xliff:g id="USB_DEVICE">%2$s</xliff:g> へのアクセスを許可しますか？"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> に <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> へのアクセスを許可しますか？"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="APPLICATION">%1$s</xliff:g> を起動して <xliff:g id="USB_DEVICE">%2$s</xliff:g> を処理しますか？"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="APPLICATION">%1$s</xliff:g> を起動して <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> を処理しますか？"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"確認しました"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"完了するには [確認] をタップしてください"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"認証済み"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"指紋認証センサーをタップしてください"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋アイコン"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"顔を認証しています…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ライト"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"モバイルデータ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"データ使用量"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"残りのデータ"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index b3c7de798693..24db256a08e0 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"შეყვანის მეთოდების დაყენება"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ფიზიკური კლავიატურა"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"მიეცეს <xliff:g id="APPLICATION">%1$s</xliff:g>-ს <xliff:g id="USB_DEVICE">%2$s</xliff:g>-ზე წვდომის უფლება?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"მიეცეს <xliff:g id="APPLICATION">%1$s</xliff:g>-ს <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>-ზე წვდომის უფლება?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"გსურთ, გახსნათ <xliff:g id="APPLICATION">%1$s</xliff:g>, <xliff:g id="USB_DEVICE">%2$s</xliff:g>-ის გამოსაყენებლად?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"გსურთ, გახსნათ <xliff:g id="APPLICATION">%1$s</xliff:g>, <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>-ის გამოსაყენებლად?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"დადასტურებული"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"დასასრულებლად შეეხეთ „დადასტურებას“"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ავტორიზებულია"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"შეეხეთ თითის ანაბეჭდის სენსორს"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"თითის ანაბეჭდის ხატულა"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"მიმდინარეობს თქვენი ძიება…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"შეტყობინებები"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ფანარი"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"მობილური ინტერნეტი"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"მონაცემთა მოხმარება"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"დარჩენილი მონაცემები"</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index e1fa4b2b7c8d..ff1b9fc154d5 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Енгізу әдістерін орнату"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Физикалық пернетақта"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_DEVICE">%2$s</xliff:g> құрылғысына кіруге рұқсат берілсін бе?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> қолданбасына <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> жабдығына кіруге рұқсат берілсін бе?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> жабдығын басқару үшін <xliff:g id="APPLICATION">%1$s</xliff:g> ашылсын ба?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> жабдығын басқару үшін <xliff:g id="APPLICATION">%1$s</xliff:g> ашылсын ба?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Расталды"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Аяқтау үшін \"Растау\" түймесін түртіңіз."</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Аутентификацияланған"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Саусақ ізін оқу сканерін түртіңіз"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Саусақ ізі белгішесі"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Бет ізделуде…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Хабарландырулар"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Қалта шам"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобильдік деректер"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Дерек шығыны"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Қалған деректер"</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index db93aa9a448b..323138cfc51b 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"រៀបចំវិធីសាស្ត្របញ្ចូល"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ក្ដារចុចពិតប្រាកដ"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"អនុញ្ញាត <xliff:g id="APPLICATION">%1$s</xliff:g> ឱ្យចូលប្រើ <xliff:g id="USB_DEVICE">%2$s</xliff:g> មែនទេ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"អនុញ្ញាត <xliff:g id="APPLICATION">%1$s</xliff:g> ឱ្យចូលប្រើ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> មែនទេ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"បើក <xliff:g id="APPLICATION">%1$s</xliff:g> ដើម្បីគ្រប់គ្រង <xliff:g id="USB_DEVICE">%2$s</xliff:g> មែនទេ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"បើក <xliff:g id="APPLICATION">%1$s</xliff:g> ដើម្បីគ្រប់គ្រង <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> មែនទេ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"បានបញ្ជាក់"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ចុច \"បញ្ជាក់\" ដើម្បីបញ្ចប់"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"បានផ្ទៀងផ្ទាត់"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"រូបតំណាងស្នាមម្រាមដៃ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"កំពុងស្វែងរកអ្នក…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ការជូនដំណឹង"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ពិល"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ទិន្នន័យទូរសព្ទចល័ត"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ការប្រើទិន្នន័យ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ទិន្នន័យនៅសល់"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index 98589ad29461..ac593e80c3a1 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ಇನ್ಪುಟ್ ವಿಧಾನಗಳನ್ನು ಹೊಂದಿಸು"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ಪ್ರವೇಶಿಸಲು <xliff:g id="APPLICATION">%1$s</xliff:g> ಅನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ಗೆ ಪ್ರವೇಶಿಸಲು <xliff:g id="APPLICATION">%1$s</xliff:g> ಅನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ಅನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APPLICATION">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯುವುದೇ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ಅನ್ನು ನಿರ್ವಹಿಸಲು <xliff:g id="APPLICATION">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯುವುದೇ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ಪೂರ್ಣಗೊಳಿಸಲು ದೃಢೀಕರಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ದೃಢೀಕರಿಸಲಾಗಿದೆ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಐಕಾನ್"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ನಿಮಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ಅಧಿಸೂಚನೆಗಳು"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ಫ್ಲಾಶ್ಲೈಟ್"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ಮೊಬೈಲ್ ಡೇಟಾ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ಡೇಟಾ ಬಳಕೆ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ಉಳಿದಿರುವ ಡೇಟಾ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 03c277e5a888..f37ec008355d 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"입력 방법 설정"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"물리적 키보드"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱이 <xliff:g id="USB_DEVICE">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱이 <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 열어 <xliff:g id="USB_DEVICE">%2$s</xliff:g>을(를) 처리하시겠습니까?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="APPLICATION">%1$s</xliff:g> 앱을 열어 <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>을(를) 처리하시겠습니까?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"확인함"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"완료하려면 확인을 탭하세요."</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"인증됨"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"지문 센서를 터치하세요."</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"지문 아이콘"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"찾는 중..."</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"알림"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"손전등"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"모바일 데이터"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"데이터 사용"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"잔여 데이터"</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index c82e5b035d6a..beb2b02c0a3b 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Киргизүү ыкмасын тууралоо"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Аппараттык тергич"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүн колдоно берсинби?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> кабелин колдоно берсинби?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> түзмөгүнө туташуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу ачылсынбы?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> кабелине туташуу үчүн <xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу ачылсынбы?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Ырасталды"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Бүтүрүү үчүн \"Ырастоо\" баскычын басыңыз"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Аныктыгы текшерилди"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Манжа изинин сенсорун басыңыз"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Манжа изинин сүрөтчөсү"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Жүзүңүз изделүүдө…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Билдирмелер"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Кол чырак"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобилдик Интернет"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Дайындардын өткөрүлүшү"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Калган дайындар"</string> @@ -902,7 +920,7 @@ <string name="slice_permission_text_2" msgid="3146758297471143723">"- <xliff:g id="APP">%1$s</xliff:g> колдонмосунда аракеттерди аткарат"</string> <string name="slice_permission_checkbox" msgid="7986504458640562900">"<xliff:g id="APP">%1$s</xliff:g> бардык колдонмолордун үлгүлөрүн көрсөтүүгө уруксат берүү"</string> <string name="slice_permission_allow" msgid="2340244901366722709">"Уруксат берүү"</string> - <string name="slice_permission_deny" msgid="7683681514008048807">"Жок"</string> + <string name="slice_permission_deny" msgid="7683681514008048807">"Тыюу салынат"</string> <string name="auto_saver_title" msgid="1217959994732964228">"Батареяны үнөмдөгүчтүн тартибин жөндөө үчүн басыңыз"</string> <string name="auto_saver_text" msgid="2563289953551438248">"Батареянын кубаты түгөнүп калганда, күйгүзүлсүн"</string> <string name="no_auto_saver_action" msgid="8086002101711328500">"Жок, рахмат"</string> @@ -926,7 +944,7 @@ <string name="bubbles_settings_button_description" msgid="2970630476657287189">"<xliff:g id="APP_NAME">%1$s</xliff:g> көбүктөрүнүн жөндөөлөрү"</string> <string name="bubbles_prompt" msgid="8807968030159469710">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунун калкып чыкма билдирмелерине уруксат бересизби?"</string> <string name="manage_bubbles_text" msgid="7027739766859191408">"Башкаруу"</string> - <string name="no_bubbles" msgid="337101288173078247">"Жок"</string> + <string name="no_bubbles" msgid="337101288173078247">"Тыюу салынат"</string> <string name="yes_bubbles" msgid="668809525728633841">"Уруксат берүү"</string> <string name="ask_me_later_bubbles" msgid="2147688438402939029">"Кийинчерээк суралсын"</string> <string name="bubble_content_description_single" msgid="1184462974339387516">"<xliff:g id="APP_NAME">%2$s</xliff:g> колдонмосунан <xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 4f4d29153dbb..68c99514bcb2 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ຕັ້ງຄ່າວິທີການປ້ອນຂໍ້ມູນ"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ແປ້ນພິມແທ້"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"ອະນຸຍາດໃຫ້ <xliff:g id="APPLICATION">%1$s</xliff:g> ເຂົ້າເຖິງ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ໄດ້ບໍ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"ອະນຸຍາດໃຫ້ <xliff:g id="APPLICATION">%1$s</xliff:g> ເຂົ້າເຖິງ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ໄດ້ບໍ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"ເປີດ <xliff:g id="APPLICATION">%1$s</xliff:g> ເພື່ອໃຊ້ກັບ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ບໍ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"ເປີດ <xliff:g id="APPLICATION">%1$s</xliff:g> ເພື່ອໃຊ້ກັບ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ບໍ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ຢືນຢັນແລ້ວ"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ແຕະຢືນຢັນເພື່ອສຳເລັດ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ຮັບຮອງຄວາມຖືກຕ້ອງແລ້ວ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ແຕະໃສ່ເຊັນເຊີລາຍນິ້ວມື"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ໄອຄອນລາຍນິ້ວມື"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ກຳລັງຊອກຫາທ່ານ…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ການແຈ້ງເຕືອນ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ໄຟສາຍ"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ອິນເຕີເນັດມືຖື"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ການນຳໃຊ້ຂໍ້ມູນ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ຂໍ້ມູນທີ່ຍັງເຫຼືອ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index ca7c89ec4847..230194d41576 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Nustatyti įvesties metodus"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizinė klaviatūra"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Leisti „<xliff:g id="APPLICATION">%1$s</xliff:g>“ pasiekti įrenginį (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Leisti „<xliff:g id="APPLICATION">%1$s</xliff:g>“ pasiekti įrenginį (<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>)?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Atidaryti „<xliff:g id="APPLICATION">%1$s</xliff:g>“, kad būtų galima tvarkyti įrenginį (<xliff:g id="USB_DEVICE">%2$s</xliff:g>)?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Atidaryti „<xliff:g id="APPLICATION">%1$s</xliff:g>“, kad būtų galima tvarkyti įrenginį (<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>)?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Patvirtinta"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Paliesk. „Patvirtinti“, kad užbaigtumėte"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentifikuota"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Palieskite piršto antspaudo jutiklį"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Piršto antspaudo piktograma"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ieškoma jūsų…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Pranešimai"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Žibintuvėlis"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiliojo ryšio duomenys"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Duomenų naudojimas"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Likę duomenys"</string> @@ -466,7 +484,7 @@ <string name="media_projection_remember_text" msgid="3103510882172746752">"Daugiau neberodyti"</string> <string name="clear_all_notifications_text" msgid="814192889771462828">"Viską išvalyti"</string> <string name="manage_notifications_text" msgid="2386728145475108753">"Tvarkyti"</string> - <string name="notification_section_header_gentle" msgid="4372438504154095677">"Tylūs pranešimai"</string> + <string name="notification_section_header_gentle" msgid="4372438504154095677">"Tylieji pranešimai"</string> <string name="accessibility_notification_section_header_gentle_clear_all" msgid="4286716295850400959">"Išvalyti visus tylius pranešimus"</string> <string name="dnd_suppressing_shade_text" msgid="1904574852846769301">"Pranešimai pristabdyti naudojant netrukdymo režimą"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Pradėti dabar"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 424e10427903..e1905f5dafbd 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Iestatīt ievades metodes"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fiziskā tastatūra"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vai atļaut lietotnei <xliff:g id="APPLICATION">%1$s</xliff:g> piekļūt šai ierīcei: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vai atļaut lietotnei <xliff:g id="APPLICATION">%1$s</xliff:g> piekļūt šim piederumam: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vai atvērt lietotni <xliff:g id="APPLICATION">%1$s</xliff:g>, lai izmantotu šo ierīci: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vai atvērt lietotni <xliff:g id="APPLICATION">%1$s</xliff:g>, lai izmantotu šo piederumu: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Apstiprināts"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Lai pabeigtu, pieskarieties Apstiprināt"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentifikācija veikta"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Pieskarieties pirksta nospieduma sensoram"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Pirksta nospieduma ikona"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Notiek jūsu sejas meklēšana…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Paziņojumi"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Zibspuldze"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilie dati"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datu lietojums"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Atlikušie dati"</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index dd86edecb64a..300dff5afcb6 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Постави методи на внес."</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Физичка тастатура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Ќе дозволите <xliff:g id="APPLICATION">%1$s</xliff:g> да пристапува до <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Ќе дозволите <xliff:g id="APPLICATION">%1$s</xliff:g> да пристапува до <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Да се отвори <xliff:g id="APPLICATION">%1$s</xliff:g> за да управува со <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Да се отвори <xliff:g id="APPLICATION">%1$s</xliff:g> за да управува со <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Потврдено"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Допрете „Потврди“ за да се заврши"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Проверена"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Допрете го сензорот за отпечатоци"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона за отпечатоци"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ве бараме вас…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Известувања"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Светилка"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобилен интернет"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Потрошен интернет"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Преостанати податоци"</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index 859e65b11bb0..0a06b2c402fd 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ടൈപ്പുചെയ്യൽ രീതികൾ സജ്ജീകരിക്കുക"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ഫിസിക്കൽ കീബോഡ്"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ആക്സസ് ചെയ്യാൻ <xliff:g id="APPLICATION">%1$s</xliff:g>-നെ അനുവദിക്കണോ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ആക്സസ് ചെയ്യാൻ <xliff:g id="APPLICATION">%1$s</xliff:g>-നെ അനുവദിക്കണോ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> കൈകാര്യം ചെയ്യാൻ <xliff:g id="APPLICATION">%1$s</xliff:g> തുറക്കണോ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> കൈകാര്യം ചെയ്യാൻ <xliff:g id="APPLICATION">%1$s</xliff:g> തുറക്കണോ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"സ്ഥിരീകരിച്ചു"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"പൂർത്തിയാക്കാൻ സ്ഥിരീകരിക്കുക ടാപ്പ് ചെയ്യൂ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"പരിശോധിച്ചുറപ്പിച്ചു"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"വിരലടയാള സെൻസർ സ്പർശിക്കുക"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"വിരലടയാള ഐക്കൺ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"നിങ്ങൾക്കായി തിരയുന്നു…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"അറിയിപ്പുകൾ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ടോർച്ച്"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"മൊബൈൽ ഡാറ്റ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ഡാറ്റാ ഉപയോഗം"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ശേഷിക്കുന്ന ഡാറ്റ"</string> @@ -377,7 +395,7 @@ <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4453017157391574402">"സൂര്യോദയം വരെ"</string> <string name="quick_settings_night_secondary_label_on_at" msgid="6256314040368487637">"<xliff:g id="TIME">%s</xliff:g>-ന്"</string> <string name="quick_settings_secondary_label_until" msgid="2749196569462600150">"<xliff:g id="TIME">%s</xliff:g> വരെ"</string> - <string name="quick_settings_ui_mode_night_label" msgid="3419947801072692538">"ഇരുണ്ട തീം"</string> + <string name="quick_settings_ui_mode_night_label" msgid="3419947801072692538">"ഡാർക്ക് തീം"</string> <string name="quick_settings_ui_mode_night_label_battery_saver" msgid="7438725724589758362">"ഇരുണ്ട തീം\nബാറ്ററി ലാഭിക്കൽ"</string> <string name="quick_settings_nfc_label" msgid="9012153754816969325">"NFC"</string> <string name="quick_settings_nfc_off" msgid="6883274004315134333">"NFC പ്രവർത്തനരഹിതമാക്കി"</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index 3363af7a0fd9..0298d20ccd07 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Оруулах аргыг тохируулах"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Бодит гар"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g>-г <xliff:g id="USB_DEVICE">%2$s</xliff:g>-д хандахыг зөвшөөрөх үү?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g>-г <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>-д хандахыг зөвшөөрөх үү?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>-г зохицуулахын тулд <xliff:g id="APPLICATION">%1$s</xliff:g>-г нээх үү?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>-г зохицуулахын тулд <xliff:g id="APPLICATION">%1$s</xliff:g>-г нээх үү?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Баталгаажсан"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Дуусгахын тулд баталгаажуулахыг товших"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Баталгаажуулагдсан"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Хурууны хээ мэдрэгчид хүрэх"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Хурууны хээний дүрс тэмдэг"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Таныг хайж байна…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Мэдэгдэл"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Гар чийдэн"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобайл дата"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Дата ашиглалт"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Үлдсэн дата"</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index f785fe98d9c4..07b985fff05d 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"इनपुट पद्धती सेट करा"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"वास्तविक कीबोर्ड"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> ला <xliff:g id="USB_DEVICE">%2$s</xliff:g> अॅक्सेस करण्याची अनुमती द्यायची का?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> ला <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> अॅक्सेस करण्याची अनुमती द्यायची का?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> हाताळण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> उघडायचे का?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> हाताळण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> उघडायचे का?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"निश्चित केले"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"पूर्ण करण्यासाठी खात्री करा वर टॅप करा"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ऑथेंटिकेशन केलेले"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फिंगरप्रिंट सेन्सरला स्पर्श करा"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फिंगरप्रिंट आयकन"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"तुमच्यासाठी शोधत आहे…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"सूचना"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"फ्लॅशलाइट"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"मोबाइल डेटा"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"डेटा वापर"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"शिल्लक डेटा"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index 352c376f8a37..f696ee341b33 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Sediakan kaedah input"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Papan kekunci fizikal"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Benarkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Benarkan <xliff:g id="APPLICATION">%1$s</xliff:g> mengakses <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk mengendalikan <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Buka <xliff:g id="APPLICATION">%1$s</xliff:g> untuk mengendalikan <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Disahkan"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Ketik Sahkan untuk menyelesaikan"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Disahkan"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Sentuh penderia cap jari"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon cap jari"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Mencari anda…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Pemberitahuan"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lampu suluh"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Data mudah alih"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Penggunaan data"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Baki data"</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index d136042650ae..eb73df70c552 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ထည့်သွင်းနည်းများ သတ်မှတ်ခြင်း"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ခလုတ်ပါဝင်သော ကီးဘုတ်"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> အား ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုပါသလား။"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> အား ဝင်သုံးရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ခွင့်ပြုပါသလား။"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ဆောင်ရွက်ရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ဖွင့်လိုပါသလား။"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ဆောင်ရွက်ရန် <xliff:g id="APPLICATION">%1$s</xliff:g> ကို ဖွင့်လိုပါသလား။"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"အတည်ပြုပြီးပြီ"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"အပြီးသတ်ရန်အတွက် \'အတည်ပြုရန်\' ကို တို့ပါ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"အထောက်အထားစိစစ်ပြီးပြီ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"လက်ဗွေအာရုံခံကိရိယာကို တို့ပါ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"လက်ဗွေ သင်္ကေတ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"သင့်ကို ရှာဖွေနေသည်…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"အကြောင်းကြားချက်များ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ဖလက်ရှ်မီး"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"မိုဘိုင်းဒေတာ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ဒေတာ သုံးစွဲမှု"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ကျန်ရှိ ဒေတာ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 86f0b3804019..9e1c5dbeb21d 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfigurer inndatametoder"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fysisk tastatur"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vil du gi <xliff:g id="APPLICATION">%1$s</xliff:g> tilgang til <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vil du gi <xliff:g id="APPLICATION">%1$s</xliff:g> tilgang til <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vil du åpne <xliff:g id="APPLICATION">%1$s</xliff:g> for å behandle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vil du åpne <xliff:g id="APPLICATION">%1$s</xliff:g> for å behandle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bekreftet"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Trykk på Bekreft for å fullføre"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentisert"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Trykk på fingeravtrykkssensoren"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon for fingeravtrykk"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Ser etter deg …"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Varsler"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lommelykt"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobildata"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Databruk"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Gjenværende data"</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 4c17904bac50..5a0000273d73 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"इनपुट विधिहरू सेटअप गर्नुहोस्"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"वास्तविक किबोर्ड"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> लाई <xliff:g id="USB_DEVICE">%2$s</xliff:g> माथि पहुँच राख्ने अनुमति दिने हो?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> लाई <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> माथि पहुँच राख्ने अनुमति दिने हो?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> को व्यवस्थापन गर्न <xliff:g id="APPLICATION">%1$s</xliff:g> खोल्ने हो?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> को व्यवस्थापन गर्न <xliff:g id="APPLICATION">%1$s</xliff:g> खोल्ने हो?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"पुष्टि भयो"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"पूरा गर्नका लागि पुष्टि गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"प्रमाणीकरण गरियो"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"फिंगरप्रिन्ट सेन्सरमा छुनुहोस्"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"फिंगरप्रिन्ट जनाउने आइकन"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"तपाईंलाई खोज्दै…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"अधिसूचनाहरू"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"फ्ल्यासलाइट"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"मोबाइल डेटा"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"डेटाको प्रयोग"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"बाँकी डेटा"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index c62c579b47b7..dacbd5314ae1 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Invoermethoden instellen"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fysiek toetsenbord"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> toegang geven tot <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="APPLICATION">%1$s</xliff:g> openen om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te verwerken?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="APPLICATION">%1$s</xliff:g> openen om <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> te verwerken?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bevestigd"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tik op Bevestigen om te voltooien"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Geverifieerd"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Raak de vingerafdruksensor aan"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Vingerafdrukpictogram"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Jouw gezicht zoeken…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Meldingen"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Zaklamp"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobiele data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Datagebruik"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Resterende gegevens"</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index d29592541dc1..2720abff5917 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ଇନପୁଟ୍ ପଦ୍ଧତି ସେଟ୍ କରନ୍ତୁ"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ଫିଜିକଲ୍ କୀ’ବୋର୍ଡ୍"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ଆକ୍ସେସ୍ କରିବାକୁ <xliff:g id="APPLICATION">%1$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ଆକ୍ସେସ୍ କରିବାକୁ <xliff:g id="APPLICATION">%1$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ନିୟନ୍ତ୍ରଣ କରିବାକୁ <xliff:g id="APPLICATION">%1$s</xliff:g> ଖୋଲିବେ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ନିୟନ୍ତ୍ରଣ କରିବାକୁ <xliff:g id="APPLICATION">%1$s</xliff:g> ଖୋଲିବେ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ସୁନିଶ୍ଚିତ କରାଯାଇଛି"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ସମ୍ପୂର୍ଣ୍ଣ କରିବାକୁ ସୁନିଶ୍ଚିତ କରନ୍ତୁରେ ଟାପ୍ କରନ୍ତୁ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ପ୍ରାମାଣିକତା ହୋଇଛି"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ଟିପଚିହ୍ନ ସେନସର୍କୁ ଛୁଅଁନ୍ତୁ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ଆଇକନ୍"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରୁଛି…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ବିଜ୍ଞପ୍ତି"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ଫ୍ଲାସ୍ଲାଇଟ୍"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ମୋବାଇଲ୍ ଡାଟା"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ଡାଟାର ବ୍ୟବହାର"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ଅବଶିଷ୍ଟ ଡାଟା"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index b75deb96d768..805a580e3e1c 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ਇਨਪੁਟ ਵਿਧੀਆਂ ਸੈਟ ਅਪ ਕਰੋ"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ਫਿਜੀਕਲ ਕੀ-ਬੋਰਡ"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"ਕੀ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਤੱਕ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"ਕੀ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ਤੱਕ <xliff:g id="APPLICATION">%1$s</xliff:g> ਨੂੰ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"ਕੀ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ <xliff:g id="APPLICATION">%1$s</xliff:g> ਖੋਲ੍ਹਣੀ ਹੈ?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"ਕੀ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ਨੂੰ ਵਰਤਣ ਲਈ <xliff:g id="APPLICATION">%1$s</xliff:g> ਖੋਲ੍ਹਣੀ ਹੈ?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ਪੁਸ਼ਟੀ ਕੀਤੀ ਗਈ"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"ਪੂਰਾ ਕਰਨ ਲਈ ਪੁਸ਼ਟੀ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ਪ੍ਰਮਾਣਿਤ ਹੋਇਆ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਪ੍ਰਤੀਕ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ਤੁਹਾਡੀ ਪਛਾਣ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ਸੂਚਨਾਵਾਂ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ਫਲੈਸ਼ਲਾਈਟ"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ਮੋਬਾਈਲ ਡਾਟਾ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ਡਾਟਾ ਵਰਤੋਂ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ਬਾਕੀ ਡਾਟਾ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index d372b3d2e2c0..16dfff35fef3 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfiguruj metody wprowadzania"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Klawiatura fizyczna"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Zezwolić aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na dostęp do urządzenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Zezwolić aplikacji <xliff:g id="APPLICATION">%1$s</xliff:g> na dostęp do urządzenia <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Otworzyć aplikację <xliff:g id="APPLICATION">%1$s</xliff:g> do obsługi urządzenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Otworzyć aplikację <xliff:g id="APPLICATION">%1$s</xliff:g> do obsługi urządzenia <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potwierdzono"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Aby zakończyć, kliknij Potwierdź"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Uwierzytelniono"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotknij czytnika linii papilarnych"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona odcisku palca"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Szukam Cię…"</string> @@ -370,6 +386,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Powiadomienia"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Latarka"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilna transmisja danych"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Użycie danych"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Pozostały limit"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 2b761577d17d..25ca226f5a7d 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com o <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com o <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toque em \"Confirmar\" para concluir"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressão digital"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Procurando você…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificações"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lanterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dados móveis"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Uso de dados"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dados restantes"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 17cc86f1007e..fdb98faf3326 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos introdução"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Pretende permitir que a aplicação <xliff:g id="APPLICATION">%1$s</xliff:g> aceda ao dispositivo <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Pretende permitir que a aplicação <xliff:g id="APPLICATION">%1$s</xliff:g> aceda ao acessório <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Pretende abrir a aplicação <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar o acessório <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Pretende abrir a aplicação <xliff:g id="APPLICATION">%1$s</xliff:g> para controlar o acessório <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -68,7 +70,7 @@ <string name="learn_more" msgid="5000517160980853569">"Saiba mais"</string> <string name="compat_mode_on" msgid="6623839244840638213">"Zoom para preencher o ecrã"</string> <string name="compat_mode_off" msgid="4434467572461327898">"Esticar p. caber em ec. int."</string> - <string name="global_action_screenshot" msgid="8329831278085426283">"Captura de ecrã"</string> + <string name="global_action_screenshot" msgid="8329831278085426283">"Capt. ecrã"</string> <string name="screenshot_saving_ticker" msgid="7403652894056693515">"A guardar captura de ecrã..."</string> <string name="screenshot_saving_title" msgid="8242282144535555697">"A guardar captura de ecrã..."</string> <string name="screenshot_saved_title" msgid="5637073968117370753">"Captura de ecrã guardada"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmado"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toque em Confirmar para concluir."</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressões digitais."</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"À sua procura…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificações"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lanterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dados móveis"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Utilização de dados"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dados restantes"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 2b761577d17d..25ca226f5a7d 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Configurar métodos de entrada"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Teclado físico"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Permitir que o app <xliff:g id="APPLICATION">%1$s</xliff:g> acesse <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com o <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Abrir o app <xliff:g id="APPLICATION">%1$s</xliff:g> para lidar com o <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmada"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Toque em \"Confirmar\" para concluir"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autenticado"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Toque no sensor de impressão digital"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ícone de impressão digital"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Procurando você…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificações"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lanterna"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dados móveis"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Uso de dados"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dados restantes"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index db8f87debaec..171ca9a9d1d0 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Setați metode introducere text"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Tastatură fizică"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Permiteți <xliff:g id="APPLICATION">%1$s</xliff:g> să acceseze <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Permiteți <xliff:g id="APPLICATION">%1$s</xliff:g> să acceseze <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Deschideți <xliff:g id="APPLICATION">%1$s</xliff:g> ca să gestioneze <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Deschideți <xliff:g id="APPLICATION">%1$s</xliff:g> ca să gestioneze <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"Deschideți întotdeauna <xliff:g id="APPLICATION">%1$s</xliff:g> când este conectat <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="3257892669444535154">"Deschideți întotdeauna <xliff:g id="APPLICATION">%1$s</xliff:g> când este conectat <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Permiteți remedierea erorilor prin USB?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"Amprenta digitală din cheia RSA a computerului este:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Amprenta din cheia RSA a computerului este:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Permiteți întotdeauna de pe acest computer"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"Permiteți"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Remedierea erorilor prin USB nu este permisă"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Confirmat"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Atingeți Confirmați pentru a finaliza"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentificat"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Atingeți senzorul de amprente"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Pictograma amprentă"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Vă căutăm…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificări"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Lanternă"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Date mobile"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Utilizarea datelor"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Date rămase"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f7527d9e0cd3..1d7f6c83701a 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Настройка способов ввода"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Физическая клавиатура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Предоставить приложению \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" доступ к устройству \"<xliff:g id="USB_DEVICE">%2$s</xliff:g>\"?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Предоставить приложению \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" доступ к устройству \"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>\"?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Открыть приложение \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" для управления устройством \"<xliff:g id="USB_DEVICE">%2$s</xliff:g>\"?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Открыть приложение \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" для управления устройством \"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>\"?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Подтверждено"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Нажмите \"Подтвердить\""</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Аутентификация выполнена"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Прикоснитесь к сканеру отпечатков пальцев."</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок отпечатка пальца"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Поиск лица…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Уведомления"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Фонарик"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобильный Интернет"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Передача данных"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Остается данных"</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index c87ef5a001b5..fa1c109c0ac0 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ආදාන ක්රම සකසන්න"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"භෞතික යතුරු පුවරුව"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> හට <xliff:g id="USB_DEVICE">%2$s</xliff:g> වෙත පිවිසීමට ඉඩ දෙන්නද?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> හට <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> වෙත පිවිසීමට ඉඩ දෙන්නද?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> හැසිරවීමට <xliff:g id="APPLICATION">%1$s</xliff:g> විවෘත කරන්නද?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> හැසිරවීමට <xliff:g id="APPLICATION">%1$s</xliff:g> විවෘත කරන්නද?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"තහවුරු කළා"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"සම්පූර්ණ කිරීමට තහවුරු කරන්න තට්ටු කර."</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"සත්යාපනය විය"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ඇඟිලි සලකුණු නිරූපකය"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"ඔබව සොයමින්…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"දැනුම්දීම්"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"සැණෙළි ආලෝකය"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"ජංගම දත්ත"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"දත්ත භාවිතය"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ඉතිරි ඇති දත්ත"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 1e171a1ab055..ddb0ed4f551a 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Nastavenie metód vstupu"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fyzická klávesnica"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Povoliť aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> prístup k zariadeniu <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Povoliť aplikácii <xliff:g id="APPLICATION">%1$s</xliff:g> prístup k zariadeniu <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Otvoriť aplikáciu <xliff:g id="APPLICATION">%1$s</xliff:g> na použitie zariadenia <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Otvoriť aplikáciu <xliff:g id="APPLICATION">%1$s</xliff:g> na použitie zariadenia <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potvrdené"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Overenie dokončíte klepnutím na Potvrdiť"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Overené"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotknite sa senzora odtlačkov prstov"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona odtlačku prsta"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hľadáme vás…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Upozornenia"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Baterka"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobilné dáta"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Spotreba dát"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Zostávajúce údaje"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index b342ce6c0d32..1af84fec425f 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Nastavi načine vnosa"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fizična tipkovnica"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Ali aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> dovolite dostop do dodatka USB <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Ali aplikaciji <xliff:g id="APPLICATION">%1$s</xliff:g> dovolite dostop do dodatka USB <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Želite odpreti aplikacijo <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje dodatka USB <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Želite odpreti aplikacijo <xliff:g id="APPLICATION">%1$s</xliff:g> za upravljanje dodatka USB <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Potrjeno"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Za dokončanje se dotaknite »Potrdite«"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Preverjena pristnost"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Dotaknite se tipala prstnih odtisov"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona prstnih odtisov"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Preverjanje vašega obraza …"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obvestila"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Svetilka"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Prenos podatkov v mobilnem omrežju"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Poraba podatkov"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Preostala količina podatkov"</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index 4fba77052876..344aae3c2e7e 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfiguro metodat e hyrjes"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Tastierë fizike"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Të lejohet <xliff:g id="APPLICATION">%1$s</xliff:g> të ketë qasje te <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Të lejohet <xliff:g id="APPLICATION">%1$s</xliff:g> të ketë qasje te <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Të hapet <xliff:g id="APPLICATION">%1$s</xliff:g> për të përdorur <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Të hapet <xliff:g id="APPLICATION">%1$s</xliff:g> për të përdorur <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"Hap gjithmonë <xliff:g id="APPLICATION">%1$s</xliff:g> kur lidhet <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="3257892669444535154">"Hap gjithmonë <xliff:g id="APPLICATION">%1$s</xliff:g> kur lidhet <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Të lejohet korrigjimi i USB-së?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"Shenja e gishtit të tastit \"RSA\" së kompjuterit është:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Gjurma e gishtit të tastit \"RSA\" së kompjuterit është:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Lejo gjithmonë nga ky kompjuter"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"Lejo"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Korrigjimi i USB-së nuk lejohet"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Konfirmuar"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Trokit \"Konfirmo\" për ta përfunduar"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"U vërtetua"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Prek sensorin e gjurmës së gishtit"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikona e gjurmës së gishtit"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Po të kërkojmë…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Njoftimet"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Elektriku"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Të dhënat celulare"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Përdorimi i të dhënave"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Të dhënat e mbetura"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 310fc6fb7840..b36b9dc8f6c2 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Подеси методе уноса"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Физичка тастатура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Желите ли да дозволите да <xliff:g id="APPLICATION">%1$s</xliff:g> приступа уређају <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Желите ли да дозволите да <xliff:g id="APPLICATION">%1$s</xliff:g> приступа уређају <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Желите ли да отворите апликацију <xliff:g id="APPLICATION">%1$s</xliff:g> да бисте користили уређај <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Желите ли да отворите апликацију <xliff:g id="APPLICATION">%1$s</xliff:g> да бисте користили уређај <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Потврђено"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Додирните Потврди да бисте завршили"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Идентитет је потврђен"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Додирните сензор за отисак прста"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Икона отиска прста"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Тражимо вас…"</string> @@ -366,6 +382,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Обавештења"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Лампа"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобилни подаци"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Потрошња података"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Преостала количина података"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 54769cd291c5..24e0b1e11f21 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Konfigurera inmatningsmetoder"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fysiskt tangentbord"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vill du ge <xliff:g id="APPLICATION">%1$s</xliff:g> åtkomst till <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vill du ge <xliff:g id="APPLICATION">%1$s</xliff:g> åtkomst till <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vill du öppna <xliff:g id="APPLICATION">%1$s</xliff:g> och hantera <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vill du öppna <xliff:g id="APPLICATION">%1$s</xliff:g> och hantera <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Bekräftat"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Slutför genom att trycka på Bekräfta"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Autentiserad"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Tryck på fingeravtryckssensorn"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Ikon för fingeravtryck"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Håller utkik efter dig …"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Aviseringar"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Ficklampa"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobildata"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Dataanvändning"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Återstående data"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 3f9278a55941..93f5b7d31c02 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Weka mbinu za ingizo"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Kibodi halisi"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Ungependa kuruhusu <xliff:g id="APPLICATION">%1$s</xliff:g> ifikie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Ungependa kuruhusu <xliff:g id="APPLICATION">%1$s</xliff:g> ifikie <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Ungependa kufungua <xliff:g id="APPLICATION">%1$s</xliff:g> ili itumie <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Ungependa kufungua <xliff:g id="APPLICATION">%1$s</xliff:g> ili itumie <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Imethibitishwa"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Gusa Thibitisha ili ukamilishe"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Umethibitishwa"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Gusa kitambua alama ya kidole"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Aikoni ya alama ya kidole"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Inakutafuta…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Arifa"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Tochi"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Data ya simu"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Matumizi ya data"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Data iliyosalia"</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index 0f368899b086..a5aa91d00b54 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"உள்ளீட்டு முறைகளை அமை"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"கைமுறை விசைப்பலகை"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ஐ அணுக, <xliff:g id="APPLICATION">%1$s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ஐ அணுக, <xliff:g id="APPLICATION">%1$s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ஐக் கையாள, <xliff:g id="APPLICATION">%1$s</xliff:g> பயன்பாட்டைத் திறக்கவா?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ஐக் கையாள, <xliff:g id="APPLICATION">%1$s</xliff:g> பயன்பாட்டைத் திறக்கவா?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"உறுதிப்படுத்தப்பட்டது"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"முடிக்க \'உறுதிப்படுத்து\' என்பதை தட்டவும்"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"அங்கீகரிக்கப்பட்டது"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"கைரேகை சென்சாரைத் தொடவும்"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"கைரேகை ஐகான்"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"உங்கள் முகத்தைத் தேடுகிறது…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"அறிவிப்புகள்"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"டார்ச் லைட்"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"மொபைல் டேட்டா"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"டேட்டா உபயோகம்"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"மீதமுள்ள தரவு"</string> @@ -498,29 +516,29 @@ <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"உங்கள் நிறுவனம், பணிக் கணக்கில் சான்றிதழ் அங்கீகாரத்தை நிறுவியுள்ளது. உங்களின் பாதுகாப்பான நெட்வொர்க் ட்ராஃபிக் கண்காணிக்கப்படலாம் அல்லது மாற்றப்படலாம்."</string> <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"இந்தச் சாதனத்தில் சான்றிதழ் அங்கீகாரம் நிறுவப்பட்டுள்ளது. உங்களின் பாதுகாப்பான நெட்வொர்க் ட்ராஃபிக் கண்காணிக்கப்படலாம் அல்லது மாற்றப்படலாம்."</string> <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"உங்கள் நிர்வாகி, நெட்வொர்க் பதிவெடுத்தலை இயக்கியுள்ளார். இது சாதனத்தில் ட்ராஃபிக்கைக் கண்காணிக்கும்."</string> - <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> - <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP_0">%1$s</xliff:g> மற்றும் <xliff:g id="VPN_APP_1">%2$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> - <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்கள் பணிக் கணக்கு இணைக்கப்பட்டுள்ளது."</string> - <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்களின் தனிப்பட்ட சுயவிவரம் இணைக்கப்பட்டுள்ளது."</string> + <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> + <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP_0">%1$s</xliff:g> மற்றும் <xliff:g id="VPN_APP_1">%2$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> + <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்கள் பணிக் கணக்கு இணைக்கப்பட்டுள்ளது."</string> + <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="VPN_APP">%1$s</xliff:g> உடன் உங்களின் தனிப்பட்ட சுயவிவரம் இணைக்கப்பட்டுள்ளது."</string> <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"உங்கள் சாதனத்தை நிர்வகிப்பது: <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string> <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"உங்கள் சாதனத்தை நிர்வகிக்க, <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> ஆப்ஸை <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> பயன்படுத்தும்."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"உங்கள் நிர்வாகியால் அமைப்புகள், நிறுவன அணுகல், ஆப்ஸ், சாதனத்துடன் தொடர்புடைய டேட்டா, சாதன இருப்பிடத் தகவல் ஆகியவற்றைக் கண்காணிக்கவும் நிர்வகிக்கவும் முடியும்."</string> <string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string> <string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"மேலும் அறிக"</string> - <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"<xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால் மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> + <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"<xliff:g id="VPN_APP">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால் மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string> <string name="monitoring_description_vpn_settings" msgid="6434859242636063861">"VPN அமைப்புகளைத் திற"</string> <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"நம்பகமான அனுமதிச் சான்றுகளைத் திற"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"உங்கள் நிர்வாகி நெட்வொர்க் பதிவெடுத்தலை இயக்கியுள்ளார், இது சாதனத்தில் ட்ராஃபிக்கைக் கண்காணிக்கும்.\n\nமேலும் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> - <string name="monitoring_description_vpn" msgid="4445150119515393526">"VPN இணைப்பை அமைக்க, பயன்பாட்டிற்கு அனுமதி வழங்கியுள்ளீர்கள்.\n\nஇந்த ஆப்ஸால் மின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் இணையதளங்கள் உட்பட, உங்கள் சாதனத்தையும் நெட்வொர்க் செயல்பாட்டையும் கண்காணிக்க முடியும்."</string> - <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது.\n\nஉங்கள் நிர்வாகியால் பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்.\n\nமேலும் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.\n\nஉங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய VPN உடனும் இணைக்கப்பட்டுள்ளீர்கள்."</string> + <string name="monitoring_description_vpn" msgid="4445150119515393526">"VPN இணைப்பை அமைக்க, பயன்பாட்டிற்கு அனுமதி வழங்கியுள்ளீர்கள்.\n\nஇந்த ஆப்ஸால் மின்னஞ்சல்கள், ஆப்ஸ் மற்றும் இணையதளங்கள் உட்பட, உங்கள் சாதனத்தையும் நெட்வொர்க் செயல்பாட்டையும் கண்காணிக்க முடியும்."</string> + <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது.\n\nஉங்கள் நிர்வாகியால் ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்.\n\nமேலும் தகவலுக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்.\n\nஉங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய VPN உடனும் இணைக்கப்பட்டுள்ளீர்கள்."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> - <string name="monitoring_description_app" msgid="1828472472674709532">"மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> - <string name="monitoring_description_app_personal" msgid="484599052118316268">"<xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால், மின்னஞ்சல்கள், பயன்பாடுகள் மற்றும் இணையதளங்கள் உட்பட உங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> - <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"<xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால் மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> - <string name="monitoring_description_app_work" msgid="4612997849787922906">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nமேலும் தகவலுக்கு, நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> - <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், பயன்பாடுகள், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nஉங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> உடனும் இணைக்கப்பட்டுள்ளீர்கள்."</string> + <string name="monitoring_description_app" msgid="1828472472674709532">"மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள்."</string> + <string name="monitoring_description_app_personal" msgid="484599052118316268">"<xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால், மின்னஞ்சல்கள், ஆப்ஸ் மற்றும் இணையதளங்கள் உட்பட உங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> + <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"<xliff:g id="APPLICATION">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளீர்கள். இந்த ஆப்ஸால் மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்க முடியும்."</string> + <string name="monitoring_description_app_work" msgid="4612997849787922906">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nமேலும் தகவலுக்கு, நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> + <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"உங்கள் பணிக் கணக்கை <xliff:g id="ORGANIZATION">%1$s</xliff:g> நிர்வகிக்கிறது. மின்னஞ்சல்கள், ஆப்ஸ், இணையதளங்கள் உட்பட உங்கள் பணி நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> உடன் அது இணைக்கப்பட்டுள்ளது.\n\nஉங்கள் தனிப்பட்ட நெட்வொர்க் செயல்பாட்டைக் கண்காணிக்கக்கூடிய <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> உடனும் இணைக்கப்பட்டுள்ளீர்கள்."</string> <string name="keyguard_indication_trust_unlocked" msgid="2712865815371519117">"TrustAgent இதைத் திறந்தே வைத்துள்ளது"</string> <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"நீங்கள் கைமுறையாகத் திறக்கும் வரை, சாதனம் பூட்டப்பட்டிருக்கும்"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"விரைவாக அறிவிப்புகளைப் பெறுதல்"</string> @@ -846,7 +864,7 @@ <string name="pip_skip_to_prev" msgid="1955311326688637914">"முந்தையதற்குச் செல்"</string> <string name="thermal_shutdown_title" msgid="4458304833443861111">"வெப்பத்தினால் ஃபோன் ஆஃப் செய்யப்பட்டது"</string> <string name="thermal_shutdown_message" msgid="9006456746902370523">"இப்போது உங்கள் ஃபோன் இயல்புநிலையில் இயங்குகிறது"</string> - <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"உங்கள் ஃபோன் அதிகமாகச் சூடானதால், அதன் சூட்டைக் குறைக்க, ஆஃப் செய்யப்பட்டது. இப்போது உங்கள் ஃபோன் இயல்புநிலையில் இயங்குகிறது.\n\nபின்வருவனவற்றைச் செய்தால், ஃபோன் சூடாகலாம்:\n • அதிகளவு தரவைப் பயன்படுத்தும் ஆப்ஸை (எ.கா: கேமிங், வீடியோ (அ) வழிகாட்டுதல் பயன்பாடுகள்) பயன்படுத்துவது\n • பெரிய கோப்புகளைப் பதிவிறக்குவது/பதிவேற்றுவது\n • அதிக வெப்பநிலையில் ஃபோனைப் பயன்படுத்துவது"</string> + <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"உங்கள் ஃபோன் அதிகமாகச் சூடானதால், அதன் சூட்டைக் குறைக்க, ஆஃப் செய்யப்பட்டது. இப்போது உங்கள் ஃபோன் இயல்புநிலையில் இயங்குகிறது.\n\nபின்வருவனவற்றைச் செய்தால், ஃபோன் சூடாகலாம்:\n • அதிகளவு தரவைப் பயன்படுத்தும் ஆப்ஸை (எ.கா: கேமிங், வீடியோ (அ) வழிகாட்டுதல் ஆப்ஸ்) பயன்படுத்துவது\n • பெரிய கோப்புகளைப் பதிவிறக்குவது/பதிவேற்றுவது\n • அதிக வெப்பநிலையில் ஃபோனைப் பயன்படுத்துவது"</string> <string name="high_temp_title" msgid="4589508026407318374">"மொபைல் சூடாகிறது"</string> <string name="high_temp_notif_message" msgid="5642466103153429279">"மொபைலின் வெப்ப அளவு குறையும் போது, சில அம்சங்களைப் பயன்படுத்த முடியாது"</string> <string name="high_temp_dialog_message" msgid="6840700639374113553">"உங்கள் மொபைலின் வெப்ப அளவு தானாகவே குறையும். தொடர்ந்து நீங்கள் மொபைலைப் பயன்படுத்தலாம், ஆனால் அதன் வேகம் குறைவாக இருக்கக்கூடும்.\n\nமொபைலின் வெப்ப அளவு குறைந்தவுடன், அது இயல்பு நிலையில் இயங்கும்."</string> @@ -891,7 +909,7 @@ <string name="qs_dnd_until" msgid="3469471136280079874">"<xliff:g id="ID_1">%s</xliff:g> வரை"</string> <string name="qs_dnd_keep" msgid="1825009164681928736">"வைத்திரு"</string> <string name="qs_dnd_replace" msgid="8019520786644276623">"மாற்று"</string> - <string name="running_foreground_services_title" msgid="381024150898615683">"பின்னணியில் இயங்கும் பயன்பாடுகள்"</string> + <string name="running_foreground_services_title" msgid="381024150898615683">"பின்னணியில் இயங்கும் ஆப்ஸ்"</string> <string name="running_foreground_services_msg" msgid="6326247670075574355">"பேட்டரி மற்றும் டேட்டா உபயோக விவரங்களைக் காண, தட்டவும்"</string> <string name="mobile_data_disable_title" msgid="1068272097382942231">"மொபைல் டேட்டாவை ஆஃப் செய்யவா?"</string> <string name="mobile_data_disable_message" msgid="4756541658791493506">"<xliff:g id="CARRIER">%s</xliff:g> மூலம் டேட்டா அல்லது இணையத்தை உங்களால் பயன்படுத்த முடியாது. வைஃபை வழியாக மட்டுமே இணையத்தைப் பயன்படுத்த முடியும்."</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 62fe95b52290..c6b2bb7152a4 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ఇన్పుట్ పద్ధతులను సెటప్ చేయండి"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"భౌతిక కీబోర్డ్"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ని యాక్సెస్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని అనుమతించాలా?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ని యాక్సెస్ చేయడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని అనుమతించాలా?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g>ని నిర్వహించడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని తెరవాలా?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>ని నిర్వహించడానికి <xliff:g id="APPLICATION">%1$s</xliff:g>ని తెరవాలా?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"నిర్ధారించబడింది"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"పూర్తి చేయడానికి \"నిర్ధారించు\" నొక్కండి"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ప్రామాణీకరించబడింది"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"వేలిముద్ర సెన్సార్ను తాకండి"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"వేలిముద్ర చిహ్నం"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"మీ కోసం చూస్తోంది…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"నోటిఫికేషన్లు"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ఫ్లాష్లైట్"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"మొబైల్ డేటా"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"డేటా వినియోగం"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"మిగిలిన డేటా"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index eb6810a0898a..2907524981a8 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ตั้งค่าวิธีการป้อนข้อมูล"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"แป้นพิมพ์บนเครื่อง"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"อนุญาตให้ <xliff:g id="APPLICATION">%1$s</xliff:g> เข้าถึง <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ไหม"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_DEVICE">%2$s</xliff:g> ไหม"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"เปิด <xliff:g id="APPLICATION">%1$s</xliff:g> เพื่อจัดการ <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ไหม"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"ยืนยันแล้ว"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"แตะยืนยันเพื่อดำเนินการให้เสร็จสมบูรณ์"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"ตรวจสอบสิทธิ์แล้ว"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"แตะเซ็นเซอร์ลายนิ้วมือ"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"ไอคอนลายนิ้วมือ"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"กำลังหาใบหน้าคุณ…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"การแจ้งเตือน"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ไฟฉาย"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"เน็ตมือถือ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"การใช้อินเทอร์เน็ต"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ข้อมูลที่เหลืออยู่"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index f6abdcbcbada..ce8c88bad0de 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"I-set up paraan ng pag-input"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Aktwal na keyboard"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Payagan ang <xliff:g id="APPLICATION">%1$s</xliff:g> na ma-access ang <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Payagan ang <xliff:g id="APPLICATION">%1$s</xliff:g> na ma-access ang <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Buksan ang <xliff:g id="APPLICATION">%1$s</xliff:g> upang pamahalaan ang <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Buksan ang <xliff:g id="APPLICATION">%1$s</xliff:g> upang pamahalaan ang <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Nakumpirma"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"I-tap ang Kumpirmahin para kumpletuhin"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Na-authenticate"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Pindutin ang fingerprint sensor"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Icon ng fingerprint"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Hinahanap ka…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Mga Notification"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flashlight"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Paggamit ng data"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Natitirang data"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index b5e17023b0e5..79760141338c 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Giriş yöntemlerini ayarla"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Fiziksel klavye"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> uygulamasının <xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazına erişmesine izin verilsin mi?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> uygulamasının <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> aksesuarına erişmesine izin verilsin mi?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> cihazını işlemek için <xliff:g id="APPLICATION">%1$s</xliff:g> uygulaması açılsın mı?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> aksesuarını işlemek için <xliff:g id="APPLICATION">%1$s</xliff:g> uygulaması açılsın mı?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Onaylandı"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tamamlamak için Onayla\'ya dokunun"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Kimliği Doğrulandı"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Parmak izi sensörüne dokunun"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Parmak izi simgesi"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Yüzünüz tanınmaya çalışılıyor…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Bildirimler"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Fener"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobil veri"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Veri kullanımı"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Kalan veri"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 36bec1e031b4..ea2f376f4d75 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Налаштувати методи введення"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Фізична клавіатура"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Надати додатку <xliff:g id="APPLICATION">%1$s</xliff:g> доступ до такого аксесуара: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Надати додатку <xliff:g id="APPLICATION">%1$s</xliff:g> доступ до такого аксесуара: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Відкрити додаток <xliff:g id="APPLICATION">%1$s</xliff:g>, щоб використовувати такий аксесуар: <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Відкрити додаток <xliff:g id="APPLICATION">%1$s</xliff:g>, щоб використовувати такий аксесуар: <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Підтверджено"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Щоб завершити, натисніть \"Підтвердити\""</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Автентифіковано"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Торкніться сканера відбитків пальців"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Значок відбитка пальця"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Пошук обличчя…"</string> @@ -368,6 +384,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Сповіщення"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Ліхтарик"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Мобільне передавання даних"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Використання даних"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Залишилося даних"</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 5fceabe93f2f..1c284315324b 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ان پٹ کے طریقوں کو ترتیب دیں"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"طبعی کی بورڈ"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> کو <xliff:g id="USB_DEVICE">%2$s</xliff:g> تک رسائی حاصل کرنے کی اجازت دیں؟"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> کو <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> تک رسائی حاصل کرنے کی اجازت دیں؟"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> ہینڈل کرنے کیلئے <xliff:g id="APPLICATION">%1$s</xliff:g> کھولیں؟"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> ہینڈل کرنے کیلئے <xliff:g id="APPLICATION">%1$s</xliff:g> کھولیں؟"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"تصدیق شدہ"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"مکمل کرنے کیلئے \'تصدیق کریں\' تھپتھپائیں"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"تصدیق کردہ"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"فنگر پرنٹ سینسر پر ٹچ کریں"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"فنگر پرنٹ آئیکن"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"آپ کے لیے تلاش کیا جا رہا ہے…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"اطلاعات"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"فلیش لائٹ"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"موبائل ڈیٹا"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ڈیٹا کا استعمال"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"باقی ڈیٹا"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 37651a5c000d..c3e39e563456 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Kiritish usullarini moslash"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Tashqi tugmatag"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasiga <xliff:g id="USB_DEVICE">%2$s</xliff:g> qurilmasidan foydalanishga ruxsat berilsinmi?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasiga <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> qurilmasidan foydalanishga ruxsat berilsinmi?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"<xliff:g id="USB_DEVICE">%2$s</xliff:g> bilan ishlash uchun <xliff:g id="APPLICATION">%1$s</xliff:g> ochilsinmi?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"<xliff:g id="USB_ACCESSORY">%2$s</xliff:g> bilan ishlash uchun <xliff:g id="APPLICATION">%1$s</xliff:g> ochilsinmi?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Tasdiqlangan"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Tasdiqlash uchun tegining"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Tasdiqlandi"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Barmoq izi skaneriga tegining"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Barmoq izi belgisi"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Yuzingiz tekshirilmoqda…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Bildirishnomalar"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Fonar"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobil internet"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Trafik sarfi"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Qolgan trafik"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index f6782659f1ed..d2da39bf7dff 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Thiết lập phương thức nhập"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Bàn phím vật lý"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Cho phép <xliff:g id="APPLICATION">%1$s</xliff:g> truy cập <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Cho phép <xliff:g id="APPLICATION">%1$s</xliff:g> truy cập <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Mở <xliff:g id="APPLICATION">%1$s</xliff:g> để điều khiển <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Mở <xliff:g id="APPLICATION">%1$s</xliff:g> để điều khiển <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -56,7 +58,7 @@ <string name="always_use_device" msgid="4015357883336738417">"Luôn mở <xliff:g id="APPLICATION">%1$s</xliff:g> khi kết nối <xliff:g id="USB_DEVICE">%2$s</xliff:g>"</string> <string name="always_use_accessory" msgid="3257892669444535154">"Luôn mở <xliff:g id="APPLICATION">%1$s</xliff:g> khi kết nối <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Cho phép gỡ lỗi qua USB?"</string> - <string name="usb_debugging_message" msgid="2220143855912376496">"Tệp tham chiếu khóa RSA của máy tính là:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Vân tay khóa RSA của máy tính là:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Luôn cho phép từ máy tính này"</string> <string name="usb_debugging_allow" msgid="2272145052073254852">"Cho phép"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Không cho phép chế độ gỡ lỗi qua USB"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Ðã xác nhận"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Nhấn vào Xác nhận để hoàn tất"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Đã xác thực"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Chạm vào cảm biến vân tay"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Biểu tượng vân tay"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Đang tìm kiếm bạn…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Thông báo"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Đèn pin"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Dữ liệu di động"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Sử dụng dữ liệu"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Dữ liệu còn lại"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 05509f65047e..551e54e9f473 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"设置输入法"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"物理键盘"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"要允许<xliff:g id="APPLICATION">%1$s</xliff:g>访问<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"要允许<xliff:g id="APPLICATION">%1$s</xliff:g>访问<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>吗？"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"要打开<xliff:g id="APPLICATION">%1$s</xliff:g>来处理<xliff:g id="USB_DEVICE">%2$s</xliff:g>吗？"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"要打开<xliff:g id="APPLICATION">%1$s</xliff:g>来处理<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>吗？"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"已确认"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"点按“确认”即可完成"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"已经过身份验证"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"请触摸指纹传感器"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指纹图标"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在查找您的面孔…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"手电筒"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"移动数据"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"流量使用情况"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"剩余流量"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index b57e61fa0cf6..206fcfc0e101 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"設定輸入法"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"實體鍵盤"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"要允許「<xliff:g id="APPLICATION">%1$s</xliff:g>」存取「<xliff:g id="USB_DEVICE">%2$s</xliff:g>」嗎？"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"要允許「<xliff:g id="APPLICATION">%1$s</xliff:g>」存取「<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>」嗎？"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"要開啟「<xliff:g id="APPLICATION">%1$s</xliff:g>」處理「<xliff:g id="USB_DEVICE">%2$s</xliff:g>」嗎？"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"要開啟「<xliff:g id="APPLICATION">%1$s</xliff:g>」處理「<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>」嗎？"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"已確認"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"輕按 [確定] 以完成"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"驗證咗"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"請輕觸指紋感應器"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋圖示"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在搜尋您的臉孔…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"電筒"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"流動數據"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"數據用量"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"剩餘資料"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 14fedbbad2c5..c1f299d93136 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"設定輸入法"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"實體鍵盤"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"要允許「<xliff:g id="APPLICATION">%1$s</xliff:g>」存取「<xliff:g id="USB_DEVICE">%2$s</xliff:g>」嗎？"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"要允許「<xliff:g id="APPLICATION">%1$s</xliff:g>」存取「<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>」嗎？"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"要開啟「<xliff:g id="APPLICATION">%1$s</xliff:g>」處理「<xliff:g id="USB_DEVICE">%2$s</xliff:g>」嗎？"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"要開啟「<xliff:g id="APPLICATION">%1$s</xliff:g>」處理「<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>」嗎？"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"確認完畢"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"輕觸 [確認] 完成驗證設定"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"已通過驗證"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"請輕觸指紋感應器"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"指紋圖示"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"正在尋找你的臉孔…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"手電筒"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"行動數據"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"數據用量"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"剩餘資料"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index c158c773b03d..37eca51c1734 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -47,6 +47,8 @@ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Izilungiselelo zezindlela zokufakwayo"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Ukwakheka kwekhibhodi"</string> <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Vumela i-<xliff:g id="APPLICATION">%1$s</xliff:g> ukufinyelela i-<xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> + <!-- no translation found for usb_device_permission_prompt_warn (1842558472039505091) --> + <skip /> <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Vumela i-<xliff:g id="APPLICATION">%1$s</xliff:g> ukufinyelela i-<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Vula i-<xliff:g id="APPLICATION">%1$s</xliff:g> ukuze uphath i-<xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Vula i-<xliff:g id="APPLICATION">%1$s</xliff:g> ukuze uphath i-<xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> @@ -126,6 +128,20 @@ <string name="biometric_dialog_face_icon_description_confirmed" msgid="2003141400387093967">"Kuqinisekisiwe"</string> <string name="biometric_dialog_tap_confirm" msgid="4540715260292022404">"Thepha okuthi Qinisekisa ukuze uqedele"</string> <string name="biometric_dialog_authenticated" msgid="5918352844999713693">"Kugunyaziwe"</string> + <!-- no translation found for biometric_dialog_use_pin (2506187927478996039) --> + <skip /> + <!-- no translation found for biometric_dialog_use_pattern (4721877831431699442) --> + <skip /> + <!-- no translation found for biometric_dialog_use_password (3426428493718969343) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pin (4600590473629948574) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_pattern (4808369401645512099) --> + <skip /> + <!-- no translation found for biometric_dialog_wrong_password (2343518162282889518) --> + <skip /> + <!-- no translation found for biometric_dialog_credential_too_many_attempts (1556206869468265728) --> + <skip /> <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Thinta inzwa yesigxivizo somunwe"</string> <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Isithonjana sezigxivizo zeminwe"</string> <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Kufunwa wena…"</string> @@ -364,6 +380,8 @@ </plurals> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Izaziso"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"I-Flashlight"</string> + <!-- no translation found for quick_settings_flashlight_camera_in_use (6120370795890963385) --> + <skip /> <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Idatha yeselula"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Ukusetshenziswa kwedatha"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Idatha esele"</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 1079206c81ce..d722d618e416 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1009,10 +1009,15 @@ <!-- Biometric Dialog values --> <dimen name="biometric_dialog_biometric_icon_size">64dp</dimen> <dimen name="biometric_dialog_corner_size">4dp</dimen> + <!-- Y translation when showing/dismissing the dialog--> <dimen name="biometric_dialog_animation_translation_offset">350dp</dimen> <dimen name="biometric_dialog_border_padding">4dp</dimen> <dimen name="biometric_dialog_elevation">1dp</dimen> <dimen name="biometric_dialog_icon_padding">16dp</dimen> + <!-- Y translation for biometric contents when transitioning to device credential UI --> + <dimen name="biometric_dialog_medium_to_large_translation_offset">100dp</dimen> + <!-- Y translation for credential contents when animating in --> + <dimen name="biometric_dialog_credential_translation_offset">60dp</dimen> <!-- Wireless Charging Animation values --> <dimen name="wireless_charging_dots_radius_start">0dp</dimen> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 372718139886..04640f418e97 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -141,5 +141,8 @@ <!-- Global Actions Menu --> <item type="id" name="global_actions_view" /> + + <!-- NotificationPanelView --> + <item type="id" name="notification_panel" /> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index c5547800360d..8335c116c95f 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -311,6 +311,21 @@ <!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] --> <string name="biometric_dialog_authenticated">Authenticated</string> + <!-- Button text shown on BiometricPrompt giving the user the option to use an alternate form of authentication (Pin) [CHAR LIMIT=30] --> + <string name="biometric_dialog_use_pin">Use PIN</string> + <!-- Button text shown on BiometricPrompt giving the user the option to use an alternate form of authentication (Pattern) [CHAR LIMIT=30] --> + <string name="biometric_dialog_use_pattern">Use pattern</string> + <!-- Button text shown on BiometricPrompt giving the user the option to use an alternate form of authentication (Pass) [CHAR LIMIT=30] --> + <string name="biometric_dialog_use_password">Use password</string> + <!-- Error string shown when the user enters an incorrect PIN [CHAR LIMIT=40]--> + <string name="biometric_dialog_wrong_pin">Wrong PIN</string> + <!-- Error string shown when the user enters an incorrect pattern [CHAR LIMIT=40]--> + <string name="biometric_dialog_wrong_pattern">Wrong pattern</string> + <!-- Error string shown when the user enters an incorrect password [CHAR LIMIT=40]--> + <string name="biometric_dialog_wrong_password">Wrong password</string> + <!-- Error string shown when the user enters too many incorrect attempts [CHAR LIMIT=120]--> + <string name="biometric_dialog_credential_too_many_attempts">Too many incorrect attempts.\nTry again in <xliff:g id="number">%d</xliff:g> seconds.</string> + <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication --> <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string> <!-- Content description of the fingerprint icon when the system-provided fingerprint dialog is showing, for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6374191c4d7b..96fbcbba6e8b 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -314,6 +314,12 @@ <item name="*android:errorColor">?android:attr/colorError</item> </style> + <style name="LockPatternStyleBiometricPrompt"> + <item name="*android:regularColor">?android:attr/colorForeground</item> + <item name="*android:successColor">?android:attr/colorForeground</item> + <item name="*android:errorColor">?android:attr/colorError</item> + </style> + <style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> <item name="lightIconTheme">@style/QSIconTheme</item> <item name="darkIconTheme">@style/QSIconTheme</item> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java index 5ddf89c08887..6186589ab086 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java @@ -17,6 +17,7 @@ package com.android.systemui.shared.system; import android.app.ActivityManager.RunningTaskInfo; +import android.app.ITaskStackListener; import android.content.ComponentName; import android.os.IBinder; import android.os.UserHandle; @@ -106,6 +107,9 @@ public abstract class TaskStackChangeListener { */ public void onRecentTaskListUpdated() { } + /** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */ + public void onRecentTaskListFrozenChanged(boolean frozen) { } + /** * Checks that the current user matches the process. Since * {@link android.app.ITaskStackListener} is not multi-user aware, handlers of diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java index 820057a168a0..8d823ca34b39 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java @@ -224,6 +224,12 @@ public class TaskStackChangeListeners extends TaskStackListener { mHandler.obtainMessage(H.ON_TASK_LIST_UPDATED).sendToTarget(); } + @Override + public void onRecentTaskListFrozenChanged(boolean frozen) { + mHandler.obtainMessage(H.ON_TASK_LIST_FROZEN_UNFROZEN, frozen ? 1 : 0, 0 /* unused */) + .sendToTarget(); + } + private final class H extends Handler { private static final int ON_TASK_STACK_CHANGED = 1; private static final int ON_TASK_SNAPSHOT_CHANGED = 2; @@ -247,6 +253,7 @@ public class TaskStackChangeListeners extends TaskStackListener { private static final int ON_TASK_DISPLAY_CHANGED = 20; private static final int ON_TASK_LIST_UPDATED = 21; private static final int ON_SINGLE_TASK_DISPLAY_EMPTY = 22; + private static final int ON_TASK_LIST_FROZEN_UNFROZEN = 23; public H(Looper looper) { @@ -408,6 +415,12 @@ public class TaskStackChangeListeners extends TaskStackListener { } break; } + case ON_TASK_LIST_FROZEN_UNFROZEN: { + for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) { + mTaskStackListeners.get(i).onRecentTaskListFrozenChanged(msg.arg1 != 0); + } + break; + } } } } diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java index a97ec6442e14..ef9538dbef38 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java @@ -35,6 +35,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.telephony.IccCardConstants; @@ -66,6 +67,7 @@ public class CarrierTextController { private WifiManager mWifiManager; private boolean[] mSimErrorState; private final int mSimSlotsNumber; + @Nullable // Check for nullability before dispatching private CarrierTextCallback mCarrierTextCallback; private Context mContext; private CharSequence mSeparator; @@ -74,12 +76,12 @@ public class CarrierTextController { new WakefulnessLifecycle.Observer() { @Override public void onFinishedWakingUp() { - mCarrierTextCallback.finishedWakingUp(); + if (mCarrierTextCallback != null) mCarrierTextCallback.finishedWakingUp(); } @Override public void onStartedGoingToSleep() { - mCarrierTextCallback.startedGoingToSleep(); + if (mCarrierTextCallback != null) mCarrierTextCallback.startedGoingToSleep(); } }; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index 63da5339efe7..5a1c9976f021 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import android.os.Handler; -import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; import android.text.TextUtils; @@ -135,7 +134,7 @@ public class KeyguardStatusView extends GridLayout implements super(context, attrs, defStyle); mIActivityManager = ActivityManager.getService(); mLockPatternUtils = new LockPatternUtils(getContext()); - mHandler = new Handler(Looper.myLooper()); + mHandler = new Handler(); onDensityOrFontScaleChanged(); } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index dc8ee16e8645..9bcccbc903dc 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -118,12 +118,14 @@ import java.util.function.Consumer; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Singleton; /** * Watches for updates that may be interesting to the keyguard, and provides * the up to date information as well as a registration for callbacks that care * to be updated. */ +@Singleton public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private static final String TAG = "KeyguardUpdateMonitor"; diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java b/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java index 72831e99e122..176bcbfd9500 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java @@ -19,8 +19,6 @@ package com.android.systemui; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; -import android.content.Context; - import androidx.annotation.Nullable; import com.android.systemui.dock.DockManager; @@ -72,11 +70,8 @@ abstract class SystemUIDefaultModule { abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment( KeyguardEnvironmentImpl keyguardEnvironment); - @Singleton - @Provides - static ShadeController provideShadeController(Context context) { - return SysUiServiceProvider.getComponent(context, StatusBar.class); - } + @Binds + abstract ShadeController provideShadeController(StatusBar statusBar); @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java index f9ffb804f9f3..5010f319f8b4 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleViewController.java @@ -43,6 +43,7 @@ public class AssistHandleViewController implements NavigationBarTransitions.Dark private Handler mHandler; private CornerHandleView mAssistHintLeft; private CornerHandleView mAssistHintRight; + private int mBottomOffset; @VisibleForTesting boolean mAssistHintVisible; @@ -62,6 +63,23 @@ public class AssistHandleViewController implements NavigationBarTransitions.Dark } /** + * Set the bottom offset. + * + * @param bottomOffset the bottom offset to translate. + */ + public void setBottomOffset(int bottomOffset) { + if (mBottomOffset != bottomOffset) { + mBottomOffset = bottomOffset; + if (mAssistHintVisible) { + // If assist handles are visible, hide them without animation and then make them + // show once again (with corrected bottom offset). + hideAssistHandles(); + setAssistHintVisible(true); + } + } + } + + /** * Controls the visibility of the assist gesture handles. * * @param visible whether the handles should be shown @@ -126,7 +144,8 @@ public class AssistHandleViewController implements NavigationBarTransitions.Dark xDirection * translationStart * view.getWidth(), xDirection * translationEnd * view.getWidth()); Animator translateY = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, - translationStart * view.getHeight(), translationEnd * view.getHeight()); + translationStart * view.getHeight() + mBottomOffset, + translationEnd * view.getHeight() + mBottomOffset); AnimatorSet set = new AnimatorSet(); set.play(scaleX).with(scaleY); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java index 73bbce9c5b35..d20cd72f0712 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java @@ -16,8 +16,6 @@ package com.android.systemui.biometrics; -import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE; - import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; @@ -25,6 +23,7 @@ import android.animation.ValueAnimator; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.admin.DevicePolicyManager; import android.content.Context; import android.hardware.biometrics.BiometricPrompt; import android.os.Bundle; @@ -34,7 +33,7 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.view.View; -import android.view.accessibility.AccessibilityEvent; +import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.Button; import android.widget.ImageView; @@ -42,10 +41,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.widget.LockPatternUtils; import com.android.systemui.R; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; +import java.util.List; /** * Contains the Biometric views (title, subtitle, icon, buttons, etc) and its controllers. @@ -97,6 +99,7 @@ public abstract class AuthBiometricView extends LinearLayout { int ACTION_BUTTON_NEGATIVE = 3; int ACTION_BUTTON_TRY_AGAIN = 4; int ACTION_ERROR = 5; + int ACTION_USE_DEVICE_CREDENTIAL = 6; /** * When an action has occurred. The caller will only invoke this when the callback should @@ -145,6 +148,14 @@ public abstract class AuthBiometricView extends LinearLayout { public int getDelayAfterError() { return BiometricPrompt.HIDE_DIALOG_DELAY; } + + public int getMediumToLargeAnimationDurationMs() { + return AuthDialog.ANIMATE_MEDIUM_TO_LARGE_DURATION_MS; + } + + public int getAnimateCredentialStartDelayMs() { + return AuthDialog.ANIMATE_CREDENTIAL_START_DELAY_MS; + } } private final Injector mInjector; @@ -154,8 +165,9 @@ public abstract class AuthBiometricView extends LinearLayout { private final int mTextColorHint; private AuthPanelController mPanelController; - private Bundle mBundle; + private Bundle mBiometricPromptBundle; private boolean mRequireConfirmation; + private int mUserId; @AuthDialog.DialogSize int mSize = AuthDialog.SIZE_UNKNOWN; private TextView mTitleView; @@ -212,6 +224,9 @@ public abstract class AuthBiometricView extends LinearLayout { } else if (mSize == AuthDialog.SIZE_SMALL) { Log.w(TAG, "Ignoring background click during small dialog"); return; + } else if (mSize == AuthDialog.SIZE_LARGE) { + Log.w(TAG, "Ignoring background click during large dialog"); + return; } mCallback.onAction(Callback.ACTION_USER_CANCELED); }; @@ -256,7 +271,7 @@ public abstract class AuthBiometricView extends LinearLayout { } public void setBiometricPromptBundle(Bundle bundle) { - mBundle = bundle; + mBiometricPromptBundle = bundle; } public void setCallback(Callback callback) { @@ -267,6 +282,10 @@ public abstract class AuthBiometricView extends LinearLayout { backgroundView.setOnClickListener(mBackgroundClickListener); } + public void setUserId(int userId) { + mUserId = userId; + } + public void setRequireConfirmation(boolean requireConfirmation) { mRequireConfirmation = requireConfirmation; } @@ -287,7 +306,7 @@ public abstract class AuthBiometricView extends LinearLayout { final int newHeight = mIconView.getHeight() + 2 * (int) iconPadding; mPanelController.updateForContentDimensions(mMediumWidth, newHeight, - false /* animate */); + 0 /* animateDurationMs */); mSize = newSize; } else if (mSize == AuthDialog.SIZE_SMALL && newSize == AuthDialog.SIZE_MEDIUM) { @@ -305,10 +324,8 @@ public abstract class AuthBiometricView extends LinearLayout { // Animate the text final ValueAnimator opacityAnimator = ValueAnimator.ofFloat(0, 1); - opacityAnimator.setDuration(AuthDialog.ANIMATE_DURATION_MS); opacityAnimator.addUpdateListener((animation) -> { final float opacity = (float) animation.getAnimatedValue(); - mTitleView.setAlpha(opacity); mIndicatorView.setAlpha(opacity); mNegativeButton.setAlpha(opacity); @@ -324,7 +341,7 @@ public abstract class AuthBiometricView extends LinearLayout { // Choreograph together final AnimatorSet as = new AnimatorSet(); - as.setDuration(AuthDialog.ANIMATE_DURATION_MS); + as.setDuration(AuthDialog.ANIMATE_SMALL_TO_MEDIUM_DURATION_MS); as.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { @@ -355,11 +372,73 @@ public abstract class AuthBiometricView extends LinearLayout { as.start(); // Animate the panel mPanelController.updateForContentDimensions(mMediumWidth, mMediumHeight, - true /* animate */); + AuthDialog.ANIMATE_SMALL_TO_MEDIUM_DURATION_MS); } else if (newSize == AuthDialog.SIZE_MEDIUM) { mPanelController.updateForContentDimensions(mMediumWidth, mMediumHeight, - false /* animate */); + 0 /* animateDurationMs */); mSize = newSize; + } else if (newSize == AuthDialog.SIZE_LARGE) { + final boolean isManagedProfile = Utils.isManagedProfile(mContext, mUserId); + + // If it's a managed profile, animate the contents and panel down, since the credential + // contents will be shown on the same "layer" as the background. If it's not a managed + // profile, animate the contents up and expand the panel to full-screen - the credential + // contents will be shown on the same "layer" as the panel. + final float translationY = isManagedProfile ? + -getResources().getDimension( + R.dimen.biometric_dialog_animation_translation_offset) + : getResources().getDimension( + R.dimen.biometric_dialog_medium_to_large_translation_offset); + final AuthBiometricView biometricView = this; + + // Translate at full duration + final ValueAnimator translationAnimator = ValueAnimator.ofFloat( + biometricView.getY(), biometricView.getY() - translationY); + translationAnimator.setDuration(mInjector.getMediumToLargeAnimationDurationMs()); + translationAnimator.addUpdateListener((animation) -> { + final float translation = (float) animation.getAnimatedValue(); + biometricView.setTranslationY(translation); + }); + translationAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + if (biometricView.getParent() != null) { + ((ViewGroup) biometricView.getParent()).removeView(biometricView); + } + mSize = newSize; + } + }); + + // Opacity to 0 in half duration + final ValueAnimator opacityAnimator = ValueAnimator.ofFloat(1, 0); + opacityAnimator.setDuration(mInjector.getMediumToLargeAnimationDurationMs() / 2); + opacityAnimator.addUpdateListener((animation) -> { + final float opacity = (float) animation.getAnimatedValue(); + biometricView.setAlpha(opacity); + }); + + if (!isManagedProfile) { + mPanelController.setUseFullScreen(true); + mPanelController.updateForContentDimensions( + mPanelController.getContainerWidth(), + mPanelController.getContainerHeight(), + mInjector.getMediumToLargeAnimationDurationMs()); + } + + // Start the animations together + AnimatorSet as = new AnimatorSet(); + List<Animator> animators = new ArrayList<>(); + animators.add(translationAnimator); + animators.add(opacityAnimator); + if (isManagedProfile) { + animators.add(mPanelController.getTranslationAnimator(translationY)); + animators.add(mPanelController.getAlphaAnimator(0)); + } + as.playTogether(animators); + as.setDuration(isManagedProfile ? mInjector.getMediumToLargeAnimationDurationMs() + : mInjector.getMediumToLargeAnimationDurationMs() * 2 / 3); + as.start(); } else { Log.e(TAG, "Unknown transition from: " + mSize + " to: " + newSize); } @@ -528,7 +607,11 @@ public abstract class AuthBiometricView extends LinearLayout { if (mState == STATE_PENDING_CONFIRMATION) { mCallback.onAction(Callback.ACTION_USER_CANCELED); } else { - mCallback.onAction(Callback.ACTION_BUTTON_NEGATIVE); + if (isDeviceCredentialAllowed()) { + startTransitionToCredentialUI(); + } else { + mCallback.onAction(Callback.ACTION_BUTTON_NEGATIVE); + } } }); @@ -544,6 +627,16 @@ public abstract class AuthBiometricView extends LinearLayout { }); } + /** + * Kicks off the animation process and invokes the callback. + */ + void startTransitionToCredentialUI() { + updateSize(AuthDialog.SIZE_LARGE); + mHandler.postDelayed(() -> { + mCallback.onAction(Callback.ACTION_USE_DEVICE_CREDENTIAL); + }, mInjector.getAnimateCredentialStartDelayMs()); + } + @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); @@ -556,11 +649,37 @@ public abstract class AuthBiometricView extends LinearLayout { */ @VisibleForTesting void onAttachedToWindowInternal() { - setText(mTitleView, mBundle.getString(BiometricPrompt.KEY_TITLE)); - setText(mNegativeButton, mBundle.getString(BiometricPrompt.KEY_NEGATIVE_TEXT)); + setText(mTitleView, mBiometricPromptBundle.getString(BiometricPrompt.KEY_TITLE)); + + final String negativeText; + if (isDeviceCredentialAllowed()) { + + final @Utils.CredentialType int credentialType = + Utils.getCredentialType(mContext, mUserId); + switch(credentialType) { + case Utils.CREDENTIAL_PIN: + negativeText = getResources().getString(R.string.biometric_dialog_use_pin); + break; + case Utils.CREDENTIAL_PATTERN: + negativeText = getResources().getString(R.string.biometric_dialog_use_pattern); + break; + case Utils.CREDENTIAL_PASSWORD: + negativeText = getResources().getString(R.string.biometric_dialog_use_password); + break; + default: + negativeText = getResources().getString(R.string.biometric_dialog_use_password); + break; + } - setTextOrHide(mSubtitleView, mBundle.getString(BiometricPrompt.KEY_SUBTITLE)); - setTextOrHide(mDescriptionView, mBundle.getString(BiometricPrompt.KEY_DESCRIPTION)); + } else { + negativeText = mBiometricPromptBundle.getString(BiometricPrompt.KEY_NEGATIVE_TEXT); + } + setText(mNegativeButton, negativeText); + + setTextOrHide(mSubtitleView, + mBiometricPromptBundle.getString(BiometricPrompt.KEY_SUBTITLE)); + setTextOrHide(mDescriptionView, + mBiometricPromptBundle.getString(BiometricPrompt.KEY_DESCRIPTION)); if (mSavedState == null) { updateState(STATE_AUTHENTICATING_ANIMATING_IN); @@ -655,4 +774,8 @@ public abstract class AuthBiometricView extends LinearLayout { } } } + + private boolean isDeviceCredentialAllowed() { + return Utils.isDeviceCredentialAllowed(mBiometricPromptBundle); + } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index 6555c75f677a..a9359d4ff0db 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -24,7 +24,9 @@ import android.content.Context; import android.graphics.PixelFormat; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; +import android.hardware.biometrics.Authenticator; import android.hardware.biometrics.BiometricAuthenticator; +import android.hardware.biometrics.BiometricPrompt; import android.os.Binder; import android.os.Bundle; import android.os.IBinder; @@ -36,6 +38,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.view.animation.Interpolator; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -72,17 +75,20 @@ public class AuthContainerView extends LinearLayout @interface ContainerState {} final Config mConfig; + private final Injector mInjector; private final IBinder mWindowToken = new Binder(); private final WindowManager mWindowManager; private final AuthPanelController mPanelController; private final Interpolator mLinearOutSlowIn; @VisibleForTesting final BiometricCallback mBiometricCallback; + private final CredentialCallback mCredentialCallback; - private final ViewGroup mContainerView; - private final AuthBiometricView mBiometricView; + @VisibleForTesting final FrameLayout mFrameLayout; + @VisibleForTesting @Nullable AuthBiometricView mBiometricView; + @VisibleForTesting @Nullable AuthCredentialView mCredentialView; private final ImageView mBackgroundView; - private final ScrollView mScrollView; + @VisibleForTesting final ScrollView mBiometricScrollView; private final View mPanelView; private final float mTranslationY; @@ -145,7 +151,31 @@ public class AuthContainerView extends LinearLayout public AuthContainerView build(int modalityMask) { mConfig.mModalityMask = modalityMask; - return new AuthContainerView(mConfig); + return new AuthContainerView(mConfig, new Injector()); + } + } + + public static class Injector { + ScrollView getBiometricScrollView(FrameLayout parent) { + return parent.findViewById(R.id.biometric_scrollview); + } + + FrameLayout inflateContainerView(LayoutInflater factory, ViewGroup root) { + return (FrameLayout) factory.inflate( + R.layout.auth_container_view, root, false /* attachToRoot */); + } + + AuthPanelController getPanelController(Context context, View panelView, + boolean isManagedProfile) { + return new AuthPanelController(context, panelView, isManagedProfile); + } + + ImageView getBackgroundView(FrameLayout parent) { + return parent.findViewById(R.id.background); + } + + View getPanelView(FrameLayout parent) { + return parent.findViewById(R.id.panel); } } @@ -155,7 +185,7 @@ public class AuthContainerView extends LinearLayout public void onAction(int action) { switch (action) { case AuthBiometricView.Callback.ACTION_AUTHENTICATED: - animateAway(AuthDialogCallback.DISMISSED_AUTHENTICATED); + animateAway(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED); break; case AuthBiometricView.Callback.ACTION_USER_CANCELED: animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED); @@ -169,17 +199,30 @@ public class AuthContainerView extends LinearLayout case AuthBiometricView.Callback.ACTION_ERROR: animateAway(AuthDialogCallback.DISMISSED_ERROR); break; + case AuthBiometricView.Callback.ACTION_USE_DEVICE_CREDENTIAL: + mConfig.mCallback.onDeviceCredentialPressed(); + addCredentialView(false /* animatePanel */, true /* animateContents */); + break; default: Log.e(TAG, "Unhandled action: " + action); } } } + final class CredentialCallback implements AuthCredentialView.Callback { + @Override + public void onCredentialMatched() { + animateAway(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED); + } + } + @VisibleForTesting - AuthContainerView(Config config) { + AuthContainerView(Config config, Injector injector) { super(config.mContext); mConfig = config; + mInjector = injector; + mWindowManager = mContext.getSystemService(WindowManager.class); mWakefulnessLifecycle = Dependency.get(WakefulnessLifecycle.class); @@ -187,51 +230,48 @@ public class AuthContainerView extends LinearLayout .getDimension(R.dimen.biometric_dialog_animation_translation_offset); mLinearOutSlowIn = Interpolators.LINEAR_OUT_SLOW_IN; mBiometricCallback = new BiometricCallback(); + mCredentialCallback = new CredentialCallback(); final LayoutInflater factory = LayoutInflater.from(mContext); - mContainerView = (ViewGroup) factory.inflate( - R.layout.auth_container_view, this, false /* attachToRoot */); - - mPanelView = mContainerView.findViewById(R.id.panel); - mPanelController = new AuthPanelController(mContext, mPanelView); - - // TODO: Update with new controllers if multi-modal authentication can occur simultaneously - if (config.mModalityMask == BiometricAuthenticator.TYPE_FINGERPRINT) { - mBiometricView = (AuthBiometricFingerprintView) - factory.inflate(R.layout.auth_biometric_fingerprint_view, null, false); - } else if (config.mModalityMask == BiometricAuthenticator.TYPE_FACE) { - mBiometricView = (AuthBiometricFaceView) - factory.inflate(R.layout.auth_biometric_face_view, null, false); - } else { - Log.e(TAG, "Unsupported modality mask: " + config.mModalityMask); - mBiometricView = null; - mBackgroundView = null; - mScrollView = null; - return; + mFrameLayout = mInjector.inflateContainerView(factory, this); + + final boolean isManagedProfile = Utils.isManagedProfile(mContext, mConfig.mUserId); + + mPanelView = mInjector.getPanelView(mFrameLayout); + mPanelController = mInjector.getPanelController(mContext, mPanelView, isManagedProfile); + + // Inflate biometric view only if necessary. + if (Utils.isBiometricAllowed(mConfig.mBiometricPromptBundle)) { + if (config.mModalityMask == BiometricAuthenticator.TYPE_FINGERPRINT) { + mBiometricView = (AuthBiometricFingerprintView) + factory.inflate(R.layout.auth_biometric_fingerprint_view, null, false); + } else if (config.mModalityMask == BiometricAuthenticator.TYPE_FACE) { + mBiometricView = (AuthBiometricFaceView) + factory.inflate(R.layout.auth_biometric_face_view, null, false); + } else { + Log.e(TAG, "Unsupported biometric modality: " + config.mModalityMask); + mBiometricView = null; + mBackgroundView = null; + mBiometricScrollView = null; + return; + } } - mBackgroundView = mContainerView.findViewById(R.id.background); + mBiometricScrollView = mInjector.getBiometricScrollView(mFrameLayout); + mBackgroundView = mInjector.getBackgroundView(mFrameLayout); + - UserManager userManager = mContext.getSystemService(UserManager.class); - DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class); - if (userManager.isManagedProfile(mConfig.mUserId)) { + if (isManagedProfile) { final Drawable image = getResources().getDrawable(R.drawable.work_challenge_background, mContext.getTheme()); + final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class); image.setColorFilter(dpm.getOrganizationColorForUser(mConfig.mUserId), PorterDuff.Mode.DARKEN); mBackgroundView.setScaleType(ImageView.ScaleType.CENTER_CROP); mBackgroundView.setImageDrawable(image); } - mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation); - mBiometricView.setPanelController(mPanelController); - mBiometricView.setBiometricPromptBundle(config.mBiometricPromptBundle); - mBiometricView.setCallback(mBiometricCallback); - mBiometricView.setBackgroundView(mBackgroundView); - - mScrollView = mContainerView.findViewById(R.id.scrollview); - mScrollView.addView(mBiometricView); - addView(mContainerView); + addView(mFrameLayout); setOnKeyListener((v, keyCode, event) -> { if (keyCode != KeyEvent.KEYCODE_BACK) { @@ -248,6 +288,53 @@ public class AuthContainerView extends LinearLayout } @Override + public boolean isAllowDeviceCredentials() { + return Utils.isDeviceCredentialAllowed(mConfig.mBiometricPromptBundle); + } + + private void addBiometricView() { + mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation); + mBiometricView.setPanelController(mPanelController); + mBiometricView.setBiometricPromptBundle(mConfig.mBiometricPromptBundle); + mBiometricView.setCallback(mBiometricCallback); + mBiometricView.setBackgroundView(mBackgroundView); + mBiometricView.setUserId(mConfig.mUserId); + mBiometricScrollView.addView(mBiometricView); + } + + /** + * Adds the credential view. When going from biometric to credential view, the biometric + * view starts the panel expansion animation. If the credential view is being shown first, + * it should own the panel expansion. + * @param animatePanel if the credential view needs to own the panel expansion animation + */ + private void addCredentialView(boolean animatePanel, boolean animateContents) { + final LayoutInflater factory = LayoutInflater.from(mContext); + final int credentialType = Utils.getCredentialType(mContext, mConfig.mUserId); + switch (credentialType) { + case Utils.CREDENTIAL_PATTERN: + mCredentialView = (AuthCredentialView) factory.inflate( + R.layout.auth_credential_pattern_view, null, false); + break; + case Utils.CREDENTIAL_PIN: + case Utils.CREDENTIAL_PASSWORD: + mCredentialView = (AuthCredentialView) factory.inflate( + R.layout.auth_credential_password_view, null, false); + break; + default: + throw new IllegalStateException("Unknown credential type: " + credentialType); + } + + mCredentialView.setContainerView(this); + mCredentialView.setUser(mConfig.mUserId); + mCredentialView.setCallback(mCredentialCallback); + mCredentialView.setBiometricPromptBundle(mConfig.mBiometricPromptBundle); + mCredentialView.setPanelController(mPanelController, animatePanel); + mCredentialView.setShouldAnimateContents(animateContents); + mFrameLayout.addView(mCredentialView); + } + + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); mPanelController.setContainerDimensions(getMeasuredWidth(), getMeasuredHeight()); @@ -256,8 +343,22 @@ public class AuthContainerView extends LinearLayout @Override public void onAttachedToWindow() { super.onAttachedToWindow(); + onAttachedToWindowInternal(); + } + + @VisibleForTesting + void onAttachedToWindowInternal() { mWakefulnessLifecycle.addObserver(this); + if (Utils.isBiometricAllowed(mConfig.mBiometricPromptBundle)) { + addBiometricView(); + } else if (Utils.isDeviceCredentialAllowed(mConfig.mBiometricPromptBundle)) { + addCredentialView(true /* animatePanel */, false /* animateContents */); + } else { + throw new IllegalStateException("Unknown configuration: " + + Utils.getAuthenticators(mConfig.mBiometricPromptBundle)); + } + if (mConfig.mSkipIntro) { mContainerState = STATE_SHOWING; } else { @@ -265,7 +366,7 @@ public class AuthContainerView extends LinearLayout // The background panel and content are different views since we need to be able to // animate them separately in other places. mPanelView.setY(mTranslationY); - mScrollView.setY(mTranslationY); + mBiometricScrollView.setY(mTranslationY); setAlpha(0f); postOnAnimation(() -> { @@ -276,12 +377,21 @@ public class AuthContainerView extends LinearLayout .withLayer() .withEndAction(this::onDialogAnimatedIn) .start(); - mScrollView.animate() + mBiometricScrollView.animate() .translationY(0) .setDuration(ANIMATION_DURATION_SHOW_MS) .setInterpolator(mLinearOutSlowIn) .withLayer() .start(); + if (mCredentialView != null && mCredentialView.isAttachedToWindow()) { + mCredentialView.setY(mTranslationY); + mCredentialView.animate() + .translationY(0) + .setDuration(ANIMATION_DURATION_SHOW_MS) + .setInterpolator(mLinearOutSlowIn) + .withLayer() + .start(); + } animate() .alpha(1f) .setDuration(ANIMATION_DURATION_SHOW_MS) @@ -305,7 +415,9 @@ public class AuthContainerView extends LinearLayout @Override public void show(WindowManager wm, @Nullable Bundle savedState) { - mBiometricView.restoreState(savedState); + if (mBiometricView != null) { + mBiometricView.restoreState(savedState); + } wm.addView(this, getLayoutParams(mWindowToken)); } @@ -346,7 +458,15 @@ public class AuthContainerView extends LinearLayout @Override public void onSaveState(@NonNull Bundle outState) { outState.putInt(AuthDialog.KEY_CONTAINER_STATE, mContainerState); - mBiometricView.onSaveState(outState); + // In the case where biometric and credential are both allowed, we can assume that + // biometric isn't showing if credential is showing since biometric is shown first. + outState.putBoolean(AuthDialog.KEY_BIOMETRIC_SHOWING, + mBiometricView != null && mCredentialView == null); + outState.putBoolean(AuthDialog.KEY_CREDENTIAL_SHOWING, mCredentialView != null); + + if (mBiometricView != null) { + mBiometricView.onSaveState(outState); + } } @Override @@ -354,6 +474,11 @@ public class AuthContainerView extends LinearLayout return mConfig.mOpPackageName; } + @Override + public void animateToCredentialUI() { + mBiometricView.startTransitionToCredentialUI(); + } + @VisibleForTesting void animateAway(int reason) { animateAway(true /* sendReason */, reason); @@ -391,12 +516,20 @@ public class AuthContainerView extends LinearLayout .withLayer() .withEndAction(endActionRunnable) .start(); - mScrollView.animate() + mBiometricScrollView.animate() .translationY(mTranslationY) .setDuration(ANIMATION_DURATION_AWAY_MS) .setInterpolator(mLinearOutSlowIn) .withLayer() .start(); + if (mCredentialView != null && mCredentialView.isAttachedToWindow()) { + mCredentialView.animate() + .translationY(mTranslationY) + .setDuration(ANIMATION_DURATION_AWAY_MS) + .setInterpolator(mLinearOutSlowIn) + .withLayer() + .start(); + } animate() .alpha(0f) .setDuration(ANIMATION_DURATION_AWAY_MS) @@ -431,7 +564,9 @@ public class AuthContainerView extends LinearLayout return; } mContainerState = STATE_SHOWING; - mBiometricView.onDialogAnimatedIn(); + if (mBiometricView != null) { + mBiometricView.onDialogAnimatedIn(); + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index d10a3fede412..4c2afb0a14ca 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -23,6 +23,8 @@ import android.app.TaskStackListener; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.hardware.biometrics.Authenticator; +import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.IBiometricServiceReceiverInternal; import android.os.Bundle; @@ -105,6 +107,15 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, } @Override + public void onDeviceCredentialPressed() { + try { + mReceiver.onDeviceCredentialPressed(); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException when handling credential button", e); + } + } + + @Override public void onDismissed(@DismissedReason int reason) { switch (reason) { case AuthDialogCallback.DISMISSED_USER_CANCELED: @@ -116,11 +127,12 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, break; case AuthDialogCallback.DISMISSED_BUTTON_POSITIVE: - sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CONFIRMED); + sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED); break; - case AuthDialogCallback.DISMISSED_AUTHENTICATED: - sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED); + case AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED: + sendResultAndCleanUp( + BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED); break; case AuthDialogCallback.DISMISSED_ERROR: @@ -131,6 +143,10 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED); break; + case AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED: + sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED); + break; + default: Log.e(TAG, "Unhandled reason: " + reason); break; @@ -185,16 +201,19 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, } @Override - public void showBiometricDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, - int type, boolean requireConfirmation, int userId, String opPackageName) { + public void showAuthenticationDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, + int biometricModality, boolean requireConfirmation, int userId, String opPackageName) { + final int authenticators = Utils.getAuthenticators(bundle); + if (DEBUG) { - Log.d(TAG, "showBiometricDialog, type: " + type + Log.d(TAG, "showAuthenticationDialog, authenticators: " + authenticators + + ", biometricModality: " + biometricModality + ", requireConfirmation: " + requireConfirmation); } SomeArgs args = SomeArgs.obtain(); args.arg1 = bundle; args.arg2 = receiver; - args.argi1 = type; + args.argi1 = biometricModality; args.arg3 = requireConfirmation; args.argi2 = userId; args.arg4 = opPackageName; @@ -204,6 +223,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, Log.w(TAG, "mCurrentDialog: " + mCurrentDialog); skipAnimation = true; } + showDialog(args, skipAnimation, null /* savedState */); } @@ -227,14 +247,21 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, } @Override - public void onBiometricError(String error) { - if (DEBUG) Log.d(TAG, "onBiometricError: " + error); - mCurrentDialog.onError(error); + public void onBiometricError(int errorCode, String error) { + if (DEBUG) Log.d(TAG, "onBiometricError: " + errorCode + ", " + error); + + final boolean isLockout = errorCode == BiometricConstants.BIOMETRIC_ERROR_LOCKOUT + || errorCode == BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT; + if (mCurrentDialog.isAllowDeviceCredentials() && isLockout) { + mCurrentDialog.animateToCredentialUI(); + } else { + mCurrentDialog.onError(error); + } } @Override - public void hideBiometricDialog() { - if (DEBUG) Log.d(TAG, "hideBiometricDialog"); + public void hideAuthenticationDialog() { + if (DEBUG) Log.d(TAG, "hideAuthenticationDialog"); mCurrentDialog.dismissFromSystemServer(); } @@ -262,7 +289,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, } if (DEBUG) { - Log.d(TAG, "showDialog, " + Log.d(TAG, "showDialog: " + args + " savedState: " + savedState + " mCurrentDialog: " + mCurrentDialog + " newDialog: " + newDialog @@ -306,6 +333,15 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, // to send its pending callback immediately. if (savedState.getInt(AuthDialog.KEY_CONTAINER_STATE) != AuthContainerView.STATE_ANIMATING_OUT) { + final boolean credentialShowing = + savedState.getBoolean(AuthDialog.KEY_CREDENTIAL_SHOWING); + if (credentialShowing) { + // TODO: Clean this up + Bundle bundle = (Bundle) mCurrentDialogArgs.arg1; + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, + Authenticator.TYPE_CREDENTIAL); + } + showDialog(mCurrentDialogArgs, true /* skipAnimation */, savedState); } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPasswordView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPasswordView.java new file mode 100644 index 000000000000..8df072e9b99e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPasswordView.java @@ -0,0 +1,118 @@ +/* + * 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.biometrics; + +import android.content.Context; +import android.text.InputType; +import android.util.AttributeSet; +import android.view.KeyEvent; +import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; +import android.widget.TextView; + +import com.android.internal.widget.LockPatternChecker; +import com.android.internal.widget.LockPatternUtils; +import com.android.systemui.R; + +/** + * Pin and Password UI + */ +public class AuthCredentialPasswordView extends AuthCredentialView + implements TextView.OnEditorActionListener { + + private static final String TAG = "BiometricPrompt/AuthCredentialPasswordView"; + + private final InputMethodManager mImm; + private EditText mPasswordField; + + public AuthCredentialPasswordView(Context context, + AttributeSet attrs) { + super(context, attrs); + mImm = mContext.getSystemService(InputMethodManager.class); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mPasswordField = findViewById(R.id.lockPassword); + mPasswordField.setOnEditorActionListener(this); + mPasswordField.setOnKeyListener((v, keyCode, event) -> { + if (keyCode != KeyEvent.KEYCODE_BACK) { + return false; + } + if (event.getAction() == KeyEvent.ACTION_UP) { + mContainerView.animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED); + } + return true; + }); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + + if (mCredentialType == Utils.CREDENTIAL_PIN) { + mPasswordField.setInputType( + InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD); + } + + // Wait a bit to focus the field so the focusable flag on the window is already set then. + post(() -> { + mPasswordField.requestFocus(); + mImm.showSoftInput(mPasswordField, InputMethodManager.SHOW_IMPLICIT); + }); + } + + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + // Check if this was the result of hitting the enter key + final boolean isSoftImeEvent = event == null + && (actionId == EditorInfo.IME_NULL + || actionId == EditorInfo.IME_ACTION_DONE + || actionId == EditorInfo.IME_ACTION_NEXT); + final boolean isKeyboardEnterKey = event != null + && KeyEvent.isConfirmKey(event.getKeyCode()) + && event.getAction() == KeyEvent.ACTION_DOWN; + if (isSoftImeEvent || isKeyboardEnterKey) { + checkPasswordAndUnlock(); + return true; + } + return false; + } + + private void checkPasswordAndUnlock() { + final byte[] password = LockPatternUtils.charSequenceToByteArray(mPasswordField.getText()); + if (password == null || password.length == 0) { + return; + } + + mPendingLockCheck = LockPatternChecker.checkPassword(mLockPatternUtils, + password, mUserId, this::onCredentialChecked); + } + + @Override + protected void onCredentialChecked(boolean matched, int timeoutMs) { + super.onCredentialChecked(matched, timeoutMs); + + if (matched) { + mImm.hideSoftInputFromWindow(getWindowToken(), 0 /* flags */); + } else { + mPasswordField.setText(""); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPatternView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPatternView.java new file mode 100644 index 000000000000..6c36f8263237 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialPatternView.java @@ -0,0 +1,102 @@ +/* + * 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.biometrics; + +import android.content.Context; +import android.util.AttributeSet; + +import com.android.internal.widget.LockPatternChecker; +import com.android.internal.widget.LockPatternUtils; +import com.android.internal.widget.LockPatternView; +import com.android.systemui.R; + +import java.util.List; + +/** + * Pattern UI + */ +public class AuthCredentialPatternView extends AuthCredentialView { + + private LockPatternView mLockPatternView; + + private class UnlockPatternListener implements LockPatternView.OnPatternListener { + + @Override + public void onPatternStart() { + + } + + @Override + public void onPatternCleared() { + + } + + @Override + public void onPatternCellAdded(List<LockPatternView.Cell> pattern) { + + } + + @Override + public void onPatternDetected(List<LockPatternView.Cell> pattern) { + if (mPendingLockCheck != null) { + mPendingLockCheck.cancel(false); + } + + mLockPatternView.setEnabled(false); + + if (pattern.size() < LockPatternUtils.MIN_PATTERN_REGISTER_FAIL) { + // Pattern size is less than the minimum, do not count it as a failed attempt. + onPatternChecked(false /* matched */, 0 /* timeoutMs */); + return; + } + + mPendingLockCheck = LockPatternChecker.checkPattern( + mLockPatternUtils, + pattern, + mUserId, + this::onPatternChecked); + } + + private void onPatternChecked(boolean matched, int timeoutMs) { + AuthCredentialPatternView.this.onCredentialChecked(matched, timeoutMs); + if (timeoutMs > 0) { + mLockPatternView.setEnabled(false); + } else { + mLockPatternView.setEnabled(true); + } + } + } + + @Override + protected void onErrorTimeoutFinish() { + super.onErrorTimeoutFinish(); + mLockPatternView.setEnabled(true); + } + + public AuthCredentialPatternView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mLockPatternView = findViewById(R.id.lockPattern); + mLockPatternView.setOnPatternListener(new UnlockPatternListener()); + mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(mUserId)); + mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled()); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java new file mode 100644 index 000000000000..8c8611e49dfb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthCredentialView.java @@ -0,0 +1,265 @@ +/* + * 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.biometrics; + +import android.content.Context; +import android.hardware.biometrics.BiometricPrompt; +import android.os.AsyncTask; +import android.os.Bundle; +import android.os.CountDownTimer; +import android.os.Handler; +import android.os.Looper; +import android.os.SystemClock; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.View; +import android.view.accessibility.AccessibilityManager; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.internal.widget.LockPatternUtils; +import com.android.systemui.Interpolators; +import com.android.systemui.R; + +/** + * Abstract base class for Pin, Pattern, or Password authentication, for + * {@link BiometricPrompt.Builder#setDeviceCredentialAllowed(boolean)} + */ +public abstract class AuthCredentialView extends LinearLayout { + + private static final String TAG = "BiometricPrompt/AuthCredentialView"; + private static final int ERROR_DURATION_MS = 3000; + + private final AccessibilityManager mAccessibilityManager; + + protected final Handler mHandler; + + private Bundle mBiometricPromptBundle; + private AuthPanelController mPanelController; + private boolean mShouldAnimatePanel; + private boolean mShouldAnimateContents; + + private TextView mTitleView; + private TextView mSubtitleView; + private TextView mDescriptionView; + protected TextView mErrorView; + + protected @Utils.CredentialType int mCredentialType; + protected final LockPatternUtils mLockPatternUtils; + protected AuthContainerView mContainerView; + protected Callback mCallback; + protected AsyncTask<?, ?, ?> mPendingLockCheck; + protected int mUserId; + protected ErrorTimer mErrorTimer; + + interface Callback { + void onCredentialMatched(); + } + + protected static class ErrorTimer extends CountDownTimer { + private final TextView mErrorView; + private final Context mContext; + + /** + * @param millisInFuture The number of millis in the future from the call + * to {@link #start()} until the countdown is done and {@link + * #onFinish()} + * is called. + * @param countDownInterval The interval along the way to receive + * {@link #onTick(long)} callbacks. + */ + public ErrorTimer(Context context, long millisInFuture, long countDownInterval, + TextView errorView) { + super(millisInFuture, countDownInterval); + mErrorView = errorView; + mContext = context; + } + + @Override + public void onTick(long millisUntilFinished) { + final int secondsCountdown = (int) (millisUntilFinished / 1000); + mErrorView.setText(mContext.getString( + R.string.biometric_dialog_credential_too_many_attempts, secondsCountdown)); + } + + @Override + public void onFinish() { + mErrorView.setText(""); + } + } + + protected final Runnable mClearErrorRunnable = new Runnable() { + @Override + public void run() { + mErrorView.setText(""); + } + }; + + public AuthCredentialView(Context context, AttributeSet attrs) { + super(context, attrs); + + mLockPatternUtils = new LockPatternUtils(mContext); + mHandler = new Handler(Looper.getMainLooper()); + mAccessibilityManager = mContext.getSystemService(AccessibilityManager.class); + } + + protected void showError(String error) { + mHandler.removeCallbacks(mClearErrorRunnable); + mErrorView.setText(error); + mHandler.postDelayed(mClearErrorRunnable, ERROR_DURATION_MS); + } + + private void setTextOrHide(TextView view, String string) { + if (TextUtils.isEmpty(string)) { + view.setVisibility(View.GONE); + } else { + view.setText(string); + } + + Utils.notifyAccessibilityContentChanged(mAccessibilityManager, this); + } + + private void setText(TextView view, String string) { + view.setText(string); + } + + void setUser(int user) { + mUserId = user; + } + + void setCallback(Callback callback) { + mCallback = callback; + } + + void setBiometricPromptBundle(Bundle bundle) { + mBiometricPromptBundle = bundle; + } + + void setPanelController(AuthPanelController panelController, boolean animatePanel) { + mPanelController = panelController; + mShouldAnimatePanel = animatePanel; + } + + void setShouldAnimateContents(boolean animateContents) { + mShouldAnimateContents = animateContents; + } + + void setContainerView(AuthContainerView containerView) { + mContainerView = containerView; + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + + mCredentialType = Utils.getCredentialType(mContext, mUserId); + + setText(mTitleView, mBiometricPromptBundle.getString(BiometricPrompt.KEY_TITLE)); + setTextOrHide(mSubtitleView, + mBiometricPromptBundle.getString(BiometricPrompt.KEY_SUBTITLE)); + setTextOrHide(mDescriptionView, + mBiometricPromptBundle.getString(BiometricPrompt.KEY_DESCRIPTION)); + + // Only animate this if we're transitioning from a biometric view. + if (mShouldAnimateContents) { + setTranslationY(getResources() + .getDimension(R.dimen.biometric_dialog_credential_translation_offset)); + setAlpha(0); + + postOnAnimation(() -> { + animate().translationY(0) + .setDuration(AuthDialog.ANIMATE_CREDENTIAL_INITIAL_DURATION_MS) + .alpha(1.f) + .setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN) + .withLayer() + .start(); + }); + } + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (mErrorTimer != null) { + mErrorTimer.cancel(); + } + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mTitleView = findViewById(R.id.title); + mSubtitleView = findViewById(R.id.subtitle); + mDescriptionView = findViewById(R.id.description); + mErrorView = findViewById(R.id.error); + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + + if (mShouldAnimatePanel) { + // Credential view is always full screen. + mPanelController.setUseFullScreen(true); + mPanelController.updateForContentDimensions(mPanelController.getContainerWidth(), + mPanelController.getContainerHeight(), 0 /* animateDurationMs */); + mShouldAnimatePanel = false; + } + } + + protected void onErrorTimeoutFinish() {} + + protected void onCredentialChecked(boolean matched, int timeoutMs) { + if (matched) { + mClearErrorRunnable.run(); + mCallback.onCredentialMatched(); + } else { + if (timeoutMs > 0) { + mHandler.removeCallbacks(mClearErrorRunnable); + long deadline = mLockPatternUtils.setLockoutAttemptDeadline(mUserId, timeoutMs); + mErrorTimer = new ErrorTimer(mContext, + deadline - SystemClock.elapsedRealtime(), + LockPatternUtils.FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS, + mErrorView) { + @Override + public void onFinish() { + onErrorTimeoutFinish(); + mClearErrorRunnable.run(); + } + }; + mErrorTimer.start(); + } else { + final int error; + switch (mCredentialType) { + case Utils.CREDENTIAL_PIN: + error = R.string.biometric_dialog_wrong_pin; + break; + case Utils.CREDENTIAL_PATTERN: + error = R.string.biometric_dialog_wrong_pattern; + break; + case Utils.CREDENTIAL_PASSWORD: + error = R.string.biometric_dialog_wrong_password; + break; + default: + error = R.string.biometric_dialog_wrong_password; + break; + } + showError(getResources().getString(error)); + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java index edb29538874c..ca95f9d736fc 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialog.java @@ -31,6 +31,8 @@ import java.lang.annotation.RetentionPolicy; public interface AuthDialog { String KEY_CONTAINER_STATE = "container_state"; + String KEY_BIOMETRIC_SHOWING = "biometric_showing"; + String KEY_CREDENTIAL_SHOWING = "credential_showing"; String KEY_BIOMETRIC_TRY_AGAIN_VISIBILITY = "try_agian_visibility"; String KEY_BIOMETRIC_STATE = "state"; @@ -40,17 +42,38 @@ public interface AuthDialog { String KEY_BIOMETRIC_DIALOG_SIZE = "size"; int SIZE_UNKNOWN = 0; + /** + * Minimal UI, showing only biometric icon. + */ int SIZE_SMALL = 1; + /** + * Normal-sized biometric UI, showing title, icon, buttons, etc. + */ int SIZE_MEDIUM = 2; + /** + * Full-screen credential UI. + */ int SIZE_LARGE = 3; @Retention(RetentionPolicy.SOURCE) @IntDef({SIZE_UNKNOWN, SIZE_SMALL, SIZE_MEDIUM, SIZE_LARGE}) @interface DialogSize {} /** - * Animation duration, e.g. small to medium dialog, icon translation, etc. + * Animation duration, from small to medium dialog, including back panel, icon translation, etc + */ + int ANIMATE_SMALL_TO_MEDIUM_DURATION_MS = 150; + /** + * Animation duration from medium to large dialog, including biometric fade out, back panel, etc + */ + int ANIMATE_MEDIUM_TO_LARGE_DURATION_MS = 450; + /** + * Delay before notifying {@link AuthCredentialView} to start animating in. + */ + int ANIMATE_CREDENTIAL_START_DELAY_MS = ANIMATE_MEDIUM_TO_LARGE_DURATION_MS * 2 / 3; + /** + * Animation duration when sliding in credential UI */ - int ANIMATE_DURATION_MS = 150; + int ANIMATE_CREDENTIAL_INITIAL_DURATION_MS = 150; /** * Show the dialog. @@ -101,4 +124,14 @@ public interface AuthDialog { * Get the client's package name */ String getOpPackageName(); + + /** + * Animate to credential UI. Typically called after biometric is locked out. + */ + void animateToCredentialUI(); + + /** + * @return true if device credential is allowed. + */ + boolean isAllowDeviceCredentials(); } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java index 70752f5f860e..12bb1228a53b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthDialogCallback.java @@ -27,17 +27,18 @@ public interface AuthDialogCallback { int DISMISSED_USER_CANCELED = 1; int DISMISSED_BUTTON_NEGATIVE = 2; int DISMISSED_BUTTON_POSITIVE = 3; - - int DISMISSED_AUTHENTICATED = 4; + int DISMISSED_BIOMETRIC_AUTHENTICATED = 4; int DISMISSED_ERROR = 5; int DISMISSED_BY_SYSTEM_SERVER = 6; + int DISMISSED_CREDENTIAL_AUTHENTICATED = 7; @IntDef({DISMISSED_USER_CANCELED, DISMISSED_BUTTON_NEGATIVE, DISMISSED_BUTTON_POSITIVE, - DISMISSED_AUTHENTICATED, + DISMISSED_BIOMETRIC_AUTHENTICATED, DISMISSED_ERROR, - DISMISSED_BY_SYSTEM_SERVER}) + DISMISSED_BY_SYSTEM_SERVER, + DISMISSED_CREDENTIAL_AUTHENTICATED}) @interface DismissedReason {} /** @@ -50,4 +51,9 @@ public interface AuthDialogCallback { * Invoked when the "try again" button is clicked */ void onTryAgainPressed(); + + /** + * Invoked when the "use password" button is clicked + */ + void onDeviceCredentialPressed(); } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java index 55ba0491dc1e..2b8b586961ff 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthPanelController.java @@ -16,15 +16,17 @@ package com.android.systemui.biometrics; +import android.animation.AnimatorSet; import android.animation.ValueAnimator; import android.content.Context; +import android.graphics.Color; import android.graphics.Outline; import android.util.Log; import android.view.View; import android.view.ViewOutlineProvider; +import android.view.animation.AccelerateDecelerateInterpolator; import com.android.systemui.R; -import com.android.systemui.biometrics.AuthDialog; /** * Controls the back panel and its animations for the BiometricPrompt UI. @@ -36,8 +38,9 @@ public class AuthPanelController extends ViewOutlineProvider { private final Context mContext; private final View mPanelView; - private final float mCornerRadius; - private final int mBiometricMargin; + private final boolean mIsManagedProfile; + + private boolean mUseFullScreen; private int mContainerWidth; private int mContainerHeight; @@ -45,14 +48,23 @@ public class AuthPanelController extends ViewOutlineProvider { private int mContentWidth; private int mContentHeight; + private float mCornerRadius; + private int mMargin; + @Override public void getOutline(View view, Outline outline) { final int left = (mContainerWidth - mContentWidth) / 2; final int right = mContainerWidth - left; + + // If the content fits within the container, shrink the height to wrap the content. + // Otherwise, set the outline to be the display size minus the margin - the content within + // is scrollable. final int top = mContentHeight < mContainerHeight - ? mContainerHeight - mContentHeight - mBiometricMargin - : mBiometricMargin; - final int bottom = mContainerHeight - mBiometricMargin; + ? mContainerHeight - mContentHeight - mMargin + : mMargin; + + // TODO(b/139954942) Likely don't need to "+1" after we resolve the navbar styling. + final int bottom = mContainerHeight - mMargin + 1; outline.setRoundRect(left, top, right, bottom, mCornerRadius); } @@ -64,11 +76,34 @@ public class AuthPanelController extends ViewOutlineProvider { mContainerHeight = containerHeight; } - public void updateForContentDimensions(int contentWidth, int contentHeight, boolean animate) { + public void setUseFullScreen(boolean fullScreen) { + mUseFullScreen = fullScreen; + } + + public ValueAnimator getTranslationAnimator(float relativeTranslationY) { + final ValueAnimator animator = ValueAnimator.ofFloat( + mPanelView.getY(), mPanelView.getY() - relativeTranslationY); + animator.addUpdateListener(animation -> { + final float translation = (float) animation.getAnimatedValue(); + mPanelView.setTranslationY(translation); + }); + return animator; + } + + public ValueAnimator getAlphaAnimator(float alpha) { + final ValueAnimator animator = ValueAnimator.ofFloat(mPanelView.getAlpha(), alpha); + animator.addUpdateListener(animation -> { + mPanelView.setAlpha((float) animation.getAnimatedValue()); + }); + return animator; + } + + public void updateForContentDimensions(int contentWidth, int contentHeight, + int animateDurationMs) { if (DEBUG) { Log.v(TAG, "Content Width: " + contentWidth + " Height: " + contentHeight - + " Animate: " + animate); + + " Animate: " + animateDurationMs); } if (mContainerWidth == 0 || mContainerHeight == 0) { @@ -76,27 +111,86 @@ public class AuthPanelController extends ViewOutlineProvider { return; } - if (animate) { + final int margin = mUseFullScreen ? 0 : (int) mContext.getResources() + .getDimension(R.dimen.biometric_dialog_border_padding); + final float cornerRadius = mUseFullScreen ? 0 : mContext.getResources() + .getDimension(R.dimen.biometric_dialog_corner_size); + + // When going to full-screen for managed profiles, fade away so the managed profile + // background behind this view becomes visible. + final boolean shouldFadeAway = mUseFullScreen && mIsManagedProfile; + final int alpha = shouldFadeAway ? 0 : 255; + final float elevation = shouldFadeAway ? 0 : + mContext.getResources().getDimension(R.dimen.biometric_dialog_elevation); + + if (animateDurationMs > 0) { + // Animate margin + ValueAnimator marginAnimator = ValueAnimator.ofInt(mMargin, margin); + marginAnimator.addUpdateListener((animation) -> { + mMargin = (int) animation.getAnimatedValue(); + }); + + // Animate corners + ValueAnimator cornerAnimator = ValueAnimator.ofFloat(mCornerRadius, cornerRadius); + cornerAnimator.addUpdateListener((animation) -> { + mCornerRadius = (float) animation.getAnimatedValue(); + }); + + // Animate height ValueAnimator heightAnimator = ValueAnimator.ofInt(mContentHeight, contentHeight); - heightAnimator.setDuration(AuthDialog.ANIMATE_DURATION_MS); heightAnimator.addUpdateListener((animation) -> { mContentHeight = (int) animation.getAnimatedValue(); mPanelView.invalidateOutline(); }); heightAnimator.start(); + + // Animate width + ValueAnimator widthAnimator = ValueAnimator.ofInt(mContentWidth, contentWidth); + widthAnimator.addUpdateListener((animation) -> { + mContentWidth = (int) animation.getAnimatedValue(); + }); + + // Animate background + ValueAnimator alphaAnimator = ValueAnimator.ofInt( + mPanelView.getBackground().getAlpha(), alpha); + alphaAnimator.addUpdateListener((animation) -> { + if (shouldFadeAway) { + mPanelView.getBackground().setAlpha((int) animation.getAnimatedValue()); + } + }); + + // Play together + AnimatorSet as = new AnimatorSet(); + as.setDuration(animateDurationMs); + as.setInterpolator(new AccelerateDecelerateInterpolator()); + as.playTogether(cornerAnimator, widthAnimator, marginAnimator, alphaAnimator); + as.start(); + } else { + mMargin = margin; + mCornerRadius = cornerRadius; mContentWidth = contentWidth; mContentHeight = contentHeight; + mPanelView.getBackground().setAlpha(alpha); mPanelView.invalidateOutline(); } } - AuthPanelController(Context context, View panelView) { + int getContainerWidth() { + return mContainerWidth; + } + + int getContainerHeight() { + return mContainerHeight; + } + + AuthPanelController(Context context, View panelView, boolean isManagedProfile) { mContext = context; mPanelView = panelView; + mIsManagedProfile = isManagedProfile; mCornerRadius = context.getResources() .getDimension(R.dimen.biometric_dialog_corner_size); - mBiometricMargin = (int) context.getResources() + mMargin = (int) context.getResources() .getDimension(R.dimen.biometric_dialog_border_padding); mPanelView.setOutlineProvider(this); mPanelView.setClipToOutline(true); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java b/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java index e00cf6abafaa..d6f830dd2e7a 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/Utils.java @@ -18,14 +18,36 @@ package com.android.systemui.biometrics; import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE; +import android.annotation.IntDef; +import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.hardware.biometrics.Authenticator; +import android.hardware.biometrics.BiometricPrompt; +import android.os.Bundle; +import android.os.UserManager; import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; +import com.android.internal.widget.LockPatternUtils; +import com.android.systemui.R; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + public class Utils { + + public static final int CREDENTIAL_PIN = 1; + public static final int CREDENTIAL_PATTERN = 2; + public static final int CREDENTIAL_PASSWORD = 3; + + @Retention(RetentionPolicy.SOURCE) + @IntDef({CREDENTIAL_PIN, CREDENTIAL_PATTERN, CREDENTIAL_PASSWORD}) + @interface CredentialType {} + + static float dpToPixels(Context context, float dp) { return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT); @@ -46,4 +68,41 @@ public class Utils { view.sendAccessibilityEventUnchecked(event); view.notifySubtreeAccessibilityStateChanged(view, view, CONTENT_CHANGE_TYPE_SUBTREE); } + + static boolean isDeviceCredentialAllowed(Bundle biometricPromptBundle) { + final int authenticators = getAuthenticators(biometricPromptBundle); + return (authenticators & Authenticator.TYPE_CREDENTIAL) != 0; + } + + static boolean isBiometricAllowed(Bundle biometricPromptBundle) { + final int authenticators = getAuthenticators(biometricPromptBundle); + return (authenticators & Authenticator.TYPE_BIOMETRIC) != 0; + } + + static int getAuthenticators(Bundle biometricPromptBundle) { + return biometricPromptBundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED); + } + + static @CredentialType int getCredentialType(Context context, int userId) { + final LockPatternUtils lpu = new LockPatternUtils(context); + switch (lpu.getKeyguardStoredPasswordQuality(userId)) { + case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: + return CREDENTIAL_PATTERN; + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: + return CREDENTIAL_PIN; + case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: + case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX: + case DevicePolicyManager.PASSWORD_QUALITY_MANAGED: + return CREDENTIAL_PASSWORD; + default: + return CREDENTIAL_PASSWORD; + } + } + + static boolean isManagedProfile(Context context, int userId) { + final UserManager userManager = context.getSystemService(UserManager.class); + return userManager.isManagedProfile(userId); + } } diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 824034507019..cc548d0c7f8e 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -569,7 +569,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi if (mStackView != null) { mStackView.updateDotVisibility(entry.key); } - mNotificationEntryManager.updateNotifications(); + mNotificationEntryManager.updateNotifications( + "BubbleController.onNotificationRemoveRequested"); return true; } else if (!userRemovedNotif && entry != null) { // This wasn't a user removal so we should remove the bubble as well @@ -609,7 +610,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi mBubbleData.addSummaryToSuppress(summary.notification.getGroupKey(), summary.key); // Tell shade to update for the suppression - mNotificationEntryManager.updateNotifications(); + mNotificationEntryManager.updateNotifications( + "BubbleController.handleSummaryRemovalInterception"); } return !isAutogroupSummary; } else { @@ -760,7 +762,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi mStackView.setExpanded(true); } - mNotificationEntryManager.updateNotifications(); + mNotificationEntryManager.updateNotifications( + "BubbleData.Listener.applyUpdate"); updateStack(); if (DEBUG_BUBBLE_CONTROLLER) { diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index 1e0a9f157ff5..176676fcb9b3 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -152,6 +152,20 @@ public class BrightnessController implements ToggleSlider.Listener { private final Runnable mStartListeningRunnable = new Runnable() { @Override public void run() { + if (mListening) { + return; + } + mListening = true; + + if (mVrManager != null) { + try { + mVrManager.registerListener(mVrStateCallbacks); + mIsVrModeEnabled = mVrManager.getVrModeState(); + } catch (RemoteException e) { + Log.e(TAG, "Failed to register VR mode state listener: ", e); + } + } + mBrightnessObserver.startObserving(); mUserTracker.startTracking(); @@ -167,6 +181,19 @@ public class BrightnessController implements ToggleSlider.Listener { private final Runnable mStopListeningRunnable = new Runnable() { @Override public void run() { + if (!mListening) { + return; + } + mListening = false; + + if (mVrManager != null) { + try { + mVrManager.unregisterListener(mVrStateCallbacks); + } catch (RemoteException e) { + Log.e(TAG, "Failed to unregister VR mode state listener: ", e); + } + } + mBrightnessObserver.stopObserving(); mUserTracker.stopTracking(); @@ -297,39 +324,12 @@ public class BrightnessController implements ToggleSlider.Listener { } public void registerCallbacks() { - if (mListening) { - return; - } - - if (mVrManager != null) { - try { - mVrManager.registerListener(mVrStateCallbacks); - mIsVrModeEnabled = mVrManager.getVrModeState(); - } catch (RemoteException e) { - Log.e(TAG, "Failed to register VR mode state listener: ", e); - } - } - mBackgroundHandler.post(mStartListeningRunnable); - mListening = true; } /** Unregister all call backs, both to and from the controller */ public void unregisterCallbacks() { - if (!mListening) { - return; - } - - if (mVrManager != null) { - try { - mVrManager.unregisterListener(mVrStateCallbacks); - } catch (RemoteException e) { - Log.e(TAG, "Failed to unregister VR mode state listener: ", e); - } - } - mBackgroundHandler.post(mStopListeningRunnable); - mListening = false; mControlValueInitialized = false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 134d4b87a159..36e04fe42ced 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -270,12 +270,13 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< default void onRotationProposal(int rotation, boolean isValid) { } - default void showBiometricDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, - int type, boolean requireConfirmation, int userId, String opPackageName) { } + default void showAuthenticationDialog(Bundle bundle, + IBiometricServiceReceiverInternal receiver, int biometricModality, + boolean requireConfirmation, int userId, String opPackageName) { } default void onBiometricAuthenticated(boolean authenticated, String failureReason) { } default void onBiometricHelp(String message) { } - default void onBiometricError(String error) { } - default void hideBiometricDialog() { } + default void onBiometricError(int errorCode, String error) { } + default void hideAuthenticationDialog() { } /** * @see IStatusBar#onDisplayReady(int) @@ -740,13 +741,13 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } @Override - public void showBiometricDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, - int type, boolean requireConfirmation, int userId, String opPackageName) { + public void showAuthenticationDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, + int biometricModality, boolean requireConfirmation, int userId, String opPackageName) { synchronized (mLock) { SomeArgs args = SomeArgs.obtain(); args.arg1 = bundle; args.arg2 = receiver; - args.argi1 = type; + args.argi1 = biometricModality; args.arg3 = requireConfirmation; args.argi2 = userId; args.arg4 = opPackageName; @@ -773,14 +774,14 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< } @Override - public void onBiometricError(String error) { + public void onBiometricError(int errorCode, String error) { synchronized (mLock) { - mHandler.obtainMessage(MSG_BIOMETRIC_ERROR, error).sendToTarget(); + mHandler.obtainMessage(MSG_BIOMETRIC_ERROR, errorCode, 0, error).sendToTarget(); } } @Override - public void hideBiometricDialog() { + public void hideAuthenticationDialog() { synchronized (mLock) { mHandler.obtainMessage(MSG_BIOMETRIC_HIDE).sendToTarget(); } @@ -1032,10 +1033,10 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< mHandler.removeMessages(MSG_BIOMETRIC_AUTHENTICATED); SomeArgs someArgs = (SomeArgs) msg.obj; for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).showBiometricDialog( + mCallbacks.get(i).showAuthenticationDialog( (Bundle) someArgs.arg1, (IBiometricServiceReceiverInternal) someArgs.arg2, - someArgs.argi1 /* type */, + someArgs.argi1 /* biometricModality */, (boolean) someArgs.arg3 /* requireConfirmation */, someArgs.argi2 /* userId */, (String) someArgs.arg4 /* opPackageName */); @@ -1060,12 +1061,12 @@ public class CommandQueue extends IStatusBar.Stub implements CallbackController< break; case MSG_BIOMETRIC_ERROR: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).onBiometricError((String) msg.obj); + mCallbacks.get(i).onBiometricError(msg.arg1, (String) msg.obj); } break; case MSG_BIOMETRIC_HIDE: for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).hideBiometricDialog(); + mCallbacks.get(i).hideAuthenticationDialog(); } break; case MSG_SHOW_CHARGING_ANIMATION: diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java index 6c0f90a65ae9..c4de2d3572bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java @@ -127,7 +127,7 @@ public class NotificationListener extends NotificationListenerWithPlugins { mEntryManager.removeNotification(key, rankingMap, UNDEFINED_DISMISS_REASON); } else { mEntryManager.getNotificationData() - .updateRanking(rankingMap); + .updateRanking(rankingMap, "onNotificationPosted"); } return; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java index 4ba111436048..6ffea79c420a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java @@ -106,7 +106,7 @@ public class NotificationLockscreenUserManagerImpl implements isCurrentProfile(getSendingUserId())) { mUsersAllowingPrivateNotifications.clear(); updateLockscreenNotificationSetting(); - getEntryManager().updateNotifications(); + getEntryManager().updateNotifications("ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED"); } } }; @@ -124,7 +124,7 @@ public class NotificationLockscreenUserManagerImpl implements updatePublicMode(); // The filtering needs to happen before the update call below in order to make sure // the presenter has the updated notifications from the new user - getEntryManager().getNotificationData().filterAndSort(); + getEntryManager().getNotificationData().filterAndSort("user switched"); mPresenter.onUserSwitched(mCurrentUserId); for (UserChangedListener listener : mListeners) { @@ -205,7 +205,8 @@ public class NotificationLockscreenUserManagerImpl implements mUsersAllowingNotifications.clear(); // ... and refresh all the notifications updateLockscreenNotificationSetting(); - getEntryManager().updateNotifications(); + getEntryManager().updateNotifications("LOCK_SCREEN_SHOW_NOTIFICATIONS," + + " or LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS change"); } }; @@ -214,7 +215,8 @@ public class NotificationLockscreenUserManagerImpl implements public void onChange(boolean selfChange) { updateLockscreenNotificationSetting(); if (mDeviceProvisionedController.isDeviceProvisioned()) { - getEntryManager().updateNotifications(); + getEntryManager().updateNotifications("LOCK_SCREEN_ALLOW_REMOTE_INPUT" + + " or ZEN_MODE change"); } } }; @@ -532,7 +534,7 @@ public class NotificationLockscreenUserManagerImpl implements setLockscreenPublicMode(isProfilePublic, userId); mUsersWithSeperateWorkChallenge.put(userId, needsSeparateChallenge); } - getEntryManager().updateNotifications(); + getEntryManager().updateNotifications("NotificationLockscreenUserManager.updatePublicMode"); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java index c50fb3d76b51..3616b541741c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java @@ -361,7 +361,7 @@ public class NotificationMediaManager implements Dumpable { } if (metaDataChanged) { - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("NotificationMediaManager - metaDataChanged"); } dispatchUpdateMediaMetaData(metaDataChanged, true /* allowEnterAnimation */); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java index 13c6f2730d08..9b312341c583 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java @@ -38,7 +38,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment; import com.android.systemui.statusbar.phone.NotificationPanelView; -import com.android.systemui.statusbar.phone.StatusBarWindowView; +import com.android.systemui.statusbar.phone.StatusBarWindowViewController; /** * A class that allows activities to be launched in a seamless way where the notification @@ -55,8 +55,8 @@ public class ActivityLaunchAnimator { private static final long LAUNCH_TIMEOUT = 500; private final NotificationPanelView mNotificationPanel; private final NotificationListContainer mNotificationContainer; - private final StatusBarWindowView mStatusBarWindow; private final float mWindowCornerRadius; + private final StatusBarWindowViewController mStatusBarWindowViewController; private Callback mCallback; private final Runnable mTimeoutRunnable = () -> { setAnimationPending(false); @@ -66,16 +66,17 @@ public class ActivityLaunchAnimator { private boolean mAnimationRunning; private boolean mIsLaunchForActivity; - public ActivityLaunchAnimator(StatusBarWindowView statusBarWindow, + public ActivityLaunchAnimator( + StatusBarWindowViewController statusBarWindowViewController, Callback callback, NotificationPanelView notificationPanel, NotificationListContainer container) { mNotificationPanel = notificationPanel; mNotificationContainer = container; - mStatusBarWindow = statusBarWindow; + mStatusBarWindowViewController = statusBarWindowViewController; mCallback = callback; mWindowCornerRadius = ScreenDecorationsUtils - .getWindowCornerRadius(statusBarWindow.getResources()); + .getWindowCornerRadius(mStatusBarWindowViewController.getView().getResources()); } public RemoteAnimationAdapter getLaunchAnimation( @@ -112,11 +113,11 @@ public class ActivityLaunchAnimator { private void setAnimationPending(boolean pending) { mAnimationPending = pending; - mStatusBarWindow.setExpandAnimationPending(pending); + mStatusBarWindowViewController.setExpandAnimationPending(pending); if (pending) { - mStatusBarWindow.postDelayed(mTimeoutRunnable, LAUNCH_TIMEOUT); + mStatusBarWindowViewController.getView().postDelayed(mTimeoutRunnable, LAUNCH_TIMEOUT); } else { - mStatusBarWindow.removeCallbacks(mTimeoutRunnable); + mStatusBarWindowViewController.getView().removeCallbacks(mTimeoutRunnable); } } @@ -246,7 +247,7 @@ public class ActivityLaunchAnimator { private void setExpandAnimationRunning(boolean running) { mNotificationPanel.setLaunchingNotification(running); mSourceNotification.setExpandAnimationRunning(running); - mStatusBarWindow.setExpandAnimationRunning(running); + mStatusBarWindowViewController.setExpandAnimationRunning(running); mNotificationContainer.setExpandingNotification(running ? mSourceNotification : null); mAnimationRunning = running; if (!running) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java index 148a1a87f305..01c79b3df064 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java @@ -40,6 +40,8 @@ import com.android.systemui.statusbar.notification.collection.NotificationData; import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationRowBinder; +import com.android.systemui.statusbar.notification.logging.NotifEvent; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.NotificationContentInflater; import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag; @@ -92,6 +94,7 @@ public class NotificationEntryManager implements private NotificationListenerService.RankingMap mLatestRankingMap; @VisibleForTesting protected NotificationData mNotificationData; + private NotifLog mNotifLog; @VisibleForTesting final ArrayList<NotificationLifetimeExtender> mNotificationLifetimeExtenders @@ -123,8 +126,9 @@ public class NotificationEntryManager implements } @Inject - public NotificationEntryManager(NotificationData notificationData) { + public NotificationEntryManager(NotificationData notificationData, NotifLog notifLog) { mNotificationData = notificationData; + mNotifLog = notifLog; } /** Adds a {@link NotificationEntryListener}. */ @@ -178,7 +182,7 @@ public class NotificationEntryManager implements @Override public void onReorderingAllowed() { - updateNotifications(); + updateNotifications("reordering is now allowed"); } /** @@ -203,15 +207,19 @@ public class NotificationEntryManager implements return NotificationVisibility.obtain(key, rank, count, true, location); } - private void abortExistingInflation(String key) { + private void abortExistingInflation(String key, String reason) { if (mPendingNotifications.containsKey(key)) { NotificationEntry entry = mPendingNotifications.get(key); entry.abortTask(); mPendingNotifications.remove(key); + mNotifLog.log(NotifEvent.INFLATION_ABORTED, entry.sbn(), null, + "PendingNotification aborted. " + reason); } NotificationEntry addedEntry = mNotificationData.get(key); if (addedEntry != null) { addedEntry.abortTask(); + mNotifLog.log(NotifEvent.INFLATION_ABORTED, addedEntry.sbn(), + null, reason); } } @@ -247,7 +255,7 @@ public class NotificationEntryManager implements for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onBeforeNotificationAdded(entry); } - updateNotifications(); + updateNotifications("onAsyncInflationFinished"); for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onNotificationAdded(entry); } @@ -276,7 +284,8 @@ public class NotificationEntryManager implements if (mRemoveInterceptor != null && mRemoveInterceptor.onNotificationRemoveRequested(key, reason)) { - // Remove intercepted; skip + // Remove intercepted; log and skip + mNotifLog.log(NotifEvent.REMOVE_INTERCEPTED); return; } @@ -291,13 +300,17 @@ public class NotificationEntryManager implements if (extender.shouldExtendLifetimeForPendingNotification(pendingEntry)) { extendLifetime(pendingEntry, extender); lifetimeExtended = true; + mNotifLog.log( + NotifEvent.LIFETIME_EXTENDED, + pendingEntry.sbn(), + "pendingEntry extendedBy=" + extender.toString()); } } } } if (!lifetimeExtended) { - abortExistingInflation(key); + abortExistingInflation(key, "removeNotification"); } if (entry != null) { @@ -310,6 +323,10 @@ public class NotificationEntryManager implements mLatestRankingMap = ranking; extendLifetime(entry, extender); lifetimeExtended = true; + mNotifLog.log( + NotifEvent.LIFETIME_EXTENDED, + entry.sbn(), + "entry extendedBy=" + extender.toString()); break; } } @@ -329,10 +346,12 @@ public class NotificationEntryManager implements handleGroupSummaryRemoved(key); mNotificationData.remove(key, ranking); - updateNotifications(); + updateNotifications("removeNotificationInternal"); Dependency.get(LeakDetector.class).trackGarbage(entry); removedByUser |= entryDismissed; + mNotifLog.log(NotifEvent.NOTIF_REMOVED, entry.sbn(), + "removedByUser=" + removedByUser); for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onEntryRemoved(entry, visibility, removedByUser); } @@ -389,7 +408,7 @@ public class NotificationEntryManager implements Log.d(TAG, "addNotification key=" + key); } - mNotificationData.updateRanking(rankingMap); + mNotificationData.updateRanking(rankingMap, "addNotificationInternal"); Ranking ranking = new Ranking(); rankingMap.getRanking(key, ranking); @@ -400,9 +419,9 @@ public class NotificationEntryManager implements requireBinder().inflateViews(entry, () -> performRemoveNotification(notification, REASON_CANCEL)); - abortExistingInflation(key); - + abortExistingInflation(key, "addNotification"); mPendingNotifications.put(key, entry); + mNotifLog.log(NotifEvent.NOTIF_ADDED, entry.sbn()); for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onPendingEntryAdded(entry); } @@ -423,7 +442,7 @@ public class NotificationEntryManager implements if (DEBUG) Log.d(TAG, "updateNotification(" + notification + ")"); final String key = notification.getKey(); - abortExistingInflation(key); + abortExistingInflation(key, "updateNotification"); NotificationEntry entry = mNotificationData.get(key); if (entry == null) { return; @@ -433,15 +452,15 @@ public class NotificationEntryManager implements // to keep its lifetime extended. cancelLifetimeExtension(entry); - mNotificationData.update(entry, ranking, notification); - + mNotificationData.update(entry, ranking, notification, "updateNotificationInternal"); + mNotifLog.log(NotifEvent.NOTIF_UPDATED, entry.sbn(), entry.ranking()); for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onPreEntryUpdated(entry); } requireBinder().inflateViews(entry, () -> performRemoveNotification(notification, REASON_CANCEL)); - updateNotifications(); + updateNotifications("updateNotificationInternal"); if (DEBUG) { // Is this for you? @@ -465,8 +484,12 @@ public class NotificationEntryManager implements } } - public void updateNotifications() { - mNotificationData.filterAndSort(); + /** + * Update the notifications + * @param reason why the notifications are updating + */ + public void updateNotifications(String reason) { + mNotificationData.filterAndSort(reason); if (mPresenter != null) { mPresenter.updateNotificationViews(); } @@ -489,7 +512,7 @@ public class NotificationEntryManager implements } // Populate notification entries from the new rankings. - mNotificationData.updateRanking(rankingMap); + mNotificationData.updateRanking(rankingMap, "updateNotificationRanking"); updateRankingOfPendingNotifications(rankingMap); // By comparing the old and new UI adjustments, reinflate the view accordingly. @@ -501,7 +524,7 @@ public class NotificationEntryManager implements NotificationUiAdjustment.extractFromNotificationEntry(entry)); } - updateNotifications(); + updateNotifications("updateNotificationRanking"); for (NotificationEntryListener listener : mNotificationEntryListeners) { listener.onNotificationRankingUpdated(rankingMap); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java index 769cbb7b984c..970cbf9aa1e2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationListController.java @@ -81,7 +81,7 @@ public class NotificationListController { new DeviceProvisionedListener() { @Override public void onDeviceProvisionedChanged() { - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("device provisioned changed"); } }; @@ -106,7 +106,7 @@ public class NotificationListController { if (foregroundKey != null) { mEntryManager .getNotificationData().updateAppOp(appOp, uid, pkg, foregroundKey, showIcon); - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("app opp changed pkg=" + pkg); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java index cf0fbbb5d9c1..a98fa664a357 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationData.java @@ -35,6 +35,8 @@ import com.android.systemui.Dependency; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.notification.NotificationFilter; import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager; +import com.android.systemui.statusbar.notification.logging.NotifEvent; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.phone.NotificationGroupManager; import com.android.systemui.statusbar.policy.HeadsUpManager; @@ -73,10 +75,13 @@ public class NotificationData { private RankingMap mRankingMap; private final Ranking mTmpRanking = new Ranking(); private final boolean mUsePeopleFiltering; + private final NotifLog mNotifLog; @Inject - public NotificationData(NotificationSectionsFeatureManager sectionsFeatureManager) { + public NotificationData(NotificationSectionsFeatureManager sectionsFeatureManager, + NotifLog notifLog) { mUsePeopleFiltering = sectionsFeatureManager.isFilteringEnabled(); + mNotifLog = notifLog; } public void setHeadsUpManager(HeadsUpManager headsUpManager) { @@ -179,7 +184,7 @@ public class NotificationData { } mGroupManager.onEntryAdded(entry); - updateRankingAndSort(mRankingMap); + updateRankingAndSort(mRankingMap, "addEntry=" + entry.sbn()); } public NotificationEntry remove(String key, RankingMap ranking) { @@ -189,7 +194,7 @@ public class NotificationData { } if (removed == null) return null; mGroupManager.onEntryRemoved(removed); - updateRankingAndSort(ranking); + updateRankingAndSort(ranking, "removeEntry=" + removed.sbn()); return removed; } @@ -197,15 +202,19 @@ public class NotificationData { public void update( NotificationEntry entry, RankingMap ranking, - StatusBarNotification notification) { - updateRanking(ranking); + StatusBarNotification notification, + String reason) { + updateRanking(ranking, reason); final StatusBarNotification oldNotification = entry.notification; entry.setNotification(notification); mGroupManager.onEntryUpdated(entry, oldNotification); } - public void updateRanking(RankingMap ranking) { - updateRankingAndSort(ranking); + /** + * Update ranking and trigger a re-sort + */ + public void updateRanking(RankingMap ranking, String reason) { + updateRankingAndSort(ranking, reason); } public void updateAppOp(int appOp, int uid, String pkg, String key, boolean showIcon) { @@ -352,7 +361,7 @@ public class NotificationData { return false; } - private void updateRankingAndSort(RankingMap rankingMap) { + private void updateRankingAndSort(RankingMap rankingMap, String reason) { if (rankingMap != null) { mRankingMap = rankingMap; synchronized (mEntries) { @@ -375,7 +384,7 @@ public class NotificationData { } } } - filterAndSort(); + filterAndSort(reason); } /** @@ -393,7 +402,11 @@ public class NotificationData { // TODO: This should not be public. Instead the Environment should notify this class when // anything changed, and this class should call back the UI so it updates itself. - public void filterAndSort() { + /** + * Filters and sorts the list of notification entries + */ + public void filterAndSort(String reason) { + mNotifLog.log(NotifEvent.FILTER_AND_SORT, reason); mSortedAndFiltered.clear(); synchronized (mEntries) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java index 60cf995ad8d1..e5571b64cc9e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationRowBinderImpl.java @@ -41,6 +41,8 @@ import com.android.systemui.statusbar.NotificationUiAdjustment; import com.android.systemui.statusbar.notification.InflationException; import com.android.systemui.statusbar.notification.NotificationClicker; import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider; +import com.android.systemui.statusbar.notification.logging.NotifEvent; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationContentInflater; @@ -72,6 +74,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { private final boolean mAllowLongPress; private final KeyguardBypassController mKeyguardBypassController; private final StatusBarStateController mStatusBarStateController; + private final NotifLog mNotifLog; private NotificationRemoteInputManager mRemoteInputManager; private NotificationPresenter mPresenter; @@ -85,12 +88,14 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { public NotificationRowBinderImpl(Context context, boolean allowLongPress, KeyguardBypassController keyguardBypassController, - StatusBarStateController statusBarStateController) { + StatusBarStateController statusBarStateController, + NotifLog notifLog) { mContext = context; mMessagingUtil = new NotificationMessagingUtil(context); mAllowLongPress = allowLongPress; mKeyguardBypassController = keyguardBypassController; mStatusBarStateController = statusBarStateController; + mNotifLog = notifLog; } private NotificationRemoteInputManager getRemoteInputManager() { @@ -143,6 +148,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { row -> { bindRow(entry, pmUser, sbn, row, onDismissRunnable); updateNotification(entry, pmUser, sbn, row); + mNotifLog.log(NotifEvent.INFLATED, sbn); }); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifEvent.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifEvent.java index 2396d28bd46d..7703cbd94e1c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifEvent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifEvent.java @@ -30,9 +30,9 @@ import java.lang.annotation.RetentionPolicy; * and triaging purposes. */ public class NotifEvent extends RichEvent { - public static final int TOTAL_EVENT_TYPES = 8; - private StatusBarNotification mSbn; - private Ranking mRanking; + public static final int TOTAL_EVENT_TYPES = 11; + private final StatusBarNotification mSbn; + private final Ranking mRanking; /** * Creates a NotifEvent with an event type that matches with an index in the array @@ -44,9 +44,20 @@ public class NotifEvent extends RichEvent { public NotifEvent(int logLevel, int type, String reason, StatusBarNotification sbn, Ranking ranking) { super(logLevel, type, reason); - mSbn = sbn.clone(); - mRanking = new Ranking(); - mRanking.populate(ranking); + + if (sbn != null) { + mSbn = sbn.cloneLight(); + } else { + mSbn = null; + } + + if (ranking != null) { + mRanking = new Ranking(); + mRanking.populate(ranking); + } else { + mRanking = null; + } + mMessage += getExtraInfo(); } @@ -76,11 +87,14 @@ public class NotifEvent extends RichEvent { "NotifAdded", "NotifRemoved", "NotifUpdated", - "HeadsUpStarted", - "HeadsUpEnded", "Filter", "Sort", + "FilterAndSort", "NotifVisibilityChanged", + "LifetimeExtended", + "RemoveIntercepted", + "InflationAborted", + "Inflated" }; if (events.length != TOTAL_EVENT_TYPES) { @@ -135,8 +149,19 @@ public class NotifEvent extends RichEvent { } } - @IntDef({NOTIF_ADDED, NOTIF_REMOVED, NOTIF_UPDATED, HEADS_UP_STARTED, HEADS_UP_ENDED, FILTER, - SORT, NOTIF_VISIBILITY_CHANGED}) + @IntDef({NOTIF_ADDED, + NOTIF_REMOVED, + NOTIF_UPDATED, + FILTER, + SORT, + FILTER_AND_SORT, + NOTIF_VISIBILITY_CHANGED, + LIFETIME_EXTENDED, + REMOVE_INTERCEPTED, + INFLATION_ABORTED, + INFLATED + }) + /** * Types of NotifEvents */ @@ -145,9 +170,13 @@ public class NotifEvent extends RichEvent { public static final int NOTIF_ADDED = 0; public static final int NOTIF_REMOVED = 1; public static final int NOTIF_UPDATED = 2; - public static final int HEADS_UP_STARTED = 3; - public static final int HEADS_UP_ENDED = 4; - public static final int FILTER = 5; - public static final int SORT = 6; - public static final int NOTIF_VISIBILITY_CHANGED = 7; + public static final int FILTER = 3; + public static final int SORT = 4; + public static final int FILTER_AND_SORT = 5; + public static final int NOTIF_VISIBILITY_CHANGED = 6; + public static final int LIFETIME_EXTENDED = 7; + // unable to remove notif - removal intercepted by {@link NotificationRemoveInterceptor} + public static final int REMOVE_INTERCEPTED = 8; + public static final int INFLATION_ABORTED = 9; + public static final int INFLATED = 10; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifLog.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifLog.java index d42cd82f9784..8466d2e83002 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifLog.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotifLog.java @@ -82,6 +82,14 @@ public class NotifLog extends SysuiLog { } /** + * Logs a {@link NotifEvent} with a notification + * @return true if successfully logged, else false + */ + public boolean log(@NotifEvent.EventType int eventType, StatusBarNotification sbn, String msg) { + return log(eventType, sbn, null, msg); + } + + /** * Logs a {@link NotifEvent} with a ranking * @return true if successfully logged, else false */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 9f4b026b3d38..924a3470b832 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -1447,6 +1447,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } setDismissed(fromAccessibility); if (mEntry.isClearable()) { + // TODO: beverlyt, log dismissal // TODO: track dismiss sentiment if (mOnDismissRunnable != null) { mOnDismissRunnable.run(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java index 73093c6f471f..37f63c9779f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManager.java @@ -139,7 +139,8 @@ public class NotificationBlockingHelperManager { mBlockingHelperRow.setBlockingHelperShowing(false); if (mBlockingHelperRow.isAttachedToWindow()) { - Dependency.get(NotificationEntryManager.class).updateNotifications(); + Dependency.get(NotificationEntryManager.class).updateNotifications( + "dismissCurrentBlockingHelper"); } mBlockingHelperRow = null; return true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index f5705c5f643b..7bbe8188b402 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -5333,7 +5333,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd requestChildrenUpdate(); onUpdateRowStates(); - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("StatusBar state changed"); updateVisibility(); } @@ -6492,12 +6492,12 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd @Override public void onGroupCreatedFromChildren(NotificationGroupManager.NotificationGroup group) { - mStatusBar.requestNotificationUpdate(); + mStatusBar.requestNotificationUpdate("onGroupCreatedFromChildren"); } @Override public void onGroupsChanged() { - mStatusBar.requestNotificationUpdate(); + mStatusBar.requestNotificationUpdate("onGroupsChanged"); } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java index 4cd3ad27ab34..ca7c227f42b7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java @@ -16,6 +16,8 @@ package com.android.systemui.statusbar.phone; import static android.view.Display.INVALID_DISPLAY; +import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; +import static android.view.View.NAVIGATION_BAR_TRANSIENT; import android.content.Context; import android.content.res.Resources; @@ -131,6 +133,7 @@ public class EdgeBackGestureHandler implements DisplayListener { private boolean mIsAttached; private boolean mIsGesturalModeEnabled; private boolean mIsEnabled; + private boolean mIsInTransientImmersiveStickyState; private InputMonitor mInputMonitor; private InputEventReceiver mInputEventReceiver; @@ -195,6 +198,12 @@ public class EdgeBackGestureHandler implements DisplayListener { updateCurrentUserResources(currentUserContext.getResources()); } + public void onSystemUiVisibilityChanged(int systemUiVisibility) { + mIsInTransientImmersiveStickyState = + (systemUiVisibility & SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0 + && (systemUiVisibility & NAVIGATION_BAR_TRANSIENT) != 0; + } + private void disposeInputChannel() { if (mInputEventReceiver != null) { mInputEventReceiver.dispose(); @@ -296,13 +305,21 @@ public class EdgeBackGestureHandler implements DisplayListener { } private boolean isWithinTouchRegion(int x, int y) { + // Disallow if over the IME if (y > (mDisplaySize.y - Math.max(mImeHeight, mNavBarHeight))) { return false; } + // Disallow if too far from the edge if (x > mEdgeWidth + mLeftInset && x < (mDisplaySize.x - mEdgeWidth - mRightInset)) { return false; } + + // Always allow if the user is in a transient sticky immersive state + if (mIsInTransientImmersiveStickyState) { + return true; + } + boolean isInExcludedRegion = mExcludeRegion.contains(x, y); if (isInExcludedRegion) { mOverviewProxyService.notifyBackAction(false /* completed */, -1, -1, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 68eca8d68d90..cac33044ea13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -117,6 +117,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private static final int DOZE_ANIMATION_STAGGER_DELAY = 48; private static final int DOZE_ANIMATION_ELEMENT_DURATION = 250; + private final boolean mShowLeftAffordance; + private final boolean mShowCameraAffordance; + private KeyguardAffordanceView mRightAffordanceView; private KeyguardAffordanceView mLeftAffordanceView; private ViewGroup mIndicationArea; @@ -184,6 +187,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL public KeyguardBottomAreaView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); + mShowLeftAffordance = getResources().getBoolean(R.bool.config_keyguardShowLeftAffordance); + mShowCameraAffordance = getResources() + .getBoolean(R.bool.config_keyguardShowCameraAffordance); } private AccessibilityDelegate mAccessibilityDelegate = new AccessibilityDelegate() { @@ -371,8 +377,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL // Things are not set up yet; reply hazy, ask again later return; } - mRightAffordanceView.setVisibility(!mDozing && mRightButton.getIcon().isVisible - ? View.VISIBLE : View.GONE); + mRightAffordanceView.setVisibility(!mDozing && mShowCameraAffordance + && mRightButton.getIcon().isVisible ? View.VISIBLE : View.GONE); } /** @@ -384,8 +390,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } private void updateLeftAffordanceIcon() { + if (!mShowLeftAffordance || mDozing) { + mLeftAffordanceView.setVisibility(GONE); + return; + } IconState state = mLeftButton.getIcon(); - mLeftAffordanceView.setVisibility(!mDozing && state.isVisible ? View.VISIBLE : View.GONE); + mLeftAffordanceView.setVisibility(state.isVisible ? View.VISIBLE : View.GONE); if (state.drawable != mLeftAffordanceView.getDrawable() || state.tint != mLeftAffordanceView.shouldTint()) { mLeftAffordanceView.setImageDrawable(state.drawable, state.tint); @@ -767,10 +777,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL @Override public IconState getIcon() { mLeftIsVoiceAssist = canLaunchVoiceAssist(); - final boolean showAffordance = - getResources().getBoolean(R.bool.config_keyguardShowLeftAffordance); if (mLeftIsVoiceAssist) { - mIconState.isVisible = mUserSetupComplete && showAffordance; + mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance; if (mLeftAssistIcon == null) { mIconState.drawable = mContext.getDrawable(R.drawable.ic_mic_26dp); } else { @@ -779,7 +787,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mIconState.contentDescription = mContext.getString( R.string.accessibility_voice_assist_button); } else { - mIconState.isVisible = mUserSetupComplete && showAffordance && isPhoneVisible(); + mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance + && isPhoneVisible(); mIconState.drawable = mContext.getDrawable( com.android.internal.R.drawable.ic_phone); mIconState.contentDescription = mContext.getString( @@ -802,7 +811,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL public IconState getIcon() { boolean isCameraDisabled = (mStatusBar != null) && !mStatusBar.isCameraAllowedByAdmin(); mIconState.isVisible = !isCameraDisabled - && getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance) + && mShowCameraAffordance && mUserSetupComplete && resolveCameraIntent() != null; mIconState.drawable = mContext.getDrawable(R.drawable.ic_camera_alt_24dp); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 6e61d7ceaf6c..38dc5ea4dcd5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -560,6 +560,9 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback } mAutoHideController.touchAutoHide(); } + if (mNavigationBarView != null) { + mNavigationBarView.onSystemUiVisibilityChanged(mSystemUiVisibility); + } } mLightBarController.onNavigationVisibilityChanged( vis, mask, nbModeChanged, mNavigationBarMode, navbarColorManagedByIme); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index a1a47e1305f5..9804f9ff4698 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -67,6 +67,7 @@ import com.android.systemui.DockedStackExistsListener; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.SysUiServiceProvider; +import com.android.systemui.assist.AssistHandleViewController; import com.android.systemui.assist.AssistManager; import com.android.systemui.model.SysUiState; import com.android.systemui.recents.OverviewProxyService; @@ -75,6 +76,7 @@ import com.android.systemui.recents.RecentsOnboarding; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.shared.system.WindowManagerWrapper; +import com.android.systemui.statusbar.NavigationBarController; import com.android.systemui.statusbar.policy.DeadZone; import com.android.systemui.statusbar.policy.KeyButtonDrawable; @@ -364,6 +366,10 @@ public class NavigationBarView extends FrameLayout implements return super.onTouchEvent(event); } + void onSystemUiVisibilityChanged(int systemUiVisibility) { + mEdgeBackGestureHandler.onSystemUiVisibilityChanged(systemUiVisibility); + } + void onBarTransition(int newMode) { if (newMode == MODE_OPAQUE) { // If the nav bar background is opaque, stop auto tinting since we know the icons are @@ -1198,6 +1204,19 @@ public class NavigationBarView extends FrameLayout implements // we're passing the insets onto the gesture handler since the back arrow is only // conditionally added and doesn't always get all the insets. mEdgeBackGestureHandler.setInsets(leftInset, rightInset); + + // this allows assist handle to be drawn outside its bound so that it can align screen + // bottom by translating its y position. + final boolean shouldClip = + !isGesturalMode(mNavBarMode) || insets.getSystemWindowInsetBottom() == 0; + setClipChildren(shouldClip); + setClipToPadding(shouldClip); + + AssistHandleViewController controller = Dependency.get(NavigationBarController.class) + .getAssistHandlerViewController(); + if (controller != null) { + controller.setBottomOffset(insets.getSystemWindowInsetBottom()); + } return super.onApplyWindowInsets(insets); } 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 cee1d5da42cd..00736b73f12e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -408,14 +408,11 @@ public class NotificationPanelView extends PanelView implements .setDuration(200) .setAnimationFinishListener(mAnimatorListenerAdapter) .setCustomInterpolator(PANEL_ALPHA.getProperty(), Interpolators.ALPHA_IN); - private final NotificationEntryManager mEntryManager = - Dependency.get(NotificationEntryManager.class); + private final NotificationEntryManager mEntryManager; private final CommandQueue mCommandQueue; - private final NotificationLockscreenUserManager mLockscreenUserManager = - Dependency.get(NotificationLockscreenUserManager.class); - private final ShadeController mShadeController = - Dependency.get(ShadeController.class); + private final NotificationLockscreenUserManager mLockscreenUserManager; + private final ShadeController mShadeController; private int mDisplayId; /** @@ -461,6 +458,9 @@ public class NotificationPanelView extends PanelView implements KeyguardBypassController bypassController, FalsingManager falsingManager, PluginManager pluginManager, + ShadeController shadeController, + NotificationLockscreenUserManager notificationLockscreenUserManager, + NotificationEntryManager notificationEntryManager, DozeLog dozeLog) { super(context, attrs, falsingManager, dozeLog); setWillNotDraw(!DEBUG); @@ -495,6 +495,11 @@ public class NotificationPanelView extends PanelView implements mBottomAreaShadeAlphaAnimator.setDuration(160); mBottomAreaShadeAlphaAnimator.setInterpolator(Interpolators.ALPHA_OUT); mPluginManager = pluginManager; + mShadeController = shadeController; + mLockscreenUserManager = notificationLockscreenUserManager; + mEntryManager = notificationEntryManager; + + setBackgroundColor(Color.TRANSPARENT); } /** @@ -509,9 +514,11 @@ public class NotificationPanelView extends PanelView implements mKeyguardBottomArea.setStatusBar(mStatusBar); } - @Override - protected void onFinishInflate() { - super.onFinishInflate(); + /** + * Call after this view has been fully inflated and had its children attached. + */ + public void onChildrenAttached() { + loadDimens(); mKeyguardStatusBar = findViewById(R.id.keyguard_header); mKeyguardStatusView = findViewById(R.id.keyguard_status_view); @@ -554,7 +561,7 @@ public class NotificationPanelView extends PanelView implements } }); - Dependency.get(PluginManager.class).addPluginListener( + mPluginManager.addPluginListener( new PluginListener<HomeControlsPlugin>() { @Override 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 da5931a50ba8..2b80d2282661 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -25,7 +25,6 @@ import static android.app.StatusBarManager.WindowVisibleState; import static android.app.StatusBarManager.windowStateToString; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY; -import static com.android.systemui.DejankUtils.whitelistIpcs; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.Dependency.BG_HANDLER; import static com.android.systemui.Dependency.MAIN_HANDLER; @@ -211,6 +210,7 @@ import com.android.systemui.statusbar.notification.ViewGroupFadeHelper; import com.android.systemui.statusbar.notification.VisualStabilityManager; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; @@ -244,9 +244,11 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Named; +import javax.inject.Singleton; import dagger.Subcomponent; +@Singleton public class StatusBar extends SystemUI implements DemoMode, ActivityStarter, KeyguardStateController.Callback, OnHeadsUpChangedListener, CommandQueue.Callbacks, ZenModeController.Callback, @@ -355,6 +357,7 @@ public class StatusBar extends SystemUI implements DemoMode, private final Point mCurrentDisplaySize = new Point(); + protected StatusBarWindowViewController mStatusBarWindowViewController; protected StatusBarWindowView mStatusBarWindow; protected PhoneStatusBarView mStatusBarView; private int mStatusBarWindowState = WINDOW_STATE_SHOWING; @@ -382,6 +385,8 @@ public class StatusBar extends SystemUI implements DemoMode, private final FalsingManager mFalsingManager; private final BroadcastDispatcher mBroadcastDispatcher; private final ConfigurationController mConfigurationController; + private final StatusBarWindowViewController.Builder mStatusBarWindowViewControllerBuilder; + private final NotifLog mNotifLog; // expanded notifications protected NotificationPanelView mNotificationPanel; // the sliding/resizing panel within the notification window @@ -582,7 +587,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onStrongAuthStateChanged(int userId) { super.onStrongAuthStateChanged(userId); - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("onStrongAuthStateChanged"); } }; private final Handler mMainThreadHandler = new Handler(Looper.getMainLooper()); @@ -596,6 +601,7 @@ public class StatusBar extends SystemUI implements DemoMode, private boolean mPulsing; private final BubbleController mBubbleController; private final BubbleController.BubbleExpandListener mBubbleExpandListener; + private ActivityIntentHelper mActivityIntentHelper; @Override @@ -665,7 +671,9 @@ public class StatusBar extends SystemUI implements DemoMode, AssistManager assistManager, NotificationListener notificationListener, ConfigurationController configurationController, - StatusBarWindowController statusBarWindowController) { + StatusBarWindowController statusBarWindowController, + StatusBarWindowViewController.Builder statusBarWindowViewControllerBuilder, + NotifLog notifLog) { mLightBarController = lightBarController; mAutoHideController = autoHideController; mKeyguardUpdateMonitor = keyguardUpdateMonitor; @@ -718,10 +726,12 @@ public class StatusBar extends SystemUI implements DemoMode, mNotificationListener = notificationListener; mConfigurationController = configurationController; mStatusBarWindowController = statusBarWindowController; + mStatusBarWindowViewControllerBuilder = statusBarWindowViewControllerBuilder; + mNotifLog = notifLog; mBubbleExpandListener = (isExpanding, key) -> { - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("onBubbleExpandChanged"); updateScrimController(); }; } @@ -883,8 +893,7 @@ public class StatusBar extends SystemUI implements DemoMode, updateTheme(); inflateStatusBarWindow(context); - mStatusBarWindow.setService(this); - mStatusBarWindow.setBypassController(mKeyguardBypassController); + mStatusBarWindowViewController.setService(this); mStatusBarWindow.setOnTouchListener(getStatusBarWindowTouchListener()); // TODO: Deal with the ugliness that comes from having some of the statusbar broken out @@ -952,7 +961,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarStateController, mKeyguardBypassController, mWakeUpCoordinator); mHeadsUpAppearanceController.readFrom(oldController); - mStatusBarWindow.setStatusBarView(mStatusBarView); + mStatusBarWindowViewController.setStatusBarView(mStatusBarView); updateAreThereNotifications(); checkBarModes(); }).getFragmentManager() @@ -1019,7 +1028,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarWindowController.setScrimsVisibility(scrimsVisible); } if (mStatusBarWindow != null) { - mStatusBarWindow.onScrimVisibilityChanged(scrimsVisible); + mStatusBarWindowViewController.onScrimVisibilityChanged(scrimsVisible); } }, DozeParameters.getInstance(mContext), mContext.getSystemService(AlarmManager.class), @@ -1042,7 +1051,7 @@ public class StatusBar extends SystemUI implements DemoMode, } mNotificationPanel.setLaunchAffordanceListener( - mStatusBarWindow::onShowingLaunchAffordanceChanged); + mStatusBarWindowViewController::onShowingLaunchAffordanceChanged); // Set up the quick settings tile panel View container = mStatusBarWindow.findViewById(R.id.qs_frame); @@ -1148,7 +1157,7 @@ public class StatusBar extends SystemUI implements DemoMode, private void setUpPresenter() { // Set up the initial notification state. mActivityLaunchAnimator = new ActivityLaunchAnimator( - mStatusBarWindow, this, mNotificationPanel, + mStatusBarWindowViewController, this, mNotificationPanel, (NotificationListContainer) mStackScroller); final NotificationRowBinderImpl rowBinder = @@ -1156,7 +1165,8 @@ public class StatusBar extends SystemUI implements DemoMode, mContext, mAllowNotificationLongPress, mKeyguardBypassController, - mStatusBarStateController); + mStatusBarStateController, + mNotifLog); mPresenter = new StatusBarNotificationPresenter(mContext, mNotificationPanel, mHeadsUpManager, mStatusBarWindow, mStackScroller, mDozeScrimController, @@ -1320,6 +1330,10 @@ public class StatusBar extends SystemUI implements DemoMode, protected void inflateStatusBarWindow(Context context) { mStatusBarWindow = (StatusBarWindowView) mInjectionInflater.injectable( LayoutInflater.from(context)).inflate(R.layout.super_status_bar, null); + mStatusBarWindowViewController = mStatusBarWindowViewControllerBuilder + .setStatusBarWindowView(mStatusBarWindow) + .setShadeController(this) + .build(); } protected void startKeyguard() { @@ -1435,8 +1449,12 @@ public class StatusBar extends SystemUI implements DemoMode, return mZenController.areNotificationsHiddenInShade(); } - public void requestNotificationUpdate() { - mEntryManager.updateNotifications(); + /** + * Request a notification update + * @param reason why we're requesting a notification update + */ + public void requestNotificationUpdate(String reason) { + mEntryManager.updateNotifications(reason); } /** @@ -1677,7 +1695,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) { - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("onHeadsUpStateChanged"); if (isDozing() && isHeadsUp) { entry.setPulseSuppressed(false); mDozeServiceHost.fireNotificationPulse(entry); @@ -2022,7 +2040,7 @@ public class StatusBar extends SystemUI implements DemoMode, // release focus immediately to kick off focus change transition mStatusBarWindowController.setStatusBarFocusable(false); - mStatusBarWindow.cancelExpandHelper(); + mStatusBarWindowViewController.cancelExpandHelper(); mStatusBarView.collapsePanel(true /* animate */, delayed, speedUpFactor); } else { mBubbleController.collapseStack(); @@ -2413,8 +2431,8 @@ public class StatusBar extends SystemUI implements DemoMode, dumpBarTransitions(pw, "mStatusBarView", mStatusBarView.getBarTransitions()); } pw.println(" StatusBarWindowView: "); - if (mStatusBarWindow != null) { - mStatusBarWindow.dump(fd, pw, args); + if (mStatusBarWindowViewController != null) { + mStatusBarWindowViewController.dump(fd, pw, args); } pw.println(" mMediaManager: "); @@ -3558,7 +3576,7 @@ public class StatusBar extends SystemUI implements DemoMode, updateQsExpansionEnabled(); mKeyguardViewMediator.setDozing(mDozing); - mEntryManager.updateNotifications(); + mEntryManager.updateNotifications("onDozingChanged"); updateDozingState(); updateScrimController(); updateReportRejectedTouchVisibility(); @@ -3708,7 +3726,7 @@ public class StatusBar extends SystemUI implements DemoMode, mBouncerShowing = bouncerShowing; mKeyguardBypassController.setBouncerShowing(bouncerShowing); mPulseExpansionHandler.setBouncerShowing(bouncerShowing); - mStatusBarWindow.setBouncerShowingScrimmed(isBouncerShowingScrimmed()); + mStatusBarWindowViewController.setBouncerShowingScrimmed(isBouncerShowingScrimmed()); if (mStatusBarView != null) mStatusBarView.setBouncerShowing(bouncerShowing); updateHideIconsForBouncer(true /* animate */); mCommandQueue.recomputeDisableFlags(mDisplayId, true /* animate */); @@ -3723,7 +3741,7 @@ public class StatusBar extends SystemUI implements DemoMode, */ public void collapseShade() { if (mNotificationPanel.isTracking()) { - mStatusBarWindow.cancelCurrentTouch(); + mStatusBarWindowViewController.cancelCurrentTouch(); } if (mPanelExpanded && mState == StatusBarState.SHADE) { animateCollapsePanels(); @@ -3744,7 +3762,7 @@ public class StatusBar extends SystemUI implements DemoMode, updateVisibleToUser(); updateNotificationPanelTouchState(); - mStatusBarWindow.cancelCurrentTouch(); + mStatusBarWindowViewController.cancelCurrentTouch(); if (mLaunchCameraOnFinishedGoingToSleep) { mLaunchCameraOnFinishedGoingToSleep = false; @@ -3936,20 +3954,17 @@ public class StatusBar extends SystemUI implements DemoMode, } boolean isCameraAllowedByAdmin() { - // TODO(b/140060745) - return whitelistIpcs(() -> { - if (mDevicePolicyManager.getCameraDisabled(null, - mLockscreenUserManager.getCurrentUserId())) { - return false; - } else if (mStatusBarKeyguardViewManager == null - || (isKeyguardShowing() && isKeyguardSecure())) { - // Check if the admin has disabled the camera specifically for the keyguard - return (mDevicePolicyManager.getKeyguardDisabledFeatures(null, - mLockscreenUserManager.getCurrentUserId()) - & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) == 0; - } - return true; - }); + if (mDevicePolicyManager.getCameraDisabled(null, + mLockscreenUserManager.getCurrentUserId())) { + return false; + } else if (mStatusBarKeyguardViewManager == null + || (isKeyguardShowing() && isKeyguardSecure())) { + // Check if the admin has disabled the camera specifically for the keyguard + return (mDevicePolicyManager.getKeyguardDisabledFeatures(null, + mLockscreenUserManager.getCurrentUserId()) + & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) == 0; + } + return true; } private boolean isGoingToSleep() { @@ -3965,7 +3980,8 @@ public class StatusBar extends SystemUI implements DemoMode, public void notifyBiometricAuthModeChanged() { updateDozing(); updateScrimController(); - mStatusBarWindow.onBiometricAuthModeChanged(mBiometricUnlockController.isWakeAndUnlock(), + mStatusBarWindowViewController.onBiometricAuthModeChanged( + mBiometricUnlockController.isWakeAndUnlock(), mBiometricUnlockController.isBiometricUnlock()); } @@ -4086,7 +4102,7 @@ public class StatusBar extends SystemUI implements DemoMode, } if (reason == DozeEvent.PULSE_REASON_DOCKING && mStatusBarWindow != null) { - mStatusBarWindow.suppressWakeUpGesture(true); + mStatusBarWindowViewController.suppressWakeUpGesture(true); } boolean passiveAuthInterrupt = reason == DozeEvent.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN @@ -4110,7 +4126,7 @@ public class StatusBar extends SystemUI implements DemoMode, updateNotificationPanelTouchState(); mScrimController.setWakeLockScreenSensorActive(false); if (mStatusBarWindow != null) { - mStatusBarWindow.suppressWakeUpGesture(false); + mStatusBarWindowViewController.suppressWakeUpGesture(false); } setPulsing(false); } @@ -4121,7 +4137,7 @@ public class StatusBar extends SystemUI implements DemoMode, mKeyguardViewMediator.setPulsing(pulsing); mNotificationPanel.setPulsing(pulsing); mVisualStabilityManager.setPulsing(pulsing); - mStatusBarWindow.setPulsing(pulsing); + mStatusBarWindowViewController.setPulsing(pulsing); mIgnoreTouchWhilePulsing = false; if (mKeyguardUpdateMonitor != null && passiveAuthInterrupt) { mKeyguardUpdateMonitor.onAuthInterruptDetected(pulsing /* active */); @@ -4152,7 +4168,7 @@ public class StatusBar extends SystemUI implements DemoMode, } mIgnoreTouchWhilePulsing = ignore; if (isDozing() && ignore) { - mStatusBarWindow.cancelCurrentTouch(); + mStatusBarWindowViewController.cancelCurrentTouch(); } } @@ -4607,7 +4623,7 @@ public class StatusBar extends SystemUI implements DemoMode, */ public void onBouncerPreHideAnimation() { mNotificationPanel.onBouncerPreHideAnimation(); - mStatusBarWindow.onBouncerPreHideAnimation(); + mStatusBarWindowViewController.onBouncerPreHideAnimation(); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index a9e818df6bc3..d04c7bd38320 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -19,29 +19,18 @@ package com.android.systemui.statusbar.phone; import android.annotation.ColorInt; import android.annotation.DrawableRes; import android.annotation.LayoutRes; -import android.app.StatusBarManager; import android.content.Context; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.hardware.display.AmbientDisplayConfiguration; -import android.media.AudioManager; -import android.media.session.MediaSessionLegacyHelper; import android.net.Uri; import android.os.Bundle; -import android.os.SystemClock; -import android.os.UserHandle; -import android.provider.Settings; import android.util.AttributeSet; import android.view.ActionMode; import android.view.DisplayCutout; -import android.view.GestureDetector; -import android.view.InputDevice; import android.view.InputQueue; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -56,21 +45,9 @@ import android.view.Window; import android.view.WindowInsetsController; import android.widget.FrameLayout; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.view.FloatingActionMode; import com.android.internal.widget.FloatingToolbar; -import com.android.systemui.Dependency; -import com.android.systemui.ExpandHelper; import com.android.systemui.R; -import com.android.systemui.plugins.FalsingManager; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.statusbar.DragDownHelper; -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; -import com.android.systemui.statusbar.phone.ScrimController.ScrimVisibility; -import com.android.systemui.tuner.TunerService; - -import java.io.FileDescriptor; -import java.io.PrintWriter; /** * Combined status bar and notification panel view. Also holding backdrop and scrims. @@ -79,87 +56,21 @@ public class StatusBarWindowView extends FrameLayout { public static final String TAG = "StatusBarWindowView"; public static final boolean DEBUG = StatusBar.DEBUG; - private final GestureDetector mGestureDetector; - private final StatusBarStateController mStatusBarStateController; - private boolean mDoubleTapEnabled; - private boolean mSingleTapEnabled; - private DragDownHelper mDragDownHelper; - private NotificationStackScrollLayout mStackScrollLayout; - private NotificationPanelView mNotificationPanel; - private View mBrightnessMirror; - private LockIcon mLockIcon; - private PhoneStatusBarView mStatusBarView; - private int mRightInset = 0; private int mLeftInset = 0; - private StatusBar mService; - private final Paint mTransparentSrcPaint = new Paint(); - private FalsingManager mFalsingManager; - // Implements the floating action mode for TextView's Cut/Copy/Past menu. Normally provided by // DecorView, but since this is a special window we have to roll our own. private View mFloatingActionModeOriginatingView; private ActionMode mFloatingActionMode; private FloatingToolbar mFloatingToolbar; private ViewTreeObserver.OnPreDrawListener mFloatingToolbarPreDrawListener; - private boolean mTouchCancelled; - private boolean mTouchActive; - private boolean mExpandAnimationRunning; - private boolean mExpandAnimationPending; - private boolean mSuppressingWakeUpGesture; - - private final GestureDetector.SimpleOnGestureListener mGestureListener = - new GestureDetector.SimpleOnGestureListener() { - @Override - public boolean onSingleTapConfirmed(MotionEvent e) { - if (mSingleTapEnabled && !mSuppressingWakeUpGesture) { - mService.wakeUpIfDozing(SystemClock.uptimeMillis(), StatusBarWindowView.this, - "SINGLE_TAP"); - return true; - } - return false; - } - @Override - public boolean onDoubleTap(MotionEvent e) { - if (mDoubleTapEnabled || mSingleTapEnabled) { - mService.wakeUpIfDozing(SystemClock.uptimeMillis(), StatusBarWindowView.this, - "DOUBLE_TAP"); - return true; - } - return false; - } - }; - private final TunerService.Tunable mTunable = (key, newValue) -> { - AmbientDisplayConfiguration configuration = new AmbientDisplayConfiguration(mContext); - switch (key) { - case Settings.Secure.DOZE_DOUBLE_TAP_GESTURE: - mDoubleTapEnabled = configuration.doubleTapGestureEnabled(UserHandle.USER_CURRENT); - break; - case Settings.Secure.DOZE_TAP_SCREEN_GESTURE: - mSingleTapEnabled = configuration.tapGestureEnabled(UserHandle.USER_CURRENT); - } - }; - - /** - * If set to true, the current gesture started below the notch and we need to dispatch touch - * events manually as it's outside of the regular view bounds. - */ - private boolean mExpandingBelowNotch; - private KeyguardBypassController mBypassController; + private InteractionEventHandler mInteractionEventHandler; public StatusBarWindowView(Context context, AttributeSet attrs) { super(context, attrs); setMotionEventSplittingEnabled(false); - mTransparentSrcPaint.setColor(0); - mTransparentSrcPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC)); - mFalsingManager = Dependency.get(FalsingManager.class); // TODO: inject into a controller. - mGestureDetector = new GestureDetector(context, mGestureListener); - mStatusBarStateController = Dependency.get(StatusBarStateController.class); - Dependency.get(TunerService.class).addTunable(mTunable, - Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, - Settings.Secure.DOZE_TAP_SCREEN_GESTURE); } @Override @@ -226,11 +137,6 @@ public class StatusBarWindowView extends FrameLayout { } } - @VisibleForTesting - protected NotificationStackScrollLayout getStackScrollLayout() { - return mStackScrollLayout; - } - @Override public FrameLayout.LayoutParams generateLayoutParams(AttributeSet attrs) { return new LayoutParams(getContext(), attrs); @@ -242,61 +148,6 @@ public class StatusBarWindowView extends FrameLayout { } @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mStackScrollLayout = findViewById(R.id.notification_stack_scroller); - mNotificationPanel = findViewById(R.id.notification_panel); - mBrightnessMirror = findViewById(R.id.brightness_mirror); - mLockIcon = findViewById(R.id.lock_icon); - } - - @Override - public void onViewAdded(View child) { - super.onViewAdded(child); - if (child.getId() == R.id.brightness_mirror) { - mBrightnessMirror = child; - } - } - - /** - * Propagate {@link StatusBar} pulsing state. - */ - public void setPulsing(boolean pulsing) { - if (mLockIcon != null) { - mLockIcon.setPulsing(pulsing); - } - } - - /** - * Called when the biometric authentication mode changes. - * @param wakeAndUnlock If the type is {@link BiometricUnlockController#isWakeAndUnlock()} - * @param isUnlock If the type is {@link BiometricUnlockController#isBiometricUnlock()} () - */ - public void onBiometricAuthModeChanged(boolean wakeAndUnlock, boolean isUnlock) { - if (mLockIcon != null) { - mLockIcon.onBiometricAuthModeChanged(wakeAndUnlock, isUnlock); - } - } - - public void setStatusBarView(PhoneStatusBarView statusBarView) { - mStatusBarView = statusBarView; - } - - public void setService(StatusBar service) { - mService = service; - NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); - ExpandHelper.Callback expandHelperCallback = stackScrollLayout.getExpandHelperCallback(); - DragDownHelper.DragDownCallback dragDownCallback = stackScrollLayout.getDragDownCallback(); - setDragDownHelper(new DragDownHelper(getContext(), this, expandHelperCallback, - dragDownCallback, mFalsingManager)); - } - - @VisibleForTesting - void setDragDownHelper(DragDownHelper dragDownHelper) { - mDragDownHelper = dragDownHelper; - } - - @Override protected void onAttachedToWindow () { super.onAttachedToWindow(); setWillNotDraw(!DEBUG); @@ -304,152 +155,53 @@ public class StatusBarWindowView extends FrameLayout { @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (mService.interceptMediaKey(event)) { + if (mInteractionEventHandler.interceptMediaKey(event)) { return true; } + if (super.dispatchKeyEvent(event)) { return true; } - boolean down = event.getAction() == KeyEvent.ACTION_DOWN; - switch (event.getKeyCode()) { - case KeyEvent.KEYCODE_BACK: - if (!down) { - mService.onBackPressed(); - } - return true; - case KeyEvent.KEYCODE_MENU: - if (!down) { - return mService.onMenuPressed(); - } - case KeyEvent.KEYCODE_SPACE: - if (!down) { - return mService.onSpacePressed(); - } - break; - case KeyEvent.KEYCODE_VOLUME_DOWN: - case KeyEvent.KEYCODE_VOLUME_UP: - if (mService.isDozing()) { - MediaSessionLegacyHelper.getHelper(mContext).sendVolumeKeyEvent( - event, AudioManager.USE_DEFAULT_STREAM_TYPE, true); - return true; - } - break; - } - return false; - } - public void setTouchActive(boolean touchActive) { - mTouchActive = touchActive; + return mInteractionEventHandler.dispatchKeyEvent(event); } - void suppressWakeUpGesture(boolean suppress) { - mSuppressingWakeUpGesture = suppress; + protected void setInteractionEventHandler(InteractionEventHandler listener) { + mInteractionEventHandler = listener; } @Override public boolean dispatchTouchEvent(MotionEvent ev) { - boolean isDown = ev.getActionMasked() == MotionEvent.ACTION_DOWN; - boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP; - boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL; - - // Reset manual touch dispatch state here but make sure the UP/CANCEL event still gets - // delivered. - boolean expandingBelowNotch = mExpandingBelowNotch; - if (isUp || isCancel) { - mExpandingBelowNotch = false; - } + Boolean result = mInteractionEventHandler.handleDispatchTouchEvent(ev); - if (!isCancel && mService.shouldIgnoreTouch()) { - return false; - } - if (isDown && mNotificationPanel.isFullyCollapsed()) { - mNotificationPanel.startExpandLatencyTracking(); - } - if (isDown) { - setTouchActive(true); - mTouchCancelled = false; - } else if (ev.getActionMasked() == MotionEvent.ACTION_UP - || ev.getActionMasked() == MotionEvent.ACTION_CANCEL) { - setTouchActive(false); - } - if (mTouchCancelled || mExpandAnimationRunning || mExpandAnimationPending) { - return false; - } - mFalsingManager.onTouchEvent(ev, getWidth(), getHeight()); - mGestureDetector.onTouchEvent(ev); - if (mBrightnessMirror != null && mBrightnessMirror.getVisibility() == VISIBLE) { - // Disallow new pointers while the brightness mirror is visible. This is so that you - // can't touch anything other than the brightness slider while the mirror is showing - // and the rest of the panel is transparent. - if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) { - return false; - } - } - if (isDown) { - getStackScrollLayout().closeControlsIfOutsideTouch(ev); - } - if (mService.isDozing()) { - mService.mDozeScrimController.extendPulse(); - } - - // In case we start outside of the view bounds (below the status bar), we need to dispatch - // the touch manually as the view system can't accomodate for touches outside of the - // regular view bounds. - if (isDown && ev.getY() >= mBottom) { - mExpandingBelowNotch = true; - expandingBelowNotch = true; - } - if (expandingBelowNotch) { - return mStatusBarView.dispatchTouchEvent(ev); - } - - return super.dispatchTouchEvent(ev); + return result != null ? result : super.dispatchTouchEvent(ev); } @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); - if (mService.isDozing() && !mService.isPulsing()) { - // Capture all touch events in always-on. - return true; - } - boolean intercept = false; - if (mNotificationPanel.isFullyExpanded() - && mDragDownHelper.isDragDownEnabled() - && !mService.isBouncerShowing() - && !mService.isDozing()) { - intercept = mDragDownHelper.onInterceptTouchEvent(ev); - } + boolean intercept = mInteractionEventHandler.shouldInterceptTouchEvent(ev); if (!intercept) { - super.onInterceptTouchEvent(ev); + intercept = super.onInterceptTouchEvent(ev); } if (intercept) { - MotionEvent cancellation = MotionEvent.obtain(ev); - cancellation.setAction(MotionEvent.ACTION_CANCEL); - stackScrollLayout.onInterceptTouchEvent(cancellation); - mNotificationPanel.onInterceptTouchEvent(cancellation); - cancellation.recycle(); + mInteractionEventHandler.didIntercept(ev); } + return intercept; } @Override public boolean onTouchEvent(MotionEvent ev) { - boolean handled = false; - if (mService.isDozing()) { - handled = !mService.isPulsing(); - } - if ((mDragDownHelper.isDragDownEnabled() && !handled) || mDragDownHelper.isDraggingDown()) { - // we still want to finish our drag down gesture when locking the screen - handled = mDragDownHelper.onTouchEvent(ev); - } + boolean handled = mInteractionEventHandler.handleTouchEvent(ev); + if (!handled) { handled = super.onTouchEvent(ev); } - final int action = ev.getAction(); - if (!handled && (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL)) { - mService.setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false); + + if (!handled) { + mInteractionEventHandler.didNotHandleTouchEvent(ev); } + return handled; } @@ -465,77 +217,6 @@ public class StatusBarWindowView extends FrameLayout { } } - public void cancelExpandHelper() { - NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); - if (stackScrollLayout != null) { - stackScrollLayout.cancelExpandHelper(); - } - } - - public void cancelCurrentTouch() { - if (mTouchActive) { - final long now = SystemClock.uptimeMillis(); - MotionEvent event = MotionEvent.obtain(now, now, - MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0); - event.setSource(InputDevice.SOURCE_TOUCHSCREEN); - dispatchTouchEvent(event); - event.recycle(); - mTouchCancelled = true; - } - } - - public void setExpandAnimationRunning(boolean expandAnimationRunning) { - mExpandAnimationRunning = expandAnimationRunning; - } - - public void setExpandAnimationPending(boolean pending) { - mExpandAnimationPending = pending; - } - - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - pw.print(" mExpandAnimationPending="); pw.println(mExpandAnimationPending); - pw.print(" mExpandAnimationRunning="); pw.println(mExpandAnimationRunning); - pw.print(" mTouchCancelled="); pw.println(mTouchCancelled); - pw.print(" mTouchActive="); pw.println(mTouchActive); - } - - /** - * Called whenever the scrims become opaque, transparent or semi-transparent. - */ - public void onScrimVisibilityChanged(@ScrimVisibility int scrimsVisible) { - if (mLockIcon != null) { - mLockIcon.onScrimVisibilityChanged(scrimsVisible); - } - } - - /** - * When we're launching an affordance, like double pressing power to open camera. - */ - public void onShowingLaunchAffordanceChanged(boolean showing) { - if (mLockIcon != null) { - mLockIcon.onShowingLaunchAffordanceChanged(showing); - } - } - - public void setBypassController(KeyguardBypassController bypassController) { - mBypassController = bypassController; - } - - public void setBouncerShowingScrimmed(boolean bouncerShowing) { - if (mLockIcon != null) { - mLockIcon.setBouncerShowingScrimmed(bouncerShowing); - } - } - - /** - * When {@link KeyguardBouncer} starts to be dismissed and starts to play its animation. - */ - public void onBouncerPreHideAnimation() { - if (mLockIcon != null) { - mLockIcon.onBouncerPreHideAnimation(); - } - } - public class LayoutParams extends FrameLayout.LayoutParams { public boolean ignoreRightInset; @@ -657,6 +338,35 @@ public class StatusBarWindowView extends FrameLayout { } } + interface InteractionEventHandler { + /** + * Returns a result for {@link ViewGroup#dispatchTouchEvent(MotionEvent)} or null to defer + * to the super method. + */ + Boolean handleDispatchTouchEvent(MotionEvent ev); + + /** + * Returns if the view should intercept the touch event. + * + * The touch event may still be interecepted if + * {@link ViewGroup#onInterceptTouchEvent(MotionEvent)} decides to do so. + */ + boolean shouldInterceptTouchEvent(MotionEvent ev); + + /** + * Called when the view decides to intercept the touch event. + */ + void didIntercept(MotionEvent ev); + + boolean handleTouchEvent(MotionEvent ev); + + void didNotHandleTouchEvent(MotionEvent ev); + + boolean interceptMediaKey(KeyEvent event); + + boolean dispatchKeyEvent(KeyEvent event); + } + /** * Minimal window to satisfy FloatingToolbar. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java new file mode 100644 index 000000000000..f21085ef0b1d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowViewController.java @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone; + +import android.app.StatusBarManager; +import android.hardware.display.AmbientDisplayConfiguration; +import android.media.AudioManager; +import android.media.session.MediaSessionLegacyHelper; +import android.os.SystemClock; +import android.os.UserHandle; +import android.provider.Settings; +import android.view.GestureDetector; +import android.view.InputDevice; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewStub; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.ExpandHelper; +import com.android.systemui.R; +import com.android.systemui.doze.DozeLog; +import com.android.systemui.plugins.FalsingManager; +import com.android.systemui.shared.plugins.PluginManager; +import com.android.systemui.statusbar.DragDownHelper; +import com.android.systemui.statusbar.NotificationLockscreenUserManager; +import com.android.systemui.statusbar.PulseExpansionHandler; +import com.android.systemui.statusbar.notification.DynamicPrivacyController; +import com.android.systemui.statusbar.notification.NotificationEntryManager; +import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; +import com.android.systemui.tuner.TunerService; +import com.android.systemui.util.InjectionInflationController; + +import java.io.FileDescriptor; +import java.io.PrintWriter; + +import javax.inject.Inject; + +/** + * Controller for {@link StatusBarWindowView}. + */ +public class StatusBarWindowViewController { + private final StatusBarWindowView mView; + private final FalsingManager mFalsingManager; + private final GestureDetector mGestureDetector; + private View mBrightnessMirror; + private boolean mTouchActive; + private boolean mTouchCancelled; + private boolean mExpandAnimationPending; + private boolean mExpandAnimationRunning; + private NotificationStackScrollLayout mStackScrollLayout; + private LockIcon mLockIcon; + private PhoneStatusBarView mStatusBarView; + private StatusBar mService; + private DragDownHelper mDragDownHelper; + private boolean mSuppressingWakeUpGesture; + private boolean mDoubleTapEnabled; + private boolean mSingleTapEnabled; + private boolean mExpandingBelowNotch; + + private StatusBarWindowViewController( + StatusBarWindowView view, + InjectionInflationController injectionInflationController, + NotificationWakeUpCoordinator coordinator, + PulseExpansionHandler pulseExpansionHandler, + DynamicPrivacyController dynamicPrivacyController, + KeyguardBypassController bypassController, + FalsingManager falsingManager, + PluginManager pluginManager, + TunerService tunerService, + ShadeController shadeController, + NotificationLockscreenUserManager notificationLockscreenUserManager, + NotificationEntryManager notificationEntryManager, + DozeLog dozeLog) { + mView = view; + mFalsingManager = falsingManager; + + // TODO: create controller for NotificationPanelView + NotificationPanelView notificationPanelView = new NotificationPanelView( + view.getContext(), + null, + injectionInflationController, + coordinator, + pulseExpansionHandler, + dynamicPrivacyController, + bypassController, + falsingManager, + pluginManager, + shadeController, + notificationLockscreenUserManager, + notificationEntryManager, + dozeLog); + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); + notificationPanelView.setVisibility(View.INVISIBLE); + notificationPanelView.setId(R.id.notification_panel); + LayoutInflater li = injectionInflationController.injectable( + LayoutInflater.from(mView.getContext())); + + li.inflate(R.layout.status_bar_expanded, notificationPanelView); + notificationPanelView.onChildrenAttached(); + + ViewStub statusBarExpanded = view.findViewById(R.id.status_bar_expanded); + mView.addView(notificationPanelView, mView.indexOfChild(statusBarExpanded), lp); + mView.removeView(statusBarExpanded); + + mStackScrollLayout = mView.findViewById(R.id.notification_stack_scroller); + mLockIcon = mView.findViewById(R.id.lock_icon); + mBrightnessMirror = mView.findViewById(R.id.brightness_mirror); + + TunerService.Tunable tunable = (key, newValue) -> { + AmbientDisplayConfiguration configuration = + new AmbientDisplayConfiguration(mView.getContext()); + switch (key) { + case Settings.Secure.DOZE_DOUBLE_TAP_GESTURE: + mDoubleTapEnabled = configuration.doubleTapGestureEnabled( + UserHandle.USER_CURRENT); + break; + case Settings.Secure.DOZE_TAP_SCREEN_GESTURE: + mSingleTapEnabled = configuration.tapGestureEnabled(UserHandle.USER_CURRENT); + } + }; + tunerService.addTunable(tunable, + Settings.Secure.DOZE_DOUBLE_TAP_GESTURE, + Settings.Secure.DOZE_TAP_SCREEN_GESTURE); + + GestureDetector.SimpleOnGestureListener gestureListener = + new GestureDetector.SimpleOnGestureListener() { + @Override + public boolean onSingleTapConfirmed(MotionEvent e) { + if (mSingleTapEnabled && !mSuppressingWakeUpGesture) { + mService.wakeUpIfDozing( + SystemClock.uptimeMillis(), mView, "SINGLE_TAP"); + return true; + } + return false; + } + + @Override + public boolean onDoubleTap(MotionEvent e) { + if (mDoubleTapEnabled || mSingleTapEnabled) { + mService.wakeUpIfDozing( + SystemClock.uptimeMillis(), mView, "DOUBLE_TAP"); + return true; + } + return false; + } + }; + mGestureDetector = new GestureDetector(mView.getContext(), gestureListener); + + mView.setInteractionEventHandler(new StatusBarWindowView.InteractionEventHandler() { + @Override + public Boolean handleDispatchTouchEvent(MotionEvent ev) { + boolean isDown = ev.getActionMasked() == MotionEvent.ACTION_DOWN; + boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP; + boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL; + + if (isUp || isCancel) { + mExpandingBelowNotch = false; + } + + // Reset manual touch dispatch state here but make sure the UP/CANCEL event still + // gets + // delivered. + + if (!isCancel && mService.shouldIgnoreTouch()) { + return false; + } + if (isDown && notificationPanelView.isFullyCollapsed()) { + notificationPanelView.startExpandLatencyTracking(); + } + if (isDown) { + setTouchActive(true); + mTouchCancelled = false; + } else if (ev.getActionMasked() == MotionEvent.ACTION_UP + || ev.getActionMasked() == MotionEvent.ACTION_CANCEL) { + setTouchActive(false); + } + if (mTouchCancelled || mExpandAnimationRunning || mExpandAnimationPending) { + return false; + } + mFalsingManager.onTouchEvent(ev, mView.getWidth(), mView.getHeight()); + mGestureDetector.onTouchEvent(ev); + if (mBrightnessMirror != null + && mBrightnessMirror.getVisibility() == View.VISIBLE) { + // Disallow new pointers while the brightness mirror is visible. This is so that + // you can't touch anything other than the brightness slider while the mirror is + // showing and the rest of the panel is transparent. + if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) { + return false; + } + } + if (isDown) { + getStackScrollLayout().closeControlsIfOutsideTouch(ev); + } + if (mService.isDozing()) { + mService.mDozeScrimController.extendPulse(); + } + // In case we start outside of the view bounds (below the status bar), we need to + // dispatch + // the touch manually as the view system can't accommodate for touches outside of + // the + // regular view bounds. + if (isDown && ev.getY() >= mView.getBottom()) { + mExpandingBelowNotch = true; + } + if (mExpandingBelowNotch) { + return mStatusBarView.dispatchTouchEvent(ev); + } + + return null; + } + + @Override + public boolean shouldInterceptTouchEvent(MotionEvent ev) { + if (mService.isDozing() && !mService.isPulsing()) { + // Capture all touch events in always-on. + return true; + } + boolean intercept = false; + if (notificationPanelView.isFullyExpanded() + && mDragDownHelper.isDragDownEnabled() + && !mService.isBouncerShowing() + && !mService.isDozing()) { + intercept = mDragDownHelper.onInterceptTouchEvent(ev); + } + + return intercept; + + } + + @Override + public void didIntercept(MotionEvent ev) { + NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); + MotionEvent cancellation = MotionEvent.obtain(ev); + cancellation.setAction(MotionEvent.ACTION_CANCEL); + stackScrollLayout.onInterceptTouchEvent(cancellation); + notificationPanelView.onInterceptTouchEvent(cancellation); + cancellation.recycle(); + } + + @Override + public boolean handleTouchEvent(MotionEvent ev) { + boolean handled = false; + if (mService.isDozing()) { + handled = !mService.isPulsing(); + } + if ((mDragDownHelper.isDragDownEnabled() && !handled) + || mDragDownHelper.isDraggingDown()) { + // we still want to finish our drag down gesture when locking the screen + handled = mDragDownHelper.onTouchEvent(ev); + } + + return handled; + } + + @Override + public void didNotHandleTouchEvent(MotionEvent ev) { + final int action = ev.getActionMasked(); + if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { + mService.setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false); + } + } + + @Override + public boolean interceptMediaKey(KeyEvent event) { + return mService.interceptMediaKey(event); + } + + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + boolean down = event.getAction() == KeyEvent.ACTION_DOWN; + switch (event.getKeyCode()) { + case KeyEvent.KEYCODE_BACK: + if (!down) { + mService.onBackPressed(); + } + return true; + case KeyEvent.KEYCODE_MENU: + if (!down) { + return mService.onMenuPressed(); + } + break; + case KeyEvent.KEYCODE_SPACE: + if (!down) { + return mService.onSpacePressed(); + } + break; + case KeyEvent.KEYCODE_VOLUME_DOWN: + case KeyEvent.KEYCODE_VOLUME_UP: + if (mService.isDozing()) { + MediaSessionLegacyHelper.getHelper(mView.getContext()) + .sendVolumeKeyEvent( + event, AudioManager.USE_DEFAULT_STREAM_TYPE, true); + return true; + } + break; + } + return false; + } + }); + + mView.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() { + @Override + public void onChildViewAdded(View parent, View child) { + if (child.getId() == R.id.brightness_mirror) { + mBrightnessMirror = child; + } + } + + @Override + public void onChildViewRemoved(View parent, View child) { + } + }); + } + + public StatusBarWindowView getView() { + return mView; + } + + public void setTouchActive(boolean touchActive) { + mTouchActive = touchActive; + } + + public void cancelCurrentTouch() { + if (mTouchActive) { + final long now = SystemClock.uptimeMillis(); + MotionEvent event = MotionEvent.obtain(now, now, + MotionEvent.ACTION_CANCEL, 0.0f, 0.0f, 0); + event.setSource(InputDevice.SOURCE_TOUCHSCREEN); + mView.dispatchTouchEvent(event); + event.recycle(); + mTouchCancelled = true; + } + } + + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + pw.print(" mExpandAnimationPending="); + pw.println(mExpandAnimationPending); + pw.print(" mExpandAnimationRunning="); + pw.println(mExpandAnimationRunning); + pw.print(" mTouchCancelled="); + pw.println(mTouchCancelled); + pw.print(" mTouchActive="); + pw.println(mTouchActive); + } + + public void setExpandAnimationPending(boolean pending) { + mExpandAnimationPending = pending; + } + + public void setExpandAnimationRunning(boolean running) { + mExpandAnimationRunning = running; + } + + public void cancelExpandHelper() { + NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); + if (stackScrollLayout != null) { + stackScrollLayout.cancelExpandHelper(); + } + } + + @VisibleForTesting + protected NotificationStackScrollLayout getStackScrollLayout() { + return mStackScrollLayout; + } + + /** + * Called whenever the scrims become opaque, transparent or semi-transparent. + */ + public void onScrimVisibilityChanged(Integer scrimsVisible) { + if (mLockIcon != null) { + mLockIcon.onScrimVisibilityChanged(scrimsVisible); + } + } + + /** + * Propagate {@link StatusBar} pulsing state. + */ + public void setPulsing(boolean pulsing) { + if (mLockIcon != null) { + mLockIcon.setPulsing(pulsing); + } + } + + /** + * Called when the biometric authentication mode changes. + * + * @param wakeAndUnlock If the type is {@link BiometricUnlockController#isWakeAndUnlock()} + * @param isUnlock If the type is {@link BiometricUnlockController#isBiometricUnlock()} () + */ + public void onBiometricAuthModeChanged(boolean wakeAndUnlock, boolean isUnlock) { + if (mLockIcon != null) { + mLockIcon.onBiometricAuthModeChanged(wakeAndUnlock, isUnlock); + } + } + + public void setStatusBarView(PhoneStatusBarView statusBarView) { + mStatusBarView = statusBarView; + } + + public void setService(StatusBar statusBar) { + mService = statusBar; + NotificationStackScrollLayout stackScrollLayout = getStackScrollLayout(); + ExpandHelper.Callback expandHelperCallback = stackScrollLayout.getExpandHelperCallback(); + DragDownHelper.DragDownCallback dragDownCallback = stackScrollLayout.getDragDownCallback(); + setDragDownHelper( + new DragDownHelper( + mView.getContext(), mView, expandHelperCallback, + dragDownCallback, mFalsingManager)); + } + + @VisibleForTesting + void setDragDownHelper(DragDownHelper dragDownHelper) { + mDragDownHelper = dragDownHelper; + } + + public void suppressWakeUpGesture(boolean suppress) { + mSuppressingWakeUpGesture = suppress; + } + + /** + * When we're launching an affordance, like double pressing power to open camera. + */ + public void onShowingLaunchAffordanceChanged(Boolean showing) { + if (mLockIcon != null) { + mLockIcon.onShowingLaunchAffordanceChanged(showing); + } + } + + public void setBouncerShowingScrimmed(boolean bouncerShowing) { + if (mLockIcon != null) { + mLockIcon.setBouncerShowingScrimmed(bouncerShowing); + } + } + + /** + * When {@link KeyguardBouncer} starts to be dismissed and starts to play its animation. + */ + public void onBouncerPreHideAnimation() { + if (mLockIcon != null) { + mLockIcon.onBouncerPreHideAnimation(); + } + } + + /** + * Builder for {@link StatusBarWindowViewController}. + */ + public static class Builder { + private final InjectionInflationController mInjectionInflationController; + private final NotificationWakeUpCoordinator mCoordinator; + private final PulseExpansionHandler mPulseExpansionHandler; + private final DynamicPrivacyController mDynamicPrivacyController; + private final KeyguardBypassController mBypassController; + private final FalsingManager mFalsingManager; + private final PluginManager mPluginManager; + private final TunerService mTunerService; + private ShadeController mShadeController; + private final NotificationLockscreenUserManager mNotificationLockScreenUserManager; + private final NotificationEntryManager mNotificationEntryManager; + private final DozeLog mDozeLog; + private StatusBarWindowView mView; + + @Inject + public Builder( + InjectionInflationController injectionInflationController, + NotificationWakeUpCoordinator coordinator, + PulseExpansionHandler pulseExpansionHandler, + DynamicPrivacyController dynamicPrivacyController, + KeyguardBypassController bypassController, + FalsingManager falsingManager, + PluginManager pluginManager, + TunerService tunerService, + NotificationLockscreenUserManager notificationLockscreenUserManager, + NotificationEntryManager notificationEntryManager, + DozeLog dozeLog) { + mInjectionInflationController = injectionInflationController; + mCoordinator = coordinator; + mPulseExpansionHandler = pulseExpansionHandler; + mDynamicPrivacyController = dynamicPrivacyController; + mBypassController = bypassController; + mFalsingManager = falsingManager; + mPluginManager = pluginManager; + mTunerService = tunerService; + mNotificationLockScreenUserManager = notificationLockscreenUserManager; + mNotificationEntryManager = notificationEntryManager; + mDozeLog = dozeLog; + } + + /** + * Provide {@link StatusBarWindowView} to attach this controller to. + */ + public Builder setStatusBarWindowView(StatusBarWindowView view) { + mView = view; + return this; + } + + /** + * Provide {@link ShadeController} that this view needs. + */ + public Builder setShadeController(ShadeController shadeController) { + mShadeController = shadeController; + return this; + } + + /** + * Build a {@link StatusBarWindowView}. + */ + public StatusBarWindowViewController build() { + return new StatusBarWindowViewController( + mView, + mInjectionInflationController, + mCoordinator, + mPulseExpansionHandler, + mDynamicPrivacyController, + mBypassController, + mFalsingManager, + mPluginManager, + mTunerService, + mShadeController, + mNotificationLockScreenUserManager, + mNotificationEntryManager, + mDozeLog); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index cc91bc082871..392094d0288e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -154,13 +154,17 @@ public class KeyguardStateControllerImpl extends KeyguardUpdateMonitorCallback } private void notifyKeyguardChanged() { + Trace.beginSection("KeyguardStateController#notifyKeyguardChanged"); // Copy the list to allow removal during callback. new ArrayList<>(mCallbacks).forEach(Callback::onKeyguardShowingChanged); + Trace.endSection(); } private void notifyUnlockedChanged() { + Trace.beginSection("KeyguardStateController#notifyUnlockedChanged"); // Copy the list to allow removal during callback. new ArrayList<>(mCallbacks).forEach(Callback::onUnlockedChanged); + Trace.endSection(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java index fa7af0be77f1..be5e0a0b12c5 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -53,7 +54,7 @@ public class DumpTruck { private final Context context; private Uri hprofUri; - private long pss; + private long rss; final StringBuilder body = new StringBuilder(); public DumpTruck(Context context) { @@ -66,7 +67,7 @@ public class DumpTruck { * @param pids * @return this, for chaining */ - public DumpTruck captureHeaps(int[] pids) { + public DumpTruck captureHeaps(List<Long> pids) { final GarbageMonitor gm = Dependency.get(GarbageMonitor.class); final File dumpDir = new File(context.getCacheDir(), FILEPROVIDER_PATH); @@ -79,8 +80,8 @@ public class DumpTruck { final ArrayList<String> paths = new ArrayList<String>(); final int myPid = android.os.Process.myPid(); - final int[] pids_copy = Arrays.copyOf(pids, pids.length); - for (int pid : pids_copy) { + for (Long pidL : pids) { + final int pid = pidL.intValue(); body.append(" pid ").append(pid); if (gm != null) { GarbageMonitor.ProcessMemInfo info = gm.getMemInfo(pid); @@ -88,11 +89,9 @@ public class DumpTruck { body.append(":") .append(" up=") .append(info.getUptime()) - .append(" pss=") - .append(info.currentPss) - .append(" uss=") - .append(info.currentUss); - pss = info.currentPss; + .append(" rss=") + .append(info.currentRss); + rss = info.currentRss; } } if (pid == myPid) { @@ -147,7 +146,7 @@ public class DumpTruck { shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); shareIntent.putExtra(Intent.EXTRA_SUBJECT, - String.format("SystemUI memory dump (pss=%dM)", pss / 1024)); + String.format("SystemUI memory dump (rss=%dM)", rss / 1024)); shareIntent.putExtra(Intent.EXTRA_TEXT, body.toString()); diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java index db4390686cd9..2d5ebc4875cb 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java @@ -35,7 +35,6 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; -import android.os.Debug; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -57,6 +56,7 @@ import com.android.systemui.qs.tileimpl.QSTileImpl; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.List; import javax.inject.Inject; import javax.inject.Named; @@ -102,7 +102,6 @@ public class GarbageMonitor implements Dumpable { private final LongSparseArray<ProcessMemInfo> mData = new LongSparseArray<>(); private final ArrayList<Long> mPids = new ArrayList<>(); - private int[] mPidsArray = new int[1]; private long mHeapLimit; @@ -164,8 +163,8 @@ public class GarbageMonitor implements Dumpable { return mData.get(pid); } - public int[] getTrackedProcesses() { - return mPidsArray; + public List<Long> getTrackedProcesses() { + return mPids; } public void startTrackingProcess(long pid, String name, long start) { @@ -173,43 +172,40 @@ public class GarbageMonitor implements Dumpable { if (mPids.contains(pid)) return; mPids.add(pid); - updatePidsArrayL(); + logPids(); mData.put(pid, new ProcessMemInfo(pid, name, start)); } } - private void updatePidsArrayL() { - final int N = mPids.size(); - mPidsArray = new int[N]; - StringBuffer sb = new StringBuffer("Now tracking processes: "); - for (int i = 0; i < N; i++) { - final int p = mPids.get(i).intValue(); - mPidsArray[i] = p; - sb.append(p); - sb.append(" "); - } - if (DEBUG) Log.v(TAG, sb.toString()); + private void logPids() { + if (DEBUG) { + StringBuffer sb = new StringBuffer("Now tracking processes: "); + for (int i = 0; i < mPids.size(); i++) { + final int p = mPids.get(i).intValue(); + sb.append(" "); + } + Log.v(TAG, sb.toString()); + } } private void update() { synchronized (mPids) { - Debug.MemoryInfo[] dinfos = mAm.getProcessMemoryInfo(mPidsArray); - for (int i = 0; i < dinfos.length; i++) { - Debug.MemoryInfo dinfo = dinfos[i]; - if (i > mPids.size()) { - if (DEBUG) Log.e(TAG, "update: unknown process info received: " + dinfo); + for (int i = 0; i < mPids.size(); i++) { + final int pid = mPids.get(i).intValue(); + // rssValues contains [VmRSS, RssFile, RssAnon, VmSwap]. + long[] rssValues = Process.getRss(pid); + if (rssValues == null && rssValues.length == 0) { + if (DEBUG) Log.e(TAG, "update: Process.getRss() didn't provide any values."); break; } - final long pid = mPids.get(i).intValue(); + long rss = rssValues[0]; final ProcessMemInfo info = mData.get(pid); - info.pss[info.head] = info.currentPss = dinfo.getTotalPss(); - info.uss[info.head] = info.currentUss = dinfo.getTotalPrivateDirty(); - info.head = (info.head + 1) % info.pss.length; - if (info.currentPss > info.max) info.max = info.currentPss; - if (info.currentUss > info.max) info.max = info.currentUss; - if (info.currentPss == 0) { - if (DEBUG) Log.v(TAG, "update: pid " + pid + " has pss=0, it probably died"); + info.rss[info.head] = info.currentRss = rss; + info.head = (info.head + 1) % info.rss.length; + if (info.currentRss > info.max) info.max = info.currentRss; + if (info.currentRss == 0) { + if (DEBUG) Log.v(TAG, "update: pid " + pid + " has rss=0, it probably died"); mData.remove(pid); } } @@ -217,7 +213,7 @@ public class GarbageMonitor implements Dumpable { final long pid = mPids.get(i).intValue(); if (mData.get(pid) == null) { mPids.remove(i); - updatePidsArrayL(); + logPids(); } } } @@ -270,7 +266,7 @@ public class GarbageMonitor implements Dumpable { private static class MemoryIconDrawable extends Drawable { - long pss, limit; + long rss, limit; final Drawable baseIcon; final Paint paint = new Paint(); final float dp; @@ -281,9 +277,9 @@ public class GarbageMonitor implements Dumpable { paint.setColor(QSTileImpl.getColorForState(context, STATE_ACTIVE)); } - public void setPss(long pss) { - if (pss != this.pss) { - this.pss = pss; + public void setRss(long rss) { + if (rss != this.rss) { + this.rss = rss; invalidateSelf(); } } @@ -299,8 +295,8 @@ public class GarbageMonitor implements Dumpable { public void draw(Canvas canvas) { baseIcon.draw(canvas); - if (limit > 0 && pss > 0) { - float frac = Math.min(1f, (float) pss / limit); + if (limit > 0 && rss > 0) { + float frac = Math.min(1f, (float) rss / limit); final Rect bounds = getBounds(); canvas.translate(bounds.left + 8 * dp, bounds.top + 5 * dp); @@ -361,10 +357,10 @@ public class GarbageMonitor implements Dumpable { } private static class MemoryGraphIcon extends QSTile.Icon { - long pss, limit; + long rss, limit; - public void setPss(long pss) { - this.pss = pss; + public void setRss(long rss) { + this.rss = rss; } public void setHeapLimit(long limit) { @@ -374,7 +370,7 @@ public class GarbageMonitor implements Dumpable { @Override public Drawable getDrawable(Context context) { final MemoryIconDrawable drawable = new MemoryIconDrawable(context); - drawable.setPss(pss); + drawable.setRss(rss); drawable.setLimit(limit); return drawable; } @@ -464,14 +460,14 @@ public class GarbageMonitor implements Dumpable { ? "Dumping..." : mContext.getString(R.string.heap_dump_tile_name); if (pmi != null) { - icon.setPss(pmi.currentPss); + icon.setRss(pmi.currentRss); state.secondaryLabel = String.format( - "pss: %s / %s", - formatBytes(pmi.currentPss * 1024), + "rss: %s / %s", + formatBytes(pmi.currentRss * 1024), formatBytes(gm.mHeapLimit * 1024)); } else { - icon.setPss(0); + icon.setRss(0); state.secondaryLabel = null; } state.icon = icon; @@ -481,8 +477,8 @@ public class GarbageMonitor implements Dumpable { refreshState(); } - public long getPss() { - return pmi != null ? pmi.currentPss : 0; + public long getRss() { + return pmi != null ? pmi.currentRss : 0; } public long getHeapLimit() { @@ -495,9 +491,8 @@ public class GarbageMonitor implements Dumpable { public long pid; public String name; public long startTime; - public long currentPss, currentUss; - public long[] pss = new long[HEAP_TRACK_HISTORY_LEN]; - public long[] uss = new long[HEAP_TRACK_HISTORY_LEN]; + public long currentRss; + public long[] rss = new long[HEAP_TRACK_HISTORY_LEN]; public long max = 1; public int head = 0; @@ -519,17 +514,12 @@ public class GarbageMonitor implements Dumpable { pw.print(name.replace('"', '-')); pw.print("\", \"start\": "); pw.print(startTime); - pw.print(", \"pss\": ["); - // write pss values starting from the oldest, which is pss[head], wrapping around to - // pss[(head-1) % pss.length] - for (int i = 0; i < pss.length; i++) { - if (i > 0) pw.print(","); - pw.print(pss[(head + i) % pss.length]); - } - pw.print("], \"uss\": ["); - for (int i = 0; i < uss.length; i++) { + pw.print(", \"rss\": ["); + // write rss values starting from the oldest, which is rss[head], wrapping around to + // rss[(head-1) % rss.length] + for (int i = 0; i < rss.length; i++) { if (i > 0) pw.print(","); - pw.print(uss[(head + i) % uss.length]); + pw.print(rss[(head + i) % rss.length]); } pw.println("] }"); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java index a245d4112798..cf778504190a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiBaseFragmentTest.java @@ -24,6 +24,7 @@ import android.testing.DexmakerShareClassLoaderRule; import androidx.test.InstrumentationRegistry; +import com.android.systemui.assist.AssistManager; import com.android.systemui.utils.leaks.LeakCheckedTest; import com.android.systemui.utils.leaks.LeakCheckedTest.SysuiLeakCheck; @@ -64,6 +65,7 @@ public abstract class SysuiBaseFragmentTest extends BaseFragmentTest { when(inst.getTargetContext()).thenThrow(new RuntimeException( "SysUI Tests should use SysuiTestCase#getContext or SysuiTestCase#mContext")); InstrumentationRegistry.registerInstance(inst, InstrumentationRegistry.getArguments()); + mDependency.injectMockDependency(AssistManager.class); } @After diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java index 7a09137b1ff8..2c85424bac79 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import android.content.Context; +import android.hardware.biometrics.Authenticator; import android.hardware.biometrics.BiometricPrompt; import android.os.Bundle; import android.test.suitebuilder.annotation.SmallTest; @@ -70,7 +71,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testOnAuthenticationSucceeded_noConfirmationRequired_sendsActionAuthenticated() { - initDialog(mContext, mCallback, new MockInjector()); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); // The onAuthenticated runnable is posted when authentication succeeds. mBiometricView.onAuthenticationSucceeded(); @@ -81,7 +82,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testOnAuthenticationSucceeded_confirmationRequired_updatesDialogContents() { - initDialog(mContext, mCallback, new MockInjector()); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); mBiometricView.setRequireConfirmation(true); mBiometricView.onAuthenticationSucceeded(); @@ -97,7 +98,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testPositiveButton_sendsActionAuthenticated() { Button button = new Button(mContext); - initDialog(mContext, mCallback, new MockInjector() { + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector() { @Override public Button getPositiveButton() { return button; @@ -114,7 +115,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testNegativeButton_beforeAuthentication_sendsActionButtonNegative() { Button button = new Button(mContext); - initDialog(mContext, mCallback, new MockInjector() { + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector() { @Override public Button getNegativeButton() { return button; @@ -131,7 +132,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testNegativeButton_whenPendingConfirmation_sendsActionUserCanceled() { Button button = new Button(mContext); - initDialog(mContext, mCallback, new MockInjector() { + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector() { @Override public Button getNegativeButton() { return button; @@ -149,7 +150,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testTryAgainButton_sendsActionTryAgain() { Button button = new Button(mContext); - initDialog(mContext, mCallback, new MockInjector() { + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector() { @Override public Button getTryAgainButton() { return button; @@ -165,7 +166,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testError_sendsActionError() { - initDialog(mContext, mCallback, new MockInjector()); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); final String testError = "testError"; mBiometricView.onError(testError); waitForIdleSync(); @@ -176,7 +177,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testBackgroundClicked_sendsActionUserCanceled() { - initDialog(mContext, mCallback, new MockInjector()); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); View view = new View(mContext); mBiometricView.setBackgroundView(view); @@ -186,7 +187,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testBackgroundClicked_afterAuthenticated_neverSendsUserCanceled() { - initDialog(mContext, mCallback, new MockInjector()); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); View view = new View(mContext); mBiometricView.setBackgroundView(view); @@ -197,8 +198,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { @Test public void testBackgroundClicked_whenSmallDialog_neverSendsUserCanceled() { - initDialog(mContext, mCallback, new MockInjector()); - mBiometricView.setPanelController(mPanelController); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector()); mBiometricView.updateSize(AuthDialog.SIZE_SMALL); View view = new View(mContext); @@ -213,7 +213,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { Button tryAgainButton = new Button(mContext); TextView indicatorView = new TextView(mContext); - initDialog(mContext, mCallback, new MockInjector() { + initDialog(mContext, false /* allowDeviceCredential */, mCallback, new MockInjector() { @Override public Button getTryAgainButton() { return tryAgainButton; @@ -249,16 +249,18 @@ public class AuthBiometricViewTest extends SysuiTestCase { // Create new dialog and restore the previous state into it Button tryAgainButton2 = new Button(mContext); TextView indicatorView2 = new TextView(mContext); - initDialog(mContext, mCallback, state, new MockInjector() { - @Override - public Button getTryAgainButton() { - return tryAgainButton2; - } - @Override - public TextView getIndicatorView() { - return indicatorView2; - } - }); + initDialog(mContext, false /* allowDeviceCredential */, mCallback, state, + new MockInjector() { + @Override + public Button getTryAgainButton() { + return tryAgainButton2; + } + + @Override + public TextView getIndicatorView() { + return indicatorView2; + } + }); mBiometricView.setRequireConfirmation(requireConfirmation); waitForIdleSync(); @@ -271,26 +273,51 @@ public class AuthBiometricViewTest extends SysuiTestCase { // dialog size is known. } - private Bundle buildBiometricPromptBundle() { + @Test + public void testNegativeButton_whenDeviceCredentialAllowed() throws InterruptedException { + Button negativeButton = new Button(mContext); + initDialog(mContext, true /* allowDeviceCredential */, mCallback, new MockInjector() { + @Override + public Button getNegativeButton() { + return negativeButton; + } + }); + + negativeButton.performClick(); + waitForIdleSync(); + + verify(mCallback).onAction(AuthBiometricView.Callback.ACTION_USE_DEVICE_CREDENTIAL); + } + + private Bundle buildBiometricPromptBundle(boolean allowDeviceCredential) { Bundle bundle = new Bundle(); bundle.putCharSequence(BiometricPrompt.KEY_TITLE, "Title"); - bundle.putCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT, "Negative"); + int authenticators = Authenticator.TYPE_BIOMETRIC; + if (allowDeviceCredential) { + authenticators |= Authenticator.TYPE_CREDENTIAL; + } else { + bundle.putCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT, "Negative"); + } + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); return bundle; } - private void initDialog(Context context, AuthBiometricView.Callback callback, + private void initDialog(Context context, boolean allowDeviceCredential, + AuthBiometricView.Callback callback, Bundle savedState, MockInjector injector) { mBiometricView = new TestableBiometricView(context, null, injector); - mBiometricView.setBiometricPromptBundle(buildBiometricPromptBundle()); + mBiometricView.setBiometricPromptBundle(buildBiometricPromptBundle(allowDeviceCredential)); mBiometricView.setCallback(callback); mBiometricView.restoreState(savedState); mBiometricView.onFinishInflateInternal(); mBiometricView.onAttachedToWindowInternal(); + + mBiometricView.setPanelController(mPanelController); } - private void initDialog(Context context, AuthBiometricView.Callback callback, - MockInjector injector) { - initDialog(context, callback, null /* savedState */, injector); + private void initDialog(Context context, boolean allowDeviceCredential, + AuthBiometricView.Callback callback, MockInjector injector) { + initDialog(context, allowDeviceCredential, callback, null /* savedState */, injector); } private class MockInjector extends AuthBiometricView.Injector { @@ -338,6 +365,16 @@ public class AuthBiometricViewTest extends SysuiTestCase { public int getDelayAfterError() { return 0; // Keep this at 0 for tests to invoke callback immediately. } + + @Override + public int getMediumToLargeAnimationDurationMs() { + return 0; + } + + @Override + public int getAnimateCredentialStartDelayMs() { + return 0; + } } private class TestableBiometricView extends AuthBiometricView { diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java index d4fc3f842e9d..990f74ae33c8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java @@ -16,12 +16,30 @@ package com.android.systemui.biometrics; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import android.content.Context; +import android.hardware.biometrics.Authenticator; +import android.hardware.biometrics.BiometricAuthenticator; +import android.hardware.biometrics.BiometricPrompt; +import android.os.Bundle; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.ScrollView; import com.android.systemui.SysuiTestCase; @@ -43,22 +61,21 @@ public class AuthContainerViewTest extends SysuiTestCase { @Before public void setup() { MockitoAnnotations.initMocks(this); - - AuthContainerView.Config config = new AuthContainerView.Config(); - config.mContext = mContext; - config.mCallback = mCallback; - mAuthContainer = new TestableAuthContainer(config); } @Test public void testActionAuthenticated_sendsDismissedAuthenticated() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + mAuthContainer.mBiometricCallback.onAction( AuthBiometricView.Callback.ACTION_AUTHENTICATED); - verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_AUTHENTICATED)); + verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED)); } @Test public void testActionUserCanceled_sendsDismissedUserCanceled() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + mAuthContainer.mBiometricCallback.onAction( AuthBiometricView.Callback.ACTION_USER_CANCELED); verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_USER_CANCELED)); @@ -66,6 +83,8 @@ public class AuthContainerViewTest extends SysuiTestCase { @Test public void testActionButtonNegative_sendsDismissedButtonNegative() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + mAuthContainer.mBiometricCallback.onAction( AuthBiometricView.Callback.ACTION_BUTTON_NEGATIVE); verify(mCallback).onDismissed(eq(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE)); @@ -73,6 +92,8 @@ public class AuthContainerViewTest extends SysuiTestCase { @Test public void testActionTryAgain_sendsTryAgain() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + mAuthContainer.mBiometricCallback.onAction( AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN); verify(mCallback).onTryAgainPressed(); @@ -80,14 +101,77 @@ public class AuthContainerViewTest extends SysuiTestCase { @Test public void testActionError_sendsDismissedError() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + mAuthContainer.mBiometricCallback.onAction( AuthBiometricView.Callback.ACTION_ERROR); verify(mCallback).onDismissed(AuthDialogCallback.DISMISSED_ERROR); } + @Test + public void testActionUseDeviceCredential_sendsOnDeviceCredentialPressed() { + initializeContainer( + Authenticator.TYPE_BIOMETRIC | Authenticator.TYPE_CREDENTIAL); + + mAuthContainer.mBiometricCallback.onAction( + AuthBiometricView.Callback.ACTION_USE_DEVICE_CREDENTIAL); + verify(mCallback).onDeviceCredentialPressed(); + + // Credential view is attached to the frame layout + waitForIdleSync(); + assertNotNull(mAuthContainer.mCredentialView); + verify(mAuthContainer.mFrameLayout).addView(eq(mAuthContainer.mCredentialView)); + } + + @Test + public void testAnimateToCredentialUI_invokesStartTransitionToCredentialUI() { + initializeContainer( + Authenticator.TYPE_BIOMETRIC | Authenticator.TYPE_CREDENTIAL); + + mAuthContainer.mBiometricView = mock(AuthBiometricView.class); + mAuthContainer.animateToCredentialUI(); + verify(mAuthContainer.mBiometricView).startTransitionToCredentialUI(); + } + + @Test + public void testShowBiometricUI() { + initializeContainer(Authenticator.TYPE_BIOMETRIC); + + assertNotEquals(null, mAuthContainer.mBiometricView); + + mAuthContainer.onAttachedToWindowInternal(); + verify(mAuthContainer.mBiometricScrollView).addView(mAuthContainer.mBiometricView); + // Credential view is not added + verify(mAuthContainer.mFrameLayout, never()).addView(any()); + } + + @Test + public void testShowCredentialUI_doesNotInflateBiometricUI() { + initializeContainer(Authenticator.TYPE_CREDENTIAL); + + mAuthContainer.onAttachedToWindowInternal(); + + assertNull(null, mAuthContainer.mBiometricView); + assertNotNull(mAuthContainer.mCredentialView); + verify(mAuthContainer.mFrameLayout).addView(mAuthContainer.mCredentialView); + } + + private void initializeContainer(int authenticators) { + AuthContainerView.Config config = new AuthContainerView.Config(); + config.mContext = mContext; + config.mCallback = mCallback; + config.mModalityMask |= BiometricAuthenticator.TYPE_FINGERPRINT; + + Bundle bundle = new Bundle(); + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + config.mBiometricPromptBundle = bundle; + + mAuthContainer = new TestableAuthContainer(config); + } + private class TestableAuthContainer extends AuthContainerView { TestableAuthContainer(AuthContainerView.Config config) { - super(config); + super(config, new MockInjector()); } @Override @@ -95,4 +179,32 @@ public class AuthContainerViewTest extends SysuiTestCase { mConfig.mCallback.onDismissed(reason); } } + + private final class MockInjector extends AuthContainerView.Injector { + @Override + public ScrollView getBiometricScrollView(FrameLayout parent) { + return mock(ScrollView.class); + } + + @Override + public FrameLayout inflateContainerView(LayoutInflater factory, ViewGroup root) { + return mock(FrameLayout.class); + } + + @Override + public AuthPanelController getPanelController(Context context, View view, + boolean isManagedProfile) { + return mock(AuthPanelController.class); + } + + @Override + public ImageView getBackgroundView(FrameLayout parent) { + return mock(ImageView.class); + } + + @Override + public View getPanelView(FrameLayout parent) { + return mock(View.class); + } + } } 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 eb7be4fa6332..dcdb5c3f8e9e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -22,8 +22,11 @@ import static junit.framework.TestCase.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; 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.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,6 +36,8 @@ import android.app.IActivityTaskManager; import android.content.ComponentName; import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.hardware.biometrics.Authenticator; +import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.IBiometricServiceReceiverInternal; import android.os.Bundle; @@ -69,7 +74,7 @@ public class AuthControllerTest extends SysuiTestCase { @Mock private AuthDialog mDialog2; - private TestableBiometricDialogImpl mBiometricDialogImpl; + private TestableAuthController mAuthController; @Before @@ -90,78 +95,90 @@ public class AuthControllerTest extends SysuiTestCase { when(mDialog1.getOpPackageName()).thenReturn("Dialog1"); when(mDialog2.getOpPackageName()).thenReturn("Dialog2"); - mBiometricDialogImpl = new TestableBiometricDialogImpl(new MockInjector()); - mBiometricDialogImpl.mContext = context; - mBiometricDialogImpl.mComponents = mContext.getComponents(); + when(mDialog1.isAllowDeviceCredentials()).thenReturn(false); + when(mDialog2.isAllowDeviceCredentials()).thenReturn(false); - mBiometricDialogImpl.start(); + mAuthController = new TestableAuthController(new MockInjector()); + mAuthController.mContext = context; + mAuthController.mComponents = mContext.getComponents(); + + mAuthController.start(); } // Callback tests @Test public void testSendsReasonUserCanceled_whenDismissedByUserCancel() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED); verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL); } @Test public void testSendsReasonNegative_whenDismissedByButtonNegative() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE); verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_NEGATIVE); } @Test public void testSendsReasonConfirmed_whenDismissedByButtonPositive() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE); - verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_CONFIRMED); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE); + verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED); } @Test public void testSendsReasonConfirmNotRequired_whenDismissedByAuthenticated() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_AUTHENTICATED); - verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED); + verify(mReceiver).onDialogDismissed( + BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED); } @Test public void testSendsReasonError_whenDismissedByError() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_ERROR); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_ERROR); verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_ERROR); } @Test - public void testSendsReasonDismissedBySystemServer_whenDismissedByServer() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onDismissed(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER); + public void testSendsReasonServerRequested_whenDismissedByServer() throws Exception { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER); verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED); } + @Test + public void testSendsReasonCredentialConfirmed_whenDeviceCredentialAuthenticated() + throws Exception { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onDismissed(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED); + verify(mReceiver).onDialogDismissed(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED); + } + // Statusbar tests @Test public void testShowInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); verify(mDialog1).show(any(), any()); } @Test - public void testOnAuthenticationSucceededInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.onBiometricAuthenticated(true, null /* failureReason */); + public void testOnAuthenticationSucceededInvoked_whenSystemRequested() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.onBiometricAuthenticated(true, null /* failureReason */); verify(mDialog1).onAuthenticationSucceeded(); } @Test - public void testOnAuthenticationFailedInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + public void testOnAuthenticationFailedInvoked_whenSystemRequested() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); final String failureReason = "failure reason"; - mBiometricDialogImpl.onBiometricAuthenticated(false, failureReason); + mAuthController.onBiometricAuthenticated(false, failureReason); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mDialog1).onAuthenticationFailed(captor.capture()); @@ -170,10 +187,10 @@ public class AuthControllerTest extends SysuiTestCase { } @Test - public void testOnHelpInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + public void testOnHelpInvoked_whenSystemRequested() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); final String helpMessage = "help"; - mBiometricDialogImpl.onBiometricHelp(helpMessage); + mAuthController.onBiometricHelp(helpMessage); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mDialog1).onHelp(captor.capture()); @@ -182,10 +199,11 @@ public class AuthControllerTest extends SysuiTestCase { } @Test - public void testOnErrorInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + public void testOnErrorInvoked_whenSystemRequested() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + final int error = 1; final String errMessage = "error message"; - mBiometricDialogImpl.onBiometricError(errMessage); + mAuthController.onBiometricError(error, errMessage); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mDialog1).onError(captor.capture()); @@ -194,30 +212,82 @@ public class AuthControllerTest extends SysuiTestCase { } @Test - public void testDismissWithoutCallbackInvoked_whenSystemRequested() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.hideBiometricDialog(); + public void testErrorLockout_whenCredentialAllowed_AnimatesToCredentialUI() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + final int error = BiometricConstants.BIOMETRIC_ERROR_LOCKOUT; + final String errorString = "lockout"; + + when(mDialog1.isAllowDeviceCredentials()).thenReturn(true); + + mAuthController.onBiometricError(error, errorString); + verify(mDialog1, never()).onError(anyString()); + verify(mDialog1).animateToCredentialUI(); + } + + @Test + public void testErrorLockoutPermanent_whenCredentialAllowed_AnimatesToCredentialUI() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + final int error = BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT; + final String errorString = "lockout_permanent"; + + when(mDialog1.isAllowDeviceCredentials()).thenReturn(true); + + mAuthController.onBiometricError(error, errorString); + verify(mDialog1, never()).onError(anyString()); + verify(mDialog1).animateToCredentialUI(); + } + + @Test + public void testErrorLockout_whenCredentialNotAllowed_sendsOnError() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + final int error = BiometricConstants.BIOMETRIC_ERROR_LOCKOUT; + final String errorString = "lockout"; + + when(mDialog1.isAllowDeviceCredentials()).thenReturn(false); + + mAuthController.onBiometricError(error, errorString); + verify(mDialog1).onError(eq(errorString)); + verify(mDialog1, never()).animateToCredentialUI(); + } + + @Test + public void testErrorLockoutPermanent_whenCredentialNotAllowed_sendsOnError() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + final int error = BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT; + final String errorString = "lockout_permanent"; + + when(mDialog1.isAllowDeviceCredentials()).thenReturn(false); + + mAuthController.onBiometricError(error, errorString); + verify(mDialog1).onError(eq(errorString)); + verify(mDialog1, never()).animateToCredentialUI(); + } + + @Test + public void testDismissWithoutCallbackInvoked_whenSystemRequested() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.hideAuthenticationDialog(); verify(mDialog1).dismissFromSystemServer(); } @Test - public void testClientNotified_whenDismissedBySystemServer() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); - mBiometricDialogImpl.hideBiometricDialog(); + public void testClientNotified_whenDismissedBySystemServer() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); + mAuthController.hideAuthenticationDialog(); verify(mDialog1).dismissFromSystemServer(); - assertNotNull(mBiometricDialogImpl.mCurrentDialog); - assertNotNull(mBiometricDialogImpl.mReceiver); + assertNotNull(mAuthController.mCurrentDialog); + assertNotNull(mAuthController.mReceiver); } // Corner case tests @Test - public void testShowNewDialog_beforeOldDialogDismissed_SkipsAnimations() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + public void testShowNewDialog_beforeOldDialogDismissed_SkipsAnimations() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); verify(mDialog1).show(any(), any()); - showDialog(BiometricPrompt.TYPE_FACE); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); // First dialog should be dismissed without animation verify(mDialog1).dismissWithoutCallback(eq(false) /* animate */); @@ -227,11 +297,20 @@ public class AuthControllerTest extends SysuiTestCase { } @Test - public void testConfigurationPersists_whenOnConfigurationChanged() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + public void testConfigurationPersists_whenOnConfigurationChanged() { + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); verify(mDialog1).show(any(), any()); - mBiometricDialogImpl.onConfigurationChanged(new Configuration()); + // Return that the UI is in "showing" state + doAnswer(invocation -> { + Object[] args = invocation.getArguments(); + Bundle savedState = (Bundle) args[0]; + savedState.putInt( + AuthDialog.KEY_CONTAINER_STATE, AuthContainerView.STATE_SHOWING); + return null; // onSaveState returns void + }).when(mDialog1).onSaveState(any()); + + mAuthController.onConfigurationChanged(new Configuration()); ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class); verify(mDialog1).onSaveState(captor.capture()); @@ -248,37 +327,63 @@ public class AuthControllerTest extends SysuiTestCase { } @Test + public void testConfigurationPersists_whenBiometricFallbackToCredential() { + showDialog(Authenticator.TYPE_CREDENTIAL | Authenticator.TYPE_BIOMETRIC, + BiometricPrompt.TYPE_FACE); + verify(mDialog1).show(any(), any()); + + // Pretend that the UI is now showing device credential UI. + doAnswer(invocation -> { + Object[] args = invocation.getArguments(); + Bundle savedState = (Bundle) args[0]; + savedState.putInt( + AuthDialog.KEY_CONTAINER_STATE, AuthContainerView.STATE_SHOWING); + savedState.putBoolean(AuthDialog.KEY_CREDENTIAL_SHOWING, true); + return null; // onSaveState returns void + }).when(mDialog1).onSaveState(any()); + + mAuthController.onConfigurationChanged(new Configuration()); + + // Check that the new dialog was initialized to the credential UI. + ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class); + verify(mDialog2).show(any(), captor.capture()); + assertEquals(Authenticator.TYPE_CREDENTIAL, + mAuthController.mLastBiometricPromptBundle + .getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + } + + @Test public void testClientNotified_whenTaskStackChangesDuringAuthentication() throws Exception { - showDialog(BiometricPrompt.TYPE_FACE); + showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE); List<ActivityManager.RunningTaskInfo> tasks = new ArrayList<>(); ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class); taskInfo.topActivity = mock(ComponentName.class); when(taskInfo.topActivity.getPackageName()).thenReturn("other_package"); tasks.add(taskInfo); - when(mBiometricDialogImpl.mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks); + when(mAuthController.mActivityTaskManager.getTasks(anyInt())).thenReturn(tasks); - mBiometricDialogImpl.mTaskStackListener.onTaskStackChanged(); + mAuthController.mTaskStackListener.onTaskStackChanged(); waitForIdleSync(); - assertNull(mBiometricDialogImpl.mCurrentDialog); - assertNull(mBiometricDialogImpl.mReceiver); + assertNull(mAuthController.mCurrentDialog); + assertNull(mAuthController.mReceiver); verify(mDialog1).dismissWithoutCallback(true /* animate */); verify(mReceiver).onDialogDismissed(eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL)); } // Helpers - private void showDialog(int type) { - mBiometricDialogImpl.showBiometricDialog(createTestDialogBundle(), + private void showDialog(int authenticators, int biometricModality) { + mAuthController.showAuthenticationDialog(createTestDialogBundle(authenticators), mReceiver /* receiver */, - type, + biometricModality, true /* requireConfirmation */, 0 /* userId */, "testPackage"); } - private Bundle createTestDialogBundle() { + private Bundle createTestDialogBundle(int authenticators) { Bundle bundle = new Bundle(); bundle.putCharSequence(BiometricPrompt.KEY_TITLE, "Title"); @@ -290,13 +395,16 @@ public class AuthControllerTest extends SysuiTestCase { // by user settings, and should be tested in BiometricService. bundle.putBoolean(BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true); + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + return bundle; } - private final class TestableBiometricDialogImpl extends AuthController { + private final class TestableAuthController extends AuthController { private int mBuildCount = 0; + private Bundle mLastBiometricPromptBundle; - public TestableBiometricDialogImpl(Injector injector) { + public TestableAuthController(Injector injector) { super(injector); } @@ -304,6 +412,9 @@ public class AuthControllerTest extends SysuiTestCase { protected AuthDialog buildDialog(Bundle biometricPromptBundle, boolean requireConfirmation, int userId, int type, String opPackageName, boolean skipIntro) { + + mLastBiometricPromptBundle = biometricPromptBundle; + AuthDialog dialog; if (mBuildCount == 0) { dialog = mDialog1; diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java index 2798c6b56771..5a2b5e38222a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java @@ -33,6 +33,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -91,7 +92,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper(setAsMainLooper = true) public class BubbleControllerTest extends SysuiTestCase { - @Mock private NotificationEntryManager mNotificationEntryManager; @Mock @@ -223,13 +223,13 @@ public class BubbleControllerTest extends SysuiTestCase { mBubbleController.updateBubble(mRow.getEntry()); assertNotNull(mBubbleData.getBubbleWithKey(mRow.getEntry().key)); assertTrue(mBubbleController.hasBubbles()); - verify(mNotificationEntryManager).updateNotifications(); + verify(mNotificationEntryManager).updateNotifications(any()); verify(mBubbleStateChangeListener).onHasBubblesChanged(true); mBubbleController.removeBubble(mRow.getEntry().key, BubbleController.DISMISS_USER_GESTURE); assertFalse(mStatusBarWindowController.getBubblesShowing()); assertNull(mBubbleData.getBubbleWithKey(mRow.getEntry().key)); - verify(mNotificationEntryManager, times(2)).updateNotifications(); + verify(mNotificationEntryManager, times(2)).updateNotifications(anyString()); verify(mBubbleStateChangeListener).onHasBubblesChanged(false); } @@ -257,16 +257,16 @@ public class BubbleControllerTest extends SysuiTestCase { @Test public void testDismissStack() { mBubbleController.updateBubble(mRow.getEntry()); - verify(mNotificationEntryManager, times(1)).updateNotifications(); + verify(mNotificationEntryManager, times(1)).updateNotifications(any()); assertNotNull(mBubbleData.getBubbleWithKey(mRow.getEntry().key)); mBubbleController.updateBubble(mRow2.getEntry()); - verify(mNotificationEntryManager, times(2)).updateNotifications(); + verify(mNotificationEntryManager, times(2)).updateNotifications(any()); assertNotNull(mBubbleData.getBubbleWithKey(mRow2.getEntry().key)); assertTrue(mBubbleController.hasBubbles()); mBubbleController.dismissStack(BubbleController.DISMISS_USER_GESTURE); assertFalse(mStatusBarWindowController.getBubblesShowing()); - verify(mNotificationEntryManager, times(3)).updateNotifications(); + verify(mNotificationEntryManager, times(3)).updateNotifications(any()); assertNull(mBubbleData.getBubbleWithKey(mRow.getEntry().key)); assertNull(mBubbleData.getBubbleWithKey(mRow2.getEntry().key)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java index 07fbbcf4f152..77520140b1a3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java @@ -60,6 +60,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; +import java.util.Objects; import javax.inject.Provider; @@ -190,8 +191,7 @@ public class QSTileHostTest extends SysuiTestCase { // changed String newSetting = Settings.Secure.getStringForUser(getContext().getContentResolver(), TILES_SETTING, ActivityManager.getCurrentUser()); - // newSetting is not null, as it has just been set. - if (!newSetting.equals(previousSetting)) { + if (!Objects.equals(newSetting, previousSetting)) { onTuningChanged(TILES_SETTING, newSetting); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java index b252a0d95f94..1bd01e166ddb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -367,12 +367,13 @@ public class CommandQueueTest extends SysuiTestCase { } @Test - public void testShowBiometricDialog() { + public void testShowAuthenticationDialog() { Bundle bundle = new Bundle(); String packageName = "test"; - mCommandQueue.showBiometricDialog(bundle, null /* receiver */, 1, true, 3, packageName); + mCommandQueue.showAuthenticationDialog(bundle, null /* receiver */, 1, true, 3, + packageName); waitForIdleSync(); - verify(mCallbacks).showBiometricDialog(eq(bundle), eq(null), eq(1), eq(true), eq(3), + verify(mCallbacks).showAuthenticationDialog(eq(bundle), eq(null), eq(1), eq(true), eq(3), eq(packageName)); } @@ -394,16 +395,17 @@ public class CommandQueueTest extends SysuiTestCase { @Test public void testOnBiometricError() { + final int errorCode = 1; String errorMessage = "test_error_message"; - mCommandQueue.onBiometricError(errorMessage); + mCommandQueue.onBiometricError(errorCode, errorMessage); waitForIdleSync(); - verify(mCallbacks).onBiometricError(eq(errorMessage)); + verify(mCallbacks).onBiometricError(eq(errorCode), eq(errorMessage)); } @Test - public void testHideBiometricDialog() { - mCommandQueue.hideBiometricDialog(); + public void testHideAuthenticationDialog() { + mCommandQueue.hideAuthenticationDialog(); waitForIdleSync(); - verify(mCallbacks).hideBiometricDialog(); + verify(mCallbacks).hideAuthenticationDialog(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NavigationBarControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NavigationBarControllerTest.java index 618272cbcab0..cfa4065aed62 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NavigationBarControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NavigationBarControllerTest.java @@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -31,15 +32,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import android.content.Context; -import android.hardware.display.DisplayManager; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.util.SparseArray; -import android.view.Display; -import android.view.WindowManager; import androidx.test.filters.SmallTest; @@ -59,7 +55,6 @@ import org.junit.runner.RunWith; public class NavigationBarControllerTest extends SysuiTestCase { private NavigationBarController mNavigationBarController; - private Display mDisplay; private NavigationBarFragment mDefaultNavBar; private NavigationBarFragment mSecondaryNavBar; @@ -89,37 +84,28 @@ public class NavigationBarControllerTest extends SysuiTestCase { @After public void tearDown() { mNavigationBarController = null; - mDisplay = null; mDefaultNavBar = null; mSecondaryNavBar = null; } @Test public void testCreateNavigationBarsIncludeDefaultTrue() { - initializeDisplayManager(); doNothing().when(mNavigationBarController).createNavigationBar(any(), any()); mNavigationBarController.createNavigationBars(true, null); - verify(mNavigationBarController).createNavigationBar(any(Display.class), any()); + verify(mNavigationBarController).createNavigationBar( + argThat(display -> display.getDisplayId() == DEFAULT_DISPLAY), any()); } @Test public void testCreateNavigationBarsIncludeDefaultFalse() { - initializeDisplayManager(); doNothing().when(mNavigationBarController).createNavigationBar(any(), any()); mNavigationBarController.createNavigationBars(false, null); - verify(mNavigationBarController, never()).createNavigationBar(any(), any()); - } - - private void initializeDisplayManager() { - DisplayManager displayManager = mock(DisplayManager.class); - mDisplay = mContext.getSystemService(WindowManager.class).getDefaultDisplay(); - Display[] displays = {mDisplay}; - when(displayManager.getDisplays()).thenReturn(displays); - mContext.addMockSystemService(Context.DISPLAY_SERVICE, displayManager); + verify(mNavigationBarController, never()).createNavigationBar( + argThat(display -> display.getDisplayId() == DEFAULT_DISPLAY), any()); } // Tests if NPE occurs when call checkNavBarModes() with invalid display. diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java index a02764320b6c..0569c55981fb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerTest.java @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -99,7 +100,7 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { @Test public void testLockScreenShowNotificationsChangeUpdatesNotifications() { mLockscreenUserManager.getLockscreenSettingsObserverForTest().onChange(false); - verify(mEntryManager, times(1)).updateNotifications(); + verify(mEntryManager, times(1)).updateNotifications(anyString()); } @Test @@ -138,7 +139,7 @@ public class NotificationLockscreenUserManagerTest extends SysuiTestCase { public void testSettingsObserverUpdatesNotifications() { when(mDeviceProvisionedController.isDeviceProvisioned()).thenReturn(true); mLockscreenUserManager.getSettingsObserverForTest().onChange(false); - verify(mEntryManager, times(1)).updateNotifications(); + verify(mEntryManager, times(1)).updateNotifications(anyString()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimatorTest.java index 55583931af43..145a25caf95d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimatorTest.java @@ -17,11 +17,8 @@ package com.android.systemui.statusbar.notification; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,23 +27,20 @@ import android.app.ActivityManager; import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; -import android.testing.TestableLooper.RunWithLooper; import android.view.RemoteAnimationAdapter; import android.view.View; -import android.widget.FrameLayout; import com.android.systemui.SysuiTestCase; -import com.android.systemui.statusbar.NotificationTestHelper; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.phone.NotificationPanelView; import com.android.systemui.statusbar.phone.StatusBarWindowView; +import com.android.systemui.statusbar.phone.StatusBarWindowViewController; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.stubbing.Answer; @SmallTest @RunWith(AndroidTestingRunner.class) @@ -55,6 +49,8 @@ public class ActivityLaunchAnimatorTest extends SysuiTestCase { private ActivityLaunchAnimator mLaunchAnimator; private ActivityLaunchAnimator.Callback mCallback = mock(ActivityLaunchAnimator.Callback.class); + private StatusBarWindowViewController mStatusBarWindowViewController = mock( + StatusBarWindowViewController.class); private StatusBarWindowView mStatusBarWindowView = mock(StatusBarWindowView.class); private NotificationListContainer mNotificationContainer = mock(NotificationListContainer.class); @@ -62,10 +58,11 @@ public class ActivityLaunchAnimatorTest extends SysuiTestCase { @Before public void setUp() throws Exception { + when(mStatusBarWindowViewController.getView()).thenReturn(mStatusBarWindowView); when(mStatusBarWindowView.getResources()).thenReturn(mContext.getResources()); when(mCallback.areLaunchAnimationsEnabled()).thenReturn(true); mLaunchAnimator = new ActivityLaunchAnimator( - mStatusBarWindowView, + mStatusBarWindowViewController, mCallback, mock(NotificationPanelView.class), mNotificationContainer); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java index 52f7e679b49c..e52a25806086 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; @@ -68,6 +69,7 @@ import com.android.systemui.statusbar.NotificationEntryBuilder; import com.android.systemui.statusbar.NotificationLifetimeExtender; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; +import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationRemoveInterceptor; @@ -79,6 +81,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationData.K import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationRowBinder; import com.android.systemui.statusbar.notification.collection.NotificationRowBinderImpl; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; @@ -145,7 +148,8 @@ public class NotificationEntryManagerTest extends SysuiTestCase { private final CountDownLatch mCountDownLatch; TestableNotificationEntryManager() { - super(new NotificationData(mock(NotificationSectionsFeatureManager.class))); + super(new NotificationData(mock(NotificationSectionsFeatureManager.class), + mock(NotifLog.class)), mock(NotifLog.class)); mCountDownLatch = new CountDownLatch(1); } @@ -224,6 +228,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase { mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger); mDependency.injectTestDependency(SmartReplyController.class, mSmartReplyController); mDependency.injectTestDependency(KeyguardEnvironment.class, mEnvironment); + mDependency.injectMockDependency(NotificationMediaManager.class); mCountDownLatch = new CountDownLatch(1); @@ -257,7 +262,9 @@ public class NotificationEntryManagerTest extends SysuiTestCase { NotificationRowBinderImpl notificationRowBinder = new NotificationRowBinderImpl(mContext, true, /* allowLongPress */ - mock(KeyguardBypassController.class), mock(StatusBarStateController.class)); + mock(KeyguardBypassController.class), + mock(StatusBarStateController.class), + mock(NotifLog.class)); notificationRowBinder.setUpWithPresenter( mPresenter, mListContainer, mHeadsUpManager, mEntryManager, mBindCallback); notificationRowBinder.setNotificationClicker(mock(NotificationClicker.class)); @@ -348,7 +355,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase { // Ensure that update callbacks happen in correct order InOrder order = inOrder(mEntryListener, notifData, mPresenter, mEntryListener); order.verify(mEntryListener).onPreEntryUpdated(mEntry); - order.verify(notifData).filterAndSort(); + order.verify(notifData).filterAndSort(anyString()); order.verify(mPresenter).updateNotificationViews(); order.verify(mEntryListener).onPostEntryUpdated(mEntry); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java index 6d275419ee94..8207a041ef50 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationListControllerTest.java @@ -21,6 +21,7 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -43,6 +44,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.NotificationEntryBuilder; import com.android.systemui.statusbar.notification.collection.NotificationData; import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; @@ -76,7 +78,7 @@ public class NotificationListControllerTest extends SysuiTestCase { // TODO: Remove this once EntryManager no longer needs to be mocked private NotificationData mNotificationData = new NotificationData(new NotificationSectionsFeatureManager( - new DeviceConfigProxyFake(), mContext)); + new DeviceConfigProxyFake(), mContext), mock(NotifLog.class)); private int mNextNotifId = 0; @@ -113,7 +115,7 @@ public class NotificationListControllerTest extends SysuiTestCase { @Test public void testCallUpdateNotificationsOnDeviceProvisionedChange() { mProvisionedListener.onDeviceProvisionedChanged(); - verify(mEntryManager).updateNotifications(); + verify(mEntryManager).updateNotifications(anyString()); } @Test @@ -133,8 +135,8 @@ public class NotificationListControllerTest extends SysuiTestCase { // THEN the app op is added to the entry assertTrue(entry.mActiveAppOps.contains(AppOpsManager.OP_CAMERA)); - // THEN updateNotifications() is called - verify(mEntryManager, times(1)).updateNotifications(); + // THEN updateNotifications(TEST) is called + verify(mEntryManager, times(1)).updateNotifications(anyString()); } @Test @@ -146,8 +148,8 @@ public class NotificationListControllerTest extends SysuiTestCase { // WHEN An unrelated notification gets a new app op mController.updateNotificationsForAppOp(AppOpsManager.OP_CAMERA, 1000, "pkg", true); - // THEN We never call updateNotifications() - verify(mEntryManager, never()).updateNotifications(); + // THEN We never call updateNotifications(TEST) + verify(mEntryManager, never()).updateNotifications(anyString()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java index 5fbacb1d7adf..59c76a8cbb77 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotificationDataTest.java @@ -79,6 +79,7 @@ import com.android.systemui.statusbar.RankingBuilder; import com.android.systemui.statusbar.SbnBuilder; import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager; import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.phone.NotificationGroupManager; import com.android.systemui.statusbar.phone.ShadeController; @@ -141,7 +142,7 @@ public class NotificationDataTest extends SysuiTestCase { when(mEnvironment.isNotificationForCurrentProfiles(any())).thenReturn(true); mNotificationData = new TestableNotificationData( mock(NotificationSectionsFeatureManager.class)); - mNotificationData.updateRanking(mock(NotificationListenerService.RankingMap.class)); + mNotificationData.updateRanking(mock(NotificationListenerService.RankingMap.class), ""); mRow = new NotificationTestHelper(getContext()).createRow(); Dependency.get(InitController.class).executePostInitTasks(); } @@ -633,7 +634,7 @@ public class NotificationDataTest extends SysuiTestCase { public static class TestableNotificationData extends NotificationData { public TestableNotificationData(NotificationSectionsFeatureManager sectionsFeatureManager) { - super(sectionsFeatureManager); + super(sectionsFeatureManager, mock(NotifLog.class)); } public static final String OVERRIDE_RANK = "r"; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManagerTest.java index 6d6439532912..cc89504cb54d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationBlockingHelperManagerTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -62,7 +63,6 @@ import org.mockito.MockitoAnnotations; @org.junit.runner.RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper public class NotificationBlockingHelperManagerTest extends SysuiTestCase { - private NotificationBlockingHelperManager mBlockingHelperManager; private NotificationTestHelper mHelper; @@ -112,7 +112,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { assertTrue(mBlockingHelperManager.dismissCurrentBlockingHelper()); assertTrue(mBlockingHelperManager.isBlockingHelperRowNull()); - verify(mEntryManager, times(0)).updateNotifications(); + verify(mEntryManager, times(0)).updateNotifications(anyString()); } @Test @@ -125,7 +125,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { assertTrue(mBlockingHelperManager.dismissCurrentBlockingHelper()); assertTrue(mBlockingHelperManager.isBlockingHelperRowNull()); - verify(mEntryManager).updateNotifications(); + verify(mEntryManager).updateNotifications(anyString()); } @Test @@ -267,7 +267,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { assertTrue(mBlockingHelperManager.dismissCurrentBlockingHelper()); assertTrue(mBlockingHelperManager.isBlockingHelperRowNull()); - verify(mEntryManager).updateNotifications(); + verify(mEntryManager).updateNotifications(anyString()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java index f1da4e8a2905..95e9e67cb830 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java @@ -40,8 +40,8 @@ import com.android.keyguard.KeyguardStatusView; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SystemUIFactory; import com.android.systemui.SysuiTestCase; -import com.android.systemui.doze.DozeLog; import com.android.systemui.classifier.FalsingManagerFake; +import com.android.systemui.doze.DozeLog; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.shared.plugins.PluginManager; @@ -52,7 +52,11 @@ import com.android.systemui.statusbar.PulseExpansionHandler; import com.android.systemui.statusbar.StatusBarStateControllerImpl; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.notification.DynamicPrivacyController; +import com.android.systemui.statusbar.notification.NotificationEntryManager; +import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager; import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; +import com.android.systemui.statusbar.notification.collection.NotificationData; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.policy.ConfigurationController; @@ -122,8 +126,6 @@ public class NotificationPanelViewTest extends SysuiTestCase { mDependency.injectTestDependency(StatusBarStateController.class, mStatusBarStateController); mDependency.injectTestDependency(KeyguardUpdateMonitor.class, mUpdateMonitor); - mDependency.injectMockDependency(ShadeController.class); - mDependency.injectMockDependency(NotificationLockscreenUserManager.class); mDependency.injectMockDependency(ConfigurationController.class); mDependency.injectMockDependency(ZenModeController.class); NotificationWakeUpCoordinator coordinator = @@ -217,12 +219,23 @@ public class NotificationPanelViewTest extends SysuiTestCase { TestableNotificationPanelView(NotificationWakeUpCoordinator coordinator, PulseExpansionHandler expansionHandler, KeyguardBypassController bypassController) { - super(NotificationPanelViewTest.this.mContext, null, + super( + NotificationPanelViewTest.this.mContext, + null, new InjectionInflationController( SystemUIFactory.getInstance().getRootComponent()), - coordinator, expansionHandler, mock(DynamicPrivacyController.class), + coordinator, + expansionHandler, + mock(DynamicPrivacyController.class), bypassController, - mFalsingManager, mock(PluginManager.class), mock(DozeLog.class)); + mFalsingManager, + mock(PluginManager.class), + mock(ShadeController.class), + mock(NotificationLockscreenUserManager.class), + new NotificationEntryManager(new NotificationData(mock( + NotificationSectionsFeatureManager.class), mock(NotifLog.class)), + mock(NotifLog.class)), + mock(DozeLog.class)); mNotificationStackScroller = mNotificationStackScrollLayout; mKeyguardStatusView = NotificationPanelViewTest.this.mKeyguardStatusView; mKeyguardStatusBar = NotificationPanelViewTest.this.mKeyguardStatusBar; 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 2631ced77972..12e9be15354f 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 @@ -117,6 +117,7 @@ import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator import com.android.systemui.statusbar.notification.VisualStabilityManager; import com.android.systemui.statusbar.notification.collection.NotificationData; import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.notification.logging.NotifLog; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; @@ -216,6 +217,9 @@ public class StatusBarTest extends SysuiTestCase { @Mock private NotificationGroupAlertTransferHelper mGroupAlertTransferHelper; @Mock private StatusBarWindowController mStatusBarWindowController; @Mock private NotificationIconAreaController mNotificationIconAreaController; + @Mock private StatusBarWindowViewController.Builder mStatusBarWindowViewControllerBuilder; + @Mock private StatusBarWindowViewController mStatusBarWindowViewController; + @Mock private NotifLog mNotifLog; @Before public void setup() throws Exception { @@ -278,6 +282,9 @@ public class StatusBarTest extends SysuiTestCase { when(mColorExtractor.getNeutralColors()).thenReturn(mGradientColors); ConfigurationController configurationController = new ConfigurationControllerImpl(mContext); + when(mStatusBarWindowViewControllerBuilder.build()) + .thenReturn(mStatusBarWindowViewController); + mStatusBar = new StatusBar( mLightBarController, mAutoHideController, @@ -333,7 +340,9 @@ public class StatusBarTest extends SysuiTestCase { mAssistManager, mNotificationListener, configurationController, - mStatusBarWindowController); + mStatusBarWindowController, + mStatusBarWindowViewControllerBuilder, + mNotifLog); // TODO: we should be able to call mStatusBar.start() and have all the below values // initialized automatically. mStatusBar.mContext = mContext; @@ -351,6 +360,7 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.mPowerManager = mPowerManager; mStatusBar.mBarService = mBarService; mStatusBar.mStackScroller = mStackScroller; + mStatusBar.mStatusBarWindowViewController = mStatusBarWindowViewController; mStatusBar.putComponent(StatusBar.class, mStatusBar); Dependency.get(InitController.class).executePostInitTasks(); entryManager.setUpForTest(mock(NotificationPresenter.class), mStackScroller, @@ -784,11 +794,11 @@ public class StatusBarTest extends SysuiTestCase { // Starting a pulse while docking should suppress wakeup gesture mStatusBar.mDozeServiceHost.pulseWhileDozing(mock(DozeHost.PulseCallback.class), DozeEvent.PULSE_REASON_DOCKING); - verify(mStatusBarWindowView).suppressWakeUpGesture(eq(true)); + verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(true)); // Ending a pulse should restore wakeup gesture pulseCallback[0].onPulseFinished(); - verify(mStatusBarWindowView).suppressWakeUpGesture(eq(false)); + verify(mStatusBarWindowViewController).suppressWakeUpGesture(eq(false)); } @Test @@ -866,7 +876,7 @@ public class StatusBarTest extends SysuiTestCase { public static class TestableNotificationEntryManager extends NotificationEntryManager { public TestableNotificationEntryManager(NotificationData notificationData) { - super(notificationData); + super(notificationData, mock(NotifLog.class)); } public void setUpForTest(NotificationPresenter presenter, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java index 00d87c399293..9f4dfb4453fc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java @@ -16,55 +16,89 @@ package com.android.systemui.statusbar.phone; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemClock; +import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.view.MotionEvent; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; -import com.android.systemui.Dependency; +import com.android.systemui.SystemUIFactory; import com.android.systemui.SysuiTestCase; -import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.classifier.FalsingManagerFake; +import com.android.systemui.doze.DozeLog; +import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.statusbar.DragDownHelper; -import com.android.systemui.statusbar.StatusBarState; -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout; +import com.android.systemui.statusbar.NotificationLockscreenUserManager; +import com.android.systemui.statusbar.PulseExpansionHandler; +import com.android.systemui.statusbar.notification.DynamicPrivacyController; +import com.android.systemui.statusbar.notification.NotificationEntryManager; +import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; +import com.android.systemui.tuner.TunerService; +import com.android.systemui.util.InjectionInflationController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) -@TestableLooper.RunWithLooper +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) @SmallTest public class StatusBarWindowViewTest extends SysuiTestCase { private StatusBarWindowView mView; - private StatusBar mStatusBar; - private DragDownHelper mDragDownHelper; - private NotificationStackScrollLayout mStackScrollLayout; + private StatusBarWindowViewController mController; + + @Mock private NotificationWakeUpCoordinator mCoordinator; + @Mock private PulseExpansionHandler mPulseExpansionHandler; + @Mock private DynamicPrivacyController mDynamicPrivacyController; + @Mock private KeyguardBypassController mBypassController; + @Mock private PluginManager mPluginManager; + @Mock private TunerService mTunerService; + @Mock private DragDownHelper mDragDownHelper; + @Mock private ShadeController mShadeController; + @Mock private NotificationLockscreenUserManager mNotificationLockScreenUserManager; + @Mock private NotificationEntryManager mNotificationEntryManager; + @Mock private StatusBar mStatusBar; + @Mock private DozeLog mDozeLog; @Before public void setUp() { - mDependency.injectMockDependency(StatusBarStateController.class); - mView = spy(new StatusBarWindowView(getContext(), null)); - mStackScrollLayout = mock(NotificationStackScrollLayout.class); - when(mView.getStackScrollLayout()).thenReturn(mStackScrollLayout); - mStatusBar = mock(StatusBar.class); - mView.setService(mStatusBar); - mDragDownHelper = mock(DragDownHelper.class); - mView.setDragDownHelper(mDragDownHelper); + MockitoAnnotations.initMocks(this); + + mView = new StatusBarWindowView(getContext(), null); + mContext.putComponent(StatusBar.class, mStatusBar); + when(mStatusBar.isDozing()).thenReturn(false); + mDependency.injectTestDependency(ShadeController.class, mShadeController); + + mController = new StatusBarWindowViewController.Builder( + new InjectionInflationController( + SystemUIFactory.getInstance().getRootComponent()), + mCoordinator, + mPulseExpansionHandler, + mDynamicPrivacyController, + mBypassController, + new FalsingManagerFake(), + mPluginManager, + mTunerService, + mNotificationLockScreenUserManager, + mNotificationEntryManager, + mDozeLog) + .setShadeController(mShadeController) + .setStatusBarWindowView(mView) + .build(); + mController.setService(mStatusBar); + mController.setDragDownHelper(mDragDownHelper); + } @Test - public void testDragDownHelperCalledWhenDraggingDown() throws Exception { - when(Dependency.get(StatusBarStateController.class).getState()) - .thenReturn(StatusBarState.SHADE); + public void testDragDownHelperCalledWhenDraggingDown() { when(mDragDownHelper.isDraggingDown()).thenReturn(true); long now = SystemClock.elapsedRealtime(); MotionEvent ev = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 0 /* x */, 0 /* y */, diff --git a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java index 4f021ad3cee0..950fa8d4038a 100644 --- a/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java @@ -91,7 +91,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ protected final Context mContext; protected final SystemSupport mSystemSupport; protected final WindowManagerInternal mWindowManagerService; - private final GlobalActionPerformer mGlobalActionPerformer; + private final SystemActionPerformer mSystemActionPerformer; private final AccessibilityWindowManager mA11yWindowManager; private final DisplayManager mDisplayManager; private final PowerManager mPowerManager; @@ -213,7 +213,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ AccessibilityServiceInfo accessibilityServiceInfo, int id, Handler mainHandler, Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport, WindowManagerInternal windowManagerInternal, - GlobalActionPerformer globalActionPerfomer, + SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager a11yWindowManager) { mContext = context; mWindowManagerService = windowManagerInternal; @@ -222,7 +222,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ mAccessibilityServiceInfo = accessibilityServiceInfo; mLock = lock; mSecurityPolicy = securityPolicy; - mGlobalActionPerformer = globalActionPerfomer; + mSystemActionPerformer = systemActionPerfomer; mSystemSupport = systemSupport; mInvocationHandler = new InvocationHandler(mainHandler.getLooper()); mA11yWindowManager = a11yWindowManager; @@ -350,9 +350,9 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ protected abstract boolean hasRightsToCurrentUserLocked(); + @Nullable @Override - public List<AccessibilityWindowInfo> getWindows() { - ensureWindowsAvailableTimed(Display.DEFAULT_DISPLAY); + public AccessibilityWindowInfo.WindowListSparseArray getWindows() { synchronized (mLock) { if (!hasRightsToCurrentUserLocked()) { return null; @@ -362,38 +362,39 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ if (!permissionGranted) { return null; } - List<AccessibilityWindowInfo> internalWindowList = - mA11yWindowManager.getWindowListLocked(Display.DEFAULT_DISPLAY); - if (internalWindowList == null) { - return null; - } if (!mSecurityPolicy.checkAccessibilityAccess(this)) { return null; } - List<AccessibilityWindowInfo> returnedWindowList = new ArrayList<>(); - final int windowCount = internalWindowList.size(); - for (int i = 0; i < windowCount; i++) { - AccessibilityWindowInfo window = internalWindowList.get(i); - AccessibilityWindowInfo windowClone = - AccessibilityWindowInfo.obtain(window); - windowClone.setConnectionId(mId); - returnedWindowList.add(windowClone); + final AccessibilityWindowInfo.WindowListSparseArray allWindows = + new AccessibilityWindowInfo.WindowListSparseArray(); + final ArrayList<Integer> displayList = mA11yWindowManager.getDisplayListLocked(); + final int displayListCounts = displayList.size(); + if (displayListCounts > 0) { + for (int i = 0; i < displayListCounts; i++) { + final int displayId = displayList.get(i); + ensureWindowsAvailableTimedLocked(displayId); + + final List<AccessibilityWindowInfo> windowList = getWindowsByDisplayLocked( + displayId); + if (windowList != null) { + allWindows.put(displayId, windowList); + } + } } - return returnedWindowList; + return allWindows; } } @Override public AccessibilityWindowInfo getWindow(int windowId) { - int displayId = Display.INVALID_DISPLAY; synchronized (mLock) { + int displayId = Display.INVALID_DISPLAY; if (windowId != AccessibilityWindowInfo.UNDEFINED_WINDOW_ID) { displayId = mA11yWindowManager.getDisplayIdByUserIdAndWindowIdLocked( mSystemSupport.getCurrentUserIdLocked(), windowId); } - } - ensureWindowsAvailableTimed(displayId); - synchronized (mLock) { + ensureWindowsAvailableTimedLocked(displayId); + if (!hasRightsToCurrentUserLocked()) { return null; } @@ -759,7 +760,7 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ return false; } } - return mGlobalActionPerformer.performGlobalAction(action); + return mSystemActionPerformer.performSystemAction(action); } @Override @@ -1316,35 +1317,33 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ * * @param displayId The logical display id. */ - private void ensureWindowsAvailableTimed(int displayId) { - synchronized (mLock) { - if (mA11yWindowManager.getWindowListLocked(displayId) != null) { - return; - } - // If we have no registered callback, update the state we - // we may have to register one but it didn't happen yet. - if (!mA11yWindowManager.isTrackingWindowsLocked(displayId)) { - // Invokes client change to make sure tracking window enabled. - mSystemSupport.onClientChangeLocked(false); - } - // We have no windows but do not care about them, done. - if (!mA11yWindowManager.isTrackingWindowsLocked(displayId)) { + private void ensureWindowsAvailableTimedLocked(int displayId) { + if (mA11yWindowManager.getWindowListLocked(displayId) != null) { + return; + } + // If we have no registered callback, update the state we + // we may have to register one but it didn't happen yet. + if (!mA11yWindowManager.isTrackingWindowsLocked(displayId)) { + // Invokes client change to make sure tracking window enabled. + mSystemSupport.onClientChangeLocked(false); + } + // We have no windows but do not care about them, done. + if (!mA11yWindowManager.isTrackingWindowsLocked(displayId)) { + return; + } + + // Wait for the windows with a timeout. + final long startMillis = SystemClock.uptimeMillis(); + while (mA11yWindowManager.getWindowListLocked(displayId) == null) { + final long elapsedMillis = SystemClock.uptimeMillis() - startMillis; + final long remainMillis = WAIT_WINDOWS_TIMEOUT_MILLIS - elapsedMillis; + if (remainMillis <= 0) { return; } - - // Wait for the windows with a timeout. - final long startMillis = SystemClock.uptimeMillis(); - while (mA11yWindowManager.getWindowListLocked(displayId) == null) { - final long elapsedMillis = SystemClock.uptimeMillis() - startMillis; - final long remainMillis = WAIT_WINDOWS_TIMEOUT_MILLIS - elapsedMillis; - if (remainMillis <= 0) { - return; - } - try { - mLock.wait(remainMillis); - } catch (InterruptedException ie) { - /* ignore */ - } + try { + mLock.wait(remainMillis); + } catch (InterruptedException ie) { + /* ignore */ } } } @@ -1442,6 +1441,24 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ interrogatingPid, interrogatingTid); } + private List<AccessibilityWindowInfo> getWindowsByDisplayLocked(int displayId) { + final List<AccessibilityWindowInfo> internalWindowList = + mA11yWindowManager.getWindowListLocked(displayId); + if (internalWindowList == null) { + return null; + } + final List<AccessibilityWindowInfo> returnedWindowList = new ArrayList<>(); + final int windowCount = internalWindowList.size(); + for (int i = 0; i < windowCount; i++) { + AccessibilityWindowInfo window = internalWindowList.get(i); + AccessibilityWindowInfo windowClone = + AccessibilityWindowInfo.obtain(window); + windowClone.setConnectionId(mId); + returnedWindowList.add(windowClone); + } + return returnedWindowList; + } + public ComponentName getComponentName() { return mComponentName; } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 1f11059392a1..91269c7ab37e 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -30,6 +30,7 @@ import android.Manifest; import android.accessibilityservice.AccessibilityGestureEvent; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; +import android.accessibilityservice.AccessibilityShortcutInfo; import android.accessibilityservice.IAccessibilityServiceClient; import android.annotation.NonNull; import android.annotation.Nullable; @@ -197,7 +198,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private final MainHandler mMainHandler; - private final GlobalActionPerformer mGlobalActionPerformer; + private final SystemActionPerformer mSystemActionPerformer; private MagnificationController mMagnificationController; @@ -271,7 +272,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub mWindowManagerService = LocalServices.getService(WindowManagerInternal.class); mSecurityPolicy = new AccessibilitySecurityPolicy(mContext, this); mMainHandler = new MainHandler(mContext.getMainLooper()); - mGlobalActionPerformer = new GlobalActionPerformer(mContext, mWindowManagerService); + mSystemActionPerformer = new SystemActionPerformer(mContext, mWindowManagerService); mA11yWindowManager = new AccessibilityWindowManager(mLock, mMainHandler, mWindowManagerService, this, mSecurityPolicy, this); mA11yDisplayListener = new AccessibilityDisplayListener(mContext, mMainHandler); @@ -729,7 +730,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub synchronized (mLock) { mUiAutomationManager.registerUiTestAutomationServiceLocked(owner, serviceClient, mContext, accessibilityServiceInfo, sIdCounter++, mMainHandler, - mSecurityPolicy, this, mWindowManagerService, mGlobalActionPerformer, + mSecurityPolicy, this, mWindowManagerService, mSystemActionPerformer, mA11yWindowManager, flags); onUserStateChangedLocked(getCurrentUserStateLocked()); } @@ -1208,6 +1209,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub return false; } + private boolean readInstalledAccessibilityShortcutLocked(UserState userState) { + final List<AccessibilityShortcutInfo> shortcutInfos = AccessibilityManager + .getInstance(mContext).getInstalledAccessibilityShortcutListAsUser( + mContext, mCurrentUserId); + if (!shortcutInfos.equals(userState.mInstalledShortcuts)) { + userState.mInstalledShortcuts.clear(); + userState.mInstalledShortcuts.addAll(shortcutInfos); + return true; + } + return false; + } + private boolean readEnabledAccessibilityServicesLocked(UserState userState) { mTempComponentNameSet.clear(); readComponentNamesFromSettingLocked(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, @@ -1437,7 +1450,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub if (service == null) { service = new AccessibilityServiceConnection(userState, mContext, componentName, installedService, sIdCounter++, mMainHandler, mLock, mSecurityPolicy, - this, mWindowManagerService, mGlobalActionPerformer, + this, mWindowManagerService, mSystemActionPerformer, mA11yWindowManager); } else if (userState.mBoundServices.contains(service)) { continue; @@ -1741,6 +1754,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private boolean readConfigurationForUserStateLocked(UserState userState) { boolean somethingChanged = readInstalledAccessibilityServiceLocked(userState); + somethingChanged |= readInstalledAccessibilityShortcutLocked(userState); somethingChanged |= readEnabledAccessibilityServicesLocked(userState); somethingChanged |= readTouchExplorationGrantedAccessibilityServicesLocked(userState); somethingChanged |= readTouchExplorationEnabledSettingLocked(userState); @@ -2468,7 +2482,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub userState, mContext, COMPONENT_NAME, info, sIdCounter++, mMainHandler, mLock, mSecurityPolicy, AccessibilityManagerService.this, mWindowManagerService, - mGlobalActionPerformer, mA11yWindowManager) { + mSystemActionPerformer, mA11yWindowManager) { @Override public boolean supportsFlagForNotImportantViews(AccessibilityServiceInfo info) { return true; @@ -2671,6 +2685,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub public final List<AccessibilityServiceInfo> mInstalledServices = new ArrayList<>(); + public final List<AccessibilityShortcutInfo> mInstalledShortcuts = new ArrayList<>(); + private final Set<ComponentName> mBindingServices = new HashSet<>(); public final Set<ComponentName> mEnabledServices = new HashSet<>(); @@ -3083,6 +3099,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub || mUserInteractiveUiTimeoutUri.equals(uri)) { readUserRecommendedUiTimeoutSettingsLocked(userState); } + // TODO(a11y shortcut): Monitor new setting keys, when user adds shortcut, and + // remove from the list of enabled targets anything that's been uninstalled. } } } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java index d7f61e5371d5..e7f3ccc9f883 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java @@ -71,9 +71,9 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect AccessibilityServiceInfo accessibilityServiceInfo, int id, Handler mainHandler, Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport, WindowManagerInternal windowManagerInternal, - GlobalActionPerformer globalActionPerfomer, AccessibilityWindowManager awm) { + SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager awm) { super(context, componentName, accessibilityServiceInfo, id, mainHandler, lock, - securityPolicy, systemSupport, windowManagerInternal, globalActionPerfomer, awm); + securityPolicy, systemSupport, windowManagerInternal, systemActionPerfomer, awm); mUserStateWeakReference = new WeakReference<UserState>(userState); mIntent = new Intent().setComponent(mComponentName); mMainHandler = mainHandler; diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 0038a27db384..cb858ac11b00 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -1472,11 +1472,27 @@ public class AccessibilityWindowManager { public int getDisplayIdByUserIdAndWindowIdLocked(int userId, int windowId) { final IBinder windowToken = getWindowTokenForUserAndWindowIdLocked(userId, windowId); final int displayId = mWindowManagerInternal.getDisplayIdForWindow(windowToken); - return displayId; } /** + * Returns the display list including all displays which are tracking windows. + * + * @return The display list. + */ + public ArrayList<Integer> getDisplayListLocked() { + final ArrayList<Integer> displayList = new ArrayList<>(); + final int count = mDisplayWindowsObservers.size(); + for (int i = 0; i < count; i++) { + final DisplayWindowsObserver observer = mDisplayWindowsObservers.valueAt(i); + if (observer != null) { + displayList.add(observer.mDisplayId); + } + } + return displayList; + } + + /** * Gets current input focused window token from window manager, and returns its windowId. * * @param userId The userId diff --git a/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java b/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java index b9b2654b93cc..19ac0d3c1024 100644 --- a/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java +++ b/services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java @@ -1,17 +1,17 @@ /* - ** Copyright 2017, The Android Open Source Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.android.server.accessibility; @@ -40,12 +40,12 @@ import java.util.function.Supplier; /** * Handle the back-end of AccessibilityService#performGlobalAction */ -public class GlobalActionPerformer { +public class SystemActionPerformer { private final WindowManagerInternal mWindowManagerService; private final Context mContext; private Supplier<ScreenshotHelper> mScreenshotHelperSupplier; - public GlobalActionPerformer(Context context, WindowManagerInternal windowManagerInternal) { + public SystemActionPerformer(Context context, WindowManagerInternal windowManagerInternal) { mContext = context; mWindowManagerService = windowManagerInternal; mScreenshotHelperSupplier = null; @@ -53,13 +53,16 @@ public class GlobalActionPerformer { // Used to mock ScreenshotHelper @VisibleForTesting - public GlobalActionPerformer(Context context, WindowManagerInternal windowManagerInternal, + public SystemActionPerformer(Context context, WindowManagerInternal windowManagerInternal, Supplier<ScreenshotHelper> screenshotHelperSupplier) { this(context, windowManagerInternal); mScreenshotHelperSupplier = screenshotHelperSupplier; } - public boolean performGlobalAction(int action) { + /** + * Performe the system action matching the given action id. + */ + public boolean performSystemAction(int action) { final long identity = Binder.clearCallingIdentity(); try { switch (action) { diff --git a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java index 79d975dac2b2..7dd4a7089954 100644 --- a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java +++ b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java @@ -87,7 +87,7 @@ class UiAutomationManager { AccessibilitySecurityPolicy securityPolicy, AbstractAccessibilityServiceConnection.SystemSupport systemSupport, WindowManagerInternal windowManagerInternal, - GlobalActionPerformer globalActionPerfomer, + SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager awm, int flags) { synchronized (mLock) { accessibilityServiceInfo.setComponentName(COMPONENT_NAME); @@ -108,7 +108,7 @@ class UiAutomationManager { mSystemSupport = systemSupport; mUiAutomationService = new UiAutomationService(context, accessibilityServiceInfo, id, mainHandler, mLock, securityPolicy, systemSupport, windowManagerInternal, - globalActionPerfomer, awm); + systemActionPerfomer, awm); mUiAutomationServiceOwner = owner; mUiAutomationFlags = flags; mUiAutomationServiceInfo = accessibilityServiceInfo; @@ -226,9 +226,9 @@ class UiAutomationManager { int id, Handler mainHandler, Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport, WindowManagerInternal windowManagerInternal, - GlobalActionPerformer globalActionPerfomer, AccessibilityWindowManager awm) { + SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager awm) { super(context, COMPONENT_NAME, accessibilityServiceInfo, id, mainHandler, lock, - securityPolicy, systemSupport, windowManagerInternal, globalActionPerfomer, + securityPolicy, systemSupport, windowManagerInternal, systemActionPerfomer, awm); mMainHandler = mainHandler; } diff --git a/services/core/Android.bp b/services/core/Android.bp index 4e80977f7d11..4f4e47a0dd27 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -146,7 +146,8 @@ genrule { name: "services.core.json.gz", srcs: [":checked-protolog.json"], out: ["services.core.protolog.json.gz"], - cmd: "gzip < $(in) > $(out)", + cmd: "$(location minigzip) -c < $(in) > $(out)", + tools: ["minigzip"], } prebuilt_etc { diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 3eef92fc0aa7..1d666adff561 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -33,6 +33,8 @@ import android.os.PersistableBundle; import android.util.ArraySet; import android.util.SparseArray; +import com.android.server.pm.PackageList; + import java.io.IOException; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9acafaec185e..e0f60b43f8c8 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -579,6 +579,8 @@ public class ConnectivityService extends IConnectivityManager.Stub // the set of network types that can only be enabled by system/sig apps private List mProtectedNetworks; + private Set<String> mWolSupportedInterfaces; + private TelephonyManager mTelephonyManager; private KeepaliveTracker mKeepaliveTracker; @@ -1055,6 +1057,10 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + mWolSupportedInterfaces = new ArraySet( + mContext.getResources().getStringArray( + com.android.internal.R.array.config_wakeonlan_supported_interfaces)); + mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mTethering = deps.makeTethering(mContext, mNMS, mStatsService, mPolicyManager, @@ -3268,7 +3274,8 @@ public class ConnectivityService extends IConnectivityManager.Stub final NetworkRequestInfo nri = mNetworkRequests.get(request); if (nri != null) { - if (Process.SYSTEM_UID != callingUid && nri.mUid != callingUid) { + if (Process.SYSTEM_UID != callingUid && Process.NETWORK_STACK_UID != callingUid + && nri.mUid != callingUid) { log(String.format("UID %d attempted to %s for unowned request %s", callingUid, requestedOperation, nri)); return null; @@ -5599,6 +5606,9 @@ public class ConnectivityService extends IConnectivityManager.Stub } else { updateProxy(newLp, oldLp); } + + updateWakeOnLan(newLp); + // TODO - move this check to cover the whole function if (!Objects.equals(newLp, oldLp)) { synchronized (networkAgent) { @@ -5769,6 +5779,10 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + private void updateWakeOnLan(@NonNull LinkProperties lp) { + lp.setWakeOnLanSupported(mWolSupportedInterfaces.contains(lp.getInterfaceName())); + } + private int getNetworkPermission(NetworkCapabilities nc) { if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) { return INetd.PERMISSION_SYSTEM; diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index 35a06a977a58..09f62ff3fc56 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -3064,11 +3064,6 @@ public class LocationManagerService extends ILocationManager.Stub { try { LocationProvider oldProvider = getLocationProviderLocked(name); if (oldProvider != null) { - if (oldProvider.isMock()) { - throw new IllegalArgumentException( - "Provider \"" + name + "\" already exists"); - } - removeProviderLocked(oldProvider); } @@ -3093,7 +3088,7 @@ public class LocationManagerService extends ILocationManager.Stub { try { LocationProvider testProvider = getLocationProviderLocked(name); if (testProvider == null || !testProvider.isMock()) { - throw new IllegalArgumentException("Provider \"" + name + "\" unknown"); + return; } removeProviderLocked(testProvider); diff --git a/services/core/java/com/android/server/SystemServerInitThreadPool.java b/services/core/java/com/android/server/SystemServerInitThreadPool.java index ff6a5375565a..19f4089b07af 100644 --- a/services/core/java/com/android/server/SystemServerInitThreadPool.java +++ b/services/core/java/com/android/server/SystemServerInitThreadPool.java @@ -16,10 +16,12 @@ package com.android.server; +import android.annotation.NonNull; import android.os.Build; import android.os.Process; import android.util.Slog; +import com.android.internal.annotations.GuardedBy; import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.Preconditions; import com.android.server.am.ActivityManagerService; @@ -32,9 +34,11 @@ import java.util.concurrent.TimeUnit; /** * Thread pool used during initialization of system server. + * * <p>System services can {@link #submit(Runnable)} tasks for execution during boot. * The pool will be shut down after {@link SystemService#PHASE_BOOT_COMPLETED}. - * New tasks <em>should not</em> be submitted afterwards. + * + * <p>New tasks <em>should not</em> be submitted afterwards. * * @hide */ @@ -42,26 +46,46 @@ public class SystemServerInitThreadPool { private static final String TAG = SystemServerInitThreadPool.class.getSimpleName(); private static final int SHUTDOWN_TIMEOUT_MILLIS = 20000; private static final boolean IS_DEBUGGABLE = Build.IS_DEBUGGABLE; + private static final Object LOCK = new Object(); + @GuardedBy("LOCK") private static SystemServerInitThreadPool sInstance; - private ExecutorService mService = ConcurrentUtils.newFixedThreadPool( - Runtime.getRuntime().availableProcessors(), - "system-server-init-thread", Process.THREAD_PRIORITY_FOREGROUND); + private final ExecutorService mService; - private List<String> mPendingTasks = new ArrayList<>(); + @GuardedBy("mPendingTasks") + private final List<String> mPendingTasks = new ArrayList<>(); - public static synchronized SystemServerInitThreadPool get() { - if (sInstance == null) { - sInstance = new SystemServerInitThreadPool(); + @GuardedBy("mPendingTasks") + private boolean mShutDown; + + private SystemServerInitThreadPool() { + final int size = Runtime.getRuntime().availableProcessors(); + Slog.i(TAG, "Creating instance with " + size + " threads"); + mService = ConcurrentUtils.newFixedThreadPool(size, + "system-server-init-thread", Process.THREAD_PRIORITY_FOREGROUND); + } + + /** + * Gets the singleton. + * + * @throws IllegalStateException if it hasn't been started or has been shut down already. + */ + public static SystemServerInitThreadPool get() { + synchronized (LOCK) { + Preconditions.checkState(sInstance != null, "Cannot get " + TAG + + " - it has been shut down"); + return sInstance; } - Preconditions.checkState(sInstance.mService != null, "Cannot get " + TAG - + " - it has been shut down"); - return sInstance; } - public Future<?> submit(Runnable runnable, String description) { + /** + * Submits a task for execution. + */ + public @NonNull Future<?> submit(@NonNull Runnable runnable, @NonNull String description) { + Preconditions.checkNotNull(description, "description cannot be null"); synchronized (mPendingTasks) { + Preconditions.checkState(!mShutDown, TAG + " already shut down"); mPendingTasks.add(description); } return mService.submit(() -> { @@ -83,10 +107,36 @@ public class SystemServerInitThreadPool { }); } - static synchronized void shutdown() { - if (sInstance != null && sInstance.mService != null) { + /** + * Starts it. + * + * <p>Note:</p> should only be called by {@link SystemServer}. + * + * @throws IllegalStateException if it has been started already without being shut down yet. + */ + static void start() { + synchronized (LOCK) { + Preconditions.checkState(sInstance == null, TAG + " already started"); + sInstance = new SystemServerInitThreadPool(); + } + } + + /** + * Shuts it down. + * + * <p>Note:</p> should only be called by {@link SystemServer}. + */ + static void shutdown() { + synchronized (LOCK) { + if (sInstance == null) { + Slog.wtf(TAG, "Already shutdown", new Exception()); + return; + } + synchronized (sInstance.mPendingTasks) { + sInstance.mShutDown = true; + } sInstance.mService.shutdown(); - boolean terminated; + final boolean terminated; try { terminated = sInstance.mService.awaitTermination(SHUTDOWN_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); @@ -100,7 +150,7 @@ public class SystemServerInitThreadPool { // in the thread pool. dumpStackTraces(); } - List<Runnable> unstartedRunnables = sInstance.mService.shutdownNow(); + final List<Runnable> unstartedRunnables = sInstance.mService.shutdownNow(); if (!terminated) { final List<String> copy = new ArrayList<>(); synchronized (sInstance.mPendingTasks) { @@ -109,8 +159,7 @@ public class SystemServerInitThreadPool { throw new IllegalStateException("Cannot shutdown. Unstarted tasks " + unstartedRunnables + " Unfinished tasks " + copy); } - sInstance.mService = null; // Make mService eligible for GC - sInstance.mPendingTasks = null; + sInstance = null; // Make eligible for GC Slog.d(TAG, "Shutdown successful"); } } diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index f91cf0cc1255..0f8a3b54acc5 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -274,8 +274,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE; static final int READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK = - PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER - | PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER; + PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL + | PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_SMS; private static final int MSG_USER_SWITCHED = 1; private static final int MSG_UPDATE_DEFAULT_SUB = 2; @@ -1932,7 +1932,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mOutgoingCallEmergencyNumber[phoneId] = emergencyNumber; for (Record r : mRecords) { if (r.matchPhoneStateListenerEvent( - PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER) + PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL) && idMatch(r.subId, subId, phoneId)) { try { r.callback.onOutgoingEmergencyCall(emergencyNumber); @@ -1957,7 +1957,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { mOutgoingSmsEmergencyNumber[phoneId] = emergencyNumber; for (Record r : mRecords) { if (r.matchPhoneStateListenerEvent( - PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER) + PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_SMS) && idMatch(r.subId, subId, phoneId)) { try { r.callback.onOutgoingEmergencySms(emergencyNumber); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 08f75e600bc5..9209a21a61d7 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -192,34 +192,38 @@ public final class ActiveServices { @Override public void stopForegroundServicesForUidPackage(final int uid, final String packageName) { synchronized (mAm) { - final ServiceMap smap = getServiceMapLocked(UserHandle.getUserId(uid)); - final int N = smap.mServicesByInstanceName.size(); - final ArrayList<ServiceRecord> toStop = new ArrayList<>(N); - for (int i = 0; i < N; i++) { - final ServiceRecord r = smap.mServicesByInstanceName.valueAt(i); - if (uid == r.serviceInfo.applicationInfo.uid - || packageName.equals(r.serviceInfo.packageName)) { - if (r.isForeground) { - toStop.add(r); - } - } - } + stopAllForegroundServicesLocked(uid, packageName); + } + } + } - // Now stop them all - final int numToStop = toStop.size(); - if (numToStop > 0 && DEBUG_FOREGROUND_SERVICE) { - Slog.i(TAG, "Package " + packageName + "/" + uid - + " entering FAS with foreground services"); - } - for (int i = 0; i < numToStop; i++) { - final ServiceRecord r = toStop.get(i); - if (DEBUG_FOREGROUND_SERVICE) { - Slog.i(TAG, " Stopping fg for service " + r); - } - setServiceForegroundInnerLocked(r, 0, null, 0, 0); + void stopAllForegroundServicesLocked(final int uid, final String packageName) { + final ServiceMap smap = getServiceMapLocked(UserHandle.getUserId(uid)); + final int N = smap.mServicesByInstanceName.size(); + final ArrayList<ServiceRecord> toStop = new ArrayList<>(N); + for (int i = 0; i < N; i++) { + final ServiceRecord r = smap.mServicesByInstanceName.valueAt(i); + if (uid == r.serviceInfo.applicationInfo.uid + || packageName.equals(r.serviceInfo.packageName)) { + if (r.isForeground) { + toStop.add(r); } } } + + // Now stop them all + final int numToStop = toStop.size(); + if (numToStop > 0 && DEBUG_FOREGROUND_SERVICE) { + Slog.i(TAG, "Package " + packageName + "/" + uid + + " in FAS with foreground services"); + } + for (int i = 0; i < numToStop; i++) { + final ServiceRecord r = toStop.get(i); + if (DEBUG_FOREGROUND_SERVICE) { + Slog.i(TAG, " Stopping fg for service " + r); + } + setServiceForegroundInnerLocked(r, 0, null, 0, 0); + } } /** @@ -1019,12 +1023,23 @@ public final class ActiveServices { } } if (!aa.mAppOnTop) { - if (active == null) { - active = new ArrayList<>(); + // Transitioning a fg-service host app out of top: if it's bg restricted, + // it loses the fg service state now. + if (!appRestrictedAnyInBackground(aa.mUid, aa.mPackageName)) { + if (active == null) { + active = new ArrayList<>(); + } + if (DEBUG_FOREGROUND_SERVICE) Slog.d(TAG, "Adding active: pkg=" + + aa.mPackageName + ", uid=" + aa.mUid); + active.add(aa); + } else { + if (DEBUG_FOREGROUND_SERVICE) { + Slog.d(TAG, "bg-restricted app " + + aa.mPackageName + "/" + aa.mUid + + " exiting top; demoting fg services "); + } + stopAllForegroundServicesLocked(aa.mUid, aa.mPackageName); } - if (DEBUG_FOREGROUND_SERVICE) Slog.d(TAG, "Adding active: pkg=" - + aa.mPackageName + ", uid=" + aa.mUid); - active.add(aa); } } smap.removeMessages(ServiceMap.MSG_UPDATE_FOREGROUND_APPS); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 7cbd1fcebb94..8c672a118843 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -350,6 +350,7 @@ import com.android.server.Watchdog; import com.android.server.am.ActivityManagerServiceDumpProcessesProto.UidObserverRegistrationProto; import com.android.server.appop.AppOpsService; import com.android.server.compat.CompatConfig; +import com.android.server.compat.PlatformCompat; import com.android.server.contentcapture.ContentCaptureManagerInternal; import com.android.server.firewall.IntentFirewall; import com.android.server.job.JobSchedulerInternal; @@ -1575,6 +1576,8 @@ public class ActivityManagerService extends IActivityManager.Stub // Encapsulates the global setting "hidden_api_blacklist_exemptions" final HiddenApiSettings mHiddenApiBlacklist; + private final PlatformCompat mPlatformCompat; + PackageManagerInternal mPackageManagerInt; PermissionManagerServiceInternal mPermissionManagerInt; @@ -2427,6 +2430,7 @@ public class ActivityManagerService extends IActivityManager.Stub mFactoryTest = FACTORY_TEST_OFF; mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class); mInternal = new LocalService(); + mPlatformCompat = null; } // Note: This method is invoked on the main thread but may need to attach various @@ -2563,6 +2567,9 @@ public class ActivityManagerService extends IActivityManager.Stub mHiddenApiBlacklist = new HiddenApiSettings(mHandler, mContext); + mPlatformCompat = (PlatformCompat) ServiceManager.getService( + Context.PLATFORM_COMPAT_SERVICE); + Watchdog.getInstance().addMonitor(this); Watchdog.getInstance().addThread(mHandler); @@ -5015,7 +5022,9 @@ public class ActivityManagerService extends IActivityManager.Stub if (preBindAgent != null) { thread.attachAgent(preBindAgent); } - + if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + thread.attachStartupAgents(app.info.dataDir); + } // Figure out whether the app needs to run in autofill compat mode. AutofillOptions autofillOptions = null; @@ -5042,6 +5051,9 @@ public class ActivityManagerService extends IActivityManager.Stub mAtmInternal.preBindApplication(app.getWindowProcessController()); final ActiveInstrumentation instr2 = app.getActiveInstrumentation(); long[] disabledCompatChanges = CompatConfig.get().getDisabledChanges(app.info); + if (mPlatformCompat != null) { + mPlatformCompat.resetReporting(app.info); + } if (app.isolatedEntryPoint != null) { // This is an isolated process which should just call an entry point instead of // being bound to an application. @@ -18353,7 +18365,7 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public int getCurrentUserId() { - return mUserController.getCurrentUserIdLU(); + return mUserController.getCurrentUserId(); } @Override diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 3c2aee40b4fd..bb214bd740a4 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -30,7 +30,7 @@ import static android.app.ActivityManager.PROCESS_STATE_SERVICE; import static android.app.ActivityManager.PROCESS_STATE_TOP; import static android.app.ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND; import static android.os.Process.SCHED_OTHER; -import static android.os.Process.THREAD_GROUP_BG_NONINTERACTIVE; +import static android.os.Process.THREAD_GROUP_BACKGROUND; import static android.os.Process.THREAD_GROUP_DEFAULT; import static android.os.Process.THREAD_GROUP_RESTRICTED; import static android.os.Process.THREAD_GROUP_TOP_APP; @@ -1759,7 +1759,7 @@ public final class OomAdjuster { int processGroup; switch (curSchedGroup) { case ProcessList.SCHED_GROUP_BACKGROUND: - processGroup = THREAD_GROUP_BG_NONINTERACTIVE; + processGroup = THREAD_GROUP_BACKGROUND; break; case ProcessList.SCHED_GROUP_TOP_APP: case ProcessList.SCHED_GROUP_TOP_APP_BOUND: diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index c0af814cdb38..af126f289fc2 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -215,7 +215,7 @@ public final class ProcessList { // Memory pages are 4K. static final int PAGE_SIZE = 4 * 1024; - // Activity manager's version of Process.THREAD_GROUP_BG_NONINTERACTIVE + // Activity manager's version of Process.THREAD_GROUP_BACKGROUND static final int SCHED_GROUP_BACKGROUND = 0; // Activity manager's version of Process.THREAD_GROUP_RESTRICTED static final int SCHED_GROUP_RESTRICTED = 1; diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 798185ad88f7..6c4cc2d43866 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -65,7 +65,6 @@ import android.content.pm.PermissionInfo; import android.content.pm.UserInfo; import android.database.ContentObserver; import android.hardware.camera2.CameraDevice.CAMERA_AUDIO_RESTRICTION; -import android.media.AudioAttributes; import android.net.Uri; import android.os.AsyncTask; import android.os.Binder; @@ -109,6 +108,7 @@ import com.android.internal.app.IAppOpsNotedCallback; import com.android.internal.app.IAppOpsService; import com.android.internal.os.Zygote; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.CollectionUtils; import com.android.internal.util.DumpUtils; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; @@ -257,6 +257,9 @@ public class AppOpsService extends IAppOpsService.Stub { @GuardedBy("this") private CheckOpsDelegate mCheckOpsDelegate; + @GuardedBy("this") + private SparseArray<List<Integer>> mSwitchOpToOps; + /** * All times are in milliseconds. These constants are kept synchronized with the system * global Settings. Any access to this class or its fields should be done while @@ -1291,6 +1294,8 @@ public class AppOpsService extends IAppOpsService.Stub { verifyIncomingOp(code); code = AppOpsManager.opToSwitch(code); + updatePermissionRevokedCompat(uid, code, mode); + synchronized (this) { final int defaultMode = AppOpsManager.opToDefaultMode(code); @@ -1392,6 +1397,86 @@ public class AppOpsService extends IAppOpsService.Stub { notifyOpChangedSync(code, uid, null, mode); } + private void updatePermissionRevokedCompat(int uid, int switchCode, int mode) { + PackageManager packageManager = mContext.getPackageManager(); + String[] packageNames = packageManager.getPackagesForUid(uid); + if (ArrayUtils.isEmpty(packageNames)) { + return; + } + String packageName = packageNames[0]; + + List<Integer> ops = getSwitchOpToOps().get(switchCode); + int opsSize = CollectionUtils.size(ops); + for (int i = 0; i < opsSize; i++) { + int code = ops.get(i); + + String permissionName = AppOpsManager.opToPermission(code); + if (permissionName == null) { + continue; + } + + PermissionInfo permissionInfo; + try { + permissionInfo = packageManager.getPermissionInfo(permissionName, 0); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + continue; + } + + if (!permissionInfo.isRuntime()) { + continue; + } + + UserHandle user = UserHandle.getUserHandleForUid(uid); + boolean isRevokedCompat; + if (permissionInfo.backgroundPermission != null) { + boolean isBackgroundRevokedCompat = mode != AppOpsManager.MODE_ALLOWED; + long identity = Binder.clearCallingIdentity(); + try { + packageManager.updatePermissionFlags(permissionInfo.backgroundPermission, + packageName, PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, + isBackgroundRevokedCompat + ? PackageManager.FLAG_PERMISSION_REVOKED_COMPAT : 0, user); + } finally { + Binder.restoreCallingIdentity(identity); + } + + isRevokedCompat = mode != AppOpsManager.MODE_ALLOWED + && mode != AppOpsManager.MODE_FOREGROUND; + } else { + isRevokedCompat = mode != AppOpsManager.MODE_ALLOWED; + } + + long identity = Binder.clearCallingIdentity(); + try { + packageManager.updatePermissionFlags(permissionName, packageName, + PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, isRevokedCompat + ? PackageManager.FLAG_PERMISSION_REVOKED_COMPAT : 0, user); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + } + + @NonNull + private SparseArray<List<Integer>> getSwitchOpToOps() { + synchronized (this) { + if (mSwitchOpToOps == null) { + mSwitchOpToOps = new SparseArray<>(); + for (int op = 0; op < _NUM_OP; op++) { + int switchOp = AppOpsManager.opToSwitch(op); + List<Integer> ops = mSwitchOpToOps.get(switchOp); + if (ops == null) { + ops = new ArrayList<>(); + mSwitchOpToOps.put(switchOp, ops); + } + ops.add(op); + } + } + return mSwitchOpToOps; + } + } + private void notifyOpChangedSync(int code, int uid, @NonNull String packageName, int mode) { final StorageManagerInternal storageManagerInternal = LocalServices.getService(StorageManagerInternal.class); diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index 3d341ef67d6f..4f1db3c96faf 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -26,19 +26,17 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_NONE; import android.app.ActivityManager; import android.app.IActivityManager; -import android.app.KeyguardManager; import android.app.UserSwitchObserver; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; import android.database.ContentObserver; +import android.hardware.biometrics.Authenticator; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.BiometricSourceType; import android.hardware.biometrics.BiometricsProtoEnums; -import android.hardware.biometrics.IBiometricConfirmDeviceCredentialCallback; import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback; import android.hardware.biometrics.IBiometricService; import android.hardware.biometrics.IBiometricServiceReceiver; @@ -95,11 +93,8 @@ public class BiometricService extends SystemService { private static final int MSG_ON_READY_FOR_AUTHENTICATION = 8; private static final int MSG_AUTHENTICATE = 9; private static final int MSG_CANCEL_AUTHENTICATION = 10; - private static final int MSG_ON_CONFIRM_DEVICE_CREDENTIAL_SUCCESS = 11; - private static final int MSG_ON_CONFIRM_DEVICE_CREDENTIAL_ERROR = 12; - private static final int MSG_REGISTER_CANCELLATION_CALLBACK = 13; - private static final int MSG_ON_AUTHENTICATION_TIMED_OUT = 14; - + private static final int MSG_ON_AUTHENTICATION_TIMED_OUT = 11; + private static final int MSG_ON_DEVICE_CREDENTIAL_PRESSED = 12; private static final int[] FEATURE_ID = { TYPE_FINGERPRINT, TYPE_IRIS, @@ -132,19 +127,19 @@ public class BiometricService extends SystemService { */ static final int STATE_AUTH_PENDING_CONFIRM = 5; /** - * Biometric authentication was canceled, but the device is now showing ConfirmDeviceCredential - */ - static final int STATE_BIOMETRIC_AUTH_CANCELED_SHOWING_CDC = 6; - /** * Biometric authenticated, waiting for SysUI to finish animation */ - static final int STATE_AUTHENTICATED_PENDING_SYSUI = 7; + static final int STATE_AUTHENTICATED_PENDING_SYSUI = 6; /** * Biometric error, waiting for SysUI to finish animation */ - static final int STATE_ERROR_PENDING_SYSUI = 8; + static final int STATE_ERROR_PENDING_SYSUI = 7; + /** + * Device credential in AuthController is showing + */ + static final int STATE_SHOWING_DEVICE_CREDENTIAL = 8; - final class AuthSession implements IBinder.DeathRecipient { + final class AuthSession { // Map of Authenticator/Cookie pairs. We expect to receive the cookies back from // <Biometric>Services before we can start authenticating. Pairs that have been returned // are moved to mModalitiesMatched. @@ -184,14 +179,10 @@ public class BiometricService extends SystemService { // Timestamp when hardware authentication occurred private long mAuthenticatedTimeMs; - // TODO(b/123378871): Remove when moved. - private IBiometricConfirmDeviceCredentialCallback mConfirmDeviceCredentialCallback; - AuthSession(HashMap<Integer, Integer> modalities, IBinder token, long sessionId, int userId, IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle, int callingUid, int callingPid, int callingUserId, - int modality, boolean requireConfirmation, - IBiometricConfirmDeviceCredentialCallback callback) { + int modality, boolean requireConfirmation) { mModalitiesWaiting = modalities; mToken = token; mSessionId = sessionId; @@ -204,25 +195,12 @@ public class BiometricService extends SystemService { mCallingUserId = callingUserId; mModality = modality; mRequireConfirmation = requireConfirmation; - mConfirmDeviceCredentialCallback = callback; - - if (isFromConfirmDeviceCredential()) { - try { - token.linkToDeath(this, 0 /* flags */); - } catch (RemoteException e) { - Slog.e(TAG, "Unable to link to death", e); - } - } } boolean isCrypto() { return mSessionId != 0; } - boolean isFromConfirmDeviceCredential() { - return mBundle.getBoolean(BiometricPrompt.KEY_FROM_CONFIRM_DEVICE_CREDENTIAL, false); - } - boolean containsCookie(int cookie) { if (mModalitiesWaiting != null && mModalitiesWaiting.containsValue(cookie)) { return true; @@ -233,23 +211,8 @@ public class BiometricService extends SystemService { return false; } - // TODO(b/123378871): Remove when moved. - @Override - public void binderDied() { - mHandler.post(() -> { - Slog.e(TAG, "Binder died, killing ConfirmDeviceCredential"); - if (mConfirmDeviceCredentialCallback == null) { - Slog.e(TAG, "Callback is null"); - return; - } - - try { - mConfirmDeviceCredentialCallback.cancel(); - mConfirmDeviceCredentialCallback = null; - } catch (RemoteException e) { - Slog.e(TAG, "Unable to send cancel", e); - } - }); + boolean isAllowDeviceCredential() { + return Utils.isDeviceCredentialAllowed(mBundle); } } @@ -275,7 +238,7 @@ public class BiometricService extends SystemService { // Get and cache the available authenticator (manager) classes. Used since aidl doesn't support // polymorphism :/ - final ArrayList<Authenticator> mAuthenticators = new ArrayList<>(); + final ArrayList<AuthenticatorWrapper> mAuthenticators = new ArrayList<>(); // The current authentication session, null if idle/done. We need to track both the current // and pending sessions since errors may be sent to either. @@ -284,14 +247,6 @@ public class BiometricService extends SystemService { @VisibleForTesting AuthSession mPendingAuthSession; - // TODO(b/123378871): Remove when moved. - // When BiometricPrompt#setAllowDeviceCredentials is set to true, we need to store the - // client (app) receiver. BiometricService internally launches CDCA which invokes - // BiometricService to start authentication (normal path). When auth is success/rejected, - // CDCA will use an aidl method to poke BiometricService - the result will then be forwarded - // to this receiver. - private IBiometricServiceReceiver mConfirmDeviceCredentialReceiver; - @VisibleForTesting final Handler mHandler = new Handler(Looper.getMainLooper()) { @Override @@ -361,8 +316,7 @@ public class BiometricService extends SystemService { (Bundle) args.arg5 /* bundle */, args.argi2 /* callingUid */, args.argi3 /* callingPid */, - args.argi4 /* callingUserId */, - (IBiometricConfirmDeviceCredentialCallback) args.arg6 /* callback */); + args.argi4 /* callingUserId */); args.recycle(); break; } @@ -376,28 +330,13 @@ public class BiometricService extends SystemService { break; } - case MSG_ON_CONFIRM_DEVICE_CREDENTIAL_SUCCESS: { - handleOnConfirmDeviceCredentialSuccess(); - break; - } - - case MSG_ON_CONFIRM_DEVICE_CREDENTIAL_ERROR: { - SomeArgs args = (SomeArgs) msg.obj; - handleOnConfirmDeviceCredentialError( - args.argi1 /* error */, - (String) args.arg1 /* errorMsg */); - args.recycle(); + case MSG_ON_AUTHENTICATION_TIMED_OUT: { + handleAuthenticationTimedOut((String) msg.obj /* errorMessage */); break; } - case MSG_REGISTER_CANCELLATION_CALLBACK: { - handleRegisterCancellationCallback( - (IBiometricConfirmDeviceCredentialCallback) msg.obj /* callback */); - break; - } - - case MSG_ON_AUTHENTICATION_TIMED_OUT: { - handleAuthenticationTimedOut((String) msg.obj /* errorMessage */); + case MSG_ON_DEVICE_CREDENTIAL_PRESSED: { + handleOnDeviceCredentialPressed(); break; } @@ -408,11 +347,11 @@ public class BiometricService extends SystemService { } }; - private final class Authenticator { + private final class AuthenticatorWrapper { final int mType; final BiometricAuthenticator mAuthenticator; - Authenticator(int type, BiometricAuthenticator authenticator) { + AuthenticatorWrapper(int type, BiometricAuthenticator authenticator) { mType = type; mAuthenticator = authenticator; } @@ -620,6 +559,11 @@ public class BiometricService extends SystemService { public void onTryAgainPressed() { mHandler.sendEmptyMessage(MSG_ON_TRY_AGAIN_PRESSED); } + + @Override + public void onDeviceCredentialPressed() { + mHandler.sendEmptyMessage(MSG_ON_DEVICE_CREDENTIAL_PRESSED); + } }; @@ -642,18 +586,12 @@ public class BiometricService extends SystemService { @Override // Binder call public void authenticate(IBinder token, long sessionId, int userId, - IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle, - IBiometricConfirmDeviceCredentialCallback callback) + IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle) throws RemoteException { final int callingUid = Binder.getCallingUid(); final int callingPid = Binder.getCallingPid(); final int callingUserId = UserHandle.getCallingUserId(); - // TODO(b/123378871): Remove when moved. - if (callback != null) { - checkInternalPermission(); - } - // In the BiometricServiceBase, check do the AppOps and foreground check. if (userId == callingUserId) { // Check the USE_BIOMETRIC permission here. @@ -670,12 +608,12 @@ public class BiometricService extends SystemService { return; } - final boolean isFromConfirmDeviceCredential = - bundle.getBoolean(BiometricPrompt.KEY_FROM_CONFIRM_DEVICE_CREDENTIAL, false); - if (isFromConfirmDeviceCredential) { + if (bundle.get(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED) != null) { checkInternalPermission(); } + Utils.combineAuthenticatorBundles(bundle); + // Check the usage of this in system server. Need to remove this check if it becomes // a public API. final boolean useDefaultTitle = @@ -689,39 +627,6 @@ public class BiometricService extends SystemService { } } - // Launch CDC instead if necessary. CDC will return results through an AIDL call, since - // we can't get activity results. Store the receiver somewhere so we can forward the - // result back to the client. - // TODO(b/123378871): Remove when moved. - if (bundle.getBoolean(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL)) { - mHandler.post(() -> { - final KeyguardManager kgm = getContext().getSystemService( - KeyguardManager.class); - if (!kgm.isDeviceSecure()) { - try { - receiver.onError( - BiometricConstants.BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL, - getContext().getString( - R.string.biometric_error_device_not_secured)); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception", e); - } - return; - } - mConfirmDeviceCredentialReceiver = receiver; - // Use this so we don't need to duplicate logic.. - final Intent intent = kgm.createConfirmDeviceCredentialIntent(null /* title */, - null /* description */, userId); - // Then give it the bundle to do magic behavior.. - intent.putExtra(KeyguardManager.EXTRA_BIOMETRIC_PROMPT_BUNDLE, bundle); - // Create a new task with this activity located at the root. - intent.setFlags( - Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT); - getContext().startActivityAsUser(intent, UserHandle.CURRENT); - }); - return; - } - SomeArgs args = SomeArgs.obtain(); args.arg1 = token; args.arg2 = sessionId; @@ -732,41 +637,11 @@ public class BiometricService extends SystemService { args.argi2 = callingUid; args.argi3 = callingPid; args.argi4 = callingUserId; - args.arg6 = callback; mHandler.obtainMessage(MSG_AUTHENTICATE, args).sendToTarget(); } @Override // Binder call - public void onConfirmDeviceCredentialSuccess() { - checkInternalPermission(); - - mHandler.sendEmptyMessage(MSG_ON_CONFIRM_DEVICE_CREDENTIAL_SUCCESS); - } - - @Override // Binder call - public void onConfirmDeviceCredentialError(int error, String message) { - checkInternalPermission(); - - SomeArgs args = SomeArgs.obtain(); - args.argi1 = error; - args.arg1 = message; - mHandler.obtainMessage(MSG_ON_CONFIRM_DEVICE_CREDENTIAL_ERROR, args).sendToTarget(); - } - - @Override // Binder call - public void registerCancellationCallback( - IBiometricConfirmDeviceCredentialCallback callback) { - // TODO(b/123378871): Remove when moved. - // This callback replaces the one stored in the current session. If the session is null - // we can ignore this, since it means ConfirmDeviceCredential was launched by something - // else (not BiometricPrompt) - checkInternalPermission(); - - mHandler.obtainMessage(MSG_REGISTER_CANCELLATION_CALLBACK, callback).sendToTarget(); - } - - @Override // Binder call public void cancelAuthentication(IBinder token, String opPackageName) throws RemoteException { checkPermission(); @@ -972,8 +847,8 @@ public class BiometricService extends SystemService { // Cache the authenticators for (int featureId : FEATURE_ID) { if (hasFeature(featureId)) { - Authenticator authenticator = - new Authenticator(featureId, getAuthenticator(featureId)); + AuthenticatorWrapper authenticator = + new AuthenticatorWrapper(featureId, getAuthenticator(featureId)); mAuthenticators.add(authenticator); } } @@ -1011,7 +886,7 @@ public class BiometricService extends SystemService { int modality = TYPE_NONE; int firstHwAvailable = TYPE_NONE; - for (Authenticator authenticatorWrapper : mAuthenticators) { + for (AuthenticatorWrapper authenticatorWrapper : mAuthenticators) { modality = authenticatorWrapper.getType(); BiometricAuthenticator authenticator = authenticatorWrapper.getAuthenticator(); if (authenticator.isHardwareDetected()) { @@ -1108,7 +983,7 @@ public class BiometricService extends SystemService { } private void logDialogDismissed(int reason) { - if (reason == BiometricPrompt.DISMISSED_REASON_CONFIRMED) { + if (reason == BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED) { // Explicit auth, authentication confirmed. // Latency in this case is authenticated -> confirmed. <Biometric>Service // should have the first half (first acquired -> authenticated). @@ -1254,49 +1129,6 @@ public class BiometricService extends SystemService { } } - private void handleOnConfirmDeviceCredentialSuccess() { - if (mConfirmDeviceCredentialReceiver == null) { - Slog.w(TAG, "handleOnConfirmDeviceCredentialSuccess null!"); - return; - } - try { - mConfirmDeviceCredentialReceiver.onAuthenticationSucceeded(); - if (mCurrentAuthSession != null) { - mCurrentAuthSession = null; - } - } catch (RemoteException e) { - Slog.e(TAG, "RemoteException", e); - } - mConfirmDeviceCredentialReceiver = null; - } - - private void handleOnConfirmDeviceCredentialError(int error, String message) { - if (mConfirmDeviceCredentialReceiver == null) { - Slog.w(TAG, "handleOnConfirmDeviceCredentialError null! Error: " - + error + " " + message); - return; - } - try { - mConfirmDeviceCredentialReceiver.onError(error, message); - if (mCurrentAuthSession != null) { - mCurrentAuthSession = null; - } - } catch (RemoteException e) { - Slog.e(TAG, "RemoteException", e); - } - mConfirmDeviceCredentialReceiver = null; - } - - private void handleRegisterCancellationCallback( - IBiometricConfirmDeviceCredentialCallback callback) { - if (mCurrentAuthSession == null) { - Slog.d(TAG, "Current auth session null"); - return; - } - Slog.d(TAG, "Updating cancel callback"); - mCurrentAuthSession.mConfirmDeviceCredentialCallback = callback; - } - private void handleOnError(int cookie, int error, String message) { Slog.d(TAG, "handleOnError: " + error + " cookie: " + cookie); // Errors can either be from the current auth session or the pending auth session. @@ -1307,34 +1139,34 @@ public class BiometricService extends SystemService { // of their intended receivers. try { if (mCurrentAuthSession != null && mCurrentAuthSession.containsCookie(cookie)) { - mCurrentAuthSession.mErrorEscrow = error; mCurrentAuthSession.mErrorStringEscrow = message; - if (mCurrentAuthSession.isFromConfirmDeviceCredential()) { - // If we were invoked by ConfirmDeviceCredential, do not delete the current - // auth session since we still need to respond to cancel signal while - if (DEBUG) Slog.d(TAG, "From CDC, transition to CANCELED_SHOWING_CDC state"); - - // Send the error to ConfirmDeviceCredential so that it goes to Pin/Pattern/Pass - // screen - mCurrentAuthSession.mClientReceiver.onError(error, message); - mCurrentAuthSession.mState = STATE_BIOMETRIC_AUTH_CANCELED_SHOWING_CDC; - mStatusBarService.hideBiometricDialog(); - } else if (mCurrentAuthSession.mState == STATE_AUTH_STARTED) { - mCurrentAuthSession.mState = STATE_ERROR_PENDING_SYSUI; - if (error == BiometricConstants.BIOMETRIC_ERROR_CANCELED) { - mStatusBarService.hideBiometricDialog(); + if (mCurrentAuthSession.mState == STATE_AUTH_STARTED) { + final boolean errorLockout = error == BiometricConstants.BIOMETRIC_ERROR_LOCKOUT + || error == BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT; + if (mCurrentAuthSession.isAllowDeviceCredential() && errorLockout) { + // SystemUI handles transition from biometric to device credential. + mCurrentAuthSession.mState = STATE_SHOWING_DEVICE_CREDENTIAL; + mStatusBarService.onBiometricError(error, message); } else { - mStatusBarService.onBiometricError(message); + mCurrentAuthSession.mState = STATE_ERROR_PENDING_SYSUI; + if (error == BiometricConstants.BIOMETRIC_ERROR_CANCELED) { + mStatusBarService.hideAuthenticationDialog(); + } else { + mStatusBarService.onBiometricError(error, message); + } } } else if (mCurrentAuthSession.mState == STATE_AUTH_PAUSED) { // In the "try again" state, we should forward canceled errors to // the client and and clean up. The only error we should get here is // ERROR_CANCELED due to another client kicking us out. mCurrentAuthSession.mClientReceiver.onError(error, message); - mStatusBarService.hideBiometricDialog(); + mStatusBarService.hideAuthenticationDialog(); mCurrentAuthSession = null; + } else if (mCurrentAuthSession.mState == STATE_SHOWING_DEVICE_CREDENTIAL) { + Slog.d(TAG, "Biometric canceled, ignoring from state: " + + mCurrentAuthSession.mState); } else { Slog.e(TAG, "Impossible session error state: " + mCurrentAuthSession.mState); @@ -1342,12 +1174,38 @@ public class BiometricService extends SystemService { } else if (mPendingAuthSession != null && mPendingAuthSession.containsCookie(cookie)) { if (mPendingAuthSession.mState == STATE_AUTH_CALLED) { - mPendingAuthSession.mClientReceiver.onError(error, message); - mPendingAuthSession = null; + // If any error is received while preparing the auth session (lockout, etc), + // and if device credential is allowed, just show the credential UI. + if (mPendingAuthSession.isAllowDeviceCredential()) { + int authenticators = mPendingAuthSession.mBundle + .getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, 0); + // Disallow biometric and notify SystemUI to show the authentication prompt. + authenticators &= ~Authenticator.TYPE_BIOMETRIC; + mPendingAuthSession.mBundle.putInt( + BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, + authenticators); + + mCurrentAuthSession = mPendingAuthSession; + mCurrentAuthSession.mState = STATE_SHOWING_DEVICE_CREDENTIAL; + mPendingAuthSession = null; + + mStatusBarService.showAuthenticationDialog( + mCurrentAuthSession.mBundle, + mInternalReceiver, + 0 /* biometricModality */, + false /* requireConfirmation */, + mCurrentAuthSession.mUserId, + mCurrentAuthSession.mOpPackageName); + } else { + mPendingAuthSession.mClientReceiver.onError(error, message); + mPendingAuthSession = null; + } } else { Slog.e(TAG, "Impossible pending session error state: " + mPendingAuthSession.mState); } + } else { + Slog.e(TAG, "Unknown cookie: " + cookie); } } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); @@ -1385,9 +1243,12 @@ public class BiometricService extends SystemService { try { switch (reason) { - case BiometricPrompt.DISMISSED_REASON_CONFIRMED: - case BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED: - mKeyStore.addAuthToken(mCurrentAuthSession.mTokenEscrow); + case BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED: + case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED: + case BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED: + if (mCurrentAuthSession.mTokenEscrow != null) { + mKeyStore.addAuthToken(mCurrentAuthSession.mTokenEscrow); + } mCurrentAuthSession.mClientReceiver.onAuthenticationSucceeded(); break; @@ -1439,12 +1300,37 @@ public class BiometricService extends SystemService { mCurrentAuthSession.mCallingUid, mCurrentAuthSession.mCallingPid, mCurrentAuthSession.mCallingUserId, - mCurrentAuthSession.mModality, - mCurrentAuthSession.mConfirmDeviceCredentialCallback); + mCurrentAuthSession.mModality); } + private void handleOnDeviceCredentialPressed() { + Slog.d(TAG, "onDeviceCredentialPressed"); + if (mCurrentAuthSession == null) { + Slog.e(TAG, "Auth session null"); + return; + } + + // Cancel authentication. Skip the token/package check since we are cancelling + // from system server. The interface is permission protected so this is fine. + cancelInternal(null /* token */, null /* package */, false /* fromClient */); + + mCurrentAuthSession.mState = STATE_SHOWING_DEVICE_CREDENTIAL; + } + + /** + * Invoked when each service has notified that its client is ready to be started. When + * all biometrics are ready, this invokes the SystemUI dialog through StatusBar. + */ private void handleOnReadyForAuthentication(int cookie, boolean requireConfirmation, int userId) { + if (mPendingAuthSession == null) { + // Only should happen if a biometric was locked out when authenticate() was invoked. + // In that case, if device credentials are allowed, the UI is already showing. If not + // allowed, the error has already been returned to the caller. + Slog.w(TAG, "Pending auth session null"); + return; + } + Iterator it = mPendingAuthSession.mModalitiesWaiting.entrySet().iterator(); while (it.hasNext()) { Map.Entry<Integer, Integer> pair = (Map.Entry) it.next(); @@ -1486,7 +1372,7 @@ public class BiometricService extends SystemService { } if (!continuing) { - mStatusBarService.showBiometricDialog(mCurrentAuthSession.mBundle, + mStatusBarService.showAuthenticationDialog(mCurrentAuthSession.mBundle, mInternalReceiver, modality, requireConfirmation, userId, mCurrentAuthSession.mOpPackageName); } @@ -1498,16 +1384,21 @@ public class BiometricService extends SystemService { private void handleAuthenticate(IBinder token, long sessionId, int userId, IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle, - int callingUid, int callingPid, int callingUserId, - IBiometricConfirmDeviceCredentialCallback callback) { + int callingUid, int callingPid, int callingUserId) { mHandler.post(() -> { final Pair<Integer, Integer> result = checkAndGetBiometricModality(userId); final int modality = result.first; final int error = result.second; - // Check for errors, notify callback, and return - if (error != BiometricConstants.BIOMETRIC_SUCCESS) { + final boolean credentialAllowed = Utils.isDeviceCredentialAllowed(bundle); + + if (error != BiometricConstants.BIOMETRIC_SUCCESS && credentialAllowed) { + // If there's a problem but device credential is allowed, only show credential UI. + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, + Authenticator.TYPE_CREDENTIAL); + } else if (error != BiometricConstants.BIOMETRIC_SUCCESS) { + // Check for errors, notify callback, and return try { final String hardwareUnavailable = getContext().getString(R.string.biometric_error_hw_unavailable); @@ -1535,7 +1426,7 @@ public class BiometricService extends SystemService { // Start preparing for authentication. Authentication starts when // all modalities requested have invoked onReadyForAuthentication. authenticateInternal(token, sessionId, userId, receiver, opPackageName, bundle, - callingUid, callingPid, callingUserId, modality, callback); + callingUid, callingPid, callingUserId, modality); }); } @@ -1550,8 +1441,7 @@ public class BiometricService extends SystemService { */ private void authenticateInternal(IBinder token, long sessionId, int userId, IBiometricServiceReceiver receiver, String opPackageName, Bundle bundle, - int callingUid, int callingPid, int callingUserId, int modality, - IBiometricConfirmDeviceCredentialCallback callback) { + int callingUid, int callingPid, int callingUserId, int modality) { try { boolean requireConfirmation = bundle.getBoolean( BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true /* default */); @@ -1565,27 +1455,49 @@ public class BiometricService extends SystemService { // with the cookie. Once all cookies are received, we can show the prompt // and let the services start authenticating. The cookie should be non-zero. final int cookie = mRandom.nextInt(Integer.MAX_VALUE - 1) + 1; + final int authenticators = bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED); Slog.d(TAG, "Creating auth session. Modality: " + modality - + ", cookie: " + cookie); - final HashMap<Integer, Integer> authenticators = new HashMap<>(); - authenticators.put(modality, cookie); - mPendingAuthSession = new AuthSession(authenticators, token, sessionId, userId, - receiver, opPackageName, bundle, callingUid, callingPid, callingUserId, - modality, requireConfirmation, callback); - mPendingAuthSession.mState = STATE_AUTH_CALLED; - // No polymorphism :( - if ((modality & TYPE_FINGERPRINT) != 0) { - mFingerprintService.prepareForAuthentication(token, sessionId, userId, - mInternalReceiver, opPackageName, cookie, - callingUid, callingPid, callingUserId); - } - if ((modality & TYPE_IRIS) != 0) { - Slog.w(TAG, "Iris unsupported"); + + ", cookie: " + cookie + + ", authenticators: " + authenticators); + final HashMap<Integer, Integer> modalities = new HashMap<>(); + + // If it's only device credential, we don't need to wait - LockSettingsService is + // always ready to check credential (SystemUI invokes that path). + if ((authenticators & ~Authenticator.TYPE_CREDENTIAL) != 0) { + modalities.put(modality, cookie); } - if ((modality & TYPE_FACE) != 0) { - mFaceService.prepareForAuthentication(requireConfirmation, - token, sessionId, userId, mInternalReceiver, opPackageName, - cookie, callingUid, callingPid, callingUserId); + mPendingAuthSession = new AuthSession(modalities, token, sessionId, userId, + receiver, opPackageName, bundle, callingUid, callingPid, callingUserId, + modality, requireConfirmation); + + if (authenticators == Authenticator.TYPE_CREDENTIAL) { + mPendingAuthSession.mState = STATE_SHOWING_DEVICE_CREDENTIAL; + mCurrentAuthSession = mPendingAuthSession; + mPendingAuthSession = null; + + mStatusBarService.showAuthenticationDialog( + mCurrentAuthSession.mBundle, + mInternalReceiver, + 0 /* biometricModality */, + false /* requireConfirmation */, + mCurrentAuthSession.mUserId, + mCurrentAuthSession.mOpPackageName); + } else { + mPendingAuthSession.mState = STATE_AUTH_CALLED; + // No polymorphism :( + if ((modality & TYPE_FINGERPRINT) != 0) { + mFingerprintService.prepareForAuthentication(token, sessionId, userId, + mInternalReceiver, opPackageName, cookie, + callingUid, callingPid, callingUserId); + } + if ((modality & TYPE_IRIS) != 0) { + Slog.w(TAG, "Iris unsupported"); + } + if ((modality & TYPE_FACE) != 0) { + mFaceService.prepareForAuthentication(requireConfirmation, + token, sessionId, userId, mInternalReceiver, opPackageName, + cookie, callingUid, callingPid, callingUserId); + } } } catch (RemoteException e) { Slog.e(TAG, "Unable to start authentication", e); @@ -1598,20 +1510,7 @@ public class BiometricService extends SystemService { return; } - if (mCurrentAuthSession != null - && mCurrentAuthSession.mState == STATE_BIOMETRIC_AUTH_CANCELED_SHOWING_CDC) { - if (DEBUG) Slog.d(TAG, "Cancel received while ConfirmDeviceCredential showing"); - try { - mCurrentAuthSession.mConfirmDeviceCredentialCallback.cancel(); - } catch (RemoteException e) { - Slog.e(TAG, "Unable to cancel ConfirmDeviceCredential", e); - } - - // TODO(b/123378871): Remove when moved. Piggy back on this for now to clean up. - handleOnConfirmDeviceCredentialError(BiometricConstants.BIOMETRIC_ERROR_CANCELED, - getContext().getString(R.string.biometric_error_canceled)); - } else if (mCurrentAuthSession != null - && mCurrentAuthSession.mState != STATE_AUTH_STARTED) { + if (mCurrentAuthSession != null && mCurrentAuthSession.mState != STATE_AUTH_STARTED) { // We need to check the current authenticators state. If we're pending confirm // or idle, we need to dismiss the dialog and send an ERROR_CANCELED to the client, // since we won't be getting an onError from the driver. @@ -1624,24 +1523,12 @@ public class BiometricService extends SystemService { ); mCurrentAuthSession = null; - mStatusBarService.hideBiometricDialog(); + mStatusBarService.hideAuthenticationDialog(); } catch (RemoteException e) { Slog.e(TAG, "Remote exception", e); } } else { - boolean fromCDC = false; - if (mCurrentAuthSession != null) { - fromCDC = mCurrentAuthSession.mBundle.getBoolean( - BiometricPrompt.KEY_FROM_CONFIRM_DEVICE_CREDENTIAL, false); - } - - if (fromCDC) { - if (DEBUG) Slog.d(TAG, "Cancelling from CDC"); - cancelInternal(token, opPackageName, false /* fromClient */); - } else { - cancelInternal(token, opPackageName, true /* fromClient */); - } - + cancelInternal(token, opPackageName, true /* fromClient */); } } diff --git a/services/core/java/com/android/server/biometrics/Utils.java b/services/core/java/com/android/server/biometrics/Utils.java index 4fa29ac541f9..ed5f9de01bcf 100644 --- a/services/core/java/com/android/server/biometrics/Utils.java +++ b/services/core/java/com/android/server/biometrics/Utils.java @@ -17,10 +17,15 @@ package com.android.server.biometrics; import android.content.Context; +import android.hardware.biometrics.Authenticator; +import android.hardware.biometrics.BiometricPrompt; import android.os.Build; +import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; +import com.android.internal.annotations.VisibleForTesting; + public class Utils { public static boolean isDebugEnabled(Context context, int targetUserId) { if (targetUserId == UserHandle.USER_NULL) { @@ -38,4 +43,43 @@ public class Utils { } return true; } + + /** + * Combine {@link BiometricPrompt#KEY_ALLOW_DEVICE_CREDENTIAL} with + * {@link BiometricPrompt#KEY_AUTHENTICATORS_ALLOWED}, as the former is not flexible + * enough. + */ + public static void combineAuthenticatorBundles(Bundle bundle) { + boolean biometricEnabled = true; // enabled by default + boolean credentialEnabled = bundle.getBoolean( + BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL, false); + if (bundle.get(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED) != null) { + final int authenticatorFlags = + bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED); + biometricEnabled = (authenticatorFlags & Authenticator.TYPE_BIOMETRIC) != 0; + // Using both KEY_ALLOW_DEVICE_CREDENTIAL and KEY_AUTHENTICATORS_ALLOWED together + // is not supported. Default to overwriting. + credentialEnabled = (authenticatorFlags & Authenticator.TYPE_CREDENTIAL) != 0; + } + + bundle.remove(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL); + + int authenticators = 0; + if (biometricEnabled) { + authenticators |= Authenticator.TYPE_BIOMETRIC; + } + if (credentialEnabled) { + authenticators |= Authenticator.TYPE_CREDENTIAL; + } + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + } + + /** + * @param bundle should be first processed by {@link #combineAuthenticatorBundles(Bundle)} + * @return true if device credential allowed. + */ + public static boolean isDeviceCredentialAllowed(Bundle bundle) { + final int authenticators = bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED); + return (authenticators & Authenticator.TYPE_CREDENTIAL) != 0; + } } diff --git a/services/core/java/com/android/server/compat/OWNERS b/services/core/java/com/android/server/compat/OWNERS new file mode 100644 index 000000000000..2b7cdb0cbce9 --- /dev/null +++ b/services/core/java/com/android/server/compat/OWNERS @@ -0,0 +1,7 @@ +# Use this reviewer by default. +platform-compat-eng+reviews@google.com + +andreionea@google.com +atrost@google.com +mathewi@google.com +satayev@google.com diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 852b26d1ff07..a7378880a91d 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -105,6 +105,15 @@ public class PlatformCompat extends IPlatformCompat.Stub { CompatConfig.get().dumpConfig(pw); } + /** + * Clears information stored about events reported on behalf of an app. + * To be called once upon app start or end. A second call would be a no-op. + * @param appInfo the app to reset + */ + public void resetReporting(ApplicationInfo appInfo) { + mChangeReporter.resetReportedChanges(appInfo.uid); + } + private ApplicationInfo getApplicationInfo(String packageName) { try { return mContext.getPackageManager().getApplicationInfo(packageName, 0); diff --git a/services/core/java/com/android/server/display/ColorFade.java b/services/core/java/com/android/server/display/ColorFade.java index c46fc20b3cc8..29026e8affcf 100644 --- a/services/core/java/com/android/server/display/ColorFade.java +++ b/services/core/java/com/android/server/display/ColorFade.java @@ -114,6 +114,8 @@ final class ColorFade { private final FloatBuffer mVertexBuffer = createNativeFloatBuffer(8); private final FloatBuffer mTexCoordBuffer = createNativeFloatBuffer(8); + private final Transaction mTransaction = new Transaction(); + /** * Animates an color fade warming up. */ @@ -659,14 +661,10 @@ final class ColorFade { private boolean showSurface(float alpha) { if (!mSurfaceVisible || mSurfaceAlpha != alpha) { - SurfaceControl.openTransaction(); - try { - mSurfaceControl.setLayer(COLOR_FADE_LAYER); - mSurfaceControl.setAlpha(alpha); - mSurfaceControl.show(); - } finally { - SurfaceControl.closeTransaction(); - } + mTransaction.setLayer(mSurfaceControl, COLOR_FADE_LAYER) + .setAlpha(mSurfaceControl, alpha) + .show(mSurfaceControl) + .apply(); mSurfaceVisible = true; mSurfaceAlpha = alpha; } diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index f20003a2ee04..b7fcd3f19334 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -3569,9 +3569,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!calledWithValidTokenLocked(token)) { return; } - if (mCurClient != null && mCurClient.client != null) { - executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIO( - MSG_APPLY_IME_VISIBILITY, setVisible ? 1 : 0, mCurClient)); + if (!setVisible) { + // Client hides the IME directly. + if (mCurClient != null && mCurClient.client != null) { + executeOrSendMessage(mCurClient.client, mCaller.obtainMessageIO( + MSG_APPLY_IME_VISIBILITY, setVisible ? 1 : 0, mCurClient)); + } + } else { + // Send to window manager to show IME after IME layout finishes. + mWindowManagerInternal.showImePostLayout(mLastImeTargetWindow); } } } diff --git a/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java b/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java index fc4430640b90..e90612e54105 100644 --- a/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java +++ b/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java @@ -16,6 +16,10 @@ package com.android.server.integrity.engine; +import android.util.Slog; + +import com.android.server.integrity.model.AppInstallMetadata; +import com.android.server.integrity.model.IntegrityCheckResult; import com.android.server.integrity.model.Rule; import java.util.ArrayList; @@ -24,8 +28,8 @@ import java.util.List; /** * The engine used to evaluate rules against app installs. * - * <p>Every app install is evaluated against rules (pushed by the verifier) by the evaluation engine - * to allow/block that install. + * <p>Every app install is evaluated against rules (pushed by the verifier) by the evaluation + * engine to allow/block that install. */ public final class RuleEvaluationEngine { private static final String TAG = "RuleEvaluation"; @@ -34,15 +38,6 @@ public final class RuleEvaluationEngine { // installs against rules. private static RuleEvaluationEngine sRuleEvaluationEngine; - // The subset of rules loaded to be used to evaluate an app install request. - // TODO: Load rules relevant to app installs. - private List<Rule> mRules; - - private RuleEvaluationEngine() { - // Initialize rules with the empty rule set. - mRules = new ArrayList<>(); - } - /** * Provide a singleton instance of the rule evaluation engine. */ @@ -52,4 +47,33 @@ public final class RuleEvaluationEngine { } return sRuleEvaluationEngine; } + + /** + * Load, and match the list of rules against an app install metadata. + * + * @param appInstallMetadata Metadata of the app to be installed, and to evaluate the rules + * against. + * @return A rule matching the metadata. If there are multiple matching rules, returns any. If + * no rules are matching, returns {@link Rule#EMPTY}. + */ + public IntegrityCheckResult evaluate(AppInstallMetadata appInstallMetadata) { + List<Rule> rules = loadRules(appInstallMetadata); + Rule matchedRule = RuleEvaluator.evaluateRules(rules, appInstallMetadata); + if (matchedRule == Rule.EMPTY) { + return IntegrityCheckResult.allow(); + } else { + switch (matchedRule.getEffect()) { + case DENY: + return IntegrityCheckResult.deny(matchedRule); + default: + Slog.e(TAG, "Matched a non-DENY rule: " + matchedRule); + return IntegrityCheckResult.allow(); + } + } + } + + private List<Rule> loadRules(AppInstallMetadata appInstallMetadata) { + // TODO: Load rules + return new ArrayList<>(); + } } diff --git a/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java new file mode 100644 index 000000000000..4ed581d6e915 --- /dev/null +++ b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java @@ -0,0 +1,105 @@ +/* + * 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.integrity.engine; + +import android.util.Slog; + +import com.android.server.integrity.model.AppInstallMetadata; +import com.android.server.integrity.model.AtomicFormula; +import com.android.server.integrity.model.Formula; +import com.android.server.integrity.model.OpenFormula; +import com.android.server.integrity.model.Rule; + +import java.util.List; + +/** + * A helper class for evaluating rules against app install metadata to find if there are matching + * rules. + */ +final class RuleEvaluator { + + private static final String TAG = "RuleEvaluator"; + + /** + * Match the list of rules against an app install metadata. + * + * @param rules The list of rules to evaluate. + * @param appInstallMetadata Metadata of the app to be installed, and to evaluate the rules + * against. + * @return A rule matching the metadata. If there are multiple matching rules, returns any. If + * no rules are matching, returns {@link Rule#EMPTY}. + */ + static Rule evaluateRules(List<Rule> rules, AppInstallMetadata appInstallMetadata) { + for (Rule rule : rules) { + if (isMatch(rule, appInstallMetadata)) { + return rule; + } + } + return Rule.EMPTY; + } + + /** + * Match a rule against app install metadata. + */ + private static boolean isMatch(Rule rule, AppInstallMetadata appInstallMetadata) { + return isMatch(rule.getFormula(), appInstallMetadata); + } + + private static boolean isMatch(Formula formula, AppInstallMetadata appInstallMetadata) { + if (formula instanceof AtomicFormula) { + AtomicFormula atomicFormula = (AtomicFormula) formula; + switch (atomicFormula.getKey()) { + case PACKAGE_NAME: + return atomicFormula.isMatch(appInstallMetadata.getPackageName()); + case APP_CERTIFICATE: + return atomicFormula.isMatch(appInstallMetadata.getAppCertificate()); + case INSTALLER_NAME: + return atomicFormula.isMatch(appInstallMetadata.getInstallerName()); + case INSTALLER_CERTIFICATE: + return atomicFormula.isMatch(appInstallMetadata.getInstallerCertificate()); + case VERSION_CODE: + return atomicFormula.isMatch(appInstallMetadata.getVersionCode()); + case PRE_INSTALLED: + return atomicFormula.isMatch(appInstallMetadata.isPreInstalled()); + default: + Slog.i(TAG, String.format("Returned no match for unknown key %s", + atomicFormula.getKey())); + return false; + } + } else if (formula instanceof OpenFormula) { + OpenFormula openFormula = (OpenFormula) formula; + // A rule is in disjunctive normal form, so there are no OR connectors. + switch (openFormula.getConnector()) { + case NOT: + // NOT connector has only 1 formula attached. + return !isMatch(openFormula.getFormulas().get(0), appInstallMetadata); + case AND: + boolean result = true; + for (Formula subFormula : openFormula.getFormulas()) { + result &= isMatch(subFormula, appInstallMetadata); + } + return result; + default: + Slog.i(TAG, String.format("Returned no match for unknown connector %s", + openFormula.getConnector())); + return false; + } + } + + return false; + } +} diff --git a/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java b/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java index 814b8e1d783b..660bd2e0d62e 100644 --- a/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java +++ b/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java @@ -16,29 +16,154 @@ package com.android.server.integrity.model; +import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkNotNull; + +import android.annotation.Nullable; + /** * The app install metadata. * * <p>The integrity component retrieves metadata for app installs from package manager, passing it * to the rule evaluation engine to evaluate the metadata against the rules. + * + * <p>Instances of this class are immutable. */ public final class AppInstallMetadata { - final String mPackageName; + private final String mPackageName; // Raw string encoding for the SHA-256 hash of the certificate of the app. - final String mAppCertificate; - final String mInstallerName; + private final String mAppCertificate; + private final String mInstallerName; // Raw string encoding for the SHA-256 hash of the certificate of the installer. - final String mInstallerCertificate; - final int mVersionCode; - final boolean mIsPreInstalled; - - public AppInstallMetadata(String packageName, String appCertificate, String installerName, - String installerCertificate, int versionCode, boolean isPreInstalled) { - this.mPackageName = packageName; - this.mAppCertificate = appCertificate; - this.mInstallerName = installerName; - this.mInstallerCertificate = installerCertificate; - this.mVersionCode = versionCode; - this.mIsPreInstalled = isPreInstalled; + private final String mInstallerCertificate; + private final int mVersionCode; + private final boolean mIsPreInstalled; + + private AppInstallMetadata(Builder builder) { + this.mPackageName = builder.mPackageName; + this.mAppCertificate = builder.mAppCertificate; + this.mInstallerName = builder.mInstallerName; + this.mInstallerCertificate = builder.mInstallerCertificate; + this.mVersionCode = builder.mVersionCode; + this.mIsPreInstalled = builder.mIsPreInstalled; + } + + public String getPackageName() { + return mPackageName; + } + + public String getAppCertificate() { + return mAppCertificate; + } + + @Nullable + public String getInstallerName() { + return mInstallerName; + } + + @Nullable + public String getInstallerCertificate() { + return mInstallerCertificate; + } + + /** + * @see AppInstallMetadata.Builder#setVersionCode(int) + */ + public int getVersionCode() { + return mVersionCode; + } + + /** + * @see AppInstallMetadata.Builder#setIsPreInstalled(boolean) + */ + public boolean isPreInstalled() { + return mIsPreInstalled; + } + + /** + * Builder class for constructing {@link AppInstallMetadata} objects. + */ + public static final class Builder { + private String mPackageName; + private String mAppCertificate; + private String mInstallerName; + private String mInstallerCertificate; + private int mVersionCode; + private boolean mIsPreInstalled; + + /** + * Set package name of the app to be installed. + * + * @see AppInstallMetadata#getPackageName() + */ + public Builder setPackageName(String packageName) { + this.mPackageName = checkNotNull(packageName); + return this; + } + + /** + * Set certificate of the app to be installed. + * + * <p>It is represented as the raw string encoding for the SHA-256 hash of the certificate + * of the app. + * + * @see AppInstallMetadata#getAppCertificate() + */ + public Builder setAppCertificate(String appCertificate) { + this.mAppCertificate = checkNotNull(appCertificate); + return this; + } + + /** + * Set name of the installer installing the app. + * + * @see AppInstallMetadata#getInstallerName() + */ + public Builder setInstallerName(String installerName) { + this.mInstallerName = checkNotNull(installerName); + return this; + } + + /** + * Set certificate of the installer installing the app. + * + * <p>It is represented as the raw string encoding for the SHA-256 hash of the certificate + * of the installer. + * + * @see AppInstallMetadata#getInstallerCertificate() + */ + public Builder setInstallerCertificate(String installerCertificate) { + this.mInstallerCertificate = checkNotNull(installerCertificate); + return this; + } + + /** + * Set version code of the app to be installed. + * + * @see AppInstallMetadata#getVersionCode() + */ + public Builder setVersionCode(int versionCode) { + this.mVersionCode = versionCode; + return this; + } + + /** + * Set whether the app is pre-installed on the device or not. + * + * @see AppInstallMetadata#isPreInstalled() + */ + public Builder setIsPreInstalled(boolean isPreInstalled) { + this.mIsPreInstalled = isPreInstalled; + return this; + } + + /** + * Build {@link AppInstallMetadata}. + */ + public AppInstallMetadata build() { + checkArgument(mPackageName != null); + checkArgument(mAppCertificate != null); + return new AppInstallMetadata(this); + } } } diff --git a/services/core/java/com/android/server/integrity/model/AtomicFormula.java b/services/core/java/com/android/server/integrity/model/AtomicFormula.java new file mode 100644 index 000000000000..dde8c2a31537 --- /dev/null +++ b/services/core/java/com/android/server/integrity/model/AtomicFormula.java @@ -0,0 +1,213 @@ +/* + * 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.integrity.model; + +import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkNotNull; + +import android.annotation.Nullable; +import android.util.Slog; + +/** + * Represents a simple formula consisting of an app install metadata field and a value. + * + * <p>Instances of this class are immutable. + */ +public final class AtomicFormula extends Formula { + + private static final String TAG = "AtomicFormula"; + + public enum Key { + PACKAGE_NAME, + APP_CERTIFICATE, + INSTALLER_NAME, + INSTALLER_CERTIFICATE, + VERSION_CODE, + PRE_INSTALLED + } + + public enum Operator { + EQ, + LT, + LE, + GT, + GE + } + + private final Key mKey; + private final Operator mOperator; + + // The value of a key can take either 1 of 3 forms: String, Integer, or Boolean. + // It cannot have multiple values. + @Nullable + private final String mStringValue; + @Nullable + private final Integer mIntValue; + @Nullable + private final Boolean mBoolValue; + + public AtomicFormula(Key key, Operator operator, String stringValue) { + validateOperator(key, operator); + checkArgument( + key == Key.PACKAGE_NAME || key == Key.APP_CERTIFICATE || key == Key.INSTALLER_NAME + || key == Key.INSTALLER_CERTIFICATE, + String.format("Key %s cannot have string value", key)); + this.mKey = checkNotNull(key); + this.mOperator = checkNotNull(operator); + this.mStringValue = checkNotNull(stringValue); + this.mIntValue = null; + this.mBoolValue = null; + } + + public AtomicFormula(Key key, Operator operator, Integer intValue) { + validateOperator(key, operator); + checkArgument(key == Key.VERSION_CODE, + String.format("Key %s cannot have integer value", key)); + this.mKey = checkNotNull(key); + this.mOperator = checkNotNull(operator); + this.mStringValue = null; + this.mIntValue = checkNotNull(intValue); + this.mBoolValue = null; + } + + public AtomicFormula(Key key, Operator operator, Boolean boolValue) { + validateOperator(key, operator); + checkArgument(key == Key.PRE_INSTALLED, + String.format("Key %s cannot have boolean value", key)); + this.mKey = checkNotNull(key); + this.mOperator = checkNotNull(operator); + this.mStringValue = null; + this.mIntValue = null; + this.mBoolValue = checkNotNull(boolValue); + } + + public Key getKey() { + return mKey; + } + + public Operator getOperator() { + return mOperator; + } + + public String getStringValue() { + return mStringValue; + } + + public Integer getIntValue() { + return mIntValue; + } + + public Boolean getBoolValue() { + return mBoolValue; + } + + /** + * Get string representation of the value of the key in the formula. + * + * @return string representation of the value of the key. + */ + public String getValue() { + if (mStringValue != null) { + return mStringValue; + } + if (mIntValue != null) { + return mIntValue.toString(); + } + return mBoolValue.toString(); + } + + @Override + public String toString() { + return String.format("%s %s %s", mKey, mOperator, getValue()); + } + + /** + * Check if the formula is true when substituting its {@link Key} with the string value. + * + * @param value String value to substitute the key with. + * @return {@code true} if the formula is true, and {@code false} otherwise. + */ + public boolean isMatch(String value) { + switch (mOperator) { + case EQ: + return mStringValue.equals(value); + } + Slog.i(TAG, String.format("Found operator %s for value %s", mOperator, mStringValue)); + return false; + } + + /** + * Check if the formula is true when substituting its {@link Key} with the integer value. + * + * @param value Integer value to substitute the key with. + * @return {@code true} if the formula is true, and {@code false} otherwise. + */ + public boolean isMatch(int value) { + switch (mOperator) { + case EQ: + return mIntValue == value; + case LE: + return mIntValue <= value; + case LT: + return mIntValue < value; + case GE: + return mIntValue >= value; + case GT: + return mIntValue > value; + } + Slog.i(TAG, String.format("Found operator %s for value %s", mOperator, mIntValue)); + return false; + } + + /** + * Check if the formula is true when substituting its {@link Key} with the boolean value. + * + * @param value Boolean value to substitute the key with. + * @return {@code true} if the formula is true, and {@code false} otherwise. + */ + public boolean isMatch(boolean value) { + switch (mOperator) { + case EQ: + return mBoolValue == value; + } + Slog.i(TAG, String.format("Found operator %s for value %s", mOperator, mBoolValue)); + return false; + } + + private void validateOperator(Key key, Operator operator) { + boolean validOperator; + switch (key) { + case PACKAGE_NAME: + case APP_CERTIFICATE: + case INSTALLER_NAME: + case INSTALLER_CERTIFICATE: + case PRE_INSTALLED: + validOperator = (operator == Operator.EQ); + break; + case VERSION_CODE: + validOperator = true; + break; + default: + Slog.i(TAG, String.format("Found operator %s for key %s", operator, key)); + validOperator = false; + } + if (!validOperator) { + throw new IllegalArgumentException( + String.format("Invalid operator %s used for key %s", operator, key)); + } + } +} diff --git a/core/java/android/hardware/biometrics/IBiometricConfirmDeviceCredentialCallback.aidl b/services/core/java/com/android/server/integrity/model/Formula.java index 8b35852efd31..9db445378dce 100644 --- a/core/java/android/hardware/biometrics/IBiometricConfirmDeviceCredentialCallback.aidl +++ b/services/core/java/com/android/server/integrity/model/Formula.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package android.hardware.biometrics; +package com.android.server.integrity.model; /** - * Communication channel between ConfirmDeviceCredential / ConfirmLock* and BiometricService. - * @hide + * Represents a rule logic/content. */ -interface IBiometricConfirmDeviceCredentialCallback { - // Invoked when authentication should be canceled. - oneway void cancel(); -}
\ No newline at end of file +public abstract class Formula { + +} diff --git a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java new file mode 100644 index 000000000000..7aeb0c1b188e --- /dev/null +++ b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java @@ -0,0 +1,67 @@ +/* + * 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.integrity.model; + +/** + * A class encapsulating the result from the evaluation engine after evaluating rules against app + * install metadata. + * + * <p>It contains the outcome effect (whether to allow or block the install), and the rule causing + * that effect. + */ +public final class IntegrityCheckResult { + + public enum Effect { + ALLOW, + DENY + } + + private final Effect mEffect; + private final Rule mRule; + + private IntegrityCheckResult(Effect effect, Rule rule) { + this.mEffect = effect; + this.mRule = rule; + } + + public Effect getEffect() { + return mEffect; + } + + public Rule getRule() { + return mRule; + } + + /** + * Create an ALLOW evaluation outcome. + * + * @return An evaluation outcome with ALLOW effect and empty rule. + */ + public static IntegrityCheckResult allow() { + return new IntegrityCheckResult(Effect.ALLOW, Rule.EMPTY); + } + + /** + * Create a DENY evaluation outcome. + * + * @param rule Rule causing the DENY effect. + * @return An evaluation outcome with DENY effect and rule causing that effect. + */ + public static IntegrityCheckResult deny(Rule rule) { + return new IntegrityCheckResult(Effect.DENY, rule); + } +} diff --git a/services/core/java/com/android/server/integrity/model/OpenFormula.java b/services/core/java/com/android/server/integrity/model/OpenFormula.java new file mode 100644 index 000000000000..5ba9f46f5aba --- /dev/null +++ b/services/core/java/com/android/server/integrity/model/OpenFormula.java @@ -0,0 +1,80 @@ +/* + * 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.integrity.model; + +import static com.android.internal.util.Preconditions.checkArgument; +import static com.android.internal.util.Preconditions.checkNotNull; + +import java.util.Collections; +import java.util.List; + +/** + * Represents a complex formula consisting of other simple and complex formulas. + * + * <p>Instances of this class are immutable. + */ +public final class OpenFormula extends Formula { + + public enum Connector { + AND, + OR, + NOT + } + + private final Connector mConnector; + private final List<Formula> mFormulas; + + public OpenFormula(Connector connector, List<Formula> formulas) { + validateFormulas(connector, formulas); + this.mConnector = checkNotNull(connector); + this.mFormulas = Collections.unmodifiableList(checkNotNull(formulas)); + } + + public Connector getConnector() { + return mConnector; + } + + public List<Formula> getFormulas() { + return mFormulas; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < mFormulas.size(); i++) { + if (i > 0) { + sb.append(String.format(" %s ", mConnector)); + } + sb.append(mFormulas.get(i).toString()); + } + return sb.toString(); + } + + private void validateFormulas(Connector connector, List<Formula> formulas) { + switch (connector) { + case AND: + case OR: + checkArgument(formulas.size() >= 2, + String.format("Connector %s must have at least 2 formulas", connector)); + break; + case NOT: + checkArgument(formulas.size() == 1, + String.format("Connector %s must have 1 formula only", connector)); + break; + } + } +} diff --git a/services/core/java/com/android/server/integrity/model/Rule.java b/services/core/java/com/android/server/integrity/model/Rule.java index a6e08d8504ed..41611d0f7154 100644 --- a/services/core/java/com/android/server/integrity/model/Rule.java +++ b/services/core/java/com/android/server/integrity/model/Rule.java @@ -18,8 +18,6 @@ package com.android.server.integrity.model; import static com.android.internal.util.Preconditions.checkNotNull; -import android.annotation.Nullable; - /** * Represent rules to be used in the rule evaluation engine to match against app installs. * @@ -27,35 +25,12 @@ import android.annotation.Nullable; */ public final class Rule { - // Holds an empty rule instance. - public static final Rule EMPTY = new Rule(); - - enum Key { - PACKAGE_NAME, - APP_CERTIFICATE, - INSTALLER_NAME, - INSTALLER_CERTIFICATE, - VERSION_CODE, - PRE_INSTALLED - } - - enum Effect { + public enum Effect { DENY } - enum Operator { - EQ, - LT, - LE, - GT, - GE - } - - enum Connector { - AND, - OR, - NOT - } + // Holds an empty rule instance. + public static final Rule EMPTY = new Rule(); private final Formula mFormula; private final Effect mEffect; @@ -87,74 +62,8 @@ public final class Rule { return mEffect; } - // TODO: Consider moving the sub-components to their respective model class. - - /** - * Represents a rule logic/content. - */ - abstract static class Formula { - - } - - /** - * Represents a simple formula consisting of an app install metadata field and a value. - */ - public static final class AtomicFormula extends Formula { - - final Key mKey; - final Operator mOperator; - - // The value of a key can take either 1 of 3 forms: String, Integer, or Boolean. - // It cannot have multiple values. - @Nullable - final String mStringValue; - @Nullable - final Integer mIntValue; - @Nullable - final Boolean mBoolValue; - - public AtomicFormula(Key key, Operator operator, String stringValue) { - // TODO: Add validators - this.mKey = key; - this.mOperator = operator; - this.mStringValue = stringValue; - this.mIntValue = null; - this.mBoolValue = null; - } - - public AtomicFormula(Key key, Operator operator, Integer intValue) { - // TODO: Add validators - this.mKey = key; - this.mOperator = operator; - this.mStringValue = null; - this.mIntValue = intValue; - this.mBoolValue = null; - } - - public AtomicFormula(Key key, Operator operator, Boolean boolValue) { - // TODO: Add validators - this.mKey = key; - this.mOperator = operator; - this.mStringValue = null; - this.mIntValue = null; - this.mBoolValue = boolValue; - } - } - - /** - * Represents a complex formula consisting of other simple and complex formulas. - */ - public static final class OpenFormula extends Formula { - - final Connector mConnector; - final Formula mMainFormula; - final Formula mAuxiliaryFormula; - - public OpenFormula(Connector connector, Formula mainFormula, - @Nullable Formula auxiliaryFormula) { - this.mConnector = checkNotNull(connector); - this.mMainFormula = checkNotNull(mainFormula); - this.mAuxiliaryFormula = auxiliaryFormula; - } + @Override + public String toString() { + return String.format("Rule: %s, %s", mFormula, mEffect); } } diff --git a/services/core/java/com/android/server/notification/GroupHelper.java b/services/core/java/com/android/server/notification/GroupHelper.java index b1cd62788073..9cb8a0105286 100644 --- a/services/core/java/com/android/server/notification/GroupHelper.java +++ b/services/core/java/com/android/server/notification/GroupHelper.java @@ -16,9 +16,13 @@ package com.android.server.notification; import android.service.notification.StatusBarNotification; +import android.util.ArrayMap; +import android.util.ArraySet; import android.util.Log; import android.util.Slog; +import com.android.internal.annotations.VisibleForTesting; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; @@ -37,6 +41,11 @@ public class GroupHelper { private final Callback mCallback; private final int mAutoGroupAtCount; + // count the number of ongoing notifications per group + // userId -> (package name -> (group Id -> (set of notification keys))) + final ArrayMap<String, ArraySet<String>> + mOngoingGroupCount = new ArrayMap<>(); + // Map of user : <Map of package : notification keys>. Only contains notifications that are not // grouped by the app (aka no group or sort key). Map<Integer, Map<String, LinkedHashSet<String>>> mUngroupedNotifications = new HashMap<>(); @@ -46,10 +55,52 @@ public class GroupHelper { mCallback = callback; } + private String generatePackageGroupKey(int userId, String pkg, String group) { + return userId + "|" + pkg + "|" + group; + } + + @VisibleForTesting + protected int getOngoingGroupCount(int userId, String pkg, String group) { + String key = generatePackageGroupKey(userId, pkg, group); + return mOngoingGroupCount.getOrDefault(key, new ArraySet<>(0)).size(); + } + + private void addToOngoingGroupCount(StatusBarNotification sbn, boolean add) { + if (sbn.getNotification().isGroupSummary()) return; + if (!sbn.isOngoing() && add) return; + String group = sbn.getGroup(); + if (group == null) return; + int userId = sbn.getUser().getIdentifier(); + String key = generatePackageGroupKey(userId, sbn.getPackageName(), group); + ArraySet<String> notifications = mOngoingGroupCount.getOrDefault(key, new ArraySet<>(0)); + if (add) { + notifications.add(sbn.getKey()); + mOngoingGroupCount.put(key, notifications); + } else { + notifications.remove(sbn.getKey()); + // we dont need to put it back if it is default + } + String combinedKey = generatePackageGroupKey(userId, sbn.getPackageName(), group); + boolean needsOngoingFlag = notifications.size() > 0; + mCallback.updateAutogroupSummary(sbn.getKey(), needsOngoingFlag); + } + + public void onNotificationUpdated(StatusBarNotification childSbn, + boolean autogroupSummaryExists) { + if (childSbn.getGroup() != AUTOGROUP_KEY + || childSbn.getNotification().isGroupSummary()) return; + if (childSbn.isOngoing()) { + addToOngoingGroupCount(childSbn, true); + } else { + addToOngoingGroupCount(childSbn, false); + } + } + public void onNotificationPosted(StatusBarNotification sbn, boolean autogroupSummaryExists) { if (DEBUG) Log.i(TAG, "POSTED " + sbn.getKey()); try { List<String> notificationsToGroup = new ArrayList<>(); + if (autogroupSummaryExists) addToOngoingGroupCount(sbn, true); if (!sbn.isAppGroup()) { // Not grouped by the app, add to the list of notifications for the app; // send grouping update if app exceeds the autogrouping limit. @@ -90,6 +141,7 @@ public class GroupHelper { public void onNotificationRemoved(StatusBarNotification sbn) { try { + addToOngoingGroupCount(sbn, false); maybeUngroup(sbn, true, sbn.getUserId()); } catch (Exception e) { Slog.e(TAG, "Error processing canceled notification", e); @@ -159,5 +211,6 @@ public class GroupHelper { void removeAutoGroup(String key); void addAutoGroupSummary(int userId, String pkg, String triggeringKey); void removeAutoGroupSummary(int user, String pkg); + void updateAutogroupSummary(String key, boolean needsOngoingFlag); } } diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 48b0fd6e86d1..8560ae6d2e3a 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -185,7 +185,7 @@ abstract public class ManagedServices { } protected void addDefaultComponentOrPackage(String packageOrComponent) { - if (packageOrComponent != null) { + if (!TextUtils.isEmpty(packageOrComponent)) { synchronized (mDefaultsLock) { ComponentName cn = ComponentName.unflattenFromString(packageOrComponent); if (cn == null) { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index a8ba82a74065..4293ccadd1fb 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -94,7 +94,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_TOAST; import static com.android.server.am.PendingIntentRecord.FLAG_ACTIVITY_SENDER; import static com.android.server.am.PendingIntentRecord.FLAG_BROADCAST_SENDER; import static com.android.server.am.PendingIntentRecord.FLAG_SERVICE_SENDER; -import static com.android.server.notification.PreferencesHelper.DEFAULT_ALLOW_BUBBLE; import static com.android.server.utils.PriorityDump.PRIORITY_ARG; import static com.android.server.utils.PriorityDump.PRIORITY_ARG_CRITICAL; import static com.android.server.utils.PriorityDump.PRIORITY_ARG_NORMAL; @@ -523,7 +522,6 @@ public class NotificationManagerService extends SystemService { } - void loadDefaultApprovedServices(int userId) { String defaultListenerAccess = getContext().getResources().getString( com.android.internal.R.string.config_defaultListenerAccessPackages); @@ -531,6 +529,9 @@ public class NotificationManagerService extends SystemService { String[] listeners = defaultListenerAccess.split(ManagedServices.ENABLED_SERVICES_SEPARATOR); for (int i = 0; i < listeners.length; i++) { + if (TextUtils.isEmpty(listeners[i])) { + continue; + } ArraySet<ComponentName> approvedListeners = mListeners.queryPackageForServices(listeners[i], MATCH_DIRECT_BOOT_AWARE @@ -547,6 +548,9 @@ public class NotificationManagerService extends SystemService { if (defaultDndAccess != null) { String[] dnds = defaultDndAccess.split(ManagedServices.ENABLED_SERVICES_SEPARATOR); for (int i = 0; i < dnds.length; i++) { + if (TextUtils.isEmpty(dnds[i])) { + continue; + } mConditionProviders.addDefaultComponentOrPackage(dnds[i]); } } @@ -565,12 +569,14 @@ public class NotificationManagerService extends SystemService { .split(ManagedServices.ENABLED_SERVICES_SEPARATOR))); for (int i = 0; i < assistants.size(); i++) { String cnString = assistants.valueAt(i); + if (TextUtils.isEmpty(cnString)) { + continue; + } mAssistants.addDefaultComponentOrPackage(cnString); } } protected void allowDefaultApprovedServices(int userId) { - ArraySet<ComponentName> defaultListeners = mListeners.getDefaultComponents(); for (int i = 0; i < defaultListeners.size(); i++) { ComponentName cn = defaultListeners.valueAt(i); @@ -595,6 +601,40 @@ public class NotificationManagerService extends SystemService { } } + /** + * This method will update the flags of the summary. + * It will set it to FLAG_ONGOING_EVENT if any of its group members + * has the same flag. It will delete the flag otherwise + * @param userId user id of the autogroup summary + * @param pkg package of the autogroup summary + * @param needsOngoingFlag true if the group has at least one ongoing notification + */ + @GuardedBy("mNotificationLock") + protected void updateAutobundledSummaryFlags(int userId, String pkg, boolean needsOngoingFlag) { + ArrayMap<String, String> summaries = mAutobundledSummaries.get(userId); + if (summaries == null) { + return; + } + String summaryKey = summaries.get(pkg); + if (summaryKey == null) { + return; + } + NotificationRecord summary = mNotificationsByKey.get(summaryKey); + if (summary == null) { + return; + } + int oldFlags = summary.sbn.getNotification().flags; + if (needsOngoingFlag) { + summary.sbn.getNotification().flags |= FLAG_ONGOING_EVENT; + } else { + summary.sbn.getNotification().flags &= ~FLAG_ONGOING_EVENT; + } + + if (summary.sbn.getNotification().flags != oldFlags) { + mHandler.post(new EnqueueNotificationRunnable(userId, summary)); + } + } + private void allowDndPackage(String packageName) { try { getBinderService().setNotificationPolicyAccessGranted(packageName, true); @@ -1428,10 +1468,8 @@ public class NotificationManagerService extends SystemService { private final class SettingsObserver extends ContentObserver { private final Uri NOTIFICATION_BADGING_URI = Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_BADGING); - private final Uri NOTIFICATION_BUBBLES_URI_GLOBAL + private final Uri NOTIFICATION_BUBBLES_URI = Settings.Global.getUriFor(Settings.Global.NOTIFICATION_BUBBLES); - private final Uri NOTIFICATION_BUBBLES_URI_SECURE - = Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_BUBBLES); private final Uri NOTIFICATION_LIGHT_PULSE_URI = Settings.System.getUriFor(Settings.System.NOTIFICATION_LIGHT_PULSE); private final Uri NOTIFICATION_RATE_LIMIT_URI @@ -1449,9 +1487,7 @@ public class NotificationManagerService extends SystemService { false, this, UserHandle.USER_ALL); resolver.registerContentObserver(NOTIFICATION_RATE_LIMIT_URI, false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(NOTIFICATION_BUBBLES_URI_GLOBAL, - false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(NOTIFICATION_BUBBLES_URI_SECURE, + resolver.registerContentObserver(NOTIFICATION_BUBBLES_URI, false, this, UserHandle.USER_ALL); update(null); } @@ -1478,41 +1514,9 @@ public class NotificationManagerService extends SystemService { if (uri == null || NOTIFICATION_BADGING_URI.equals(uri)) { mPreferencesHelper.updateBadgingEnabled(); } - // In QPR we moved the setting to Global rather than Secure so that the setting - // applied to work profiles. Unfortunately we need to maintain both to pass CTS without - // a change to CTS outside of a normal letter release. - if (uri == null || NOTIFICATION_BUBBLES_URI_GLOBAL.equals(uri)) { - syncBubbleSettings(resolver, NOTIFICATION_BUBBLES_URI_GLOBAL); + if (uri == null || NOTIFICATION_BUBBLES_URI.equals(uri)) { mPreferencesHelper.updateBubblesEnabled(); } - if (NOTIFICATION_BUBBLES_URI_SECURE.equals(uri)) { - syncBubbleSettings(resolver, NOTIFICATION_BUBBLES_URI_SECURE); - } - } - - private void syncBubbleSettings(ContentResolver resolver, Uri settingToFollow) { - boolean followSecureSetting = settingToFollow.equals(NOTIFICATION_BUBBLES_URI_SECURE); - - int secureSettingValue = Settings.Secure.getInt(resolver, - Settings.Secure.NOTIFICATION_BUBBLES, DEFAULT_ALLOW_BUBBLE ? 1 : 0); - int globalSettingValue = Settings.Global.getInt(resolver, - Settings.Global.NOTIFICATION_BUBBLES, DEFAULT_ALLOW_BUBBLE ? 1 : 0); - - if (globalSettingValue == secureSettingValue) { - return; - } - - if (followSecureSetting) { - // Global => secure - Settings.Global.putInt(resolver, - Settings.Global.NOTIFICATION_BUBBLES, - secureSettingValue); - } else { - // Secure => Global - Settings.Secure.putInt(resolver, - Settings.Secure.NOTIFICATION_BADGING, - globalSettingValue); - } } } @@ -1947,7 +1951,6 @@ public class NotificationManagerService extends SystemService { }); } - private GroupHelper getGroupHelper() { mAutoGroupAtCount = getContext().getResources().getInteger(R.integer.config_autoGroupAtCount); @@ -1977,6 +1980,16 @@ public class NotificationManagerService extends SystemService { clearAutogroupSummaryLocked(userId, pkg); } } + + @Override + public void updateAutogroupSummary(String key, boolean needsOngoingFlag) { + synchronized (mNotificationLock) { + NotificationRecord r = mNotificationsByKey.get(key); + if (r == null) return; + updateAutobundledSummaryFlags(r.getUser().getIdentifier(), + r.sbn.getPackageName(), needsOngoingFlag); + } + } }); } @@ -5044,12 +5057,13 @@ public class NotificationManagerService extends SystemService { final int contentViewSize = contentView.estimateMemoryUsage(); if (contentViewSize > mWarnRemoteViewsSizeBytes && contentViewSize < mStripRemoteViewsSizeBytes) { - Slog.w(TAG, "RemoteViews too large on tag: " + tag + " id: " + id + Slog.w(TAG, "RemoteViews too large on pkg: " + pkg + " tag: " + tag + " id: " + id + " this might be stripped in a future release"); } if (contentViewSize >= mStripRemoteViewsSizeBytes) { mUsageStats.registerImageRemoved(pkg); - Slog.w(TAG, "Removed too large RemoteViews on tag: " + tag + " id: " + id); + Slog.w(TAG, + "Removed too large RemoteViews on pkg: " + pkg + " tag: " + tag + " id: " + id); return true; } return false; @@ -5791,6 +5805,10 @@ public class NotificationManagerService extends SystemService { n, hasAutoGroupSummaryLocked(n)); } }); + } else if (oldSbn != null) { + final NotificationRecord finalRecord = r; + mHandler.post(() -> mGroupHelper.onNotificationUpdated( + finalRecord.sbn, hasAutoGroupSummaryLocked(n))); } } else { Slog.e(TAG, "Not posting notification without small icon: " + notification); diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 61ea84f9dc7f..05b61689fdcf 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -41,7 +41,7 @@ import android.util.SparseArray; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.server.FgThread; -import com.android.server.compat.PlatformCompat; +import com.android.server.compat.CompatConfig; import java.io.PrintWriter; import java.util.ArrayList; @@ -131,24 +131,22 @@ public class AppsFilter { private static class FeatureConfigImpl implements FeatureConfig { private static final String FILTERING_ENABLED_NAME = "package_query_filtering_enabled"; - private final PackageManagerService.Injector mInjector; private volatile boolean mFeatureEnabled = true; + private CompatConfig mCompatibility; private FeatureConfigImpl(PackageManagerService.Injector injector) { - mInjector = injector; + mCompatibility = injector.getCompatibility(); } @Override public void onSystemReady() { mFeatureEnabled = DeviceConfig.getBoolean( - NAMESPACE_PACKAGE_MANAGER_SERVICE, FILTERING_ENABLED_NAME, - true); + NAMESPACE_PACKAGE_MANAGER_SERVICE, FILTERING_ENABLED_NAME, true); DeviceConfig.addOnPropertiesChangedListener( NAMESPACE_PACKAGE_MANAGER_SERVICE, FgThread.getExecutor(), properties -> { synchronized (FeatureConfigImpl.this) { - mFeatureEnabled = properties.getBoolean( - FILTERING_ENABLED_NAME, true); + mFeatureEnabled = properties.getBoolean(FILTERING_ENABLED_NAME, true); } }); } @@ -160,12 +158,7 @@ public class AppsFilter { @Override public boolean packageIsEnabled(PackageParser.Package pkg) { - final PlatformCompat compatibility = mInjector.getCompatibility(); - if (compatibility == null) { - Slog.wtf(TAG, "PlatformCompat is null"); - return mFeatureEnabled; - } - return compatibility.isChangeEnabled( + return mCompatibility.isChangeEnabled( PackageManager.FILTER_APPLICATION_QUERY, pkg.applicationInfo); } } @@ -202,19 +195,19 @@ public class AppsFilter { return false; } for (Intent intent : querying.mQueriesIntents) { - if (matches(intent, potentialTarget.providers, potentialTarget.activities, - potentialTarget.services, potentialTarget.receivers)) { + if (matches(intent, potentialTarget)) { return true; } } return false; } - private static boolean matches(Intent intent, - ArrayList<PackageParser.Provider> providerList, - ArrayList<? extends Component<? extends IntentInfo>>... componentLists) { - for (int p = providerList.size() - 1; p >= 0; p--) { - PackageParser.Provider provider = providerList.get(p); + private static boolean matches(Intent intent, PackageParser.Package potentialTarget) { + for (int p = potentialTarget.providers.size() - 1; p >= 0; p--) { + PackageParser.Provider provider = potentialTarget.providers.get(p); + if (!provider.info.exported) { + continue; + } final ProviderInfo providerInfo = provider.info; final Uri data = intent.getData(); if ("content".equalsIgnoreCase(intent.getScheme()) @@ -223,19 +216,44 @@ public class AppsFilter { return true; } } + for (int s = potentialTarget.services.size() - 1; s >= 0; s--) { + PackageParser.Service service = potentialTarget.services.get(s); + if (!service.info.exported) { + continue; + } + if (matchesAnyFilter(intent, service)) { + return true; + } + } + for (int a = potentialTarget.activities.size() - 1; a >= 0; a--) { + PackageParser.Activity activity = potentialTarget.activities.get(a); + if (!activity.info.exported) { + continue; + } + if (matchesAnyFilter(intent, activity)) { + return true; + } + } + for (int r = potentialTarget.receivers.size() - 1; r >= 0; r--) { + PackageParser.Activity receiver = potentialTarget.receivers.get(r); + if (!receiver.info.exported) { + continue; + } + if (matchesAnyFilter(intent, receiver)) { + return true; + } + } + return false; + } - for (int l = componentLists.length - 1; l >= 0; l--) { - ArrayList<? extends Component<? extends IntentInfo>> components = componentLists[l]; - for (int c = components.size() - 1; c >= 0; c--) { - Component<? extends IntentInfo> component = components.get(c); - ArrayList<? extends IntentInfo> intents = component.intents; - for (int i = intents.size() - 1; i >= 0; i--) { - IntentFilter intentFilter = intents.get(i); - if (intentFilter.match(intent.getAction(), intent.getType(), intent.getScheme(), - intent.getData(), intent.getCategories(), "AppsFilter") > 0) { - return true; - } - } + private static boolean matchesAnyFilter( + Intent intent, Component<? extends IntentInfo> component) { + ArrayList<? extends IntentInfo> intents = component.intents; + for (int i = intents.size() - 1; i >= 0; i--) { + IntentFilter intentFilter = intents.get(i); + if (intentFilter.match(intent.getAction(), intent.getType(), intent.getScheme(), + intent.getData(), intent.getCategories(), "AppsFilter") > 0) { + return true; } } return false; diff --git a/services/core/java/com/android/server/pm/ComponentResolver.java b/services/core/java/com/android/server/pm/ComponentResolver.java index 8facce112b52..976cdfbf8f60 100644 --- a/services/core/java/com/android/server/pm/ComponentResolver.java +++ b/services/core/java/com/android/server/pm/ComponentResolver.java @@ -23,6 +23,7 @@ import static com.android.server.pm.PackageManagerService.DEBUG_PACKAGE_SCANNING import static com.android.server.pm.PackageManagerService.DEBUG_REMOVE; import static com.android.server.pm.PackageManagerService.fixProcessName; +import android.annotation.Nullable; import android.content.ComponentName; import android.content.Intent; import android.content.IntentFilter; @@ -219,12 +220,14 @@ public class ComponentResolver { } } + @Nullable List<ResolveInfo> queryActivities(Intent intent, String resolvedType, int flags, int userId) { synchronized (mLock) { return mActivities.queryIntent(intent, resolvedType, flags, userId); } } + @Nullable List<ResolveInfo> queryActivities(Intent intent, String resolvedType, int flags, List<PackageParser.Activity> activities, int userId) { synchronized (mLock) { @@ -233,12 +236,14 @@ public class ComponentResolver { } } + @Nullable List<ResolveInfo> queryProviders(Intent intent, String resolvedType, int flags, int userId) { synchronized (mLock) { return mProviders.queryIntent(intent, resolvedType, flags, userId); } } + @Nullable List<ResolveInfo> queryProviders(Intent intent, String resolvedType, int flags, List<PackageParser.Provider> providers, int userId) { synchronized (mLock) { @@ -246,6 +251,7 @@ public class ComponentResolver { } } + @Nullable List<ProviderInfo> queryProviders(String processName, String metaDataKey, int uid, int flags, int userId) { if (!sUserManager.exists(userId)) { @@ -285,6 +291,7 @@ public class ComponentResolver { return providerList; } + @Nullable ProviderInfo queryProvider(String authority, int flags, int userId) { synchronized (mLock) { final PackageParser.Provider p = mProvidersByAuthority.get(authority); @@ -326,12 +333,14 @@ public class ComponentResolver { } } + @Nullable List<ResolveInfo> queryReceivers(Intent intent, String resolvedType, int flags, int userId) { synchronized (mLock) { return mReceivers.queryIntent(intent, resolvedType, flags, userId); } } + @Nullable List<ResolveInfo> queryReceivers(Intent intent, String resolvedType, int flags, List<PackageParser.Activity> receivers, int userId) { synchronized (mLock) { @@ -339,12 +348,14 @@ public class ComponentResolver { } } + @Nullable List<ResolveInfo> queryServices(Intent intent, String resolvedType, int flags, int userId) { synchronized (mLock) { return mServices.queryIntent(intent, resolvedType, flags, userId); } } + @Nullable List<ResolveInfo> queryServices(Intent intent, String resolvedType, int flags, List<PackageParser.Service> services, int userId) { synchronized (mLock) { @@ -1355,6 +1366,7 @@ public class ComponentResolver { return super.queryIntent(intent, resolvedType, defaultOnly, userId); } + @Nullable List<ResolveInfo> queryIntent(Intent intent, String resolvedType, int flags, int userId) { if (!sUserManager.exists(userId)) { @@ -1366,6 +1378,7 @@ public class ComponentResolver { userId); } + @Nullable List<ResolveInfo> queryIntentForPackage(Intent intent, String resolvedType, int flags, List<PackageParser.Provider> packageProviders, int userId) { if (!sUserManager.exists(userId)) { diff --git a/core/java/android/content/pm/PackageList.java b/services/core/java/com/android/server/pm/PackageList.java index e3eb2c55a2bb..60bc8a87f62d 100644 --- a/core/java/android/content/pm/PackageList.java +++ b/services/core/java/com/android/server/pm/PackageList.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package android.content.pm; +package com.android.server.pm; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal.PackageListObserver; import com.android.server.LocalServices; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 86340d40e3c9..b1d05f4c07d6 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -162,7 +162,6 @@ import android.content.pm.PackageBackwardCompatibility; import android.content.pm.PackageInfo; import android.content.pm.PackageInfoLite; import android.content.pm.PackageInstaller; -import android.content.pm.PackageList; import android.content.pm.PackageManager; import android.content.pm.PackageManager.LegacyPackageDeleteObserver; import android.content.pm.PackageManager.ModuleInfoFlags; @@ -300,7 +299,7 @@ import com.android.server.ServiceThread; import com.android.server.SystemConfig; import com.android.server.SystemServerInitThreadPool; import com.android.server.Watchdog; -import com.android.server.compat.PlatformCompat; +import com.android.server.compat.CompatConfig; import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.Settings.DatabaseVersion; @@ -835,7 +834,7 @@ public class PackageManagerService extends IPackageManager.Stub private final Singleton<StorageManager> mStorageManagerProducer; private final Singleton<AppOpsManager> mAppOpsManagerProducer; private final Singleton<AppsFilter> mAppsFilterProducer; - private final Singleton<PlatformCompat> mPlatformCompatProducer; + private final Singleton<CompatConfig> mPlatformCompatProducer; Injector(Context context, Object lock, Installer installer, Object installLock, PackageAbiHelper abiHelper, @@ -853,7 +852,7 @@ public class PackageManagerService extends IPackageManager.Stub Producer<StorageManager> storageManagerProducer, Producer<AppOpsManager> appOpsManagerProducer, Producer<AppsFilter> appsFilterProducer, - Producer<PlatformCompat> platformCompatProducer) { + Producer<CompatConfig> platformCompatProducer) { mContext = context; mLock = lock; mInstaller = installer; @@ -964,7 +963,7 @@ public class PackageManagerService extends IPackageManager.Stub return mAppsFilterProducer.get(this, mPackageManager); } - public PlatformCompat getCompatibility() { + public CompatConfig getCompatibility() { return mPlatformCompatProducer.get(this, mPackageManager); } } @@ -2466,7 +2465,7 @@ public class PackageManagerService extends IPackageManager.Stub new Injector.SystemServiceProducer<>(StorageManager.class), new Injector.SystemServiceProducer<>(AppOpsManager.class), (i, pm) -> AppsFilter.create(i), - (i, pm) -> (PlatformCompat) ServiceManager.getService("platform_compat")); + (i, pm) -> CompatConfig.get()); PackageManagerService m = new PackageManagerService(injector, factoryTest, onlyCore); t.traceEnd(); // "create package manager" @@ -3048,7 +3047,7 @@ public class PackageManagerService extends IPackageManager.Stub // Resolve protected action filters. Only the setup wizard is allowed to // have a high priority filter for these actions. - mSetupWizardPackage = getSetupWizardPackageName(); + mSetupWizardPackage = getSetupWizardPackageNameImpl(); mComponentResolver.fixProtectedFilterPriorities(); mSystemTextClassifierPackage = getSystemTextClassifierPackageName(); @@ -6976,7 +6975,7 @@ public class PackageManagerService extends IPackageManager.Stub * @param intent * @return A filtered list of resolved activities. */ - private List<ResolveInfo> applyPostResolutionFilter(List<ResolveInfo> resolveInfos, + private List<ResolveInfo> applyPostResolutionFilter(@NonNull List<ResolveInfo> resolveInfos, String ephemeralPkgName, boolean allowDynamicSplits, int filterCallingUid, boolean resolveForStart, int userId, Intent intent) { final boolean blockInstant = intent.isWebIntent() && areWebInstantAppsDisabled(userId); @@ -7633,6 +7632,9 @@ public class PackageManagerService extends IPackageManager.Stub if (pkgName == null) { final List<ResolveInfo> result = mComponentResolver.queryReceivers(intent, resolvedType, flags, userId); + if (result == null) { + return Collections.emptyList(); + } return applyPostResolutionFilter( result, instantAppPkgName, allowDynamicSplits, callingUid, false, userId, intent); @@ -7641,6 +7643,9 @@ public class PackageManagerService extends IPackageManager.Stub if (pkg != null) { final List<ResolveInfo> result = mComponentResolver.queryReceivers( intent, resolvedType, flags, pkg.receivers, userId); + if (result == null) { + return Collections.emptyList(); + } return applyPostResolutionFilter( result, instantAppPkgName, allowDynamicSplits, callingUid, false, userId, intent); @@ -7735,15 +7740,25 @@ public class PackageManagerService extends IPackageManager.Stub synchronized (mLock) { String pkgName = intent.getPackage(); if (pkgName == null) { + final List<ResolveInfo> resolveInfos = mComponentResolver.queryServices(intent, + resolvedType, flags, userId); + if (resolveInfos == null) { + return Collections.emptyList(); + } return applyPostServiceResolutionFilter( - mComponentResolver.queryServices(intent, resolvedType, flags, userId), + resolveInfos, instantAppPkgName); } final PackageParser.Package pkg = mPackages.get(pkgName); if (pkg != null) { + final List<ResolveInfo> resolveInfos = mComponentResolver.queryServices(intent, + resolvedType, flags, pkg.services, + userId); + if (resolveInfos == null) { + return Collections.emptyList(); + } return applyPostServiceResolutionFilter( - mComponentResolver.queryServices(intent, resolvedType, flags, pkg.services, - userId), + resolveInfos, instantAppPkgName); } return Collections.emptyList(); @@ -7853,15 +7868,25 @@ public class PackageManagerService extends IPackageManager.Stub synchronized (mLock) { String pkgName = intent.getPackage(); if (pkgName == null) { + final List<ResolveInfo> resolveInfos = mComponentResolver.queryProviders(intent, + resolvedType, flags, userId); + if (resolveInfos == null) { + return Collections.emptyList(); + } return applyPostContentProviderResolutionFilter( - mComponentResolver.queryProviders(intent, resolvedType, flags, userId), + resolveInfos, instantAppPkgName); } final PackageParser.Package pkg = mPackages.get(pkgName); if (pkg != null) { + final List<ResolveInfo> resolveInfos = mComponentResolver.queryProviders(intent, + resolvedType, flags, + pkg.providers, userId); + if (resolveInfos == null) { + return Collections.emptyList(); + } return applyPostContentProviderResolutionFilter( - mComponentResolver.queryProviders(intent, resolvedType, flags, - pkg.providers, userId), + resolveInfos, instantAppPkgName); } return Collections.emptyList(); @@ -13212,9 +13237,11 @@ public class PackageManagerService extends IPackageManager.Stub * @return verification timeout in milliseconds */ private long getVerificationTimeout() { - return android.provider.Settings.Global.getLong(mContext.getContentResolver(), - android.provider.Settings.Global.PACKAGE_VERIFIER_TIMEOUT, - DEFAULT_VERIFICATION_TIMEOUT); + long timeout = Global.getLong(mContext.getContentResolver(), + Global.PACKAGE_VERIFIER_TIMEOUT, DEFAULT_VERIFICATION_TIMEOUT); + // The setting can be used to increase the timeout but not decrease it, since that is + // equivalent to disabling the verifier. + return Math.max(timeout, DEFAULT_VERIFICATION_TIMEOUT); } /** @@ -13245,22 +13272,18 @@ public class PackageManagerService extends IPackageManager.Stub return false; } - boolean ensureVerifyAppsEnabled = isUserRestricted(userId, UserManager.ENSURE_VERIFY_APPS); - // Check if installing from ADB if ((installFlags & PackageManager.INSTALL_FROM_ADB) != 0) { // Do not run verification in a test harness environment if (ActivityManager.isRunningInTestHarness()) { return false; } - if (ensureVerifyAppsEnabled) { + if (isUserRestricted(userId, UserManager.ENSURE_VERIFY_APPS)) { return true; } // Check if the developer does not want package verification for ADB installs - if (android.provider.Settings.Global.getInt(mContext.getContentResolver(), - android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) == 0) { - return false; - } + return Global.getInt(mContext.getContentResolver(), + Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0; } else { // only when not installed from ADB, skip verification for instant apps when // the installer and verifier are the same. @@ -13278,14 +13301,8 @@ public class PackageManagerService extends IPackageManager.Stub } catch (SecurityException ignore) { } } } - } - - if (ensureVerifyAppsEnabled) { return true; } - - return android.provider.Settings.Global.getInt(mContext.getContentResolver(), - android.provider.Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 1; } @Override @@ -15078,19 +15095,6 @@ public class PackageManagerService extends IPackageManager.Stub return disabled; } - @GuardedBy("mLock") - private void setInstallerPackageNameLPw(PackageParser.Package pkg, - String installerPackageName) { - // Enable the parent package - mSettings.setInstallerPackageName(pkg.packageName, installerPackageName); - // Enable the child packages - final int childCount = (pkg.childPackages != null) ? pkg.childPackages.size() : 0; - for (int i = 0; i < childCount; i++) { - PackageParser.Package childPkg = pkg.childPackages.get(i); - mSettings.setInstallerPackageName(childPkg.packageName, installerPackageName); - } - } - private void updateSettingsLI(PackageParser.Package newPackage, String installerPackageName, int[] allUsers, PackageInstalledInfo res, UserHandle user, int installReason) { // Update the parent package setting @@ -19673,7 +19677,7 @@ public class PackageManagerService extends IPackageManager.Stub set, comp, userId); } - private @Nullable String getSetupWizardPackageName() { + private @Nullable String getSetupWizardPackageNameImpl() { final Intent intent = new Intent(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_SETUP_WIZARD); @@ -19780,6 +19784,14 @@ public class PackageManagerService extends IPackageManager.Stub return systemCaptionsServiceComponentName.getPackageName(); } + @Override + public String getSetupWizardPackageName() { + if (Binder.getCallingUid() != Process.SYSTEM_UID) { + throw new SecurityException("Non-system caller"); + } + return mPmInternal.getSetupWizardPackageName(); + } + public String getIncidentReportApproverPackageName() { return mContext.getString(R.string.config_incidentReportApproverPackage); } diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index ebba128b5f28..8253b392768f 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -1200,12 +1200,20 @@ public class ShortcutService extends IShortcutService.Stub { return mUsers.get(userId) != null; } + private int mLastLockedUser = -1; + /** Return the per-user state. */ @GuardedBy("mLock") @NonNull ShortcutUser getUserShortcutsLocked(@UserIdInt int userId) { if (!isUserUnlockedL(userId)) { - wtf("User still locked"); + // Only do wtf once for each user. (until the user is unlocked) + if (userId != mLastLockedUser) { + wtf("User still locked"); + mLastLockedUser = userId; + } + } else { + mLastLockedUser = -1; } ShortcutUser userPackages = mUsers.get(userId); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 8431fa36c04c..95baa01923f5 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -209,7 +209,8 @@ public class UserManagerService extends IUserManager.Stub { | UserInfo.FLAG_DEMO; @VisibleForTesting - static final int MIN_USER_ID = 10; + static final int MIN_USER_ID = UserHandle.MIN_SECONDARY_USER_ID; + // We need to keep process uid within Integer.MAX_VALUE. @VisibleForTesting static final int MAX_USER_ID = Integer.MAX_VALUE / UserHandle.PER_USER_RANGE; diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 4213168b6ec7..89908f04a6b3 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -53,7 +53,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.ActivityManager; -import android.app.AppOpsManager; import android.app.ApplicationPackageManager; import android.app.IActivityManager; import android.content.Context; @@ -793,13 +792,13 @@ public class PermissionManagerService extends IPermissionManager.Stub { final CheckPermissionDelegate checkPermissionDelegate; synchronized (mLock) { - if (mCheckPermissionDelegate == null) { - return checkPermissionImpl(permName, pkgName, userId); - } checkPermissionDelegate = mCheckPermissionDelegate; } + if (checkPermissionDelegate == null) { + return checkPermissionImpl(permName, pkgName, userId); + } return checkPermissionDelegate.checkPermission(permName, pkgName, userId, - PermissionManagerService.this::checkPermissionImpl); + this::checkPermissionImpl); } private int checkPermissionImpl(String permName, String pkgName, int userId) { @@ -845,23 +844,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { private boolean checkSinglePermissionInternal(int uid, @NonNull PermissionsState permissionsState, @NonNull String permissionName) { - boolean hasPermission = permissionsState.hasPermission(permissionName, - UserHandle.getUserId(uid)); - - if (!hasPermission && mSettings.isPermissionRuntime(permissionName)) { - final String[] packageNames = mContext.getPackageManager().getPackagesForUid(uid); - final int packageNamesSize = packageNames != null ? packageNames.length : 0; - for (int i = 0; i < packageNamesSize; i++) { - final PackageParser.Package pkg = mPackageManagerInt.getPackage(packageNames[i]); - if (pkg != null && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M - && pkg.requestedPermissions.contains(permissionName)) { - hasPermission = true; - break; - } - } - } - - if (!hasPermission) { + if (!permissionsState.hasPermission(permissionName, UserHandle.getUserId(uid))) { return false; } @@ -885,13 +868,13 @@ public class PermissionManagerService extends IPermissionManager.Stub { final CheckPermissionDelegate checkPermissionDelegate; synchronized (mLock) { - if (mCheckPermissionDelegate == null) { - return checkUidPermissionImpl(permName, uid); - } checkPermissionDelegate = mCheckPermissionDelegate; } + if (checkPermissionDelegate == null) { + return checkUidPermissionImpl(permName, uid); + } return checkPermissionDelegate.checkUidPermission(permName, uid, - PermissionManagerService.this::checkUidPermissionImpl); + this::checkUidPermissionImpl); } private int checkUidPermissionImpl(String permName, int uid) { diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index 77c16e37b51d..df2b3caaacce 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -152,10 +152,10 @@ public final class PermissionPolicyService extends SystemService { for (int i = 0; i < numDangerousPerms; i++) { PermissionInfo perm = dangerousPerms.get(i); - if (perm.isHardRestricted() || perm.backgroundPermission != null) { - appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener); - } else if (perm.isSoftRestricted()) { + if (perm.isRuntime()) { appOpsService.startWatchingMode(getSwitchOp(perm.name), null, appOpsListener); + } + if (perm.isSoftRestricted()) { SoftRestrictedPermissionPolicy policy = SoftRestrictedPermissionPolicy.forPermission(null, null, null, perm.name); diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 88b17936d93d..c851cc69a732 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -23,6 +23,7 @@ import static android.app.AppOpsManager.OP_TOAST_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.content.Context.CONTEXT_RESTRICTED; import static android.content.Context.WINDOW_SERVICE; +import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE; import static android.content.pm.PackageManager.FEATURE_HDMI_CEC; import static android.content.pm.PackageManager.FEATURE_LEANBACK; import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE; @@ -385,6 +386,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { BurnInProtectionHelper mBurnInProtectionHelper; private DisplayFoldController mDisplayFoldController; AppOpsManager mAppOpsManager; + private boolean mHasFeatureAuto; private boolean mHasFeatureWatch; private boolean mHasFeatureLeanback; private boolean mHasFeatureHdmiCec; @@ -1753,6 +1755,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mDisplayManager = mContext.getSystemService(DisplayManager.class); mHasFeatureWatch = mContext.getPackageManager().hasSystemFeature(FEATURE_WATCH); mHasFeatureLeanback = mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK); + mHasFeatureAuto = mContext.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE); mHasFeatureHdmiCec = mContext.getPackageManager().hasSystemFeature(FEATURE_HDMI_CEC); mAccessibilityShortcutController = new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId); @@ -4540,6 +4543,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void wakeUpFromPowerKey(long eventTime) { wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey, PowerManager.WAKE_REASON_POWER_BUTTON, "android.policy:POWER"); + + // Turn on the connected TV and switch HDMI input if we're a HDMI playback device. + final HdmiControl hdmiControl = getHdmiControl(); + if (hdmiControl != null) { + hdmiControl.turnOnTv(); + } } private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, @WakeReason int reason, @@ -4572,7 +4581,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // ... eventually calls finishWindowsDrawn which will finalize our screen turn on // as well as enabling the orientation change logic/sensor. mWindowManagerInternal.waitForAllWindowsDrawn(mWindowManagerDrawCallback, - WAITING_FOR_DRAWN_TIMEOUT); + WAITING_FOR_DRAWN_TIMEOUT, INVALID_DISPLAY); } // Called on the DisplayManager's DisplayPowerController thread. @@ -5222,7 +5231,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { awakenDreams(); } - if (!isUserSetupComplete()) { + if (!mHasFeatureAuto && !isUserSetupComplete()) { Slog.i(TAG, "Not going home because user setup is in progress."); return; } diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 9c19aeccd59a..83891f60d4f7 100644 --- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -370,7 +370,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve private void checkAndMitigateNativeCrashes() { mNumberOfNativeCrashPollsRemaining--; // Check if native watchdog reported a crash - if ("1".equals(SystemProperties.get("ro.init.updatable_crashing"))) { + if ("1".equals(SystemProperties.get("sys.init.updatable_crashing"))) { execute(getModuleMetadataPackage()); // we stop polling after an attempt to execute rollback, regardless of whether the // attempt succeeds or not diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java index 5fd2ab87f410..3b2f32479ed2 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -180,8 +180,13 @@ public class SliceManagerService extends ISliceManager.Stub { verifyCaller(pkg); enforceAccess(pkg, uri); uri = maybeAddUserId(uri, Binder.getCallingUserHandle().getIdentifier()); - if (getPinnedSlice(uri).unpin(pkg, token)) { - removePinnedSlice(uri); + try { + PinnedSliceState slice = getPinnedSlice(uri); + if (slice != null && slice.unpin(pkg, token)) { + removePinnedSlice(uri); + } + } catch (IllegalStateException exception) { + Slog.w(TAG, exception.getMessage()); } } diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 8897eca85d7a..3439d3841973 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -609,13 +609,13 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D } @Override - public void showBiometricDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, - int type, boolean requireConfirmation, int userId, String opPackageName) { + public void showAuthenticationDialog(Bundle bundle, IBiometricServiceReceiverInternal receiver, + int biometricModality, boolean requireConfirmation, int userId, String opPackageName) { enforceBiometricDialog(); if (mBar != null) { try { - mBar.showBiometricDialog(bundle, receiver, type, requireConfirmation, userId, - opPackageName); + mBar.showAuthenticationDialog(bundle, receiver, biometricModality, + requireConfirmation, userId, opPackageName); } catch (RemoteException ex) { } } @@ -644,22 +644,22 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D } @Override - public void onBiometricError(String error) { + public void onBiometricError(int errorCode, String error) { enforceBiometricDialog(); if (mBar != null) { try { - mBar.onBiometricError(error); + mBar.onBiometricError(errorCode, error); } catch (RemoteException ex) { } } } @Override - public void hideBiometricDialog() { + public void hideAuthenticationDialog() { enforceBiometricDialog(); if (mBar != null) { try { - mBar.hideBiometricDialog(); + mBar.hideAuthenticationDialog(); } catch (RemoteException ex) { } } diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 59f051bc76a6..10415f58db80 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -271,11 +271,11 @@ final class AccessibilityController { } } - /** NOTE: This has to be called within a surface transaction. */ - public void drawMagnifiedRegionBorderIfNeededLocked(int displayId) { + public void drawMagnifiedRegionBorderIfNeededLocked(int displayId, + SurfaceControl.Transaction t) { final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId); if (displayMagnifier != null) { - displayMagnifier.drawMagnifiedRegionBorderIfNeededLocked(); + displayMagnifier.drawMagnifiedRegionBorderIfNeededLocked(t); } // Not relevant for the window observer. } @@ -431,7 +431,7 @@ final class AccessibilityController { Slog.i(LOG_TAG, "Rotation: " + Surface.rotationToString(rotation) + " displayId: " + displayContent.getDisplayId()); } - mMagnifedViewport.onRotationChangedLocked(); + mMagnifedViewport.onRotationChangedLocked(displayContent.getPendingTransaction()); mHandler.sendEmptyMessage(MyHandler.MESSAGE_NOTIFY_ROTATION_CHANGED); } @@ -536,9 +536,8 @@ final class AccessibilityController { .sendToTarget(); } - /** NOTE: This has to be called within a surface transaction. */ - public void drawMagnifiedRegionBorderIfNeededLocked() { - mMagnifedViewport.drawWindowIfNeededLocked(); + public void drawMagnifiedRegionBorderIfNeededLocked(SurfaceControl.Transaction t) { + mMagnifedViewport.drawWindowIfNeededLocked(t); } private final class MagnifiedViewport { @@ -744,7 +743,7 @@ final class AccessibilityController { return letterboxBounds; } - public void onRotationChangedLocked() { + public void onRotationChangedLocked(SurfaceControl.Transaction t) { // If we are showing the magnification border, hide it immediately so // the user does not see strange artifacts during rotation. The screenshot // used for rotation already has the border. After the rotation is complete @@ -758,7 +757,7 @@ final class AccessibilityController { mHandler.sendMessageDelayed(message, delay); } recomputeBoundsLocked(); - mWindow.updateSize(); + mWindow.updateSize(t); } public void setMagnifiedRegionBorderShownLocked(boolean shown, boolean animate) { @@ -784,10 +783,9 @@ final class AccessibilityController { return mMagnificationSpec; } - /** NOTE: This has to be called within a surface transaction. */ - public void drawWindowIfNeededLocked() { + public void drawWindowIfNeededLocked(SurfaceControl.Transaction t) { recomputeBoundsLocked(); - mWindow.drawIfNeeded(); + mWindow.drawIfNeeded(t); } public void destroyWindow() { @@ -837,10 +835,11 @@ final class AccessibilityController { /* ignore */ } mSurfaceControl = surfaceControl; - mSurfaceControl.setLayer(mService.mPolicy.getWindowLayerFromTypeLw( - TYPE_MAGNIFICATION_OVERLAY) - * WindowManagerService.TYPE_LAYER_MULTIPLIER); - mSurfaceControl.setPosition(0, 0); + mService.mTransactionFactory.get().setLayer(mSurfaceControl, + mService.mPolicy.getWindowLayerFromTypeLw(TYPE_MAGNIFICATION_OVERLAY) + * WindowManagerService.TYPE_LAYER_MULTIPLIER) + .setPosition(mSurfaceControl, 0, 0) + .apply(); mSurface.copyFrom(mSurfaceControl); mAnimationController = new AnimationController(context, @@ -905,10 +904,10 @@ final class AccessibilityController { } } - public void updateSize() { + public void updateSize(SurfaceControl.Transaction t) { synchronized (mService.mGlobalLock) { mWindowManager.getDefaultDisplay().getRealSize(mTempPoint); - mSurfaceControl.setBufferSize(mTempPoint.x, mTempPoint.y); + t.setBufferSize(mSurfaceControl, mTempPoint.x, mTempPoint.y); invalidate(mDirtyRect); } } @@ -923,8 +922,7 @@ final class AccessibilityController { mService.scheduleAnimationLocked(); } - /** NOTE: This has to be called within a surface transaction. */ - public void drawIfNeeded() { + public void drawIfNeeded(SurfaceControl.Transaction t) { synchronized (mService.mGlobalLock) { if (!mInvalidated) { return; @@ -959,9 +957,9 @@ final class AccessibilityController { canvas.drawPath(path, mPaint); mSurface.unlockCanvasAndPost(canvas); - mSurfaceControl.show(); + t.show(mSurfaceControl); } else { - mSurfaceControl.hide(); + t.hide(mSurfaceControl); } } } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index c9e84ec2c69b..4f52d9df817a 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -54,20 +54,14 @@ import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE; import static android.content.pm.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; import static android.content.pm.ActivityInfo.CONFIG_UI_MODE; import static android.content.pm.ActivityInfo.CONFIG_WINDOW_CONFIGURATION; -import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE; import static android.content.pm.ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS; import static android.content.pm.ActivityInfo.FLAG_IMMERSIVE; -import static android.content.pm.ActivityInfo.FLAG_INHERIT_SHOW_WHEN_LOCKED; import static android.content.pm.ActivityInfo.FLAG_MULTIPROCESS; import static android.content.pm.ActivityInfo.FLAG_NO_HISTORY; import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; -import static android.content.pm.ActivityInfo.FLAG_SHOW_WHEN_LOCKED; import static android.content.pm.ActivityInfo.FLAG_STATE_NOT_NEEDED; -import static android.content.pm.ActivityInfo.FLAG_TURN_SCREEN_ON; -import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE; import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE; import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK; -import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_ALWAYS; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_DEFAULT; import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED; @@ -86,7 +80,6 @@ import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.content.res.Configuration.ORIENTATION_UNDEFINED; import static android.content.res.Configuration.UI_MODE_TYPE_MASK; import static android.content.res.Configuration.UI_MODE_TYPE_VR_HEADSET; -import static android.os.Build.VERSION_CODES.HONEYCOMB; import static android.os.Build.VERSION_CODES.O; import static android.os.Process.SYSTEM_UID; import static android.view.Display.DEFAULT_DISPLAY; @@ -96,7 +89,7 @@ import static android.view.Surface.ROTATION_90; import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; import static android.view.WindowManager.TRANSIT_TASK_CLOSE; -import static com.android.server.am.ActivityRecordProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.ActivityRecordProto.APP_WINDOW_TOKEN; import static com.android.server.am.ActivityRecordProto.FRONT_OF_TASK; import static com.android.server.am.ActivityRecordProto.IDENTIFIER; import static com.android.server.am.ActivityRecordProto.PROC_ID; @@ -151,12 +144,10 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE; import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE; -import static com.android.server.wm.IdentifierProto.HASH_CODE; -import static com.android.server.wm.IdentifierProto.TITLE; -import static com.android.server.wm.IdentifierProto.USER_ID; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ORIENTATION; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW; +import static com.android.server.wm.ActivityTaskManagerService.getInputDispatchingTimeoutLocked; import static com.android.server.wm.TaskPersister.DEBUG; import static com.android.server.wm.TaskPersister.IMAGE_EXTENSION; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -211,7 +202,6 @@ import android.os.PersistableBundle; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; -import android.os.UserHandle; import android.os.storage.StorageManager; import android.service.voice.IVoiceInteractionSession; import android.util.ArraySet; @@ -225,16 +215,12 @@ import android.view.AppTransitionAnimationSpec; import android.view.DisplayCutout; import android.view.IAppTransitionAnimationSpecsFuture; import android.view.IApplicationToken; -import android.view.RemoteAnimationDefinition; import android.view.WindowManager.LayoutParams; -import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ResolverActivity; import com.android.internal.content.ReferrerIntent; import com.android.internal.util.XmlUtils; -import com.android.server.AttributeCache; -import com.android.server.AttributeCache.Entry; import com.android.server.am.AppTimeTracker; import com.android.server.am.EventLogTags; import com.android.server.am.PendingIntentRecord; @@ -262,7 +248,7 @@ import java.util.Objects; /** * An entry in the history stack, representing an activity. */ -final class ActivityRecord extends ConfigurationContainer { +final class ActivityRecord extends AppWindowToken { private static final String TAG = TAG_WITH_CLASS_NAME ? "ActivityRecord" : TAG_ATM; private static final String TAG_ADD_REMOVE = TAG + POSTFIX_ADD_REMOVE; private static final String TAG_APP = TAG + POSTFIX_APP; @@ -291,29 +277,17 @@ final class ActivityRecord extends ConfigurationContainer { // How many activities have to be scheduled to stop to force a stop pass. private static final int MAX_STOPPING_TO_FORCE = 3; - final ActivityTaskManagerService mAtmService; // owner - final IApplicationToken.Stub appToken; // window manager token - // TODO: Remove after unification - AppWindowToken mAppWindowToken; - + // TODO: Move to AppWindowToken? final ActivityInfo info; // activity info provided by developer in AndroidManifest final int launchedFromPid; // always the pid who started the activity. final int launchedFromUid; // always the uid who started the activity. final String launchedFromPackage; // always the package who started the activity. - final int mUserId; // Which user is this running for? final Intent intent; // the original intent that generated us - final ComponentName mActivityComponent; // the intent component, or target of an alias. final String shortComponentName; // the short component name of the intent final String resolvedType; // as per original caller; - final String packageName; // the package implementing intent's component final String processName; // process where this component wants to run final String taskAffinity; // as per ActivityInfo.taskAffinity final boolean stateNotNeeded; // As per ActivityInfo.flags - boolean fullscreen; // The activity is opaque and fills the entire space of this task. - // TODO: See if it possible to combine this with the fullscreen field. - final boolean hasWallpaper; // Has a wallpaper window as a background. - @VisibleForTesting - boolean noDisplay; // activity is not displayed? @VisibleForTesting int mHandoverLaunchDisplayId = INVALID_DISPLAY; // Handover launch display id to next activity. private final boolean componentSpecified; // did caller specify an explicit component? @@ -324,7 +298,6 @@ final class ActivityRecord extends ConfigurationContainer { private int icon; // resource identifier of activity's icon. private int logo; // resource identifier of activity's logo. private int theme; // resource identifier of activity's theme. - private int realTheme; // actual theme resource we will use, never 0. private int windowFlags; // custom window flags for preview window. private TaskRecord task; // the task this is in. private long createTime = System.currentTimeMillis(); @@ -374,6 +347,7 @@ final class ActivityRecord extends ConfigurationContainer { boolean visible; // does this activity's window need to be shown? boolean visibleIgnoringKeyguard; // is this activity visible, ignoring the fact that Keyguard // might hide this activity? + // TODO: figureout how to consolidate with the same variable in AppWindowToken. private boolean mDeferHidingClient; // If true we told WM to defer reporting to the client // process that it is hidden. boolean sleeping; // have we told the activity to sleep? @@ -393,8 +367,6 @@ final class ActivityRecord extends ConfigurationContainer { long lastLaunchTime; // time of last launch of this activity ComponentName requestedVrComponent; // the requested component for handling VR mode. - String stringName; // for caching of toString(). - private boolean inHistory; // are we in the history stack? final ActivityStackSupervisor mStackSupervisor; final RootActivityContainer mRootActivityContainer; @@ -411,8 +383,6 @@ final class ActivityRecord extends ConfigurationContainer { int mRelaunchReason = RELAUNCH_REASON_NONE; TaskDescription taskDescription; // the recents information for this activity - boolean mLaunchTaskBehind; // this activity is actively being launched with - // ActivityOptions.setLaunchTaskBehind, will be cleared once launch is completed. // These configurations are collected from application's resources based on size-sensitive // qualifiers. For example, layout-w800dp will be added to mHorizontalSizeConfigurations as 800 @@ -430,17 +400,6 @@ final class ActivityRecord extends ConfigurationContainer { boolean pendingVoiceInteractionStart; // Waiting for activity-invoked voice session IVoiceInteractionSession voiceSession; // Voice interaction session for this activity - // A hint to override the window specified rotation animation, or -1 - // to use the window specified value. We use this so that - // we can select the right animation in the cases of starting - // windows, where the app hasn't had time to set a value - // on the window. - int mRotationAnimationHint = -1; - - private boolean mShowWhenLocked; - private boolean mInheritShownWhenLocked; - private boolean mTurnScreenOn; - /** * Current sequencing integer of the configuration, for skipping old activity configurations. */ @@ -603,7 +562,7 @@ final class ActivityRecord extends ConfigurationContainer { pw.print(" idle="); pw.print(idle); pw.print(" mStartingWindowState="); pw.println(startingWindowStateToString(mStartingWindowState)); - pw.print(prefix); pw.print("fullscreen="); pw.print(fullscreen); + pw.print(prefix); pw.print("occludesParent="); pw.print(occludesParent()); pw.print(" noDisplay="); pw.print(noDisplay); pw.print(" immersive="); pw.print(immersive); pw.print(" launchMode="); pw.println(launchMode); @@ -855,22 +814,7 @@ final class ActivityRecord extends ConfigurationContainer { } } - @Override - protected int getChildCount() { - // {@link ActivityRecord} is a leaf node and has no children. - return 0; - } - - @Override - protected ConfigurationContainer getChildAt(int index) { - return null; - } - - @Override - protected ConfigurationContainer getParent() { - return getTaskRecord(); - } - + // TODO: Remove once TaskRecord and Task are unified. TaskRecord getTaskRecord() { return task; } @@ -914,31 +858,63 @@ final class ActivityRecord extends ConfigurationContainer { this.task = task; - if (!reparenting) { + // This is attaching the activity to the task which we only want to do once. + // TODO: Need to re-work after unifying the task level since it will already have a parent + // then. Just need to restructure the re-parent case not to do this. NOTE that the + // reparenting flag passed in can't be used directly for this as it isn't set in + // ActivityRecord#reparent() case that ends up calling this method. + if (task != null && getParent() == null) { + inHistory = true; + final Task container = task.getTask(); + if (container != null) { + onAttachToTask(task.voiceSession != null, container.getDisplayContent(), + getInputDispatchingTimeoutLocked(this) * 1000000L); + ProtoLog.v(WM_DEBUG_ADD_REMOVE, "setTask: %s at top.", this); + container.addChild(this, Integer.MAX_VALUE /* add on top */); + } + + // TODO(b/36505427): Maybe this call should be moved inside + // updateOverrideConfiguration() + task.updateOverrideConfigurationFromLaunchBounds(); + // Make sure override configuration is up-to-date before using to create window + // controller. + updateOverrideConfiguration(); + + task.addActivityToTop(this); + + // When an activity is started directly into a split-screen fullscreen stack, we need to + // update the initial multi-window modes so that the callbacks are scheduled correctly + // when the user leaves that mode. + mLastReportedMultiWindowMode = inMultiWindowMode(); + mLastReportedPictureInPictureMode = inPinnedWindowingMode(); + } else if (!reparenting) { onParentChanged(); } } /** - * Notifies AWT that this app is waiting to pause in order to determine if it will enter PIP. - * This information helps AWT know that the app is in the process of pausing before it gets the - * signal on the WM side. + * Sets the Task on this activity for the purposes of re-use during launch where we will + * re-use another activity instead of this one for the launch. */ - void setWillCloseOrEnterPip(boolean willCloseOrEnterPip) { - if (mAppWindowToken == null) { - return; - } - - mAppWindowToken.setWillCloseOrEnterPip(willCloseOrEnterPip); + void setTaskForReuse(TaskRecord task) { + this.task = task; } static class Token extends IApplicationToken.Stub { - private final WeakReference<ActivityRecord> weakActivity; + private WeakReference<ActivityRecord> weakActivity; private final String name; + private final String tokenString; - Token(ActivityRecord activity, Intent intent) { - weakActivity = new WeakReference<>(activity); + Token(Intent intent) { name = intent.getComponent().flattenToShortString(); + tokenString = "Token{" + Integer.toHexString(System.identityHashCode(this)) + "}"; + } + + private void attach(ActivityRecord activity) { + if (weakActivity != null) { + throw new IllegalStateException("Already attached..." + this); + } + weakActivity = new WeakReference<>(activity); } private static @Nullable ActivityRecord tokenToActivityRecordLocked(Token token) { @@ -958,7 +934,9 @@ final class ActivityRecord extends ConfigurationContainer { sb.append("Token{"); sb.append(Integer.toHexString(System.identityHashCode(this))); sb.append(' '); - sb.append(weakActivity.get()); + if (weakActivity != null) { + sb.append(weakActivity.get()); + } sb.append('}'); return sb.toString(); } @@ -1005,14 +983,15 @@ final class ActivityRecord extends ConfigurationContainer { ActivityRecord _resultTo, String _resultWho, int _reqCode, boolean _componentSpecified, boolean _rootVoiceInteraction, ActivityStackSupervisor supervisor, ActivityOptions options, ActivityRecord sourceRecord) { - mAtmService = _service; + super(_service.mWindowManager, _service, new Token(_intent), aInfo, options, _intent, + null /* displayContent */); + appToken.attach(this); + mRootActivityContainer = _service.mRootActivityContainer; - appToken = new Token(this, _intent); info = aInfo; launchedFromPid = _launchedFromPid; launchedFromUid = _launchedFromUid; launchedFromPackage = _launchedFromPackage; - mUserId = UserHandle.getUserId(aInfo.applicationInfo.uid); intent = _intent; shortComponentName = _intent.getComponent().flattenToShortString(); resolvedType = _resolvedType; @@ -1037,17 +1016,6 @@ final class ActivityRecord extends ConfigurationContainer { hasBeenLaunched = false; mStackSupervisor = supervisor; - // If the class name in the intent doesn't match that of the target, this is - // probably an alias. We have to create a new ComponentName object to keep track - // of the real activity name, so that FLAG_ACTIVITY_CLEAR_TOP is handled properly. - if (aInfo.targetActivity == null - || (aInfo.targetActivity.equals(_intent.getComponent().getClassName()) - && (aInfo.launchMode == LAUNCH_MULTIPLE - || aInfo.launchMode == LAUNCH_SINGLE_TOP))) { - mActivityComponent = _intent.getComponent(); - } else { - mActivityComponent = new ComponentName(aInfo.packageName, aInfo.targetActivity); - } taskAffinity = aInfo.taskAffinity; stateNotNeeded = (aInfo.flags & FLAG_STATE_NOT_NEEDED) != 0; nonLocalizedLabel = aInfo.nonLocalizedLabel; @@ -1060,11 +1028,6 @@ final class ActivityRecord extends ConfigurationContainer { icon = aInfo.getIconResource(); logo = aInfo.getLogoResource(); theme = aInfo.getThemeResource(); - realTheme = theme; - if (realTheme == 0) { - realTheme = aInfo.applicationInfo.targetSdkVersion < HONEYCOMB - ? android.R.style.Theme : android.R.style.Theme_Holo; - } if ((aInfo.flags & ActivityInfo.FLAG_HARDWARE_ACCELERATED) != 0) { windowFlags |= LayoutParams.FLAG_HARDWARE_ACCELERATED; } @@ -1080,21 +1043,8 @@ final class ActivityRecord extends ConfigurationContainer { intent.addFlags(FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); } - packageName = aInfo.applicationInfo.packageName; launchMode = aInfo.launchMode; - Entry ent = AttributeCache.instance().get(packageName, - realTheme, com.android.internal.R.styleable.Window, mUserId); - - if (ent != null) { - fullscreen = !ActivityInfo.isTranslucentOrFloating(ent.array); - hasWallpaper = ent.array.getBoolean(R.styleable.Window_windowShowWallpaper, false); - noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false); - } else { - hasWallpaper = false; - noDisplay = false; - } - setActivityType(_componentSpecified, _launchedFromUid, _intent, options, sourceRecord); immersive = (aInfo.flags & FLAG_IMMERSIVE) != 0; @@ -1102,11 +1052,6 @@ final class ActivityRecord extends ConfigurationContainer { requestedVrComponent = (aInfo.requestedVrComponent == null) ? null : ComponentName.unflattenFromString(aInfo.requestedVrComponent); - mShowWhenLocked = (aInfo.flags & FLAG_SHOW_WHEN_LOCKED) != 0; - mInheritShownWhenLocked = (aInfo.privateFlags & FLAG_INHERIT_SHOW_WHEN_LOCKED) != 0; - mTurnScreenOn = (aInfo.flags & FLAG_TURN_SCREEN_ON) != 0; - - mRotationAnimationHint = aInfo.rotationAnimation; lockTaskLaunchMode = aInfo.lockTaskLaunchMode; if (info.applicationInfo.isPrivilegedApp() && (lockTaskLaunchMode == LOCK_TASK_LAUNCH_MODE_ALWAYS @@ -1116,13 +1061,6 @@ final class ActivityRecord extends ConfigurationContainer { if (options != null) { pendingOptions = options; - mLaunchTaskBehind = options.getLaunchTaskBehind(); - - final int rotationAnimation = pendingOptions.getRotationAnimationHint(); - // Only override manifest supplied option if set. - if (rotationAnimation >= 0) { - mRotationAnimationHint = rotationAnimation; - } final PendingIntent usageReport = pendingOptions.getUsageTimeReport(); if (usageReport != null) { appTimeTracker = new AppTimeTracker(usageReport); @@ -1152,53 +1090,6 @@ final class ActivityRecord extends ConfigurationContainer { return hasProcess() && app.hasThread(); } - void createAppWindowToken() { - if (mAppWindowToken != null) { - throw new IllegalArgumentException("App Window Token=" + mAppWindowToken - + " already created for r=" + this); - } - - inHistory = true; - - // TODO(b/36505427): Maybe this call should be moved inside updateOverrideConfiguration() - task.updateOverrideConfigurationFromLaunchBounds(); - // Make sure override configuration is up-to-date before using to create window controller. - updateOverrideConfiguration(); - - // TODO: remove after unification - mAppWindowToken = mAtmService.mWindowManager.mRoot.getAppWindowToken(appToken.asBinder()); - if (mAppWindowToken != null) { - // TODO: Should this throw an exception instead? - Slog.w(TAG, "Attempted to add existing app token: " + appToken); - } else { - final Task container = task.getTask(); - if (container == null) { - throw new IllegalArgumentException("createAppWindowToken: invalid task =" + task); - } - mAppWindowToken = createAppWindow(mAtmService.mWindowManager, appToken, - task.voiceSession != null, container.getDisplayContent(), - ActivityTaskManagerService.getInputDispatchingTimeoutLocked(this) - * 1000000L, fullscreen, - (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0, - info.applicationInfo.targetSdkVersion, - info.screenOrientation, mRotationAnimationHint, - mLaunchTaskBehind, isAlwaysFocusable()); - ProtoLog.v(WM_DEBUG_ADD_REMOVE, "addAppToken: %s" - + " task=%s at %d", mAppWindowToken, container, - Integer.MAX_VALUE); - - container.addChild(mAppWindowToken, Integer.MAX_VALUE /* add on top */); - } - - task.addActivityToTop(this); - - // When an activity is started directly into a split-screen fullscreen stack, we need to - // update the initial multi-window modes so that the callbacks are scheduled correctly when - // the user leaves that mode. - mLastReportedMultiWindowMode = inMultiWindowMode(); - mLastReportedPictureInPictureMode = inPinnedWindowingMode(); - } - boolean addStartingWindow(String pkg, int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon, int logo, int windowFlags, IBinder transferFrom, boolean newTask, boolean taskSwitch, boolean processRunning, @@ -1207,40 +1098,20 @@ final class ActivityRecord extends ConfigurationContainer { + " pkg=%s transferFrom=%s newTask=%b taskSwitch=%b processRunning=%b" + " allowTaskSnapshot=%b", appToken, pkg, transferFrom, newTask, taskSwitch, processRunning, allowTaskSnapshot); - - if (mAppWindowToken == null) { - Slog.w(TAG_WM, "Attempted to set icon of non-existing app token: " + appToken); - return false; - } - if (mAppWindowToken.getTask() == null) { - // Can be removed after unification of Task and TaskRecord. + if (getParent() == null) { Slog.w(TAG_WM, "Attempted to start a window to an app token not having attached to any" + " task: " + appToken); return false; } - return mAppWindowToken.addStartingWindow(pkg, theme, compatInfo, nonLocalizedLabel, + return super.addStartingWindow(pkg, theme, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags, transferFrom, newTask, taskSwitch, processRunning, allowTaskSnapshot, activityCreated, fromRecents); } - // TODO: Remove after unification - @VisibleForTesting - AppWindowToken createAppWindow(WindowManagerService service, IApplicationToken token, - boolean voiceInteraction, DisplayContent dc, long inputDispatchingTimeoutNanos, - boolean fullscreen, boolean showForAllUsers, int targetSdk, int orientation, - int rotationAnimationHint, boolean launchTaskBehind, - boolean alwaysFocusable) { - return new AppWindowToken(service, token, mActivityComponent, voiceInteraction, dc, - inputDispatchingTimeoutNanos, fullscreen, showForAllUsers, targetSdk, orientation, - rotationAnimationHint, launchTaskBehind, alwaysFocusable, - this); - } - void removeWindowContainer() { - if (mAtmService.mWindowManager.mRoot == null) return; + if (mWmService.mRoot == null) return; - final DisplayContent dc = mAtmService.mWindowManager.mRoot.getDisplayContent( - getDisplayId()); + final DisplayContent dc = mWmService.mRoot.getDisplayContent(getDisplayId()); if (dc == null) { Slog.w(TAG, "removeWindowContainer: Attempted to remove token: " + appToken + " from non-existing displayId=" + getDisplayId()); @@ -1256,7 +1127,7 @@ final class ActivityRecord extends ConfigurationContainer { * should ensure that the {@param newTask} is not already the parent of this activity. */ void reparent(TaskRecord newTask, int position, String reason) { - if (mAppWindowToken == null) { + if (getParent() == null) { Slog.w(TAG, "reparent: Attempted to reparent non-existing app token: " + appToken); return; } @@ -1275,7 +1146,7 @@ final class ActivityRecord extends ConfigurationContainer { + " r=" + this + " (" + prevTask.getStackId() + ")"); } - mAppWindowToken.reparent(newTask.getTask(), position); + reparent(newTask.getTask(), position); // Reparenting prevents informing the parent stack of activity removal in the case that // the new stack has the same parent. we must manually signal here if this is not the case. @@ -1366,6 +1237,7 @@ final class ActivityRecord extends ConfigurationContainer { /** * @return Stack value from current task, null if there is no task. */ + // TODO: Remove once ActivityStack and TaskStack are unified. <T extends ActivityStack> T getActivityStack() { return task != null ? (T) task.getStack() : null; } @@ -1380,14 +1252,13 @@ final class ActivityRecord extends ConfigurationContainer { } boolean setOccludesParent(boolean occludesParent) { - final boolean changed = mAppWindowToken.setOccludesParent(occludesParent); + final boolean changed = super.setOccludesParent(occludesParent); if (changed) { if (!occludesParent) { getActivityStack().convertActivityToTranslucent(this); } // Keep track of the number of fullscreen activities in this task. task.numFullscreen += occludesParent ? +1 : -1; - fullscreen = occludesParent; } // Always ensure visibility if this activity doesn't occlude parent, so the // {@link #returningOptions} of the activity under this one can be applied in @@ -1556,10 +1427,6 @@ final class ActivityRecord extends ConfigurationContainer { OP_PICTURE_IN_PICTURE, info.applicationInfo.uid, packageName) == MODE_ALLOWED; } - boolean isAlwaysFocusable() { - return (info.flags & FLAG_ALWAYS_FOCUSABLE) != 0; - } - /** Move activity with its stack to front and make the stack focused. */ boolean moveFocusableActivityToTop(String reason) { if (!isFocusable()) { @@ -1707,7 +1574,7 @@ final class ActivityRecord extends ConfigurationContainer { final TaskRecord task = getTaskRecord(); EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY, mUserId, System.identityHashCode(this), - task.taskId, shortComponentName, reason); + task.mTaskId, shortComponentName, reason); final ArrayList<ActivityRecord> activities = task.mActivities; final int index = activities.indexOf(this); if (index < (activities.size() - 1)) { @@ -1856,25 +1723,27 @@ final class ActivityRecord extends ConfigurationContainer { // implied that the current finishing activity should be added into stopping list rather // than destroy immediately. final boolean isNextNotYetVisible = next != null && (!next.nowVisible || !next.visible); - final ActivityStack stack = getActivityStack(); - final boolean notFocusedStack = stack != mRootActivityContainer.getTopDisplayFocusedStack(); + final boolean notGlobalFocusedStack = + getActivityStack() != mRootActivityContainer.getTopDisplayFocusedStack(); if (isVisible && isNextNotYetVisible) { + // Add this activity to the list of stopping activities. It will be processed and + // destroyed when the next activity reports idle. addToStopping(false /* scheduleIdle */, false /* idleDelayed */, "completeFinishing"); - if (DEBUG_STATES) { - Slog.v(TAG_STATES, "Moving to STOPPING: " + this + " (finish requested)"); - } setState(STOPPING, "completeFinishing"); - if (notFocusedStack) { + if (notGlobalFocusedStack) { + // Ensuring visibility and configuration only for non-focused stacks since this + // method call is relatively expensive and not necessary for focused stacks. mRootActivityContainer.ensureVisibilityAndConfig(next, getDisplayId(), false /* markFrozenIfConfigChanged */, true /* deferResume */); } - } else if (isVisible && isState(PAUSED) && getActivityStack().isFocusedStackOnDisplay() - && !inPinnedWindowingMode()) { - // TODO(b/137329632): Currently non-focused stack is handled differently. - addToFinishingAndWaitForIdle(); + } else if (addToFinishingAndWaitForIdle()) { + // We added this activity to the finishing list and something else is becoming resumed. + // The activity will complete finishing when the next activity reports idle. No need to + // do anything else here. } else { - // Not waiting for the next one to become visible - finish right away. + // Not waiting for the next one to become visible, and nothing else will be resumed in + // place of this activity - requesting destruction right away. activityRemoved = destroyIfPossible(reason); } @@ -1931,13 +1800,20 @@ final class ActivityRecord extends ConfigurationContainer { return activityRemoved; } + /** + * Add this activity to the list of finishing and trigger resuming of activities in focused + * stacks. + * @return {@code true} if some other activity is being resumed as a result of this call. + */ @VisibleForTesting - void addToFinishingAndWaitForIdle() { + boolean addToFinishingAndWaitForIdle() { if (DEBUG_STATES) Slog.v(TAG, "Enqueueing pending finish: " + this); setState(FINISHING, "addToFinishingAndWaitForIdle"); - mStackSupervisor.mFinishingActivities.add(this); + if (!mStackSupervisor.mFinishingActivities.contains(this)) { + mStackSupervisor.mFinishingActivities.add(this); + } resumeKeyDispatchingLocked(); - mRootActivityContainer.resumeFocusedStacksTopActivities(); + return mRootActivityContainer.resumeFocusedStacksTopActivities(); } /** @@ -1967,7 +1843,7 @@ final class ActivityRecord extends ConfigurationContainer { } EventLog.writeEvent(EventLogTags.AM_DESTROY_ACTIVITY, mUserId, - System.identityHashCode(this), getTaskRecord().taskId, shortComponentName, reason); + System.identityHashCode(this), getTaskRecord().mTaskId, shortComponentName, reason); boolean removedFromHistory = false; @@ -2105,7 +1981,7 @@ final class ActivityRecord extends ConfigurationContainer { // work. // TODO: If the callers to removeTask() changes such that we have multiple places // where we are destroying the task, move this back into removeTask() - mStackSupervisor.removeTaskByIdLocked(task.taskId, false /* killProcess */, + mStackSupervisor.removeTaskByIdLocked(task.mTaskId, false /* killProcess */, !REMOVE_FROM_RECENTS, reason); } @@ -2200,9 +2076,7 @@ final class ActivityRecord extends ConfigurationContainer { stack.removeTimeoutsForActivity(this); // Clean-up activities are no longer relaunching (e.g. app process died). Notify window // manager so it can update its bookkeeping. - if (mAppWindowToken != null) { - mAppWindowToken.clearRelaunching(); - } + clearRelaunching(); } /** @@ -2221,7 +2095,7 @@ final class ActivityRecord extends ConfigurationContainer { final String strData = data != null ? data.toSafeString() : null; EventLog.writeEvent(tag, - mUserId, System.identityHashCode(this), task.taskId, + mUserId, System.identityHashCode(this), task.mTaskId, shortComponentName, intent.getAction(), intent.getType(), strData, intent.getFlags()); } @@ -2368,7 +2242,7 @@ final class ActivityRecord extends ConfigurationContainer { */ void applyOptionsLocked(ActivityOptions pendingOptions, Intent intent) { final int animationType = pendingOptions.getAnimationType(); - final DisplayContent displayContent = mAppWindowToken.getDisplayContent(); + final DisplayContent displayContent = getDisplayContent(); switch (animationType) { case ANIM_CUSTOM: displayContent.mAppTransition.overridePendingAppTransition( @@ -2502,11 +2376,8 @@ final class ActivityRecord extends ConfigurationContainer { if (!keysPaused) { keysPaused = true; - // TODO: remove the check after unification with AppWindowToken. The DC check is not - // needed after no mock mAppWindowToken in tests. - if (mAppWindowToken != null && mAppWindowToken.getDisplayContent() != null) { - mAppWindowToken.getDisplayContent().getInputMonitor().pauseDispatchingLw( - mAppWindowToken); + if (getDisplayContent() != null) { + getDisplayContent().getInputMonitor().pauseDispatchingLw(this); } } } @@ -2515,11 +2386,8 @@ final class ActivityRecord extends ConfigurationContainer { if (keysPaused) { keysPaused = false; - // TODO: remove the check after unification with AppWindowToken. The DC check is not - // needed after no mock mAppWindowToken in tests. - if (mAppWindowToken != null && mAppWindowToken.getDisplayContent() != null) { - mAppWindowToken.getDisplayContent().getInputMonitor().resumeDispatchingLw( - mAppWindowToken); + if (getDisplayContent() != null) { + getDisplayContent().getInputMonitor().resumeDispatchingLw(this); } } } @@ -2541,12 +2409,12 @@ final class ActivityRecord extends ConfigurationContainer { } void setVisibility(boolean visible) { - if (mAppWindowToken == null) { + if (getParent() == null) { Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: " + appToken); return; } - mAppWindowToken.setVisibility(visible, mDeferHidingClient); + setVisibility(visible, mDeferHidingClient); mAtmService.addWindowLayoutReasons( ActivityTaskManagerService.LAYOUT_REASON_VISIBILITY_CHANGED); mStackSupervisor.getActivityMetricsLogger().notifyVisibilityChanged(this); @@ -2582,12 +2450,12 @@ final class ActivityRecord extends ConfigurationContainer { // an indication that the Surface will eventually be destroyed. // This however isn't necessarily true if we are going to sleep. if (state == STOPPING && !isSleeping()) { - if (mAppWindowToken == null) { + if (getParent() == null) { Slog.w(TAG_WM, "Attempted to notify stopping on non-existing app token: " + appToken); return; } - mAppWindowToken.detachChildren(); + detachChildren(); } if (state == RESUMED) { @@ -2646,23 +2514,20 @@ final class ActivityRecord extends ConfigurationContainer { } void notifyAppResumed(boolean wasStopped) { - if (mAppWindowToken == null) { + if (getParent() == null) { Slog.w(TAG_WM, "Attempted to notify resumed of non-existing app token: " + appToken); return; } - mAppWindowToken.notifyAppResumed(wasStopped); + super.notifyAppResumed(wasStopped); } void notifyUnknownVisibilityLaunched() { // No display activities never add a window, so there is no point in waiting them for // relayout. - if (!noDisplay) { - if (mAppWindowToken != null) { - mAppWindowToken.getDisplayContent().mUnknownAppVisibilityController - .notifyLaunched(mAppWindowToken); - } + if (!noDisplay && getDisplayContent() != null) { + getDisplayContent().mUnknownAppVisibilityController.notifyLaunched(this); } } @@ -2962,10 +2827,7 @@ final class ActivityRecord extends ConfigurationContainer { display.handleActivitySizeCompatModeIfNeeded(r); } - if (r.mAppWindowToken != null) { - r.mAppWindowToken.getDisplayContent().mUnknownAppVisibilityController - .notifyAppResumedFinished(r.mAppWindowToken); - } + r.getDisplayContent().mUnknownAppVisibilityController.notifyAppResumedFinished(r); } /** @@ -3113,9 +2975,7 @@ final class ActivityRecord extends ConfigurationContainer { setState(STOPPED, "activityStoppedLocked"); } - if (mAppWindowToken != null) { - mAppWindowToken.notifyAppStopped(); - } + notifyAppStopped(); if (finishing) { clearOptionsLocked(); @@ -3192,9 +3052,11 @@ final class ActivityRecord extends ConfigurationContainer { stack.removeLaunchTickMessages(); } - // IApplicationToken + boolean mayFreezeScreenLocked() { + return mayFreezeScreenLocked(app); + } - public boolean mayFreezeScreenLocked(WindowProcessController app) { + private boolean mayFreezeScreenLocked(WindowProcessController app) { // Only freeze the screen if this activity is currently attached to // an application, and that application is not blocked or unresponding. // In any other case, we can't count on getting the screen unfrozen, @@ -3202,9 +3064,13 @@ final class ActivityRecord extends ConfigurationContainer { return hasProcess() && !app.isCrashing() && !app.isNotResponding(); } - public void startFreezingScreenLocked(WindowProcessController app, int configChanges) { + void startFreezingScreenLocked(int configChanges) { + startFreezingScreenLocked(app, configChanges); + } + + void startFreezingScreenLocked(WindowProcessController app, int configChanges) { if (mayFreezeScreenLocked(app)) { - if (mAppWindowToken == null) { + if (getParent() == null) { Slog.w(TAG_WM, "Attempted to freeze screen with non-existing app token: " + appToken); return; @@ -3212,29 +3078,29 @@ final class ActivityRecord extends ConfigurationContainer { // Window configuration changes only effect windows, so don't require a screen freeze. int freezableConfigChanges = configChanges & ~(CONFIG_WINDOW_CONFIGURATION); - if (freezableConfigChanges == 0 && mAppWindowToken.okToDisplay()) { + if (freezableConfigChanges == 0 && okToDisplay()) { ProtoLog.v(WM_DEBUG_ORIENTATION, "Skipping set freeze of %s", appToken); return; } - mAppWindowToken.startFreezingScreen(); + startFreezingScreen(); } } - public void stopFreezingScreenLocked(boolean force) { + void stopFreezingScreenLocked(boolean force) { if (force || frozenBeforeDestroy) { frozenBeforeDestroy = false; - if (mAppWindowToken == null) { + if (getParent() == null) { return; } ProtoLog.v(WM_DEBUG_ORIENTATION, "Clear freezing of %s: hidden=%b freezing=%b", appToken, - mAppWindowToken.isHidden(), mAppWindowToken.isFreezingScreen()); - mAppWindowToken.stopFreezingScreen(true, force); + isHidden(), isFreezingScreen()); + stopFreezingScreen(true, force); } } - public void reportFullyDrawnLocked(boolean restoredFromBundle) { + void reportFullyDrawnLocked(boolean restoredFromBundle) { final WindowingModeTransitionInfoSnapshot info = mStackSupervisor .getActivityMetricsLogger().logAppTransitionReportedDrawn(this, restoredFromBundle); if (info != null) { @@ -3243,74 +3109,42 @@ final class ActivityRecord extends ConfigurationContainer { } } - /** - * Called when the starting window for this container is drawn. - */ - public void onStartingWindowDrawn(long timestamp) { - synchronized (mAtmService.mGlobalLock) { - mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn( - getWindowingMode(), timestamp); - } - } - /** Called when the windows associated app window container are drawn. */ - public void onWindowsDrawn(boolean drawn, long timestamp) { - synchronized (mAtmService.mGlobalLock) { - mDrawn = drawn; - if (!drawn) { - return; - } - final WindowingModeTransitionInfoSnapshot info = mStackSupervisor - .getActivityMetricsLogger().notifyWindowsDrawn(getWindowingMode(), timestamp); - final int windowsDrawnDelayMs = info != null ? info.windowsDrawnDelayMs : INVALID_DELAY; - final @LaunchState int launchState = info != null ? info.getLaunchState() : -1; - mStackSupervisor.reportActivityLaunchedLocked(false /* timeout */, this, - windowsDrawnDelayMs, launchState); - mStackSupervisor.stopWaitingForActivityVisible(this); - finishLaunchTickingLocked(); - if (task != null) { - task.hasBeenVisible = true; - } + void onWindowsDrawn(boolean drawn, long timestamp) { + mDrawn = drawn; + if (!drawn) { + return; + } + final WindowingModeTransitionInfoSnapshot info = mStackSupervisor + .getActivityMetricsLogger().notifyWindowsDrawn(getWindowingMode(), timestamp); + final int windowsDrawnDelayMs = info != null ? info.windowsDrawnDelayMs : INVALID_DELAY; + final @LaunchState int launchState = info != null ? info.getLaunchState() : -1; + mStackSupervisor.reportActivityLaunchedLocked(false /* timeout */, this, + windowsDrawnDelayMs, launchState); + mStackSupervisor.stopWaitingForActivityVisible(this); + finishLaunchTickingLocked(); + if (task != null) { + task.hasBeenVisible = true; } } /** Called when the windows associated app window container are visible. */ - public void onWindowsVisible() { - synchronized (mAtmService.mGlobalLock) { - mStackSupervisor.stopWaitingForActivityVisible(this); - if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsVisibleLocked(): " + this); - if (!nowVisible) { - nowVisible = true; - lastVisibleTime = SystemClock.uptimeMillis(); - mAtmService.scheduleAppGcsLocked(); - } + void onWindowsVisible() { + super.onWindowsVisible(); + mStackSupervisor.stopWaitingForActivityVisible(this); + if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsVisibleLocked(): " + this); + if (!nowVisible) { + nowVisible = true; + lastVisibleTime = SystemClock.uptimeMillis(); + mAtmService.scheduleAppGcsLocked(); } } /** Called when the windows associated app window container are no longer visible. */ - public void onWindowsGone() { - synchronized (mAtmService.mGlobalLock) { - if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsGone(): " + this); - nowVisible = false; - } - } - - void onAnimationFinished() { - if (mRootActivityContainer.allResumedActivitiesIdle() - || mStackSupervisor.isStoppingNoHistoryActivity()) { - // If all activities are already idle or there is an activity that must be - // stopped immediately after visible, then we now need to make sure we perform - // the full stop of this activity. This is because we won't do that while they are still - // waiting for the animation to finish. - if (mStackSupervisor.mStoppingActivities.contains(this)) { - mStackSupervisor.scheduleIdleLocked(); - } - } else { - // Instead of doing the full stop routine here, let's just hide any activities - // we now can, and let them stop when the normal idle happens. - mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */, - false /* remove */, true /* processPausingActivities */); - } + void onWindowsGone() { + super.onWindowsGone(); + if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "windowsGone(): " + this); + nowVisible = false; } /** @@ -3415,7 +3249,7 @@ final class ActivityRecord extends ConfigurationContainer { || (onlyRoot && activityNdx > task.findRootIndex(true /* effectiveRoot */))) { return INVALID_TASK_ID; } - return task.taskId; + return task.mTaskId; } static ActivityRecord isInStackLocked(IBinder token) { @@ -3470,8 +3304,8 @@ final class ActivityRecord extends ConfigurationContainer { Bitmap icon; if (_taskDescription.getIconFilename() == null && (icon = _taskDescription.getIcon()) != null) { - final String iconFilename = createImageFilename(createTime, task.taskId); - final File iconFile = new File(TaskPersister.getUserImagesDir(task.userId), + final String iconFilename = createImageFilename(createTime, task.mTaskId); + final File iconFile = new File(TaskPersister.getUserImagesDir(task.mUserId), iconFilename); final String iconFilePath = iconFile.getAbsolutePath(); mAtmService.getRecentTasks().saveImage(icon, iconFilePath); @@ -3496,9 +3330,6 @@ final class ActivityRecord extends ConfigurationContainer { void showStartingWindow(ActivityRecord prev, boolean newTask, boolean taskSwitch, boolean fromRecents) { - if (mAppWindowToken == null) { - return; - } if (mTaskOverlay) { // We don't show starting window for overlay activities. return; @@ -3526,26 +3357,20 @@ final class ActivityRecord extends ConfigurationContainer { if (mStartingWindowState == STARTING_WINDOW_SHOWN && behindFullscreenActivity) { if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY, "Found orphaned starting window " + this); mStartingWindowState = STARTING_WINDOW_REMOVED; - mAppWindowToken.removeStartingWindow(); + removeStartingWindow(); } } void setRequestedOrientation(int requestedOrientation) { - setOrientation(requestedOrientation, mayFreezeScreenLocked(app)); + setOrientation(requestedOrientation, mayFreezeScreenLocked()); mAtmService.getTaskChangeNotificationController().notifyActivityRequestedOrientationChanged( - task.taskId, requestedOrientation); + task.mTaskId, requestedOrientation); } private void setOrientation(int requestedOrientation, boolean freezeScreenIfNeeded) { - if (mAppWindowToken == null) { - Slog.w(TAG_WM, - "Attempted to set orientation of non-existing app token: " + appToken); - return; - } - final IBinder binder = (freezeScreenIfNeeded && appToken != null) ? appToken.asBinder() : null; - mAppWindowToken.setOrientation(requestedOrientation, binder, this); + setOrientation(requestedOrientation, binder, this); // Push the new configuration to the requested app in case where it's not pushed, e.g. when // the request is handled at task level with letterbox. @@ -3555,23 +3380,6 @@ final class ActivityRecord extends ConfigurationContainer { } } - int getOrientation() { - if (mAppWindowToken == null) { - return info.screenOrientation; - } - - return mAppWindowToken.getOrientationIgnoreVisibility(); - } - - void setDisablePreviewScreenshots(boolean disable) { - if (mAppWindowToken == null) { - Slog.w(TAG_WM, "Attempted to set disable screenshots of non-existing app" - + " token: " + appToken); - return; - } - mAppWindowToken.setDisablePreviewScreenshots(disable); - } - /** * Set the last reported global configuration to the client. Should be called whenever a new * global configuration is sent to the client for this activity. @@ -3594,33 +3402,6 @@ final class ActivityRecord extends ConfigurationContainer { } /** - * Get the configuration orientation by the requested screen orientation - * ({@link ActivityInfo.ScreenOrientation}) of this activity. - * - * @return orientation in ({@link Configuration#ORIENTATION_LANDSCAPE}, - * {@link Configuration#ORIENTATION_PORTRAIT}, - * {@link Configuration#ORIENTATION_UNDEFINED}). - */ - int getRequestedConfigurationOrientation() { - final int screenOrientation = getOrientation(); - if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_NOSENSOR) { - // NOSENSOR means the display's "natural" orientation, so return that. - final ActivityDisplay display = getDisplay(); - if (display != null && display.mDisplayContent != null) { - return display.mDisplayContent.getNaturalOrientation(); - } - } else if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) { - // LOCKED means the activity's orientation remains unchanged, so return existing value. - return getConfiguration().orientation; - } else if (isFixedOrientationLandscape(screenOrientation)) { - return ORIENTATION_LANDSCAPE; - } else if (isFixedOrientationPortrait(screenOrientation)) { - return ORIENTATION_PORTRAIT; - } - return ORIENTATION_UNDEFINED; - } - - /** * @return {@code true} if this activity is in size compatibility mode that uses the different * density or bounds from its parent. */ @@ -3701,6 +3482,8 @@ final class ActivityRecord extends ConfigurationContainer { // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer. private void updateOverrideConfiguration() { final Configuration overrideConfig = mTmpConfig; + overrideConfig.setTo(getRequestedOverrideConfiguration()); + if (shouldUseSizeCompatMode()) { if (mCompatDisplayInsets != null) { // The override configuration is set only once in size compatibility mode. @@ -3719,7 +3502,6 @@ final class ActivityRecord extends ConfigurationContainer { // are relative to bounds and density, they will be calculated in // {@link TaskRecord#computeConfigResourceOverrides} and the result will also be // relatively fixed. - overrideConfig.unset(); overrideConfig.colorMode = parentConfig.colorMode; overrideConfig.densityDpi = parentConfig.densityDpi; overrideConfig.screenLayout = parentConfig.screenLayout @@ -3746,7 +3528,6 @@ final class ActivityRecord extends ConfigurationContainer { return; } - overrideConfig.unset(); overrideConfig.windowConfiguration.setBounds(mTmpBounds); } @@ -3873,22 +3654,6 @@ final class ActivityRecord extends ConfigurationContainer { onMergedOverrideConfigurationChanged(); } - // TODO(b/80414790): Remove code below after unification. - // Same as above it doesn't notify configuration listeners, and consequently AppWindowToken - // can't get updated seq number. However WindowState's merged override configuration needs - // to have this seq number because that's also used for activity config pushes during layout - // traversal. Therefore explicitly update them here. - if (mAppWindowToken == null) { - return; - } - final Configuration appWindowTokenRequestedOverrideConfig = - mAppWindowToken.getRequestedOverrideConfiguration(); - if (appWindowTokenRequestedOverrideConfig.seq != getResolvedOverrideConfiguration().seq) { - appWindowTokenRequestedOverrideConfig.seq = - getResolvedOverrideConfiguration().seq; - mAppWindowToken.onMergedOverrideConfigurationChanged(); - } - final ActivityDisplay display = getDisplay(); if (display == null) { return; @@ -3916,7 +3681,7 @@ final class ActivityRecord extends ConfigurationContainer { /** Returns true if the configuration is compatible with this activity. */ boolean isConfigurationCompatible(Configuration config) { - final int orientation = getOrientation(); + final int orientation = getRequestedOrientation(); if (isFixedOrientationPortrait(orientation) && config.orientation != ORIENTATION_PORTRAIT) { return false; @@ -4149,7 +3914,7 @@ final class ActivityRecord extends ConfigurationContainer { if (shouldRelaunchLocked(changes, mTmpConfig) || forceNewConfig) { // Aha, the activity isn't handling the change, so DIE DIE DIE. configChangeFlags |= changes; - startFreezingScreenLocked(app, globalChanges); + startFreezingScreenLocked(globalChanges); forceNewConfig = false; preserveWindow &= isResizeOnlyChange(changes); final boolean hasResizeChange = hasResizeChange(changes & ~info.getRealConfigChanged()); @@ -4305,18 +4070,16 @@ final class ActivityRecord extends ConfigurationContainer { + " preserveWindow=" + preserveWindow); EventLog.writeEvent(andResume ? AM_RELAUNCH_RESUME_ACTIVITY : AM_RELAUNCH_ACTIVITY, mUserId, System.identityHashCode(this), - task.taskId, shortComponentName); + task.mTaskId, shortComponentName); - startFreezingScreenLocked(app, 0); + startFreezingScreenLocked(0); try { if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG_SWITCH, "Moving to " + (andResume ? "RESUMED" : "PAUSED") + " Relaunching " + this + " callers=" + Debug.getCallers(6)); forceNewConfig = false; - if (mAppWindowToken != null) { - mAppWindowToken.startRelaunching(); - } + startRelaunching(); final ClientTransactionItem callbackItem = ActivityRelaunchItem.obtain(pendingResults, pendingNewIntents, configChangeFlags, new MergedConfiguration(mAtmService.getGlobalConfiguration(), @@ -4405,8 +4168,8 @@ final class ActivityRecord extends ConfigurationContainer { return; } - if (mAppWindowToken != null) { - mAppWindowToken.startFreezingScreen(); + if (getParent() != null) { + startFreezingScreen(); } // The process will be killed until the activity reports stopped with saved state (see // {@link ActivityTaskManagerService.activityStopped}). @@ -4574,67 +4337,24 @@ final class ActivityRecord extends ConfigurationContainer { return info.applicationInfo.uid; } - void setShowWhenLocked(boolean showWhenLocked) { - mShowWhenLocked = showWhenLocked; - mRootActivityContainer.ensureActivitiesVisible(null, 0 /* configChanges */, - false /* preserveWindows */); - } - - void setInheritShowWhenLocked(boolean inheritShowWhenLocked) { - mInheritShownWhenLocked = inheritShowWhenLocked; - mRootActivityContainer.ensureActivitiesVisible(null, 0, false); - } - - /** - * @return true if the activity windowing mode is not - * {@link android.app.WindowConfiguration#WINDOWING_MODE_PINNED} and a) activity - * contains windows that have {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the - * activity has set {@link #mShowWhenLocked}, or b) if the activity has set - * {@link #mInheritShownWhenLocked} and the activity behind this satisfies the - * conditions a) above. - * Multi-windowing mode will be exited if true is returned. - */ - boolean canShowWhenLocked() { - if (!inPinnedWindowingMode() && (mShowWhenLocked - || (mAppWindowToken != null && mAppWindowToken.containsShowWhenLockedWindow()))) { - return true; - } else if (mInheritShownWhenLocked) { - ActivityRecord r = getActivityBelow(); - return r != null && !r.inPinnedWindowingMode() && (r.mShowWhenLocked - || (r.mAppWindowToken != null - && r.mAppWindowToken.containsShowWhenLockedWindow())); - } else { - return false; - } - } - - /** - * @return an {@link ActivityRecord} of the activity below this activity, or {@code null} if no - * such activity exists. - */ - @Nullable - private ActivityRecord getActivityBelow() { - final int pos = task.mActivities.indexOf(this); - if (pos == -1) { - throw new IllegalStateException("Activity not found in its task"); - } - return pos == 0 ? null : task.getChildAt(pos - 1); - } - - void setTurnScreenOn(boolean turnScreenOn) { - mTurnScreenOn = turnScreenOn; + @Override + int getPid() { + return app != null ? app.getPid() : 0; } /** * Determines whether this ActivityRecord can turn the screen on. It checks whether the flag - * {@link #mTurnScreenOn} is set and checks whether the ActivityRecord should be visible - * depending on Keyguard state + * {@link AppWindowToken#getTurnScreenOnFlag} is set and checks whether the ActivityRecord + * should be visible depending on Keyguard state * * @return true if the screen can be turned on, false otherwise. */ boolean canTurnScreenOn() { + if (!getTurnScreenOnFlag()) { + return false; + } final ActivityStack stack = getActivityStack(); - return mTurnScreenOn && stack != null && + return stack != null && stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */); } @@ -4648,10 +4368,6 @@ final class ActivityRecord extends ConfigurationContainer { return app == null || app.updateTopResumingActivityInProcessIfNeeded(this); } - boolean getTurnScreenOnFlag() { - return mTurnScreenOn; - } - boolean isTopRunningActivity() { return mRootActivityContainer.topRunningActivity() == this; } @@ -4686,20 +4402,11 @@ final class ActivityRecord extends ConfigurationContainer { return task.getChildAt(0) == this; } - void registerRemoteAnimations(RemoteAnimationDefinition definition) { - if (mAppWindowToken == null) { - Slog.w(TAG_WM, "Attempted to register remote animations with non-existing app" - + " token: " + appToken); - return; - } - mAppWindowToken.registerRemoteAnimations(definition); - } - @Override public String toString() { if (stringName != null) { - return stringName + " t" + (task == null ? INVALID_TASK_ID : task.taskId) + - (finishing ? " f}" : "}"); + return stringName + " t" + (task == null ? INVALID_TASK_ID : task.mTaskId) + + (finishing ? " f}" : "") + (mIsExiting ? " mIsExiting=" : "") + "}"; } StringBuilder sb = new StringBuilder(128); sb.append("ActivityRecord{"); @@ -4709,15 +4416,7 @@ final class ActivityRecord extends ConfigurationContainer { sb.append(' '); sb.append(intent.getComponent().flattenToShortString()); stringName = sb.toString(); - return toString(); - } - - void writeIdentifierToProto(ProtoOutputStream proto, long fieldId) { - final long token = proto.start(fieldId); - proto.write(HASH_CODE, System.identityHashCode(this)); - proto.write(USER_ID, mUserId); - proto.write(TITLE, intent.getComponent().flattenToShortString()); - proto.end(token); + return stringName; } /** @@ -4725,7 +4424,7 @@ final class ActivityRecord extends ConfigurationContainer { * {@code ActivityRecordProto} is the outer-most proto data. */ void writeToProto(ProtoOutputStream proto) { - super.writeToProto(proto, CONFIGURATION_CONTAINER, WindowTraceLogLevel.ALL); + super.writeToProto(proto, APP_WINDOW_TOKEN, WindowTraceLogLevel.ALL); writeIdentifierToProto(proto, IDENTIFIER); proto.write(STATE, mState.toString()); proto.write(VISIBLE, visible); @@ -4733,7 +4432,7 @@ final class ActivityRecord extends ConfigurationContainer { if (hasProcess()) { proto.write(PROC_ID, app.getPid()); } - proto.write(TRANSLUCENT, !fullscreen); + proto.write(TRANSLUCENT, !occludesParent()); } public void writeToProto(ProtoOutputStream proto, long fieldId) { diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index ab1f258df8c7..595925442053 100644 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ b/services/core/java/com/android/server/wm/ActivityStack.java @@ -775,7 +775,7 @@ class ActivityStack extends ConfigurationContainer { // multi-window mode. final String packageName = topActivity.info.applicationInfo.packageName; mService.getTaskChangeNotificationController().notifyActivityForcedResizable( - topTask.taskId, FORCED_RESIZEABLE_REASON_SPLIT_SCREEN, packageName); + topTask.mTaskId, FORCED_RESIZEABLE_REASON_SPLIT_SCREEN, packageName); } mService.deferWindowLayout(); @@ -1114,7 +1114,7 @@ class ActivityStack extends ConfigurationContainer { final ActivityRecord topRunningActivityLocked(IBinder token, int taskId) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { TaskRecord task = mTaskHistory.get(taskNdx); - if (task.taskId == taskId) { + if (task.mTaskId == taskId) { continue; } ArrayList<ActivityRecord> activities = task.mActivities; @@ -1150,7 +1150,7 @@ class ActivityStack extends ConfigurationContainer { TaskRecord taskForIdLocked(int id) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { final TaskRecord task = mTaskHistory.get(taskNdx); - if (task.taskId == id) { + if (task.mTaskId == id) { return task; } } @@ -1345,7 +1345,7 @@ class ActivityStack extends ConfigurationContainer { if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Skipping " + task + ": voice session"); continue; } - if (task.userId != userId) { + if (task.mUserId != userId) { // Looking for a different task. if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Skipping " + task + ": different user"); continue; @@ -1896,7 +1896,7 @@ class ActivityStack extends ConfigurationContainer { continue; } - if (r.fullscreen || r.hasWallpaper) { + if (r.occludesParent() || r.hasWallpaper) { // Stack isn't translucent if it has at least one fullscreen activity // that is visible. return false; @@ -2259,8 +2259,7 @@ class ActivityStack extends ConfigurationContainer { .isKeyguardOrAodShowing(displayId); final boolean keyguardLocked = mStackSupervisor.getKeyguardController().isKeyguardLocked(); final boolean showWhenLocked = r.canShowWhenLocked(); - final boolean dismissKeyguard = r.mAppWindowToken != null - && r.mAppWindowToken.containsDismissKeyguardWindow(); + final boolean dismissKeyguard = r.containsDismissKeyguardWindow(); if (shouldBeVisible) { if (dismissKeyguard && mTopDismissingKeyguardActivity == null) { mTopDismissingKeyguardActivity = r; @@ -2329,7 +2328,7 @@ class ActivityStack extends ConfigurationContainer { // get it started and resume if no other stack in this stack is resumed. if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Start and freeze screen for " + r); if (r != starting) { - r.startFreezingScreenLocked(r.app, configChanges); + r.startFreezingScreenLocked(configChanges); } if (!r.visible || r.mLaunchTaskBehind) { if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Starting and making visible: " + r); @@ -2345,7 +2344,7 @@ class ActivityStack extends ConfigurationContainer { private boolean updateBehindFullscreen(boolean stackInvisible, boolean behindFullscreenActivity, ActivityRecord r) { - if (r.fullscreen) { + if (r.occludesParent()) { if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Fullscreen: at " + r + " stackInvisible=" + stackInvisible + " behindFullscreenActivity=" + behindFullscreenActivity); @@ -2431,12 +2430,12 @@ class ActivityStack extends ConfigurationContainer { if (r == topActivity) { aboveTop = false; } - behindFullscreenActivity |= r.fullscreen; + behindFullscreenActivity |= r.occludesParent(); continue; } r.removeOrphanedStartingWindow(behindFullscreenActivity); - behindFullscreenActivity |= r.fullscreen; + behindFullscreenActivity |= r.occludesParent(); } } } @@ -2566,8 +2565,7 @@ class ActivityStack extends ConfigurationContainer { final boolean canShowWhenLocked = !mTopActivityOccludesKeyguard && next.canShowWhenLocked(); final boolean mayDismissKeyguard = mTopDismissingKeyguardActivity != next - && next.mAppWindowToken != null - && next.mAppWindowToken.containsDismissKeyguardWindow(); + && next.containsDismissKeyguardWindow(); if (canShowWhenLocked || mayDismissKeyguard) { ensureActivitiesVisibleLocked(null /* starting */, 0 /* configChanges */, @@ -2776,7 +2774,7 @@ class ActivityStack extends ConfigurationContainer { final boolean lastActivityTranslucent = lastFocusedStack != null && (lastFocusedStack.inMultiWindowMode() || (lastFocusedStack.mLastPausedActivity != null - && !lastFocusedStack.mLastPausedActivity.fullscreen)); + && !lastFocusedStack.mLastPausedActivity.occludesParent())); // This activity is now becoming visible. if (!next.visible || next.stopped || lastActivityTranslucent) { @@ -2865,7 +2863,7 @@ class ActivityStack extends ConfigurationContainer { next.notifyAppResumed(next.stopped); EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY, next.mUserId, - System.identityHashCode(next), next.getTaskRecord().taskId, + System.identityHashCode(next), next.getTaskRecord().mTaskId, next.shortComponentName); next.sleeping = false; @@ -2975,7 +2973,7 @@ class ActivityStack extends ConfigurationContainer { // The task can't be shown, put non-current user tasks below current user tasks. while (maxPosition > 0) { final TaskRecord tmpTask = mTaskHistory.get(maxPosition - 1); - if (!mStackSupervisor.isCurrentProfileLocked(tmpTask.userId) + if (!mStackSupervisor.isCurrentProfileLocked(tmpTask.mUserId) || tmpTask.topRunningActivityLocked() == null) { break; } @@ -3028,7 +3026,7 @@ class ActivityStack extends ConfigurationContainer { void startActivityLocked(ActivityRecord r, ActivityRecord focusedTopActivity, boolean newTask, boolean keepCurTransition, ActivityOptions options) { TaskRecord rTask = r.getTaskRecord(); - final int taskId = rTask.taskId; + final int taskId = rTask.mTaskId; final boolean allowMoveToFront = options == null || !options.getAvoidMoveToFront(); // mLaunchTaskBehind tasks get placed at the back of the task stack. if (!r.mLaunchTaskBehind && allowMoveToFront @@ -3055,7 +3053,7 @@ class ActivityStack extends ConfigurationContainer { if (!startIt) { if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to task " + task, new RuntimeException("here").fillInStackTrace()); - r.createAppWindowToken(); + r.setTask(rTask); ActivityOptions.abort(options); return; } @@ -3082,12 +3080,7 @@ class ActivityStack extends ConfigurationContainer { // Slot the activity into the history stack and proceed if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to stack to task " + task, new RuntimeException("here").fillInStackTrace()); - // TODO: Need to investigate if it is okay for the controller to already be created by the - // time we get to this point. I think it is, but need to double check. - // Use test in b/34179495 to trace the call path. - if (r.mAppWindowToken == null) { - r.createAppWindowToken(); - } + r.setTask(task); // The transition animation and starting window are not needed if {@code allowMoveToFront} // is false, because the activity won't be visible. @@ -3944,7 +3937,7 @@ class ActivityStack extends ConfigurationContainer { if (r.finishing) { continue; } - if (r.fullscreen) { + if (r.occludesParent()) { lastIsOpaque = true; } if (owner != null && r.app != owner) { @@ -4105,7 +4098,7 @@ class ActivityStack extends ConfigurationContainer { Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY, r.mUserId, System.identityHashCode(r), - r.getTaskRecord().taskId, r.shortComponentName, + r.getTaskRecord().mTaskId, r.shortComponentName, "proc died without state saved"); } } else { @@ -4230,7 +4223,7 @@ class ActivityStack extends ConfigurationContainer { } mRootActivityContainer.resumeFocusedStacksTopActivities(); - EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.userId, tr.taskId); + EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.mUserId, tr.mTaskId); mService.getTaskChangeNotificationController().notifyTaskMovedToFront(tr.getTaskInfo()); } finally { getDisplay().continueUpdateImeTarget(); @@ -4335,7 +4328,7 @@ class ActivityStack extends ConfigurationContainer { final ActivityRecord r = activities.get(activityIndex); updatedConfig |= r.ensureActivityConfiguration(0 /* globalChanges */, preserveWindow); - if (r.fullscreen) { + if (r.occludesParent()) { behindFullscreen = true; break; } @@ -4438,7 +4431,7 @@ class ActivityStack extends ConfigurationContainer { if (r.appToken == token) { return true; } - if (r.fullscreen && !r.finishing) { + if (r.occludesParent() && !r.finishing) { return false; } } @@ -4527,7 +4520,7 @@ class ActivityStack extends ConfigurationContainer { continue; } if (task.effectiveUid != callingUid) { - if (task.userId != userId && !crossUser && !profileIds.contains(task.userId)) { + if (task.mUserId != userId && !crossUser && !profileIds.contains(task.mUserId)) { // Skip if the caller does not have cross user permission or cannot access // the task's profile continue; @@ -4552,7 +4545,7 @@ class ActivityStack extends ConfigurationContainer { // For the focused stack top task, update the last stack active time so that it can // be used to determine the order of the tasks (it may not be set for newly created // tasks) - task.lastActiveTime = SystemClock.elapsedRealtime(); + task.touchActiveTime(); topTask = false; } tasksOut.add(task); @@ -4661,7 +4654,7 @@ class ActivityStack extends ConfigurationContainer { if (needSep) { pw.println(""); } - pw.println(prefix + "Task id #" + task.taskId); + pw.println(prefix + "Task id #" + task.mTaskId); pw.println(prefix + "mBounds=" + task.getRequestedOverrideBounds()); pw.println(prefix + "mMinWidth=" + task.mMinWidth); pw.println(prefix + "mMinHeight=" + task.mMinHeight); @@ -4718,8 +4711,7 @@ class ActivityStack extends ConfigurationContainer { if (a.info.packageName.equals(packageName)) { a.forceNewConfig = true; if (starting != null && a == starting && a.visible) { - a.startFreezingScreenLocked(starting.app, - CONFIG_SCREEN_LAYOUT); + a.startFreezingScreenLocked(CONFIG_SCREEN_LAYOUT); } } } @@ -4740,7 +4732,7 @@ class ActivityStack extends ConfigurationContainer { final boolean removed = mTaskHistory.remove(task); if (removed) { - EventLog.writeEvent(EventLogTags.AM_REMOVE_TASK, task.taskId, getStackId()); + EventLog.writeEvent(EventLogTags.AM_REMOVE_TASK, task.mTaskId, getStackId()); } removeActivitiesFromLRUList(task); @@ -4892,7 +4884,7 @@ class ActivityStack extends ConfigurationContainer { mStackSupervisor.scheduleUpdatePictureInPictureModeIfNeeded(task, prevStack); } else if (task.voiceSession != null) { try { - task.voiceSession.taskStarted(task.intent, task.taskId); + task.voiceSession.taskStarted(task.intent, task.mTaskId); } catch (RemoteException e) { } } @@ -4950,7 +4942,7 @@ class ActivityStack extends ConfigurationContainer { if (top != null && !top.isConfigurationCompatible(parentConfig)) { // The final orientation of this activity will change after moving to full screen. // Start freezing screen here to prevent showing a temporary full screen window. - top.startFreezingScreenLocked(top.app, CONFIG_SCREEN_LAYOUT); + top.startFreezingScreenLocked(CONFIG_SCREEN_LAYOUT); mService.moveTasksToFullscreenStack(mStackId, true /* onTop */); return; } diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index d151f86ff810..f1284d81bfbf 100644 --- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java @@ -821,7 +821,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { + " with results=" + results + " newIntents=" + newIntents + " andResume=" + andResume); EventLog.writeEvent(EventLogTags.AM_RESTART_ACTIVITY, r.mUserId, - System.identityHashCode(r), task.taskId, r.shortComponentName); + System.identityHashCode(r), task.mTaskId, r.shortComponentName); if (r.isActivityTypeHome()) { // Home process is the root process of the task. updateHomeProcess(task.mActivities.get(0).app); @@ -1765,7 +1765,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { moveTasksToFullscreenStackLocked(stack, !ON_TOP); } else { for (int i = tasks.size() - 1; i >= 0; i--) { - removeTaskByIdLocked(tasks.get(i).taskId, true /* killProcess */, + removeTaskByIdLocked(tasks.get(i).mTaskId, true /* killProcess */, REMOVE_FROM_RECENTS, "remove-stack"); } } @@ -1817,7 +1817,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // Find any running services associated with this app and stop if needed. final Message msg = PooledLambda.obtainMessage(ActivityManagerInternal::cleanUpServices, - mService.mAmInternal, tr.userId, component, new Intent(tr.getBaseIntent())); + mService.mAmInternal, tr.mUserId, component, new Intent(tr.getBaseIntent())); mService.mH.sendMessage(msg); if (!killProcess) { @@ -1834,7 +1834,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { SparseArray<WindowProcessController> uids = pmap.valueAt(i); for (int j = 0; j < uids.size(); j++) { WindowProcessController proc = uids.valueAt(j); - if (proc.mUserId != tr.userId) { + if (proc.mUserId != tr.mUserId) { // Don't kill process for a different user. continue; } @@ -1901,7 +1901,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { "Added restored task=" + task + " to stack=" + stack); final ArrayList<ActivityRecord> activities = task.mActivities; for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) { - activities.get(activityNdx).createAppWindowToken(); + activities.get(activityNdx).setTask(task); } return true; } @@ -1916,7 +1916,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { if (wasTrimmed) { // Task was trimmed from the recent tasks list -- remove the active task record as well // since the user won't really be able to go back to it - removeTaskByIdLocked(task.taskId, killProcess, false /* removeFromRecents */, + removeTaskByIdLocked(task.mTaskId, killProcess, false /* removeFromRecents */, "recent-task-trimmed"); } task.removedFromRecents(); @@ -2123,6 +2123,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { return false; } + // TODO: Change method name to reflect what it actually does. final ArrayList<ActivityRecord> processStoppingActivitiesLocked(ActivityRecord idleActivity, boolean remove, boolean processPausingActivities) { ArrayList<ActivityRecord> stops = null; @@ -2131,7 +2132,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { for (int activityNdx = mStoppingActivities.size() - 1; activityNdx >= 0; --activityNdx) { ActivityRecord s = mStoppingActivities.get(activityNdx); - final boolean animating = s.mAppWindowToken.isSelfAnimating(); + final boolean animating = s.isSelfAnimating(); if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible + " animating=" + animating + " finishing=" + s.finishing); @@ -2476,15 +2477,13 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { return; } mService.getTaskChangeNotificationController().notifyActivityForcedResizable( - task.taskId, reason, topActivity.info.applicationInfo.packageName); + task.mTaskId, reason, topActivity.info.applicationInfo.packageName); } void activityRelaunchedLocked(IBinder token) { final ActivityRecord r = ActivityRecord.isInStackLocked(token); if (r != null) { - if (r.mAppWindowToken != null) { - r.mAppWindowToken.finishRelaunching(); - } + r.finishRelaunching(); if (r.getActivityStack().shouldSleepOrShutDownActivities()) { r.setSleeping(true, true); } @@ -2700,7 +2699,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { * @param task The task to put into resizing mode */ void setResizingDuringAnimation(TaskRecord task) { - mResizingTasksDuringAnimation.add(task.taskId); + mResizingTasksDuringAnimation.add(task.mTaskId); task.setTaskDockedResizing(true); } @@ -2762,7 +2761,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { // If the user must confirm credentials (e.g. when first launching a work app and the // Work Challenge is present) let startActivityInPackage handle the intercepting. - if (!mService.mAmInternal.shouldConfirmCredentials(task.userId) + if (!mService.mAmInternal.shouldConfirmCredentials(task.mUserId) && task.getRootActivity() != null) { final ActivityRecord targetActivity = task.getTopActivity(); @@ -2771,7 +2770,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { mActivityMetricsLogger.notifyActivityLaunching(task.intent); try { mService.moveTaskToFrontLocked(null /* appThread */, null /* callingPackage */, - task.taskId, 0, options, true /* fromRecents */); + task.mTaskId, 0, options, true /* fromRecents */); // Apply options to prevent pendingOptions be taken by client to make sure // the override pending app transition will be applied immediately. targetActivity.applyOptionsLocked(); @@ -2788,7 +2787,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { callingPackage = task.mCallingPackage; intent = task.intent; intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY); - userId = task.userId; + userId = task.mUserId; return mService.getActivityStartController().startActivityInPackage( task.mCallingUid, callingPid, callingUid, callingPackage, intent, null, null, null, 0, 0, options, userId, task, "startActivityFromRecents", diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java index cc69b5a7205f..effd154a6aa0 100644 --- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java +++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java @@ -274,7 +274,7 @@ class ActivityStartInterceptor { // ConfirmCredentials intent and unassign it, as otherwise the task will move to // front even if ConfirmCredentials is cancelled. if (mInTask != null) { - mIntent.putExtra(EXTRA_TASK_ID, mInTask.taskId); + mIntent.putExtra(EXTRA_TASK_ID, mInTask.mTaskId); mInTask = null; } if (mActivityOptions == null) { diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 54bb5f7bcd5f..939789307333 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1557,7 +1557,7 @@ class ActivityStarter { ); if (newTask) { EventLog.writeEvent(EventLogTags.AM_CREATE_TASK, mStartActivity.mUserId, - mStartActivity.getTaskRecord().taskId); + mStartActivity.getTaskRecord().mTaskId); } mStartActivity.logStartActivity( EventLogTags.AM_CREATE_ACTIVITY, mStartActivity.getTaskRecord()); @@ -1684,14 +1684,16 @@ class ActivityStarter { == (FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) && mLaunchMode == LAUNCH_MULTIPLE; - // If mStartActivity does not have a task associated with it, associate it with the - // reused activity's task. Do not do so if we're clearing top and resetting for a - // standard launchMode activity. - if (mStartActivity.getTaskRecord() == null && !clearTopAndResetStandardLaunchMode) { - mStartActivity.setTask(targetTask); - } - + boolean clearTaskForReuse = false; if (reusedActivity != null) { + // If mStartActivity does not have a task associated with it, associate it with the + // reused activity's task. Do not do so if we're clearing top and resetting for a + // standard launchMode activity. + if (mStartActivity.getTaskRecord() == null && !clearTopAndResetStandardLaunchMode) { + mStartActivity.setTaskForReuse(reusedActivity.getTaskRecord()); + clearTaskForReuse = true; + } + if (targetTask.intent == null) { // This task was started because of movement of the activity based on // affinity... @@ -1739,6 +1741,13 @@ class ActivityStarter { complyActivityFlags(targetTask, reusedActivity); + if (clearTaskForReuse) { + // Clear task for re-use so later code to methods + // {@link #setTaskFromReuseOrCreateNewTask}, {@link #setTaskFromSourceRecord}, or + // {@link #setTaskFromInTask} can parent it to the task. + mStartActivity.setTaskForReuse(null); + } + if (mAddingToTask) { return START_SUCCESS; } diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 468a13d45d55..750fc6832627 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -807,7 +807,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { mUiHandler = new UiHandler(); mIntentFirewall = intentFirewall; final File systemDir = SystemServiceManager.ensureSystemDir(); - mAppWarnings = new AppWarnings(this, mUiContext, mH, mUiHandler, systemDir); + mAppWarnings = createAppWarnings(mUiContext, mH, mUiHandler, systemDir); mCompatModePackages = new CompatModePackages(this, systemDir, mH); mPendingIntentController = intentController; @@ -845,6 +845,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { return supervisor; } + protected AppWarnings createAppWarnings( + Context uiContext, Handler handler, Handler uiHandler, File systemDir) { + return new AppWarnings(this, uiContext, handler, uiHandler, systemDir); + } + public void setWindowManager(WindowManagerService wm) { synchronized (mGlobalLock) { mWindowManager = wm; @@ -1613,7 +1618,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // because we don't support returning them across task boundaries. Also, to // keep backwards compatibility we remove the task from recents when finishing // task with root activity. - res = mStackSupervisor.removeTaskByIdLocked(tr.taskId, false /* killProcess */, + res = mStackSupervisor.removeTaskByIdLocked(tr.mTaskId, false /* killProcess */, finishWithRootActivity, "finish-activity"); if (!res) { Slog.i(TAG, "Removing task failed to finish activity"); @@ -1813,11 +1818,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public int getRequestedOrientation(IBinder token) { synchronized (mGlobalLock) { - ActivityRecord r = ActivityRecord.isInStackLocked(token); - if (r == null) { - return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; - } - return r.getOrientation(); + final ActivityRecord r = ActivityRecord.isInStackLocked(token); + return (r != null) + ? r.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; } } @@ -2230,7 +2233,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { final TaskRecord tr = mRootActivityContainer.anyTaskForId(id, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS); if (tr != null) { - return tr.lastTaskDescription; + return tr.mTaskDescription; } } return null; @@ -3029,7 +3032,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (structure != null) { // Pre-fill the task/activity component for all assist data receivers - structure.setTaskId(pae.activity.getTaskRecord().taskId); + structure.setTaskId(pae.activity.getTaskRecord().mTaskId); structure.setActivityComponent(pae.activity.mActivityComponent); structure.setHomeActivity(pae.isHome); } @@ -3056,7 +3059,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { // Caller wants result sent back to them. sendBundle = new Bundle(); sendBundle.putInt(ActivityTaskManagerInternal.ASSIST_TASK_ID, - pae.activity.getTaskRecord().taskId); + pae.activity.getTaskRecord().mTaskId); sendBundle.putBinder(ActivityTaskManagerInternal.ASSIST_ACTIVITY_ID, pae.activity.assistToken); sendBundle.putBundle(ASSIST_KEY_DATA, pae.extras); @@ -3152,11 +3155,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { stack.removeTask(task, "addAppTask", REMOVE_TASK_MODE_DESTROYING); return INVALID_TASK_ID; } - task.lastTaskDescription.copyFrom(description); + task.mTaskDescription.copyFrom(description); // TODO: Send the thumbnail to WM to store it. - return task.taskId; + return task.mTaskId; } } finally { Binder.restoreCallingIdentity(callingIdent); @@ -4964,8 +4967,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (lastTask != task) { lastTask = task; pw.print("TASK "); pw.print(lastTask.affinity); - pw.print(" id="); pw.print(lastTask.taskId); - pw.print(" userId="); pw.println(lastTask.userId); + pw.print(" id="); pw.print(lastTask.mTaskId); + pw.print(" userId="); pw.println(lastTask.mUserId); if (dumpAll) { lastTask.dump(pw, " "); } diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 266862820017..a261341cfa53 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -21,8 +21,15 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT; +import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE; +import static android.content.pm.ActivityInfo.FLAG_INHERIT_SHOW_WHEN_LOCKED; +import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; +import static android.content.pm.ActivityInfo.FLAG_TURN_SCREEN_ON; +import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE; +import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; +import static android.os.Build.VERSION_CODES.HONEYCOMB; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; @@ -62,6 +69,9 @@ import static com.android.server.wm.AppWindowTokenProto.STARTING_MOVED; import static com.android.server.wm.AppWindowTokenProto.STARTING_WINDOW; import static com.android.server.wm.AppWindowTokenProto.THUMBNAIL; import static com.android.server.wm.AppWindowTokenProto.WINDOW_TOKEN; +import static com.android.server.wm.IdentifierProto.HASH_CODE; +import static com.android.server.wm.IdentifierProto.TITLE; +import static com.android.server.wm.IdentifierProto.USER_ID; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS_ANIM; @@ -84,12 +94,17 @@ import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM; import android.annotation.CallSuper; +import android.annotation.Nullable; import android.annotation.Size; import android.app.Activity; import android.app.ActivityManager; +import android.app.ActivityOptions; import android.content.ComponentName; +import android.content.Intent; +import android.content.pm.ActivityInfo; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.GraphicBuffer; import android.graphics.PixelFormat; import android.graphics.Point; @@ -98,14 +113,13 @@ import android.os.Binder; import android.os.Build; import android.os.Debug; import android.os.IBinder; -import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; +import android.os.UserHandle; import android.util.ArraySet; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; -import android.view.IApplicationToken; import android.view.InputApplicationHandle; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationDefinition; @@ -140,8 +154,8 @@ class AppTokenList extends ArrayList<AppWindowToken> { * Version of WindowToken that is specifically for a particular application (or * really activity) that is displaying windows. */ -class AppWindowToken extends WindowToken implements WindowManagerService.AppFreezeListener, - ConfigurationContainerListener { +// TODO: Fully merge this class into ActivityRecord class since they are really the same thing... +class AppWindowToken extends WindowToken implements WindowManagerService.AppFreezeListener { private static final String TAG = TAG_WITH_CLASS_NAME ? "AppWindowToken" : TAG_WM; /** @@ -149,17 +163,36 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree */ @VisibleForTesting static final int Z_BOOST_BASE = 800570000; + final ActivityTaskManagerService mAtmService; // Non-null only for application tokens. - final IApplicationToken appToken; + // TODO: rename to mActivityToken + final ActivityRecord.Token appToken; + // All about me + final ActivityInfo mActivityInfo; + // Which user is this running for? + final int mUserId; + // The package implementing intent's component + // TODO: rename to mPackageName + final String packageName; + // the intent component, or target of an alias. final ComponentName mActivityComponent; - final boolean mVoiceInteraction; + boolean mVoiceInteraction; /** * The activity is opaque and fills the entire space of this task. * @see WindowContainer#fillsParent() */ private boolean mOccludesParent; + // Has a wallpaper window as a background. + // TODO: Rename to mHasWallpaper and also see if it possible to combine this with the + // mOccludesParent field. + final boolean hasWallpaper; + // activity is not displayed? + // TODO: rename to mNoDisplay + @VisibleForTesting + boolean noDisplay; boolean mShowForAllUsers; + // TODO: Make this final int mTargetSdk; // Flag set while reparenting to prevent actions normally triggered by an individual parent @@ -234,10 +267,12 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree boolean mLaunchTaskBehind; boolean mEnteringAnimation; - private boolean mAlwaysFocusable; - boolean mAppStopped; - int mRotationAnimationHint; + // A hint to override the window specified rotation animation, or -1 to use the window specified + // value. We use this so that we can select the right animation in the cases of starting + // windows, where the app hasn't had time to set a value on the window. + int mRotationAnimationHint = -1; + private int mPendingRelaunchCount; private boolean mLastContainsShowWhenLockedWindow; @@ -261,9 +296,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree private Task mLastParent; - // TODO: Remove after unification - ActivityRecord mActivityRecord; - /** * @see #currentLaunchCanTurnScreenOn() */ @@ -327,6 +359,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree private static final int STARTING_WINDOW_TYPE_SNAPSHOT = 1; private static final int STARTING_WINDOW_TYPE_SPLASH_SCREEN = 2; + private boolean mShowWhenLocked; + private boolean mInheritShownWhenLocked; + private boolean mTurnScreenOn; + private AppSaturationInfo mLastAppSaturationInfo; private final ColorDisplayService.ColorTransformController mColorTransformController = @@ -341,23 +377,67 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } }); - AppWindowToken(WindowManagerService service, IApplicationToken token, - ComponentName activityComponent, boolean voiceInteraction, DisplayContent dc, - long inputDispatchingTimeoutNanos, boolean fullscreen, boolean showForAllUsers, - int targetSdk, int orientation, int rotationAnimationHint, - boolean launchTaskBehind, boolean alwaysFocusable, - ActivityRecord activityRecord) { - this(service, token, activityComponent, voiceInteraction, dc, fullscreen); - // TODO: remove after unification - mActivityRecord = activityRecord; - mActivityRecord.registerConfigurationChangeListener(this); - mInputDispatchingTimeoutNanos = inputDispatchingTimeoutNanos; - mShowForAllUsers = showForAllUsers; - mTargetSdk = targetSdk; - mOrientation = orientation; - mLaunchTaskBehind = launchTaskBehind; - mAlwaysFocusable = alwaysFocusable; - mRotationAnimationHint = rotationAnimationHint; + AppWindowToken(WindowManagerService service, ActivityTaskManagerService atm, + ActivityRecord.Token token, ActivityInfo aInfo, ActivityOptions options, Intent intent, + DisplayContent dc) { + super(service, token != null ? token.asBinder() : null, TYPE_APPLICATION, true, dc, + false /* ownerCanManageAppTokens */); + mAtmService = atm; + appToken = token; + mActivityInfo = aInfo; + mUserId = UserHandle.getUserId(mActivityInfo.applicationInfo.uid); + packageName = mActivityInfo.applicationInfo.packageName; + mInputApplicationHandle = new InputApplicationHandle(appToken); + + // If the class name in the intent doesn't match that of the target, this is probably an + // alias. We have to create a new ComponentName object to keep track of the real activity + // name, so that FLAG_ACTIVITY_CLEAR_TOP is handled properly. + if (mActivityInfo.targetActivity == null + || (mActivityInfo.targetActivity.equals(intent.getComponent().getClassName()) + && (mActivityInfo.launchMode == LAUNCH_MULTIPLE + || mActivityInfo.launchMode == LAUNCH_SINGLE_TOP))) { + mActivityComponent = intent.getComponent(); + } else { + mActivityComponent = + new ComponentName(mActivityInfo.packageName, mActivityInfo.targetActivity); + } + + mTargetSdk = mActivityInfo.applicationInfo.targetSdkVersion; + mShowForAllUsers = (mActivityInfo.flags & FLAG_SHOW_FOR_ALL_USERS) != 0; + setOrientation(mActivityInfo.screenOrientation); + mRotationAnimationHint = mActivityInfo.rotationAnimation; + + mShowWhenLocked = (aInfo.flags & ActivityInfo.FLAG_SHOW_WHEN_LOCKED) != 0; + mInheritShownWhenLocked = (aInfo.privateFlags & FLAG_INHERIT_SHOW_WHEN_LOCKED) != 0; + mTurnScreenOn = (aInfo.flags & FLAG_TURN_SCREEN_ON) != 0; + + int realTheme = mActivityInfo.getThemeResource(); + if (realTheme == Resources.ID_NULL) { + realTheme = aInfo.applicationInfo.targetSdkVersion < HONEYCOMB + ? android.R.style.Theme : android.R.style.Theme_Holo; + } + + final AttributeCache.Entry ent = AttributeCache.instance().get(packageName, + realTheme, com.android.internal.R.styleable.Window, mUserId); + + if (ent != null) { + mOccludesParent = !ActivityInfo.isTranslucentOrFloating(ent.array); + hasWallpaper = ent.array.getBoolean(R.styleable.Window_windowShowWallpaper, false); + noDisplay = ent.array.getBoolean(R.styleable.Window_windowNoDisplay, false); + } else { + hasWallpaper = false; + noDisplay = false; + } + + if (options != null) { + mLaunchTaskBehind = options.getLaunchTaskBehind(); + + final int rotationAnimation = options.getRotationAnimationHint(); + // Only override manifest supplied option if set. + if (rotationAnimation >= 0) { + mRotationAnimationHint = rotationAnimation; + } + } // Application tokens start out hidden. setHidden(true); @@ -365,20 +445,19 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree ColorDisplayService.ColorDisplayServiceInternal cds = LocalServices.getService( ColorDisplayService.ColorDisplayServiceInternal.class); - cds.attachColorTransformController(activityRecord.packageName, activityRecord.mUserId, + cds.attachColorTransformController(packageName, mUserId, new WeakReference<>(mColorTransformController)); } - AppWindowToken(WindowManagerService service, IApplicationToken token, - ComponentName activityComponent, boolean voiceInteraction, DisplayContent dc, - boolean fillsParent) { - super(service, token != null ? token.asBinder() : null, TYPE_APPLICATION, true, dc, - false /* ownerCanManageAppTokens */); - appToken = token; - mActivityComponent = activityComponent; + void onAttachToTask(boolean voiceInteraction, DisplayContent dc, + long inputDispatchingTimeoutNanos) { + mInputDispatchingTimeoutNanos = inputDispatchingTimeoutNanos; mVoiceInteraction = voiceInteraction; - mOccludesParent = fillsParent; - mInputApplicationHandle = new InputApplicationHandle(appToken.asBinder()); + onDisplayChanged(dc); + + // Application tokens start out hidden. + setHidden(true); + hiddenRequested = true; } void onFirstWindowDrawn(WindowState win, WindowStateAnimator winAnimator) { @@ -433,43 +512,33 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree if (DEBUG_VISIBILITY) Slog.v(TAG, "VIS " + this + ": interesting=" + numInteresting + " visible=" + numVisible); if (nowDrawn != reportedDrawn) { - if (mActivityRecord != null) { - mActivityRecord.onWindowsDrawn(nowDrawn, SystemClock.uptimeMillis()); - } + onWindowsDrawn(nowDrawn, SystemClock.uptimeMillis()); reportedDrawn = nowDrawn; } if (nowVisible != reportedVisible) { if (DEBUG_VISIBILITY) Slog.v(TAG, "Visibility changed in " + this + ": vis=" + nowVisible); reportedVisible = nowVisible; - if (mActivityRecord != null) { - if (nowVisible) { - onWindowsVisible(); - } else { - onWindowsGone(); - } + if (nowVisible) { + onWindowsVisible(); + } else { + onWindowsGone(); } } } - private void onWindowsGone() { - if (mActivityRecord == null) { - return; - } - if (DEBUG_VISIBILITY) { - Slog.v(TAG_WM, "Reporting gone in " + mActivityRecord.appToken); - } - mActivityRecord.onWindowsGone(); + // Mostly implemented in ActivityRecord. + void onWindowsDrawn(boolean drawn, long timestamp) { } - private void onWindowsVisible() { - if (mActivityRecord == null) { - return; - } - if (DEBUG_VISIBILITY) { - Slog.v(TAG_WM, "Reporting visible in " + mActivityRecord.appToken); - } - mActivityRecord.onWindowsVisible(); + // Mostly implemented in ActivityRecord. Keeping here for the logpoint. + void onWindowsGone() { + if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting gone in " + appToken); + } + + // Mostly implemented in ActivityRecord. Keeping here for the logpoint. + void onWindowsVisible() { + if (DEBUG_VISIBILITY) Slog.v(TAG_WM, "Reporting visible in " + appToken); } boolean isClientHidden() { @@ -604,8 +673,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } } } - // Changes in opening apps and closing apps may cause orientation change. - reportDescendantOrientationChangeIfNeeded(); return; } @@ -762,29 +829,27 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } SurfaceControl.closeTransaction(); } - - // Visibility changes may cause orientation request change. - reportDescendantOrientationChangeIfNeeded(); } return delayed; } - private void reportDescendantOrientationChangeIfNeeded() { + boolean mayFreezeScreenLocked() { + return false; + } + + void reportDescendantOrientationChangeIfNeeded() { // Orientation request is exposed only when we're visible. Therefore visibility change // will change requested orientation. Notify upward the hierarchy ladder to adjust // configuration. This is important to cases where activities with incompatible // orientations launch, or user goes back from an activity of bi-orientation to an // activity with specified orientation. - if (mActivityRecord.getRequestedConfigurationOrientation() == getConfiguration().orientation - || getOrientationIgnoreVisibility() == SCREEN_ORIENTATION_UNSET) { + if (getRequestedOrientation() == SCREEN_ORIENTATION_UNSET) { return; } - final IBinder freezeToken = - mActivityRecord.mayFreezeScreenLocked(mActivityRecord.app) - ? mActivityRecord.appToken : null; - onDescendantOrientationChanged(freezeToken, mActivityRecord); + final IBinder freezeToken = mayFreezeScreenLocked() ? appToken : null; + onDescendantOrientationChanged(freezeToken, this); } /** @@ -834,10 +899,16 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return candidate; } + boolean isAlwaysFocusable() { + return (mActivityInfo.flags & FLAG_ALWAYS_FOCUSABLE) != 0; + } + + // TODO: Does this really need to be different from isAlwaysFocusable()? For the activity side + // focusable means resumeable. I guess with that in mind maybe we should rename the other + // method to isResumeable() or something like that. boolean windowsAreFocusable() { if (mTargetSdk < Build.VERSION_CODES.Q) { - final int pid = mActivityRecord != null - ? (mActivityRecord.app != null ? mActivityRecord.app.getPid() : 0) : 0; + final int pid = getPid(); final AppWindowToken topFocusedAppOfMyProcess = mWmService.mRoot.mTopFocusedAppByProcess.get(pid); if (topFocusedAppOfMyProcess != null && topFocusedAppOfMyProcess != this) { @@ -846,7 +917,12 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return false; } } - return getWindowConfiguration().canReceiveKeys() || mAlwaysFocusable; + return getWindowConfiguration().canReceiveKeys() || isAlwaysFocusable(); + } + + // Mostly implemented in ActivityRecord... + int getPid() { + return 0; } @Override @@ -859,9 +935,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree @Override void removeImmediately() { onRemovedFromDisplay(); - if (mActivityRecord != null) { - mActivityRecord.unregisterConfigurationChangeListener(this); - } super.removeImmediately(); } @@ -1065,7 +1138,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree if (task == null) { // It is possible we have been marked as a closing app earlier. We must remove ourselves // from this list so we do not participate in any future animations. - getDisplayContent().mClosingApps.remove(this); + if (getDisplayContent() != null) { + getDisplayContent().mClosingApps.remove(this); + } } else if (mLastParent != null && mLastParent.mStack != null) { task.mStack.mExitingAppTokens.remove(this); } @@ -1655,27 +1730,18 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } /** Returns the app's preferred orientation regardless of its currently visibility state. */ - int getOrientationIgnoreVisibility() { + int getRequestedOrientation() { return mOrientation; } /** @return {@code true} if the compatibility bounds is taking effect. */ - boolean inSizeCompatMode() { + boolean hasSizeCompatBounds() { return mSizeCompatBounds != null; } @Override float getSizeCompatScale() { - return inSizeCompatMode() ? mSizeCompatScale : super.getSizeCompatScale(); - } - - /** - * @return Non-empty bounds if the activity has override bounds. - * @see ActivityRecord#resolveOverrideConfiguration(Configuration) - */ - Rect getResolvedOverrideBounds() { - // Get bounds from resolved override configuration because it is computed with orientation. - return getResolvedOverrideConfiguration().windowConfiguration.getBounds(); + return hasSizeCompatBounds() ? mSizeCompatScale : super.getSizeCompatScale(); } @Override @@ -1708,7 +1774,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree final int winMode = getWindowingMode(); - if (prevWinMode == winMode) { + if (prevWinMode == winMode || mDisplayContent == null) { return; } @@ -1951,8 +2017,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } } + // Mostly implemented in ActivityRecord... boolean keyDispatchingTimedOut(String reason, int windowPid) { - return mActivityRecord != null && mActivityRecord.keyDispatchingTimedOut(reason, windowPid); + return false; } /** @@ -2019,9 +2086,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } } } else if (w.isDrawnLw()) { - if (mActivityRecord != null) { - mActivityRecord.onStartingWindowDrawn(SystemClock.uptimeMillis()); - } + onStartingWindowDrawn(SystemClock.uptimeMillis()); startingDisplayed = true; } } @@ -2029,6 +2094,14 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return isInterestingAndDrawn; } + /** Called when the starting window for this container is drawn. */ + private void onStartingWindowDrawn(long timestamp) { + synchronized (mAtmService.mGlobalLock) { + mAtmService.mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn( + getWindowingMode(), timestamp); + } + } + void layoutLetterbox(WindowState winHint) { final WindowState w = findMainWindow(); if (w == null || winHint != null && w != winHint) { @@ -2413,6 +2486,66 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return false; } + void setShowWhenLocked(boolean showWhenLocked) { + mShowWhenLocked = showWhenLocked; + mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */, + 0 /* configChanges */, false /* preserveWindows */); + } + + void setInheritShowWhenLocked(boolean inheritShowWhenLocked) { + mInheritShownWhenLocked = inheritShowWhenLocked; + mAtmService.mRootActivityContainer.ensureActivitiesVisible(null /* starting */, + 0 /* configChanges */, false /* preserveWindows */); + } + + /** + * @return {@code true} if the activity windowing mode is not + * {@link android.app.WindowConfiguration#WINDOWING_MODE_PINNED} and a) activity + * contains windows that have {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} set or if the + * activity has set {@link #mShowWhenLocked}, or b) if the activity has set + * {@link #mInheritShownWhenLocked} and the activity behind this satisfies the + * conditions a) above. + * Multi-windowing mode will be exited if {@code true} is returned. + */ + boolean canShowWhenLocked() { + if (!inPinnedWindowingMode() && (mShowWhenLocked || containsShowWhenLockedWindow())) { + return true; + } else if (mInheritShownWhenLocked) { + final AppWindowToken r = getActivityBelow(); + return r != null && !r.inPinnedWindowingMode() && (r.mShowWhenLocked + || r.containsShowWhenLockedWindow()); + } else { + return false; + } + } + + /** + * @return an {@link ActivityRecord} of the activity below this activity, or {@code null} if no + * such activity exists. + */ + @Nullable + private AppWindowToken getActivityBelow() { + final Task task = getTask(); + final int pos = task.mChildren.indexOf(this); + if (pos == -1) { + throw new IllegalStateException("Activity not found in its task"); + } + return pos == 0 ? null : task.getChildAt(pos - 1); + } + + void setTurnScreenOn(boolean turnScreenOn) { + mTurnScreenOn = turnScreenOn; + } + + /** Mostly implemented in ActivityRecord. */ + boolean canTurnScreenOn() { + return mTurnScreenOn; + } + + boolean getTurnScreenOnFlag() { + return mTurnScreenOn; + } + void checkKeyguardFlagsChanged() { final boolean containsDismissKeyguard = containsDismissKeyguardWindow(); final boolean containsShowWhenLocked = containsShowWhenLockedWindow(); @@ -2797,7 +2930,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree layer += Z_BOOST_BASE; } if (!mNeedsAnimationBoundsLayer) { - leash.setLayer(layer); + t.setLayer(leash, layer); } final DisplayContent dc = getDisplayContent(); @@ -2890,7 +3023,21 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree getDisplayContent().mAppTransition.notifyAppTransitionFinishedLocked(token); scheduleAnimation(); - mActivityRecord.onAnimationFinished(); + if (mAtmService.mRootActivityContainer.allResumedActivitiesIdle() + || mAtmService.mStackSupervisor.isStoppingNoHistoryActivity()) { + // If all activities are already idle or there is an activity that must be + // stopped immediately after visible, then we now need to make sure we perform + // the full stop of this activity. This is because we won't do that while they are still + // waiting for the animation to finish. + if (mAtmService.mStackSupervisor.mStoppingActivities.contains(this)) { + mAtmService.mStackSupervisor.scheduleIdleLocked(); + } + } else { + // Instead of doing the full stop routine here, let's just hide any activities + // we now can, and let them stop when the normal idle happens. + mAtmService.mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */, + false /* remove */, true /* processPausingActivities */); + } Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } @@ -2957,10 +3104,13 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } boolean isWaitingForTransitionStart() { - return getDisplayContent().mAppTransition.isTransitionSet() - && (getDisplayContent().mOpeningApps.contains(this) - || getDisplayContent().mClosingApps.contains(this) - || getDisplayContent().mChangingApps.contains(this)); + final DisplayContent dc = getDisplayContent(); + // TODO: Test for null can be removed once unification is done. + if (dc == null) return false; + return dc.mAppTransition.isTransitionSet() + && (dc.mOpeningApps.contains(this) + || dc.mClosingApps.contains(this) + || dc.mChangingApps.contains(this)); } public int getTransit() { @@ -3204,27 +3354,17 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } void writeNameToProto(ProtoOutputStream proto, long fieldId) { - if (appToken == null) { - return; - } - try { + if (appToken != null) { proto.write(fieldId, appToken.getName()); - } catch (RemoteException e) { - // This shouldn't happen, but in this case fall back to outputting nothing - Slog.e(TAG, e.toString()); } } - @Override - public String toString() { - if (stringName == null) { - StringBuilder sb = new StringBuilder(); - sb.append("AppWindowToken{"); - sb.append(Integer.toHexString(System.identityHashCode(this))); - sb.append(" token="); sb.append(token); sb.append('}'); - stringName = sb.toString(); - } - return stringName + ((mIsExiting) ? " mIsExiting=" : ""); + void writeIdentifierToProto(ProtoOutputStream proto, long fieldId) { + final long token = proto.start(fieldId); + proto.write(HASH_CODE, System.identityHashCode(this)); + proto.write(USER_ID, mUserId); + proto.write(TITLE, ((ActivityRecord) this).intent.getComponent().flattenToShortString()); + proto.end(token); } Rect getLetterboxInsets() { diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java index c1ca816d788a..b73b481075ae 100644 --- a/services/core/java/com/android/server/wm/CircularDisplayMask.java +++ b/services/core/java/com/android/server/wm/CircularDisplayMask.java @@ -56,7 +56,7 @@ class CircularDisplayMask { private int mMaskThickness; CircularDisplayMask(Supplier<Surface> surfaceFactory, DisplayContent dc, int zOrder, - int screenOffset, int maskThickness) { + int screenOffset, int maskThickness, SurfaceControl.Transaction t) { final Display display = dc.getDisplay(); mSurface = surfaceFactory.get(); mScreenSize = new Point(); @@ -75,10 +75,10 @@ class CircularDisplayMask { .setFormat(PixelFormat.TRANSLUCENT) .build(); - ctrl.setLayerStack(display.getLayerStack()); - ctrl.setLayer(zOrder); - ctrl.setPosition(0, 0); - ctrl.show(); + t.setLayerStack(ctrl, display.getLayerStack()); + t.setLayer(ctrl, zOrder); + t.setPosition(ctrl, 0, 0); + t.show(ctrl); mSurface.copyFrom(ctrl); } catch (OutOfResourcesException e) { } @@ -91,7 +91,7 @@ class CircularDisplayMask { mMaskThickness = maskThickness; } - private void drawIfNeeded() { + private void drawIfNeeded(SurfaceControl.Transaction t) { if (!mDrawNeeded || !mVisible || mDimensionsUnequal) { return; } @@ -108,45 +108,46 @@ class CircularDisplayMask { return; } switch (mRotation) { - case Surface.ROTATION_0: - case Surface.ROTATION_90: - // chin bottom or right - mSurfaceControl.setPosition(0, 0); - break; - case Surface.ROTATION_180: - // chin top - mSurfaceControl.setPosition(0, -mScreenOffset); - break; - case Surface.ROTATION_270: - // chin left - mSurfaceControl.setPosition(-mScreenOffset, 0); - break; + case Surface.ROTATION_0: + case Surface.ROTATION_90: + // chin bottom or right + t.setPosition(mSurfaceControl, 0, 0); + break; + case Surface.ROTATION_180: + // chin top + t.setPosition(mSurfaceControl, 0, -mScreenOffset); + break; + case Surface.ROTATION_270: + // chin left + t.setPosition(mSurfaceControl, -mScreenOffset, 0); + break; } int circleRadius = mScreenSize.x / 2; c.drawColor(Color.BLACK); - // The radius is reduced by mMaskThickness to provide an anti aliasing effect on the display edges. + // The radius is reduced by mMaskThickness to provide an anti aliasing effect on the + // display edges. c.drawCircle(circleRadius, circleRadius, circleRadius - mMaskThickness, mPaint); mSurface.unlockCanvasAndPost(c); } // Note: caller responsible for being inside // Surface.openTransaction() / closeTransaction() - public void setVisibility(boolean on) { + public void setVisibility(boolean on, SurfaceControl.Transaction t) { if (mSurfaceControl == null) { return; } mVisible = on; - drawIfNeeded(); + drawIfNeeded(t); if (on) { - mSurfaceControl.show(); + t.show(mSurfaceControl); } else { - mSurfaceControl.hide(); + t.hide(mSurfaceControl); } } - void positionSurface(int dw, int dh, int rotation) { + void positionSurface(int dw, int dh, int rotation, SurfaceControl.Transaction t) { if (mLastDW == dw && mLastDH == dh && mRotation == rotation) { return; } @@ -154,7 +155,7 @@ class CircularDisplayMask { mLastDH = dh; mDrawNeeded = true; mRotation = rotation; - drawIfNeeded(); + drawIfNeeded(t); } } diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java index 3886ae1635cc..8afbbdf303ab 100644 --- a/services/core/java/com/android/server/wm/ConfigurationContainer.java +++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java @@ -90,7 +90,8 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { private ArrayList<ConfigurationContainerListener> mChangeListeners = new ArrayList<>(); // TODO: Can't have ag/2592611 soon enough! - private final Configuration mTmpConfig = new Configuration(); + private final Configuration mRequestsTmpConfig = new Configuration(); + private final Configuration mResolvedTmpConfig = new Configuration(); // Used for setting bounds private final Rect mTmpRect = new Rect(); @@ -121,12 +122,19 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { * @see #mFullConfiguration */ public void onConfigurationChanged(Configuration newParentConfig) { - mTmpConfig.setTo(mResolvedOverrideConfiguration); + onConfigurationChanged(newParentConfig, true /*forwardToChildren*/); + } + + // TODO: Consolidate with onConfigurationChanged() method above once unification is done. This + // is only currently need during the process of unification where we don't want configuration + // forwarded to a child from both parents. + public void onConfigurationChanged(Configuration newParentConfig, boolean forwardToChildren) { + mResolvedTmpConfig.setTo(mResolvedOverrideConfiguration); resolveOverrideConfiguration(newParentConfig); mFullConfiguration.setTo(newParentConfig); mLastOverrideConfigurationChanges = mFullConfiguration.updateFrom(mResolvedOverrideConfiguration); - if (!mTmpConfig.equals(mResolvedOverrideConfiguration)) { + if (!mResolvedTmpConfig.equals(mResolvedOverrideConfiguration)) { onMergedOverrideConfigurationChanged(); // This depends on the assumption that change-listeners don't do // their own override resolution. This way, dependent hierarchies @@ -139,9 +147,11 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { mResolvedOverrideConfiguration); } } - for (int i = getChildCount() - 1; i >= 0; --i) { - final ConfigurationContainer child = getChildAt(i); - child.onConfigurationChanged(mFullConfiguration); + if (forwardToChildren) { + for (int i = getChildCount() - 1; i >= 0; --i) { + final ConfigurationContainer child = getChildAt(i); + child.onConfigurationChanged(mFullConfiguration); + } } } @@ -262,6 +272,11 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { out.set(bounds.left, bounds.top); } + Rect getResolvedOverrideBounds() { + mReturnBounds.set(getResolvedOverrideConfiguration().windowConfiguration.getBounds()); + return mReturnBounds; + } + /** * Returns the bounds requested on this container. These may not be the actual bounds the * container ends up with due to policy constraints. The {@link Rect} handed back is @@ -306,9 +321,9 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { } - mTmpConfig.setTo(getRequestedOverrideConfiguration()); - mTmpConfig.windowConfiguration.setBounds(bounds); - onRequestedOverrideConfigurationChanged(mTmpConfig); + mRequestsTmpConfig.setTo(getRequestedOverrideConfiguration()); + mRequestsTmpConfig.windowConfiguration.setBounds(bounds); + onRequestedOverrideConfigurationChanged(mRequestsTmpConfig); return boundsChange; } @@ -360,9 +375,9 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { /** Sets the requested windowing mode override for the configuration container. */ public void setWindowingMode(/*@WindowConfiguration.WindowingMode*/ int windowingMode) { - mTmpConfig.setTo(getRequestedOverrideConfiguration()); - mTmpConfig.windowConfiguration.setWindowingMode(windowingMode); - onRequestedOverrideConfigurationChanged(mTmpConfig); + mRequestsTmpConfig.setTo(getRequestedOverrideConfiguration()); + mRequestsTmpConfig.windowConfiguration.setWindowingMode(windowingMode); + onRequestedOverrideConfigurationChanged(mRequestsTmpConfig); } /** Sets the always on top flag for this configuration container. @@ -372,16 +387,16 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { * - {@Link ActivityDisplay#positionChildAtTop(ActivityStack)}; * */ public void setAlwaysOnTop(boolean alwaysOnTop) { - mTmpConfig.setTo(getRequestedOverrideConfiguration()); - mTmpConfig.windowConfiguration.setAlwaysOnTop(alwaysOnTop); - onRequestedOverrideConfigurationChanged(mTmpConfig); + mRequestsTmpConfig.setTo(getRequestedOverrideConfiguration()); + mRequestsTmpConfig.windowConfiguration.setAlwaysOnTop(alwaysOnTop); + onRequestedOverrideConfigurationChanged(mRequestsTmpConfig); } /** Sets the windowing mode for the configuration container. */ void setDisplayWindowingMode(int windowingMode) { - mTmpConfig.setTo(getRequestedOverrideConfiguration()); - mTmpConfig.windowConfiguration.setDisplayWindowingMode(windowingMode); - onRequestedOverrideConfigurationChanged(mTmpConfig); + mRequestsTmpConfig.setTo(getRequestedOverrideConfiguration()); + mRequestsTmpConfig.windowConfiguration.setDisplayWindowingMode(windowingMode); + onRequestedOverrideConfigurationChanged(mRequestsTmpConfig); } /** @@ -451,9 +466,9 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { throw new IllegalStateException("Can't change activity type once set: " + this + " activityType=" + activityTypeToString(activityType)); } - mTmpConfig.setTo(getRequestedOverrideConfiguration()); - mTmpConfig.windowConfiguration.setActivityType(activityType); - onRequestedOverrideConfigurationChanged(mTmpConfig); + mRequestsTmpConfig.setTo(getRequestedOverrideConfiguration()); + mRequestsTmpConfig.windowConfiguration.setActivityType(activityType); + onRequestedOverrideConfigurationChanged(mRequestsTmpConfig); } public boolean isActivityTypeHome() { diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 6d9a00804e32..ac910cde79b0 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -132,7 +132,6 @@ import static com.android.server.wm.WindowManagerService.dipToPixel; import static com.android.server.wm.WindowState.EXCLUSION_LEFT; import static com.android.server.wm.WindowState.EXCLUSION_RIGHT; import static com.android.server.wm.WindowState.RESIZE_HANDLE_WIDTH_IN_DP; -import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING; import static com.android.server.wm.WindowStateAnimator.READY_TO_SHOW; import static com.android.server.wm.utils.RegionUtils.forEachRectReverse; import static com.android.server.wm.utils.RegionUtils.rectListToRegion; @@ -221,7 +220,7 @@ import java.util.function.Predicate; * particular Display. */ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowContainer> - implements WindowManagerPolicy.DisplayContentInfo { + implements WindowManagerPolicy.DisplayContentInfo, ConfigurationContainerListener { private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplayContent" : TAG_WM; /** The default scaling mode that scales content automatically. */ @@ -240,7 +239,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo private final int mDisplayId; // TODO: Remove once unification is complete. - ActivityDisplay mAcitvityDisplay; + ActivityDisplay mActivityDisplay; /** The containers below are the only child containers the display can have. */ // Contains all window containers that are related to apps (Activities) @@ -332,7 +331,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo /** * For default display it contains real metrics, empty for others. - * @see WindowManagerService#createWatermarkInTransaction() + * @see WindowManagerService#createWatermark() */ final DisplayMetrics mRealDisplayMetrics = new DisplayMetrics(); @@ -852,7 +851,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo DisplayContent(Display display, WindowManagerService service, ActivityDisplay activityDisplay) { super(service); - mAcitvityDisplay = activityDisplay; + mActivityDisplay = activityDisplay; if (service.mRoot.getDisplayContent(display.getDisplayId()) != null) { throw new IllegalArgumentException("Display with ID=" + display.getDisplayId() + " already exists=" + service.mRoot.getDisplayContent(display.getDisplayId()) @@ -1136,10 +1135,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo * values from being replaced by the initializing {@link #ActivityDisplay}. */ void initializeDisplayOverrideConfiguration() { - if (mAcitvityDisplay != null) { - mAcitvityDisplay.getRequestedOverrideConfiguration() - .updateFrom(getRequestedOverrideConfiguration()); + if (mActivityDisplay == null) { + return; } + mActivityDisplay.onRequestedOverrideConfigurationChanged( + getResolvedOverrideConfiguration()); + mActivityDisplay.registerConfigurationChangeListener(this); } void reconfigureDisplayLocked() { @@ -1165,10 +1166,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } void sendNewConfiguration() { - if (!isReady() || mAcitvityDisplay == null) { + if (!isReady() || mActivityDisplay == null) { return; } - final boolean configUpdated = mAcitvityDisplay.updateDisplayOverrideConfigurationLocked(); + final boolean configUpdated = mActivityDisplay.updateDisplayOverrideConfigurationLocked(); if (configUpdated) { return; } @@ -1199,7 +1200,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (handled && requestingContainer instanceof ActivityRecord) { final ActivityRecord activityRecord = (ActivityRecord) requestingContainer; - final boolean kept = mAcitvityDisplay.updateDisplayOverrideConfigurationLocked( + final boolean kept = mActivityDisplay.updateDisplayOverrideConfigurationLocked( config, activityRecord, false /* deferResume */, null /* result */); activityRecord.frozenBeforeDestroy = true; if (!kept) { @@ -1208,7 +1209,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } else { // We have a new configuration to push so we need to update ATMS for now. // TODO: Clean up display configuration push between ATMS and WMS after unification. - mAcitvityDisplay.updateDisplayOverrideConfigurationLocked( + mActivityDisplay.updateDisplayOverrideConfigurationLocked( config, null /* starting */, false /* deferResume */, null); } return handled; @@ -2373,6 +2374,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo void removeImmediately() { mRemovingDisplay = true; try { + if (mActivityDisplay != null) { + mActivityDisplay.unregisterConfigurationChangeListener(this); + } if (mParentWindow != null) { mParentWindow.removeEmbeddedDisplayContent(this); } @@ -2635,13 +2639,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mFocusedApp.writeNameToProto(proto, FOCUSED_APP); } for (int i = mOpeningApps.size() - 1; i >= 0; i--) { - mOpeningApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, OPENING_APPS); + mOpeningApps.valueAt(i).writeIdentifierToProto(proto, OPENING_APPS); } for (int i = mClosingApps.size() - 1; i >= 0; i--) { - mClosingApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, CLOSING_APPS); + mClosingApps.valueAt(i).writeIdentifierToProto(proto, CLOSING_APPS); } for (int i = mChangingApps.size() - 1; i >= 0; i--) { - mChangingApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, CHANGING_APPS); + mChangingApps.valueAt(i).writeIdentifierToProto(proto, CHANGING_APPS); } proto.end(token); } @@ -3514,19 +3518,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mWmService.mWindowPlacerLocked.performSurfacePlacement(); } - void waitForAllWindowsDrawn() { - final WindowManagerPolicy policy = mWmService.mPolicy; - forAllWindows(w -> { - final boolean keyguard = policy.isKeyguardHostWindow(w.mAttrs); - if (w.isVisibleLw() && (w.mAppToken != null || keyguard)) { - w.mWinAnimator.mDrawState = DRAW_PENDING; - // Force add to mResizingWindows. - w.resetLastContentInsets(); - mWmService.mWaitingForDrawn.add(w); - } - }, true /* traverseTopToBottom */); - } - // TODO: Super crazy long method that should be broken down... void applySurfaceChangesTransaction(boolean recoveringMemory) { final WindowSurfacePlacer surfacePlacer = mWmService.mWindowPlacerLocked; diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java index ae3b5f2f70d3..d3e429019767 100644 --- a/services/core/java/com/android/server/wm/DockedStackDividerController.java +++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java @@ -819,9 +819,12 @@ public class DockedStackDividerController { // We put all tasks into drag resizing mode - wait until all of them have completed the // drag resizing switch. - if (!mService.mWaitingForDrawn.isEmpty()) { - mService.mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT); - mService.mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, + final Runnable existingWaitingForDrwanCallback = + mService.mWaitingForDrawnCallbacks.get(mService.mRoot); + if (existingWaitingForDrwanCallback != null) { + mService.mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, mService.mRoot); + mService.mH.sendMessageDelayed(mService.mH.obtainMessage(H.WAITING_FOR_DRAWN_TIMEOUT, + mService.mRoot), IME_ADJUST_DRAWN_TIMEOUT); mAnimationStartDelayed = true; if (imeWin != null) { @@ -838,10 +841,8 @@ public class DockedStackDividerController { // still gets executed. // TODO: Have a real system where we can wait on different windows to be drawn with // different callbacks. - if (mService.mWaitingForDrawnCallback != null) { - mService.mWaitingForDrawnCallback.run(); - } - mService.mWaitingForDrawnCallback = () -> { + existingWaitingForDrwanCallback.run(); + mService.mWaitingForDrawnCallbacks.put(mService.mRoot, () -> { synchronized (mService.mGlobalLock) { mAnimationStartDelayed = false; if (mDelayedImeWin != null) { @@ -863,7 +864,7 @@ public class DockedStackDividerController { notifyAdjustedForImeChanged( mAdjustedForIme || mAdjustedForDivider, duration); } - }; + }); } else { notifyAdjustedForImeChanged( adjustedForIme || adjustedForDivider, IME_ADJUST_ANIM_DURATION); diff --git a/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java b/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java index f64592fd46bd..2165b0e8b593 100644 --- a/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java +++ b/services/core/java/com/android/server/wm/EmulatorDisplayOverlay.java @@ -50,7 +50,7 @@ class EmulatorDisplayOverlay { private boolean mVisible; EmulatorDisplayOverlay(Supplier<Surface> surfaceFactory, Context context, DisplayContent dc, - int zOrder) { + int zOrder, SurfaceControl.Transaction t) { mSurface = surfaceFactory.get(); final Display display = dc.getDisplay(); mScreenSize = new Point(); @@ -63,9 +63,9 @@ class EmulatorDisplayOverlay { .setBufferSize(mScreenSize.x, mScreenSize.y) .setFormat(PixelFormat.TRANSLUCENT) .build(); - ctrl.setLayer(zOrder); - ctrl.setPosition(0, 0); - ctrl.show(); + t.setLayer(ctrl, zOrder); + t.setPosition(ctrl, 0, 0); + t.show(ctrl); mSurface.copyFrom(ctrl); } catch (OutOfResourcesException e) { } @@ -75,7 +75,7 @@ class EmulatorDisplayOverlay { com.android.internal.R.drawable.emulator_circular_window_overlay); } - private void drawIfNeeded() { + private void drawIfNeeded(SurfaceControl.Transaction t) { if (!mDrawNeeded || !mVisible) { return; } @@ -92,7 +92,7 @@ class EmulatorDisplayOverlay { return; } c.drawColor(Color.TRANSPARENT, PorterDuff.Mode.SRC); - mSurfaceControl.setPosition(0, 0); + t.setPosition(mSurfaceControl, 0, 0); // Always draw the overlay with square dimensions int size = Math.max(mScreenSize.x, mScreenSize.y); mOverlay.setBounds(0, 0, size, size); @@ -102,20 +102,20 @@ class EmulatorDisplayOverlay { // Note: caller responsible for being inside // Surface.openTransaction() / closeTransaction() - public void setVisibility(boolean on) { + public void setVisibility(boolean on, SurfaceControl.Transaction t) { if (mSurfaceControl == null) { return; } mVisible = on; - drawIfNeeded(); + drawIfNeeded(t); if (on) { - mSurfaceControl.show(); + t.show(mSurfaceControl); } else { - mSurfaceControl.hide(); + t.hide(mSurfaceControl); } } - void positionSurface(int dw, int dh, int rotation) { + void positionSurface(int dw, int dh, int rotation, SurfaceControl.Transaction t) { if (mLastDW == dw && mLastDH == dh && mRotation == rotation) { return; } @@ -123,7 +123,7 @@ class EmulatorDisplayOverlay { mLastDH = dh; mDrawNeeded = true; mRotation = rotation; - drawIfNeeded(); + drawIfNeeded(t); } } diff --git a/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java new file mode 100644 index 000000000000..7e085f677be9 --- /dev/null +++ b/services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java @@ -0,0 +1,81 @@ +/* + * 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.wm; + +import android.view.InsetsSource; +import android.view.WindowInsets; + +/** + * Controller for IME inset source on the server. It's called provider as it provides the + * {@link InsetsSource} to the client that uses it in {@link InsetsSourceConsumer}. + */ +class ImeInsetsSourceProvider extends InsetsSourceProvider { + + private WindowState mCurImeTarget; + private Runnable mShowImeRunner; + private boolean mIsImeLayoutDrawn; + + ImeInsetsSourceProvider(InsetsSource source, + InsetsStateController stateController, DisplayContent displayContent) { + super(source, stateController, displayContent); + } + + /** + * Called when a layout pass has occurred. + */ + void onPostLayout() { + super.onPostLayout(); + + if (mCurImeTarget != null + && mCurImeTarget == mDisplayContent.mInputMethodTarget + && mWin != null + && mWin.isDrawnLw() + && !mWin.mGivenInsetsPending) { + mIsImeLayoutDrawn = true; + } + } + + /** + * Called when Insets have been dispatched to client. + */ + void onPostInsetsDispatched() { + if (mIsImeLayoutDrawn && mShowImeRunner != null) { + // Show IME if InputMethodService requested to be shown and it's layout has finished. + mShowImeRunner.run(); + mIsImeLayoutDrawn = false; + mShowImeRunner = null; + } + } + + /** + * Called from {@link WindowManagerInternal#showImePostLayout} when {@link InputMethodService} + * requests to show IME on {@param imeTarget}. + * @param imeTarget imeTarget on which IME is displayed. + */ + void scheduleShowImePostLayout(WindowState imeTarget) { + mCurImeTarget = imeTarget; + mShowImeRunner = () -> { + // Target should still be the same. + if (mCurImeTarget == mDisplayContent.mInputMethodTarget) { + mDisplayContent.mInputMethodTarget.showInsets( + WindowInsets.Type.ime(), true /* fromIme */); + } + mCurImeTarget = null; + }; + } + +} diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java index 842686441465..cc55e0137e20 100644 --- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java +++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java @@ -47,9 +47,11 @@ import java.io.PrintWriter; */ class InsetsSourceProvider { + protected final DisplayContent mDisplayContent; + protected final @NonNull InsetsSource mSource; + protected WindowState mWin; + private final Rect mTmpRect = new Rect(); - private final @NonNull InsetsSource mSource; - private final DisplayContent mDisplayContent; private final InsetsStateController mStateController; private final InsetsSourceControl mFakeControl; private @Nullable InsetsSourceControl mControl; @@ -57,7 +59,6 @@ class InsetsSourceProvider { private @Nullable InsetsControlTarget mFakeControlTarget; private @Nullable ControlAdapter mAdapter; - private WindowState mWin; private TriConsumer<DisplayFrames, WindowState, Rect> mFrameProvider; /** The visibility override from the current controlling window. */ diff --git a/services/core/java/com/android/server/wm/InsetsStateController.java b/services/core/java/com/android/server/wm/InsetsStateController.java index 4ebb553318e8..b0410335c5cd 100644 --- a/services/core/java/com/android/server/wm/InsetsStateController.java +++ b/services/core/java/com/android/server/wm/InsetsStateController.java @@ -108,8 +108,18 @@ class InsetsStateController { * @return The provider of a specific type. */ InsetsSourceProvider getSourceProvider(@InternalInsetType int type) { - return mProviders.computeIfAbsent(type, - key -> new InsetsSourceProvider(mState.getSource(key), this, mDisplayContent)); + if (type == TYPE_IME) { + return mProviders.computeIfAbsent(type, + key -> new ImeInsetsSourceProvider( + mState.getSource(key), this, mDisplayContent)); + } else { + return mProviders.computeIfAbsent(type, + key -> new InsetsSourceProvider(mState.getSource(key), this, mDisplayContent)); + } + } + + ImeInsetsSourceProvider getImeSourceProvider() { + return (ImeInsetsSourceProvider) getSourceProvider(TYPE_IME); } /** @@ -124,6 +134,7 @@ class InsetsStateController { mLastState.set(mState, true /* copySources */); notifyInsetsChanged(); } + getImeSourceProvider().onPostInsetsDispatched(); } void onInsetsModified(WindowState windowState, InsetsState state) { diff --git a/services/core/java/com/android/server/wm/LaunchParamsPersister.java b/services/core/java/com/android/server/wm/LaunchParamsPersister.java index d364a3765c22..5d27390da588 100644 --- a/services/core/java/com/android/server/wm/LaunchParamsPersister.java +++ b/services/core/java/com/android/server/wm/LaunchParamsPersister.java @@ -17,7 +17,6 @@ package com.android.server.wm; import android.content.ComponentName; -import android.content.pm.PackageList; import android.content.pm.PackageManagerInternal; import android.graphics.Rect; import android.os.Environment; @@ -32,6 +31,7 @@ import android.view.DisplayInfo; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FastXmlSerializer; import com.android.server.LocalServices; +import com.android.server.pm.PackageList; import com.android.server.wm.LaunchParamsController.LaunchParams; import libcore.io.IoUtils; @@ -198,7 +198,7 @@ class LaunchParamsPersister { void saveTask(TaskRecord task) { final ComponentName name = task.realActivity; - final int userId = task.userId; + final int userId = task.mUserId; PersistableLaunchParams params; ArrayMap<ComponentName, PersistableLaunchParams> map = mMap.get(userId); if (map == null) { @@ -247,7 +247,7 @@ class LaunchParamsPersister { void getLaunchParams(TaskRecord task, ActivityRecord activity, LaunchParams outParams) { final ComponentName name = task != null ? task.realActivity : activity.mActivityComponent; - final int userId = task != null ? task.userId : activity.mUserId; + final int userId = task != null ? task.mUserId : activity.mUserId; outParams.reset(); Map<ComponentName, PersistableLaunchParams> map = mMap.get(userId); diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java index 1bd2493e9a07..94d010e846f5 100644 --- a/services/core/java/com/android/server/wm/Letterbox.java +++ b/services/core/java/com/android/server/wm/Letterbox.java @@ -247,12 +247,12 @@ public class Letterbox { mLayoutFrameRelative.offset(-surfaceOrigin.x, -surfaceOrigin.y); } - private void createSurface() { + private void createSurface(SurfaceControl.Transaction t) { mSurface = mSurfaceControlFactory.get().setName("Letterbox - " + mType) .setFlags(HIDDEN).setColorLayer().build(); - mSurface.setLayer(-1); - mSurface.setColor(new float[]{0, 0, 0}); - mSurface.setColorSpaceAgnostic(true); + t.setLayer(mSurface, -1) + .setColor(mSurface, new float[]{0, 0, 0}) + .setColorSpaceAgnostic(mSurface, true); } void attachInput(WindowState win) { @@ -300,7 +300,7 @@ public class Letterbox { mSurfaceFrameRelative.set(mLayoutFrameRelative); if (!mSurfaceFrameRelative.isEmpty()) { if (mSurface == null) { - createSurface(); + createSurface(t); } t.setPosition(mSurface, mSurfaceFrameRelative.left, mSurfaceFrameRelative.top); t.setWindowCrop(mSurface, mSurfaceFrameRelative.width(), diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java index b30da5e156e2..dc45686a1359 100644 --- a/services/core/java/com/android/server/wm/LockTaskController.java +++ b/services/core/java/com/android/server/wm/LockTaskController.java @@ -317,12 +317,12 @@ public class LockTaskController { } // Allow recents activity if enabled by policy - if (task.isActivityTypeRecents() && isRecentsAllowed(task.userId)) { + if (task.isActivityTypeRecents() && isRecentsAllowed(task.mUserId)) { return false; } // Allow emergency calling when the device is protected by a locked keyguard - if (isKeyguardAllowed(task.userId) && isEmergencyCallTask(task)) { + if (isKeyguardAllowed(task.mUserId) && isEmergencyCallTask(task)) { return false; } @@ -474,7 +474,7 @@ public class LockTaskController { if (mLockTaskModeTasks.isEmpty()) { if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "removeLockedTask: task=" + task + " last task, reverting locktask mode. Callers=" + Debug.getCallers(3)); - mHandler.post(() -> performStopLockTask(task.userId)); + mHandler.post(() -> performStopLockTask(task.mUserId)); } } @@ -537,7 +537,7 @@ public class LockTaskController { StatusBarManagerInternal statusBarManager = LocalServices.getService( StatusBarManagerInternal.class); if (statusBarManager != null) { - statusBarManager.showScreenPinningRequest(task.taskId); + statusBarManager.showScreenPinningRequest(task.mTaskId); } return; } @@ -570,11 +570,11 @@ public class LockTaskController { final Intent taskIntent = task.intent; if (mLockTaskModeTasks.isEmpty() && taskIntent != null) { - mSupervisor.mRecentTasks.onLockTaskModeStateChanged(lockTaskModeState, task.userId); + mSupervisor.mRecentTasks.onLockTaskModeStateChanged(lockTaskModeState, task.mUserId); // Start lock task on the handler thread mHandler.post(() -> performStartLockTask( taskIntent.getComponent().getPackageName(), - task.userId, + task.mUserId, lockTaskModeState)); } if (DEBUG_LOCKTASK) Slog.w(TAG_LOCKTASK, "setLockTaskMode: Locking to " + task + @@ -640,7 +640,7 @@ public class LockTaskController { || lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED; if (mLockTaskModeState != LOCK_TASK_MODE_LOCKED - || lockedTask.userId != userId + || lockedTask.mUserId != userId || !wasWhitelisted || isWhitelisted) { continue; } @@ -704,7 +704,7 @@ public class LockTaskController { } mLockTaskFeatures.put(userId, flags); - if (!mLockTaskModeTasks.isEmpty() && userId == mLockTaskModeTasks.get(0).userId) { + if (!mLockTaskModeTasks.isEmpty() && userId == mLockTaskModeTasks.get(0).mUserId) { mHandler.post(() -> { if (mLockTaskModeState == LOCK_TASK_MODE_LOCKED) { setStatusBarState(mLockTaskModeState, userId); diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index fb6b5da87f2d..71696778f891 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -120,7 +120,7 @@ class RecentTasks { // Comparator to sort by taskId private static final Comparator<TaskRecord> TASK_ID_COMPARATOR = - (lhs, rhs) -> rhs.taskId - lhs.taskId; + (lhs, rhs) -> rhs.mTaskId - lhs.mTaskId; // Placeholder variables to keep track of activities/apps that are no longer avialble while // iterating through the recents list @@ -272,9 +272,14 @@ class RecentTasks { * app, or a timeout occurs. */ void setFreezeTaskListReordering() { + // Only fire the callback once per quickswitch session, not on every individual switch + if (!mFreezeTaskListReordering) { + mTaskNotificationController.notifyTaskListFrozen(true); + mFreezeTaskListReordering = true; + } + // Always update the reordering time when this is called to ensure that the timeout // is reset - mFreezeTaskListReordering = true; mService.mH.removeCallbacks(mResetFreezeTaskListOnTimeoutRunnable); mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, mFreezeTaskListTimeoutMs); } @@ -302,6 +307,7 @@ class RecentTasks { trimInactiveRecentTasks(); mTaskNotificationController.notifyTaskStackChanged(); + mTaskNotificationController.notifyTaskListFrozen(false); } /** @@ -458,8 +464,8 @@ class RecentTasks { // Check if any tasks are added before recents is loaded final SparseBooleanArray preaddedTasks = new SparseBooleanArray(); for (final TaskRecord task : mTasks) { - if (task.userId == userId && shouldPersistTaskLocked(task)) { - preaddedTasks.put(task.taskId, true); + if (task.mUserId == userId && shouldPersistTaskLocked(task)) { + preaddedTasks.put(task.mTaskId, true); } } @@ -527,12 +533,12 @@ class RecentTasks { if (shouldPersistTaskLocked(task)) { // Set of persisted taskIds for task.userId should not be null here // TODO Investigate why it can happen. For now initialize with an empty set - if (mPersistedTaskIds.get(task.userId) == null) { - Slog.wtf(TAG, "No task ids found for userId " + task.userId + ". task=" + task + if (mPersistedTaskIds.get(task.mUserId) == null) { + Slog.wtf(TAG, "No task ids found for userId " + task.mUserId + ". task=" + task + " mPersistedTaskIds=" + mPersistedTaskIds); - mPersistedTaskIds.put(task.userId, new SparseBooleanArray()); + mPersistedTaskIds.put(task.mUserId, new SparseBooleanArray()); } - mPersistedTaskIds.get(task.userId).put(task.taskId, true); + mPersistedTaskIds.get(task.mUserId).put(task.mTaskId, true); } } } @@ -608,7 +614,7 @@ class RecentTasks { for (int i = mTasks.size() - 1; i >= 0; --i) { TaskRecord tr = mTasks.get(i); - if (tr.userId == userId) { + if (tr.mUserId == userId) { if(DEBUG_TASKS) Slog.i(TAG_TASKS, "remove RecentTask " + tr + " when finishing user" + userId); remove(tr); @@ -622,11 +628,11 @@ class RecentTasks { final TaskRecord tr = mTasks.get(i); if (tr.realActivity != null && packageNames.contains(tr.realActivity.getPackageName()) - && tr.userId == userId + && tr.mUserId == userId && tr.realActivitySuspended != suspended) { tr.realActivitySuspended = suspended; if (suspended) { - mSupervisor.removeTaskByIdLocked(tr.taskId, false, + mSupervisor.removeTaskByIdLocked(tr.mTaskId, false, REMOVE_FROM_RECENTS, "suspended-package"); } notifyTaskPersisterLocked(tr, false); @@ -640,7 +646,7 @@ class RecentTasks { } for (int i = mTasks.size() - 1; i >= 0; --i) { final TaskRecord tr = mTasks.get(i); - if (tr.userId == userId && !mService.getLockTaskController().isTaskWhitelisted(tr)) { + if (tr.mUserId == userId && !mService.getLockTaskController().isTaskWhitelisted(tr)) { remove(tr); } } @@ -651,10 +657,10 @@ class RecentTasks { final TaskRecord tr = mTasks.get(i); final String taskPackageName = tr.getBaseIntent().getComponent().getPackageName(); - if (tr.userId != userId) continue; + if (tr.mUserId != userId) continue; if (!taskPackageName.equals(packageName)) continue; - mSupervisor.removeTaskByIdLocked(tr.taskId, true, REMOVE_FROM_RECENTS, + mSupervisor.removeTaskByIdLocked(tr.mTaskId, true, REMOVE_FROM_RECENTS, "remove-package-task"); } } @@ -663,7 +669,7 @@ class RecentTasks { Set<Integer> profileIds = getProfileIds(userId); for (int i = mTasks.size() - 1; i >= 0; --i) { final TaskRecord tr = mTasks.get(i); - if (!profileIds.contains(tr.userId)) continue; + if (!profileIds.contains(tr.mUserId)) continue; if (isVisibleRecentTask(tr)) { mTasks.remove(i); notifyTaskRemoved(tr, true /* wasTrimmed */, true /* killProcess */); @@ -675,7 +681,7 @@ class RecentTasks { int userId) { for (int i = mTasks.size() - 1; i >= 0; --i) { final TaskRecord tr = mTasks.get(i); - if (userId != UserHandle.USER_ALL && tr.userId != userId) { + if (userId != UserHandle.USER_ALL && tr.mUserId != userId) { continue; } @@ -683,7 +689,7 @@ class RecentTasks { final boolean sameComponent = cn != null && cn.getPackageName().equals(packageName) && (filterByClasses == null || filterByClasses.contains(cn.getClassName())); if (sameComponent) { - mSupervisor.removeTaskByIdLocked(tr.taskId, false, + mSupervisor.removeTaskByIdLocked(tr.mTaskId, false, REMOVE_FROM_RECENTS, "disabled-package"); } } @@ -709,7 +715,7 @@ class RecentTasks { final IPackageManager pm = AppGlobals.getPackageManager(); for (int i = recentsCount - 1; i >= 0; i--) { final TaskRecord task = mTasks.get(i); - if (userId != UserHandle.USER_ALL && task.userId != userId) { + if (userId != UserHandle.USER_ALL && task.mUserId != userId) { // Only look at tasks for the user ID of interest. continue; } @@ -826,7 +832,7 @@ class RecentTasks { if (intent == null || !callingPackage.equals(intent.getComponent().getPackageName())) { continue; } - AppTaskImpl taskImpl = new AppTaskImpl(mService, tr.taskId, callingUid); + AppTaskImpl taskImpl = new AppTaskImpl(mService, tr.mTaskId, callingUid); list.add(taskImpl.asBinder()); } return list; @@ -908,7 +914,7 @@ class RecentTasks { } // Only add calling user or related users recent tasks - if (!includedUsers.contains(Integer.valueOf(tr.userId))) { + if (!includedUsers.contains(Integer.valueOf(tr.mUserId))) { if (DEBUG_RECENTS) Slog.d(TAG_RECENTS, "Skipping, not user: " + tr); continue; } @@ -972,7 +978,7 @@ class RecentTasks { if ((task.isPersistable || task.inRecents) && (stack == null || !stack.isHomeOrRecentsStack())) { if (TaskPersister.DEBUG) Slog.d(TAG, "adding to persistentTaskIds task=" + task); - persistentTaskIds.add(task.taskId); + persistentTaskIds.add(task.mTaskId); } else { if (TaskPersister.DEBUG) Slog.d(TAG, "omitting from persistentTaskIds task=" + task); @@ -997,7 +1003,7 @@ class RecentTasks { if (isVisibleRecentTask(tr)) { numVisibleTasks++; if (isInVisibleRange(tr, i, numVisibleTasks, false /* skipExcludedCheck */)) { - res.put(tr.taskId, true); + res.put(tr.mTaskId, true); } } } @@ -1011,7 +1017,7 @@ class RecentTasks { final int recentsCount = mTasks.size(); for (int i = 0; i < recentsCount; i++) { TaskRecord tr = mTasks.get(i); - if (tr.taskId == id) { + if (tr.mTaskId == id) { return tr; } } @@ -1024,7 +1030,7 @@ class RecentTasks { void add(TaskRecord task) { if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "add: task=" + task); - final boolean isAffiliated = task.mAffiliatedTaskId != task.taskId + final boolean isAffiliated = task.mAffiliatedTaskId != task.mTaskId || task.mNextAffiliateTaskId != INVALID_TASK_ID || task.mPrevAffiliateTaskId != INVALID_TASK_ID; @@ -1138,7 +1144,7 @@ class RecentTasks { if (needAffiliationFix) { if (DEBUG_RECENTS) Slog.d(TAG_RECENTS, "addRecent: regrouping affiliations"); - cleanupLocked(task.userId); + cleanupLocked(task.mUserId); } // Trim the set of tasks to the active set @@ -1248,13 +1254,13 @@ class RecentTasks { if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "isActiveRecentTask: task=" + task + " globalMax=" + mGlobalMaxNumTasks); - if (quietProfileUserIds.get(task.userId)) { + if (quietProfileUserIds.get(task.mUserId)) { // Quiet profile user's tasks are never active if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "\tisQuietProfileTask=true"); return false; } - if (task.mAffiliatedTaskId != INVALID_TASK_ID && task.mAffiliatedTaskId != task.taskId) { + if (task.mAffiliatedTaskId != INVALID_TASK_ID && task.mAffiliatedTaskId != task.mTaskId) { // Keep the task active if its affiliated task is also active final TaskRecord affiliatedTask = getTask(task.mAffiliatedTaskId); if (affiliatedTask != null) { @@ -1430,7 +1436,7 @@ class RecentTasks { final TaskRecord tr = mTasks.get(i); if (task != tr) { if (!hasCompatibleActivityTypeAndWindowingMode(task, tr) - || task.userId != tr.userId) { + || task.mUserId != tr.mUserId) { continue; } final Intent trIntent = tr.intent; @@ -1485,7 +1491,7 @@ class RecentTasks { final int affiliateId = startTask.mAffiliatedTaskId; // Quick identification of isolated tasks. I.e. those not launched behind. - if (startTask.taskId == affiliateId && startTask.mPrevAffiliate == null && + if (startTask.mTaskId == affiliateId && startTask.mPrevAffiliate == null && startTask.mNextAffiliate == null) { // There is still a slim chance that there are other tasks that point to this task // and that the chain is so messed up that this task no longer points to them but @@ -1581,7 +1587,7 @@ class RecentTasks { } else { // Verify middle of the chain's next points back to the one before. if (cur.mNextAffiliate != prev - || cur.mNextAffiliateTaskId != prev.taskId) { + || cur.mNextAffiliateTaskId != prev.mTaskId) { Slog.wtf(TAG, "Bad chain @" + endIndex + ": middle task " + cur + " @" + endIndex + " has bad next affiliate " diff --git a/services/core/java/com/android/server/wm/RecentsAnimation.java b/services/core/java/com/android/server/wm/RecentsAnimation.java index 31f4584cded9..062cdc5b2b60 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimation.java +++ b/services/core/java/com/android/server/wm/RecentsAnimation.java @@ -137,9 +137,9 @@ class RecentsAnimation implements RecentsAnimationCallbacks, mStackSupervisor.startSpecificActivityLocked(targetActivity, false /* andResume */, false /* checkConfig */); // Make sure the activity won't be involved in transition. - if (targetActivity.mAppWindowToken != null) { - targetActivity.mAppWindowToken.getDisplayContent().mUnknownAppVisibilityController - .appRemovedOrHidden(targetActivity.mAppWindowToken); + if (targetActivity.getDisplayContent() != null) { + targetActivity.getDisplayContent().mUnknownAppVisibilityController + .appRemovedOrHidden(targetActivity); } } @@ -429,7 +429,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, // 1) The next launching task is not being animated by the recents animation // 2) The next task is home activity. (i.e. pressing home key to back home in recents). if ((!controller.isAnimatingTask(stack.getTaskStack().getTopChild()) - || controller.isTargetApp(stack.getTopActivity().mAppWindowToken)) + || controller.isTargetApp(stack.getTopActivity())) && controller.shouldDeferCancelUntilNextTransition()) { // Always prepare an app transition since we rely on the transition callbacks to cleanup mWindowManager.prepareAppTransition(TRANSIT_NONE, false); @@ -492,7 +492,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, for (int i = targetStack.getChildCount() - 1; i >= 0; i--) { final TaskRecord task = targetStack.getChildAt(i); - if (task.userId == mUserId + if (task.mUserId == mUserId && task.getBaseIntent().getComponent().equals(mTargetIntent.getComponent())) { return task.getTopActivity(); } diff --git a/services/core/java/com/android/server/wm/RootActivityContainer.java b/services/core/java/com/android/server/wm/RootActivityContainer.java index 734f2248d131..d78d517fcfc1 100644 --- a/services/core/java/com/android/server/wm/RootActivityContainer.java +++ b/services/core/java/com/android/server/wm/RootActivityContainer.java @@ -638,17 +638,23 @@ class RootActivityContainer extends ConfigurationContainer if (displayContent != null) { config = displayContent.updateOrientation( getDisplayOverrideConfiguration(displayId), - starting != null && starting.mayFreezeScreenLocked(starting.app) + starting != null && starting.mayFreezeScreenLocked() ? starting.appToken : null, true /* forceUpdate */); } + // Visibilities may change so let the starting activity have a chance to report. Can't do it + // when visibility is changed in each AppWindowToken because it may trigger wrong + // configuration push because the visibility of some activities may not be updated yet. + if (starting != null) { + starting.reportDescendantOrientationChangeIfNeeded(); + } if (starting != null && markFrozenIfConfigChanged && config != null) { starting.frozenBeforeDestroy = true; } - if (displayContent != null && displayContent.mAcitvityDisplay != null) { + if (displayContent != null && displayContent.mActivityDisplay != null) { // Update the configuration of the activities on the display. - return displayContent.mAcitvityDisplay.updateDisplayOverrideConfigurationLocked(config, + return displayContent.mActivityDisplay.updateDisplayOverrideConfigurationLocked(config, starting, deferResume, null /* result */); } else { return true; @@ -1097,7 +1103,7 @@ class RootActivityContainer extends ConfigurationContainer } } } - return finishedTask != null ? finishedTask.taskId : INVALID_TASK_ID; + return finishedTask != null ? finishedTask.mTaskId : INVALID_TASK_ID; } boolean resumeFocusedStacksTopActivities() { @@ -1254,14 +1260,14 @@ class RootActivityContainer extends ConfigurationContainer int[] taskUserIds = new int[numTasks]; for (int i = 0; i < numTasks; ++i) { final TaskRecord task = tasks.get(i); - taskIds[i] = task.taskId; + taskIds[i] = task.mTaskId; taskNames[i] = task.origActivity != null ? task.origActivity.flattenToString() : task.realActivity != null ? task.realActivity.flattenToString() : task.getTopActivity() != null ? task.getTopActivity().packageName : "unknown"; taskBounds[i] = new Rect(); task.getWindowContainerBounds(taskBounds[i]); - taskUserIds[i] = task.userId; + taskUserIds[i] = task.mUserId; } info.taskIds = taskIds; info.taskNames = taskNames; @@ -2097,7 +2103,7 @@ class RootActivityContainer extends ConfigurationContainer // picker for personal files, opened by a work app, should still get locked. if (taskTopActivityIsUser(task, userId)) { mService.getTaskChangeNotificationController().notifyTaskProfileLocked( - task.taskId, userId); + task.mTaskId, userId); } } } diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 78fcb37aacd1..b6a05d1b9608 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -230,7 +230,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final DisplayContent existing = getDisplayContent(displayId); if (existing != null) { - existing.mAcitvityDisplay = activityDisplay; + existing.mActivityDisplay = activityDisplay; existing.initializeDisplayOverrideConfiguration(); return existing; } @@ -720,7 +720,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> mUpdateRotation = updateRotationUnchecked(); } - if (mWmService.mWaitingForDrawnCallback != null + if (!mWmService.mWaitingForDrawnCallbacks.isEmpty() || (mOrientationChangeComplete && !isLayoutNeeded() && !mUpdateRotation)) { mWmService.checkDrawnWindowsLocked(); @@ -813,18 +813,18 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final int defaultDw = defaultInfo.logicalWidth; final int defaultDh = defaultInfo.logicalHeight; if (mWmService.mWatermark != null) { - mWmService.mWatermark.positionSurface(defaultDw, defaultDh); + mWmService.mWatermark.positionSurface(defaultDw, defaultDh, mDisplayTransaction); } if (mWmService.mStrictModeFlash != null) { - mWmService.mStrictModeFlash.positionSurface(defaultDw, defaultDh); + mWmService.mStrictModeFlash.positionSurface(defaultDw, defaultDh, mDisplayTransaction); } if (mWmService.mCircularDisplayMask != null) { mWmService.mCircularDisplayMask.positionSurface(defaultDw, defaultDh, - mWmService.getDefaultDisplayRotation()); + mWmService.getDefaultDisplayRotation(), mDisplayTransaction); } if (mWmService.mEmulatorDisplayOverlay != null) { mWmService.mEmulatorDisplayOverlay.positionSurface(defaultDw, defaultDh, - mWmService.getDefaultDisplayRotation()); + mWmService.getDefaultDisplayRotation(), mDisplayTransaction); } final int count = mChildren.size(); @@ -1067,7 +1067,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> void positionChildAt(int position, DisplayContent child, boolean includingParents) { super.positionChildAt(position, child, includingParents); if (mRootActivityContainer != null) { - mRootActivityContainer.onChildPositionChanged(child.mAcitvityDisplay, position); + mRootActivityContainer.onChildPositionChanged(child.mActivityDisplay, position); } } diff --git a/services/core/java/com/android/server/wm/SeamlessRotator.java b/services/core/java/com/android/server/wm/SeamlessRotator.java index bcd90a14ac96..ba31818d6331 100644 --- a/services/core/java/com/android/server/wm/SeamlessRotator.java +++ b/services/core/java/com/android/server/wm/SeamlessRotator.java @@ -20,9 +20,10 @@ import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; import android.graphics.Matrix; +import android.os.IBinder; import android.view.DisplayInfo; -import android.view.Surface; import android.view.Surface.Rotation; +import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; import com.android.server.wm.utils.CoordinateTransforms; @@ -35,7 +36,7 @@ import java.io.StringWriter; * * Works by transforming the {@link WindowState} back into the old display rotation. * - * Uses {@link android.view.SurfaceControl#deferTransactionUntil(Surface, long)} instead of + * Uses {@link Transaction#deferTransactionUntil(SurfaceControl, IBinder, long)} instead of * latching on the buffer size to allow for seamless 180 degree rotations. */ public class SeamlessRotator { diff --git a/services/core/java/com/android/server/wm/StrictModeFlash.java b/services/core/java/com/android/server/wm/StrictModeFlash.java index 9e5d9cab7669..f537005c955c 100644 --- a/services/core/java/com/android/server/wm/StrictModeFlash.java +++ b/services/core/java/com/android/server/wm/StrictModeFlash.java @@ -39,7 +39,8 @@ class StrictModeFlash { private boolean mDrawNeeded; private final int mThickness = 20; - StrictModeFlash(Supplier<Surface> surfaceFactory, DisplayContent dc) { + StrictModeFlash(Supplier<Surface> surfaceFactory, DisplayContent dc, + SurfaceControl.Transaction t) { mSurface = surfaceFactory.get(); SurfaceControl ctrl = null; try { @@ -48,9 +49,11 @@ class StrictModeFlash { .setBufferSize(1, 1) .setFormat(PixelFormat.TRANSLUCENT) .build(); - ctrl.setLayer(WindowManagerService.TYPE_LAYER_MULTIPLIER * 101); // one more than Watermark? arbitrary. - ctrl.setPosition(0, 0); - ctrl.show(); + + // one more than Watermark? arbitrary. + t.setLayer(ctrl, WindowManagerService.TYPE_LAYER_MULTIPLIER * 101); + t.setPosition(ctrl, 0, 0); + t.show(ctrl); mSurface.copyFrom(ctrl); } catch (OutOfResourcesException e) { } @@ -103,25 +106,25 @@ class StrictModeFlash { // Note: caller responsible for being inside // Surface.openTransaction() / closeTransaction() - public void setVisibility(boolean on) { + public void setVisibility(boolean on, SurfaceControl.Transaction t) { if (mSurfaceControl == null) { return; } drawIfNeeded(); if (on) { - mSurfaceControl.show(); + t.show(mSurfaceControl); } else { - mSurfaceControl.hide(); + t.hide(mSurfaceControl); } } - void positionSurface(int dw, int dh) { + void positionSurface(int dw, int dh, SurfaceControl.Transaction t) { if (mLastDW == dw && mLastDH == dh) { return; } mLastDW = dw; mLastDH = dh; - mSurfaceControl.setBufferSize(dw, dh); + t.setBufferSize(mSurfaceControl, dw, dh); mDrawNeeded = true; } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 5e14087ffe41..a181c1837af7 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -63,7 +63,9 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta // TODO: Track parent marks like this in WindowContainer. TaskStack mStack; + /* Unique identifier for this task. */ final int mTaskId; + /* User for which this task was created. */ final int mUserId; private boolean mDeferRemoval = false; @@ -97,6 +99,8 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta private boolean mDragResizing; private int mDragResizeMode; + // This represents the last resolved activity values for this task + // NOTE: This value needs to be persisted with each task private TaskDescription mTaskDescription; // If set to true, the task will report that it is not in the floating @@ -114,6 +118,13 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta // TODO: remove after unification TaskRecord mTaskRecord; + // TODO: Remove after unification. + @Override + public void onConfigurationChanged(Configuration newParentConfig) { + // Only forward configuration changes in cases where children won't get it from TaskRecord. + onConfigurationChanged(newParentConfig, mTaskRecord == null /*forwardToChildren*/); + } + Task(int taskId, TaskStack stack, int userId, WindowManagerService service, int resizeMode, boolean supportsPictureInPicture, TaskDescription taskDescription, TaskRecord taskRecord) { @@ -124,16 +135,17 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta mResizeMode = resizeMode; mSupportsPictureInPicture = supportsPictureInPicture; mTaskRecord = taskRecord; + mTaskDescription = taskDescription; + + // Tasks have no set orientation value (including SCREEN_ORIENTATION_UNSPECIFIED). + setOrientation(SCREEN_ORIENTATION_UNSET); if (mTaskRecord != null) { // This can be null when we call createTaskInStack in WindowTestUtils. Remove this after // unification. mTaskRecord.registerConfigurationChangeListener(this); + } else { + setBounds(getResolvedOverrideBounds()); } - setBounds(getRequestedOverrideBounds()); - mTaskDescription = taskDescription; - - // Tasks have no set orientation value (including SCREEN_ORIENTATION_UNSPECIFIED). - setOrientation(SCREEN_ORIENTATION_UNSET); } @Override diff --git a/services/core/java/com/android/server/wm/TaskChangeNotificationController.java b/services/core/java/com/android/server/wm/TaskChangeNotificationController.java index 5e8831d47c12..a61c908e0f6f 100644 --- a/services/core/java/com/android/server/wm/TaskChangeNotificationController.java +++ b/services/core/java/com/android/server/wm/TaskChangeNotificationController.java @@ -58,6 +58,7 @@ class TaskChangeNotificationController { private static final int NOTIFY_TASK_DISPLAY_CHANGED_LISTENERS_MSG = 23; private static final int NOTIFY_TASK_LIST_UPDATED_LISTENERS_MSG = 24; private static final int NOTIFY_SINGLE_TASK_DISPLAY_EMPTY = 25; + private static final int NOTIFY_TASK_LIST_FROZEN_UNFROZEN_MSG = 26; // Delay in notifying task stack change listeners (in millis) private static final int NOTIFY_TASK_STACK_CHANGE_LISTENERS_DELAY = 100; @@ -174,6 +175,10 @@ class TaskChangeNotificationController { l.onRecentTaskListUpdated(); }; + private final TaskStackConsumer mNotifyTaskListFrozen = (l, m) -> { + l.onRecentTaskListFrozenChanged(m.arg1 != 0); + }; + @FunctionalInterface public interface TaskStackConsumer { void accept(ITaskStackListener t, Message m) throws RemoteException; @@ -265,6 +270,9 @@ class TaskChangeNotificationController { case NOTIFY_TASK_LIST_UPDATED_LISTENERS_MSG: forAllRemoteListeners(mNotifyTaskListUpdated, msg); break; + case NOTIFY_TASK_LIST_FROZEN_UNFROZEN_MSG: + forAllRemoteListeners(mNotifyTaskListFrozen, msg); + break; } } } @@ -342,7 +350,7 @@ class TaskChangeNotificationController { void notifyActivityPinned(ActivityRecord r) { mHandler.removeMessages(NOTIFY_ACTIVITY_PINNED_LISTENERS_MSG); final Message msg = mHandler.obtainMessage(NOTIFY_ACTIVITY_PINNED_LISTENERS_MSG, - r.getTaskRecord().taskId, r.getStackId(), r.packageName); + r.getTaskRecord().mTaskId, r.getStackId(), r.packageName); msg.sendingUid = r.mUserId; forAllLocalListeners(mNotifyActivityPinned, msg); msg.sendToTarget(); @@ -549,4 +557,12 @@ class TaskChangeNotificationController { forAllLocalListeners(mNotifyTaskListUpdated, msg); msg.sendToTarget(); } + + /** @see ITaskStackListener#onRecentTaskListFrozenChanged(boolean) */ + void notifyTaskListFrozen(boolean frozen) { + final Message msg = mHandler.obtainMessage(NOTIFY_TASK_LIST_FROZEN_UNFROZEN_MSG, + frozen ? 1 : 0, 0 /* unused */); + forAllLocalListeners(mNotifyTaskListFrozen, msg); + msg.sendToTarget(); + } } diff --git a/services/core/java/com/android/server/wm/TaskPersister.java b/services/core/java/com/android/server/wm/TaskPersister.java index 06bdcc04e9c8..f9a75d3d4943 100644 --- a/services/core/java/com/android/server/wm/TaskPersister.java +++ b/services/core/java/com/android/server/wm/TaskPersister.java @@ -122,7 +122,7 @@ public class TaskPersister implements PersisterQueue.Listener { mPersisterQueue.removeItems( item -> { File file = new File(item.mFilePath); - return file.getName().startsWith(Integer.toString(task.taskId)); + return file.getName().startsWith(Integer.toString(task.mTaskId)); }, ImageWriteQueueItem.class); } @@ -262,7 +262,7 @@ public class TaskPersister implements PersisterQueue.Listener { } for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) { final TaskRecord task = tasks.get(taskNdx); - if (task.taskId == taskId) { + if (task.mTaskId == taskId) { return task; } } @@ -329,14 +329,14 @@ public class TaskPersister implements PersisterQueue.Listener { // read the same thing again. // mWriteQueue.add(new TaskWriteQueueItem(task)); - final int taskId = task.taskId; + final int taskId = task.mTaskId; if (mService.mRootActivityContainer.anyTaskForId(taskId, MATCH_TASK_IN_STACKS_OR_RECENT_TASKS) != null) { // Should not happen. Slog.wtf(TAG, "Existing task with taskId " + taskId + "found"); - } else if (userId != task.userId) { + } else if (userId != task.mUserId) { // Should not happen. - Slog.wtf(TAG, "Task with userId " + task.userId + " found in " + Slog.wtf(TAG, "Task with userId " + task.mUserId + " found in " + userTasksDir.getAbsolutePath()); } else { // Looks fine. @@ -560,14 +560,14 @@ public class TaskPersister implements PersisterQueue.Listener { FileOutputStream file = null; AtomicFile atomicFile = null; try { - File userTasksDir = getUserTasksDir(task.userId); + File userTasksDir = getUserTasksDir(task.mUserId); if (!userTasksDir.isDirectory() && !userTasksDir.mkdirs()) { - Slog.e(TAG, "Failure creating tasks directory for user " + task.userId + Slog.e(TAG, "Failure creating tasks directory for user " + task.mUserId + ": " + userTasksDir + " Dropping persistence for task " + task); return; } atomicFile = new AtomicFile(new File(userTasksDir, - String.valueOf(task.taskId) + TASK_FILENAME_SUFFIX)); + String.valueOf(task.mTaskId) + TASK_FILENAME_SUFFIX)); file = atomicFile.startWrite(); file.write(stringWriter.toString().getBytes()); file.write('\n'); diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java index 0ea108e30280..75333c728e0b 100644 --- a/services/core/java/com/android/server/wm/TaskRecord.java +++ b/services/core/java/com/android/server/wm/TaskRecord.java @@ -208,7 +208,7 @@ class TaskRecord extends ConfigurationContainer { */ private static TaskRecordFactory sTaskRecordFactory; - final int taskId; // Unique identifier for this task. + final int mTaskId; // Unique identifier for this task. String affinity; // The affinity name for this task, or null; may change identity. String rootAffinity; // Initial base affinity, or null; does not change from initial root. final IVoiceInteractionSession voiceSession; // Voice interaction session driving task @@ -234,7 +234,7 @@ class TaskRecord extends ConfigurationContainer { boolean hasBeenVisible; // Set if any activities in the task have been visible to the user. String stringName; // caching of toString() result. - int userId; // user for which this task was created + int mUserId; // user for which this task was created boolean mUserSetupComplete; // The user set-up is complete as of the last time the task activity // was changed. @@ -262,7 +262,7 @@ class TaskRecord extends ConfigurationContainer { // This represents the last resolved activity values for this task // NOTE: This value needs to be persisted with each task - TaskDescription lastTaskDescription = new TaskDescription(); + TaskDescription mTaskDescription; /** List of all activities in the task arranged in history order */ final ArrayList<ActivityRecord> mActivities; @@ -282,7 +282,7 @@ class TaskRecord extends ConfigurationContainer { /** Only used for persistable tasks, otherwise 0. The last time this task was moved. Used for * determining the order when restoring. Sign indicates whether last task movement was to front * (positive) or back (negative). Absolute value indicates time. */ - long mLastTimeMoved = System.currentTimeMillis(); + long mLastTimeMoved; /** If original intent did not allow relinquishing task identity, save that information */ private boolean mNeverRelinquishIdentity = true; @@ -304,7 +304,7 @@ class TaskRecord extends ConfigurationContainer { int mCallingUid; String mCallingPackage; - final ActivityTaskManagerService mService; + final ActivityTaskManagerService mAtmService; private final Rect mTmpStableBounds = new Rect(); private final Rect mTmpNonDecorBounds = new Rect(); @@ -342,60 +342,25 @@ class TaskRecord extends ConfigurationContainer { * Don't use constructor directly. Use {@link #create(ActivityTaskManagerService, int, * ActivityInfo, Intent, TaskDescription)} instead. */ - TaskRecord(ActivityTaskManagerService service, int _taskId, ActivityInfo info, Intent _intent, - IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor) { - mService = service; - userId = UserHandle.getUserId(info.applicationInfo.uid); - taskId = _taskId; - lastActiveTime = SystemClock.elapsedRealtime(); - mAffiliatedTaskId = _taskId; - voiceSession = _voiceSession; - voiceInteractor = _voiceInteractor; - isAvailable = true; - mActivities = new ArrayList<>(); - mCallingUid = info.applicationInfo.uid; - mCallingPackage = info.packageName; - setIntent(_intent, info); - setMinDimensions(info); - touchActiveTime(); - mService.getTaskChangeNotificationController().notifyTaskCreated(_taskId, realActivity); - } - - /** - * Don't use constructor directly. - * Use {@link #create(ActivityTaskManagerService, int, ActivityInfo, - * Intent, IVoiceInteractionSession, IVoiceInteractor)} instead. - */ - TaskRecord(ActivityTaskManagerService service, int _taskId, ActivityInfo info, Intent _intent, - TaskDescription _taskDescription) { - mService = service; - userId = UserHandle.getUserId(info.applicationInfo.uid); - taskId = _taskId; - lastActiveTime = SystemClock.elapsedRealtime(); - mAffiliatedTaskId = _taskId; - voiceSession = null; - voiceInteractor = null; - isAvailable = true; - mActivities = new ArrayList<>(); - mCallingUid = info.applicationInfo.uid; - mCallingPackage = info.packageName; - setIntent(_intent, info); - setMinDimensions(info); - - isPersistable = true; - // Clamp to [1, max]. - maxRecents = Math.min(Math.max(info.maxRecents, 1), - ActivityTaskManager.getMaxAppRecentsLimitStatic()); - - lastTaskDescription = _taskDescription; - touchActiveTime(); - mService.getTaskChangeNotificationController().notifyTaskCreated(_taskId, realActivity); - } - - /** - * Don't use constructor directly. This is only used by XML parser. - */ - TaskRecord(ActivityTaskManagerService service, int _taskId, Intent _intent, + TaskRecord(ActivityTaskManagerService atmService, int _taskId, ActivityInfo info, + Intent _intent, IVoiceInteractionSession _voiceSession, + IVoiceInteractor _voiceInteractor, TaskDescription _taskDescription) { + this(atmService, _taskId, _intent, null /*_affinityIntent*/, null /*_affinity*/, + null /*_rootAffinity*/, null /*_realActivity*/, null /*_origActivity*/, + false /*_rootWasReset*/, false /*_autoRemoveRecents*/, false /*_askedCompatMode*/, + UserHandle.getUserId(info.applicationInfo.uid), 0 /*_effectiveUid*/, + null /*_lastDescription*/, new ArrayList<>(), System.currentTimeMillis(), + true /*neverRelinquishIdentity*/, + _taskDescription != null ? _taskDescription : new TaskDescription(), + _taskId, INVALID_TASK_ID, INVALID_TASK_ID, 0 /*taskAffiliationColor*/, + info.applicationInfo.uid, info.packageName, info.resizeMode, + info.supportsPictureInPicture(), false /*_realActivitySuspended*/, + false /*userSetupComplete*/, INVALID_MIN_SIZE, INVALID_MIN_SIZE, info, + _voiceSession, _voiceInteractor); + } + + /** Don't use constructor directly. This is only used by XML parser. */ + TaskRecord(ActivityTaskManagerService atmService, int _taskId, Intent _intent, Intent _affinityIntent, String _affinity, String _rootAffinity, ComponentName _realActivity, ComponentName _origActivity, boolean _rootWasReset, boolean _autoRemoveRecents, boolean _askedCompatMode, int _userId, @@ -404,15 +369,15 @@ class TaskRecord extends ConfigurationContainer { TaskDescription _lastTaskDescription, int taskAffiliation, int prevTaskId, int nextTaskId, int taskAffiliationColor, int callingUid, String callingPackage, int resizeMode, boolean supportsPictureInPicture, boolean _realActivitySuspended, - boolean userSetupComplete, int minWidth, int minHeight) { - mService = service; - taskId = _taskId; - intent = _intent; + boolean userSetupComplete, int minWidth, int minHeight, ActivityInfo info, + IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor) { + mAtmService = atmService; + mTaskId = _taskId; affinityIntent = _affinityIntent; affinity = _affinity; rootAffinity = _rootAffinity; - voiceSession = null; - voiceInteractor = null; + voiceSession = _voiceSession; + voiceInteractor = _voiceInteractor; realActivity = _realActivity; realActivitySuspended = _realActivitySuspended; origActivity = _origActivity; @@ -420,15 +385,15 @@ class TaskRecord extends ConfigurationContainer { isAvailable = true; autoRemoveRecents = _autoRemoveRecents; askedCompatMode = _askedCompatMode; - userId = _userId; + mUserId = _userId; mUserSetupComplete = userSetupComplete; effectiveUid = _effectiveUid; - lastActiveTime = SystemClock.elapsedRealtime(); + touchActiveTime(); lastDescription = _lastDescription; mActivities = activities; mLastTimeMoved = lastTimeMoved; mNeverRelinquishIdentity = neverRelinquishIdentity; - lastTaskDescription = _lastTaskDescription; + mTaskDescription = _lastTaskDescription; mAffiliatedTaskId = taskAffiliation; mAffiliatedTaskColor = taskAffiliationColor; mPrevAffiliateTaskId = prevTaskId; @@ -437,9 +402,15 @@ class TaskRecord extends ConfigurationContainer { mCallingPackage = callingPackage; mResizeMode = resizeMode; mSupportsPictureInPicture = supportsPictureInPicture; - mMinWidth = minWidth; - mMinHeight = minHeight; - mService.getTaskChangeNotificationController().notifyTaskCreated(_taskId, realActivity); + if (info != null) { + setIntent(_intent, info); + setMinDimensions(info); + } else { + intent = _intent; + mMinWidth = minWidth; + mMinHeight = minHeight; + } + mAtmService.getTaskChangeNotificationController().notifyTaskCreated(_taskId, realActivity); } Task getTask() { @@ -458,9 +429,9 @@ class TaskRecord extends ConfigurationContainer { if (stack == null) { throw new IllegalArgumentException("TaskRecord: invalid stack=" + mStack); } - EventLog.writeEvent(WM_TASK_CREATED, taskId, stack.mStackId); - mTask = new Task(taskId, stack, userId, mService.mWindowManager, mResizeMode, - mSupportsPictureInPicture, lastTaskDescription, this); + EventLog.writeEvent(WM_TASK_CREATED, mTaskId, stack.mStackId); + mTask = new Task(mTaskId, stack, mUserId, mAtmService.mWindowManager, mResizeMode, + mSupportsPictureInPicture, mTaskDescription, this); final int position = onTop ? POSITION_TOP : POSITION_BOTTOM; if (!mDisplayedBounds.isEmpty()) { @@ -487,14 +458,14 @@ class TaskRecord extends ConfigurationContainer { final boolean isVoiceSession = voiceSession != null; if (isVoiceSession) { try { - voiceSession.taskFinished(intent, taskId); + voiceSession.taskFinished(intent, mTaskId); } catch (RemoteException e) { } } if (autoRemoveFromRecents() || isVoiceSession) { // Task creator asked to remove this when done, or this task was a voice // interaction, so it should not remain on the recent tasks list. - mService.mStackSupervisor.mRecentTasks.remove(this); + mAtmService.mStackSupervisor.mRecentTasks.remove(this); } removeWindowContainer(); @@ -502,9 +473,9 @@ class TaskRecord extends ConfigurationContainer { @VisibleForTesting void removeWindowContainer() { - mService.getLockTaskController().clearLockedTask(this); + mAtmService.getLockTaskController().clearLockedTask(this); if (mTask == null) { - if (DEBUG_STACK) Slog.i(TAG_WM, "removeTask: could not find taskId=" + taskId); + if (DEBUG_STACK) Slog.i(TAG_WM, "removeTask: could not find taskId=" + mTaskId); return; } mTask.removeIfPossible(); @@ -514,11 +485,11 @@ class TaskRecord extends ConfigurationContainer { // default configuration the next time it launches. setBounds(null); } - mService.getTaskChangeNotificationController().notifyTaskRemoved(taskId); + mAtmService.getTaskChangeNotificationController().notifyTaskRemoved(mTaskId); } - public void onSnapshotChanged(TaskSnapshot snapshot) { - mService.getTaskChangeNotificationController().notifyTaskSnapshotChanged(taskId, snapshot); + void onSnapshotChanged(TaskSnapshot snapshot) { + mAtmService.getTaskChangeNotificationController().notifyTaskSnapshotChanged(mTaskId, snapshot); } void setResizeMode(int resizeMode) { @@ -527,13 +498,13 @@ class TaskRecord extends ConfigurationContainer { } mResizeMode = resizeMode; mTask.setResizeable(resizeMode); - mService.mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); - mService.mRootActivityContainer.resumeFocusedStacksTopActivities(); + mAtmService.mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); + mAtmService.mRootActivityContainer.resumeFocusedStacksTopActivities(); } void setTaskDockedResizing(boolean resizing) { if (mTask == null) { - Slog.w(TAG_WM, "setTaskDockedResizing: taskId " + taskId + " not found."); + Slog.w(TAG_WM, "setTaskDockedResizing: taskId " + mTaskId + " not found."); return; } mTask.setTaskDockedResizing(resizing); @@ -541,11 +512,11 @@ class TaskRecord extends ConfigurationContainer { // TODO: Consolidate this with the resize() method below. public void requestResize(Rect bounds, int resizeMode) { - mService.resizeTask(taskId, bounds, resizeMode); + mAtmService.resizeTask(mTaskId, bounds, resizeMode); } boolean resize(Rect bounds, int resizeMode, boolean preserveWindow, boolean deferResume) { - mService.deferWindowLayout(); + mAtmService.deferWindowLayout(); try { if (!isResizeable()) { @@ -568,7 +539,7 @@ class TaskRecord extends ConfigurationContainer { setBounds(bounds); if (!inFreeformWindowingMode()) { // re-restore the task so it can have the proper stack association. - mService.mStackSupervisor.restoreRecentTaskLocked(this, null, !ON_TOP); + mAtmService.mStackSupervisor.restoreRecentTaskLocked(this, null, !ON_TOP); } return true; } @@ -582,7 +553,7 @@ class TaskRecord extends ConfigurationContainer { // This method assumes that the task is already placed in the right stack. // we do not mess with that decision and we only do the resize! - Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "am.resizeTask_" + taskId); + Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "am.resizeTask_" + mTaskId); boolean updatedConfig = false; mTmpConfig.setTo(getResolvedOverrideConfiguration()); @@ -606,9 +577,9 @@ class TaskRecord extends ConfigurationContainer { // this won't cause tons of irrelevant windows being preserved because only // activities in this task may experience a bounds change. Configs for other // activities stay the same. - mService.mRootActivityContainer.ensureActivitiesVisible(r, 0, preserveWindow); + mAtmService.mRootActivityContainer.ensureActivitiesVisible(r, 0, preserveWindow); if (!kept) { - mService.mRootActivityContainer.resumeFocusedStacksTopActivities(); + mAtmService.mRootActivityContainer.resumeFocusedStacksTopActivities(); } } } @@ -619,7 +590,7 @@ class TaskRecord extends ConfigurationContainer { Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); return kept; } finally { - mService.continueWindowLayout(); + mAtmService.continueWindowLayout(); } } @@ -687,9 +658,9 @@ class TaskRecord extends ConfigurationContainer { boolean reparent(ActivityStack preferredStack, int position, @ReparentMoveStackMode int moveStackMode, boolean animate, boolean deferResume, boolean schedulePictureInPictureModeChange, String reason) { - final ActivityStackSupervisor supervisor = mService.mStackSupervisor; - final RootActivityContainer root = mService.mRootActivityContainer; - final WindowManagerService windowManager = mService.mWindowManager; + final ActivityStackSupervisor supervisor = mAtmService.mStackSupervisor; + final RootActivityContainer root = mAtmService.mRootActivityContainer; + final WindowManagerService windowManager = mAtmService.mWindowManager; final ActivityStack sourceStack = getStack(); final ActivityStack toStack = supervisor.getReparentTargetStack(this, preferredStack, position == MAX_VALUE); @@ -725,7 +696,7 @@ class TaskRecord extends ConfigurationContainer { windowManager.setWillReplaceWindow(topActivity.appToken, animate); } - mService.deferWindowLayout(); + mAtmService.deferWindowLayout(); boolean kept = true; try { final ActivityRecord r = topRunningActivityLocked(); @@ -764,7 +735,7 @@ class TaskRecord extends ConfigurationContainer { // Notify the voice session if required if (voiceSession != null) { try { - voiceSession.taskStarted(intent, taskId); + voiceSession.taskStarted(intent, mTaskId); } catch (RemoteException e) { } } @@ -776,7 +747,7 @@ class TaskRecord extends ConfigurationContainer { wasPaused, reason); } if (!animate) { - mService.mStackSupervisor.mNoAnimActivities.add(topActivity); + mAtmService.mStackSupervisor.mNoAnimActivities.add(topActivity); } // We might trigger a configuration change. Save the current task bounds for freezing. @@ -795,7 +766,7 @@ class TaskRecord extends ConfigurationContainer { } else if (toStackWindowingMode == WINDOWING_MODE_FREEFORM) { Rect bounds = getLaunchBounds(); if (bounds == null) { - mService.mStackSupervisor.getLaunchParamsController().layoutTask(this, null); + mAtmService.mStackSupervisor.getLaunchParamsController().layoutTask(this, null); bounds = configBounds; } kept = resize(bounds, RESIZE_MODE_FORCED, !mightReplaceWindow, deferResume); @@ -803,13 +774,13 @@ class TaskRecord extends ConfigurationContainer { if (toStackSplitScreenPrimary && moveStackMode == REPARENT_KEEP_STACK_AT_FRONT) { // Move recents to front so it is not behind home stack when going into docked // mode - mService.mStackSupervisor.moveRecentsStackToFront(reason); + mAtmService.mStackSupervisor.moveRecentsStackToFront(reason); } kept = resize(toStack.getRequestedOverrideBounds(), RESIZE_MODE_SYSTEM, !mightReplaceWindow, deferResume); } } finally { - mService.continueWindowLayout(); + mAtmService.continueWindowLayout(); } if (mightReplaceWindow) { @@ -846,7 +817,7 @@ class TaskRecord extends ConfigurationContainer { void cancelWindowTransition() { if (mTask == null) { - Slog.w(TAG_WM, "cancelWindowTransition: taskId " + taskId + " not found."); + Slog.w(TAG_WM, "cancelWindowTransition: taskId " + mTaskId + " not found."); return; } mTask.cancelTaskWindowTransition(); @@ -859,7 +830,7 @@ class TaskRecord extends ConfigurationContainer { // TODO: Move this to {@link TaskWindowContainerController} once recent tasks are more // synchronized between AM and WM. - return mService.mWindowManager.getTaskSnapshot(taskId, userId, reducedResolution, + return mAtmService.mWindowManager.getTaskSnapshot(mTaskId, mUserId, reducedResolution, restoreFromDisk); } @@ -938,9 +909,9 @@ class TaskRecord extends ConfigurationContainer { // task as having a true root activity. rootWasReset = true; } - userId = UserHandle.getUserId(info.applicationInfo.uid); - mUserSetupComplete = Settings.Secure.getIntForUser(mService.mContext.getContentResolver(), - USER_SETUP_COMPLETE, 0, userId) != 0; + mUserId = UserHandle.getUserId(info.applicationInfo.uid); + mUserSetupComplete = Settings.Secure.getIntForUser( + mAtmService.mContext.getContentResolver(), USER_SETUP_COMPLETE, 0, mUserId) != 0; if ((info.flags & ActivityInfo.FLAG_AUTO_REMOVE_FROM_RECENTS) != 0) { // If the activity itself has requested auto-remove, then just always do it. autoRemoveRecents = true; @@ -993,12 +964,12 @@ class TaskRecord extends ConfigurationContainer { void setPrevAffiliate(TaskRecord prevAffiliate) { mPrevAffiliate = prevAffiliate; - mPrevAffiliateTaskId = prevAffiliate == null ? INVALID_TASK_ID : prevAffiliate.taskId; + mPrevAffiliateTaskId = prevAffiliate == null ? INVALID_TASK_ID : prevAffiliate.mTaskId; } void setNextAffiliate(TaskRecord nextAffiliate) { mNextAffiliate = nextAffiliate; - mNextAffiliateTaskId = nextAffiliate == null ? INVALID_TASK_ID : nextAffiliate.taskId; + mNextAffiliateTaskId = nextAffiliate == null ? INVALID_TASK_ID : nextAffiliate.mTaskId; } <T extends ActivityStack> T getStack() { @@ -1061,7 +1032,7 @@ class TaskRecord extends ConfigurationContainer { @Override protected void onParentChanged() { super.onParentChanged(); - mService.mRootActivityContainer.updateUIDsPresentOnDisplay(); + mAtmService.mRootActivityContainer.updateUIDsPresentOnDisplay(); } // Close up recents linked list. @@ -1080,13 +1051,13 @@ class TaskRecord extends ConfigurationContainer { closeRecentsChain(); if (inRecents) { inRecents = false; - mService.notifyTaskPersisterLocked(this, false); + mAtmService.notifyTaskPersisterLocked(this, false); } clearRootProcess(); - mService.mWindowManager.mTaskSnapshotController.notifyTaskRemovedFromRecents( - taskId, userId); + mAtmService.mWindowManager.mTaskSnapshotController.notifyTaskRemovedFromRecents( + mTaskId, mUserId); } void setTaskToAffiliateWith(TaskRecord taskToAffiliateWith) { @@ -1235,7 +1206,7 @@ class TaskRecord extends ConfigurationContainer { boolean okToShowLocked() { // NOTE: If {@link TaskRecord#topRunningActivity} return is not null then it is // okay to show the activity when locked. - return mService.mStackSupervisor.isCurrentProfileLocked(userId) + return mAtmService.mStackSupervisor.isCurrentProfileLocked(mUserId) || topRunningActivityLocked() != null; } @@ -1251,7 +1222,7 @@ class TaskRecord extends ConfigurationContainer { mActivities.add(newTop); // Make sure window manager is aware of the position change. - mTask.positionChildAtTop(newTop.mAppWindowToken); + mTask.positionChildAtTop(newTop); updateEffectiveIntent(); } @@ -1283,7 +1254,7 @@ class TaskRecord extends ConfigurationContainer { r.setTask(this); // Remove r first, and if it wasn't already in the list and it's fullscreen, count it. - if (!mActivities.remove(r) && r.fullscreen) { + if (!mActivities.remove(r) && r.occludesParent()) { // Was not previously in list. numFullscreen++; } @@ -1324,18 +1295,18 @@ class TaskRecord extends ConfigurationContainer { updateEffectiveIntent(); if (r.isPersistable()) { - mService.notifyTaskPersisterLocked(this, false); + mAtmService.notifyTaskPersisterLocked(this, false); } - if (r.mAppWindowToken != null) { + if (r.getParent() != null) { // Only attempt to move in WM if the child has a controller. It is possible we haven't // created controller for the activity we are starting yet. - mTask.positionChildAt(r.mAppWindowToken, index); + mTask.positionChildAt(r, index); } // Make sure the list of display UID whitelists is updated // now that this record is in a new task. - mService.mRootActivityContainer.updateUIDsPresentOnDisplay(); + mAtmService.mRootActivityContainer.updateUIDsPresentOnDisplay(); } /** @@ -1355,19 +1326,19 @@ class TaskRecord extends ConfigurationContainer { r.setTask(null /* task */, reparenting /* reparenting */); - if (mActivities.remove(r) && r.fullscreen) { + if (mActivities.remove(r) && r.occludesParent()) { // Was previously in list. numFullscreen--; } if (r.isPersistable()) { - mService.notifyTaskPersisterLocked(this, false); + mAtmService.notifyTaskPersisterLocked(this, false); } if (inPinnedWindowingMode()) { // We normally notify listeners of task stack changes on pause, however pinned stack // activities are normally in the paused state so no notification will be sent there // before the activity is removed. We send it here so instead. - mService.getTaskChangeNotificationController().notifyTaskStackChanged(); + mAtmService.getTaskChangeNotificationController().notifyTaskStackChanged(); } if (mActivities.isEmpty()) { @@ -1530,10 +1501,10 @@ class TaskRecord extends ConfigurationContainer { } final String pkg = (realActivity != null) ? realActivity.getPackageName() : null; - final LockTaskController lockTaskController = mService.getLockTaskController(); + final LockTaskController lockTaskController = mAtmService.getLockTaskController(); switch (r.lockTaskLaunchMode) { case LOCK_TASK_LAUNCH_MODE_DEFAULT: - mLockTaskAuth = lockTaskController.isPackageWhitelisted(userId, pkg) + mLockTaskAuth = lockTaskController.isPackageWhitelisted(mUserId, pkg) ? LOCK_TASK_AUTH_WHITELISTED : LOCK_TASK_AUTH_PINNABLE; break; @@ -1546,7 +1517,7 @@ class TaskRecord extends ConfigurationContainer { break; case LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED: - mLockTaskAuth = lockTaskController.isPackageWhitelisted(userId, pkg) + mLockTaskAuth = lockTaskController.isPackageWhitelisted(mUserId, pkg) ? LOCK_TASK_AUTH_LAUNCHABLE : LOCK_TASK_AUTH_PINNABLE; break; } @@ -1555,7 +1526,7 @@ class TaskRecord extends ConfigurationContainer { } private boolean isResizeable(boolean checkSupportsPip) { - return (mService.mForceResizableActivities || ActivityInfo.isResizeableMode(mResizeMode) + return (mAtmService.mForceResizableActivities || ActivityInfo.isResizeableMode(mResizeMode) || (checkSupportsPip && mSupportsPictureInPicture)); } @@ -1568,8 +1539,8 @@ class TaskRecord extends ConfigurationContainer { // A task can not be docked even if it is considered resizeable because it only supports // picture-in-picture mode but has a non-resizeable resizeMode return super.supportsSplitScreenWindowingMode() - && mService.mSupportsSplitScreenMultiWindow - && (mService.mForceResizableActivities + && mAtmService.mSupportsSplitScreenMultiWindow + && (mAtmService.mForceResizableActivities || (isResizeable(false /* checkSupportsPip */) && !ActivityInfo.isPreserveOrientationMode(mResizeMode))); } @@ -1582,7 +1553,7 @@ class TaskRecord extends ConfigurationContainer { * secondary display. */ boolean canBeLaunchedOnDisplay(int displayId) { - return mService.mStackSupervisor.canPlaceEntityOnDisplay(displayId, + return mAtmService.mStackSupervisor.canPlaceEntityOnDisplay(displayId, -1 /* don't check PID */, -1 /* don't check UID */, null /* activityInfo */); } @@ -1700,15 +1671,15 @@ class TaskRecord extends ConfigurationContainer { } topActivity = false; } - lastTaskDescription = new TaskDescription(label, null, iconResource, iconFilename, + mTaskDescription = new TaskDescription(label, null, iconResource, iconFilename, colorPrimary, colorBackground, statusBarColor, navigationBarColor, statusBarContrastWhenTransparent, navigationBarContrastWhenTransparent); if (mTask != null) { - mTask.setTaskDescription(lastTaskDescription); + mTask.setTaskDescription(mTaskDescription); } // Update the task affiliation color if we are the parent of the group - if (taskId == mAffiliatedTaskId) { - mAffiliatedTaskColor = lastTaskDescription.getPrimaryColor(); + if (mTaskId == mAffiliatedTaskId) { + mAffiliatedTaskColor = mTaskDescription.getPrimaryColor(); } } } @@ -1767,9 +1738,9 @@ class TaskRecord extends ConfigurationContainer { // to do this for the pinned stack as the bounds are controlled by the system. if (!inPinnedWindowingMode() && mStack != null) { final int defaultMinSizeDp = - mService.mRootActivityContainer.mDefaultMinSizeOfResizeableTaskDp; + mAtmService.mRootActivityContainer.mDefaultMinSizeOfResizeableTaskDp; final ActivityDisplay display = - mService.mRootActivityContainer.getActivityDisplay(mStack.mDisplayId); + mAtmService.mRootActivityContainer.getActivityDisplay(mStack.mDisplayId); final float density = (float) display.getConfiguration().densityDpi / DisplayMetrics.DENSITY_DEFAULT; final int defaultMinSize = (int) (defaultMinSizeDp * density); @@ -1849,7 +1820,7 @@ class TaskRecord extends ConfigurationContainer { final boolean wasInMultiWindowMode = inMultiWindowMode(); super.onConfigurationChanged(newParentConfig); if (wasInMultiWindowMode != inMultiWindowMode()) { - mService.mStackSupervisor.scheduleUpdateMultiWindowMode(this); + mAtmService.mStackSupervisor.scheduleUpdateMultiWindowMode(this); } // If the configuration supports persistent bounds (eg. Freeform), keep track of the @@ -1890,7 +1861,7 @@ class TaskRecord extends ConfigurationContainer { } // Saves the new state so that we can launch the activity at the same location. - mService.mStackSupervisor.mLaunchParamsPersister.saveTask(this); + mAtmService.mStackSupervisor.mLaunchParamsPersister.saveTask(this); } /** @@ -2293,7 +2264,7 @@ class TaskRecord extends ConfigurationContainer { if (mLastNonFullscreenBounds != null) { setBounds(mLastNonFullscreenBounds); } else { - mService.mStackSupervisor.getLaunchParamsController().layoutTask(this, null); + mAtmService.mStackSupervisor.getLaunchParamsController().layoutTask(this, null); } } else { setBounds(inStack.getRequestedOverrideBounds()); @@ -2354,9 +2325,9 @@ class TaskRecord extends ConfigurationContainer { */ void fillTaskInfo(TaskInfo info) { getNumRunningActivities(mReuseActivitiesReport); - info.userId = userId; + info.userId = mUserId; info.stackId = getStackId(); - info.taskId = taskId; + info.taskId = mTaskId; info.displayId = mStack == null ? Display.INVALID_DISPLAY : mStack.mDisplayId; info.isRunning = getTopActivity() != null; info.baseIntent = new Intent(getBaseIntent()); @@ -2370,7 +2341,7 @@ class TaskRecord extends ConfigurationContainer { info.realActivity = realActivity; info.numActivities = mReuseActivitiesReport.numActivities; info.lastActiveTime = lastActiveTime; - info.taskDescription = new ActivityManager.TaskDescription(lastTaskDescription); + info.taskDescription = new ActivityManager.TaskDescription(mTaskDescription); info.supportsSplitScreenMultiWindow = supportsSplitScreenWindowingMode(); info.resizeMode = mResizeMode; info.configuration.setTo(getConfiguration()); @@ -2386,7 +2357,7 @@ class TaskRecord extends ConfigurationContainer { } void dump(PrintWriter pw, String prefix) { - pw.print(prefix); pw.print("userId="); pw.print(userId); + pw.print(prefix); pw.print("userId="); pw.print(mUserId); pw.print(" effectiveUid="); UserHandle.formatUid(pw, effectiveUid); pw.print(" mCallingUid="); UserHandle.formatUid(pw, mCallingUid); pw.print(" mUserSetupComplete="); pw.print(mUserSetupComplete); @@ -2440,7 +2411,7 @@ class TaskRecord extends ConfigurationContainer { pw.print(" mReuseTask="); pw.print(mReuseTask); pw.print(" mLockTaskAuth="); pw.println(lockTaskAuthToString()); } - if (mAffiliatedTaskId != taskId || mPrevAffiliateTaskId != INVALID_TASK_ID + if (mAffiliatedTaskId != mTaskId || mPrevAffiliateTaskId != INVALID_TASK_ID || mPrevAffiliate != null || mNextAffiliateTaskId != INVALID_TASK_ID || mNextAffiliate != null) { pw.print(prefix); pw.print("affiliation="); pw.print(mAffiliatedTaskId); @@ -2487,7 +2458,7 @@ class TaskRecord extends ConfigurationContainer { if (stringName != null) { sb.append(stringName); sb.append(" U="); - sb.append(userId); + sb.append(mUserId); sb.append(" StackId="); sb.append(getStackId()); sb.append(" sz="); @@ -2498,7 +2469,7 @@ class TaskRecord extends ConfigurationContainer { sb.append("TaskRecord{"); sb.append(Integer.toHexString(System.identityHashCode(this))); sb.append(" #"); - sb.append(taskId); + sb.append(mTaskId); if (affinity != null) { sb.append(" A="); sb.append(affinity); @@ -2523,7 +2494,7 @@ class TaskRecord extends ConfigurationContainer { final long token = proto.start(fieldId); super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel); - proto.write(ID, taskId); + proto.write(ID, mTaskId); for (int i = mActivities.size() - 1; i >= 0; i--) { ActivityRecord activity = mActivities.get(i); activity.writeToProto(proto, ACTIVITIES); @@ -2573,7 +2544,7 @@ class TaskRecord extends ConfigurationContainer { void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException { if (DEBUG_RECENTS) Slog.i(TAG_RECENTS, "Saving task=" + this); - out.attribute(null, ATTR_TASKID, String.valueOf(taskId)); + out.attribute(null, ATTR_TASKID, String.valueOf(mTaskId)); if (realActivity != null) { out.attribute(null, ATTR_REALACTIVITY, realActivity.flattenToShortString()); } @@ -2596,7 +2567,7 @@ class TaskRecord extends ConfigurationContainer { out.attribute(null, ATTR_ROOTHASRESET, String.valueOf(rootWasReset)); out.attribute(null, ATTR_AUTOREMOVERECENTS, String.valueOf(autoRemoveRecents)); out.attribute(null, ATTR_ASKEDCOMPATMODE, String.valueOf(askedCompatMode)); - out.attribute(null, ATTR_USERID, String.valueOf(userId)); + out.attribute(null, ATTR_USERID, String.valueOf(mUserId)); out.attribute(null, ATTR_USER_SETUP_COMPLETE, String.valueOf(mUserSetupComplete)); out.attribute(null, ATTR_EFFECTIVE_UID, String.valueOf(effectiveUid)); out.attribute(null, ATTR_LASTTIMEMOVED, String.valueOf(mLastTimeMoved)); @@ -2604,8 +2575,8 @@ class TaskRecord extends ConfigurationContainer { if (lastDescription != null) { out.attribute(null, ATTR_LASTDESCRIPTION, lastDescription.toString()); } - if (lastTaskDescription != null) { - lastTaskDescription.saveToXml(out); + if (mTaskDescription != null) { + mTaskDescription.saveToXml(out); } out.attribute(null, ATTR_TASK_AFFILIATION_COLOR, String.valueOf(mAffiliatedTaskColor)); out.attribute(null, ATTR_TASK_AFFILIATION, String.valueOf(mAffiliatedTaskId)); @@ -2692,13 +2663,14 @@ class TaskRecord extends ConfigurationContainer { TaskRecord create(ActivityTaskManagerService service, int taskId, ActivityInfo info, Intent intent, IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor) { - return new TaskRecord( - service, taskId, info, intent, voiceSession, voiceInteractor); + return new TaskRecord(service, taskId, info, intent, voiceSession, voiceInteractor, + null /*taskDescription*/); } TaskRecord create(ActivityTaskManagerService service, int taskId, ActivityInfo info, Intent intent, TaskDescription taskDescription) { - return new TaskRecord(service, taskId, info, intent, taskDescription); + return new TaskRecord(service, taskId, info, intent, null /*voiceSession*/, + null /*voiceInteractor*/, taskDescription); } /** @@ -2720,7 +2692,8 @@ class TaskRecord extends ConfigurationContainer { lastTimeMoved, neverRelinquishIdentity, lastTaskDescription, taskAffiliation, prevTaskId, nextTaskId, taskAffiliationColor, callingUid, callingPackage, resizeMode, supportsPictureInPicture, realActivitySuspended, userSetupComplete, - minWidth, minHeight); + minWidth, minHeight, null /*ActivityInfo*/, null /*_voiceSession*/, + null /*_voiceInteractor*/); } TaskRecord restoreFromXml(XmlPullParser in, ActivityStackSupervisor stackSupervisor) diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java index d070850a895f..172ebce33668 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java @@ -134,6 +134,7 @@ class TaskSnapshotSurface implements StartingSurface { private final int mStatusBarColor; @VisibleForTesting final SystemBarBackgroundPainter mSystemBarBackgroundPainter; private final int mOrientationOnCreation; + private final SurfaceControl.Transaction mTransaction; static TaskSnapshotSurface create(WindowManagerService service, AppWindowToken token, TaskSnapshot snapshot) { @@ -252,6 +253,7 @@ class TaskSnapshotSurface implements StartingSurface { windowPrivateFlags, sysUiVis, taskDescription, 1f); mStatusBarColor = taskDescription.getStatusBarColor(); mOrientationOnCreation = currentOrientation; + mTransaction = mService.mTransactionFactory.get(); } @Override @@ -336,27 +338,23 @@ class TaskSnapshotSurface implements StartingSurface { surface.copyFrom(mChildSurfaceControl); final Rect frame; - SurfaceControl.openTransaction(); - try { - // We can just show the surface here as it will still be hidden as the parent is - // still hidden. - mChildSurfaceControl.show(); - if (aspectRatioMismatch) { - // Clip off ugly navigation bar. - final Rect crop = calculateSnapshotCrop(); - frame = calculateSnapshotFrame(crop); - mChildSurfaceControl.setWindowCrop(crop); - mChildSurfaceControl.setPosition(frame.left, frame.top); - } else { - frame = null; - } - - // Scale the mismatch dimensions to fill the task bounds - final float scale = 1 / mSnapshot.getScale(); - mChildSurfaceControl.setMatrix(scale, 0, 0, scale); - } finally { - SurfaceControl.closeTransaction(); + // We can just show the surface here as it will still be hidden as the parent is + // still hidden. + mTransaction.show(mChildSurfaceControl); + if (aspectRatioMismatch) { + // Clip off ugly navigation bar. + final Rect crop = calculateSnapshotCrop(); + frame = calculateSnapshotFrame(crop); + mTransaction.setWindowCrop(mChildSurfaceControl, crop); + mTransaction.setPosition(mChildSurfaceControl, frame.left, frame.top); + } else { + frame = null; } + + // Scale the mismatch dimensions to fill the task bounds + final float scale = 1 / mSnapshot.getScale(); + mTransaction.setMatrix(mChildSurfaceControl, scale, 0, 0, scale); + mTransaction.apply(); surface.attachAndQueueBufferWithColorSpace(buffer, mSnapshot.getColorSpace()); surface.release(); diff --git a/services/core/java/com/android/server/wm/Watermark.java b/services/core/java/com/android/server/wm/Watermark.java index 729cfc04e36c..725aaa48c645 100644 --- a/services/core/java/com/android/server/wm/Watermark.java +++ b/services/core/java/com/android/server/wm/Watermark.java @@ -55,7 +55,7 @@ class Watermark { private boolean mDrawNeeded; Watermark(Supplier<Surface> surfaceFactory, DisplayContent dc, DisplayMetrics dm, - String[] tokens) { + String[] tokens, SurfaceControl.Transaction t) { if (false) { Log.i(TAG_WM, "*********************** WATERMARK"); for (int i=0; i<tokens.length; i++) { @@ -121,21 +121,21 @@ class Watermark { .setBufferSize(1, 1) .setFormat(PixelFormat.TRANSLUCENT) .build(); - ctrl.setLayerStack(mDisplay.getLayerStack()); - ctrl.setLayer(WindowManagerService.TYPE_LAYER_MULTIPLIER*100); - ctrl.setPosition(0, 0); - ctrl.show(); + t.setLayerStack(ctrl, mDisplay.getLayerStack()) + .setLayer(ctrl, WindowManagerService.TYPE_LAYER_MULTIPLIER * 100) + .setPosition(ctrl, 0, 0) + .show(ctrl); mSurface.copyFrom(ctrl); } catch (OutOfResourcesException e) { } mSurfaceControl = ctrl; } - void positionSurface(int dw, int dh) { + void positionSurface(int dw, int dh, SurfaceControl.Transaction t) { if (mLastDW != dw || mLastDH != dh) { mLastDW = dw; mLastDH = dh; - mSurfaceControl.setBufferSize(dw, dh); + t.setBufferSize(mSurfaceControl, dw, dh); mDrawNeeded = true; } } diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index f437b284637b..3a1d6e047fa8 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -161,7 +161,8 @@ public class WindowAnimator { dc.checkAppWindowsReadyToShow(); orAnimating(dc.getDockedDividerController().animate(mCurrentTime)); if (accessibilityController != null) { - accessibilityController.drawMagnifiedRegionBorderIfNeededLocked(displayId); + accessibilityController.drawMagnifiedRegionBorderIfNeededLocked(displayId, + mTransaction); } } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 264efe0fadbd..a4ab66aef550 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -19,6 +19,11 @@ package com.android.server.wm; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; +import static android.content.pm.ActivityInfo.isFixedOrientationLandscape; +import static android.content.pm.ActivityInfo.isFixedOrientationPortrait; +import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.content.res.Configuration.ORIENTATION_PORTRAIT; +import static android.content.res.Configuration.ORIENTATION_UNDEFINED; import static android.view.SurfaceControl.Transaction; import static com.android.server.wm.WindowContainerProto.CONFIGURATION_CONTAINER; @@ -28,14 +33,17 @@ import static com.android.server.wm.WindowContainerProto.VISIBLE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING; import android.annotation.CallSuper; import android.annotation.IntDef; import android.annotation.Nullable; import android.app.WindowConfiguration; +import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Point; import android.graphics.Rect; +import android.os.Debug; import android.os.IBinder; import android.util.Pools; import android.util.Slog; @@ -47,9 +55,11 @@ import android.view.SurfaceSession; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ToBooleanFunction; +import com.android.server.policy.WindowManagerPolicy; import com.android.server.wm.SurfaceAnimator.Animatable; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Comparator; import java.util.LinkedList; import java.util.function.Consumer; @@ -117,6 +127,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< private final Transaction mPendingTransaction; /** + * Windows that clients are waiting to have drawn. + */ + final ArrayList<WindowState> mWaitingForDrawn = new ArrayList<>(); + + /** * Applied as part of the animation pass in "prepareSurfaces". */ protected final SurfaceAnimator mSurfaceAnimator; @@ -134,6 +149,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< */ private boolean mCommittedReparentToAnimationLeash; + private final Configuration mTmpConfig = new Configuration(); + /** * Callback which is triggered while changing the parent, after setting up the surface but * before asking the parent to assign child layers. @@ -260,7 +277,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< if (child.getParent() != null) { throw new IllegalArgumentException("addChild: container=" + child.getName() + " is already a child of container=" + child.getParent().getName() - + " can't add to container=" + getName()); + + " can't add to container=" + getName() + + "\n callers=" + Debug.getCallers(15, "\n")); } if ((index < 0 && index != POSITION_BOTTOM) @@ -751,6 +769,31 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } /** + * Get the configuration orientation by the requested screen orientation + * ({@link ActivityInfo.ScreenOrientation}) of this activity. + * + * @return orientation in ({@link Configuration#ORIENTATION_LANDSCAPE}, + * {@link Configuration#ORIENTATION_PORTRAIT}, + * {@link Configuration#ORIENTATION_UNDEFINED}). + */ + int getRequestedConfigurationOrientation() { + if (mOrientation == ActivityInfo.SCREEN_ORIENTATION_NOSENSOR) { + // NOSENSOR means the display's "natural" orientation, so return that. + if (mDisplayContent != null) { + return mDisplayContent.getNaturalOrientation(); + } + } else if (mOrientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) { + // LOCKED means the activity's orientation remains unchanged, so return existing value. + return getConfiguration().orientation; + } else if (isFixedOrientationLandscape(mOrientation)) { + return ORIENTATION_LANDSCAPE; + } else if (isFixedOrientationPortrait(mOrientation)) { + return ORIENTATION_PORTRAIT; + } + return ORIENTATION_UNDEFINED; + } + + /** * Calls {@link #setOrientation(int, IBinder, ActivityRecord)} with {@code null} to the last 2 * parameters. * @@ -780,6 +823,13 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } mOrientation = orientation; + final int configOrientation = getRequestedConfigurationOrientation(); + if (getRequestedOverrideConfiguration().orientation != configOrientation) { + mTmpConfig.setTo(getRequestedOverrideConfiguration()); + mTmpConfig.orientation = configOrientation; + onRequestedOverrideConfigurationChanged(mTmpConfig); + } + final WindowContainer parent = getParent(); if (parent != null) { onDescendantOrientationChanged(freezeDisplayToken, requestingContainer); @@ -1392,6 +1442,19 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } + void waitForAllWindowsDrawn() { + final WindowManagerPolicy policy = mWmService.mPolicy; + forAllWindows(w -> { + final boolean keyguard = policy.isKeyguardHostWindow(w.mAttrs); + if (w.isVisibleLw() && (w.mAppToken != null || keyguard)) { + w.mWinAnimator.mDrawState = DRAW_PENDING; + // Force add to mResizingWindows. + w.resetLastContentInsets(); + mWaitingForDrawn.add(w); + } + }, true /* traverseTopToBottom */); + } + Dimmer getDimmer() { if (mParent == null) { return null; diff --git a/services/core/java/com/android/server/wm/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index abbd1abff614..f4b76729b7ea 100644 --- a/services/core/java/com/android/server/wm/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -313,10 +313,15 @@ public abstract class WindowManagerInternal { public abstract void showGlobalActions(); /** - * Invalidate all visible windows. Then report back on the callback once all windows have - * redrawn. + * Invalidate all visible windows on a given display, and report back on the callback when all + * windows have redrawn. + * + * @param callback reporting callback to be called when all windows have redrawn. + * @param timeout calls the callback anyway after the timeout. + * @param displayId waits for the windows on the given display, INVALID_DISPLAY to wait for all + * windows on all displays. */ - public abstract void waitForAllWindowsDrawn(Runnable callback, long timeout); + public abstract void waitForAllWindowsDrawn(Runnable callback, long timeout, int displayId); /** * Overrides the display size. @@ -502,6 +507,13 @@ public abstract class WindowManagerInternal { public abstract boolean shouldShowIme(int displayId); /** + * Show IME on imeTargetWindow once IME has finished layout. + * + * @param imeTargetWindowToken token of the (IME target) window on which IME should be shown. + */ + public abstract void showImePostLayout(IBinder imeTargetWindowToken); + + /** * Tell window manager about a package that should not be running with high refresh rate * setting until removeNonHighRefreshRatePackage is called for the same package. * diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 1f45cfb2f53d..6f9f2c0f9708 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -290,6 +290,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -568,13 +569,10 @@ public class WindowManagerService extends IWindowManager.Stub final ArrayList<WindowState> mForceRemoves = new ArrayList<>(); /** - * Windows that clients are waiting to have drawn. + * The callbacks to make when the windows all have been drawn for a given + * {@link WindowContainer}. */ - ArrayList<WindowState> mWaitingForDrawn = new ArrayList<>(); - /** - * And the callback to make when they've all been drawn. - */ - Runnable mWaitingForDrawnCallback; + final HashMap<WindowContainer, Runnable> mWaitingForDrawnCallbacks = new HashMap<>(); /** List of window currently causing non-system overlay windows to be hidden. */ private ArrayList<WindowState> mHidingNonSystemOverlayWindows = new ArrayList<>(); @@ -1271,14 +1269,7 @@ public class WindowManagerService extends IWindowManager.Stub // Add ourself to the Watchdog monitors. Watchdog.getInstance().addMonitor(this); - - openSurfaceTransaction(); - try { - createWatermarkInTransaction(); - } finally { - closeSurfaceTransaction("createWatermarkInTransaction"); - } - + createWatermark(); showEmulatorDisplayOverlayIfNeeded(); } @@ -3437,60 +3428,45 @@ public class WindowManagerService extends IWindowManager.Stub public void showCircularMask(boolean visible) { synchronized (mGlobalLock) { + if (visible) { + // TODO(multi-display): support multiple displays + if (mCircularDisplayMask == null) { + int screenOffset = mContext.getResources().getInteger( + com.android.internal.R.integer.config_windowOutsetBottom); + int maskThickness = mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.circular_display_mask_thickness); - if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG_WM, - ">>> OPEN TRANSACTION showCircularMask(visible=" + visible + ")"); - openSurfaceTransaction(); - try { - if (visible) { - // TODO(multi-display): support multiple displays - if (mCircularDisplayMask == null) { - int screenOffset = mContext.getResources().getInteger( - com.android.internal.R.integer.config_windowOutsetBottom); - int maskThickness = mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.circular_display_mask_thickness); - - mCircularDisplayMask = new CircularDisplayMask(mSurfaceFactory, - getDefaultDisplayContentLocked(), - mPolicy.getWindowLayerFromTypeLw( - WindowManager.LayoutParams.TYPE_POINTER) - * TYPE_LAYER_MULTIPLIER + 10, screenOffset, maskThickness); + + if (SHOW_LIGHT_TRANSACTIONS) { + Slog.i(TAG_WM, + ">>> showCircularMask(visible=" + visible + ")"); } - mCircularDisplayMask.setVisibility(true); - } else if (mCircularDisplayMask != null) { - mCircularDisplayMask.setVisibility(false); - mCircularDisplayMask = null; + mCircularDisplayMask = new CircularDisplayMask(mSurfaceFactory, + getDefaultDisplayContentLocked(), mPolicy.getWindowLayerFromTypeLw( + WindowManager.LayoutParams.TYPE_POINTER) * TYPE_LAYER_MULTIPLIER + + 10, screenOffset, maskThickness, mTransaction); } - } finally { - closeSurfaceTransaction("showCircularMask"); - if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG_WM, - "<<< CLOSE TRANSACTION showCircularMask(visible=" + visible + ")"); + mCircularDisplayMask.setVisibility(true, mTransaction); + } else if (mCircularDisplayMask != null) { + mCircularDisplayMask.setVisibility(false, mTransaction); + mCircularDisplayMask = null; } + mTransaction.apply(); } } public void showEmulatorDisplayOverlay() { synchronized (mGlobalLock) { - if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG_WM, - ">>> OPEN TRANSACTION showEmulatorDisplayOverlay"); - openSurfaceTransaction(); - try { - if (mEmulatorDisplayOverlay == null) { - mEmulatorDisplayOverlay = new EmulatorDisplayOverlay( - mSurfaceFactory, - mContext, - getDefaultDisplayContentLocked(), - mPolicy.getWindowLayerFromTypeLw( - WindowManager.LayoutParams.TYPE_POINTER) - * TYPE_LAYER_MULTIPLIER + 10); - } - mEmulatorDisplayOverlay.setVisibility(true); - } finally { - closeSurfaceTransaction("showEmulatorDisplayOverlay"); - if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG_WM, - "<<< CLOSE TRANSACTION showEmulatorDisplayOverlay"); + if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG_WM, ">>> showEmulatorDisplayOverlay"); + if (mEmulatorDisplayOverlay == null) { + mEmulatorDisplayOverlay = new EmulatorDisplayOverlay(mSurfaceFactory, mContext, + getDefaultDisplayContentLocked(), + mPolicy.getWindowLayerFromTypeLw(WindowManager.LayoutParams.TYPE_POINTER) + * TYPE_LAYER_MULTIPLIER + 10, mTransaction); } + mEmulatorDisplayOverlay.setVisibility(true, mTransaction); + mTransaction.apply(); } } @@ -3519,23 +3495,16 @@ public class WindowManagerService extends IWindowManager.Stub return; } - if (SHOW_VERBOSE_TRANSACTIONS) Slog.i(TAG_WM, - ">>> OPEN TRANSACTION showStrictModeViolation"); + if (SHOW_VERBOSE_TRANSACTIONS) Slog.i(TAG_WM, ">>> showStrictModeViolation"); // TODO: Modify this to use the surface trace once it is not going crazy. // b/31532461 - SurfaceControl.openTransaction(); - try { - // TODO(multi-display): support multiple displays - if (mStrictModeFlash == null) { - mStrictModeFlash = new StrictModeFlash(mSurfaceFactory, - getDefaultDisplayContentLocked()); - } - mStrictModeFlash.setVisibility(on); - } finally { - SurfaceControl.closeTransaction(); - if (SHOW_VERBOSE_TRANSACTIONS) Slog.i(TAG_WM, - "<<< CLOSE TRANSACTION showStrictModeViolation"); + // TODO(multi-display): support multiple displays + if (mStrictModeFlash == null) { + mStrictModeFlash = new StrictModeFlash(mSurfaceFactory, + getDefaultDisplayContentLocked(), mTransaction); } + mStrictModeFlash.setVisibility(on, mTransaction); + mTransaction.apply(); } } @@ -4736,12 +4705,12 @@ public class WindowManagerService extends IWindowManager.Stub case WAITING_FOR_DRAWN_TIMEOUT: { Runnable callback = null; + final WindowContainer container = (WindowContainer) msg.obj; synchronized (mGlobalLock) { ProtoLog.w(WM_ERROR, "Timeout waiting for drawn: undrawn=%s", - mWaitingForDrawn); - mWaitingForDrawn.clear(); - callback = mWaitingForDrawnCallback; - mWaitingForDrawnCallback = null; + container.mWaitingForDrawn); + container.mWaitingForDrawn.clear(); + callback = mWaitingForDrawnCallbacks.remove(container); } if (callback != null) { callback.run(); @@ -4773,9 +4742,9 @@ public class WindowManagerService extends IWindowManager.Stub } case ALL_WINDOWS_DRAWN: { Runnable callback; + final WindowContainer container = (WindowContainer) msg.obj; synchronized (mGlobalLock) { - callback = mWaitingForDrawnCallback; - mWaitingForDrawnCallback = null; + callback = mWaitingForDrawnCallbacks.remove(container); } if (callback != null) { callback.run(); @@ -5265,30 +5234,32 @@ public class WindowManagerService extends IWindowManager.Stub } void checkDrawnWindowsLocked() { - if (mWaitingForDrawn.isEmpty() || mWaitingForDrawnCallback == null) { + if (mWaitingForDrawnCallbacks.isEmpty()) { return; } - for (int j = mWaitingForDrawn.size() - 1; j >= 0; j--) { - WindowState win = mWaitingForDrawn.get(j); - ProtoLog.i(WM_DEBUG_SCREEN_ON, + mWaitingForDrawnCallbacks.forEach((container, callback) -> { + for (int j = container.mWaitingForDrawn.size() - 1; j >= 0; j--) { + final WindowState win = (WindowState) container.mWaitingForDrawn.get(j); + ProtoLog.i(WM_DEBUG_SCREEN_ON, "Waiting for drawn %s: removed=%b visible=%b mHasSurface=%b drawState=%d", win, win.mRemoved, win.isVisibleLw(), win.mHasSurface, win.mWinAnimator.mDrawState); - if (win.mRemoved || !win.mHasSurface || !win.isVisibleByPolicy()) { - // Window has been removed or hidden; no draw will now happen, so stop waiting. - ProtoLog.w(WM_DEBUG_SCREEN_ON, "Aborted waiting for drawn: %s", win); - mWaitingForDrawn.remove(win); - } else if (win.hasDrawnLw()) { - // Window is now drawn (and shown). - ProtoLog.d(WM_DEBUG_SCREEN_ON, "Window drawn win=%s", win); - mWaitingForDrawn.remove(win); + if (win.mRemoved || !win.mHasSurface || !win.isVisibleByPolicy()) { + // Window has been removed or hidden; no draw will now happen, so stop waiting. + ProtoLog.w(WM_DEBUG_SCREEN_ON, "Aborted waiting for drawn: %s", win); + container.mWaitingForDrawn.remove(win); + } else if (win.hasDrawnLw()) { + // Window is now drawn (and shown). + ProtoLog.d(WM_DEBUG_SCREEN_ON, "Window drawn win=%s", win); + container.mWaitingForDrawn.remove(win); + } } - } - if (mWaitingForDrawn.isEmpty()) { - ProtoLog.d(WM_DEBUG_SCREEN_ON, "All windows drawn!"); - mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT); - mH.sendEmptyMessage(H.ALL_WINDOWS_DRAWN); - } + if (container.mWaitingForDrawn.isEmpty()) { + ProtoLog.d(WM_DEBUG_SCREEN_ON, "All windows drawn!"); + mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container); + mH.sendMessage(mH.obtainMessage(H.ALL_WINDOWS_DRAWN, container)); + } + }); } void setHoldScreenLocked(final Session newHoldScreen) { @@ -5520,7 +5491,7 @@ public class WindowManagerService extends IWindowManager.Stub return val; } - void createWatermarkInTransaction() { + void createWatermark() { if (mWatermark != null) { return; } @@ -5538,8 +5509,8 @@ public class WindowManagerService extends IWindowManager.Stub // TODO(multi-display): Show watermarks on secondary displays. final DisplayContent displayContent = getDefaultDisplayContentLocked(); mWatermark = new Watermark(mSurfaceFactory, displayContent, - displayContent.mRealDisplayMetrics, - toks); + displayContent.mRealDisplayMetrics, toks, mTransaction); + mTransaction.apply(); } } } catch (FileNotFoundException e) { @@ -5934,13 +5905,18 @@ public class WindowManagerService extends IWindowManager.Stub } } } - if (mWaitingForDrawn.size() > 0) { + if (!mWaitingForDrawnCallbacks.isEmpty()) { pw.println(); pw.println(" Clients waiting for these windows to be drawn:"); - for (int i=mWaitingForDrawn.size()-1; i>=0; i--) { - WindowState win = mWaitingForDrawn.get(i); - pw.print(" Waiting #"); pw.print(i); pw.print(' '); pw.print(win); - } + mWaitingForDrawnCallbacks.forEach((wc, callback) -> { + pw.print(" WindowContainer "); + pw.println(wc.getName()); + for (int i = wc.mWaitingForDrawn.size() - 1; i >= 0; i--) { + final WindowState win = (WindowState) wc.mWaitingForDrawn.get(i); + pw.print(" Waiting #"); pw.print(i); pw.print(' '); pw.print(win); + } + }); + } pw.println(); pw.print(" mGlobalConfiguration="); pw.println(mRoot.getConfiguration()); @@ -7096,17 +7072,25 @@ public class WindowManagerService extends IWindowManager.Stub } @Override - public void waitForAllWindowsDrawn(Runnable callback, long timeout) { + public void waitForAllWindowsDrawn(Runnable callback, long timeout, int displayId) { + final WindowContainer container = displayId == INVALID_DISPLAY + ? mRoot : mRoot.getDisplayContent(displayId); + if (container == null) { + // The waiting container doesn't exist, no need to wait to run the callback. Run and + // return; + callback.run(); + return; + } boolean allWindowsDrawn = false; synchronized (mGlobalLock) { - mWaitingForDrawnCallback = callback; - getDefaultDisplayContentLocked().waitForAllWindowsDrawn(); + container.waitForAllWindowsDrawn(); mWindowPlacerLocked.requestTraversal(); - mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT); - if (mWaitingForDrawn.isEmpty()) { + mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container); + if (container.mWaitingForDrawn.isEmpty()) { allWindowsDrawn = true; } else { - mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout); + mWaitingForDrawnCallbacks.put(container, callback); + mH.sendNewMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, container, timeout); checkDrawnWindowsLocked(); } } @@ -7303,6 +7287,29 @@ public class WindowManagerService extends IWindowManager.Stub } @Override + public void showImePostLayout(IBinder imeTargetWindowToken) { + synchronized (mGlobalLock) { + final WindowState imeTarget = mWindowMap.get(imeTargetWindowToken); + if (imeTarget == null) { + return; + } + final DisplayContent displayContent = imeTarget.getDisplayContent(); + if (displayContent == null) { + Slog.w(TAG_WM, "Attempted to show IME on an IME target that does not exist: " + + imeTarget.getName()); + return; + } + if (displayContent.isUntrustedVirtualDisplay()) { + throw new SecurityException("Attempted to show IME on an untrusted " + + "virtual display: " + displayContent.getDisplayId()); + } + + displayContent.getInsetsStateController().getImeSourceProvider() + .scheduleShowImePostLayout(imeTarget); + } + } + + @Override public boolean isUidAllowedOnDisplay(int displayId, int uid) { if (displayId == Display.DEFAULT_DISPLAY) { return true; @@ -7636,7 +7643,7 @@ public class WindowManagerService extends IWindowManager.Stub // to do so because it seems possible to resume activities as part of a larger // transaction and it's too early to resume based on current order when performing // updateTopResumedActivityIfNeeded(). - displayContent.mAcitvityDisplay.ensureActivitiesVisible(null /* starting */, + displayContent.mActivityDisplay.ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, !PRESERVE_WINDOWS, true /* notifyClients */); } } diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java index d7116d8bbd87..1c0d1561de90 100644 --- a/services/core/java/com/android/server/wm/WindowProcessController.java +++ b/services/core/java/com/android/server/wm/WindowProcessController.java @@ -702,7 +702,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio } ActivityRecord hist = mActivities.get(0); intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_APP, hist.packageName); - intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_TASK, hist.getTaskRecord().taskId); + intent.putExtra(HeavyWeightSwitcherActivity.KEY_CUR_TASK, hist.getTaskRecord().mTaskId); } boolean shouldKillProcessForRemovedTask(TaskRecord tr) { @@ -713,7 +713,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio return false; } final TaskRecord otherTask = activity.getTaskRecord(); - if (tr.taskId != otherTask.taskId && otherTask.inRecents) { + if (tr.mTaskId != otherTask.mTaskId && otherTask.inRecents) { // Don't kill process(es) that has an activity in a different task that is // also in recents. return false; diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 569d248d8efb..56e08b2843b5 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -836,7 +836,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP */ boolean inSizeCompatMode() { return (mAttrs.privateFlags & PRIVATE_FLAG_COMPATIBLE_WINDOW) != 0 - || (mAppToken != null && mAppToken.inSizeCompatMode() + || (mAppToken != null && mAppToken.hasSizeCompatBounds() // Exclude starting window because it is not displayed by the application. && mAttrs.type != TYPE_APPLICATION_STARTING); } @@ -2320,7 +2320,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } // The offset of compatibility bounds is applied to surface of {@link #AppWindowToken} // and frame, so it is unnecessary to translate twice in surface based coordinates. - final int surfaceOffsetX = mAppToken.inSizeCompatMode() + final int surfaceOffsetX = mAppToken.hasSizeCompatBounds() ? mAppToken.getBounds().left : 0; mTmpRect.offset(surfaceOffsetX - mWindowFrames.mFrame.left, -mWindowFrames.mFrame.top); region.set(mTmpRect); @@ -2424,15 +2424,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP void prepareWindowToDisplayDuringRelayout(boolean wasVisible) { // We need to turn on screen regardless of visibility. final boolean hasTurnScreenOnFlag = (mAttrs.flags & FLAG_TURN_SCREEN_ON) != 0 - || (mAppToken != null && mAppToken.mActivityRecord.canTurnScreenOn()); + || (mAppToken != null && mAppToken.canTurnScreenOn()); // The screen will turn on if the following conditions are met // 1. The window has the flag FLAG_TURN_SCREEN_ON or ActivityRecord#canTurnScreenOn. // 2. The WMS allows theater mode. // 3. No AWT or the AWT allows the screen to be turned on. This should only be true once // per resume to prevent the screen getting getting turned on for each relayout. Set - // canTurnScreenOn will be set to false so the window doesn't turn the screen on again - // during this resume. + // currentLaunchCanTurnScreenOn will be set to false so the window doesn't turn the screen + // on again during this resume. // 4. When the screen is not interactive. This is because when the screen is already // interactive, the value may persist until the next animation, which could potentially // be occurring while turning off the screen. This would lead to the screen incorrectly @@ -2617,7 +2617,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override public boolean canShowWhenLocked() { final boolean showBecauseOfActivity = - mAppToken != null && mAppToken.mActivityRecord.canShowWhenLocked(); + mAppToken != null && mAppToken.canShowWhenLocked(); final boolean showBecauseOfWindow = (getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0; return showBecauseOfActivity || showBecauseOfWindow; } @@ -3497,7 +3497,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override void setWaitingForDrawnIfResizingChanged() { if (isDragResizeChanged()) { - mWmService.mWaitingForDrawn.add(this); + mWmService.mRoot.mWaitingForDrawn.add(this); } super.setWaitingForDrawnIfResizingChanged(); } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 3dcf6ecb5124..1328273c9560 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -506,9 +506,8 @@ class WindowStateAnimator { flags |= SurfaceControl.OPAQUE; } - mSurfaceController = new WindowSurfaceController(mSession.mSurfaceSession, - attrs.getTitle().toString(), width, height, format, flags, this, - windowType, ownerUid); + mSurfaceController = new WindowSurfaceController(attrs.getTitle().toString(), width, + height, format, flags, this, windowType, ownerUid); mSurfaceController.setColorSpaceAgnostic((attrs.privateFlags & WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC) != 0); diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index 49f27a1b495d..0b4ea9927139 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -37,8 +37,8 @@ import android.os.Trace; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.SurfaceControl; -import android.view.SurfaceSession; import android.view.WindowContentFrameStats; +import android.view.WindowManager; import com.android.server.protolog.common.ProtoLog; @@ -85,7 +85,7 @@ class WindowSurfaceController { private final SurfaceControl.Transaction mTmpTransaction; - public WindowSurfaceController(SurfaceSession s, String name, int w, int h, int format, + WindowSurfaceController(String name, int w, int h, int format, int flags, WindowStateAnimator animator, int windowType, int ownerUid) { mAnimator = animator; @@ -109,6 +109,13 @@ class WindowSurfaceController { .setFlags(flags) .setMetadata(METADATA_WINDOW_TYPE, windowType) .setMetadata(METADATA_OWNER_UID, ownerUid); + + if ((win.getAttrs().privateFlags & + WindowManager.LayoutParams.PRIVATE_FLAG_USE_BLAST) != 0) { + b.setContainerLayer(); + } + + mSurfaceControl = b.build(); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); } diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index fbfb0286db1e..5b362c32979b 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -120,7 +120,9 @@ class WindowToken extends WindowContainer<WindowState> { mPersistOnEmpty = persistOnEmpty; mOwnerCanManageAppTokens = ownerCanManageAppTokens; mRoundedCornerOverlay = roundedCornerOverlay; - onDisplayChanged(dc); + if (dc != null) { + onDisplayChanged(dc); + } } void setHidden(boolean hidden) { diff --git a/services/devicepolicy/TEST_MAPPING b/services/devicepolicy/TEST_MAPPING index a5ee3e24e14a..3d86cf30f38e 100644 --- a/services/devicepolicy/TEST_MAPPING +++ b/services/devicepolicy/TEST_MAPPING @@ -1,5 +1,5 @@ { - "presubmit": [ + "presubmit-devicepolicy": [ { "name": "CtsDevicePolicyManagerTestCases", "options": [ @@ -12,7 +12,7 @@ ] } ], - "postsubmit": [ + "postsubmit-devicepolicy": [ { "name": "CtsDevicePolicyManagerTestCases" } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index b118cdfeb84d..47291cb286ba 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -11320,6 +11320,28 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + @Override + public boolean isActiveSupervisionApp(int uid) { + synchronized (getLockObject()) { + final ActiveAdmin admin = getActiveAdminWithPolicyForUidLocked( + null, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, uid); + if (admin == null) { + return false; + } + + final String supervisionString = mContext.getResources().getString( + com.android.internal.R.string + .config_defaultSupervisionProfileOwnerComponent); + if (supervisionString == null) { + return false; + } + + final ComponentName supervisorComponent = ComponentName.unflattenFromString( + supervisionString); + return admin.info.getComponent().equals(supervisorComponent); + } + } + private void notifyCrossProfileProvidersChanged(int userId, List<String> packages) { final List<OnCrossProfileWidgetProvidersChangeListener> listeners; synchronized (getLockObject()) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index de65002c2c31..a453164b8fbc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -501,7 +501,7 @@ public final class SystemServer { mRuntimeStartElapsedTime, mRuntimeStartUptime); LocalServices.addService(SystemServiceManager.class, mSystemServiceManager); // Prepare the thread pool for init tasks that can be parallelized - SystemServerInitThreadPool.get(); + SystemServerInitThreadPool.start(); } finally { t.traceEnd(); // InitBeforeStartServices } diff --git a/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java index 108b017fc76c..2aa625a657ef 100644 --- a/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java @@ -108,7 +108,7 @@ public class DeviceIdleControllerTest { @Mock private AlarmManager mAlarmManager; @Mock - private ConnectivityService mConnectivityService; + private ConnectivityManager mConnectivityManager; @Mock private ContentResolver mContentResolver; @Mock @@ -127,7 +127,7 @@ public class DeviceIdleControllerTest { private SensorManager mSensorManager; class InjectorForTest extends DeviceIdleController.Injector { - ConnectivityService connectivityService; + ConnectivityManager connectivityManager; LocationManager locationManager; ConstraintController constraintController; // Freeze time for testing. @@ -155,8 +155,8 @@ public class DeviceIdleControllerTest { } @Override - ConnectivityService getConnectivityService() { - return connectivityService; + ConnectivityManager getConnectivityManager() { + return connectivityManager; } @Override @@ -347,19 +347,19 @@ public class DeviceIdleControllerTest { public void testUpdateConnectivityState() { // No connectivity service final boolean isConnected = mDeviceIdleController.isNetworkConnected(); - mInjector.connectivityService = null; + mInjector.connectivityManager = null; mDeviceIdleController.updateConnectivityState(null); assertEquals(isConnected, mDeviceIdleController.isNetworkConnected()); // No active network info - mInjector.connectivityService = mConnectivityService; - doReturn(null).when(mConnectivityService).getActiveNetworkInfo(); + mInjector.connectivityManager = mConnectivityManager; + doReturn(null).when(mConnectivityManager).getActiveNetworkInfo(); mDeviceIdleController.updateConnectivityState(null); assertFalse(mDeviceIdleController.isNetworkConnected()); // Active network info says connected. final NetworkInfo ani = mock(NetworkInfo.class); - doReturn(ani).when(mConnectivityService).getActiveNetworkInfo(); + doReturn(ani).when(mConnectivityManager).getActiveNetworkInfo(); doReturn(true).when(ani).isConnected(); mDeviceIdleController.updateConnectivityState(null); assertTrue(mDeviceIdleController.isNetworkConnected()); @@ -1827,10 +1827,10 @@ public class DeviceIdleControllerTest { } private void setNetworkConnected(boolean connected) { - mInjector.connectivityService = mConnectivityService; + mInjector.connectivityManager = mConnectivityManager; final NetworkInfo ani = mock(NetworkInfo.class); doReturn(connected).when(ani).isConnected(); - doReturn(ani).when(mConnectivityService).getActiveNetworkInfo(); + doReturn(ani).when(mConnectivityManager).getActiveNetworkInfo(); mDeviceIdleController.updateConnectivityState(null); } diff --git a/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java index 4538cacbf9c4..5c2b8ce4b432 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/color/DisplayWhiteBalanceTintControllerTest.java @@ -20,6 +20,8 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.google.common.truth.Truth.assertWithMessage; +import static org.junit.Assert.assertArrayEquals; + import android.content.Context; import android.content.res.Resources; import android.os.Binder; @@ -184,8 +186,56 @@ public class DisplayWhiteBalanceTintControllerTest { .isFalse(); } + /** + * Matrix should match the precalculated one for given cct and display primaries. + */ + @Test + public void displayWhiteBalance_validateTransformMatrix() { + DisplayPrimaries displayPrimaries = new DisplayPrimaries(); + displayPrimaries.red = new CieXyz(); + displayPrimaries.red.X = 0.412315f; + displayPrimaries.red.Y = 0.212600f; + displayPrimaries.red.Z = 0.019327f; + displayPrimaries.green = new CieXyz(); + displayPrimaries.green.X = 0.357600f; + displayPrimaries.green.Y = 0.715200f; + displayPrimaries.green.Z = 0.119200f; + displayPrimaries.blue = new CieXyz(); + displayPrimaries.blue.X = 0.180500f; + displayPrimaries.blue.Y = 0.072200f; + displayPrimaries.blue.Z = 0.950633f; + displayPrimaries.white = new CieXyz(); + displayPrimaries.white.X = 0.950456f; + displayPrimaries.white.Y = 1.000000f; + displayPrimaries.white.Z = 1.089058f; + doReturn(displayPrimaries) + .when(() -> SurfaceControl.getDisplayNativePrimaries(mDisplayToken)); + + setUpTintController(); + assertWithMessage("Setup with valid SurfaceControl failed") + .that(mDisplayWhiteBalanceTintController.mSetUp) + .isTrue(); + + final int cct = 6500; + mDisplayWhiteBalanceTintController.setMatrix(cct); + assertWithMessage("Failed to set temperature") + .that(mDisplayWhiteBalanceTintController.mCurrentColorTemperature) + .isEqualTo(cct); + + float[] matrixDwb = mDisplayWhiteBalanceTintController.getMatrix(); + final float[] expectedMatrixDwb = { + 0.962880f, -0.001780f, -0.000158f, 0.0f, + 0.035765f, 0.929988f, 0.000858f, 0.0f, + 0.001354f, -0.000470f, 0.948327f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + assertArrayEquals("Unexpected DWB matrix", matrixDwb, expectedMatrixDwb, + 1e-6f /* tolerance */); + } + private void setUpTintController() { mDisplayWhiteBalanceTintController = new DisplayWhiteBalanceTintController(); mDisplayWhiteBalanceTintController.setUp(mMockedContext, true); + mDisplayWhiteBalanceTintController.setActivated(true); } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java index 73dcb98abc8c..d11d98766b01 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AbstractAccessibilityServiceConnectionTest.java @@ -46,6 +46,7 @@ import static android.view.accessibility.AccessibilityNodeInfo.ROOT_NODE_ID; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -140,6 +141,8 @@ public class AbstractAccessibilityServiceConnectionTest { private final List<AccessibilityWindowInfo> mA11yWindowInfosOnSecondDisplay = new ArrayList<>(); private Callable[] mFindA11yNodesFunctions; private Callable<Boolean> mPerformA11yAction; + private ArrayList<Integer> mDisplayList = new ArrayList<>(Arrays.asList( + Display.DEFAULT_DISPLAY, SECONDARY_DISPLAY_ID)); // To mock package-private class. @Rule public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule = @@ -153,7 +156,7 @@ public class AbstractAccessibilityServiceConnectionTest { @Mock private AccessibilityWindowManager mMockA11yWindowManager; @Mock private AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport; @Mock private WindowManagerInternal mMockWindowManagerInternal; - @Mock private GlobalActionPerformer mMockGlobalActionPerformer; + @Mock private SystemActionPerformer mMockSystemActionPerformer; @Mock private IBinder mMockService; @Mock private IAccessibilityServiceClient mMockServiceInterface; @Mock private KeyEventDispatcher mMockKeyEventDispatcher; @@ -184,6 +187,7 @@ public class AbstractAccessibilityServiceConnectionTest { addA11yWindowInfo(mA11yWindowInfos, PIP_WINDOWID, true, Display.DEFAULT_DISPLAY); addA11yWindowInfo(mA11yWindowInfosOnSecondDisplay, WINDOWID_ONSECONDDISPLAY, false, SECONDARY_DISPLAY_ID); + when(mMockA11yWindowManager.getDisplayListLocked()).thenReturn(mDisplayList); when(mMockA11yWindowManager.getWindowListLocked(Display.DEFAULT_DISPLAY)) .thenReturn(mA11yWindowInfos); when(mMockA11yWindowManager.findA11yWindowInfoByIdLocked(WINDOWID)) @@ -217,7 +221,7 @@ public class AbstractAccessibilityServiceConnectionTest { mServiceConnection = new TestAccessibilityServiceConnection(mMockContext, COMPONENT_NAME, mSpyServiceInfo, SERVICE_ID, mHandler, new Object(), mMockSecurityPolicy, - mMockSystemSupport, mMockWindowManagerInternal, mMockGlobalActionPerformer, + mMockSystemSupport, mMockWindowManagerInternal, mMockSystemActionPerformer, mMockA11yWindowManager); // Assume that the service is connected mServiceConnection.mService = mMockService; @@ -285,7 +289,14 @@ public class AbstractAccessibilityServiceConnectionTest { @Test public void getWindows() { - assertThat(mServiceConnection.getWindows(), is(mA11yWindowInfos)); + final AccessibilityWindowInfo.WindowListSparseArray allWindows = + mServiceConnection.getWindows(); + + assertEquals(2, allWindows.size()); + assertThat(allWindows.get(Display.DEFAULT_DISPLAY), is(mA11yWindowInfos)); + assertEquals(2, allWindows.get(Display.DEFAULT_DISPLAY).size()); + assertThat(allWindows.get(SECONDARY_DISPLAY_ID), is(mA11yWindowInfosOnSecondDisplay)); + assertEquals(1, allWindows.get(SECONDARY_DISPLAY_ID).size()); } @Test @@ -478,7 +489,7 @@ public class AbstractAccessibilityServiceConnectionTest { @Test public void performGlobalAction() { mServiceConnection.performGlobalAction(GLOBAL_ACTION_HOME); - verify(mMockGlobalActionPerformer).performGlobalAction(GLOBAL_ACTION_HOME); + verify(mMockSystemActionPerformer).performSystemAction(GLOBAL_ACTION_HOME); } @Test @@ -765,10 +776,10 @@ public class AbstractAccessibilityServiceConnectionTest { AccessibilityServiceInfo accessibilityServiceInfo, int id, Handler mainHandler, Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport, WindowManagerInternal windowManagerInternal, - GlobalActionPerformer globalActionPerfomer, + SystemActionPerformer systemActionPerfomer, AccessibilityWindowManager a11yWindowManager) { super(context, componentName, accessibilityServiceInfo, id, mainHandler, lock, - securityPolicy, systemSupport, windowManagerInternal, globalActionPerfomer, + securityPolicy, systemSupport, windowManagerInternal, systemActionPerfomer, a11yWindowManager); mResolvedUserId = USER_ID; } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java index 6be5a3785865..edf82ee30e2d 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java @@ -75,7 +75,7 @@ public class AccessibilityServiceConnectionTest { @Mock AccessibilityWindowManager mMockA11yWindowManager; @Mock AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport; @Mock WindowManagerInternal mMockWindowManagerInternal; - @Mock GlobalActionPerformer mMockGlobalActionPerformer; + @Mock SystemActionPerformer mMockSystemActionPerformer; @Mock KeyEventDispatcher mMockKeyEventDispatcher; @Mock MagnificationController mMockMagnificationController; @Mock IBinder mMockIBinder; @@ -104,7 +104,7 @@ public class AccessibilityServiceConnectionTest { mConnection = new AccessibilityServiceConnection(mMockUserState, mMockContext, COMPONENT_NAME, mMockServiceInfo, SERVICE_ID, mHandler, new Object(), mMockSecurityPolicy, mMockSystemSupport, mMockWindowManagerInternal, - mMockGlobalActionPerformer, mMockA11yWindowManager); + mMockSystemActionPerformer, mMockA11yWindowManager); when(mMockSecurityPolicy.canPerformGestures(mConnection)).thenReturn(true); } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerTest.java index b7b5a4eaacfa..b5e5deb9ff59 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityWindowManagerTest.java @@ -67,6 +67,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -104,6 +105,9 @@ public class AccessibilityWindowManagerTest { // List of callback, mapping from displayId -> callback. private final SparseArray<WindowsForAccessibilityCallback> mCallbackOfWindows = new SparseArray<>(); + // List of display ID. + private final ArrayList<Integer> mExpectedDisplayList = new ArrayList<>(Arrays.asList( + Display.DEFAULT_DISPLAY, SECONDARY_DISPLAY_ID)); private final MessageCapturingHandler mHandler = new MessageCapturingHandler(null); @@ -692,6 +696,15 @@ public class AccessibilityWindowManagerTest { assertTrue(windowId >= 0); } + @Test + public void getDisplayList() throws RemoteException { + // Starts tracking window of second display. + startTrackingPerDisplay(SECONDARY_DISPLAY_ID); + + final ArrayList<Integer> displayList = mA11yWindowManager.getDisplayListLocked(); + assertTrue(displayList.equals(mExpectedDisplayList)); + } + private void startTrackingPerDisplay(int displayId) throws RemoteException { ArrayList<WindowInfo> windowInfosForDisplay = new ArrayList<>(); // Adds RemoteAccessibilityConnection into AccessibilityWindowManager, and copy diff --git a/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java index c73be6f100cd..37f5b87ac115 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java @@ -1,17 +1,17 @@ /* - ** Copyright 2017, The Android Open Source Project - ** - ** Licensed under the Apache License, Version 2.0 (the "License"); - ** you may not use this file except in compliance with the License. - ** You may obtain a copy of the License at - ** - ** http://www.apache.org/licenses/LICENSE-2.0 - ** - ** Unless required by applicable law or agreed to in writing, software - ** distributed under the License is distributed on an "AS IS" BASIS, - ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ** See the License for the specific language governing permissions and - ** limitations under the License. + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.android.server.accessibility; @@ -35,13 +35,11 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.util.function.Consumer; - /** - * Tests for GlobalActionPerformer + * Tests for SystemActionPerformer */ -public class GlobalActionPerformerTest { - GlobalActionPerformer mGlobalActionPerformer; +public class SystemActionPerformerTest { + SystemActionPerformer mSystemActionPerformer; @Mock Context mMockContext; @Mock WindowManagerInternal mMockWindowManagerInternal; @@ -55,34 +53,34 @@ public class GlobalActionPerformerTest { when(mMockContext.getSystemService(android.app.Service.STATUS_BAR_SERVICE)) .thenReturn(mMockStatusBarManager); - mGlobalActionPerformer = - new GlobalActionPerformer(mMockContext, mMockWindowManagerInternal, + mSystemActionPerformer = + new SystemActionPerformer(mMockContext, mMockWindowManagerInternal, () -> mMockScreenshotHelper); } @Test public void testNotifications_expandsNotificationPanel() { - mGlobalActionPerformer - .performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS); + mSystemActionPerformer + .performSystemAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS); verify(mMockStatusBarManager).expandNotificationsPanel(); } @Test public void testQuickSettings_requestsQuickSettingsPanel() { - mGlobalActionPerformer - .performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS); + mSystemActionPerformer + .performSystemAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS); verify(mMockStatusBarManager).expandSettingsPanel(); } @Test public void testPowerDialog_requestsFromWindowManager() { - mGlobalActionPerformer.performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG); + mSystemActionPerformer.performSystemAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG); verify(mMockWindowManagerInternal).showGlobalActions(); } @Test public void testScreenshot_requestsFromScreenshotHelper() { - mGlobalActionPerformer.performGlobalAction( + mSystemActionPerformer.performSystemAction( AccessibilityService.GLOBAL_ACTION_TAKE_SCREENSHOT); verify(mMockScreenshotHelper).takeScreenshot( eq(android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN), anyBoolean(), diff --git a/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java index 210de538d0bd..deb6f71c695b 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java @@ -64,7 +64,7 @@ public class UiAutomationManagerTest { @Mock AccessibilityWindowManager mMockA11yWindowManager; @Mock AbstractAccessibilityServiceConnection.SystemSupport mMockSystemSupport; @Mock WindowManagerInternal mMockWindowManagerInternal; - @Mock GlobalActionPerformer mMockGlobalActionPerformer; + @Mock SystemActionPerformer mMockSystemActionPerformer; @Mock IBinder mMockOwner; @Mock IAccessibilityServiceClient mMockAccessibilityServiceClient; @Mock IBinder mMockServiceAsBinder; @@ -174,7 +174,7 @@ public class UiAutomationManagerTest { mUiAutomationManager.registerUiTestAutomationServiceLocked(mMockOwner, mMockAccessibilityServiceClient, mMockContext, mMockServiceInfo, SERVICE_ID, mMessageCapturingHandler, mMockSecurityPolicy, mMockSystemSupport, - mMockWindowManagerInternal, mMockGlobalActionPerformer, + mMockWindowManagerInternal, mMockSystemActionPerformer, mMockA11yWindowManager, flags); } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java index ccf3a908364a..4aeeb0af1bf8 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/BiometricServiceTest.java @@ -39,6 +39,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.hardware.biometrics.Authenticator; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricPrompt; @@ -55,6 +56,9 @@ import android.os.Handler; import android.os.IBinder; import android.security.KeyStore; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; + import com.android.internal.R; import com.android.internal.statusbar.IStatusBarService; @@ -66,9 +70,6 @@ import org.mockito.MockitoAnnotations; import java.util.List; -import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SmallTest; - @SmallTest public class BiometricServiceTest { @@ -82,6 +83,7 @@ public class BiometricServiceTest { private static final String ERROR_CANCELED = "error_canceled"; private static final String ERROR_UNABLE_TO_PROCESS = "error_unable_to_process"; private static final String ERROR_USER_CANCELED = "error_user_canceled"; + private static final String ERROR_LOCKOUT = "error_lockout"; private static final String FINGERPRINT_ACQUIRED_SENSOR_DIRTY = "sensor_dirty"; @@ -179,7 +181,8 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, new MockInjector()); mBiometricService.onStart(); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mReceiver1).onError( eq(BiometricConstants.BIOMETRIC_ERROR_HW_NOT_PRESENT), eq(ERROR_HW_UNAVAILABLE)); @@ -193,7 +196,8 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, new MockInjector()); mBiometricService.onStart(); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mReceiver1).onError( eq(BiometricConstants.BIOMETRIC_ERROR_NO_BIOMETRICS), any()); @@ -208,7 +212,8 @@ public class BiometricServiceTest { mBiometricService = new BiometricService(mContext, new MockInjector()); mBiometricService.onStart(); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mReceiver1).onError( eq(BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE), eq(ERROR_HW_UNAVAILABLE)); @@ -226,7 +231,8 @@ public class BiometricServiceTest { // Disabled in user settings receives onError when(mBiometricService.mSettingObserver.getFaceEnabledForApps(anyInt())).thenReturn(false); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mReceiver1).onError( eq(BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE), eq(ERROR_HW_UNAVAILABLE)); @@ -236,7 +242,8 @@ public class BiometricServiceTest { when(mBiometricService.mSettingObserver.getFaceEnabledForApps(anyInt())).thenReturn(true); when(mBiometricService.mSettingObserver.getFaceAlwaysRequireConfirmation(anyInt())) .thenReturn(true); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mReceiver1, never()).onError(anyInt(), any(String.class)); verify(mBiometricService.mFaceService).prepareForAuthentication( @@ -255,7 +262,8 @@ public class BiometricServiceTest { resetReceiver(); when(mBiometricService.mSettingObserver.getFaceAlwaysRequireConfirmation(anyInt())) .thenReturn(false); - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); verify(mBiometricService.mFaceService).prepareForAuthentication( eq(false) /* requireConfirmation */, @@ -277,7 +285,8 @@ public class BiometricServiceTest { mBiometricService.onStart(); // Start testing the happy path - invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); // Creates a pending auth session with the correct initial states @@ -311,7 +320,7 @@ public class BiometricServiceTest { .startPreparedClient(cookieCaptor.getValue()); // StatusBar showBiometricDialog invoked - verify(mBiometricService.mStatusBarService).showBiometricDialog( + verify(mBiometricService.mStatusBarService).showAuthenticationDialog( eq(mBiometricService.mCurrentAuthSession.mBundle), any(IBiometricServiceReceiverInternal.class), eq(BiometricAuthenticator.TYPE_FINGERPRINT), @@ -333,7 +342,7 @@ public class BiometricServiceTest { // SystemUI sends callback with dismissed reason mBiometricService.mInternalReceiver.onDialogDismissed( - BiometricPrompt.DISMISSED_REASON_CONFIRM_NOT_REQUIRED); + BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED); waitForIdle(); // HAT sent to keystore verify(mBiometricService.mKeyStore).addAuthToken(any(byte[].class)); @@ -344,10 +353,32 @@ public class BiometricServiceTest { } @Test + public void testAuthenticate_noBiometrics_credentialAllowed() throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); + when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, + true /* requireConfirmation */, true /* allowDeviceCredential */); + waitForIdle(); + + assertEquals(BiometricService.STATE_SHOWING_DEVICE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mState); + assertEquals(Authenticator.TYPE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mBundle + .getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + verify(mBiometricService.mStatusBarService).showAuthenticationDialog( + eq(mBiometricService.mCurrentAuthSession.mBundle), + any(IBiometricServiceReceiverInternal.class), + eq(0 /* biometricModality */), + anyBoolean() /* requireConfirmation */, + anyInt() /* userId */, + eq(TEST_PACKAGE_NAME)); + } + + @Test public void testAuthenticate_happyPathWithConfirmation() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - true /* requireConfirmation */); + true /* requireConfirmation */, false /* allowDeviceCredential */); // Test authentication succeeded goes to PENDING_CONFIRMATION and that the HAT is not // sent to KeyStore yet @@ -362,7 +393,7 @@ public class BiometricServiceTest { // SystemUI sends confirm, HAT is sent to keystore and client is notified. mBiometricService.mInternalReceiver.onDialogDismissed( - BiometricPrompt.DISMISSED_REASON_CONFIRMED); + BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED); waitForIdle(); verify(mBiometricService.mKeyStore).addAuthToken(any(byte[].class)); verify(mReceiver1).onAuthenticationSucceeded(); @@ -373,7 +404,7 @@ public class BiometricServiceTest { throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onAuthenticationFailed(); waitForIdle(); @@ -390,7 +421,7 @@ public class BiometricServiceTest { throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onAuthenticationFailed(); waitForIdle(); @@ -406,13 +437,14 @@ public class BiometricServiceTest { public void testErrorCanceled_whenAuthenticating_notifiesSystemUIAndClient() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); // Create a new pending auth session but don't start it yet. HAL contract is that previous // one must get ERROR_CANCELED. Simulate that here by creating the pending auth session, // sending ERROR_CANCELED to the current auth session, and then having the second one // onReadyForAuthentication. - invokeAuthenticate(mBiometricService.mImpl, mReceiver2, false /* requireConfirmation */); + invokeAuthenticate(mBiometricService.mImpl, mReceiver2, false /* requireConfirmation */, + false /* allowDeviceCredential */); waitForIdle(); assertEquals(mBiometricService.mCurrentAuthSession.mState, @@ -430,7 +462,7 @@ public class BiometricServiceTest { verify(mReceiver2, never()).onError(anyInt(), any(String.class)); // SystemUI dialog closed - verify(mBiometricService.mStatusBarService).hideBiometricDialog(); + verify(mBiometricService.mStatusBarService).hideAuthenticationDialog(); // After SystemUI notifies that the animation has completed mBiometricService.mInternalReceiver @@ -446,7 +478,7 @@ public class BiometricServiceTest { public void testErrorHalTimeout_whenAuthenticating_entersPausedState() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onError( getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), @@ -479,7 +511,7 @@ public class BiometricServiceTest { resetStatusBar(); startPendingAuthSession(mBiometricService); waitForIdle(); - verify(mBiometricService.mStatusBarService, never()).showBiometricDialog( + verify(mBiometricService.mStatusBarService, never()).showAuthenticationDialog( any(Bundle.class), any(IBiometricServiceReceiverInternal.class), anyInt(), @@ -492,7 +524,7 @@ public class BiometricServiceTest { public void testErrorFromHal_whenPaused_notifiesSystemUIAndClient() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireCOnfirmation */); + false /* requireCOnfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onError( getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), @@ -509,7 +541,7 @@ public class BiometricServiceTest { eq(BiometricConstants.BIOMETRIC_ERROR_CANCELED), eq(ERROR_CANCELED)); // Dialog is hidden immediately - verify(mBiometricService.mStatusBarService).hideBiometricDialog(); + verify(mBiometricService.mStatusBarService).hideAuthenticationDialog(); // Auth session is over assertNull(mBiometricService.mCurrentAuthSession); } @@ -522,7 +554,7 @@ public class BiometricServiceTest { // session is done. setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onError( getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), @@ -533,9 +565,10 @@ public class BiometricServiceTest { // Sends error to SystemUI and does not notify client yet assertEquals(mBiometricService.mCurrentAuthSession.mState, BiometricService.STATE_ERROR_PENDING_SYSUI); - verify(mBiometricService.mStatusBarService) - .onBiometricError(eq(ERROR_UNABLE_TO_PROCESS)); - verify(mBiometricService.mStatusBarService, never()).hideBiometricDialog(); + verify(mBiometricService.mStatusBarService).onBiometricError( + eq(BiometricConstants.BIOMETRIC_ERROR_UNABLE_TO_PROCESS), + eq(ERROR_UNABLE_TO_PROCESS)); + verify(mBiometricService.mStatusBarService, never()).hideAuthenticationDialog(); verify(mReceiver1, never()).onError(anyInt(), anyString()); // SystemUI animation completed, client is notified, auth session is over @@ -549,11 +582,177 @@ public class BiometricServiceTest { } @Test + public void testErrorFromHal_whilePreparingAuthentication_credentialAllowed() throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, + false /* requireConfirmation */, true /* allowDeviceCredential */); + waitForIdle(); + + mBiometricService.mInternalReceiver.onError( + getCookieForPendingSession(mBiometricService.mPendingAuthSession), + BiometricConstants.BIOMETRIC_ERROR_LOCKOUT, + ERROR_LOCKOUT); + waitForIdle(); + + // Pending auth session becomes current auth session, since device credential should + // be shown now. + assertNull(mBiometricService.mPendingAuthSession); + assertNotNull(mBiometricService.mCurrentAuthSession); + assertEquals(BiometricService.STATE_SHOWING_DEVICE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mState); + assertEquals(Authenticator.TYPE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mBundle.getInt( + BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + verify(mBiometricService.mStatusBarService).showAuthenticationDialog( + eq(mBiometricService.mCurrentAuthSession.mBundle), + any(IBiometricServiceReceiverInternal.class), + eq(0 /* biometricModality */), + anyBoolean() /* requireConfirmation */, + anyInt() /* userId */, + eq(TEST_PACKAGE_NAME)); + } + + @Test + public void testErrorFromHal_whilePreparingAuthentication_credentialNotAllowed() + throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); + invokeAuthenticate(mBiometricService.mImpl, mReceiver1, + false /* requireConfirmation */, false /* allowDeviceCredential */); + waitForIdle(); + + mBiometricService.mInternalReceiver.onError( + getCookieForPendingSession(mBiometricService.mPendingAuthSession), + BiometricConstants.BIOMETRIC_ERROR_LOCKOUT, + ERROR_LOCKOUT); + waitForIdle(); + + // Error is sent to client + assertNull(mBiometricService.mPendingAuthSession); + assertNull(mBiometricService.mCurrentAuthSession); + } + + @Test + public void testCombineAuthenticatorBundle_keyAllowDeviceCredentialAlwaysRemoved() { + Bundle bundle; + int authenticators; + + // In: + // KEY_ALLOW_DEVICE_CREDENTIAL = true + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC | TYPE_CREDENTIAL + // Out: + // KEY_ALLOW_DEVICE_CREDENTIAL = null + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC | TYPE_CREDENTIAL + bundle = new Bundle(); + bundle.putBoolean(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL, true); + authenticators = Authenticator.TYPE_CREDENTIAL | Authenticator.TYPE_BIOMETRIC; + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + Utils.combineAuthenticatorBundles(bundle); + assertNull(bundle.get(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL)); + assertEquals(authenticators, bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + + // In: + // KEY_ALLOW_DEVICE_CREDENTIAL = true + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC + // Out: + // KEY_ALLOW_DEVICE_CREDENTIAL = null + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC | TYPE_CREDENTIAL + bundle = new Bundle(); + bundle.putBoolean(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL, true); + authenticators = Authenticator.TYPE_BIOMETRIC; + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + Utils.combineAuthenticatorBundles(bundle); + assertNull(bundle.get(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL)); + assertEquals(authenticators, bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + + // In: + // KEY_ALLOW_DEVICE_CREDENTIAL = null + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC | TYPE_CREDENTIAL + // Out: + // KEY_ALLOW_DEVICE_CREDENTIAL = null + // KEY_AUTHENTICATORS_ALLOWED = TYPE_BIOMETRIC | TYPE_CREDENTIAL + bundle = new Bundle(); + authenticators = Authenticator.TYPE_BIOMETRIC | Authenticator.TYPE_CREDENTIAL; + bundle.putInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED, authenticators); + Utils.combineAuthenticatorBundles(bundle); + assertNull(bundle.get(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL)); + assertEquals(authenticators, bundle.getInt(BiometricPrompt.KEY_AUTHENTICATORS_ALLOWED)); + } + + @Test + public void testErrorFromHal_whileShowingDeviceCredential_doesntNotifySystemUI() + throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); + invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, + false /* requireConfirmation */, true /* allowDeviceCredential */); + + mBiometricService.mInternalReceiver.onDeviceCredentialPressed(); + waitForIdle(); + + assertEquals(BiometricService.STATE_SHOWING_DEVICE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mState); + verify(mReceiver1, never()).onError(anyInt(), anyString()); + + mBiometricService.mInternalReceiver.onError( + getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), + BiometricConstants.BIOMETRIC_ERROR_CANCELED, + ERROR_CANCELED); + waitForIdle(); + + assertEquals(BiometricService.STATE_SHOWING_DEVICE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mState); + verify(mReceiver1, never()).onError(anyInt(), anyString()); + } + + @Test + public void testLockout_whileAuthenticating_credentialAllowed() throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); + invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, + false /* requireConfirmation */, true /* allowDeviceCredential */); + + assertEquals(BiometricService.STATE_AUTH_STARTED, + mBiometricService.mCurrentAuthSession.mState); + + mBiometricService.mInternalReceiver.onError( + getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), + BiometricConstants.BIOMETRIC_ERROR_LOCKOUT, + ERROR_LOCKOUT); + waitForIdle(); + + assertEquals(BiometricService.STATE_SHOWING_DEVICE_CREDENTIAL, + mBiometricService.mCurrentAuthSession.mState); + verify(mBiometricService.mStatusBarService).onBiometricError( + eq(BiometricConstants.BIOMETRIC_ERROR_LOCKOUT), + eq(ERROR_LOCKOUT)); + } + + @Test + public void testLockout_whenAuthenticating_credentialNotAllowed() throws Exception { + setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); + invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, + false /* requireConfirmation */, false /* allowDeviceCredential */); + + assertEquals(BiometricService.STATE_AUTH_STARTED, + mBiometricService.mCurrentAuthSession.mState); + + mBiometricService.mInternalReceiver.onError( + getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), + BiometricConstants.BIOMETRIC_ERROR_UNABLE_TO_PROCESS, + ERROR_UNABLE_TO_PROCESS); + waitForIdle(); + + assertEquals(BiometricService.STATE_ERROR_PENDING_SYSUI, + mBiometricService.mCurrentAuthSession.mState); + verify(mBiometricService.mStatusBarService).onBiometricError( + eq(BiometricConstants.BIOMETRIC_ERROR_UNABLE_TO_PROCESS), + eq(ERROR_UNABLE_TO_PROCESS)); + } + + @Test public void testDismissedReasonUserCancel_whileAuthenticating_cancelsHalAuthentication() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver .onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL); @@ -575,7 +774,7 @@ public class BiometricServiceTest { public void testDismissedReasonNegative_whilePaused_doesntInvokeHalCancel() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onError( getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), @@ -598,7 +797,7 @@ public class BiometricServiceTest { public void testDismissedReasonUserCancel_whilePaused_doesntInvokeHalCancel() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onError( getCookieForCurrentSession(mBiometricService.mCurrentAuthSession), @@ -621,7 +820,7 @@ public class BiometricServiceTest { public void testDismissedReasonUserCancel_whenPendingConfirmation() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FACE); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - true /* requireConfirmation */); + true /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onAuthenticationSucceeded( true /* requireConfirmation */, @@ -648,7 +847,7 @@ public class BiometricServiceTest { public void testAcquire_whenAuthenticating_sentToSystemUI() throws Exception { setupAuthForOnly(BiometricAuthenticator.TYPE_FINGERPRINT); invokeAuthenticateAndStart(mBiometricService.mImpl, mReceiver1, - false /* requireConfirmation */); + false /* requireConfirmation */, false /* allowDeviceCredential */); mBiometricService.mInternalReceiver.onAcquired( FingerprintManager.FINGERPRINT_ACQUIRED_IMAGER_DIRTY, @@ -698,9 +897,10 @@ public class BiometricServiceTest { } private void invokeAuthenticateAndStart(IBiometricService.Stub service, - IBiometricServiceReceiver receiver, boolean requireConfirmation) throws Exception { + IBiometricServiceReceiver receiver, boolean requireConfirmation, + boolean allowDeviceCredential) throws Exception { // Request auth, creates a pending session - invokeAuthenticate(service, receiver, requireConfirmation); + invokeAuthenticate(service, receiver, requireConfirmation, allowDeviceCredential); waitForIdle(); startPendingAuthSession(mBiometricService); @@ -720,20 +920,25 @@ public class BiometricServiceTest { } private static void invokeAuthenticate(IBiometricService.Stub service, - IBiometricServiceReceiver receiver, boolean requireConfirmation) throws Exception { + IBiometricServiceReceiver receiver, boolean requireConfirmation, + boolean allowDeviceCredential) throws Exception { service.authenticate( new Binder() /* token */, 0 /* sessionId */, 0 /* userId */, receiver, TEST_PACKAGE_NAME /* packageName */, - createTestBiometricPromptBundle(requireConfirmation), - null /* IBiometricConfirmDeviceCredentialCallback */); + createTestBiometricPromptBundle(requireConfirmation, allowDeviceCredential)); } - private static Bundle createTestBiometricPromptBundle(boolean requireConfirmation) { + private static Bundle createTestBiometricPromptBundle(boolean requireConfirmation, + boolean allowDeviceCredential) { final Bundle bundle = new Bundle(); bundle.putBoolean(BiometricPrompt.KEY_REQUIRE_CONFIRMATION, requireConfirmation); + + if (allowDeviceCredential) { + bundle.putBoolean(BiometricPrompt.KEY_ALLOW_DEVICE_CREDENTIAL, true); + } return bundle; } @@ -742,6 +947,11 @@ public class BiometricServiceTest { return session.mModalitiesMatched.values().iterator().next(); } + private static int getCookieForPendingSession(BiometricService.AuthSession session) { + assertEquals(session.mModalitiesWaiting.values().size(), 1); + return session.mModalitiesWaiting.values().iterator().next(); + } + private static void waitForIdle() { InstrumentationRegistry.getInstrumentation().waitForIdleSync(); } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index a25e40f8cc13..9a1fd9cf0e12 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -2650,6 +2650,21 @@ public class DevicePolicyManagerTest extends DpmTestBase { verifyStayOnWhilePluggedCleared(false); } + public void testIsActiveSupervisionApp() throws Exception { + when(mServiceContext.resources + .getString(R.string.config_defaultSupervisionProfileOwnerComponent)) + .thenReturn(admin1.flattenToString()); + + final int PROFILE_USER = 15; + final int PROFILE_ADMIN = UserHandle.getUid(PROFILE_USER, 19436); + addManagedProfile(admin1, PROFILE_ADMIN, admin1); + mContext.binder.callingUid = PROFILE_ADMIN; + + final DevicePolicyManagerInternal dpmi = + LocalServices.getService(DevicePolicyManagerInternal.class); + assertTrue(dpmi.isActiveSupervisionApp(PROFILE_ADMIN)); + } + // Test if lock timeout on managed profile is handled correctly depending on whether profile // uses separate challenge. public void testSetMaximumTimeToLockProfile() throws Exception { diff --git a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java index 0d5a7d6c1952..acf2d0e700d4 100644 --- a/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java +++ b/services/tests/servicestests/src/com/android/server/display/whitebalance/AmbientLuxTest.java @@ -78,6 +78,8 @@ public final class AmbientLuxTest { @Mock private TypedArray mBiases; @Mock private TypedArray mHighLightBrightnesses; @Mock private TypedArray mHighLightBiases; + @Mock private TypedArray mAmbientColorTemperatures; + @Mock private TypedArray mDisplayColorTemperatures; @Before public void setUp() throws Exception { @@ -105,10 +107,10 @@ public final class AmbientLuxTest { HIGH_LIGHT_AMBIENT_COLOR_TEMPERATURE); when(mResourcesSpy.obtainTypedArray( R.array.config_displayWhiteBalanceAmbientColorTemperatures)) - .thenReturn(createTypedArray()); + .thenReturn(mAmbientColorTemperatures); when(mResourcesSpy.obtainTypedArray( R.array.config_displayWhiteBalanceDisplayColorTemperatures)) - .thenReturn(createTypedArray()); + .thenReturn(mDisplayColorTemperatures); when(mResourcesSpy.obtainTypedArray( R.array.config_displayWhiteBalanceLowLightAmbientBrightnesses)) @@ -388,6 +390,16 @@ public final class AmbientLuxTest { assertEquals(controller.mPendingAmbientColorTemperature, ambientColorTemperature, 0.001); } + @Test + public void testWhiteBalance_updateWithEmptyFilter() throws Exception { + setAmbientColorTemperatures(5300.0f, 6000.0f, 7000.0f, 8000.0f); + setDisplayColorTemperatures(6300.0f, 6400.0f, 6850.0f, 7450.0f); + DisplayWhiteBalanceController controller = + DisplayWhiteBalanceFactory.create(mHandler, mSensorManagerMock, mResourcesSpy); + controller.updateAmbientColorTemperature(); + assertEquals(-1.0f, controller.mPendingAmbientColorTemperature, 0); + } + void mockThrottler() { when(mResourcesSpy.getInteger( R.integer.config_displayWhiteBalanceDecreaseDebounce)).thenReturn(0); @@ -455,6 +467,14 @@ public final class AmbientLuxTest { setFloatArrayResource(mHighLightBiases, vals); } + private void setAmbientColorTemperatures(float... vals) { + setFloatArrayResource(mAmbientColorTemperatures, vals); + } + + private void setDisplayColorTemperatures(float... vals) { + setFloatArrayResource(mDisplayColorTemperatures, vals); + } + private void setFloatArrayResource(TypedArray array, float[] vals) { when(array.length()).thenReturn(vals.length); for (int i = 0; i < vals.length; i++) { diff --git a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java new file mode 100644 index 000000000000..1fcd0ef07410 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java @@ -0,0 +1,130 @@ +/* + * 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.integrity.engine; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import com.android.server.integrity.model.AppInstallMetadata; +import com.android.server.integrity.model.AtomicFormula; +import com.android.server.integrity.model.OpenFormula; +import com.android.server.integrity.model.Rule; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +@RunWith(JUnit4.class) +public class RuleEvaluatorTest { + + private static final String PACKAGE_NAME_1 = "com.test.app"; + private static final String PACKAGE_NAME_2 = "com.test.app2"; + private static final String APP_CERTIFICATE = "test_cert"; + private static final AppInstallMetadata APP_INSTALL_METADATA = + new AppInstallMetadata.Builder() + .setPackageName(PACKAGE_NAME_1) + .setAppCertificate(APP_CERTIFICATE) + .build(); + + @Test + public void testMatchRules_emptyRules() { + List<Rule> rules = new ArrayList<>(); + + Rule matchedRule = RuleEvaluator.evaluateRules(rules, APP_INSTALL_METADATA); + + assertEquals(Rule.EMPTY, matchedRule); + } + + @Test + public void testMatchRules_emptyMatch() { + Rule rule1 = new Rule( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_2), Rule.Effect.DENY); + + Rule matchedRule = RuleEvaluator.evaluateRules(Collections.singletonList(rule1), + APP_INSTALL_METADATA); + + assertEquals(Rule.EMPTY, matchedRule); + } + + + @Test + public void testMatchRules_oneMatch() { + Rule rule1 = new Rule( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_1), Rule.Effect.DENY); + Rule rule2 = new Rule( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_2), Rule.Effect.DENY); + + Rule matchedRule = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), + APP_INSTALL_METADATA); + + assertEquals(rule1, matchedRule); + } + + @Test + public void testMatchRules_multipleMatches() { + Rule rule1 = new Rule( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_1), Rule.Effect.DENY); + OpenFormula openFormula2 = new OpenFormula(OpenFormula.Connector.AND, Arrays.asList( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_1), + new AtomicFormula(AtomicFormula.Key.APP_CERTIFICATE, + AtomicFormula.Operator.EQ, + APP_CERTIFICATE))); + Rule rule2 = new Rule( + openFormula2, Rule.Effect.DENY); + + Rule matchedRule = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), + APP_INSTALL_METADATA); + + assertNotEquals(Rule.EMPTY, matchedRule); + } + + @Test + public void testMatchRules_ruleWithNot() { + OpenFormula openFormula = new OpenFormula(OpenFormula.Connector.NOT, + Collections.singletonList( + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME_2))); + Rule rule = new Rule(openFormula, Rule.Effect.DENY); + + Rule matchedRule = RuleEvaluator.evaluateRules(Collections.singletonList(rule), + APP_INSTALL_METADATA); + + assertEquals(rule, matchedRule); + } + + @Test + public void testMatchRules_ruleWithIntegerOperators() { + Rule rule1 = new Rule( + new AtomicFormula(AtomicFormula.Key.VERSION_CODE, AtomicFormula.Operator.GT, + 1), Rule.Effect.DENY); + + Rule matchedRule = RuleEvaluator.evaluateRules(Collections.singletonList(rule1), + APP_INSTALL_METADATA); + + assertEquals(rule1, matchedRule); + } +} diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/AtomicFormulaTest.java b/services/tests/servicestests/src/com/android/server/integrity/model/AtomicFormulaTest.java new file mode 100644 index 000000000000..1cb2fb3517d3 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/integrity/model/AtomicFormulaTest.java @@ -0,0 +1,100 @@ +/* + * 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.integrity.model; + +import static com.android.server.testutils.TestUtils.assertExpectException; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +public class AtomicFormulaTest { + + @Test + public void testValidAtomicFormula_stringValue() { + AtomicFormula atomicFormula = new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, + AtomicFormula.Operator.EQ, "com.test.app"); + + assertEquals(AtomicFormula.Key.PACKAGE_NAME, atomicFormula.getKey()); + assertEquals(AtomicFormula.Operator.EQ, atomicFormula.getOperator()); + assertEquals("com.test.app", atomicFormula.getStringValue()); + } + + @Test + public void testValidAtomicFormula_intValue() { + AtomicFormula atomicFormula = new AtomicFormula(AtomicFormula.Key.VERSION_CODE, + AtomicFormula.Operator.LE, 1); + + assertEquals(AtomicFormula.Key.VERSION_CODE, atomicFormula.getKey()); + assertEquals(AtomicFormula.Operator.LE, atomicFormula.getOperator()); + assertEquals(1, atomicFormula.getIntValue().intValue()); + } + + @Test + public void testValidAtomicFormula_boolValue() { + AtomicFormula atomicFormula = new AtomicFormula(AtomicFormula.Key.PRE_INSTALLED, + AtomicFormula.Operator.EQ, true); + + assertEquals(AtomicFormula.Key.PRE_INSTALLED, atomicFormula.getKey()); + assertEquals(AtomicFormula.Operator.EQ, atomicFormula.getOperator()); + assertEquals(true, atomicFormula.getBoolValue()); + } + + @Test + public void testInvalidAtomicFormula_stringValue() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Key %s cannot have string value", AtomicFormula.Key.VERSION_CODE), + () -> new AtomicFormula(AtomicFormula.Key.VERSION_CODE, AtomicFormula.Operator.EQ, + "test-value")); + } + + @Test + public void testInvalidAtomicFormula_intValue() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Key %s cannot have integer value", AtomicFormula.Key.PACKAGE_NAME), + () -> new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + 1)); + } + + @Test + public void testInvalidAtomicFormula_boolValue() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Key %s cannot have boolean value", AtomicFormula.Key.PACKAGE_NAME), + () -> new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + true)); + } + + @Test + public void testValidateOperator_invalidKeyOperatorPair() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Invalid operator %s used for key %s", + AtomicFormula.Operator.LE, AtomicFormula.Key.PACKAGE_NAME), + () -> new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.LE, + "test-value")); + } +} diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/OpenFormulaTest.java b/services/tests/servicestests/src/com/android/server/integrity/model/OpenFormulaTest.java new file mode 100644 index 000000000000..2133a7d3550b --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/integrity/model/OpenFormulaTest.java @@ -0,0 +1,67 @@ +/* + * 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.integrity.model; + +import static com.android.server.testutils.TestUtils.assertExpectException; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import java.util.Arrays; +import java.util.Collections; + +@RunWith(JUnit4.class) +public class OpenFormulaTest { + + private static final AtomicFormula ATOMIC_FORMULA_1 = new AtomicFormula( + AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, "test1"); + private static final AtomicFormula ATOMIC_FORMULA_2 = new AtomicFormula( + AtomicFormula.Key.VERSION_CODE, AtomicFormula.Operator.EQ, 1); + + @Test + public void testValidOpenFormula() { + OpenFormula openFormula = new OpenFormula(OpenFormula.Connector.AND, + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + + assertEquals(OpenFormula.Connector.AND, openFormula.getConnector()); + assertEquals(Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2), openFormula.getFormulas()); + } + + @Test + public void testValidateAuxiliaryFormula_binaryConnectors() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Connector %s must have at least 2 formulas", + OpenFormula.Connector.AND), + () -> new OpenFormula(OpenFormula.Connector.AND, + Collections.singletonList(ATOMIC_FORMULA_1))); + } + + @Test + public void testValidateAuxiliaryFormula_unaryConnectors() { + assertExpectException( + IllegalArgumentException.class, + /* expectedExceptionMessageRegex */ + String.format("Connector %s must have 1 formula only", OpenFormula.Connector.NOT), + () -> new OpenFormula(OpenFormula.Connector.NOT, + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + } +} diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java b/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java index 4321c21f68b2..d1fa0f97b071 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java @@ -25,12 +25,20 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.util.Arrays; + @RunWith(JUnit4.class) public class RuleTest { private static final Rule.Effect DENY_EFFECT = Rule.Effect.DENY; - private static final Rule.Formula SIMPLE_FORMULA = - new Rule.AtomicFormula(Rule.Key.PACKAGE_NAME, Rule.Operator.EQ, "com.test.app"); + private static final String PACKAGE_NAME = "com.test.app"; + private static final String APP_CERTIFICATE = "test_cert"; + private static final Formula PACKAGE_NAME_ATOMIC_FORMULA = + new AtomicFormula(AtomicFormula.Key.PACKAGE_NAME, AtomicFormula.Operator.EQ, + PACKAGE_NAME); + private static final Formula APP_CERTIFICATE_ATOMIC_FORMULA = + new AtomicFormula(AtomicFormula.Key.APP_CERTIFICATE, AtomicFormula.Operator.EQ, + APP_CERTIFICATE); @Test public void testEmptyRule() { @@ -42,9 +50,9 @@ public class RuleTest { @Test public void testValidRule() { - Rule validRule = new Rule(SIMPLE_FORMULA, DENY_EFFECT); + Rule validRule = new Rule(PACKAGE_NAME_ATOMIC_FORMULA, DENY_EFFECT); - assertEquals(SIMPLE_FORMULA, validRule.getFormula()); + assertEquals(PACKAGE_NAME_ATOMIC_FORMULA, validRule.getFormula()); assertEquals(DENY_EFFECT, validRule.getEffect()); } @@ -53,7 +61,7 @@ public class RuleTest { assertExpectException( NullPointerException.class, /* expectedExceptionMessageRegex */ null, - () -> new Rule(SIMPLE_FORMULA, null)); + () -> new Rule(PACKAGE_NAME_ATOMIC_FORMULA, null)); } @Test @@ -63,4 +71,16 @@ public class RuleTest { /* expectedExceptionMessageRegex */ null, () -> new Rule(null, DENY_EFFECT)); } + + @Test + public void testToString() { + OpenFormula openFormula = new OpenFormula(OpenFormula.Connector.AND, + Arrays.asList(PACKAGE_NAME_ATOMIC_FORMULA, APP_CERTIFICATE_ATOMIC_FORMULA)); + Rule rule = new Rule(openFormula, Rule.Effect.DENY); + + String toString = rule.toString(); + + assertEquals(String.format("Rule: PACKAGE_NAME EQ %s AND APP_CERTIFICATE EQ %s, DENY", + PACKAGE_NAME, APP_CERTIFICATE), toString); + } } diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java index 806c71a7a9b8..6d5b994a63bb 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java @@ -132,6 +132,7 @@ public class UserManagerServiceUserInfoTest { user.profileBadge = 2; user.partial = true; user.guestToRemove = true; + user.preCreated = true; return user; } @@ -147,5 +148,6 @@ public class UserManagerServiceUserInfoTest { assertEquals("profile badge not preseved", one.profileBadge, two.profileBadge); assertEquals("partial not preseved", one.partial, two.partial); assertEquals("guestToRemove not preseved", one.guestToRemove, two.guestToRemove); + assertEquals("preCreated not preseved", one.preCreated, two.preCreated); } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java index f652c5afd203..721641a7a8c8 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java @@ -15,6 +15,8 @@ */ package com.android.server.notification; +import static com.android.server.notification.GroupHelper.AUTOGROUP_KEY; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; @@ -155,6 +157,196 @@ public class GroupHelperTest extends UiServiceTestCase { } @Test + public void testAutoGroupCount_addingNoGroupSBN() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + verify(mCallback, times(AUTOGROUP_AT_COUNT + 1)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), AUTOGROUP_AT_COUNT + 1); + } + + @Test + public void testAutoGroupCount_UpdateNotification() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + notifications.get(0).getNotification().flags &= ~Notification.FLAG_ONGOING_EVENT; + + mGroupHelper.onNotificationUpdated(notifications.get(0), true); + + verify(mCallback, times(AUTOGROUP_AT_COUNT + 2)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), AUTOGROUP_AT_COUNT); + } + + @Test + public void testAutoGroupCount_UpdateNotificationAfterChanges() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + notifications.get(0).getNotification().flags &= ~Notification.FLAG_ONGOING_EVENT; + + mGroupHelper.onNotificationUpdated(notifications.get(0), true); + + notifications.get(0).getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + + mGroupHelper.onNotificationUpdated(notifications.get(0), true); + + verify(mCallback, times(AUTOGROUP_AT_COUNT + 3)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), AUTOGROUP_AT_COUNT + 1); + } + + @Test + public void testAutoGroupCount_RemoveNotification() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + mGroupHelper.onNotificationRemoved(notifications.get(0)); + + verify(mCallback, times(AUTOGROUP_AT_COUNT + 2)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), AUTOGROUP_AT_COUNT); + } + + + @Test + public void testAutoGroupCount_UpdateToNoneOngoingNotification() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + notifications.get(0).getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + mGroupHelper.onNotificationUpdated(notifications.get(0), true); + + verify(mCallback, times(1)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), 1); + } + + @Test + public void testAutoGroupCount_AddOneOngoingNotification() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + StatusBarNotification sbn = notifications.get(0); + sbn.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + + + for (StatusBarNotification current: notifications) { + mGroupHelper.onNotificationPosted(current, true); + } + + verify(mCallback, times(1)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount( + userId, pkg, AUTOGROUP_KEY), 1); + } + + @Test + public void testAutoGroupCount_UpdateNoneOngoing() { + final String pkg = "package"; + ArrayList<StatusBarNotification> notifications = new ArrayList<>(); + for (int i = 0; i < AUTOGROUP_AT_COUNT + 1; i++) { + notifications.add(getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM)); + } + + for (StatusBarNotification sbn: notifications) { + sbn.setOverrideGroupKey(AUTOGROUP_KEY); + } + + for (StatusBarNotification sbn: notifications) { + mGroupHelper.onNotificationPosted(sbn, true); + } + + verify(mCallback, times(0)) + .updateAutogroupSummary(anyString(), eq(true)); + + int userId = UserHandle.SYSTEM.getIdentifier(); + assertEquals(mGroupHelper.getOngoingGroupCount(userId, pkg, AUTOGROUP_KEY), 0); + } + + + @Test public void testDropToZeroRemoveGroup() throws Exception { final String pkg = "package"; List<StatusBarNotification> posted = new ArrayList<>(); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index e80c6291b42a..4ea2fc0d398e 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -44,6 +44,7 @@ import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.os.Build.VERSION_CODES.O_MR1; import static android.os.Build.VERSION_CODES.P; +import static android.os.UserHandle.USER_SYSTEM; import static android.service.notification.Adjustment.KEY_IMPORTANCE; import static android.service.notification.Adjustment.KEY_USER_SENTIMENT; import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE; @@ -129,6 +130,7 @@ import android.testing.TestableContext; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; import android.testing.TestablePermissions; +import android.testing.TestableResources; import android.text.Html; import android.util.ArrayMap; import android.util.ArraySet; @@ -1180,6 +1182,36 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } @Test + public void testAutobundledSummary_notificationAdded() { + NotificationRecord summary = + generateNotificationRecord(mTestNotificationChannel, 0, "pkg", true); + summary.getNotification().flags |= Notification.FLAG_AUTOGROUP_SUMMARY; + mService.addNotification(summary); + mService.mSummaryByGroupKey.put("pkg", summary); + mService.mAutobundledSummaries.put(0, new ArrayMap<>()); + mService.mAutobundledSummaries.get(0).put("pkg", summary.getKey()); + mService.updateAutobundledSummaryFlags(0, "pkg", true); + + assertTrue(summary.sbn.isOngoing()); + } + + @Test + public void testAutobundledSummary_notificationRemoved() { + NotificationRecord summary = + generateNotificationRecord(mTestNotificationChannel, 0, "pkg", true); + summary.getNotification().flags |= Notification.FLAG_AUTOGROUP_SUMMARY; + summary.getNotification().flags |= Notification.FLAG_ONGOING_EVENT; + mService.addNotification(summary); + mService.mAutobundledSummaries.put(0, new ArrayMap<>()); + mService.mAutobundledSummaries.get(0).put("pkg", summary.getKey()); + mService.mSummaryByGroupKey.put("pkg", summary); + + mService.updateAutobundledSummaryFlags(0, "pkg", false); + + assertFalse(summary.sbn.isOngoing()); + } + + @Test public void testCancelAllNotifications_IgnoreForegroundService() throws Exception { final StatusBarNotification sbn = generateNotificationRecord(null).sbn; sbn.getNotification().flags |= FLAG_FOREGROUND_SERVICE; @@ -3278,7 +3310,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Test public void testRestore() throws Exception { int systemChecks = mService.countSystemChecks; - mBinderService.applyRestore(null, UserHandle.USER_SYSTEM); + mBinderService.applyRestore(null, USER_SYSTEM); assertEquals(1, mService.countSystemChecks - systemChecks); } @@ -3347,7 +3379,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { reset(mUgmInternal); when(mUgmInternal.newUriPermissionOwner(any())).thenReturn(new Binder()); mService.updateUriPermissions(recordA, null, mContext.getPackageName(), - UserHandle.USER_SYSTEM); + USER_SYSTEM); verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(), eq(message1.getDataUri()), anyInt(), anyInt(), anyInt()); verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(), @@ -3363,21 +3395,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Update means we drop access to first reset(mUgmInternal); mService.updateUriPermissions(recordB, recordA, mContext.getPackageName(), - UserHandle.USER_SYSTEM); + USER_SYSTEM); verify(mUgmInternal, times(1)).revokeUriPermissionFromOwner(any(), eq(message1.getDataUri()), anyInt(), anyInt()); // Update back means we grant access to first again reset(mUgm); mService.updateUriPermissions(recordA, recordB, mContext.getPackageName(), - UserHandle.USER_SYSTEM); + USER_SYSTEM); verify(mUgm, times(1)).grantUriPermissionFromOwner(any(), anyInt(), any(), eq(message1.getDataUri()), anyInt(), anyInt(), anyInt()); // And update to empty means we drop everything reset(mUgmInternal); mService.updateUriPermissions(null, recordB, mContext.getPackageName(), - UserHandle.USER_SYSTEM); + USER_SYSTEM); verify(mUgmInternal, times(1)).revokeUriPermissionFromOwner(any(), eq(null), anyInt(), anyInt()); } @@ -4077,7 +4109,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void testIsCallerInstantApp_userAllNotification() throws Exception { ApplicationInfo info = new ApplicationInfo(); info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT; - when(mPackageManager.getApplicationInfo(anyString(), anyInt(), eq(UserHandle.USER_SYSTEM))) + when(mPackageManager.getApplicationInfo(anyString(), anyInt(), eq(USER_SYSTEM))) .thenReturn(info); when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[]{"any"}); @@ -5666,4 +5698,33 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG); assertEquals(1, notifsAfter.length); } + + @Test + public void testLoadDefaultApprovedServices_emptyResources() { + TestableResources tr = mContext.getOrCreateTestableResources(); + tr.addOverride(com.android.internal.R.string.config_defaultListenerAccessPackages, ""); + tr.addOverride(com.android.internal.R.string.config_defaultDndAccessPackages, ""); + tr.addOverride(com.android.internal.R.string.config_defaultAssistantAccessComponent, ""); + setDefaultAssistantInDeviceConfig(""); + + mService.loadDefaultApprovedServices(USER_SYSTEM); + + verify(mListeners, never()).addDefaultComponentOrPackage(anyString()); + verify(mConditionProviders, never()).addDefaultComponentOrPackage(anyString()); + verify(mAssistants, never()).addDefaultComponentOrPackage(anyString()); + } + + @Test + public void testLoadDefaultApprovedServices_dnd() { + TestableResources tr = mContext.getOrCreateTestableResources(); + tr.addOverride(com.android.internal.R.string.config_defaultDndAccessPackages, "test"); + when(mListeners.queryPackageForServices(anyString(), anyInt(), anyInt())) + .thenReturn(new ArraySet<>()); + + mService.loadDefaultApprovedServices(USER_SYSTEM); + + verify(mConditionProviders, times(1)).addDefaultComponentOrPackage("test"); + } + + // TODO: add tests for the rest of the non-empty cases } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java index 69cc9b256b83..fff32215493b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java @@ -317,24 +317,24 @@ public class ActivityDisplayTests extends ActivityTestsBase { doAnswer(invocation -> { display.positionChildAtTop(stack3, false); return true; - }).when(mSupervisor).removeTaskByIdLocked(eq(task4.taskId), anyBoolean(), anyBoolean(), + }).when(mSupervisor).removeTaskByIdLocked(eq(task4.mTaskId), anyBoolean(), anyBoolean(), any()); // Removing stacks from the display while removing stacks. doAnswer(invocation -> { display.removeChild(stack2); return true; - }).when(mSupervisor).removeTaskByIdLocked(eq(task2.taskId), anyBoolean(), anyBoolean(), + }).when(mSupervisor).removeTaskByIdLocked(eq(task2.mTaskId), anyBoolean(), anyBoolean(), any()); runnable.run(); - verify(mSupervisor).removeTaskByIdLocked(eq(task4.taskId), anyBoolean(), anyBoolean(), + verify(mSupervisor).removeTaskByIdLocked(eq(task4.mTaskId), anyBoolean(), anyBoolean(), any()); - verify(mSupervisor).removeTaskByIdLocked(eq(task3.taskId), anyBoolean(), anyBoolean(), + verify(mSupervisor).removeTaskByIdLocked(eq(task3.mTaskId), anyBoolean(), anyBoolean(), any()); - verify(mSupervisor).removeTaskByIdLocked(eq(task2.taskId), anyBoolean(), anyBoolean(), + verify(mSupervisor).removeTaskByIdLocked(eq(task2.mTaskId), anyBoolean(), anyBoolean(), any()); - verify(mSupervisor).removeTaskByIdLocked(eq(task1.taskId), anyBoolean(), anyBoolean(), + verify(mSupervisor).removeTaskByIdLocked(eq(task1.mTaskId), anyBoolean(), anyBoolean(), any()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java index 50203dfc043a..bf1508a34872 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java @@ -287,22 +287,6 @@ public class ActivityRecordTests extends ActivityTestsBase { } @Test - public void testNotifiesSeqIncrementToAppToken() { - final Configuration appWindowTokenRequestedOrientation = mock(Configuration.class); - mActivity.mAppWindowToken = mock(AppWindowToken.class); - doReturn(appWindowTokenRequestedOrientation).when(mActivity.mAppWindowToken) - .getRequestedOverrideConfiguration(); - - final Configuration newConfig = new Configuration(); - newConfig.orientation = ORIENTATION_PORTRAIT; - - final int prevSeq = mActivity.getMergedOverrideConfiguration().seq; - mActivity.onRequestedOverrideConfigurationChanged(newConfig); - assertEquals(prevSeq + 1, appWindowTokenRequestedOrientation.seq); - verify(mActivity.mAppWindowToken).onMergedOverrideConfigurationChanged(); - } - - @Test public void testSetsRelaunchReason_NotDragResizing() { mActivity.setState(ActivityStack.ActivityState.RESUMED, "Testing"); @@ -519,7 +503,7 @@ public class ActivityRecordTests extends ActivityTestsBase { anyInt() /* height */, any() /* displayCutout */, any() /* outInsets */); doReturn(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) - .when(mActivity.mAppWindowToken).getOrientationIgnoreVisibility(); + .when(mActivity).getRequestedOrientation(); mActivity.info.resizeMode = RESIZE_MODE_UNRESIZEABLE; mActivity.info.minAspectRatio = mActivity.info.maxAspectRatio = 1; ensureActivityConfiguration(); @@ -571,7 +555,7 @@ public class ActivityRecordTests extends ActivityTestsBase { // Move the non-resizable activity to the new display. mStack.reparent(newDisplay, true /* onTop */, false /* displayRemoved */); - assertEquals(originalBounds, mActivity.getBounds()); + assertEquals(originalBounds, mActivity.getWindowConfiguration().getBounds()); assertEquals(originalDpi, mActivity.getConfiguration().densityDpi); assertTrue(mActivity.inSizeCompatMode()); } @@ -579,7 +563,7 @@ public class ActivityRecordTests extends ActivityTestsBase { @Test public void testSizeCompatMode_FixedScreenBoundsWhenDisplaySizeChanged() { setupDisplayContentForCompatDisplayInsets(); - when(mActivity.mAppWindowToken.getOrientationIgnoreVisibility()).thenReturn( + when(mActivity.getRequestedOrientation()).thenReturn( ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); mTask.getWindowConfiguration().setAppBounds(mStack.getDisplay().getBounds()); mTask.getConfiguration().orientation = ORIENTATION_PORTRAIT; @@ -592,7 +576,7 @@ public class ActivityRecordTests extends ActivityTestsBase { setupDisplayAndParentSize(1000, 2000); ensureActivityConfiguration(); - assertEquals(originalBounds, mActivity.getBounds()); + assertEquals(originalBounds, mActivity.getWindowConfiguration().getBounds()); assertTrue(mActivity.inSizeCompatMode()); } @@ -627,7 +611,7 @@ public class ActivityRecordTests extends ActivityTestsBase { mActivity.visible = false; mActivity.app.setReportedProcState(ActivityManager.PROCESS_STATE_CACHED_ACTIVITY); // Make the parent bounds to be different so the activity is in size compatibility mode. - mTask.getWindowConfiguration().setAppBounds(new Rect(0, 0, 600, 1200)); + setupDisplayAndParentSize(600, 1200); // Simulate the display changes orientation. doReturn(ActivityInfo.CONFIG_SCREEN_SIZE | CONFIG_ORIENTATION diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java index 9e1df913b22c..1eeca91e29d0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStackSupervisorTests.java @@ -127,7 +127,7 @@ public class ActivityStackSupervisorTests extends ActivityTestsBase { mSupervisor.handleNonResizableTaskIfNeeded(task, newDisplay.getWindowingMode(), newDisplay.mDisplayId, stack); // The top activity is unresizable, so it should notify the activity is forced resizing. - verify(taskChangeNotifier).notifyActivityForcedResizable(eq(task.taskId), + verify(taskChangeNotifier).notifyActivityForcedResizable(eq(task.mTaskId), eq(FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY), eq(unresizableActivity.packageName)); reset(taskChangeNotifier); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java index 5e4c96582d02..11aac3cf046b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStartControllerTests.java @@ -73,7 +73,9 @@ public class ActivityStartControllerTests extends ActivityTestsBase { final Random random = new Random(); final ActivityRecord activity = new ActivityBuilder(mService).build(); - final ActivityRecord source = new ActivityBuilder(mService).build(); + final ActivityRecord source = new ActivityBuilder(mService) + .setCreateTask(true) + .build(); final int startFlags = random.nextInt(); final ActivityStack stack = mService.mRootActivityContainer.getDefaultDisplay().createStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java index 78f3f7953d8d..8a9423a2f72e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java @@ -57,6 +57,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import android.app.ActivityOptions; @@ -368,6 +369,7 @@ public class ActivityStarterTests extends ActivityTestsBase { doReturn(false).when(mockPackageManager).isPermissionsReviewRequired(any(), anyInt()); doNothing().when(mockPackageManager).grantImplicitAccess( anyInt(), any(), anyInt(), anyInt()); + doNothing().when(mockPackageManager).notifyPackageUse(anyString(), anyInt()); final Intent intent = new Intent(); intent.addFlags(launchFlags); diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java index f4d1cbfa5387..77fbdcf8ff52 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java @@ -27,6 +27,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat import static com.android.dx.mockito.inline.extended.ExtendedMockito.any; import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyBoolean; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; @@ -38,8 +39,10 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.res.Configuration; +import android.os.Build; import android.os.UserHandle; import android.service.voice.IVoiceInteractionSession; +import android.util.Pair; import android.view.DisplayInfo; import com.android.server.AttributeCache; @@ -212,6 +215,23 @@ class ActivityTestsBase extends SystemServiceTestsBase { return this; } + static Pair<Intent, ActivityInfo> createIntentAndActivityInfo() { + // TODO: Look into consolidating with dup. code in build() method below. + final int id = sCurrentActivityId++; + final ComponentName component = ComponentName.createRelative( + DEFAULT_COMPONENT_PACKAGE_NAME, DEFAULT_COMPONENT_CLASS_NAME + id); + + final Intent intent = new Intent(); + intent.setComponent(component); + + final ActivityInfo aInfo = new ActivityInfo(); + aInfo.applicationInfo = new ApplicationInfo(); + aInfo.applicationInfo.packageName = component.getPackageName(); + aInfo.applicationInfo.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT; + aInfo.packageName = component.getPackageName(); + return new Pair<>(intent, aInfo); + } + ActivityRecord build() { if (mComponent == null) { final int id = sCurrentActivityId++; @@ -257,12 +277,10 @@ class ActivityTestsBase extends SystemServiceTestsBase { if (mTaskRecord != null) { // fullscreen value is normally read from resources in ctor, so for testing we need // to set it somewhere else since we can't mock resources. - activity.fullscreen = true; + doReturn(true).when(activity).occludesParent(); activity.setTask(mTaskRecord); - activity.createAppWindowToken(); - spyOn(activity.mAppWindowToken); // Make visible by default... - activity.mAppWindowToken.setHidden(false); + activity.setHidden(false); } final WindowProcessController wpc = new WindowProcessController(mService, @@ -271,6 +289,8 @@ class ActivityTestsBase extends SystemServiceTestsBase { mock(WindowProcessListener.class)); wpc.setThread(mock(IApplicationThread.class)); activity.setProcess(wpc); + doReturn(wpc).when(mService).getProcessController( + activity.processName, activity.info.applicationInfo.uid); // Resume top activities to make sure all other signals in the system are connected. mService.mRootActivityContainer.resumeFocusedStacksTopActivities(); @@ -364,9 +384,10 @@ class ActivityTestsBase extends SystemServiceTestsBase { intent.setFlags(mFlags); final TaskRecord task = new TaskRecord(mSupervisor.mService, mTaskId, aInfo, - intent /*intent*/, mVoiceSession, null /*_voiceInteractor*/); + intent /*intent*/, mVoiceSession, null /*_voiceInteractor*/, + null /*taskDescription*/); spyOn(task); - task.userId = mUserId; + task.mUserId = mUserId; if (mStack != null) { mStack.moveToFront("test"); @@ -375,8 +396,6 @@ class ActivityTestsBase extends SystemServiceTestsBase { spyOn(task.mTask); } - task.touchActiveTime(); - return task; } } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java index 61dbd67c3fe8..650a911f4a20 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java @@ -57,7 +57,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { private TaskStack mStack; private Task mTask; - private WindowTestUtils.TestAppWindowToken mToken; + private AppWindowToken mToken; public void setUpOnDisplay(DisplayContent dc) { mStack = createTaskStackOnDisplay(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, dc); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java index 49e4c78551cb..72d9bd0aaf8a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java @@ -122,9 +122,9 @@ public class AppTransitionTests extends WindowTestsBase { final DisplayContent dc2 = createNewDisplay(Display.STATE_ON); // Create 2 app window tokens to represent 2 activity window. - final WindowTestUtils.TestAppWindowToken token1 = createTestAppWindowToken(dc1, + final AppWindowToken token1 = createTestAppWindowToken(dc1, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); - final WindowTestUtils.TestAppWindowToken token2 = createTestAppWindowToken(dc2, + final AppWindowToken token2 = createTestAppWindowToken(dc2, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); token1.allDrawn = true; @@ -159,7 +159,7 @@ public class AppTransitionTests extends WindowTestsBase { final TaskStack stack1 = createTaskStackOnDisplay(dc1); final Task task1 = createTaskInStack(stack1, 0 /* userId */); - final WindowTestUtils.TestAppWindowToken token1 = + final AppWindowToken token1 = WindowTestUtils.createTestAppWindowToken(dc1); task1.addChild(token1, 0); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java index 8957486b2dfe..66ba81d93e35 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java @@ -33,8 +33,6 @@ import android.view.SurfaceControl; import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; -import com.android.server.wm.WindowTestUtils.TestAppWindowToken; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,7 +52,7 @@ import org.mockito.MockitoAnnotations; @RunWith(WindowTestRunner.class) public class AppWindowTokenAnimationTests extends WindowTestsBase { - private TestAppWindowToken mToken; + private AppWindowToken mToken; @Mock private AnimationAdapter mSpec; diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java index d528e415d75d..26617355cfbf 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java @@ -53,7 +53,6 @@ import static org.mockito.Mockito.verify; import android.content.res.Configuration; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; -import android.view.Display; import android.view.Surface; import android.view.WindowManager; @@ -78,7 +77,7 @@ public class AppWindowTokenTests extends WindowTestsBase { TaskStack mStack; Task mTask; - WindowTestUtils.TestAppWindowToken mToken; + AppWindowToken mToken; private final String mPackageName = getInstrumentation().getTargetContext().getPackageName(); @@ -94,7 +93,7 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test @Presubmit public void testAddWindow_Order() { - assertEquals(0, mToken.getWindowsCount()); + assertEquals(0, mToken.getChildCount()); final WindowState win1 = createWindow(null, TYPE_APPLICATION, mToken, "win1"); final WindowState startingWin = createWindow(null, TYPE_APPLICATION_STARTING, mToken, @@ -103,17 +102,17 @@ public class AppWindowTokenTests extends WindowTestsBase { final WindowState win4 = createWindow(null, TYPE_APPLICATION, mToken, "win4"); // Should not contain the windows that were added above. - assertEquals(4, mToken.getWindowsCount()); - assertTrue(mToken.hasWindow(win1)); - assertTrue(mToken.hasWindow(startingWin)); - assertTrue(mToken.hasWindow(baseWin)); - assertTrue(mToken.hasWindow(win4)); + assertEquals(4, mToken.getChildCount()); + assertTrue(mToken.mChildren.contains(win1)); + assertTrue(mToken.mChildren.contains(startingWin)); + assertTrue(mToken.mChildren.contains(baseWin)); + assertTrue(mToken.mChildren.contains(win4)); // The starting window should be on-top of all other windows. - assertEquals(startingWin, mToken.getLastChild()); + assertEquals(startingWin, mToken.mChildren.peekLast()); // The base application window should be below all other windows. - assertEquals(baseWin, mToken.getFirstChild()); + assertEquals(baseWin, mToken.mChildren.peekFirst()); mToken.removeImmediately(); } @@ -222,7 +221,7 @@ public class AppWindowTokenTests extends WindowTestsBase { containerBounds.set(0, 0, 600, 800); mToken.onConfigurationChanged(newParentConfig); - assertTrue(mToken.inSizeCompatMode()); + assertTrue(mToken.hasSizeCompatBounds()); assertEquals(containerAppBounds, mToken.getBounds()); assertEquals((float) containerAppBounds.width() / fixedBounds.width(), mToken.getSizeCompatScale(), 0.0001f /* delta */); @@ -232,7 +231,7 @@ public class AppWindowTokenTests extends WindowTestsBase { containerBounds.set(containerAppBounds); mToken.onConfigurationChanged(newParentConfig); - assertTrue(mToken.inSizeCompatMode()); + assertTrue(mToken.hasSizeCompatBounds()); // Don't scale up, so the bounds keep the same as the fixed width. assertEquals(fixedBounds.width(), mToken.getBounds().width()); // Assert the position is horizontal center. @@ -244,7 +243,7 @@ public class AppWindowTokenTests extends WindowTestsBase { containerBounds.set(0, 0, 1200, 2000); mToken.onConfigurationChanged(newParentConfig); // Assert don't use fixed bounds because the region is enough. - assertFalse(mToken.inSizeCompatMode()); + assertFalse(mToken.hasSizeCompatBounds()); } @Test @@ -325,37 +324,14 @@ public class AppWindowTokenTests extends WindowTestsBase { } @Test - public void testReportOrientationChangeOnVisibilityChange() { + public void testReportOrientationChange() { mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE); mDisplayContent.getDisplayRotation().setFixedToUserRotation( DisplayRotation.FIXED_TO_USER_ROTATION_ENABLED); - doReturn(Configuration.ORIENTATION_LANDSCAPE).when(mToken.mActivityRecord) - .getRequestedConfigurationOrientation(); - - mTask.mTaskRecord = Mockito.mock(TaskRecord.class, RETURNS_DEEP_STUBS); - mToken.commitVisibility(null /* lp */, false /* visible */, TRANSIT_UNSET, - true /* performLayout */, false /* isVoiceInteraction */); - - verify(mTask.mTaskRecord).onConfigurationChanged(any(Configuration.class)); - } - - @Test - public void testReportOrientationChangeOnOpeningClosingAppChange() { - mToken.setOrientation(SCREEN_ORIENTATION_LANDSCAPE); - - mDisplayContent.getDisplayRotation().setFixedToUserRotation( - DisplayRotation.FIXED_TO_USER_ROTATION_ENABLED); - mDisplayContent.getDisplayInfo().state = Display.STATE_ON; - mDisplayContent.prepareAppTransition(WindowManager.TRANSIT_ACTIVITY_CLOSE, - false /* alwaysKeepCurrent */, 0 /* flags */, true /* forceOverride */); - - doReturn(Configuration.ORIENTATION_LANDSCAPE).when(mToken.mActivityRecord) - .getRequestedConfigurationOrientation(); - mTask.mTaskRecord = Mockito.mock(TaskRecord.class, RETURNS_DEEP_STUBS); - mToken.setVisibility(false /* visible */, false /* deferHidingClient */); + mToken.reportDescendantOrientationChangeIfNeeded(); verify(mTask.mTaskRecord).onConfigurationChanged(any(Configuration.class)); } @@ -378,7 +354,7 @@ public class AppWindowTokenTests extends WindowTestsBase { public void testAddRemoveRace() { // There was once a race condition between adding and removing starting windows for (int i = 0; i < 1000; i++) { - final WindowTestUtils.TestAppWindowToken appToken = createIsolatedTestAppWindowToken(); + final AppWindowToken appToken = createIsolatedTestAppWindowToken(); appToken.addStartingWindow(mPackageName, android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true, @@ -393,8 +369,8 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test public void testTransferStartingWindow() { - final WindowTestUtils.TestAppWindowToken token1 = createIsolatedTestAppWindowToken(); - final WindowTestUtils.TestAppWindowToken token2 = createIsolatedTestAppWindowToken(); + final AppWindowToken token1 = createIsolatedTestAppWindowToken(); + final AppWindowToken token2 = createIsolatedTestAppWindowToken(); token1.addStartingWindow(mPackageName, android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true, false, false); @@ -409,8 +385,8 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test public void testTransferStartingWindowWhileCreating() { - final WindowTestUtils.TestAppWindowToken token1 = createIsolatedTestAppWindowToken(); - final WindowTestUtils.TestAppWindowToken token2 = createIsolatedTestAppWindowToken(); + final AppWindowToken token1 = createIsolatedTestAppWindowToken(); + final AppWindowToken token2 = createIsolatedTestAppWindowToken(); ((TestWindowManagerPolicy) token1.mWmService.mPolicy).setRunnableWhenAddingSplashScreen( () -> { // Surprise, ...! Transfer window in the middle of the creation flow. @@ -427,14 +403,14 @@ public class AppWindowTokenTests extends WindowTestsBase { assertHasStartingWindow(token2); } - private WindowTestUtils.TestAppWindowToken createIsolatedTestAppWindowToken() { + private AppWindowToken createIsolatedTestAppWindowToken() { final TaskStack taskStack = createTaskStackOnDisplay(mDisplayContent); final Task task = createTaskInStack(taskStack, 0 /* userId */); return createTestAppWindowTokenForGivenTask(task); } - private WindowTestUtils.TestAppWindowToken createTestAppWindowTokenForGivenTask(Task task) { - final WindowTestUtils.TestAppWindowToken appToken = + private AppWindowToken createTestAppWindowTokenForGivenTask(Task task) { + final AppWindowToken appToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent); task.addChild(appToken, 0); waitUntilHandlersIdle(); @@ -444,8 +420,8 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test public void testTryTransferStartingWindowFromHiddenAboveToken() { // Add two tasks on top of each other. - final WindowTestUtils.TestAppWindowToken tokenTop = createIsolatedTestAppWindowToken(); - final WindowTestUtils.TestAppWindowToken tokenBottom = + final AppWindowToken tokenTop = createIsolatedTestAppWindowToken(); + final AppWindowToken tokenBottom = createTestAppWindowTokenForGivenTask(tokenTop.getTask()); // Add a starting window. diff --git a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java index a98f79cb5369..73420a095cad 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DimmerTests.java @@ -46,7 +46,7 @@ public class DimmerTests extends WindowTestsBase { private static class TestWindowContainer extends WindowContainer<TestWindowContainer> { final SurfaceControl mControl = mock(SurfaceControl.class); - final SurfaceControl.Transaction mTransaction = mock(SurfaceControl.Transaction.class); + final SurfaceControl.Transaction mTransaction = spy(StubTransaction.class); TestWindowContainer(WindowManagerService wm) { super(wm); @@ -66,7 +66,7 @@ public class DimmerTests extends WindowTestsBase { private static class MockSurfaceBuildingContainer extends WindowContainer<TestWindowContainer> { final SurfaceSession mSession = new SurfaceSession(); final SurfaceControl mHostControl = mock(SurfaceControl.class); - final SurfaceControl.Transaction mHostTransaction = mock(SurfaceControl.Transaction.class); + final SurfaceControl.Transaction mHostTransaction = spy(StubTransaction.class); MockSurfaceBuildingContainer(WindowManagerService wm) { super(wm); @@ -118,7 +118,7 @@ public class DimmerTests extends WindowTestsBase { public void setUp() throws Exception { mHost = new MockSurfaceBuildingContainer(mWm); mSurfaceAnimatorStarter = spy(new SurfaceAnimatorStarterImpl()); - mTransaction = mock(SurfaceControl.Transaction.class); + mTransaction = spy(StubTransaction.class); mDimmer = new Dimmer(mHost, mSurfaceAnimatorStarter); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index ade0b146dd9a..2ba3cbdadad4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -241,8 +241,7 @@ public class DisplayContentTests extends WindowTestsBase { assertEquals(dc, stack.getDisplayContent()); final Task task = createTaskInStack(stack, 0 /* userId */); - final WindowTestUtils.TestAppWindowToken token = WindowTestUtils.createTestAppWindowToken( - dc); + final AppWindowToken token = WindowTestUtils.createTestAppWindowToken(dc); task.addChild(token, 0); assertEquals(dc, task.getDisplayContent()); assertEquals(dc, token.getDisplayContent()); @@ -314,7 +313,7 @@ public class DisplayContentTests extends WindowTestsBase { // Add stack with activity. final TaskStack stack0 = createTaskStackOnDisplay(dc0); final Task task0 = createTaskInStack(stack0, 0 /* userId */); - final WindowTestUtils.TestAppWindowToken token = + final AppWindowToken token = WindowTestUtils.createTestAppWindowToken(dc0); task0.addChild(token, 0); dc0.configureDisplayPolicy(); @@ -322,7 +321,7 @@ public class DisplayContentTests extends WindowTestsBase { final TaskStack stack1 = createTaskStackOnDisplay(dc1); final Task task1 = createTaskInStack(stack1, 0 /* userId */); - final WindowTestUtils.TestAppWindowToken token1 = + final AppWindowToken token1 = WindowTestUtils.createTestAppWindowToken(dc0); task1.addChild(token1, 0); dc1.configureDisplayPolicy(); @@ -707,13 +706,13 @@ public class DisplayContentTests extends WindowTestsBase { final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootActivityContainer) - .setDisplay(dc.mAcitvityDisplay).build(); + .setDisplay(dc.mActivityDisplay).build(); final ActivityRecord activity = stack.topTask().getTopActivity(); activity.setRequestedOrientation(newOrientation); final ArgumentCaptor<Configuration> captor = ArgumentCaptor.forClass(Configuration.class); - verify(dc.mAcitvityDisplay).updateDisplayOverrideConfigurationLocked(captor.capture(), + verify(dc.mActivityDisplay).updateDisplayOverrideConfigurationLocked(captor.capture(), same(activity), anyBoolean(), same(null)); final Configuration newDisplayConfig = captor.getValue(); final int expectedOrientation = newOrientation == SCREEN_ORIENTATION_PORTRAIT @@ -733,12 +732,12 @@ public class DisplayContentTests extends WindowTestsBase { final ActivityStack stack = new ActivityTestsBase.StackBuilder(mWm.mAtmService.mRootActivityContainer) - .setDisplay(dc.mAcitvityDisplay).build(); + .setDisplay(dc.mActivityDisplay).build(); final ActivityRecord activity = stack.topTask().getTopActivity(); activity.setRequestedOrientation(newOrientation); - verify(dc.mAcitvityDisplay, never()).updateDisplayOverrideConfigurationLocked(any(), + verify(dc.mActivityDisplay, never()).updateDisplayOverrideConfigurationLocked(any(), eq(activity), anyBoolean(), same(null)); assertEquals(dc.getDisplayRotation().getUserRotation(), dc.getRotation()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java index 9d3c866d3ae7..304df22bfd7b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java @@ -96,7 +96,7 @@ public class DragDropControllerTests extends WindowTestsBase { * Creates a window state which can be used as a drop target. */ private WindowState createDropTargetWindow(String name, int ownerId) { - final WindowTestUtils.TestAppWindowToken token = WindowTestUtils.createTestAppWindowToken( + final AppWindowToken token = WindowTestUtils.createTestAppWindowToken( mDisplayContent); final TaskStack stack = createTaskStackOnDisplay( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent); diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java index be2ee2909a22..46435ebd8e15 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsControllerTests.java @@ -422,7 +422,7 @@ public class LaunchParamsControllerTests extends ActivityTestsBase { @Override void saveTask(TaskRecord task) { - final int userId = task.userId; + final int userId = task.mUserId; final ComponentName realActivity = task.realActivity; mTmpParams.mPreferredDisplayId = task.getStack().mDisplayId; mTmpParams.mWindowingMode = task.getWindowingMode(); @@ -436,7 +436,7 @@ public class LaunchParamsControllerTests extends ActivityTestsBase { @Override void getLaunchParams(TaskRecord task, ActivityRecord activity, LaunchParams params) { - final int userId = task != null ? task.userId : activity.mUserId; + final int userId = task != null ? task.mUserId : activity.mUserId; final ComponentName name = task != null ? task.realActivity : activity.mActivityComponent; diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java index 49d778f023e5..b9fef4b008c3 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java @@ -32,7 +32,6 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.any; import android.content.ComponentName; -import android.content.pm.PackageList; import android.content.pm.PackageManagerInternal; import android.graphics.Rect; import android.os.UserHandle; @@ -43,6 +42,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import com.android.server.LocalServices; +import com.android.server.pm.PackageList; import com.android.server.wm.LaunchParamsController.LaunchParams; import org.junit.Before; @@ -115,16 +115,16 @@ public class LaunchParamsPersisterTests extends ActivityTestsBase { ACTIVITY_TYPE_STANDARD, /* onTop */ true); mTestTask = new TaskBuilder(mSupervisor).setComponent(TEST_COMPONENT).setStack(stack) .build(); - mTestTask.userId = TEST_USER_ID; + mTestTask.mUserId = TEST_USER_ID; mTestTask.mLastNonFullscreenBounds = TEST_BOUNDS; mTestTask.hasBeenVisible = true; mTaskWithDifferentComponent = new TaskBuilder(mSupervisor) .setComponent(ALTERNATIVE_COMPONENT).build(); - mTaskWithDifferentComponent.userId = TEST_USER_ID; + mTaskWithDifferentComponent.mUserId = TEST_USER_ID; mTaskWithDifferentUser = new TaskBuilder(mSupervisor).setComponent(TEST_COMPONENT).build(); - mTaskWithDifferentUser.userId = ALTERNATIVE_USER_ID; + mTaskWithDifferentUser.mUserId = ALTERNATIVE_USER_ID; mTarget = new LaunchParamsPersister(mPersisterQueue, mSupervisor, mUserFolderGetter); diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java index 2d0416d6f5bc..15417d73bd02 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java @@ -21,6 +21,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -48,8 +49,8 @@ public class LetterboxTest { @Before public void setUp() throws Exception { mSurfaces = new SurfaceControlMocker(); - mLetterbox = new Letterbox(mSurfaces, () -> mock(SurfaceControl.Transaction.class)); - mTransaction = mock(SurfaceControl.Transaction.class); + mLetterbox = new Letterbox(mSurfaces, StubTransaction::new); + mTransaction = spy(StubTransaction.class); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java index 47c76fc28d15..05e173c957d3 100644 --- a/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java @@ -707,7 +707,7 @@ public class LockTaskControllerTest { TaskRecord tr = mock(TaskRecord.class); tr.mLockTaskAuth = lockTaskAuth; tr.intent = intent; - tr.userId = TEST_USER_ID; + tr.mUserId = TEST_USER_ID; return tr; } diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java index 445a5cc50d51..cc598ffa63bd 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java @@ -882,7 +882,7 @@ public class RecentTasksTest extends ActivityTestsBase { @Test public void testNotRestoreRecentTaskApis() { final TaskRecord task = createTaskBuilder(".Task").build(); - final int taskId = task.taskId; + final int taskId = task.mTaskId; mRecentTasks.add(task); // Only keep the task in RecentTasks. task.removeWindowContainer(); @@ -968,7 +968,7 @@ public class RecentTasksTest extends ActivityTestsBase { TEST_USER_0_ID, 0).getList(); assertTrue(expectedTasks.length == infos.size()); for (int i = 0; i < infos.size(); i++) { - assertTrue(expectedTasks[i].taskId == infos.get(i).taskId); + assertTrue(expectedTasks[i].mTaskId == infos.get(i).taskId); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java index 5236b5d0e07f..f353846202e6 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java @@ -138,14 +138,13 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Test public void testIncludedApps_expectTargetAndVisible() { mWm.setRecentsAnimationController(mController); - final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack( + final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP); final AppWindowToken homeAppWindow = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService) .setStack(homeStack) .setCreateTask(true) - .build() - .mAppWindowToken; + .build(); final AppWindowToken appWindow = createAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final AppWindowToken hiddenAppWindow = createAppWindowToken(mDisplayContent, @@ -164,14 +163,13 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Test public void testWallpaperIncluded_expectTarget() throws Exception { mWm.setRecentsAnimationController(mController); - final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack( + final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP); final AppWindowToken homeAppWindow = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService) .setStack(homeStack) .setCreateTask(true) - .build() - .mAppWindowToken; + .build(); final AppWindowToken appWindow = createAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1"); @@ -194,14 +192,13 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Test public void testWallpaperAnimatorCanceled_expectAnimationKeepsRunning() throws Exception { mWm.setRecentsAnimationController(mController); - final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack( + final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP); final AppWindowToken homeAppWindow = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService) .setStack(homeStack) .setCreateTask(true) - .build() - .mAppWindowToken; + .build(); final AppWindowToken appWindow = createAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, appWindow, "win1"); @@ -226,14 +223,13 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { @Test public void testFinish_expectTargetAndWallpaperAdaptersRemoved() { mWm.setRecentsAnimationController(mController); - final ActivityStack homeStack = mDisplayContent.mAcitvityDisplay.getOrCreateStack( + final ActivityStack homeStack = mDisplayContent.mActivityDisplay.getOrCreateStack( WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP); final AppWindowToken homeAppWindow = new ActivityTestsBase.ActivityBuilder(mWm.mAtmService) .setStack(homeStack) .setCreateTask(true) - .build() - .mAppWindowToken; + .build(); final WindowState hwin1 = createWindow(null, TYPE_BASE_APPLICATION, homeAppWindow, "hwin1"); homeAppWindow.addWindow(hwin1); final AppWindowToken appWindow = createAppWindowToken(mDisplayContent, diff --git a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java index b4ccd500c971..ebedde7d4460 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java @@ -97,7 +97,6 @@ public class RecentsAnimationTest extends ActivityTestsBase { .setStack(recentsStack) .build(); ActivityRecord topActivity = new ActivityBuilder(mService).setCreateTask(true).build(); - topActivity.fullscreen = true; topActivity.getActivityStack().moveToFront("testRecentsActivityVisiblility"); doCallRealMethod().when(mRootActivityContainer).ensureActivitiesVisible( @@ -346,7 +345,7 @@ public class RecentsAnimationTest extends ActivityTestsBase { .setCreateTask(true) .setComponent(new ComponentName(mContext.getPackageName(), "Home2")) .build(); - otherUserHomeActivity.getTaskRecord().userId = TEST_USER_ID; + otherUserHomeActivity.getTaskRecord().mUserId = TEST_USER_ID; ActivityStack fullscreenStack = display.createStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */); diff --git a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java index 2ad40f2dc577..f5d08dcfcb77 100644 --- a/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java +++ b/services/tests/wmtests/src/com/android/server/wm/StubTransaction.java @@ -239,4 +239,15 @@ public class StubTransaction extends SurfaceControl.Transaction { public SurfaceControl.Transaction remove(SurfaceControl sc) { return this; } + + @Override + public SurfaceControl.Transaction syncInputWindows() { + return this; + } + + @Override + public SurfaceControl.Transaction setColorSpaceAgnostic(SurfaceControl sc, boolean agnostic) { + return this; + } + } diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java index 2ac5f7d94560..dc89f5080c4b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java @@ -112,7 +112,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { assertNull(mTarget.getDragWindowHandleLocked()); final DisplayContent content = mock(DisplayContent.class); - when(content.findTaskForResizePoint(anyInt(), anyInt())).thenReturn(mWindow.getTask()); + doReturn(mWindow.getTask()).when(content).findTaskForResizePoint(anyInt(), anyInt()); assertNotNull(mWindow.getTask().getTopVisibleAppMainWindow()); mTarget.handleTapOutsideTask(content, 0, 0); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java index d3588a269bbc..0f8fb0417d01 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java @@ -119,7 +119,7 @@ public class TaskRecordTests extends ActivityTestsBase { final byte[] serializedBytes = serializeToBytes(expected); final TaskRecord actual = restoreFromBytes(serializedBytes); - assertEquals(expected.taskId, actual.taskId); + assertEquals(expected.mTaskId, actual.mTaskId); assertEquals(expected.mLastNonFullscreenBounds, actual.mLastNonFullscreenBounds); } @@ -132,7 +132,7 @@ public class TaskRecordTests extends ActivityTestsBase { @Test public void testCopyBaseIntentForTaskInfo() { final TaskRecord task = createTaskRecord(1); - task.lastTaskDescription = new ActivityManager.TaskDescription(); + task.mTaskDescription = new ActivityManager.TaskDescription(); final TaskInfo info = task.getTaskInfo(); // The intent of info should be a copy so assert that they are different instances. @@ -238,7 +238,7 @@ public class TaskRecordTests extends ActivityTestsBase { ActivityStack stack = new StackBuilder(mRootActivityContainer).setDisplay(display) .setWindowingMode(WINDOWING_MODE_FREEFORM).build(); TaskRecord task = stack.getChildAt(0); - task.getRootActivity().mAppWindowToken.setOrientation(SCREEN_ORIENTATION_UNSPECIFIED); + task.getRootActivity().setOrientation(SCREEN_ORIENTATION_UNSPECIFIED); DisplayInfo info = new DisplayInfo(); display.mDisplay.getDisplayInfo(info); final Rect fullScreenBounds = new Rect(0, 0, info.logicalWidth, info.logicalHeight); @@ -648,9 +648,9 @@ public class TaskRecordTests extends ActivityTestsBase { final TaskRecord task1 = getTestTask(); final ActivityRecord activity1 = task1.getChildAt(0); - assertEquals(task0.taskId, + assertEquals(task0.mTaskId, ActivityRecord.getTaskForActivityLocked(activity0.appToken, false /* onlyRoot */)); - assertEquals(task1.taskId, + assertEquals(task1.mTaskId, ActivityRecord.getTaskForActivityLocked(activity1.appToken, false /* onlyRoot */)); } @@ -669,9 +669,9 @@ public class TaskRecordTests extends ActivityTestsBase { // Add one more on top final ActivityRecord activity2 = new ActivityBuilder(mService).setTask(task).build(); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity0.appToken, true /* onlyRoot */)); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity1.appToken, true /* onlyRoot */)); assertEquals("No task must be reported for activity that is above root", INVALID_TASK_ID, ActivityRecord.getTaskForActivityLocked(activity2.appToken, true /* onlyRoot */)); @@ -692,9 +692,9 @@ public class TaskRecordTests extends ActivityTestsBase { // Add one more on top final ActivityRecord activity2 = new ActivityBuilder(mService).setTask(task).build(); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity0.appToken, true /* onlyRoot */)); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity1.appToken, true /* onlyRoot */)); assertEquals("No task must be reported for activity that is above root", INVALID_TASK_ID, ActivityRecord.getTaskForActivityLocked(activity2.appToken, true /* onlyRoot */)); @@ -718,11 +718,11 @@ public class TaskRecordTests extends ActivityTestsBase { // Add one more activity on top final ActivityRecord activity2 = new ActivityBuilder(mService).setTask(task).build(); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity0.appToken, false /* onlyRoot */)); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity1.appToken, false /* onlyRoot */)); - assertEquals(task.taskId, + assertEquals(task.mTaskId, ActivityRecord.getTaskForActivityLocked(activity2.appToken, false /* onlyRoot */)); } @@ -832,8 +832,8 @@ public class TaskRecordTests extends ActivityTestsBase { private TaskRecord createTaskRecord(int taskId) { return new TaskRecord(mService, taskId, new Intent(), null, null, null, ActivityBuilder.getDefaultComponent(), null, false, false, false, 0, 10050, null, - new ArrayList<>(), 0, false, null, 0, 0, 0, 0, 0, null, 0, false, false, false, 0, 0 - ); + new ArrayList<>(), 0, false, null, 0, 0, 0, 0, 0, null, 0, false, false, false, 0, + 0, null /*ActivityInfo*/, null /*_voiceSession*/, null /*_voiceInteractor*/); } private static class TestTaskRecordFactory extends TaskRecordFactory { diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java index 5a0f7ed89cd0..92ddb35afd04 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackContainersTests.java @@ -54,7 +54,7 @@ public class TaskStackContainersTests extends WindowTestsBase { // Stack should contain visible app window to be considered visible. final Task pinnedTask = createTaskInStack(mPinnedStack, 0 /* userId */); assertFalse(mPinnedStack.isVisible()); - final WindowTestUtils.TestAppWindowToken pinnedApp = + final AppWindowToken pinnedApp = WindowTestUtils.createTestAppWindowToken(mDisplayContent); pinnedTask.addChild(pinnedApp, 0 /* addPos */); assertTrue(mPinnedStack.isVisible()); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java index 87713cb0181c..2eb6ea4dfee9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java @@ -68,13 +68,13 @@ public class TaskStackTests extends WindowTestsBase { public void testClosingAppDifferentStackOrientation() { final TaskStack stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); - WindowTestUtils.TestAppWindowToken appWindowToken1 = + AppWindowToken appWindowToken1 = WindowTestUtils.createTestAppWindowToken(mDisplayContent); task1.addChild(appWindowToken1, 0); appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE); final Task task2 = createTaskInStack(stack, 1 /* userId */); - WindowTestUtils.TestAppWindowToken appWindowToken2 = + AppWindowToken appWindowToken2 = WindowTestUtils.createTestAppWindowToken(mDisplayContent); task2.addChild(appWindowToken2, 0); appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT); @@ -88,13 +88,13 @@ public class TaskStackTests extends WindowTestsBase { public void testMoveTaskToBackDifferentStackOrientation() { final TaskStack stack = createTaskStackOnDisplay(mDisplayContent); final Task task1 = createTaskInStack(stack, 0 /* userId */); - WindowTestUtils.TestAppWindowToken appWindowToken1 = + AppWindowToken appWindowToken1 = WindowTestUtils.createTestAppWindowToken(mDisplayContent); task1.addChild(appWindowToken1, 0); appWindowToken1.setOrientation(SCREEN_ORIENTATION_LANDSCAPE); final Task task2 = createTaskInStack(stack, 1 /* userId */); - WindowTestUtils.TestAppWindowToken appWindowToken2 = + AppWindowToken appWindowToken2 = WindowTestUtils.createTestAppWindowToken(mDisplayContent); task2.addChild(appWindowToken2, 0); appWindowToken2.setOrientation(SCREEN_ORIENTATION_PORTRAIT); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java index 16fdf94cabbd..f117ff0c4deb 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java @@ -46,7 +46,7 @@ public class TaskTests extends WindowTestsBase { public void testRemoveContainer() { final TaskStack stackController1 = createTaskStackOnDisplay(mDisplayContent); final WindowTestUtils.TestTask task = WindowTestUtils.createTestTask(stackController1); - final WindowTestUtils.TestAppWindowToken appToken = + final AppWindowToken appToken = WindowTestUtils.createAppWindowTokenInTask(mDisplayContent, task); task.removeIfPossible(); @@ -60,7 +60,7 @@ public class TaskTests extends WindowTestsBase { public void testRemoveContainer_deferRemoval() { final TaskStack stackController1 = createTaskStackOnDisplay(mDisplayContent); final WindowTestUtils.TestTask task = WindowTestUtils.createTestTask(stackController1); - final WindowTestUtils.TestAppWindowToken appToken = + final AppWindowToken appToken = WindowTestUtils.createAppWindowTokenInTask(mDisplayContent, task); task.mShouldDeferRemoval = true; diff --git a/services/tests/wmtests/src/com/android/server/wm/TestActivityDisplay.java b/services/tests/wmtests/src/com/android/server/wm/TestActivityDisplay.java index 778f0ca3c782..9c3ff654ddf0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TestActivityDisplay.java +++ b/services/tests/wmtests/src/com/android/server/wm/TestActivityDisplay.java @@ -22,8 +22,11 @@ import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyBoolean; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static org.mockito.ArgumentMatchers.any; + import android.hardware.display.DisplayManagerGlobal; import android.view.Display; import android.view.DisplayInfo; @@ -85,6 +88,10 @@ class TestActivityDisplay extends ActivityDisplay { displayRotation.setRotation(rotation); return true; }).when(displayRotation).updateRotationUnchecked(anyBoolean()); + + final InputMonitor inputMonitor = mDisplayContent.getInputMonitor(); + spyOn(inputMonitor); + doNothing().when(inputMonitor).resumeDispatchingLw(any()); } @SuppressWarnings("TypeParameterUnusedInFormals") diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowAnimationSpecTest.java b/services/tests/wmtests/src/com/android/server/wm/WindowAnimationSpecTest.java index 0330de8d2c63..bfc07419fd46 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowAnimationSpecTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowAnimationSpecTest.java @@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.graphics.Point; @@ -50,7 +51,7 @@ import org.junit.Test; @Presubmit public class WindowAnimationSpecTest { private final SurfaceControl mSurfaceControl = mock(SurfaceControl.class); - private final SurfaceControl.Transaction mTransaction = mock(SurfaceControl.Transaction.class); + private final SurfaceControl.Transaction mTransaction = spy(StubTransaction.class); private final Animation mAnimation = mock(Animation.class); private final Rect mStackBounds = new Rect(0, 0, 10, 10); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java index 0503d74b38d5..a09253ab31f0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java @@ -330,7 +330,7 @@ public class WindowStateTests extends WindowTestsBase { // turn on the screen. appWindowToken.setCurrentLaunchCanTurnScreenOn(true); first.mAttrs.flags &= ~WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON; - doReturn(true).when(appWindowToken.mActivityRecord).canTurnScreenOn(); + doReturn(true).when(appWindowToken).canTurnScreenOn(); testPrepareWindowToDisplayDuringRelayout(first, true /* expectedWakeupCalled */, false /* expectedCurrentLaunchCanTurnScreenOn */); @@ -452,7 +452,7 @@ public class WindowStateTests extends WindowTestsBase { @Test public void testSeamlesslyRotateWindow() { final WindowState app = createWindow(null, TYPE_APPLICATION, "app"); - final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); + final SurfaceControl.Transaction t = spy(StubTransaction.class); app.mHasSurface = true; app.mSurfaceControl = mock(SurfaceControl.class); @@ -536,7 +536,7 @@ public class WindowStateTests extends WindowTestsBase { final float[] values = new float[9]; final Matrix matrix = new Matrix(); - final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); + final SurfaceControl.Transaction t = spy(StubTransaction.class); final WindowState win1 = createWindow(null, TYPE_APPLICATION, dc, "win1"); win1.mHasSurface = true; win1.mSurfaceControl = mock(SurfaceControl.class); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java index a7a785d14d6a..c627c1938438 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java @@ -19,14 +19,17 @@ package com.android.server.wm; import static android.app.AppOpsManager.OP_NONE; import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock; +import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.android.server.wm.ActivityTestsBase.ActivityBuilder.createIntentAndActivityInfo; import static com.android.server.wm.WindowContainer.POSITION_TOP; import android.app.ActivityManager; -import android.content.ComponentName; -import android.os.Build; +import android.content.Intent; +import android.content.pm.ActivityInfo; import android.os.IBinder; -import android.view.IApplicationToken; +import android.util.Pair; import android.view.IWindow; import android.view.WindowManager; @@ -48,57 +51,26 @@ class WindowTestUtils { } /** Creates an {@link AppWindowToken} and adds it to the specified {@link Task}. */ - static TestAppWindowToken createAppWindowTokenInTask(DisplayContent dc, Task task) { - final TestAppWindowToken newToken = createTestAppWindowToken(dc); + static AppWindowToken createAppWindowTokenInTask(DisplayContent dc, Task task) { + final AppWindowToken newToken = createTestAppWindowToken(dc); task.addChild(newToken, POSITION_TOP); return newToken; } - static TestAppWindowToken createTestAppWindowToken(DisplayContent dc) { + static AppWindowToken createTestAppWindowToken(DisplayContent dc) { synchronized (dc.mWmService.mGlobalLock) { - return new TestAppWindowToken(dc); + Pair<Intent, ActivityInfo> pair = createIntentAndActivityInfo(); + final AppWindowToken token = new AppWindowToken(dc.mWmService, + dc.mWmService.mAtmService, new ActivityRecord.Token(pair.first), pair.second, + null, pair.first, dc); + token.setOccludesParent(true); + token.setHidden(false); + token.hiddenRequested = false; + spyOn(token); + return token; } } - /** Used so we can gain access to some protected members of the {@link AppWindowToken} class. */ - static class TestAppWindowToken extends AppWindowToken { - boolean mOnTop = false; - - private TestAppWindowToken(DisplayContent dc) { - super(dc.mWmService, new IApplicationToken.Stub() { - @Override - public String getName() { - return null; - } - }, new ComponentName("", ""), false, dc, true /* fillsParent */); - mTargetSdk = Build.VERSION_CODES.CUR_DEVELOPMENT; - mActivityRecord = mock(ActivityRecord.class); - mActivityRecord.app = mock(WindowProcessController.class); - } - - int getWindowsCount() { - return mChildren.size(); - } - - boolean hasWindow(WindowState w) { - return mChildren.contains(w); - } - - WindowState getFirstChild() { - return mChildren.peekFirst(); - } - - WindowState getLastChild() { - return mChildren.peekLast(); - } - - @Override - boolean isOnTop() { - return mOnTop; - } - - } - static TestWindowToken createTestWindowToken(int type, DisplayContent dc) { return createTestWindowToken(type, dc, false /* persistOnEmpty */); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index c574b0fd33b2..4c4b21e49165 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -208,11 +208,11 @@ class WindowTestsBase extends SystemServiceTestsBase { return createTestAppWindowToken(dc, windowingMode, activityType); } - WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int + AppWindowToken createTestAppWindowToken(DisplayContent dc, int windowingMode, int activityType) { final TaskStack stack = createTaskStackOnDisplay(windowingMode, activityType, dc); final Task task = createTaskInStack(stack, 0 /* userId */); - final WindowTestUtils.TestAppWindowToken appWindowToken = + final AppWindowToken appWindowToken = WindowTestUtils.createTestAppWindowToken(dc); task.addChild(appWindowToken, 0); return appWindowToken; diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 34eb3f16bf2a..ecee709054ee 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -1733,10 +1733,13 @@ public class UsageStatsService extends SystemService implements public void registerAppUsageLimitObserver(int observerId, String[] packages, long timeLimitMs, long timeUsedMs, PendingIntent callbackIntent, String callingPackage) { + final int callingUid = Binder.getCallingUid(); + final DevicePolicyManagerInternal dpmInternal = getDpmInternal(); if (!hasPermissions(callingPackage, - Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE)) { - throw new SecurityException("Caller doesn't have both SUSPEND_APPS and " - + "OBSERVE_APP_USAGE permissions"); + Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE) + && (dpmInternal != null && !dpmInternal.isActiveSupervisionApp(callingUid))) { + throw new SecurityException("Caller must be the active supervision app or " + + "it must have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions"); } if (packages == null || packages.length == 0) { @@ -1745,7 +1748,6 @@ public class UsageStatsService extends SystemService implements if (callbackIntent == null && timeUsedMs < timeLimitMs) { throw new NullPointerException("callbackIntent can't be null"); } - final int callingUid = Binder.getCallingUid(); final int userId = UserHandle.getUserId(callingUid); final long token = Binder.clearCallingIdentity(); try { @@ -1758,13 +1760,15 @@ public class UsageStatsService extends SystemService implements @Override public void unregisterAppUsageLimitObserver(int observerId, String callingPackage) { + final int callingUid = Binder.getCallingUid(); + final DevicePolicyManagerInternal dpmInternal = getDpmInternal(); if (!hasPermissions(callingPackage, - Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE)) { - throw new SecurityException("Caller doesn't have both SUSPEND_APPS and " - + "OBSERVE_APP_USAGE permissions"); + Manifest.permission.SUSPEND_APPS, Manifest.permission.OBSERVE_APP_USAGE) + && (dpmInternal != null && !dpmInternal.isActiveSupervisionApp(callingUid))) { + throw new SecurityException("Caller must be the active supervision app or " + + "it must have both SUSPEND_APPS and OBSERVE_APP_USAGE permissions"); } - final int callingUid = Binder.getCallingUid(); final int userId = UserHandle.getUserId(callingUid); final long token = Binder.clearCallingIdentity(); try { diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java index 9735502a4f69..973924379f5a 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java @@ -159,7 +159,8 @@ public final class UsbDeviceDescriptor extends UsbDescriptor { return new UsbDevice.Builder(parser.getDeviceAddr(), mVendorID, mProductID, mDevClass, mDevSubClass, mProtocol, mfgName, prodName, versionString, - configs, serialStr, parser.hasAudioPlayback(), parser.hasAudioCapture()); + configs, serialStr, parser.hasAudioPlayback(), parser.hasAudioCapture(), + parser.hasMIDIInterface()); } @Override diff --git a/startop/scripts/app_startup/app_startup_runner.py b/startop/scripts/app_startup/app_startup_runner.py index fa1c4e601f83..25ee6f7368c8 100755 --- a/startop/scripts/app_startup/app_startup_runner.py +++ b/startop/scripts/app_startup/app_startup_runner.py @@ -233,13 +233,17 @@ def execute_run_using_perfetto_trace(collector_info, simulate: bool, inodes_path: str, timeout: int, - compiler_type: CompilerType) -> DataFrame: + compiler_type: CompilerType, + requires_trace_collection: bool) -> DataFrame: """ Executes run based on perfetto trace. """ - passed, perfetto_trace_file = run_perfetto_collector(collector_info, - timeout, - simulate) - if not passed: - raise RuntimeError('Cannot run perfetto collector!') + if requires_trace_collection: + passed, perfetto_trace_file = run_perfetto_collector(collector_info, + timeout, + simulate) + if not passed: + raise RuntimeError('Cannot run perfetto collector!') + else: + perfetto_trace_file = tempfile.NamedTemporaryFile() with perfetto_trace_file: for combos in run_combos: @@ -271,7 +275,8 @@ def execute_run_combos( simulate: bool, inodes_path: str, timeout: int, - compiler_type: CompilerType): + compiler_type: CompilerType, + requires_trace_collection: bool): # nothing will work if the screen isn't unlocked first. cmd_utils.execute_arbitrary_command([_UNLOCK_SCREEN_SCRIPT], timeout, @@ -284,7 +289,8 @@ def execute_run_combos( simulate, inodes_path, timeout, - compiler_type) + compiler_type, + requires_trace_collection) def gather_results(commands: Iterable[Tuple[DataFrame]], key_list: List[str], value_list: List[Tuple[str, ...]]): @@ -369,11 +375,13 @@ def main(): CollectorPackageInfo) print_utils.debug_print_gen("grouped run combinations: ", grouped_combos()) + requires_trace_collection = any(i in _TRACING_READAHEADS for i in opts.readaheads) exec = execute_run_combos(grouped_combos(), opts.simulate, opts.inodes, opts.timeout, - opts.compiler_type) + opts.compiler_type, + requires_trace_collection) results = gather_results(exec, _COMBINATORIAL_OPTIONS, combos()) diff --git a/startop/scripts/iorap/common b/startop/scripts/iorap/common index 031dabfadeab..387e45d431bd 100755 --- a/startop/scripts/iorap/common +++ b/startop/scripts/iorap/common @@ -248,6 +248,6 @@ iorapd_readahead_wait_until_finished() { local remote_path="$(_iorapd_path_to_data_file "$package" "$activity" "compiled_trace.pb")" # See 'read_ahead.cc' LOG(INFO). - local pattern="ReadAhead completed ($remote_path)" + local pattern="Description = $remote_path" logcat_wait_for_pattern "$timeout" "$timestamp" "$pattern" } diff --git a/telephony/common/com/android/internal/telephony/HbpcdLookup.java b/telephony/common/com/android/internal/telephony/HbpcdLookup.java new file mode 100644 index 000000000000..d9a3e725b6fb --- /dev/null +++ b/telephony/common/com/android/internal/telephony/HbpcdLookup.java @@ -0,0 +1,124 @@ +/* +** +** Copyright 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. +*/ +package com.android.internal.telephony; + +import android.net.Uri; +import android.provider.BaseColumns; + +/** + * @hide + */ +public class HbpcdLookup { + public static final String AUTHORITY = "hbpcd_lookup"; + + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY); + + public static final String PATH_MCC_IDD = "idd"; + public static final String PATH_MCC_LOOKUP_TABLE = "lookup"; + public static final String PATH_MCC_SID_CONFLICT = "conflict"; + public static final String PATH_MCC_SID_RANGE = "range"; + public static final String PATH_NANP_AREA_CODE = "nanp"; + public static final String PATH_ARBITRARY_MCC_SID_MATCH = "arbitrary"; + public static final String PATH_USERADD_COUNTRY = "useradd"; + + public static final String ID = "_id"; + public static final int IDINDEX = 0; + + /** + * @hide + */ + public static class MccIdd implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_MCC_IDD); + public static final String DEFAULT_SORT_ORDER = "MCC ASC"; + + public static final String MCC = "MCC"; + public static final String IDD = "IDD"; + + } + + /** + * @hide + */ + public static class MccLookup implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_MCC_LOOKUP_TABLE); + public static final String DEFAULT_SORT_ORDER = "MCC ASC"; + + public static final String MCC = "MCC"; + public static final String COUNTRY_CODE = "Country_Code"; + public static final String COUNTRY_NAME = "Country_Name"; + public static final String NDD = "NDD"; + public static final String NANPS = "NANPS"; + public static final String GMT_OFFSET_LOW = "GMT_Offset_Low"; + public static final String GMT_OFFSET_HIGH = "GMT_Offset_High"; + public static final String GMT_DST_LOW = "GMT_DST_Low"; + public static final String GMT_DST_HIGH = "GMT_DST_High"; + + } + + /** + * @hide + */ + public static class MccSidConflicts implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_MCC_SID_CONFLICT); + public static final String DEFAULT_SORT_ORDER = "MCC ASC"; + + public static final String MCC = "MCC"; + public static final String SID_CONFLICT = "SID_Conflict"; + + } + + /** + * @hide + */ + public static class MccSidRange implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_MCC_SID_RANGE); + public static final String DEFAULT_SORT_ORDER = "MCC ASC"; + + public static final String MCC = "MCC"; + public static final String RANGE_LOW = "SID_Range_Low"; + public static final String RANGE_HIGH = "SID_Range_High"; + } + + /** + * @hide + */ + public static class ArbitraryMccSidMatch implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_ARBITRARY_MCC_SID_MATCH); + public static final String DEFAULT_SORT_ORDER = "MCC ASC"; + + public static final String MCC = "MCC"; + public static final String SID = "SID"; + + } + + /** + * @hide + */ + public static class NanpAreaCode implements BaseColumns { + public static final Uri CONTENT_URI = + Uri.parse("content://" + AUTHORITY + "/" + PATH_NANP_AREA_CODE); + public static final String DEFAULT_SORT_ORDER = "Area_Code ASC"; + + public static final String AREA_CODE = "Area_Code"; + } +} diff --git a/telephony/common/com/android/internal/telephony/HbpcdUtils.java b/telephony/common/com/android/internal/telephony/HbpcdUtils.java new file mode 100644 index 000000000000..2f3194214be6 --- /dev/null +++ b/telephony/common/com/android/internal/telephony/HbpcdUtils.java @@ -0,0 +1,163 @@ +/* + * 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. + */ + +package com.android.internal.telephony; + +import android.content.ContentResolver; +import android.content.Context; +import android.database.Cursor; +import android.telephony.Rlog; + +import com.android.internal.telephony.HbpcdLookup.ArbitraryMccSidMatch; +import com.android.internal.telephony.HbpcdLookup.MccIdd; +import com.android.internal.telephony.HbpcdLookup.MccLookup; +import com.android.internal.telephony.HbpcdLookup.MccSidConflicts; +import com.android.internal.telephony.HbpcdLookup.MccSidRange; + +public final class HbpcdUtils { + private static final String LOG_TAG = "HbpcdUtils"; + private static final boolean DBG = false; + private ContentResolver resolver = null; + + public HbpcdUtils(Context context) { + resolver = context.getContentResolver(); + } + + /** + * Resolves the unknown MCC with SID and Timezone information. + */ + public int getMcc(int sid, int tz, int DSTflag, boolean isNitzTimeZone) { + int tmpMcc = 0; + + // check if SID exists in arbitrary_mcc_sid_match table. + // these SIDs are assigned to more than 1 operators, but they are known to + // be used by a specific operator, other operators having the same SID are + // not using it currently, if that SID is in this table, we don't need to + // check other tables. + String projection2[] = {ArbitraryMccSidMatch.MCC}; + Cursor c2 = resolver.query(ArbitraryMccSidMatch.CONTENT_URI, projection2, + ArbitraryMccSidMatch.SID + "=" + sid, null, null); + + if (c2 != null) { + int c2Counter = c2.getCount(); + if (DBG) { + Rlog.d(LOG_TAG, "Query unresolved arbitrary table, entries are " + c2Counter); + } + if (c2Counter == 1) { + if (DBG) { + Rlog.d(LOG_TAG, "Query Unresolved arbitrary returned the cursor " + c2); + } + c2.moveToFirst(); + tmpMcc = c2.getInt(0); + if (DBG) { + Rlog.d(LOG_TAG, "MCC found in arbitrary_mcc_sid_match: " + tmpMcc); + } + c2.close(); + return tmpMcc; + } + c2.close(); + } + + // Then check if SID exists in mcc_sid_conflict table. + // and use the timezone in mcc_lookup table to check which MCC matches. + String projection3[] = {MccSidConflicts.MCC}; + Cursor c3 = resolver.query(MccSidConflicts.CONTENT_URI, projection3, + MccSidConflicts.SID_CONFLICT + "=" + sid + " and (((" + + MccLookup.GMT_OFFSET_LOW + "<=" + tz + ") and (" + tz + "<=" + + MccLookup.GMT_OFFSET_HIGH + ") and (" + "0=" + DSTflag + ")) or ((" + + MccLookup.GMT_DST_LOW + "<=" + tz + ") and (" + tz + "<=" + + MccLookup.GMT_DST_HIGH + ") and (" + "1=" + DSTflag + ")))", + null, null); + if (c3 != null) { + int c3Counter = c3.getCount(); + if (c3Counter > 0) { + if (c3Counter > 1) { + Rlog.w(LOG_TAG, "something wrong, get more results for 1 conflict SID: " + c3); + } + if (DBG) Rlog.d(LOG_TAG, "Query conflict sid returned the cursor " + c3); + c3.moveToFirst(); + tmpMcc = c3.getInt(0); + if (DBG) { + Rlog.d(LOG_TAG, "MCC found in mcc_lookup_table. Return tmpMcc = " + tmpMcc); + } + if (!isNitzTimeZone) { + // time zone is not accurate, it may get wrong mcc, ignore it. + if (DBG) { + Rlog.d(LOG_TAG, "time zone is not accurate, mcc may be " + tmpMcc); + } + tmpMcc = 0; + } + c3.close(); + return tmpMcc; + } else { + c3.close(); + } + } + + // if there is no conflict, then check if SID is in mcc_sid_range. + String projection5[] = {MccSidRange.MCC}; + Cursor c5 = resolver.query(MccSidRange.CONTENT_URI, projection5, + MccSidRange.RANGE_LOW + "<=" + sid + " and " + + MccSidRange.RANGE_HIGH + ">=" + sid, + null, null); + if (c5 != null) { + if (c5.getCount() > 0) { + if (DBG) Rlog.d(LOG_TAG, "Query Range returned the cursor " + c5); + c5.moveToFirst(); + tmpMcc = c5.getInt(0); + if (DBG) Rlog.d(LOG_TAG, "SID found in mcc_sid_range. Return tmpMcc = " + tmpMcc); + c5.close(); + return tmpMcc; + } + c5.close(); + } + if (DBG) Rlog.d(LOG_TAG, "SID NOT found in mcc_sid_range."); + + if (DBG) Rlog.d(LOG_TAG, "Exit getMccByOtherFactors. Return tmpMcc = " + tmpMcc); + // If unknown MCC still could not be resolved, + return tmpMcc; + } + + /** + * Gets country information with given MCC. + */ + public String getIddByMcc(int mcc) { + if (DBG) Rlog.d(LOG_TAG, "Enter getHbpcdInfoByMCC."); + String idd = ""; + + Cursor c = null; + + String projection[] = {MccIdd.IDD}; + Cursor cur = resolver.query(MccIdd.CONTENT_URI, projection, + MccIdd.MCC + "=" + mcc, null, null); + if (cur != null) { + if (cur.getCount() > 0) { + if (DBG) Rlog.d(LOG_TAG, "Query Idd returned the cursor " + cur); + // TODO: for those country having more than 1 IDDs, need more information + // to decide which IDD would be used. currently just use the first 1. + cur.moveToFirst(); + idd = cur.getString(0); + if (DBG) Rlog.d(LOG_TAG, "IDD = " + idd); + + } + cur.close(); + } + if (c != null) c.close(); + + if (DBG) Rlog.d(LOG_TAG, "Exit getHbpcdInfoByMCC."); + return idd; + } +} diff --git a/telephony/java/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index f4eae8ef4b2a..f4eae8ef4b2a 100644 --- a/telephony/java/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java diff --git a/telephony/common/com/android/internal/telephony/SmsNumberUtils.java b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java new file mode 100644 index 000000000000..0d33af639113 --- /dev/null +++ b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java @@ -0,0 +1,627 @@ +/* + * 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. + */ + +package com.android.internal.telephony; + +import android.content.Context; +import android.database.Cursor; +import android.database.SQLException; +import android.os.Binder; +import android.os.Build; +import android.os.PersistableBundle; +import android.telephony.CarrierConfigManager; +import android.telephony.PhoneNumberUtils; +import android.telephony.Rlog; +import android.telephony.TelephonyManager; +import android.text.TextUtils; + +import com.android.internal.telephony.HbpcdLookup.MccIdd; +import com.android.internal.telephony.HbpcdLookup.MccLookup; + +import java.util.ArrayList; +import java.util.HashMap; + + +/** + * This class implements handle the MO SMS target address before sending. + * This is special for VZW requirement. Follow the specifications of assisted dialing + * of MO SMS while traveling on VZW CDMA, international CDMA or GSM markets. + * {@hide} + */ +public class SmsNumberUtils { + private static final String TAG = "SmsNumberUtils"; + private static final boolean DBG = Build.IS_DEBUGGABLE; + + private static final String PLUS_SIGN = "+"; + + private static final int NANP_SHORT_LENGTH = 7; + private static final int NANP_MEDIUM_LENGTH = 10; + private static final int NANP_LONG_LENGTH = 11; + + private static final int NANP_CC = 1; + private static final String NANP_NDD = "1"; + private static final String NANP_IDD = "011"; + + private static final int MIN_COUNTRY_AREA_LOCAL_LENGTH = 10; + + private static final int GSM_UMTS_NETWORK = 0; + private static final int CDMA_HOME_NETWORK = 1; + private static final int CDMA_ROAMING_NETWORK = 2; + + private static final int NP_NONE = 0; + private static final int NP_NANP_BEGIN = 1; + + /* <Phone Number>, <NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_LOCAL = NP_NANP_BEGIN; + + /* <Area_code>-<Phone Number>, <NXX>-<NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_AREA_LOCAL = NP_NANP_BEGIN + 1; + + /* <1>-<Area_code>-<Phone Number>, 1-<NXX>-<NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_NDD_AREA_LOCAL = NP_NANP_BEGIN + 2; + + /* <+><U.S.Country_code><Area_code><Phone Number>, +1-<NXX>-<NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_NBPCD_CC_AREA_LOCAL = NP_NANP_BEGIN + 3; + + /* <Local_IDD><Country_code><Area_code><Phone Number>, 001-1-<NXX>-<NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_LOCALIDD_CC_AREA_LOCAL = NP_NANP_BEGIN + 4; + + /* <+><Home_IDD><Country_code><Area_code><Phone Number>, +011-1-<NXX>-<NXX>-<XXXX> N[2-9] */ + private static final int NP_NANP_NBPCD_HOMEIDD_CC_AREA_LOCAL = NP_NANP_BEGIN + 5; + + private static final int NP_INTERNATIONAL_BEGIN = 100; + /* <+>-<Home_IDD>-<Country_code>-<Area_code>-<Phone Number>, +011-86-25-86281234 */ + private static final int NP_NBPCD_HOMEIDD_CC_AREA_LOCAL = NP_INTERNATIONAL_BEGIN; + + /* <Home_IDD>-<Country_code>-<Area_code>-<Phone Number>, 011-86-25-86281234 */ + private static final int NP_HOMEIDD_CC_AREA_LOCAL = NP_INTERNATIONAL_BEGIN + 1; + + /* <NBPCD>-<Country_code>-<Area_code>-<Phone Number>, +1-86-25-86281234 */ + private static final int NP_NBPCD_CC_AREA_LOCAL = NP_INTERNATIONAL_BEGIN + 2; + + /* <Local_IDD>-<Country_code>-<Area_code>-<Phone Number>, 00-86-25-86281234 */ + private static final int NP_LOCALIDD_CC_AREA_LOCAL = NP_INTERNATIONAL_BEGIN + 3; + + /* <Country_code>-<Area_code>-<Phone Number>, 86-25-86281234*/ + private static final int NP_CC_AREA_LOCAL = NP_INTERNATIONAL_BEGIN + 4; + + private static int[] ALL_COUNTRY_CODES = null; + private static int MAX_COUNTRY_CODES_LENGTH; + private static HashMap<String, ArrayList<String>> IDDS_MAPS = + new HashMap<String, ArrayList<String>>(); + + private static class NumberEntry { + public String number; + public String IDD; + public int countryCode; + public NumberEntry(String number) { + this.number = number; + } + } + + /** + * Breaks the given number down and formats it according to the rules + * for different number plans and different network. + * + * @param number destination number which need to be format + * @param activeMcc current network's mcc + * @param networkType current network type + * + * @return the number after formatting. + */ + private static String formatNumber(Context context, String number, + String activeMcc, + int networkType) { + if (number == null ) { + throw new IllegalArgumentException("number is null"); + } + + if (activeMcc == null || activeMcc.trim().length() == 0) { + throw new IllegalArgumentException("activeMcc is null or empty!"); + } + + String networkPortionNumber = PhoneNumberUtils.extractNetworkPortion(number); + if (networkPortionNumber == null || networkPortionNumber.length() == 0) { + throw new IllegalArgumentException("Number is invalid!"); + } + + NumberEntry numberEntry = new NumberEntry(networkPortionNumber); + ArrayList<String> allIDDs = getAllIDDs(context, activeMcc); + + // First check whether the number is a NANP number. + int nanpState = checkNANP(numberEntry, allIDDs); + if (DBG) Rlog.d(TAG, "NANP type: " + getNumberPlanType(nanpState)); + + if ((nanpState == NP_NANP_LOCAL) + || (nanpState == NP_NANP_AREA_LOCAL) + || (nanpState == NP_NANP_NDD_AREA_LOCAL)) { + return networkPortionNumber; + } else if (nanpState == NP_NANP_NBPCD_CC_AREA_LOCAL) { + if (networkType == CDMA_HOME_NETWORK + || networkType == CDMA_ROAMING_NETWORK) { + // Remove "+" + return networkPortionNumber.substring(1); + } else { + return networkPortionNumber; + } + } else if (nanpState == NP_NANP_LOCALIDD_CC_AREA_LOCAL) { + if (networkType == CDMA_HOME_NETWORK) { + return networkPortionNumber; + } else if (networkType == GSM_UMTS_NETWORK) { + // Remove the local IDD and replace with "+" + int iddLength = numberEntry.IDD != null ? numberEntry.IDD.length() : 0; + return PLUS_SIGN + networkPortionNumber.substring(iddLength); + } else if (networkType == CDMA_ROAMING_NETWORK) { + // Remove the local IDD + int iddLength = numberEntry.IDD != null ? numberEntry.IDD.length() : 0; + return networkPortionNumber.substring(iddLength); + } + } + + int internationalState = checkInternationalNumberPlan(context, numberEntry, allIDDs, + NANP_IDD); + if (DBG) Rlog.d(TAG, "International type: " + getNumberPlanType(internationalState)); + String returnNumber = null; + + switch (internationalState) { + case NP_NBPCD_HOMEIDD_CC_AREA_LOCAL: + if (networkType == GSM_UMTS_NETWORK) { + // Remove "+" + returnNumber = networkPortionNumber.substring(1); + } + break; + + case NP_NBPCD_CC_AREA_LOCAL: + // Replace "+" with "011" + returnNumber = NANP_IDD + networkPortionNumber.substring(1); + break; + + case NP_LOCALIDD_CC_AREA_LOCAL: + if (networkType == GSM_UMTS_NETWORK || networkType == CDMA_ROAMING_NETWORK) { + int iddLength = numberEntry.IDD != null ? numberEntry.IDD.length() : 0; + // Replace <Local IDD> to <Home IDD>("011") + returnNumber = NANP_IDD + networkPortionNumber.substring(iddLength); + } + break; + + case NP_CC_AREA_LOCAL: + int countryCode = numberEntry.countryCode; + + if (!inExceptionListForNpCcAreaLocal(numberEntry) + && networkPortionNumber.length() >= 11 && countryCode != NANP_CC) { + // Add "011" + returnNumber = NANP_IDD + networkPortionNumber; + } + break; + + case NP_HOMEIDD_CC_AREA_LOCAL: + returnNumber = networkPortionNumber; + break; + + default: + // Replace "+" with 011 in CDMA network if the number's country + // code is not in the HbpcdLookup database. + if (networkPortionNumber.startsWith(PLUS_SIGN) + && (networkType == CDMA_HOME_NETWORK || networkType == CDMA_ROAMING_NETWORK)) { + if (networkPortionNumber.startsWith(PLUS_SIGN + NANP_IDD)) { + // Only remove "+" + returnNumber = networkPortionNumber.substring(1); + } else { + // Replace "+" with "011" + returnNumber = NANP_IDD + networkPortionNumber.substring(1); + } + } + } + + if (returnNumber == null) { + returnNumber = networkPortionNumber; + } + return returnNumber; + } + + /** + * Query International direct dialing from HbpcdLookup.db + * for specified country code + * + * @param mcc current network's country code + * + * @return the IDD array list. + */ + private static ArrayList<String> getAllIDDs(Context context, String mcc) { + ArrayList<String> allIDDs = IDDS_MAPS.get(mcc); + if (allIDDs != null) { + return allIDDs; + } else { + allIDDs = new ArrayList<String>(); + } + + String projection[] = {MccIdd.IDD, MccIdd.MCC}; + String where = null; + + // if mcc is null : return all rows + // if mcc is empty-string : return those rows whose mcc is emptry-string + String[] selectionArgs = null; + if (mcc != null) { + where = MccIdd.MCC + "=?"; + selectionArgs = new String[] {mcc}; + } + + Cursor cursor = null; + try { + cursor = context.getContentResolver().query(MccIdd.CONTENT_URI, projection, + where, selectionArgs, null); + if (cursor.getCount() > 0) { + while (cursor.moveToNext()) { + String idd = cursor.getString(0); + if (!allIDDs.contains(idd)) { + allIDDs.add(idd); + } + } + } + } catch (SQLException e) { + Rlog.e(TAG, "Can't access HbpcdLookup database", e); + } finally { + if (cursor != null) { + cursor.close(); + } + } + + IDDS_MAPS.put(mcc, allIDDs); + + if (DBG) Rlog.d(TAG, "MCC = " + mcc + ", all IDDs = " + allIDDs); + return allIDDs; + } + + + /** + * Verify if the the destination number is a NANP number + * + * @param numberEntry including number and IDD array + * @param allIDDs the IDD array list of the current network's country code + * + * @return the number plan type related NANP + */ + private static int checkNANP(NumberEntry numberEntry, ArrayList<String> allIDDs) { + boolean isNANP = false; + String number = numberEntry.number; + + if (number.length() == NANP_SHORT_LENGTH) { + // 7 digits - Seven digit phone numbers + char firstChar = number.charAt(0); + if (firstChar >= '2' && firstChar <= '9') { + isNANP = true; + for (int i=1; i< NANP_SHORT_LENGTH; i++ ) { + char c= number.charAt(i); + if (!PhoneNumberUtils.isISODigit(c)) { + isNANP = false; + break; + } + } + } + if (isNANP) { + return NP_NANP_LOCAL; + } + } else if (number.length() == NANP_MEDIUM_LENGTH) { + // 10 digits - Three digit area code followed by seven digit phone numbers/ + if (isNANP(number)) { + return NP_NANP_AREA_LOCAL; + } + } else if (number.length() == NANP_LONG_LENGTH) { + // 11 digits - One digit U.S. NDD(National Direct Dial) prefix '1', + // followed by three digit area code and seven digit phone numbers + if (isNANP(number)) { + return NP_NANP_NDD_AREA_LOCAL; + } + } else if (number.startsWith(PLUS_SIGN)) { + number = number.substring(1); + if (number.length() == NANP_LONG_LENGTH) { + // '+' and 11 digits -'+', followed by NANP CC prefix '1' followed by + // three digit area code and seven digit phone numbers + if (isNANP(number)) { + return NP_NANP_NBPCD_CC_AREA_LOCAL; + } + } else if (number.startsWith(NANP_IDD) && number.length() == NANP_LONG_LENGTH + 3) { + // '+' and 14 digits -'+', followed by NANP IDD "011" followed by NANP CC + // prefix '1' followed by three digit area code and seven digit phone numbers + number = number.substring(3); + if (isNANP(number)) { + return NP_NANP_NBPCD_HOMEIDD_CC_AREA_LOCAL; + } + } + } else { + // Check whether it's NP_NANP_LOCALIDD_CC_AREA_LOCAL + for (String idd : allIDDs) { + if (number.startsWith(idd)) { + String number2 = number.substring(idd.length()); + if(number2 !=null && number2.startsWith(String.valueOf(NANP_CC))){ + if (isNANP(number2)) { + numberEntry.IDD = idd; + return NP_NANP_LOCALIDD_CC_AREA_LOCAL; + } + } + } + } + } + + return NP_NONE; + } + + private static boolean isNANP(String number) { + if (number.length() == NANP_MEDIUM_LENGTH + || (number.length() == NANP_LONG_LENGTH && number.startsWith(NANP_NDD))) { + if (number.length() == NANP_LONG_LENGTH) { + number = number.substring(1); + } + return (PhoneNumberUtils.isNanp(number)); + } + return false; + } + + /** + * Verify if the the destination number is an internal number + * + * @param numberEntry including number and IDD array + * @param allIDDs the IDD array list of the current network's country code + * + * @return the number plan type related international number + */ + private static int checkInternationalNumberPlan(Context context, NumberEntry numberEntry, + ArrayList<String> allIDDs,String homeIDD) { + String number = numberEntry.number; + int countryCode = -1; + + if (number.startsWith(PLUS_SIGN)) { + // +xxxxxxxxxx + String numberNoNBPCD = number.substring(1); + if (numberNoNBPCD.startsWith(homeIDD)) { + // +011xxxxxxxx + String numberCountryAreaLocal = numberNoNBPCD.substring(homeIDD.length()); + if ((countryCode = getCountryCode(context, numberCountryAreaLocal)) > 0) { + numberEntry.countryCode = countryCode; + return NP_NBPCD_HOMEIDD_CC_AREA_LOCAL; + } + } else if ((countryCode = getCountryCode(context, numberNoNBPCD)) > 0) { + numberEntry.countryCode = countryCode; + return NP_NBPCD_CC_AREA_LOCAL; + } + + } else if (number.startsWith(homeIDD)) { + // 011xxxxxxxxx + String numberCountryAreaLocal = number.substring(homeIDD.length()); + if ((countryCode = getCountryCode(context, numberCountryAreaLocal)) > 0) { + numberEntry.countryCode = countryCode; + return NP_HOMEIDD_CC_AREA_LOCAL; + } + } else { + for (String exitCode : allIDDs) { + if (number.startsWith(exitCode)) { + String numberNoIDD = number.substring(exitCode.length()); + if ((countryCode = getCountryCode(context, numberNoIDD)) > 0) { + numberEntry.countryCode = countryCode; + numberEntry.IDD = exitCode; + return NP_LOCALIDD_CC_AREA_LOCAL; + } + } + } + + if (!number.startsWith("0") && (countryCode = getCountryCode(context, number)) > 0) { + numberEntry.countryCode = countryCode; + return NP_CC_AREA_LOCAL; + } + } + return NP_NONE; + } + + /** + * Returns the country code from the given number. + */ + private static int getCountryCode(Context context, String number) { + int countryCode = -1; + if (number.length() >= MIN_COUNTRY_AREA_LOCAL_LENGTH) { + // Check Country code + int[] allCCs = getAllCountryCodes(context); + if (allCCs == null) { + return countryCode; + } + + int[] ccArray = new int[MAX_COUNTRY_CODES_LENGTH]; + for (int i = 0; i < MAX_COUNTRY_CODES_LENGTH; i ++) { + ccArray[i] = Integer.parseInt(number.substring(0, i+1)); + } + + for (int i = 0; i < allCCs.length; i ++) { + int tempCC = allCCs[i]; + for (int j = 0; j < MAX_COUNTRY_CODES_LENGTH; j ++) { + if (tempCC == ccArray[j]) { + if (DBG) Rlog.d(TAG, "Country code = " + tempCC); + return tempCC; + } + } + } + } + + return countryCode; + } + + /** + * Gets all country Codes information with given MCC. + */ + private static int[] getAllCountryCodes(Context context) { + if (ALL_COUNTRY_CODES != null) { + return ALL_COUNTRY_CODES; + } + + Cursor cursor = null; + try { + String projection[] = {MccLookup.COUNTRY_CODE}; + cursor = context.getContentResolver().query(MccLookup.CONTENT_URI, + projection, null, null, null); + + if (cursor.getCount() > 0) { + ALL_COUNTRY_CODES = new int[cursor.getCount()]; + int i = 0; + while (cursor.moveToNext()) { + int countryCode = cursor.getInt(0); + ALL_COUNTRY_CODES[i++] = countryCode; + int length = String.valueOf(countryCode).trim().length(); + if (length > MAX_COUNTRY_CODES_LENGTH) { + MAX_COUNTRY_CODES_LENGTH = length; + } + } + } + } catch (SQLException e) { + Rlog.e(TAG, "Can't access HbpcdLookup database", e); + } finally { + if (cursor != null) { + cursor.close(); + } + } + return ALL_COUNTRY_CODES; + } + + private static boolean inExceptionListForNpCcAreaLocal(NumberEntry numberEntry) { + int countryCode = numberEntry.countryCode; + boolean result = (numberEntry.number.length() == 12 + && (countryCode == 7 || countryCode == 20 + || countryCode == 65 || countryCode == 90)); + return result; + } + + private static String getNumberPlanType(int state) { + String numberPlanType = "Number Plan type (" + state + "): "; + + if (state == NP_NANP_LOCAL) { + numberPlanType = "NP_NANP_LOCAL"; + } else if (state == NP_NANP_AREA_LOCAL) { + numberPlanType = "NP_NANP_AREA_LOCAL"; + } else if (state == NP_NANP_NDD_AREA_LOCAL) { + numberPlanType = "NP_NANP_NDD_AREA_LOCAL"; + } else if (state == NP_NANP_NBPCD_CC_AREA_LOCAL) { + numberPlanType = "NP_NANP_NBPCD_CC_AREA_LOCAL"; + } else if (state == NP_NANP_LOCALIDD_CC_AREA_LOCAL) { + numberPlanType = "NP_NANP_LOCALIDD_CC_AREA_LOCAL"; + } else if (state == NP_NANP_NBPCD_HOMEIDD_CC_AREA_LOCAL) { + numberPlanType = "NP_NANP_NBPCD_HOMEIDD_CC_AREA_LOCAL"; + } else if (state == NP_NBPCD_HOMEIDD_CC_AREA_LOCAL) { + numberPlanType = "NP_NBPCD_HOMEIDD_CC_AREA_LOCAL"; + } else if (state == NP_HOMEIDD_CC_AREA_LOCAL) { + numberPlanType = "NP_HOMEIDD_CC_AREA_LOCAL"; + } else if (state == NP_NBPCD_CC_AREA_LOCAL) { + numberPlanType = "NP_NBPCD_CC_AREA_LOCAL"; + } else if (state == NP_LOCALIDD_CC_AREA_LOCAL) { + numberPlanType = "NP_LOCALIDD_CC_AREA_LOCAL"; + } else if (state == NP_CC_AREA_LOCAL) { + numberPlanType = "NP_CC_AREA_LOCAL"; + } else { + numberPlanType = "Unknown type"; + } + return numberPlanType; + } + + /** + * Filter the destination number if using VZW sim card. + */ + public static String filterDestAddr(Context context, int subId, String destAddr) { + if (DBG) Rlog.d(TAG, "enter filterDestAddr. destAddr=\"" + Rlog.pii(TAG, destAddr) + "\"" ); + + if (destAddr == null || !PhoneNumberUtils.isGlobalPhoneNumber(destAddr)) { + Rlog.w(TAG, "destAddr" + Rlog.pii(TAG, destAddr) + + " is not a global phone number! Nothing changed."); + return destAddr; + } + + final TelephonyManager telephonyManager = ((TelephonyManager) context + .getSystemService(Context.TELEPHONY_SERVICE)).createForSubscriptionId(subId); + final String networkOperator = telephonyManager.getNetworkOperator(); + String result = null; + + if (needToConvert(context, subId)) { + final int networkType = getNetworkType(telephonyManager); + if (networkType != -1 && !TextUtils.isEmpty(networkOperator)) { + String networkMcc = networkOperator.substring(0, 3); + if (networkMcc != null && networkMcc.trim().length() > 0) { + result = formatNumber(context, destAddr, networkMcc, networkType); + } + } + } + + if (DBG) { + Rlog.d(TAG, "destAddr is " + ((result != null)?"formatted.":"not formatted.")); + Rlog.d(TAG, "leave filterDestAddr, new destAddr=\"" + (result != null ? Rlog.pii(TAG, + result) : Rlog.pii(TAG, destAddr)) + "\""); + } + return result != null ? result : destAddr; + } + + /** + * Returns the current network type + */ + private static int getNetworkType(TelephonyManager telephonyManager) { + int networkType = -1; + int phoneType = telephonyManager.getPhoneType(); + + if (phoneType == PhoneConstants.PHONE_TYPE_GSM) { + networkType = GSM_UMTS_NETWORK; + } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) { + if (isInternationalRoaming(telephonyManager)) { + networkType = CDMA_ROAMING_NETWORK; + } else { + networkType = CDMA_HOME_NETWORK; + } + } else { + if (DBG) Rlog.w(TAG, "warning! unknown mPhoneType value=" + phoneType); + } + + return networkType; + } + + private static boolean isInternationalRoaming(TelephonyManager telephonyManager) { + String operatorIsoCountry = telephonyManager.getNetworkCountryIso(); + String simIsoCountry = telephonyManager.getSimCountryIso(); + boolean internationalRoaming = !TextUtils.isEmpty(operatorIsoCountry) + && !TextUtils.isEmpty(simIsoCountry) + && !simIsoCountry.equals(operatorIsoCountry); + if (internationalRoaming) { + if ("us".equals(simIsoCountry)) { + internationalRoaming = !"vi".equals(operatorIsoCountry); + } else if ("vi".equals(simIsoCountry)) { + internationalRoaming = !"us".equals(operatorIsoCountry); + } + } + return internationalRoaming; + } + + private static boolean needToConvert(Context context, int subId) { + // Calling package may not have READ_PHONE_STATE which is required for getConfig(). + // Clear the calling identity so that it is called as self. + final long identity = Binder.clearCallingIdentity(); + try { + CarrierConfigManager configManager = (CarrierConfigManager) + context.getSystemService(Context.CARRIER_CONFIG_SERVICE); + if (configManager != null) { + PersistableBundle bundle = configManager.getConfigForSubId(subId); + if (bundle != null) { + return bundle.getBoolean(CarrierConfigManager + .KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL); + } + } + } finally { + Binder.restoreCallingIdentity(identity); + } + // by default this value is false + return false; + } +} diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 67b252e52db9..bc29b595b0bb 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -3962,13 +3962,21 @@ public final class Telephony { public static final Uri CONTENT_URI = Uri.parse("content://cellbroadcasts"); /** - * The id of the subscription which received this cell broadcast message. + * The subscription which received this cell broadcast message. + * @deprecated use {@link #SLOT_INDEX} instead. * <P>Type: INTEGER</P> * @hide */ public static final String SUB_ID = "sub_id"; /** + * The slot which received this cell broadcast message. + * <P>Type: INTEGER</P> + * @hide + */ + public static final String SLOT_INDEX = "slot_index"; + + /** * Message geographical scope. Valid values are: * <ul> * <li>{@link android.telephony.SmsCbMessage#GEOGRAPHICAL_SCOPE_CELL_WIDE}. meaning the @@ -4202,7 +4210,7 @@ public final class Telephony { public static final String MAXIMUM_WAIT_TIME = "maximum_wait_time"; /** - * Query columns for instantiating {@link android.telephony.CellBroadcastMessage} objects. + * Query columns for instantiating com.android.cellbroadcastreceiver.CellBroadcastMessage. * @hide */ @NonNull @@ -4235,6 +4243,7 @@ public final class Telephony { */ public static final String[] QUERY_COLUMNS_FWK = { _ID, + SLOT_INDEX, GEOGRAPHICAL_SCOPE, PLMN, LAC, diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java index 432978d1c866..b7dab161c331 100644 --- a/telephony/java/android/telephony/CellIdentity.java +++ b/telephony/java/android/telephony/CellIdentity.java @@ -35,6 +35,15 @@ public abstract class CellIdentity implements Parcelable { /** @hide */ public static final int INVALID_CHANNEL_NUMBER = -1; + /** + * parameters for validation + * @hide + */ + public static final int MCC_LENGTH = 3; + + private static final int MNC_MIN_LENGTH = 2; + private static final int MNC_MAX_LENGTH = 3; + // Log tag /** @hide */ protected final String mTag; @@ -207,6 +216,17 @@ public abstract class CellIdentity implements Parcelable { dest.writeString(mAlphaShort); } + /** Used by phone interface manager to verify if a given string is valid MccMnc + * @hide + */ + public static boolean isValidPlmn(@NonNull String plmn) { + if (plmn.length() < MCC_LENGTH + MNC_MIN_LENGTH + || plmn.length() > MCC_LENGTH + MNC_MAX_LENGTH) { + return false; + } + return (isMcc(plmn.substring(0, MCC_LENGTH)) && isMnc(plmn.substring(MCC_LENGTH))); + } + /** * Construct from Parcel * @hide @@ -267,10 +287,10 @@ public abstract class CellIdentity implements Parcelable { /** @hide */ private static boolean isMcc(@NonNull String mcc) { // ensure no out of bounds indexing - if (mcc.length() != 3) return false; + if (mcc.length() != MCC_LENGTH) return false; // Character.isDigit allows all unicode digits, not just [0-9] - for (int i = 0; i < 3; i++) { + for (int i = 0; i < MCC_LENGTH; i++) { if (mcc.charAt(i) < '0' || mcc.charAt(i) > '9') return false; } @@ -280,7 +300,7 @@ public abstract class CellIdentity implements Parcelable { /** @hide */ private static boolean isMnc(@NonNull String mnc) { // ensure no out of bounds indexing - if (mnc.length() < 2 || mnc.length() > 3) return false; + if (mnc.length() < MNC_MIN_LENGTH || mnc.length() > MNC_MAX_LENGTH) return false; // Character.isDigit allows all unicode digits, not just [0-9] for (int i = 0; i < mnc.length(); i++) { @@ -289,4 +309,5 @@ public abstract class CellIdentity implements Parcelable { return true; } + } diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java index 43bc85c9f2bd..d105fe3ddc71 100644 --- a/telephony/java/android/telephony/ModemActivityInfo.java +++ b/telephony/java/android/telephony/ModemActivityInfo.java @@ -20,11 +20,10 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; - import android.os.SystemClock; import android.util.Range; + import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -64,17 +63,20 @@ public final class ModemActivityInfo implements Parcelable { mTimestamp = timestamp; mSleepTimeMs = sleepTimeMs; mIdleTimeMs = idleTimeMs; - if (txTimeMs != null) { - populateTransmitPowerRange(txTimeMs); - } + populateTransmitPowerRange(txTimeMs); mRxTimeMs = rxTimeMs; } /** helper API to populate tx power range for each bucket **/ private void populateTransmitPowerRange(@NonNull int[] transmitPowerMs) { - for (int i = 0; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) { + int i = 0; + for ( ; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) { mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], transmitPowerMs[i])); } + // Make sure that mTransmitPowerInfo is fully initialized. + for ( ; i < TX_POWER_LEVELS; i++) { + mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], 0)); + } } @Override diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 1801caeb0660..1ba0a41024ed 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -374,7 +374,7 @@ public class PhoneStateListener { @SystemApi @TestApi @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) - public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 0x10000000; + public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 0x10000000; /** * Listen for the emergency number placed from an outgoing SMS. @@ -387,7 +387,7 @@ public class PhoneStateListener { @SystemApi @TestApi @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) - public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 0x20000000; + public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 0x20000000; /* * Subscription used to listen to the phone state changes diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 8587be7579e6..1d00b4f51fdc 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -963,6 +963,9 @@ public class ServiceState implements Parcelable { case RIL_RADIO_TECHNOLOGY_LTE_CA: rtString = "LTE_CA"; break; + case RIL_RADIO_TECHNOLOGY_NR: + rtString = "LTE_NR"; + break; default: rtString = "Unexpected"; Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt); @@ -1529,6 +1532,7 @@ public class ServiceState implements Parcelable { return AccessNetworkType.CDMA2000; case RIL_RADIO_TECHNOLOGY_LTE: case RIL_RADIO_TECHNOLOGY_LTE_CA: + case RIL_RADIO_TECHNOLOGY_NR: return AccessNetworkType.EUTRAN; case RIL_RADIO_TECHNOLOGY_IWLAN: return AccessNetworkType.IWLAN; @@ -1577,6 +1581,8 @@ public class ServiceState implements Parcelable { return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN; case TelephonyManager.NETWORK_TYPE_LTE_CA: return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA; + case TelephonyManager.NETWORK_TYPE_NR: + return ServiceState.RIL_RADIO_TECHNOLOGY_NR; default: return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN; } @@ -1667,7 +1673,8 @@ public class ServiceState implements Parcelable { || radioTechnology == RIL_RADIO_TECHNOLOGY_GSM || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA || radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN - || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA; + || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA + || radioTechnology == RIL_RADIO_TECHNOLOGY_NR; } diff --git a/telephony/java/android/telephony/SmsCbMessage.java b/telephony/java/android/telephony/SmsCbMessage.java index c078764cfa24..dc991b9a3ea7 100644 --- a/telephony/java/android/telephony/SmsCbMessage.java +++ b/telephony/java/android/telephony/SmsCbMessage.java @@ -207,17 +207,19 @@ public final class SmsCbMessage implements Parcelable { /** CMAS warning area coordinates. */ private final List<Geometry> mGeometries; + private int mSlotIndex = 0; + /** * Create a new SmsCbMessage with the specified data. */ public SmsCbMessage(int messageFormat, int geographicalScope, int serialNumber, @NonNull SmsCbLocation location, int serviceCategory, @Nullable String language, @Nullable String body, int priority, @Nullable SmsCbEtwsInfo etwsWarningInfo, - @Nullable SmsCbCmasInfo cmasWarningInfo) { + @Nullable SmsCbCmasInfo cmasWarningInfo, int slotIndex) { this(messageFormat, geographicalScope, serialNumber, location, serviceCategory, language, body, priority, etwsWarningInfo, cmasWarningInfo, 0 /* maximumWaitingTime */, - null /* geometries */, System.currentTimeMillis()); + null /* geometries */, System.currentTimeMillis(), slotIndex); } /** @@ -227,7 +229,8 @@ public final class SmsCbMessage implements Parcelable { public SmsCbMessage(int messageFormat, int geographicalScope, int serialNumber, SmsCbLocation location, int serviceCategory, String language, String body, int priority, SmsCbEtwsInfo etwsWarningInfo, SmsCbCmasInfo cmasWarningInfo, - int maximumWaitTimeSec, List<Geometry> geometries, long receivedTimeMillis) { + int maximumWaitTimeSec, List<Geometry> geometries, long receivedTimeMillis, + int slotIndex) { mMessageFormat = messageFormat; mGeographicalScope = geographicalScope; mSerialNumber = serialNumber; @@ -241,6 +244,7 @@ public final class SmsCbMessage implements Parcelable { mReceivedTimeMillis = receivedTimeMillis; mGeometries = geometries; mMaximumWaitTimeSec = maximumWaitTimeSec; + mSlotIndex = slotIndex; } /** @@ -278,6 +282,7 @@ public final class SmsCbMessage implements Parcelable { String geoStr = in.readString(); mGeometries = geoStr != null ? CbGeoUtils.parseGeometriesFromString(geoStr) : null; mMaximumWaitTimeSec = in.readInt(); + mSlotIndex = in.readInt(); } /** @@ -312,6 +317,7 @@ public final class SmsCbMessage implements Parcelable { dest.writeString( mGeometries != null ? CbGeoUtils.encodeGeometriesToString(mGeometries) : null); dest.writeInt(mMaximumWaitTimeSec); + dest.writeInt(mSlotIndex); } @NonNull @@ -423,6 +429,14 @@ public final class SmsCbMessage implements Parcelable { } /** + * Get the slotIndex associated with this message. + * @return the slotIndex associated with this message + */ + public int getSlotIndex() { + return mSlotIndex; + } + + /** * Get the message format ({@link #MESSAGE_FORMAT_3GPP} or {@link #MESSAGE_FORMAT_3GPP2}). * @return an integer representing 3GPP or 3GPP2 message format */ @@ -502,6 +516,7 @@ public final class SmsCbMessage implements Parcelable { + (mEtwsWarningInfo != null ? (", " + mEtwsWarningInfo.toString()) : "") + (mCmasWarningInfo != null ? (", " + mCmasWarningInfo.toString()) : "") + ", maximumWaitingTime = " + mMaximumWaitTimeSec + + ", slotIndex = " + mSlotIndex + ", geo=" + (mGeometries != null ? CbGeoUtils.encodeGeometriesToString(mGeometries) : "null") + '}'; @@ -522,6 +537,7 @@ public final class SmsCbMessage implements Parcelable { @NonNull public ContentValues getContentValues() { ContentValues cv = new ContentValues(16); + cv.put(CellBroadcasts.SLOT_INDEX, mSlotIndex); cv.put(CellBroadcasts.GEOGRAPHICAL_SCOPE, mGeographicalScope); if (mLocation.getPlmn() != null) { cv.put(CellBroadcasts.PLMN, mLocation.getPlmn()); @@ -563,6 +579,7 @@ public final class SmsCbMessage implements Parcelable { } cv.put(CellBroadcasts.MAXIMUM_WAIT_TIME, mMaximumWaitTimeSec); + cv.put(CellBroadcasts.SLOT_INDEX, mSlotIndex); return cv; } @@ -584,6 +601,7 @@ public final class SmsCbMessage implements Parcelable { String body = cursor.getString(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_BODY)); int format = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_FORMAT)); int priority = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_PRIORITY)); + int slotIndex = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.SLOT_INDEX)); String plmn; int plmnColumn = cursor.getColumnIndex(CellBroadcasts.PLMN); @@ -681,7 +699,7 @@ public final class SmsCbMessage implements Parcelable { return new SmsCbMessage(format, geoScope, serialNum, location, category, language, body, priority, etwsInfo, cmasInfo, maximumWaitTimeSec, geometries, - receivedTimeMillis); + receivedTimeMillis, slotIndex); } /** diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index a89328836e2a..1b876575a742 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2110,19 +2110,6 @@ public class SubscriptionManager { return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getMaxPhoneCount(); } - /** - * When getPhoneCount and getMaxPhoneCount return different value, isValidPhoneId being true - * doesn't mean the phoneId has a corresponding active slot / logical modem. If a DSDS capable - * device is in single SIM mode, phoneId=1 is valid but not active. - * - * TODO: b/139642279 combine with SubscriptionManager#isValidPhoneId when phone objects - * are dynamically allocated instead of always based on getMaxPhoneCount. - * @hide - */ - public static boolean isActivePhoneId(int slotIndex) { - return slotIndex < TelephonyManager.getDefault().getPhoneCount(); - } - /** @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f3215d4d0e8b..2442023ee27c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -70,7 +70,6 @@ import android.telephony.Annotation.NetworkType; import android.telephony.Annotation.RadioPowerState; import android.telephony.Annotation.SimActivationState; import android.telephony.VisualVoicemailService.VisualVoicemailTask; -import android.telephony.data.ApnSetting; import android.telephony.emergency.EmergencyNumber; import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories; import android.telephony.ims.ImsMmTelManager; @@ -1172,6 +1171,35 @@ public class TelephonyManager { "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING"; /** + * Broadcast intent that indicates multi-SIM configuration is changed. For example, it changed + * from single SIM capable to dual-SIM capable (DSDS or DSDA) or triple-SIM mode. + * + * It doesn't indicate how many subscriptions are actually active, or which states SIMs are, + * or that all steps during multi-SIM change are done. To know those information you still need + * to listen to SIM_STATE changes or active subscription changes. + * + * See extra of {@link #EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED} for updated value. + */ + public static final String ACTION_MULTI_SIM_CONFIG_CHANGED = + "android.telephony.action.MULTI_SIM_CONFIG_CHANGED"; + + + /** + * The number of active SIM supported by current multi-SIM config. It's not related to how many + * SIM/subscriptions are currently active. + * + * For single SIM mode, it's 1. + * For DSDS or DSDA mode, it's 2. + * For triple-SIM mode, it's 3. + * + * Extra of {@link #ACTION_MULTI_SIM_CONFIG_CHANGED}. + * + * type: integer + */ + public static final String EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED = + "android.telephony.extra.NUM_OF_ACTIVE_SIM_SUPPORTED"; + + /** * @hide */ public static final String USSD_RESPONSE = "USSD_RESPONSE"; @@ -1867,11 +1895,23 @@ public class TelephonyManager { /** * Returns the Network Access Identifier (NAI). Return null if NAI is not available. * - * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). + * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or + * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier + * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a + * managed profile on the device; for more details see <a + * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner + * access is deprecated and will be removed in a future release. + * + * <ul> + * <li>If the calling app's target SDK is API level 28 or lower and the app has the + * READ_PHONE_STATE permission then null is returned.</li> + * <li>If the calling app's target SDK is API level 28 or lower and the app does not have + * the READ_PHONE_STATE permission, or if the calling app is targeting API level 29 or + * higher, then a SecurityException is thrown.</li> + * </ul> */ - @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges - @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @SuppressAutoDoc // No support for device / profile owner or carrier privileges (b/72967236). + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getNai() { return getNaiBySubscriberId(getSubId()); } @@ -1879,6 +1919,21 @@ public class TelephonyManager { /** * Returns the NAI. Return null if NAI is not available. * + * <p>Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or + * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier + * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a + * managed profile on the device; for more details see <a + * href="https://developer.android.com/work/managed-profiles">Work profiles</a>. Profile owner + * access is deprecated and will be removed in a future release. + * + * <ul> + * <li>If the calling app's target SDK is API level 28 or lower and the app has the + * READ_PHONE_STATE permission then null is returned.</li> + * <li>If the calling app's target SDK is API level 28 or lower and the app does not have + * the READ_PHONE_STATE permission, or if the calling app is targeting API level 29 or + * higher, then a SecurityException is thrown.</li> + * </ul> + * * @param slotIndex of which Nai is returned */ /** {@hide}*/ @@ -2717,6 +2772,8 @@ public class TelephonyManager { /** Class of broadly defined "4G" networks. {@hide} */ @UnsupportedAppUsage public static final int NETWORK_CLASS_4_G = 3; + /** Class of broadly defined "5G" networks. {@hide} */ + public static final int NETWORK_CLASS_5_G = 4; /** * Return general class of network type, such as "3G" or "4G". In cases @@ -2749,6 +2806,8 @@ public class TelephonyManager { case NETWORK_TYPE_IWLAN: case NETWORK_TYPE_LTE_CA: return NETWORK_CLASS_4_G; + case NETWORK_TYPE_NR: + return NETWORK_CLASS_5_G; default: return NETWORK_CLASS_UNKNOWN; } @@ -6793,6 +6852,40 @@ public class TelephonyManager { } /** + * Replace the contents of the forbidden PLMN SIM file with the provided values. + * Passing an empty list will clear the contents of the EFfplmn file. + * If the provided list is shorter than the size of EFfplmn, then the list will be padded + * up to the file size with 'FFFFFF'. (required by 3GPP TS 31.102 spec 4.2.16) + * If the list is longer than the size of EFfplmn, then the file will be written from the + * beginning of the list up to the file size. + * + * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). + * + * @param fplmns a list of PLMNs to be forbidden. + * + * @return number of PLMNs that were successfully written to the SIM FPLMN list. + * This may be less than the number of PLMNs passed in where the SIM file does not have enough + * room for all of the values passed in. Return -1 in the event of an unexpected failure + */ + @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges + @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) + public int setForbiddenPlmns(@NonNull List<String> fplmns) { + try { + ITelephony telephony = getITelephony(); + if (telephony == null) return 0; + return telephony.setForbiddenPlmns( + getSubId(), APPTYPE_USIM, fplmns, getOpPackageName()); + } catch (RemoteException ex) { + Rlog.e(TAG, "setForbiddenPlmns RemoteException: " + ex.getMessage()); + } catch (NullPointerException ex) { + // This could happen before phone starts + Rlog.e(TAG, "setForbiddenPlmns NullPointerException: " + ex.getMessage()); + } + return 0; + } + + /** * Get P-CSCF address from PCO after data connection is established or modified. * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN * @return array of P-CSCF address @@ -11375,10 +11468,13 @@ public class TelephonyManager { * 3) APN type is whitelisted. E.g. MMS is whitelisted if * {@link SubscriptionManager#setAlwaysAllowMmsData} is turned on. * + * @param apnType Value indicating the apn type. Apn types are defined in {@link ApnSetting}. * @return whether data is enabled for a apn type. * * @hide */ + @SystemApi + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(@ApnType int apnType) { String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>"; try { diff --git a/telephony/java/android/telephony/TelephonyScanManager.java b/telephony/java/android/telephony/TelephonyScanManager.java index 28747dab38db..9ff851598648 100644 --- a/telephony/java/android/telephony/TelephonyScanManager.java +++ b/telephony/java/android/telephony/TelephonyScanManager.java @@ -104,7 +104,7 @@ public final class TelephonyScanManager { private final Looper mLooper; private final Messenger mMessenger; - private SparseArray<NetworkScanInfo> mScanInfo = new SparseArray<NetworkScanInfo>(); + private final SparseArray<NetworkScanInfo> mScanInfo = new SparseArray<NetworkScanInfo>(); public TelephonyScanManager() { HandlerThread thread = new HandlerThread(TAG); @@ -204,14 +204,16 @@ public final class TelephonyScanManager { try { ITelephony telephony = getITelephony(); if (telephony != null) { - int scanId = telephony.requestNetworkScan( - subId, request, mMessenger, new Binder(), callingPackage); - if (scanId == INVALID_SCAN_ID) { - Rlog.e(TAG, "Failed to initiate network scan"); - return null; + synchronized (mScanInfo) { + int scanId = telephony.requestNetworkScan( + subId, request, mMessenger, new Binder(), callingPackage); + if (scanId == INVALID_SCAN_ID) { + Rlog.e(TAG, "Failed to initiate network scan"); + return null; + } + saveScanInfo(scanId, request, executor, callback); + return new NetworkScan(scanId, subId); } - saveScanInfo(scanId, request, executor, callback); - return new NetworkScan(scanId, subId); } } catch (RemoteException ex) { Rlog.e(TAG, "requestNetworkScan RemoteException", ex); @@ -223,9 +225,7 @@ public final class TelephonyScanManager { private void saveScanInfo( int id, NetworkScanRequest request, Executor executor, NetworkScanCallback callback) { - synchronized (mScanInfo) { - mScanInfo.put(id, new NetworkScanInfo(request, executor, callback)); - } + mScanInfo.put(id, new NetworkScanInfo(request, executor, callback)); } private ITelephony getITelephony() { diff --git a/telephony/java/android/telephony/euicc/EuiccManager.java b/telephony/java/android/telephony/euicc/EuiccManager.java index cabd4dfd91f1..5a90cb13a548 100644 --- a/telephony/java/android/telephony/euicc/EuiccManager.java +++ b/telephony/java/android/telephony/euicc/EuiccManager.java @@ -32,6 +32,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.telephony.TelephonyManager; +import android.telephony.euicc.EuiccCardManager.ResetOption; import com.android.internal.telephony.euicc.IEuiccController; @@ -821,17 +822,22 @@ public class EuiccManager { } /** - * Erase all subscriptions and reset the eUICC. + * Erase all operational subscriptions and reset the eUICC. * * <p>Requires that the calling app has the * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission. * * @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 + * * @hide */ @SystemApi @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) - public void eraseSubscriptions(PendingIntent callbackIntent) { + @Deprecated + public void eraseSubscriptions(@NonNull PendingIntent callbackIntent) { if (!isEnabled()) { sendUnavailableError(callbackIntent); return; @@ -844,6 +850,32 @@ public class EuiccManager { } /** + * Erase all specific subscriptions and reset the eUICC. + * + * <p>Requires that the calling app has the + * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission. + * + * @param options flag indicating specific set of subscriptions to erase + * @param callbackIntent a PendingIntent to launch when the operation completes. + * + * @hide + */ + @SystemApi + @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) + public void eraseSubscriptionsWithOptions( + @ResetOption int options, @NonNull PendingIntent callbackIntent) { + if (!isEnabled()) { + sendUnavailableError(callbackIntent); + return; + } + try { + getIEuiccController().eraseSubscriptionsWithOptions(mCardId, options, callbackIntent); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Ensure that subscriptions will be retained on the next factory reset. * * <p>By default, all subscriptions on the eUICC are erased the first time a device boots (ever diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index a1a7fcc5dd51..2fad8479178e 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -183,19 +183,17 @@ public class ImsMmTelManager { /** * Notifies the framework when the IMS Provider is registered to the IMS network. * - * @param imsTransportType the radio access technology. Valid values are defined in - * {@link android.telephony.AccessNetworkConstants.TransportType}. + * @param imsTransportType the radio access technology. */ - public void onRegistered(int imsTransportType) { + public void onRegistered(@AccessNetworkConstants.TransportType int imsTransportType) { } /** * Notifies the framework when the IMS Provider is trying to register the IMS network. * - * @param imsTransportType the radio access technology. Valid values are defined in - * {@link android.telephony.AccessNetworkConstants.TransportType}. + * @param imsTransportType the radio access technology. */ - public void onRegistering(int imsTransportType) { + public void onRegistering(@AccessNetworkConstants.TransportType int imsTransportType) { } /** @@ -207,15 +205,14 @@ public class ImsMmTelManager { } /** - * A failure has occurred when trying to handover registration to another technology type, - * defined in {@link android.telephony.AccessNetworkConstants.TransportType} + * A failure has occurred when trying to handover registration to another technology type. * - * @param imsTransportType The - * {@link android.telephony.AccessNetworkConstants.TransportType} - * transport type that has failed to handover registration to. + * @param imsTransportType The transport type that has failed to handover registration to. * @param info A {@link ImsReasonInfo} that identifies the reason for failure. */ - public void onTechnologyChangeFailed(int imsTransportType, @Nullable ImsReasonInfo info) { + public void onTechnologyChangeFailed( + @AccessNetworkConstants.TransportType int imsTransportType, + @Nullable ImsReasonInfo info) { } /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 4d9057975727..fd7ec561faef 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1612,6 +1612,18 @@ interface ITelephony { String[] getForbiddenPlmns(int subId, int appType, String callingPackage); /** + * Set the forbidden PLMN list from the givven app type (ex APPTYPE_USIM) on a particular + * subscription. + * + * @param subId subId the id of the subscription + * @param appType appType the uicc app type, must be USIM or SIM. + * @param fplmns plmns the Forbiden plmns list that needed to be written to the SIM. + * @param content callingPackage the op Package name. + * @return number of fplmns that is successfully written to the SIM + */ + int setForbiddenPlmns(int subId, int appType, in List<String> fplmns, String callingPackage); + + /** * Check if phone is in emergency callback mode * @return true if phone is in emergency callback mode * @param subId the subscription ID that this action applies to. diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index c9ec0f86a9dc..c19ae7b3916a 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -170,7 +170,7 @@ public class PhoneConstants { public static final int RIL_CARD_MAX_APPS = 8; - public static final int DEFAULT_CARD_INDEX = 0; + public static final int DEFAULT_SLOT_INDEX = 0; public static final int MAX_PHONE_COUNT_SINGLE_SIM = 1; diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index d892e559c899..4654437fb49c 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -878,8 +878,9 @@ public class SmsMessage extends SmsMessageBase { * Parses a broadcast SMS, possibly containing a CMAS alert. * * @param plmn the PLMN for a broadcast SMS + * @param subId */ - public SmsCbMessage parseBroadcastSms(String plmn) { + public SmsCbMessage parseBroadcastSms(String plmn, int subId) { BearerData bData = BearerData.decode(mEnvelope.bearerData, mEnvelope.serviceCategory); if (bData == null) { Rlog.w(LOG_TAG, "BearerData.decode() returned null"); @@ -895,7 +896,7 @@ public class SmsMessage extends SmsMessageBase { return new SmsCbMessage(SmsCbMessage.MESSAGE_FORMAT_3GPP2, SmsCbMessage.GEOGRAPHICAL_SCOPE_PLMN_WIDE, bData.messageId, location, mEnvelope.serviceCategory, bData.getLanguage(), bData.userData.payloadStr, - bData.priority, null, bData.cmasWarningInfo); + bData.priority, null, bData.cmasWarningInfo, subId); } /** diff --git a/telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl b/telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl index 20169152539e..7422863d862c 100644 --- a/telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl +++ b/telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl @@ -44,5 +44,7 @@ interface IEuiccController { oneway void updateSubscriptionNickname(int cardId, int subscriptionId, String nickname, String callingPackage, in PendingIntent callbackIntent); oneway void eraseSubscriptions(int cardId, in PendingIntent callbackIntent); + oneway void eraseSubscriptionsWithOptions( + int cardId, int options, in PendingIntent callbackIntent); oneway void retainSubscriptionsForFactoryReset(int cardId, in PendingIntent callbackIntent); } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java index c65c45fa015b..c3d490a6d5cf 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java @@ -90,9 +90,10 @@ public class GsmSmsCbMessage { * Create a new SmsCbMessage object from a header object plus one or more received PDUs. * * @param pdus PDU bytes + * @slotIndex slotIndex for which received sms cb message */ public static SmsCbMessage createSmsCbMessage(Context context, SmsCbHeader header, - SmsCbLocation location, byte[][] pdus) + SmsCbLocation location, byte[][] pdus, int slotIndex) throws IllegalArgumentException { long receivedTimeMillis = System.currentTimeMillis(); if (header.isEtwsPrimaryNotification()) { @@ -104,7 +105,7 @@ public class GsmSmsCbMessage { header.getSerialNumber(), location, header.getServiceCategory(), null, getEtwsPrimaryMessage(context, header.getEtwsInfo().getWarningType()), SmsCbMessage.MESSAGE_PRIORITY_EMERGENCY, header.getEtwsInfo(), - header.getCmasInfo(), 0, null /* geometries */, receivedTimeMillis); + header.getCmasInfo(), 0, null /* geometries */, receivedTimeMillis, slotIndex); } else if (header.isUmtsFormat()) { // UMTS format has only 1 PDU byte[] pdu = pdus[0]; @@ -138,7 +139,7 @@ public class GsmSmsCbMessage { header.getGeographicalScope(), header.getSerialNumber(), location, header.getServiceCategory(), language, body, priority, header.getEtwsInfo(), header.getCmasInfo(), maximumWaitingTimeSec, geometries, - receivedTimeMillis); + receivedTimeMillis, slotIndex); } else { String language = null; StringBuilder sb = new StringBuilder(); @@ -154,7 +155,7 @@ public class GsmSmsCbMessage { header.getGeographicalScope(), header.getSerialNumber(), location, header.getServiceCategory(), language, sb.toString(), priority, header.getEtwsInfo(), header.getCmasInfo(), 0, null /* geometries */, - receivedTimeMillis); + receivedTimeMillis, slotIndex); } } diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java index 9c69e2d6e08f..f2d46244d60e 100644 --- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java @@ -22,11 +22,13 @@ import android.graphics.Bitmap; import android.graphics.Color; import android.telephony.Rlog; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.GsmAlphabet; import dalvik.annotation.compat.UnsupportedAppUsage; import java.io.UnsupportedEncodingException; +import java.util.List; /** * Various methods, useful for dealing with SIM data. @@ -34,6 +36,11 @@ import java.io.UnsupportedEncodingException; public class IccUtils { static final String LOG_TAG="IccUtils"; + // 3GPP specification constants + // Spec reference TS 31.102 section 4.2.16 + @VisibleForTesting + static final int FPLMN_BYTE_SIZE = 3; + // A table mapping from a number to a hex character for fast encoding hex strings. private static final char[] HEX_CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' @@ -896,4 +903,27 @@ public class IccUtils { } return 0; } + + /** + * Encode the Fplmns into byte array to write to EF. + * + * @param fplmns Array of fplmns to be serialized. + * @param dataLength the size of the EF file. + * @return the encoded byte array in the correct format for FPLMN file. + */ + public static byte[] encodeFplmns(List<String> fplmns, int dataLength) { + byte[] serializedFplmns = new byte[dataLength]; + int offset = 0; + for (String fplmn : fplmns) { + if (offset >= dataLength) break; + stringToBcdPlmn(fplmn, serializedFplmns, offset); + offset += FPLMN_BYTE_SIZE; + } + //pads to the length of the EF file. + while (offset < dataLength) { + // required by 3GPP TS 31.102 spec 4.2.16 + serializedFplmns[offset++] = (byte) 0xff; + } + return serializedFplmns; + } } diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index a95b6f11e98a..fcd4701c7630 100644 --- a/test-mock/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java @@ -758,6 +758,12 @@ public class MockContext extends Context { /** {@hide} */ @Override + public Context createContextAsUser(UserHandle user) { + throw new UnsupportedOperationException(); + } + + /** {@hide} */ + @Override public int getUserId() { throw new UnsupportedOperationException(); } diff --git a/tests/Codegen/runTest.sh b/tests/Codegen/runTest.sh index 01522735ec3c..0e90deaadd61 100755 --- a/tests/Codegen/runTest.sh +++ b/tests/Codegen/runTest.sh @@ -14,9 +14,12 @@ else header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java && \ header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java && \ header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java && \ + header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java && \ + header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java && \ + header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java && \ cd $ANDROID_BUILD_TOP && header_and_eval mmma -j16 frameworks/base/tests/Codegen && \ - header_and_eval adb install -r -t $ANDROID_PRODUCT_OUT/testcases/CodegenTests/arm64/CodegenTests.apk && \ + header_and_eval adb install -r -t "$(find $ANDROID_TARGET_OUT_TESTCASES -name 'CodegenTests.apk')" && \ # header_and_eval adb shell am set-debug-app -w com.android.codegentest && \ header_and_eval adb shell am instrument -w -e package com.android.codegentest com.android.codegentest/androidx.test.runner.AndroidJUnitRunner diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.aidl b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.aidl new file mode 100644 index 000000000000..ab62c83fc1b9 --- /dev/null +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.aidl @@ -0,0 +1,19 @@ +/* + * 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.codegentest; + +parcelable HierrarchicalDataClassBase; diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java new file mode 100644 index 000000000000..10eba6a899ad --- /dev/null +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java @@ -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. + */ + +package com.android.codegentest; + +import android.os.Parcelable; + +import com.android.internal.util.DataClass; + +/** + * @see HierrarchicalDataClassChild + */ +@DataClass( + genConstructor = false, + genSetters = true) +public class HierrarchicalDataClassBase implements Parcelable { + + private int mBaseData; + + + + // Code below generated by codegen v1.0.7. + // + // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code + // + // To regenerate run: + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java + + + @DataClass.Generated.Member + public int getBaseData() { + return mBaseData; + } + + @DataClass.Generated.Member + public HierrarchicalDataClassBase setBaseData(int value) { + mBaseData = value; + return this; + } + + @Override + @DataClass.Generated.Member + public void writeToParcel(android.os.Parcel dest, int flags) { + // You can override field parcelling by defining methods like: + // void parcelFieldName(Parcel dest, int flags) { ... } + + dest.writeInt(mBaseData); + } + + @Override + @DataClass.Generated.Member + public int describeContents() { return 0; } + + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected HierrarchicalDataClassBase(android.os.Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + int baseData = in.readInt(); + + this.mBaseData = baseData; + + // onConstructed(); // You can define this method to get a callback + } + + @DataClass.Generated.Member + public static final @android.annotation.NonNull Parcelable.Creator<HierrarchicalDataClassBase> CREATOR + = new Parcelable.Creator<HierrarchicalDataClassBase>() { + @Override + public HierrarchicalDataClassBase[] newArray(int size) { + return new HierrarchicalDataClassBase[size]; + } + + @Override + public HierrarchicalDataClassBase createFromParcel(android.os.Parcel in) { + return new HierrarchicalDataClassBase(in); + } + }; + + @DataClass.Generated( + time = 1570576455287L, + codegenVersion = "1.0.7", + sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java", + inputSignatures = "private int mBaseData\nclass HierrarchicalDataClassBase extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genSetters=true)") + @Deprecated + private void __metadata() {} + +} diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.aidl b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.aidl new file mode 100644 index 000000000000..a0997222b0af --- /dev/null +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.aidl @@ -0,0 +1,19 @@ +/* + * 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.codegentest; + +parcelable HierrarchicalDataClassChild; diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java new file mode 100644 index 000000000000..1085a6a1636a --- /dev/null +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java @@ -0,0 +1,126 @@ +/* + * 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.codegentest; + +import android.annotation.NonNull; +import android.os.Parcelable; + +import com.android.internal.util.DataClass; + +/** + * An example of data classes that extend one another. + * + * Note that some features like constructor generation might not work well due to lack of + * information about the superclass when generating code for subclass. + * + * It is recommended to avoid inheritance in favor of composition for new data classes, + * particularly parcelable ones. + * + * However for legacy classes or where inheritance is desired for allocation efficiency, + * you can either use a technique from this example, opting for mutability/setters, or just write + * constructors by hand. + * + * @see HierrarchicalDataClassBase + */ +@DataClass( + genParcelable = true, + genConstructor = false, + genSetters = true) +public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { + + private @NonNull String mChildData; + + + + // Code below generated by codegen v1.0.7. + // + // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code + // + // To regenerate run: + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java + + + @DataClass.Generated.Member + public @NonNull String getChildData() { + return mChildData; + } + + @DataClass.Generated.Member + public HierrarchicalDataClassChild setChildData(@NonNull String value) { + mChildData = value; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mChildData); + return this; + } + + @Override + @DataClass.Generated.Member + public void writeToParcel(android.os.Parcel dest, int flags) { + // You can override field parcelling by defining methods like: + // void parcelFieldName(Parcel dest, int flags) { ... } + + super.writeToParcel(dest, flags); + + dest.writeString(mChildData); + } + + @Override + @DataClass.Generated.Member + public int describeContents() { return 0; } + + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected HierrarchicalDataClassChild(android.os.Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + super(in); + + String childData = in.readString(); + + this.mChildData = childData; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mChildData); + + // onConstructed(); // You can define this method to get a callback + } + + @DataClass.Generated.Member + public static final @NonNull Parcelable.Creator<HierrarchicalDataClassChild> CREATOR + = new Parcelable.Creator<HierrarchicalDataClassChild>() { + @Override + public HierrarchicalDataClassChild[] newArray(int size) { + return new HierrarchicalDataClassChild[size]; + } + + @Override + public HierrarchicalDataClassChild createFromParcel(android.os.Parcel in) { + return new HierrarchicalDataClassChild(in); + } + }; + + @DataClass.Generated( + time = 1570576456245L, + codegenVersion = "1.0.7", + sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java", + inputSignatures = "private @android.annotation.NonNull java.lang.String mChildData\nclass HierrarchicalDataClassChild extends com.android.codegentest.HierrarchicalDataClassBase implements []\n@com.android.internal.util.DataClass(genParcelable=true, genConstructor=false, genSetters=true)") + @Deprecated + private void __metadata() {} + +} diff --git a/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java b/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java index 2d4125783990..75ef963c7995 100644 --- a/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java +++ b/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java @@ -48,7 +48,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable { - // Code below generated by codegen v1.0.4. + // Code below generated by codegen v1.0.7. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -162,6 +162,49 @@ public class ParcelAllTheThingsDataClass implements Parcelable { @DataClass.Generated.Member public int describeContents() { return 0; } + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected ParcelAllTheThingsDataClass(Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + String[] stringArray = in.createStringArray(); + int[] intArray = in.createIntArray(); + List<String> stringList = new java.util.ArrayList<>(); + in.readStringList(stringList); + Map<String,SampleWithCustomBuilder> map = new java.util.LinkedHashMap<>(); + in.readMap(map, SampleWithCustomBuilder.class.getClassLoader()); + Map<String,String> stringMap = new java.util.LinkedHashMap<>(); + in.readMap(stringMap, String.class.getClassLoader()); + SparseArray<SampleWithCustomBuilder> sparseArray = (SparseArray) in.readSparseArray(SampleWithCustomBuilder.class.getClassLoader()); + SparseIntArray sparseIntArray = (SparseIntArray) in.readSparseIntArray(); + + this.mStringArray = stringArray; + AnnotationValidations.validate( + NonNull.class, null, mStringArray); + this.mIntArray = intArray; + AnnotationValidations.validate( + NonNull.class, null, mIntArray); + this.mStringList = stringList; + AnnotationValidations.validate( + NonNull.class, null, mStringList); + this.mMap = map; + AnnotationValidations.validate( + NonNull.class, null, mMap); + this.mStringMap = stringMap; + AnnotationValidations.validate( + NonNull.class, null, mStringMap); + this.mSparseArray = sparseArray; + AnnotationValidations.validate( + NonNull.class, null, mSparseArray); + this.mSparseIntArray = sparseIntArray; + AnnotationValidations.validate( + NonNull.class, null, mSparseIntArray); + + // onConstructed(); // You can define this method to get a callback + } + @DataClass.Generated.Member public static final @NonNull Parcelable.Creator<ParcelAllTheThingsDataClass> CREATOR = new Parcelable.Creator<ParcelAllTheThingsDataClass>() { @@ -171,29 +214,8 @@ public class ParcelAllTheThingsDataClass implements Parcelable { } @Override - @SuppressWarnings({"unchecked", "RedundantCast"}) public ParcelAllTheThingsDataClass createFromParcel(Parcel in) { - // You can override field unparcelling by defining methods like: - // static FieldType unparcelFieldName(Parcel in) { ... } - - String[] stringArray = in.createStringArray(); - int[] intArray = in.createIntArray(); - List<String> stringList = new java.util.ArrayList<>(); - in.readStringList(stringList); - Map<String,SampleWithCustomBuilder> map = new java.util.LinkedHashMap<>(); - in.readMap(map, SampleWithCustomBuilder.class.getClassLoader()); - Map<String,String> stringMap = new java.util.LinkedHashMap<>(); - in.readMap(stringMap, String.class.getClassLoader()); - SparseArray<SampleWithCustomBuilder> sparseArray = (SparseArray) in.readSparseArray(SampleWithCustomBuilder.class.getClassLoader()); - SparseIntArray sparseIntArray = (SparseIntArray) in.readSparseIntArray(); - return new ParcelAllTheThingsDataClass( - stringArray, - intArray, - stringList, - map, - stringMap, - sparseArray, - sparseIntArray); + return new ParcelAllTheThingsDataClass(in); } }; @@ -352,8 +374,8 @@ public class ParcelAllTheThingsDataClass implements Parcelable { } @DataClass.Generated( - time = 1570139502128L, - codegenVersion = "1.0.4", + time = 1570576454326L, + codegenVersion = "1.0.7", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java", inputSignatures = " @android.annotation.NonNull java.lang.String[] mStringArray\n @android.annotation.NonNull int[] mIntArray\n @android.annotation.NonNull java.util.List<java.lang.String> mStringList\n @android.annotation.NonNull java.util.Map<java.lang.String,com.android.codegentest.SampleWithCustomBuilder> mMap\n @android.annotation.NonNull java.util.Map<java.lang.String,java.lang.String> mStringMap\n @android.annotation.NonNull android.util.SparseArray<com.android.codegentest.SampleWithCustomBuilder> mSparseArray\n @android.annotation.NonNull android.util.SparseIntArray mSparseIntArray\nclass ParcelAllTheThingsDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genAidl=false, genToString=true)") @Deprecated diff --git a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java index 0631f7ded8ae..14010a9cfb1d 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java +++ b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java @@ -342,7 +342,7 @@ public final class SampleDataClass implements Parcelable { - // Code below generated by codegen v1.0.4. + // Code below generated by codegen v1.0.7. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -1290,6 +1290,123 @@ public final class SampleDataClass implements Parcelable { @DataClass.Generated.Member public int describeContents() { return 0; } + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + /* package-private */ SampleDataClass(Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + long flg = in.readLong(); + int num = in.readInt(); + int num2 = in.readInt(); + int num4 = in.readInt(); + String name = (flg & 0x8) == 0 ? null : in.readString(); + String name2 = in.readString(); + String name4 = in.readString(); + AccessibilityNodeInfo otherParcelable = (flg & 0x40) == 0 ? null : (AccessibilityNodeInfo) in.readTypedObject(AccessibilityNodeInfo.CREATOR); + Date date = sParcellingForDate.unparcel(in); + Pattern pattern = sParcellingForPattern.unparcel(in); + List<LinkAddress> linkAddresses2 = new ArrayList<>(); + in.readParcelableList(linkAddresses2, LinkAddress.class.getClassLoader()); + ArrayList<LinkAddress> linkAddresses = new ArrayList<>(); + in.readParcelableList(linkAddresses, LinkAddress.class.getClassLoader()); + LinkAddress[] linkAddresses4 = (flg & 0x800) == 0 ? null : (LinkAddress[]) in.createTypedArray(LinkAddress.CREATOR); + String stateName = in.readString(); + int flags = in.readInt(); + int state = in.readInt(); + CharSequence _charSeq = (CharSequence) in.readCharSequence(); + LinkAddress[] linkAddresses5 = (flg & 0x10000) == 0 ? null : (LinkAddress[]) in.createTypedArray(LinkAddress.CREATOR); + int stringRes = in.readInt(); + int dayOfWeek = in.readInt(); + float[] coords = in.createFloatArray(); + + this.mNum = num; + this.mNum2 = num2; + this.mNum4 = num4; + this.mName = name; + this.mName2 = name2; + AnnotationValidations.validate( + NonNull.class, null, mName2); + this.mName4 = name4; + AnnotationValidations.validate( + NonNull.class, null, mName4); + this.mOtherParcelable = otherParcelable; + this.mDate = date; + AnnotationValidations.validate( + NonNull.class, null, mDate); + this.mPattern = pattern; + AnnotationValidations.validate( + NonNull.class, null, mPattern); + this.mLinkAddresses2 = linkAddresses2; + AnnotationValidations.validate( + NonNull.class, null, mLinkAddresses2); + this.mLinkAddresses = linkAddresses; + AnnotationValidations.validate( + NonNull.class, null, mLinkAddresses); + this.mLinkAddresses4 = linkAddresses4; + this.mStateName = stateName; + + if (!(Objects.equals(mStateName, STATE_NAME_UNDEFINED)) + && !(Objects.equals(mStateName, STATE_NAME_ON)) + && !(Objects.equals(mStateName, STATE_NAME_OFF))) { + throw new java.lang.IllegalArgumentException( + "stateName was " + mStateName + " but must be one of: " + + "STATE_NAME_UNDEFINED(" + STATE_NAME_UNDEFINED + "), " + + "STATE_NAME_ON(" + STATE_NAME_ON + "), " + + "STATE_NAME_OFF(" + STATE_NAME_OFF + ")"); + } + + AnnotationValidations.validate( + NonNull.class, null, mStateName); + this.mFlags = flags; + + Preconditions.checkFlagsArgument( + mFlags, + FLAG_MANUAL_REQUEST + | FLAG_COMPATIBILITY_MODE_REQUEST + | FLAG_AUGMENTED_REQUEST); + this.mState = state; + + if (!(mState == STATE_UNDEFINED) + && !(mState == STATE_ON) + && !(mState == STATE_OFF)) { + throw new java.lang.IllegalArgumentException( + "state was " + mState + " but must be one of: " + + "STATE_UNDEFINED(" + STATE_UNDEFINED + "), " + + "STATE_ON(" + STATE_ON + "), " + + "STATE_OFF(" + STATE_OFF + ")"); + } + + this.charSeq = _charSeq; + AnnotationValidations.validate( + NonNull.class, null, charSeq); + this.mLinkAddresses5 = linkAddresses5; + this.mStringRes = stringRes; + AnnotationValidations.validate( + StringRes.class, null, mStringRes); + this.mDayOfWeek = dayOfWeek; + AnnotationValidations.validate( + android.annotation.IntRange.class, null, mDayOfWeek, + "from", 0, + "to", 6); + this.mCoords = coords; + AnnotationValidations.validate( + Size.class, null, mCoords.length, + "value", 2); + AnnotationValidations.validate( + NonNull.class, null, mCoords); + int coordsSize = mCoords.length; + for (int i = 0; i < coordsSize; i++) { + AnnotationValidations.validate( + FloatRange.class, null, mCoords[i], + "from", 0f); + } + + + onConstructed(); + } + @DataClass.Generated.Member public static final @NonNull Parcelable.Creator<SampleDataClass> CREATOR = new Parcelable.Creator<SampleDataClass>() { @@ -1299,55 +1416,8 @@ public final class SampleDataClass implements Parcelable { } @Override - @SuppressWarnings({"unchecked", "RedundantCast"}) public SampleDataClass createFromParcel(Parcel in) { - // You can override field unparcelling by defining methods like: - // static FieldType unparcelFieldName(Parcel in) { ... } - - long flg = in.readLong(); - int num = in.readInt(); - int num2 = in.readInt(); - int num4 = in.readInt(); - String name = (flg & 0x8) == 0 ? null : in.readString(); - String name2 = in.readString(); - String name4 = in.readString(); - AccessibilityNodeInfo otherParcelable = (flg & 0x40) == 0 ? null : (AccessibilityNodeInfo) in.readTypedObject(AccessibilityNodeInfo.CREATOR); - Date date = sParcellingForDate.unparcel(in); - Pattern pattern = sParcellingForPattern.unparcel(in); - List<LinkAddress> linkAddresses2 = new ArrayList<>(); - in.readParcelableList(linkAddresses2, LinkAddress.class.getClassLoader()); - ArrayList<LinkAddress> linkAddresses = new ArrayList<>(); - in.readParcelableList(linkAddresses, LinkAddress.class.getClassLoader()); - LinkAddress[] linkAddresses4 = (flg & 0x800) == 0 ? null : (LinkAddress[]) in.createTypedArray(LinkAddress.CREATOR); - String stateName = in.readString(); - int flags = in.readInt(); - int state = in.readInt(); - CharSequence _charSeq = (CharSequence) in.readCharSequence(); - LinkAddress[] linkAddresses5 = (flg & 0x10000) == 0 ? null : (LinkAddress[]) in.createTypedArray(LinkAddress.CREATOR); - int stringRes = in.readInt(); - int dayOfWeek = in.readInt(); - float[] coords = in.createFloatArray(); - return new SampleDataClass( - num, - num2, - num4, - name, - name2, - name4, - otherParcelable, - date, - pattern, - linkAddresses2, - linkAddresses, - linkAddresses4, - stateName, - flags, - state, - _charSeq, - linkAddresses5, - stringRes, - dayOfWeek, - coords); + return new SampleDataClass(in); } }; @@ -1798,8 +1868,8 @@ public final class SampleDataClass implements Parcelable { } @DataClass.Generated( - time = 1570139500112L, - codegenVersion = "1.0.4", + time = 1570576452225L, + codegenVersion = "1.0.7", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java", inputSignatures = "public static final java.lang.String STATE_NAME_UNDEFINED\npublic static final java.lang.String STATE_NAME_ON\npublic static final java.lang.String STATE_NAME_OFF\npublic static final int STATE_UNDEFINED\npublic static final int STATE_ON\npublic static final int STATE_OFF\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_MANUAL_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_COMPATIBILITY_MODE_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_AUGMENTED_REQUEST\nprivate int mNum\nprivate int mNum2\nprivate int mNum4\nprivate @android.annotation.Nullable java.lang.String mName\nprivate @android.annotation.NonNull java.lang.String mName2\nprivate @android.annotation.NonNull java.lang.String mName4\nprivate @android.annotation.Nullable android.view.accessibility.AccessibilityNodeInfo mOtherParcelable\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.codegentest.MyDateParcelling.class) @android.annotation.NonNull java.util.Date mDate\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) @android.annotation.NonNull java.util.regex.Pattern mPattern\nprivate @android.annotation.NonNull java.util.List<android.net.LinkAddress> mLinkAddresses2\nprivate @com.android.internal.util.DataClass.PluralOf(\"linkAddress\") @android.annotation.NonNull java.util.ArrayList<android.net.LinkAddress> mLinkAddresses\nprivate @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses4\nprivate @com.android.codegentest.SampleDataClass.StateName @android.annotation.NonNull java.lang.String mStateName\nprivate @com.android.codegentest.SampleDataClass.RequestFlags int mFlags\nprivate @com.android.codegentest.SampleDataClass.State int mState\npublic @android.annotation.NonNull java.lang.CharSequence charSeq\nprivate final @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses5\nprivate transient android.net.LinkAddress[] mLinkAddresses6\ntransient int[] mTmpStorage\nprivate @android.annotation.StringRes int mStringRes\nprivate @android.annotation.IntRange(from=0L, to=6L) int mDayOfWeek\nprivate @android.annotation.Size(2L) @android.annotation.NonNull @com.android.internal.util.DataClass.Each @android.annotation.FloatRange(from=0.0) float[] mCoords\nprivate static java.lang.String defaultName4()\nprivate int[] lazyInitTmpStorage()\npublic android.net.LinkAddress[] getLinkAddresses4()\nprivate boolean patternEquals(java.util.regex.Pattern)\nprivate int patternHashCode()\nprivate void onConstructed()\npublic void dump(java.io.PrintWriter)\nclass SampleDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genConstructor=true, genEqualsHashCode=true, genToString=true, genForEachField=true, genSetters=true)") @Deprecated diff --git a/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java b/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java index 0f8c663f5d4b..b5f6c73a8aef 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java +++ b/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java @@ -85,7 +85,7 @@ public class SampleWithCustomBuilder implements Parcelable { - // Code below generated by codegen v1.0.4. + // Code below generated by codegen v1.0.7. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -151,6 +151,26 @@ public class SampleWithCustomBuilder implements Parcelable { @DataClass.Generated.Member public int describeContents() { return 0; } + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected SampleWithCustomBuilder(Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + long _delayAmount = in.readLong(); + TimeUnit _delayUnit = unparcelDelayUnit(in); + long _creationTimestamp = in.readLong(); + + this.delayAmount = _delayAmount; + this.delayUnit = _delayUnit; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, delayUnit); + this.creationTimestamp = _creationTimestamp; + + // onConstructed(); // You can define this method to get a callback + } + @DataClass.Generated.Member public static final @NonNull Parcelable.Creator<SampleWithCustomBuilder> CREATOR = new Parcelable.Creator<SampleWithCustomBuilder>() { @@ -160,18 +180,8 @@ public class SampleWithCustomBuilder implements Parcelable { } @Override - @SuppressWarnings({"unchecked", "RedundantCast"}) public SampleWithCustomBuilder createFromParcel(Parcel in) { - // You can override field unparcelling by defining methods like: - // static FieldType unparcelFieldName(Parcel in) { ... } - - long _delayAmount = in.readLong(); - TimeUnit _delayUnit = unparcelDelayUnit(in); - long _creationTimestamp = in.readLong(); - return new SampleWithCustomBuilder( - _delayAmount, - _delayUnit, - _creationTimestamp); + return new SampleWithCustomBuilder(in); } }; @@ -239,8 +249,8 @@ public class SampleWithCustomBuilder implements Parcelable { } @DataClass.Generated( - time = 1570139501160L, - codegenVersion = "1.0.4", + time = 1570576453295L, + codegenVersion = "1.0.7", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java", inputSignatures = " long delayAmount\n @android.annotation.NonNull java.util.concurrent.TimeUnit delayUnit\n long creationTimestamp\nprivate static java.util.concurrent.TimeUnit unparcelDelayUnit(android.os.Parcel)\nprivate void parcelDelayUnit(android.os.Parcel,int)\nclass SampleWithCustomBuilder extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genAidl=false, genToString=true)\nabstract com.android.codegentest.SampleWithCustomBuilder.Builder setDelayAmount(long)\npublic abstract com.android.codegentest.SampleWithCustomBuilder.Builder setDelayUnit(java.util.concurrent.TimeUnit)\npublic com.android.codegentest.SampleWithCustomBuilder.Builder setDelay(long,java.util.concurrent.TimeUnit)\nclass BaseBuilder extends java.lang.Object implements []") @Deprecated diff --git a/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java b/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java new file mode 100644 index 000000000000..0ce8aba9b28f --- /dev/null +++ b/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java @@ -0,0 +1,71 @@ +/* + * 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.codegentest; + +import android.annotation.NonNull; + +import com.android.internal.util.DataClass; + +/** + * Test for some false positive pitfalls for + * {@link android.processor.staledataclass.StaleDataclassProcessor} + * + * Relies on the detector being run, failing the build should any of things here falsely + * register as stale. + */ +@DataClass(genConstructor = false, genBuilder = false) +public class StaleDataclassDetectorFalsePositivesTest { + + /** Interfaces should be ignored */ + public interface SomeListener { + void onEvent(); + } + + /** Enums should be ignored */ + private enum SomeEnum { ONE, TWO } + + /** Annotations should be ignored */ + public @interface SomeAnnotation {} + + /* Static initializers should be ignored */ + static {} + + /* Initializers should be ignored */ + {} + + /** Unrelated methods should be noted, without triggering staleness false positives */ + public @NonNull String someMethod(int param) { return null; } + + + + // Code below generated by codegen v1.0.7. + // + // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code + // + // To regenerate run: + // $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java + + + @DataClass.Generated( + time = 1570576457249L, + codegenVersion = "1.0.7", + sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java", + inputSignatures = "public @android.annotation.NonNull java.lang.String someMethod(int)\nclass StaleDataclassDetectorFalsePositivesTest extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=false)") + @Deprecated + private void __metadata() {} + +} diff --git a/tests/net/common/java/android/net/LinkPropertiesTest.java b/tests/net/common/java/android/net/LinkPropertiesTest.java index b0464d9e656f..ae8285b8a908 100644 --- a/tests/net/common/java/android/net/LinkPropertiesTest.java +++ b/tests/net/common/java/android/net/LinkPropertiesTest.java @@ -99,6 +99,7 @@ public class LinkPropertiesTest { assertFalse(lp.isIpv4Provisioned()); assertFalse(lp.isIpv6Provisioned()); assertFalse(lp.isPrivateDnsActive()); + assertFalse(lp.isWakeOnLanSupported()); } private LinkProperties makeTestObject() { @@ -120,6 +121,7 @@ public class LinkPropertiesTest { lp.setMtu(MTU); lp.setTcpBufferSizes(TCP_BUFFER_SIZES); lp.setNat64Prefix(new IpPrefix("2001:db8:0:64::/96")); + lp.setWakeOnLanSupported(true); return lp; } @@ -158,6 +160,9 @@ public class LinkPropertiesTest { assertTrue(source.isIdenticalTcpBufferSizes(target)); assertTrue(target.isIdenticalTcpBufferSizes(source)); + assertTrue(source.isIdenticalWakeOnLan(target)); + assertTrue(target.isIdenticalWakeOnLan(source)); + // Check result of equals(). assertTrue(source.equals(target)); assertTrue(target.equals(source)); @@ -1057,4 +1062,13 @@ public class LinkPropertiesTest { lp.clear(); assertFalse(lp.isPrivateDnsActive()); } + + @Test + public void testWakeOnLanSupported() { + final LinkProperties lp = makeTestObject(); + assertTrue(lp.isWakeOnLanSupported()); + + lp.clear(); + assertFalse(lp.isWakeOnLanSupported()); + } } diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 5bfd647f0152..bffbbfda08ee 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -207,7 +207,7 @@ import com.android.server.net.NetworkPinner; import com.android.server.net.NetworkPolicyManagerInternal; import com.android.testutils.ExceptionUtils; import com.android.testutils.HandlerUtilsKt; -import com.android.testutils.RecorderCallback.CallbackRecord; +import com.android.testutils.RecorderCallback.CallbackEntry; import com.android.testutils.TestableNetworkCallback; import org.junit.After; @@ -274,6 +274,7 @@ public class ConnectivityServiceTest { private static final String CLAT_PREFIX = "v4-"; private static final String MOBILE_IFNAME = "test_rmnet_data0"; private static final String WIFI_IFNAME = "test_wlan0"; + private static final String WIFI_WOL_IFNAME = "test_wlan_wol"; private static final String[] EMPTY_STRING_ARRAY = new String[0]; private MockContext mServiceContext; @@ -343,6 +344,12 @@ public class ConnectivityServiceTest { "mobile_mms,2,0,2,60000,true", }); + when(mResources.getStringArray( + com.android.internal.R.array.config_wakeonlan_supported_interfaces)) + .thenReturn(new String[]{ + WIFI_WOL_IFNAME, + }); + mContentResolver = new MockContentResolver(); mContentResolver.addProvider(Settings.AUTHORITY, settingsProvider); } @@ -1478,12 +1485,12 @@ public class ConnectivityServiceTest { } @Override - public <T extends CallbackRecord> T expectCallback(final KClass<T> type, final HasNetwork n, + public <T extends CallbackEntry> T expectCallback(final KClass<T> type, final HasNetwork n, final long timeoutMs) { final T callback = super.expectCallback(type, n, timeoutMs); - if (callback instanceof CallbackRecord.Losing) { + if (callback instanceof CallbackEntry.Losing) { // TODO : move this to the specific test(s) needing this rather than here. - final CallbackRecord.Losing losing = (CallbackRecord.Losing) callback; + final CallbackEntry.Losing losing = (CallbackEntry.Losing) callback; final int maxMsToLive = losing.getMaxMsToLive(); String msg = String.format( "Invalid linger time value %d, must be between %d and %d", @@ -1544,16 +1551,16 @@ public class ConnectivityServiceTest { cv = waitForConnectivityBroadcasts(2); mWiFiNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - wifiNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + wifiNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); cellNetworkCallback.assertNoCallback(); waitFor(cv); assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback); cv = waitForConnectivityBroadcasts(1); mCellNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); waitFor(cv); assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback); @@ -1574,21 +1581,21 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.connect(true); genericNetworkCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - genericNetworkCallback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); genericNetworkCallback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); wifiNetworkCallback.expectAvailableThenValidatedCallbacks(mWiFiNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback); mWiFiNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - wifiNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + wifiNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback); mCellNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); assertNoCallbacks(genericNetworkCallback, wifiNetworkCallback, cellNetworkCallback); } @@ -1628,7 +1635,7 @@ public class ConnectivityServiceTest { // We then get LOSING when wifi validates and cell is outscored. callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); // TODO: Investigate sending validated before losing. - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); defaultCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); @@ -1637,15 +1644,15 @@ public class ConnectivityServiceTest { mEthernetNetworkAgent.connect(true); callback.expectAvailableCallbacksUnvalidated(mEthernetNetworkAgent); // TODO: Investigate sending validated before losing. - callback.expectCallback(CallbackRecord.LOSING, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mWiFiNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mEthernetNetworkAgent); defaultCallback.expectAvailableDoubleValidatedCallbacks(mEthernetNetworkAgent); assertEquals(mEthernetNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); mEthernetNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); defaultCallback.expectAvailableCallbacksValidated(mWiFiNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -1661,7 +1668,7 @@ public class ConnectivityServiceTest { newNetwork = mWiFiNetworkAgent; } - callback.expectCallback(CallbackRecord.LOSING, oldNetwork); + callback.expectCallback(CallbackEntry.LOSING, oldNetwork); // TODO: should we send an AVAILABLE callback to newNetwork, to indicate that it is no // longer lingering? defaultCallback.expectAvailableCallbacksValidated(newNetwork); @@ -1675,7 +1682,7 @@ public class ConnectivityServiceTest { // We expect a notification about the capabilities change, and nothing else. defaultCallback.expectCapabilitiesWithout(NET_CAPABILITY_NOT_METERED, mWiFiNetworkAgent); defaultCallback.assertNoCallback(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); // Wifi no longer satisfies our listen, which is for an unmetered network. @@ -1684,11 +1691,11 @@ public class ConnectivityServiceTest { // Disconnect our test networks. mWiFiNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); mCellNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); waitForIdle(); assertEquals(null, mCm.getActiveNetwork()); @@ -1719,8 +1726,8 @@ public class ConnectivityServiceTest { assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent); assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -1731,15 +1738,15 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.adjustScore(50); mWiFiNetworkAgent.connect(false); // Score: 70 callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); defaultCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); // Tear down wifi. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent); assertEquals(mCellNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -1750,19 +1757,19 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.connect(true); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); // TODO: Investigate sending validated before losing. - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); defaultCallback.expectAvailableThenValidatedCallbacks(mWiFiNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent); mCellNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); waitForIdle(); assertEquals(null, mCm.getActiveNetwork()); @@ -1777,7 +1784,7 @@ public class ConnectivityServiceTest { defaultCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); // TODO: Investigate sending validated before losing. - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -1788,13 +1795,13 @@ public class ConnectivityServiceTest { // TODO: should this cause an AVAILABLE callback, to indicate that the network is no longer // lingering? mCm.unregisterNetworkCallback(noopCallback); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); // Similar to the above: lingering can start even after the lingered request is removed. // Disconnect wifi and switch to cell. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -1813,12 +1820,12 @@ public class ConnectivityServiceTest { callback.assertNoCallback(); // Now unregister cellRequest and expect cell to start lingering. mCm.unregisterNetworkCallback(noopCallback); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); // Let linger run its course. callback.assertNoCallback(); final int lingerTimeoutMs = mService.mLingerDelayMs + mService.mLingerDelayMs / 4; - callback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent, lingerTimeoutMs); + callback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent, lingerTimeoutMs); // Register a TRACK_DEFAULT request and check that it does not affect lingering. TestNetworkCallback trackDefaultCallback = new TestNetworkCallback(); @@ -1827,20 +1834,20 @@ public class ConnectivityServiceTest { mEthernetNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_ETHERNET); mEthernetNetworkAgent.connect(true); callback.expectAvailableCallbacksUnvalidated(mEthernetNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mWiFiNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mEthernetNetworkAgent); trackDefaultCallback.expectAvailableDoubleValidatedCallbacks(mEthernetNetworkAgent); defaultCallback.expectAvailableDoubleValidatedCallbacks(mEthernetNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); // Let linger run its course. - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent, lingerTimeoutMs); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent, lingerTimeoutMs); // Clean up. mEthernetNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); - trackDefaultCallback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); + trackDefaultCallback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(defaultCallback); @@ -1870,7 +1877,7 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.connect(true); defaultCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); // File a request for cellular, then release it. @@ -1879,7 +1886,7 @@ public class ConnectivityServiceTest { NetworkCallback noopCallback = new NetworkCallback(); mCm.requestNetwork(cellRequest, noopCallback); mCm.unregisterNetworkCallback(noopCallback); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); // Let linger run its course. callback.assertNoCallback(); @@ -1923,12 +1930,12 @@ public class ConnectivityServiceTest { // If the user chooses yes on the "No Internet access, stay connected?" dialog, we switch to // wifi even though it's unvalidated. mCm.setAcceptUnvalidated(mWiFiNetworkAgent.getNetwork(), true, false); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); // Disconnect wifi, and then reconnect, again with explicitlySelected=true. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.explicitlySelected(true, false); mWiFiNetworkAgent.connect(false); @@ -1937,14 +1944,14 @@ public class ConnectivityServiceTest { // If the user chooses no on the "No Internet access, stay connected?" dialog, we ask the // network to disconnect. mCm.setAcceptUnvalidated(mWiFiNetworkAgent.getNetwork(), false, false); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Reconnect, again with explicitlySelected=true, but this time validate. mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.explicitlySelected(true, false); mWiFiNetworkAgent.connect(true); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); @@ -1960,20 +1967,20 @@ public class ConnectivityServiceTest { // (i.e., with explicitlySelected=true and acceptUnvalidated=true). Expect to switch to // wifi immediately. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.explicitlySelected(true, true); mWiFiNetworkAgent.connect(false); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mEthernetNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mEthernetNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); mEthernetNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mEthernetNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mEthernetNetworkAgent); // Disconnect and reconnect with explicitlySelected=false and acceptUnvalidated=true. // Check that the network is not scored specially and that the device prefers cell data. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.explicitlySelected(false, true); mWiFiNetworkAgent.connect(false); @@ -1984,8 +1991,8 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.disconnect(); mCellNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); } private int[] makeIntArray(final int size, final int value) { @@ -2232,7 +2239,7 @@ public class ConnectivityServiceTest { // Need a trigger point to let NetworkMonitor tell ConnectivityService that network is // validated. mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), true); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); NetworkCapabilities nc = callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); assertTrue(nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY)); @@ -2240,7 +2247,7 @@ public class ConnectivityServiceTest { // Disconnect and reconnect wifi with partial connectivity again. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.connectWithPartialConnectivity(); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); @@ -2252,7 +2259,7 @@ public class ConnectivityServiceTest { // If the user chooses no, disconnect wifi immediately. mCm.setAcceptPartialConnectivity(mWiFiNetworkAgent.getNetwork(), false/* accept */, false /* always */); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // If user accepted partial connectivity before, and device reconnects to that network // again, but now the network has full connectivity. The network shouldn't contain @@ -2268,14 +2275,14 @@ public class ConnectivityServiceTest { // ConnectivityService#updateNetworkInfo(). callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity(); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); nc = callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); assertFalse(nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY)); // Wifi should be the default network. assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // The user accepted partial connectivity and selected "don't ask again". Now the user // reconnects to the partial connectivity network. Switch to wifi as soon as partial @@ -2289,7 +2296,7 @@ public class ConnectivityServiceTest { // ConnectivityService#updateNetworkInfo(). callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity(); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); callback.expectCapabilitiesWith(NET_CAPABILITY_PARTIAL_CONNECTIVITY, mWiFiNetworkAgent); mWiFiNetworkAgent.setNetworkValid(); @@ -2299,7 +2306,7 @@ public class ConnectivityServiceTest { mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), true); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // If the user accepted partial connectivity, and the device auto-reconnects to the partial // connectivity network, it should contain both PARTIAL_CONNECTIVITY and VALIDATED. @@ -2313,11 +2320,11 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.connectWithPartialValidConnectivity(); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity(); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith( NET_CAPABILITY_PARTIAL_CONNECTIVITY | NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); } @Test @@ -2359,7 +2366,7 @@ public class ConnectivityServiceTest { false /* always */); waitForIdle(); mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), true); - captivePortalCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + captivePortalCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); validatedCallback.expectAvailableCallbacksValidated(mWiFiNetworkAgent); NetworkCapabilities nc = validatedCallback.expectCapabilitiesWith(NET_CAPABILITY_PARTIAL_CONNECTIVITY, @@ -2392,7 +2399,7 @@ public class ConnectivityServiceTest { // Take down network. // Expect onLost callback. mWiFiNetworkAgent.disconnect(); - captivePortalCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + captivePortalCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Bring up a network with a captive portal. // Expect onAvailable callback of listen for NET_CAPABILITY_CAPTIVE_PORTAL. @@ -2406,7 +2413,7 @@ public class ConnectivityServiceTest { // Expect onLost callback because network no longer provides NET_CAPABILITY_CAPTIVE_PORTAL. mWiFiNetworkAgent.setNetworkValid(); mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), true); - captivePortalCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + captivePortalCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Expect NET_CAPABILITY_VALIDATED onAvailable callback. validatedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); @@ -2418,7 +2425,7 @@ public class ConnectivityServiceTest { // Expect NET_CAPABILITY_VALIDATED onLost callback. mWiFiNetworkAgent.setNetworkInvalid(); mCm.reportNetworkConnectivity(mWiFiNetworkAgent.getNetwork(), false); - validatedCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + validatedCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); } @Test @@ -2450,7 +2457,7 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.setNetworkPortal("http://example.com"); mCm.reportNetworkConnectivity(wifiNetwork, false); captivePortalCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - validatedCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + validatedCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Check that startCaptivePortalApp sends the expected command to NetworkMonitor. mCm.startCaptivePortalApp(wifiNetwork); @@ -2471,7 +2478,7 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.setNetworkValid(); mWiFiNetworkAgent.mNetworkMonitor.forceReevaluation(Process.myUid()); validatedCallback.expectAvailableCallbacksValidated(mWiFiNetworkAgent); - captivePortalCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + captivePortalCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); verify(mNotificationManager, times(1)).notifyAsUser(anyString(), eq(NotificationType.LOGGED_IN.eventId), any(), eq(UserHandle.ALL)); @@ -2619,7 +2626,7 @@ public class ConnectivityServiceTest { cFoo.assertNoCallback(); mWiFiNetworkAgent.setNetworkSpecifier(nsBar); - cFoo.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + cFoo.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); cBar.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); for (TestNetworkCallback c: emptyCallbacks) { c.expectCapabilitiesThat(mWiFiNetworkAgent, @@ -2647,10 +2654,10 @@ public class ConnectivityServiceTest { cBar.assertNoCallback(); mWiFiNetworkAgent.setNetworkSpecifier(null); - cFoo.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - cBar.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + cFoo.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + cBar.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); for (TestNetworkCallback c: emptyCallbacks) { - c.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, mWiFiNetworkAgent); + c.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, mWiFiNetworkAgent); } assertNoCallbacks(cEmpty1, cEmpty2, cEmpty3, cEmpty4, cFoo, cBar); @@ -2793,7 +2800,7 @@ public class ConnectivityServiceTest { // Bring down cell. Expect no default network callback, since it wasn't the default. mCellNetworkAgent.disconnect(); - cellNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); defaultNetworkCallback.assertNoCallback(); assertEquals(defaultNetworkCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); @@ -2808,11 +2815,11 @@ public class ConnectivityServiceTest { // followed by AVAILABLE cell. mWiFiNetworkAgent.disconnect(); cellNetworkCallback.assertNoCallback(); - defaultNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultNetworkCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); mCellNetworkAgent.disconnect(); - cellNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); - defaultNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); waitForIdle(); assertEquals(null, mCm.getActiveNetwork()); @@ -2829,7 +2836,7 @@ public class ConnectivityServiceTest { assertEquals(defaultNetworkCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); vpnNetworkAgent.disconnect(); - defaultNetworkCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); waitForIdle(); assertEquals(null, mCm.getActiveNetwork()); } @@ -2857,7 +2864,7 @@ public class ConnectivityServiceTest { lp.setInterfaceName("foonet_data0"); mCellNetworkAgent.sendLinkProperties(lp); // We should get onLinkPropertiesChanged(). - cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); @@ -2865,7 +2872,7 @@ public class ConnectivityServiceTest { mCellNetworkAgent.suspend(); cellNetworkCallback.expectCapabilitiesWithout(NET_CAPABILITY_NOT_SUSPENDED, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.SUSPENDED, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.SUSPENDED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); // Register a garden variety default network request. @@ -2880,7 +2887,7 @@ public class ConnectivityServiceTest { mCellNetworkAgent.resume(); cellNetworkCallback.expectCapabilitiesWith(NET_CAPABILITY_NOT_SUSPENDED, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.RESUMED, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.RESUMED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); dfltNetworkCallback = new TestNetworkCallback(); @@ -2943,10 +2950,10 @@ public class ConnectivityServiceTest { // When wifi connects, cell lingers. callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + callback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); fgCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - fgCallback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + fgCallback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); fgCallback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); assertTrue(isForegroundNetwork(mCellNetworkAgent)); assertTrue(isForegroundNetwork(mWiFiNetworkAgent)); @@ -2954,7 +2961,7 @@ public class ConnectivityServiceTest { // When lingering is complete, cell is still there but is now in the background. waitForIdle(); int timeoutMs = TEST_LINGER_DELAY_MS + TEST_LINGER_DELAY_MS / 4; - fgCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent, timeoutMs); + fgCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent, timeoutMs); // Expect a network capabilities update sans FOREGROUND. callback.expectCapabilitiesWithout(NET_CAPABILITY_FOREGROUND, mCellNetworkAgent); assertFalse(isForegroundNetwork(mCellNetworkAgent)); @@ -2980,7 +2987,7 @@ public class ConnectivityServiceTest { // Release the request. The network immediately goes into the background, since it was not // lingering. mCm.unregisterNetworkCallback(cellCallback); - fgCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + fgCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); // Expect a network capabilities update sans FOREGROUND. callback.expectCapabilitiesWithout(NET_CAPABILITY_FOREGROUND, mCellNetworkAgent); assertFalse(isForegroundNetwork(mCellNetworkAgent)); @@ -2988,8 +2995,8 @@ public class ConnectivityServiceTest { // Disconnect wifi and check that cell is foreground again. mWiFiNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - fgCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + fgCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); fgCallback.expectAvailableCallbacksValidated(mCellNetworkAgent); assertTrue(isForegroundNetwork(mCellNetworkAgent)); @@ -3126,7 +3133,7 @@ public class ConnectivityServiceTest { testFactory.waitForNetworkRequests(1); // ... and cell data to be torn down. - cellNetworkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); assertLength(1, mCm.getAllNetworks()); testFactory.unregister(); @@ -3215,7 +3222,7 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.setNetworkInvalid(); mCm.reportNetworkConnectivity(wifiNetwork, false); defaultCallback.expectCapabilitiesWithout(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); - validatedWifiCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + validatedWifiCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Because avoid bad wifi is off, we don't switch to cellular. defaultCallback.assertNoCallback(); @@ -3259,7 +3266,7 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.setNetworkInvalid(); mCm.reportNetworkConnectivity(wifiNetwork, false); defaultCallback.expectCapabilitiesWithout(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); - validatedWifiCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + validatedWifiCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Simulate the user selecting "switch" and checking the don't ask again checkbox. Settings.Global.putInt(cr, Settings.Global.NETWORK_AVOID_BAD_WIFI, 1); @@ -3286,7 +3293,7 @@ public class ConnectivityServiceTest { // If cell goes down, we switch to wifi. mCellNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); defaultCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); validatedWifiCallback.assertNoCallback(); @@ -3350,7 +3357,7 @@ public class ConnectivityServiceTest { networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false, false, TEST_CALLBACK_TIMEOUT_MS); mWiFiNetworkAgent.disconnect(); - networkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); // Validate that UNAVAILABLE is not called networkCallback.assertNoCallback(); @@ -3370,7 +3377,7 @@ public class ConnectivityServiceTest { mCm.requestNetwork(nr, networkCallback, timeoutMs); // pass timeout and validate that UNAVAILABLE is called - networkCallback.expectCallback(CallbackRecord.UNAVAILABLE, null); + networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, null); // create a network satisfying request - validate that request not triggered mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); @@ -3461,7 +3468,7 @@ public class ConnectivityServiceTest { // Simulate the factory releasing the request as unfulfillable and expect onUnavailable! testFactory.triggerUnfulfillable(requests.get(newRequestId)); - networkCallback.expectCallback(CallbackRecord.UNAVAILABLE, null); + networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, null); testFactory.waitForRequests(); // unregister network callback - a no-op (since already freed by the @@ -4303,7 +4310,7 @@ public class ConnectivityServiceTest { // Disconnect wifi aware network. wifiAware.disconnect(); - callback.expectCallbackThat(TIMEOUT_MS, (info) -> info instanceof CallbackRecord.Lost); + callback.expectCallbackThat(TIMEOUT_MS, (info) -> info instanceof CallbackEntry.Lost); mCm.unregisterNetworkCallback(callback); verifyNoNetwork(); @@ -4352,12 +4359,12 @@ public class ConnectivityServiceTest { // ConnectivityService. TestNetworkAgentWrapper networkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI, lp); networkAgent.connect(true); - networkCallback.expectCallback(CallbackRecord.AVAILABLE, networkAgent); - networkCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, networkAgent); - CallbackRecord.LinkPropertiesChanged cbi = - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + networkCallback.expectCallback(CallbackEntry.AVAILABLE, networkAgent); + networkCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, networkAgent); + CallbackEntry.LinkPropertiesChanged cbi = + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, networkAgent); - networkCallback.expectCallback(CallbackRecord.BLOCKED_STATUS, networkAgent); + networkCallback.expectCallback(CallbackEntry.BLOCKED_STATUS, networkAgent); networkCallback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, networkAgent); networkCallback.assertNoCallback(); checkDirectlyConnectedRoutes(cbi.getLp(), Arrays.asList(myIpv4Address), @@ -4372,7 +4379,7 @@ public class ConnectivityServiceTest { newLp.addLinkAddress(myIpv6Address1); newLp.addLinkAddress(myIpv6Address2); networkAgent.sendLinkProperties(newLp); - cbi = networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, networkAgent); + cbi = networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, networkAgent); networkCallback.assertNoCallback(); checkDirectlyConnectedRoutes(cbi.getLp(), Arrays.asList(myIpv4Address, myIpv6Address1, myIpv6Address2), @@ -4578,12 +4585,12 @@ public class ConnectivityServiceTest { assertTrue(ArrayUtils.containsAll(resolvrParams.tlsServers, new String[] { "2001:db8::1", "192.0.2.1" })); reset(mMockDnsResolver); - cellNetworkCallback.expectCallback(CallbackRecord.AVAILABLE, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, + cellNetworkCallback.expectCallback(CallbackEntry.AVAILABLE, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, mCellNetworkAgent); - CallbackRecord.LinkPropertiesChanged cbi = cellNetworkCallback.expectCallback( - CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.BLOCKED_STATUS, mCellNetworkAgent); + CallbackEntry.LinkPropertiesChanged cbi = cellNetworkCallback.expectCallback( + CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.BLOCKED_STATUS, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertFalse(cbi.getLp().isPrivateDnsActive()); assertNull(cbi.getLp().getPrivateDnsServerName()); @@ -4614,7 +4621,7 @@ public class ConnectivityServiceTest { setPrivateDnsSettings(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, "strict.example.com"); // Can't test dns configuration for strict mode without properly mocking // out the DNS lookups, but can test that LinkProperties is updated. - cbi = cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cbi = cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertTrue(cbi.getLp().isPrivateDnsActive()); @@ -4637,12 +4644,12 @@ public class ConnectivityServiceTest { mCellNetworkAgent.sendLinkProperties(lp); mCellNetworkAgent.connect(false); waitForIdle(); - cellNetworkCallback.expectCallback(CallbackRecord.AVAILABLE, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, + cellNetworkCallback.expectCallback(CallbackEntry.AVAILABLE, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, mCellNetworkAgent); - CallbackRecord.LinkPropertiesChanged cbi = cellNetworkCallback.expectCallback( - CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); - cellNetworkCallback.expectCallback(CallbackRecord.BLOCKED_STATUS, mCellNetworkAgent); + CallbackEntry.LinkPropertiesChanged cbi = cellNetworkCallback.expectCallback( + CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + cellNetworkCallback.expectCallback(CallbackEntry.BLOCKED_STATUS, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertFalse(cbi.getLp().isPrivateDnsActive()); assertNull(cbi.getLp().getPrivateDnsServerName()); @@ -4659,7 +4666,7 @@ public class ConnectivityServiceTest { LinkProperties lp2 = new LinkProperties(lp); lp2.addDnsServer(InetAddress.getByName("145.100.185.16")); mCellNetworkAgent.sendLinkProperties(lp2); - cbi = cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cbi = cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertFalse(cbi.getLp().isPrivateDnsActive()); @@ -4683,7 +4690,7 @@ public class ConnectivityServiceTest { // private dns fields should be sent. mService.mNetdEventCallback.onPrivateDnsValidationEvent( mCellNetworkAgent.getNetwork().netId, "145.100.185.16", "", true); - cbi = cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cbi = cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertTrue(cbi.getLp().isPrivateDnsActive()); @@ -4695,7 +4702,7 @@ public class ConnectivityServiceTest { LinkProperties lp3 = new LinkProperties(lp2); lp3.setMtu(1300); mCellNetworkAgent.sendLinkProperties(lp3); - cbi = cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cbi = cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertTrue(cbi.getLp().isPrivateDnsActive()); @@ -4708,7 +4715,7 @@ public class ConnectivityServiceTest { LinkProperties lp4 = new LinkProperties(lp3); lp4.removeDnsServer(InetAddress.getByName("145.100.185.16")); mCellNetworkAgent.sendLinkProperties(lp4); - cbi = cellNetworkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, + cbi = cellNetworkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); cellNetworkCallback.assertNoCallback(); assertFalse(cbi.getLp().isPrivateDnsActive()); @@ -4799,19 +4806,19 @@ public class ConnectivityServiceTest { defaultCallback.expectAvailableCallbacksUnvalidated(vpnNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); - genericNetworkCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, vpnNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent); genericNotVpnNetworkCallback.assertNoCallback(); vpnNetworkCallback.expectCapabilitiesThat(vpnNetworkAgent, nc -> null == nc.getUids()); - defaultCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, vpnNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent); assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); ranges.clear(); vpnNetworkAgent.setUids(ranges); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); genericNotVpnNetworkCallback.assertNoCallback(); wifiNetworkCallback.assertNoCallback(); - vpnNetworkCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + vpnNetworkCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); // TODO : The default network callback should actually get a LOST call here (also see the // comment below for AVAILABLE). This is because ConnectivityService does not look at UID @@ -4819,7 +4826,7 @@ public class ConnectivityServiceTest { // can't currently update their UIDs without disconnecting, so this does not matter too // much, but that is the reason the test here has to check for an update to the // capabilities instead of the expected LOST then AVAILABLE. - defaultCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, vpnNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent); ranges.add(new UidRange(uid, uid)); mMockVpn.setUids(ranges); @@ -4831,23 +4838,23 @@ public class ConnectivityServiceTest { vpnNetworkCallback.expectAvailableCallbacksValidated(vpnNetworkAgent); // TODO : Here like above, AVAILABLE would be correct, but because this can't actually // happen outside of the test, ConnectivityService does not rematch callbacks. - defaultCallback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, vpnNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent); mWiFiNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - genericNotVpnNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); - wifiNetworkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + genericNotVpnNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); + wifiNetworkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); vpnNetworkCallback.assertNoCallback(); defaultCallback.assertNoCallback(); vpnNetworkAgent.disconnect(); - genericNetworkCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + genericNetworkCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); genericNotVpnNetworkCallback.assertNoCallback(); wifiNetworkCallback.assertNoCallback(); - vpnNetworkCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); - defaultCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + vpnNetworkCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); assertEquals(null, mCm.getActiveNetwork()); mCm.unregisterNetworkCallback(genericNetworkCallback); @@ -4913,7 +4920,7 @@ public class ConnectivityServiceTest { assertEquals(defaultCallback.getLastAvailableNetwork(), mCm.getActiveNetwork()); vpnNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); defaultCallback.expectAvailableCallbacksValidated(mWiFiNetworkAgent); mCm.unregisterNetworkCallback(defaultCallback); @@ -4944,7 +4951,7 @@ public class ConnectivityServiceTest { // Even though the VPN is unvalidated, it becomes the default network for our app. callback.expectAvailableCallbacksUnvalidated(vpnNetworkAgent); // TODO: this looks like a spurious callback. - callback.expectCallback(CallbackRecord.NETWORK_CAPS_UPDATED, vpnNetworkAgent); + callback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent); callback.assertNoCallback(); assertTrue(vpnNetworkAgent.getScore() > mEthernetNetworkAgent.getScore()); @@ -4969,7 +4976,7 @@ public class ConnectivityServiceTest { callback.assertNoCallback(); vpnNetworkAgent.disconnect(); - callback.expectCallback(CallbackRecord.LOST, vpnNetworkAgent); + callback.expectCallback(CallbackEntry.LOST, vpnNetworkAgent); callback.expectAvailableCallbacksValidated(mEthernetNetworkAgent); } @@ -5411,7 +5418,7 @@ public class ConnectivityServiceTest { // Switch to METERED network. Restrict the use of the network. mWiFiNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); defaultCallback.expectAvailableCallbacksValidatedAndBlocked(mCellNetworkAgent); // Network becomes NOT_METERED. @@ -5425,7 +5432,7 @@ public class ConnectivityServiceTest { defaultCallback.assertNoCallback(); mCellNetworkAgent.disconnect(); - defaultCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + defaultCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); defaultCallback.assertNoCallback(); mCm.unregisterNetworkCallback(defaultCallback); @@ -5501,7 +5508,7 @@ public class ConnectivityServiceTest { // the NAT64 prefix was removed because one was never discovered. cellLp.addLinkAddress(myIpv4); mCellNetworkAgent.sendLinkProperties(cellLp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verify(mMockDnsResolver, times(1)).stopPrefix64Discovery(cellNetId); verify(mMockDnsResolver, atLeastOnce()).setResolverConfiguration(any()); @@ -5514,7 +5521,7 @@ public class ConnectivityServiceTest { cellLp.removeLinkAddress(myIpv4); cellLp.removeRoute(new RouteInfo(myIpv4, null, MOBILE_IFNAME)); mCellNetworkAgent.sendLinkProperties(cellLp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verify(mMockDnsResolver, times(1)).startPrefix64Discovery(cellNetId); // When NAT64 prefix discovery succeeds, LinkProperties are updated and clatd is started. @@ -5523,14 +5530,14 @@ public class ConnectivityServiceTest { mService.mNetdEventCallback.onNat64PrefixEvent(cellNetId, true /* added */, kNat64PrefixString, 96); LinkProperties lpBeforeClat = networkCallback.expectCallback( - CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent).getLp(); + CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent).getLp(); assertEquals(0, lpBeforeClat.getStackedLinks().size()); assertEquals(kNat64Prefix, lpBeforeClat.getNat64Prefix()); verify(mMockNetd, times(1)).clatdStart(MOBILE_IFNAME, kNat64Prefix.toString()); // Clat iface comes up. Expect stacked link to be added. clat.interfaceLinkStateChanged(CLAT_PREFIX + MOBILE_IFNAME, true); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); List<LinkProperties> stackedLps = mCm.getLinkProperties(mCellNetworkAgent.getNetwork()) .getStackedLinks(); assertEquals(makeClatLinkProperties(myIpv4), stackedLps.get(0)); @@ -5538,7 +5545,7 @@ public class ConnectivityServiceTest { // Change trivial linkproperties and see if stacked link is preserved. cellLp.addDnsServer(InetAddress.getByName("8.8.8.8")); mCellNetworkAgent.sendLinkProperties(cellLp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); List<LinkProperties> stackedLpsAfterChange = mCm.getLinkProperties(mCellNetworkAgent.getNetwork()).getStackedLinks(); @@ -5556,12 +5563,12 @@ public class ConnectivityServiceTest { cellLp.addLinkAddress(myIpv4); cellLp.addRoute(new RouteInfo(myIpv4, null, MOBILE_IFNAME)); mCellNetworkAgent.sendLinkProperties(cellLp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verify(mMockNetd, times(1)).clatdStop(MOBILE_IFNAME); verify(mMockDnsResolver, times(1)).stopPrefix64Discovery(cellNetId); // As soon as stop is called, the linkproperties lose the stacked interface. - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); LinkProperties actualLpAfterIpv4 = mCm.getLinkProperties(mCellNetworkAgent.getNetwork()); LinkProperties expected = new LinkProperties(cellLp); expected.setNat64Prefix(kNat64Prefix); @@ -5588,11 +5595,11 @@ public class ConnectivityServiceTest { cellLp.removeRoute(new RouteInfo(myIpv4, null, MOBILE_IFNAME)); cellLp.removeDnsServer(InetAddress.getByName("8.8.8.8")); mCellNetworkAgent.sendLinkProperties(cellLp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verify(mMockDnsResolver, times(1)).startPrefix64Discovery(cellNetId); mService.mNetdEventCallback.onNat64PrefixEvent(cellNetId, true /* added */, kNat64PrefixString, 96); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verify(mMockNetd, times(1)).clatdStart(MOBILE_IFNAME, kNat64Prefix.toString()); @@ -5612,7 +5619,7 @@ public class ConnectivityServiceTest { // Clean up. mCellNetworkAgent.disconnect(); - networkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); networkCallback.assertNoCallback(); mCm.unregisterNetworkCallback(networkCallback); } @@ -5644,7 +5651,7 @@ public class ConnectivityServiceTest { reset(mNetworkManagementService); mWiFiNetworkAgent.connect(true); networkCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - networkCallback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); networkCallback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); verify(mNetworkManagementService, times(1)).addIdleTimer(eq(WIFI_IFNAME), anyInt(), eq(ConnectivityManager.TYPE_WIFI)); @@ -5653,7 +5660,7 @@ public class ConnectivityServiceTest { // Disconnect wifi and switch back to cell reset(mNetworkManagementService); mWiFiNetworkAgent.disconnect(); - networkCallback.expectCallback(CallbackRecord.LOST, mWiFiNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent); assertNoCallbacks(networkCallback); verify(mNetworkManagementService, times(1)).removeIdleTimer(eq(WIFI_IFNAME)); verify(mNetworkManagementService, times(1)).addIdleTimer(eq(MOBILE_IFNAME), anyInt(), @@ -5665,14 +5672,14 @@ public class ConnectivityServiceTest { mWiFiNetworkAgent.sendLinkProperties(wifiLp); mWiFiNetworkAgent.connect(true); networkCallback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); - networkCallback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOSING, mCellNetworkAgent); networkCallback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); // Disconnect cell reset(mNetworkManagementService); reset(mMockNetd); mCellNetworkAgent.disconnect(); - networkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); // LOST callback is triggered earlier than removing idle timer. Broadcast should also be // sent as network being switched. Ensure rule removal for cell will not be triggered // unexpectedly before network being removed. @@ -5723,12 +5730,12 @@ public class ConnectivityServiceTest { LinkProperties lp = new LinkProperties(); lp.setTcpBufferSizes(testTcpBufferSizes); mCellNetworkAgent.sendLinkProperties(lp); - networkCallback.expectCallback(CallbackRecord.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LINK_PROPERTIES_CHANGED, mCellNetworkAgent); verifyTcpBufferSizeChange(testTcpBufferSizes); // Clean up. mCellNetworkAgent.disconnect(); - networkCallback.expectCallback(CallbackRecord.LOST, mCellNetworkAgent); + networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent); networkCallback.assertNoCallback(); mCm.unregisterNetworkCallback(networkCallback); } @@ -5947,6 +5954,24 @@ public class ConnectivityServiceTest { assertContainsExactly(uidCaptor.getValue(), APP2_UID); } + @Test + public void testLinkPropertiesWithWakeOnLanForActiveNetwork() throws Exception { + mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); + + LinkProperties wifiLp = new LinkProperties(); + wifiLp.setInterfaceName(WIFI_WOL_IFNAME); + wifiLp.setWakeOnLanSupported(false); + + // Default network switch should update ifaces. + mWiFiNetworkAgent.connect(false); + mWiFiNetworkAgent.sendLinkProperties(wifiLp); + waitForIdle(); + + // ConnectivityService should have changed the WakeOnLanSupported to true + wifiLp.setWakeOnLanSupported(true); + assertEquals(wifiLp, mService.getActiveLinkProperties()); + } + private TestNetworkAgentWrapper establishVpn(LinkProperties lp, int establishingUid, Set<UidRange> vpnRange) throws Exception { diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java index 702921836b0d..3fdba6eac55d 100644 --- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -54,7 +54,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; -import android.content.pm.PackageList; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.UserInfo; @@ -70,6 +69,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.server.LocalServices; +import com.android.server.pm.PackageList; import org.junit.Before; import org.junit.Test; diff --git a/tools/apilint/apilint.py b/tools/apilint/apilint.py index 9e42c044e209..912c1ad377c1 100644 --- a/tools/apilint/apilint.py +++ b/tools/apilint/apilint.py @@ -1976,7 +1976,9 @@ def verify_nullability(clazz): """Catches missing nullability annotations""" for f in clazz.fields: - if f.value is not None and 'static' in f.split and 'final' in f.split: + if "enum_constant" in f.split: + continue # Enum constants are never null + if f.value is not None and 'final' in f.split: continue # Nullability of constants can be inferred. if f.typ not in PRIMITIVES and not has_nullability(f.annotations): error(clazz, f, "M12", "Field must be marked either @NonNull or @Nullable") @@ -1985,8 +1987,12 @@ def verify_nullability(clazz): verify_nullability_args(clazz, c) for m in clazz.methods: - if m.name == "writeToParcel" or m.name == "onReceive": - continue # Parcelable.writeToParcel() and BroadcastReceiver.onReceive() are not yet annotated + if m.name == "writeToParcel" or m.name == "onReceive" or m.name == "onBind": + continue # Parcelable.writeToParcel(), BroadcastReceiver.onReceive(), and Service.onBind() are not yet annotated + + if (m.name == "equals" and m.args == ["java.lang.Object"] or + m.name == "toString" and m.args == []): + continue # Nullability of equals and toString is implicit. if m.typ not in PRIMITIVES and not has_nullability(m.annotations): error(clazz, m, "M12", "Return value must be marked either @NonNull or @Nullable") diff --git a/tools/codegen/src/com/android/codegen/ClassInfo.kt b/tools/codegen/src/com/android/codegen/ClassInfo.kt index 5061be2091e5..92da9dab863b 100644 --- a/tools/codegen/src/com/android/codegen/ClassInfo.kt +++ b/tools/codegen/src/com/android/codegen/ClassInfo.kt @@ -38,6 +38,11 @@ open class ClassInfo(val sourceLines: List<String>) { val superInterfaces = (fileAst.types[0] as ClassOrInterfaceDeclaration) .implementedTypes.map { it.asString() } + val superClass = run { + val superClasses = (fileAst.types[0] as ClassOrInterfaceDeclaration).extendedTypes + if (superClasses.isNonEmpty) superClasses[0] else null + } + val ClassName = classAst.nameAsString private val genericArgsAst = classAst.typeParameters val genericArgs = if (genericArgsAst.isEmpty()) "" else { diff --git a/tools/codegen/src/com/android/codegen/ClassPrinter.kt b/tools/codegen/src/com/android/codegen/ClassPrinter.kt index 1f0d4b8a7ec9..bd72d9e7ec21 100644 --- a/tools/codegen/src/com/android/codegen/ClassPrinter.kt +++ b/tools/codegen/src/com/android/codegen/ClassPrinter.kt @@ -1,6 +1,7 @@ package com.android.codegen import com.github.javaparser.ast.Modifier +import com.github.javaparser.ast.body.CallableDeclaration import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration import com.github.javaparser.ast.body.TypeDeclaration import com.github.javaparser.ast.expr.* @@ -37,6 +38,7 @@ class ClassPrinter( val GeneratedMember by lazy { classRef("com.android.internal.util.DataClass.Generated.Member") } val Parcelling by lazy { classRef("com.android.internal.util.Parcelling") } val Parcelable by lazy { classRef("android.os.Parcelable") } + val Parcel by lazy { classRef("android.os.Parcel") } val UnsupportedAppUsage by lazy { classRef("android.annotation.UnsupportedAppUsage") } init { @@ -354,7 +356,9 @@ class ClassPrinter( } fun hasMethod(name: String, vararg argTypes: String): Boolean { - return classAst.methods.any { + val members: List<CallableDeclaration<*>> = + if (name == ClassName) classAst.constructors else classAst.methods + return members.any { it.name.asString() == name && it.parameters.map { it.type.asString() } == argTypes.toList() } @@ -365,6 +369,10 @@ class ClassPrinter( .mapIndexed { i, node -> FieldInfo(index = i, fieldAst = node, classInfo = this) } .filter { hasMethod("lazyInit${it.NameUpperCamel}") } + val extendsParcelableClass by lazy { + Parcelable !in superInterfaces && superClass != null + } + init { val builderFactoryOverride = classAst.methods.find { it.isStatic && it.nameAsString == "builder" diff --git a/tools/codegen/src/com/android/codegen/Generators.kt b/tools/codegen/src/com/android/codegen/Generators.kt index 865340566019..5a95676c1dc8 100644 --- a/tools/codegen/src/com/android/codegen/Generators.kt +++ b/tools/codegen/src/com/android/codegen/Generators.kt @@ -422,6 +422,10 @@ fun ClassPrinter.generateParcelable() { +"// void parcelFieldName(Parcel dest, int flags) { ... }" +"" + if (extendsParcelableClass) { + +"super.writeToParcel(dest, flags);\n" + } + if (booleanFields.isNotEmpty() || nullableFields.isNotEmpty()) { +"$flagStorageType flg = 0;" booleanFields.forEachApply { @@ -463,6 +467,123 @@ fun ClassPrinter.generateParcelable() { +"" } + if (!hasMethod(ClassName, Parcel)) { + val visibility = if (classAst.isFinal) "/* package-private */" else "protected" + + +"/** @hide */" + +"@SuppressWarnings({\"unchecked\", \"RedundantCast\"})" + +GENERATED_MEMBER_HEADER + "$visibility $ClassName($Parcel in) {" { + +"// You can override field unparcelling by defining methods like:" + +"// static FieldType unparcelFieldName(Parcel in) { ... }" + +"" + + if (extendsParcelableClass) { + +"super(in);\n" + } + + if (booleanFields.isNotEmpty() || nullableFields.isNotEmpty()) { + +"$flagStorageType flg = in.read$FlagStorageType();" + } + booleanFields.forEachApply { + +"$Type $_name = (flg & $fieldBit) != 0;" + } + nonBooleanFields.forEachApply { + + // Handle customized parceling + val customParcellingMethod = "unparcel$NameUpperCamel" + if (hasMethod(customParcellingMethod, Parcel)) { + +"$Type $_name = $customParcellingMethod(in);" + } else if (customParcellingClass != null) { + +"$Type $_name = $sParcelling.unparcel(in);" + } else if (hasAnnotation("@$DataClassEnum")) { + val ordinal = "${_name}Ordinal" + +"int $ordinal = in.readInt();" + +"$Type $_name = $ordinal < 0 ? null : $FieldClass.values()[$ordinal];" + } else { + val methodArgs = mutableListOf<String>() + + // Create container if any + val containerInitExpr = when { + FieldClass.endsWith("Map") -> "new $LinkedHashMap<>()" + FieldClass == "List" || FieldClass == "ArrayList" -> + "new ${classRef("java.util.ArrayList")}<>()" + else -> "" + } + val passContainer = containerInitExpr.isNotEmpty() + + // nullcheck + + // "FieldType fieldName = (FieldType)" + if (passContainer) { + methodArgs.add(_name) + !"$Type $_name = " + if (mayBeNull) { + +"null;" + !"if ((flg & $fieldBit) != 0) {" + pushIndent() + +"" + !"$_name = " + } + +"$containerInitExpr;" + } else { + !"$Type $_name = " + if (mayBeNull) !"(flg & $fieldBit) == 0 ? null : " + if (ParcelMethodsSuffix == "StrongInterface") { + !"$FieldClass.Stub.asInterface(" + } else if (Type !in PRIMITIVE_TYPES + "String" + "Bundle" && + (!isArray || FieldInnerType !in PRIMITIVE_TYPES + "String") && + ParcelMethodsSuffix != "Parcelable") { + !"($FieldClass) " + } + } + + // Determine method args + when { + ParcelMethodsSuffix == "Parcelable" -> + methodArgs += "$FieldClass.class.getClassLoader()" + ParcelMethodsSuffix == "SparseArray" -> + methodArgs += "$FieldInnerClass.class.getClassLoader()" + ParcelMethodsSuffix == "TypedObject" -> + methodArgs += "$FieldClass.CREATOR" + ParcelMethodsSuffix == "TypedArray" -> + methodArgs += "$FieldInnerClass.CREATOR" + ParcelMethodsSuffix == "Map" -> + methodArgs += "${fieldTypeGenegicArgs[1].substringBefore("<")}.class.getClassLoader()" + ParcelMethodsSuffix.startsWith("Parcelable") + || (isList || isArray) + && FieldInnerType !in PRIMITIVE_TYPES + "String" -> + methodArgs += "$FieldInnerClass.class.getClassLoader()" + } + + // ...in.readFieldType(args...); + when { + ParcelMethodsSuffix == "StrongInterface" -> !"in.readStrongBinder" + isArray -> !"in.create$ParcelMethodsSuffix" + else -> !"in.read$ParcelMethodsSuffix" + } + !"(${methodArgs.joinToString(", ")})" + if (ParcelMethodsSuffix == "StrongInterface") !")" + +";" + + // Cleanup if passContainer + if (passContainer && mayBeNull) { + popIndent() + rmEmptyLine() + +"\n}" + } + } + } + + +"" + fields.forEachApply { + !"this." + generateSetFrom(_name) + } + + generateOnConstructedCallback() + } + } + if (classAst.fields.none { it.variables[0].nameAsString == "CREATOR" }) { val Creator = classRef("android.os.Parcelable.Creator") @@ -477,107 +598,8 @@ fun ClassPrinter.generateParcelable() { } +"@Override" - +"@SuppressWarnings({\"unchecked\", \"RedundantCast\"})" "public $ClassName createFromParcel($Parcel in)" { - +"// You can override field unparcelling by defining methods like:" - +"// static FieldType unparcelFieldName(Parcel in) { ... }" - +"" - if (booleanFields.isNotEmpty() || nullableFields.isNotEmpty()) { - +"$flagStorageType flg = in.read$FlagStorageType();" - } - booleanFields.forEachApply { - +"$Type $_name = (flg & $fieldBit) != 0;" - } - nonBooleanFields.forEachApply { - - // Handle customized parceling - val customParcellingMethod = "unparcel$NameUpperCamel" - if (hasMethod(customParcellingMethod, Parcel)) { - +"$Type $_name = $customParcellingMethod(in);" - } else if (customParcellingClass != null) { - +"$Type $_name = $sParcelling.unparcel(in);" - } else if (hasAnnotation("@$DataClassEnum")) { - val ordinal = "${_name}Ordinal" - +"int $ordinal = in.readInt();" - +"$Type $_name = $ordinal < 0 ? null : $FieldClass.values()[$ordinal];" - } else { - val methodArgs = mutableListOf<String>() - - // Create container if any - val containerInitExpr = when { - FieldClass.endsWith("Map") -> "new $LinkedHashMap<>()" - FieldClass == "List" || FieldClass == "ArrayList" -> - "new ${classRef("java.util.ArrayList")}<>()" - else -> "" - } - val passContainer = containerInitExpr.isNotEmpty() - - // nullcheck + - // "FieldType fieldName = (FieldType)" - if (passContainer) { - methodArgs.add(_name) - !"$Type $_name = " - if (mayBeNull) { - +"null;" - !"if ((flg & $fieldBit) != 0) {" - pushIndent() - +"" - !"$_name = " - } - +"$containerInitExpr;" - } else { - !"$Type $_name = " - if (mayBeNull) !"(flg & $fieldBit) == 0 ? null : " - if (ParcelMethodsSuffix == "StrongInterface") { - !"$FieldClass.Stub.asInterface(" - } else if (Type !in PRIMITIVE_TYPES + "String" + "Bundle" && - (!isArray || FieldInnerType !in PRIMITIVE_TYPES + "String") && - ParcelMethodsSuffix != "Parcelable") { - !"($FieldClass) " - } - } - - // Determine method args - when { - ParcelMethodsSuffix == "Parcelable" -> - methodArgs += "$FieldClass.class.getClassLoader()" - ParcelMethodsSuffix == "SparseArray" -> - methodArgs += "$FieldInnerClass.class.getClassLoader()" - ParcelMethodsSuffix == "TypedObject" -> - methodArgs += "$FieldClass.CREATOR" - ParcelMethodsSuffix == "TypedArray" -> - methodArgs += "$FieldInnerClass.CREATOR" - ParcelMethodsSuffix == "Map" -> - methodArgs += "${fieldTypeGenegicArgs[1].substringBefore("<")}.class.getClassLoader()" - ParcelMethodsSuffix.startsWith("Parcelable") - || (isList || isArray) - && FieldInnerType !in PRIMITIVE_TYPES + "String" -> - methodArgs += "$FieldInnerClass.class.getClassLoader()" - } - - // ...in.readFieldType(args...); - when { - ParcelMethodsSuffix == "StrongInterface" -> !"in.readStrongBinder" - isArray -> !"in.create$ParcelMethodsSuffix" - else -> !"in.read$ParcelMethodsSuffix" - } - !"(${methodArgs.joinToString(", ")})" - if (ParcelMethodsSuffix == "StrongInterface") !")" - +";" - - // Cleanup if passContainer - if (passContainer && mayBeNull) { - popIndent() - rmEmptyLine() - +"\n}" - } - } - } - "return new $ClassType(" { - fields.forEachTrimmingTrailingComma { - +"$_name," - } - } + ";" + +"return new $ClassName(in);" } rmEmptyLine() } + ";" diff --git a/tools/codegen/src/com/android/codegen/Main.kt b/tools/codegen/src/com/android/codegen/Main.kt index 580467433756..039f7b2fc627 100755 --- a/tools/codegen/src/com/android/codegen/Main.kt +++ b/tools/codegen/src/com/android/codegen/Main.kt @@ -95,7 +95,13 @@ In addition, for any field mMyField(or myField) of type FieldType you can define you can use with final fields. Version: $CODEGEN_VERSION -Questions? Feedback? Contact: eugenesusla@ + +Questions? Feedback? +Contact: eugenesusla@ +Bug/feature request: http://go/codegen-bug + +Slides: http://go/android-codegen +In-depth example: http://go/SampleDataClass """ fun main(args: Array<String>) { @@ -146,8 +152,7 @@ fun main(args: Array<String>) { generateConstructor("public") } else if (FeatureFlag.BUILDER() || FeatureFlag.COPY_CONSTRUCTOR() - || FeatureFlag.WITHERS() - || FeatureFlag.PARCELABLE()) { + || FeatureFlag.WITHERS()) { generateConstructor("/* package-private */") } if (FeatureFlag.COPY_CONSTRUCTOR()) generateCopyConstructor() diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 1cc7ef338cc3..47f774f07f16 100644 --- a/tools/codegen/src/com/android/codegen/SharedConstants.kt +++ b/tools/codegen/src/com/android/codegen/SharedConstants.kt @@ -1,7 +1,7 @@ package com.android.codegen const val CODEGEN_NAME = "codegen" -const val CODEGEN_VERSION = "1.0.4" +const val CODEGEN_VERSION = "1.0.7" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" diff --git a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt index d00def625a39..7fe21c7aab3e 100644 --- a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt +++ b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt @@ -182,6 +182,11 @@ class StaleDataclassProcessor: AbstractProcessor() { .filterNot { it.kind == ElementKind.CLASS || it.kind == ElementKind.CONSTRUCTOR + || it.kind == ElementKind.INTERFACE + || it.kind == ElementKind.ENUM + || it.kind == ElementKind.ANNOTATION_TYPE + || it.kind == ElementKind.INSTANCE_INIT + || it.kind == ElementKind.STATIC_INIT || isGenerated(it) }.map { elemToString(it) diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 5782f5b1ab31..5496e83811f8 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1813,12 +1813,13 @@ public class WifiManager { } /** - * Remove the Passpoint configuration identified by its FQDN (Fully Qualified Domain Name). + * Remove the Passpoint configuration identified by its FQDN (Fully Qualified Domain Name) added + * by the caller. * - * @param fqdn The FQDN of the Passpoint configuration to be removed + * @param fqdn The FQDN of the Passpoint configuration added by the caller to be removed * @throws IllegalArgumentException if no configuration is associated with the given FQDN or * Passpoint is not enabled on the device. - * @deprecated This is no longer supported. + * @deprecated This will be non-functional in a future release. */ @Deprecated @RequiresPermission(anyOf = { @@ -1842,12 +1843,12 @@ public class WifiManager { } /** - * Return the list of installed Passpoint configurations. + * Return the list of installed Passpoint configurations added by the caller. * * An empty list will be returned when no configurations are installed. * - * @return A list of {@link PasspointConfiguration} - * @deprecated This is no longer supported. + * @return A list of {@link PasspointConfiguration} added by the caller + * @deprecated This will be non-functional in a future release. */ @Deprecated @RequiresPermission(anyOf = { |