diff options
278 files changed, 5627 insertions, 2811 deletions
diff --git a/Android.bp b/Android.bp index 29ca05122cd2..c0879f0591b5 100644 --- a/Android.bp +++ b/Android.bp @@ -1611,7 +1611,6 @@ filegroup { "core/java/android/os/RegistrantList.java", "core/java/android/os/Registrant.java", "core/java/android/util/LocalLog.java", - "core/java/android/util/Slog.java", "core/java/android/util/TimeUtils.java", "core/java/com/android/internal/os/SomeArgs.java", "core/java/com/android/internal/util/FastXmlSerializer.java", diff --git a/apex/jobscheduler/framework/java/android/app/job/JobSchedulerFrameworkInitializer.java b/apex/jobscheduler/framework/java/android/app/job/JobSchedulerFrameworkInitializer.java index 3835d93ebeb9..0c4fcb4ec1b0 100644 --- a/apex/jobscheduler/framework/java/android/app/job/JobSchedulerFrameworkInitializer.java +++ b/apex/jobscheduler/framework/java/android/app/job/JobSchedulerFrameworkInitializer.java @@ -16,6 +16,7 @@ package android.app.job; +import android.annotation.SystemApi; import android.app.JobSchedulerImpl; import android.app.SystemServiceRegistry; import android.content.Context; @@ -28,6 +29,7 @@ import android.os.PowerWhitelistManager; * * @hide */ +@SystemApi public class JobSchedulerFrameworkInitializer { private JobSchedulerFrameworkInitializer() { } @@ -38,8 +40,6 @@ public class JobSchedulerFrameworkInitializer { * {@link Context#getSystemService} can return them. * * <p>If this is called from other places, it throws a {@link IllegalStateException). - * - * TODO Make it a system API */ public static void registerServiceWrappers() { SystemServiceRegistry.registerStaticService( diff --git a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java index 0568beb34e08..8019d4fdb870 100644 --- a/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java +++ b/apex/jobscheduler/framework/java/android/os/DeviceIdleManager.java @@ -44,6 +44,10 @@ public class DeviceIdleManager { mService = service; } + IDeviceIdleController getService() { + return mService; + } + /** * @return package names the system has white-listed to opt out of power save restrictions, * except for device idle mode. diff --git a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl index 21ce5ccd3ccc..643d47ca5c6a 100644 --- a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl +++ b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl @@ -45,6 +45,7 @@ interface IDeviceIdleController { void addPowerSaveTempWhitelistApp(String name, long duration, int userId, String reason); long addPowerSaveTempWhitelistAppForMms(String name, int userId, String reason); long addPowerSaveTempWhitelistAppForSms(String name, int userId, String reason); + long whitelistAppTemporarily(String name, int userId, String reason); void exitIdle(String reason); int setPreIdleTimeoutMode(int Mode); void resetPreIdleTimeoutMode(); diff --git a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java index 06ed52d7f586..7a3ed92c1556 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java @@ -16,12 +16,17 @@ package android.os; +import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; import android.content.Context; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Interface to access and modify the power save whitelist. * @@ -32,11 +37,91 @@ import android.content.Context; @SystemService(Context.POWER_WHITELIST_MANAGER) public class PowerWhitelistManager { private final Context mContext; + // Proxy to DeviceIdleController for now + // TODO: migrate to PowerWhitelistController + private final IDeviceIdleController mService; + + /** + * Indicates that an unforeseen event has occurred and the app should be whitelisted to handle + * it. + */ + public static final int EVENT_UNSPECIFIED = 0; + + /** + * Indicates that an SMS event has occurred and the app should be whitelisted to handle it. + */ + public static final int EVENT_SMS = 1; + + /** + * Indicates that an MMS event has occurred and the app should be whitelisted to handle it. + */ + public static final int EVENT_MMS = 2; + + /** + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = {"EVENT_"}, value = { + EVENT_UNSPECIFIED, + EVENT_SMS, + EVENT_MMS, + }) + public @interface WhitelistEvent { + } /** * @hide */ public PowerWhitelistManager(@NonNull Context context) { mContext = context; + mService = context.getSystemService(DeviceIdleManager.class).getService(); + } + + /** + * Add an app to the temporary whitelist for a short amount of time. + * + * @param packageName The package to add to the temp whitelist + * @param durationMs How long to keep the app on the temp whitelist for (in milliseconds) + */ + @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) + public void whitelistAppTemporarily(@NonNull String packageName, long durationMs) { + String reason = "from:" + UserHandle.formatUid(Binder.getCallingUid()); + try { + mService.addPowerSaveTempWhitelistApp(packageName, durationMs, mContext.getUserId(), + reason); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } + + /** + * Add an app to the temporary whitelist for a short amount of time for a specific reason. + * + * @param packageName The package to add to the temp whitelist + * @param event The reason to add the app to the temp whitelist + * @param reason A human-readable reason explaining why the app is temp whitelisted. Only used + * for logging purposes + * @return The duration (in milliseconds) that the app is whitelisted for + */ + @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) + public long whitelistAppTemporarilyForEvent(@NonNull String packageName, + @WhitelistEvent int event, @NonNull String reason) { + try { + switch (event) { + case EVENT_MMS: + return mService.addPowerSaveTempWhitelistAppForMms( + packageName, mContext.getUserId(), reason); + case EVENT_SMS: + return mService.addPowerSaveTempWhitelistAppForSms( + packageName, mContext.getUserId(), reason); + case EVENT_UNSPECIFIED: + default: + return mService.whitelistAppTemporarily( + packageName, mContext.getUserId(), reason); + } + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + return 0; + } } } diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java index dfe7a90ba246..701ea849c38f 100644 --- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java +++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java @@ -1662,7 +1662,17 @@ public class DeviceIdleController extends SystemService return isPowerSaveWhitelistAppInternal(name); } - @Override public void addPowerSaveTempWhitelistApp(String packageName, long duration, + @Override + public long whitelistAppTemporarily(String packageName, int userId, String reason) + throws RemoteException { + // At least 10 seconds. + long duration = Math.max(10_000L, mConstants.MAX_TEMP_APP_WHITELIST_DURATION / 2); + addPowerSaveTempWhitelistAppChecked(packageName, duration, userId, reason); + return duration; + } + + @Override + public void addPowerSaveTempWhitelistApp(String packageName, long duration, int userId, String reason) throws RemoteException { addPowerSaveTempWhitelistAppChecked(packageName, duration, userId, reason); } diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java index a6cc06fad7eb..62c77ef20871 100644 --- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java +++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java @@ -18,6 +18,7 @@ package com.android.server.stats; import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED; import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED; import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS; +import static android.os.Process.THREAD_PRIORITY_BACKGROUND; import static android.os.Process.getUidForPid; import static android.os.storage.VolumeInfo.TYPE_PRIVATE; import static android.os.storage.VolumeInfo.TYPE_PUBLIC; @@ -115,7 +116,6 @@ import android.util.proto.ProtoStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.procstats.IProcessStats; import com.android.internal.app.procstats.ProcessStats; -import com.android.internal.os.BackgroundThread; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BinderCallsStats.ExportedCallStat; @@ -535,7 +535,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { // Assumes that sStatsdLock is held. @GuardedBy("sStatsdLock") - private final void informAllUidsLocked(Context context) throws RemoteException { + private void informAllUidsLocked(Context context) throws RemoteException { UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); PackageManager pm = context.getPackageManager(); final List<UserInfo> users = um.getUsers(true); @@ -557,7 +557,11 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { Slog.e(TAG, "Failed to close the read side of the pipe.", e); } final ParcelFileDescriptor writeFd = fds[1]; - BackgroundThread.getHandler().post(() -> { + HandlerThread backgroundThread = new HandlerThread( + "statsCompanionService.bg", THREAD_PRIORITY_BACKGROUND); + backgroundThread.start(); + Handler handler = new Handler(backgroundThread.getLooper()); + handler.post(() -> { FileOutputStream fout = new ParcelFileDescriptor.AutoCloseOutputStream(writeFd); try { ProtoOutputStream output = new ProtoOutputStream(fout); @@ -565,7 +569,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { // Add in all the apps for every user/profile. for (UserInfo profile : users) { List<PackageInfo> pi = - pm.getInstalledPackagesAsUser(PackageManager.MATCH_KNOWN_PACKAGES, + pm.getInstalledPackagesAsUser(PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_ANY_USER, profile.id); for (int j = 0; j < pi.size(); j++) { if (pi.get(j).applicationInfo != null) { @@ -606,6 +611,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { } } finally { IoUtils.closeQuietly(fout); + backgroundThread.quit(); + backgroundThread.interrupt(); } }); } @@ -2736,23 +2743,20 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { filter.addAction(Intent.ACTION_PACKAGE_ADDED); filter.addAction(Intent.ACTION_PACKAGE_REMOVED); filter.addDataScheme("package"); - mContext.registerReceiverAsUser(mAppUpdateReceiver, UserHandle.ALL, filter, - null, - null); + mContext.registerReceiverForAllUsers(mAppUpdateReceiver, filter, null, null); // Setup receiver for user initialize (which happens once for a new user) // and // if a user is removed. filter = new IntentFilter(Intent.ACTION_USER_INITIALIZE); filter.addAction(Intent.ACTION_USER_REMOVED); - mContext.registerReceiverAsUser(mUserUpdateReceiver, UserHandle.ALL, - filter, null, null); + mContext.registerReceiverForAllUsers(mUserUpdateReceiver, filter, null, null); // Setup receiver for device reboots or shutdowns. filter = new IntentFilter(Intent.ACTION_REBOOT); filter.addAction(Intent.ACTION_SHUTDOWN); - mContext.registerReceiverAsUser( - mShutdownEventReceiver, UserHandle.ALL, filter, null, null); + mContext.registerReceiverForAllUsers( + mShutdownEventReceiver, filter, null, null); final long token = Binder.clearCallingIdentity(); try { // Pull the latest state of UID->app name, version mapping when diff --git a/api/current.txt b/api/current.txt index f1c03a4e576d..07f1183c3021 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41525,6 +41525,7 @@ package android.service.autofill { field public static final int FLAG_DONT_SAVE_ON_FINISH = 2; // 0x2 field public static final int FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE = 1; // 0x1 field public static final int NEGATIVE_BUTTON_STYLE_CANCEL = 0; // 0x0 + field public static final int NEGATIVE_BUTTON_STYLE_NEVER = 2; // 0x2 field public static final int NEGATIVE_BUTTON_STYLE_REJECT = 1; // 0x1 field public static final int POSITIVE_BUTTON_STYLE_CONTINUE = 1; // 0x1 field public static final int POSITIVE_BUTTON_STYLE_SAVE = 0; // 0x0 @@ -52497,6 +52498,9 @@ package android.view { package android.view.accessibility { public final class AccessibilityEvent extends android.view.accessibility.AccessibilityRecord implements android.os.Parcelable { + ctor public AccessibilityEvent(); + ctor public AccessibilityEvent(int); + ctor public AccessibilityEvent(@NonNull android.view.accessibility.AccessibilityEvent); method public void appendRecord(android.view.accessibility.AccessibilityRecord); method public int describeContents(); method public static String eventTypeToString(int); @@ -52607,6 +52611,10 @@ package android.view.accessibility { } public class AccessibilityNodeInfo implements android.os.Parcelable { + ctor public AccessibilityNodeInfo(); + ctor public AccessibilityNodeInfo(@NonNull android.view.View); + ctor public AccessibilityNodeInfo(@NonNull android.view.View, int); + ctor public AccessibilityNodeInfo(@NonNull android.view.accessibility.AccessibilityNodeInfo); method public void addAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction); method @Deprecated public void addAction(int); method public void addChild(android.view.View); @@ -52840,6 +52848,8 @@ package android.view.accessibility { } public static final class AccessibilityNodeInfo.CollectionInfo { + ctor public AccessibilityNodeInfo.CollectionInfo(int, int, boolean); + ctor public AccessibilityNodeInfo.CollectionInfo(int, int, boolean, int); method public int getColumnCount(); method public int getRowCount(); method public int getSelectionMode(); @@ -52852,6 +52862,8 @@ package android.view.accessibility { } public static final class AccessibilityNodeInfo.CollectionItemInfo { + ctor public AccessibilityNodeInfo.CollectionItemInfo(int, int, int, int, boolean); + ctor public AccessibilityNodeInfo.CollectionItemInfo(int, int, int, int, boolean, boolean); method public int getColumnIndex(); method public int getColumnSpan(); method public int getRowIndex(); @@ -52863,6 +52875,7 @@ package android.view.accessibility { } public static final class AccessibilityNodeInfo.RangeInfo { + ctor public AccessibilityNodeInfo.RangeInfo(int, float, float, float); method public float getCurrent(); method public float getMax(); method public float getMin(); @@ -52894,6 +52907,8 @@ package android.view.accessibility { } public class AccessibilityRecord { + ctor public AccessibilityRecord(); + ctor public AccessibilityRecord(@NonNull android.view.accessibility.AccessibilityRecord); method public int getAddedCount(); method public CharSequence getBeforeText(); method public CharSequence getClassName(); @@ -52954,6 +52969,8 @@ package android.view.accessibility { } public final class AccessibilityWindowInfo implements android.os.Parcelable { + ctor public AccessibilityWindowInfo(); + ctor public AccessibilityWindowInfo(@NonNull android.view.accessibility.AccessibilityWindowInfo); method public int describeContents(); method public android.view.accessibility.AccessibilityNodeInfo getAnchor(); method public void getBoundsInScreen(android.graphics.Rect); diff --git a/api/system-current.txt b/api/system-current.txt index 4eb2e2661002..90321d769960 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -75,7 +75,7 @@ package android { field public static final String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"; field public static final String GET_RUNTIME_PERMISSIONS = "android.permission.GET_RUNTIME_PERMISSIONS"; field public static final String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO"; - field public static final String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS = "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"; + field @Deprecated public static final String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS = "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"; field public static final String GRANT_RUNTIME_PERMISSIONS = "android.permission.GRANT_RUNTIME_PERMISSIONS"; field public static final String GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS = "android.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS"; field public static final String HANDLE_CAR_MODE_CHANGES = "android.permission.HANDLE_CAR_MODE_CHANGES"; @@ -652,6 +652,29 @@ package android.app { method public boolean isStatusBarExpansionDisabled(); } + public final class SystemServiceRegistry { + method public static <TServiceClass> void registerContextAwareService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.ContextAwareServiceProducerWithBinder<TServiceClass>); + method public static <TServiceClass> void registerContextAwareService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.ContextAwareServiceProducerWithoutBinder<TServiceClass>); + method public static <TServiceClass> void registerStaticService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.StaticServiceProducerWithBinder<TServiceClass>); + method public static <TServiceClass> void registerStaticService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.StaticServiceProducerWithoutBinder<TServiceClass>); + } + + public static interface SystemServiceRegistry.ContextAwareServiceProducerWithBinder<TServiceClass> { + method @NonNull public TServiceClass createService(@NonNull android.content.Context, @NonNull android.os.IBinder); + } + + public static interface SystemServiceRegistry.ContextAwareServiceProducerWithoutBinder<TServiceClass> { + method @NonNull public TServiceClass createService(@NonNull android.content.Context); + } + + public static interface SystemServiceRegistry.StaticServiceProducerWithBinder<TServiceClass> { + method @NonNull public TServiceClass createService(@NonNull android.os.IBinder); + } + + public static interface SystemServiceRegistry.StaticServiceProducerWithoutBinder<TServiceClass> { + method @NonNull public TServiceClass createService(); + } + public class UiModeManager { method @RequiresPermission(android.Manifest.permission.ENTER_CAR_MODE_PRIORITIZED) public void enableCarMode(@IntRange(from=0) int, int); field public static final String ACTION_ENTER_CAR_MODE_PRIORITIZED = "android.app.action.ENTER_CAR_MODE_PRIORITIZED"; @@ -745,7 +768,7 @@ package android.app.admin { method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String); method @Deprecated @RequiresPermission("android.permission.MANAGE_DEVICE_ADMINS") public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException; method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied(); - method @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName); + method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName); field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED"; field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED"; field public static final String ACTION_PROVISION_FINALIZATION = "android.app.action.PROVISION_FINALIZATION"; @@ -1091,6 +1114,10 @@ package android.app.job { method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public abstract int scheduleAsPackage(@NonNull android.app.job.JobInfo, @NonNull String, int, String); } + public class JobSchedulerFrameworkInitializer { + method public static void registerServiceWrappers(); + } + } package android.app.prediction { @@ -1283,7 +1310,7 @@ package android.app.usage { method @RequiresPermission(allOf={android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void unregisterAppUsageLimitObserver(int); method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void unregisterAppUsageObserver(int); method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void unregisterUsageSessionObserver(int); - method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(String, long, android.os.UserHandle); + method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(String, long, android.os.UserHandle); field public static final String EXTRA_OBSERVER_ID = "android.app.usage.extra.OBSERVER_ID"; field public static final String EXTRA_TIME_LIMIT = "android.app.usage.extra.TIME_LIMIT"; field public static final String EXTRA_TIME_USED = "android.app.usage.extra.TIME_USED"; @@ -1453,6 +1480,7 @@ package android.content { method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle); method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle); + field public static final String APP_INTEGRITY_SERVICE = "app_integrity"; field public static final String APP_PREDICTION_SERVICE = "app_prediction"; field public static final String BACKUP_SERVICE = "backup"; field public static final String BATTERY_STATS_SERVICE = "batterystats"; @@ -1505,6 +1533,7 @@ package android.content { field public static final String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS"; field @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public static final String ACTION_MANAGE_SPECIAL_APP_ACCESSES = "android.intent.action.MANAGE_SPECIAL_APP_ACCESSES"; field public static final String ACTION_MASTER_CLEAR_NOTIFICATION = "android.intent.action.MASTER_CLEAR_NOTIFICATION"; + field public static final String ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION = "android.intent.action.PACKAGE_NEEDS_INTEGRITY_VERIFICATION"; field public static final String ACTION_PENDING_INCIDENT_REPORTS_CHANGED = "android.intent.action.PENDING_INCIDENT_REPORTS_CHANGED"; field public static final String ACTION_PRE_BOOT_COMPLETED = "android.intent.action.PRE_BOOT_COMPLETED"; field public static final String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART"; @@ -1552,6 +1581,150 @@ package android.content { } +package android.content.integrity { + + public final class AppInstallMetadata { + method @NonNull public String getAppCertificate(); + method @Nullable public String getInstallerCertificate(); + method @Nullable public String getInstallerName(); + method @NonNull public String getPackageName(); + method public int getVersionCode(); + method public boolean isPreInstalled(); + } + + public static final class AppInstallMetadata.Builder { + ctor public AppInstallMetadata.Builder(); + method @NonNull public android.content.integrity.AppInstallMetadata build(); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setAppCertificate(@NonNull String); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setInstallerCertificate(@NonNull String); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setInstallerName(@NonNull String); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setIsPreInstalled(boolean); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setPackageName(@NonNull String); + method @NonNull public android.content.integrity.AppInstallMetadata.Builder setVersionCode(int); + } + + public class AppIntegrityManager { + method @NonNull public String getCurrentRuleSetProvider(); + method @NonNull public String getCurrentRuleSetVersion(); + method public void updateRuleSet(@NonNull android.content.integrity.RuleSet, @NonNull android.content.IntentSender); + field public static final String EXTRA_STATUS = "android.content.integrity.extra.STATUS"; + field public static final int STATUS_FAILURE = 1; // 0x1 + field public static final int STATUS_SUCCESS = 0; // 0x0 + } + + public abstract class AtomicFormula implements android.content.integrity.Formula { + ctor public AtomicFormula(@android.content.integrity.AtomicFormula.Key int); + method public int getKey(); + field public static final int APP_CERTIFICATE = 1; // 0x1 + field public static final int EQ = 0; // 0x0 + field public static final int GE = 4; // 0x4 + field public static final int GT = 3; // 0x3 + field public static final int INSTALLER_CERTIFICATE = 3; // 0x3 + field public static final int INSTALLER_NAME = 2; // 0x2 + field public static final int LE = 2; // 0x2 + field public static final int LT = 1; // 0x1 + field public static final int PACKAGE_NAME = 0; // 0x0 + field public static final int PRE_INSTALLED = 5; // 0x5 + field public static final int VERSION_CODE = 4; // 0x4 + } + + public static final class AtomicFormula.BooleanAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable { + ctor public AtomicFormula.BooleanAtomicFormula(@android.content.integrity.AtomicFormula.Key int, boolean); + method public int describeContents(); + method public int getTag(); + method public boolean getValue(); + method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.AtomicFormula.BooleanAtomicFormula> CREATOR; + } + + public static final class AtomicFormula.IntAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable { + ctor public AtomicFormula.IntAtomicFormula(@android.content.integrity.AtomicFormula.Key int, @android.content.integrity.AtomicFormula.Operator int, int); + method public int describeContents(); + method public int getOperator(); + method public int getTag(); + method public int getValue(); + method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.AtomicFormula.IntAtomicFormula> CREATOR; + } + + @IntDef({android.content.integrity.AtomicFormula.PACKAGE_NAME, android.content.integrity.AtomicFormula.APP_CERTIFICATE, android.content.integrity.AtomicFormula.INSTALLER_NAME, android.content.integrity.AtomicFormula.INSTALLER_CERTIFICATE, android.content.integrity.AtomicFormula.VERSION_CODE, android.content.integrity.AtomicFormula.PRE_INSTALLED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface AtomicFormula.Key { + } + + @IntDef({android.content.integrity.AtomicFormula.EQ, android.content.integrity.AtomicFormula.LT, android.content.integrity.AtomicFormula.LE, android.content.integrity.AtomicFormula.GT, android.content.integrity.AtomicFormula.GE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface AtomicFormula.Operator { + } + + public static final class AtomicFormula.StringAtomicFormula extends android.content.integrity.AtomicFormula implements android.os.Parcelable { + ctor public AtomicFormula.StringAtomicFormula(@android.content.integrity.AtomicFormula.Key int, @NonNull String, boolean); + method public int describeContents(); + method public boolean getIsHashedValue(); + method public int getTag(); + method @NonNull public String getValue(); + method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.AtomicFormula.StringAtomicFormula> CREATOR; + } + + public final class CompoundFormula implements android.content.integrity.Formula android.os.Parcelable { + ctor public CompoundFormula(@android.content.integrity.CompoundFormula.Connector int, @NonNull java.util.List<android.content.integrity.Formula>); + method public int describeContents(); + method @android.content.integrity.CompoundFormula.Connector public int getConnector(); + method @NonNull public java.util.List<android.content.integrity.Formula> getFormulas(); + method public int getTag(); + method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field public static final int AND = 0; // 0x0 + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.CompoundFormula> CREATOR; + field public static final int NOT = 2; // 0x2 + field public static final int OR = 1; // 0x1 + } + + @IntDef({android.content.integrity.CompoundFormula.AND, android.content.integrity.CompoundFormula.OR, android.content.integrity.CompoundFormula.NOT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface CompoundFormula.Connector { + } + + public interface Formula { + method @android.content.integrity.Formula.Tag public int getTag(); + method public boolean isSatisfied(@NonNull android.content.integrity.AppInstallMetadata); + method @NonNull public static android.content.integrity.Formula readFromParcel(@NonNull android.os.Parcel); + method public static void writeToParcel(@NonNull android.content.integrity.Formula, @NonNull android.os.Parcel, int); + field public static final int BOOLEAN_ATOMIC_FORMULA_TAG = 3; // 0x3 + field public static final int COMPOUND_FORMULA_TAG = 0; // 0x0 + field public static final int INT_ATOMIC_FORMULA_TAG = 2; // 0x2 + field public static final int STRING_ATOMIC_FORMULA_TAG = 1; // 0x1 + } + + @IntDef({android.content.integrity.Formula.COMPOUND_FORMULA_TAG, android.content.integrity.Formula.STRING_ATOMIC_FORMULA_TAG, android.content.integrity.Formula.INT_ATOMIC_FORMULA_TAG, android.content.integrity.Formula.BOOLEAN_ATOMIC_FORMULA_TAG}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Formula.Tag { + } + + public final class Rule implements android.os.Parcelable { + ctor public Rule(@NonNull android.content.integrity.Formula, @android.content.integrity.Rule.Effect int); + method public int describeContents(); + method @android.content.integrity.Rule.Effect public int getEffect(); + method @NonNull public android.content.integrity.Formula getFormula(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.Rule> CREATOR; + field public static final int DENY = 0; // 0x0 + field public static final int FORCE_ALLOW = 1; // 0x1 + } + + @IntDef({android.content.integrity.Rule.DENY, android.content.integrity.Rule.FORCE_ALLOW}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface Rule.Effect { + } + + public class RuleSet { + method @NonNull public java.util.List<android.content.integrity.Rule> getRules(); + method @NonNull public String getVersion(); + } + + public static class RuleSet.Builder { + ctor public RuleSet.Builder(); + method @NonNull public android.content.integrity.RuleSet.Builder addRules(@NonNull java.util.List<android.content.integrity.Rule>); + method @NonNull public android.content.integrity.RuleSet build(); + method @NonNull public android.content.integrity.RuleSet.Builder setVersion(@NonNull String); + } + +} + package android.content.om { public final class OverlayInfo implements android.os.Parcelable { @@ -1843,7 +2016,6 @@ package android.content.pm { field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000 field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000 field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000 - field public static final int PROTECTION_FLAG_WIFI = 8388608; // 0x800000 field @Nullable public final String backgroundPermission; field @StringRes public int requestRes; } @@ -6111,6 +6283,11 @@ package android.os { } public class PowerWhitelistManager { + method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void whitelistAppTemporarily(@NonNull String, long); + method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public long whitelistAppTemporarilyForEvent(@NonNull String, int, @NonNull String); + field public static final int EVENT_MMS = 2; // 0x2 + field public static final int EVENT_SMS = 1; // 0x1 + field public static final int EVENT_UNSPECIFIED = 0; // 0x0 } public class RecoverySystem { @@ -6239,6 +6416,7 @@ package android.os { } public final class UserHandle implements android.os.Parcelable { + method @NonNull public static String formatUid(int); method public static int getAppId(int); method public int getIdentifier(); method @Deprecated public boolean isOwner(); @@ -9038,6 +9216,7 @@ package android.telephony { } public class SubscriptionManager { + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription(); method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int); method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int); diff --git a/api/test-current.txt b/api/test-current.txt index dacc5d67b730..94453228e5aa 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -812,7 +812,6 @@ package android.content.pm { field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000 field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000 field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000 - field public static final int PROTECTION_FLAG_WIFI = 8388608; // 0x800000 field @Nullable public final String backgroundPermission; } @@ -2044,6 +2043,11 @@ package android.os { } public class PowerWhitelistManager { + method @RequiresPermission("android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST") public void whitelistAppTemporarily(@NonNull String, long); + method @RequiresPermission("android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST") public long whitelistAppTemporarilyForEvent(@NonNull String, int, @NonNull String); + field public static final int EVENT_MMS = 2; // 0x2 + field public static final int EVENT_SMS = 1; // 0x1 + field public static final int EVENT_UNSPECIFIED = 0; // 0x0 } public class Process { diff --git a/cmds/dpm/src/com/android/commands/dpm/Dpm.java b/cmds/dpm/src/com/android/commands/dpm/Dpm.java index 6c6797a328c9..d0c2a24d5314 100644 --- a/cmds/dpm/src/com/android/commands/dpm/Dpm.java +++ b/cmds/dpm/src/com/android/commands/dpm/Dpm.java @@ -48,8 +48,8 @@ public final class Dpm extends BaseCommand { private static final String COMMAND_CLEAR_FREEZE_PERIOD_RECORD = "clear-freeze-period-record"; private static final String COMMAND_FORCE_NETWORK_LOGS = "force-network-logs"; private static final String COMMAND_FORCE_SECURITY_LOGS = "force-security-logs"; - private static final String COMMAND_GRANT_PO_DEVICE_ID_ACCESS = - "grant-profile-owner-device-ids-access"; + private static final String COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE = + "mark-profile-owner-on-organization-owned-device"; private IDevicePolicyManager mDevicePolicyManager; private int mUserId = UserHandle.USER_SYSTEM; @@ -93,7 +93,7 @@ public final class Dpm extends BaseCommand { "dpm " + COMMAND_FORCE_SECURITY_LOGS + ": makes all security logs available to " + "the DPC and triggers DeviceAdminReceiver.onSecurityLogsAvailable() if needed." + "\n" - + "usage: dpm " + COMMAND_GRANT_PO_DEVICE_ID_ACCESS + ": " + + "usage: dpm " + COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE + ": " + "[ --user <USER_ID> | current ] <COMPONENT>\n"); } @@ -129,8 +129,8 @@ public final class Dpm extends BaseCommand { case COMMAND_FORCE_SECURITY_LOGS: runForceSecurityLogs(); break; - case COMMAND_GRANT_PO_DEVICE_ID_ACCESS: - runGrantProfileOwnerDeviceIdsAccess(); + case COMMAND_MARK_PO_ON_ORG_OWNED_DEVICE: + runMarkProfileOwnerOnOrganizationOwnedDevice(); break; default: throw new IllegalArgumentException ("unknown command '" + command + "'"); @@ -251,9 +251,9 @@ public final class Dpm extends BaseCommand { } - private void runGrantProfileOwnerDeviceIdsAccess() throws RemoteException { + private void runMarkProfileOwnerOnOrganizationOwnedDevice() throws RemoteException { parseArgs(/*canHaveName=*/ false); - mDevicePolicyManager.grantDeviceIdsAccessToProfileOwner(mComponent, mUserId); + mDevicePolicyManager.markProfileOwnerOnOrganizationOwnedDevice(mComponent, mUserId); System.out.println("Success"); } diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 360ddd44955a..17427a20b90e 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -117,6 +117,10 @@ cc_defaults { "src/uid_data.proto", ], + cflags: [ + // "-DNEW_ENCODING_SCHEME", + ], + local_include_dirs: [ "src", ], @@ -282,7 +286,10 @@ cc_test { include_dirs: ["external/protobuf/src"], }, - shared_libs: ["libprotobuf-cpp-lite"], + shared_libs: [ + "libprotobuf-cpp-lite", + "libstatssocket" + ], } @@ -325,7 +332,7 @@ cc_benchmark { "-Wno-unused-function", // Bug: http://b/29823425 Disable -Wvarargs for Clang update to r271374 - "-Wno-varargs" + "-Wno-varargs", ], static_libs: [ @@ -334,8 +341,9 @@ cc_benchmark { shared_libs: [ "libgtest_prod", - "libstatslog", "libprotobuf-cpp-lite", + "libstatslog", + "libstatssocket", ], } diff --git a/cmds/statsd/benchmark/log_event_benchmark.cpp b/cmds/statsd/benchmark/log_event_benchmark.cpp index 26034695906b..bdfdb2e00ac0 100644 --- a/cmds/statsd/benchmark/log_event_benchmark.cpp +++ b/cmds/statsd/benchmark/log_event_benchmark.cpp @@ -16,55 +16,30 @@ #include <vector> #include "benchmark/benchmark.h" #include "logd/LogEvent.h" +#include "stats_event.h" namespace android { namespace os { namespace statsd { -using std::vector; - -/* Special markers for android_log_list_element type */ -static const char EVENT_TYPE_LIST_STOP = '\n'; /* declare end of list */ -static const char EVENT_TYPE_UNKNOWN = '?'; /* protocol error */ - -static const char EVENT_TYPE_INT = 0; -static const char EVENT_TYPE_LONG = 1; -static const char EVENT_TYPE_STRING = 2; -static const char EVENT_TYPE_LIST = 3; -static const char EVENT_TYPE_FLOAT = 4; - -static const int kLogMsgHeaderSize = 28; - -static void write4Bytes(int val, vector<char>* buffer) { - buffer->push_back(static_cast<char>(val)); - buffer->push_back(static_cast<char>((val >> 8) & 0xFF)); - buffer->push_back(static_cast<char>((val >> 16) & 0xFF)); - buffer->push_back(static_cast<char>((val >> 24) & 0xFF)); -} - -static void getSimpleLogMsgData(log_msg* msg) { - vector<char> buffer; - // stats_log tag id - write4Bytes(1937006964, &buffer); - buffer.push_back(EVENT_TYPE_LIST); - buffer.push_back(2); // field counts; - buffer.push_back(EVENT_TYPE_INT); - write4Bytes(10 /* atom id */, &buffer); - buffer.push_back(EVENT_TYPE_INT); - write4Bytes(99 /* a value to log*/, &buffer); - buffer.push_back(EVENT_TYPE_LIST_STOP); - - msg->entry.len = buffer.size(); - msg->entry.hdr_size = kLogMsgHeaderSize; - msg->entry.sec = time(nullptr); - std::copy(buffer.begin(), buffer.end(), msg->buf + kLogMsgHeaderSize); +static size_t createAndParseStatsEvent(uint8_t* msg) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + stats_event_write_int32(event, 2); + stats_event_write_float(event, 2.0); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + memcpy(msg, buf, size); + return size; } static void BM_LogEventCreation(benchmark::State& state) { - log_msg msg; - getSimpleLogMsgData(&msg); + uint8_t msg[LOGGER_ENTRY_MAX_PAYLOAD]; + size_t size = createAndParseStatsEvent(msg); while (state.KeepRunning()) { - benchmark::DoNotOptimize(LogEvent(msg)); + benchmark::DoNotOptimize(LogEvent(msg, size, /*uid=*/ 1000)); } } BENCHMARK(BM_LogEventCreation); diff --git a/cmds/statsd/src/logd/LogEvent.cpp b/cmds/statsd/src/logd/LogEvent.cpp index 262921e5163c..67022a078b01 100644 --- a/cmds/statsd/src/logd/LogEvent.cpp +++ b/cmds/statsd/src/logd/LogEvent.cpp @@ -35,16 +35,21 @@ using android::util::ProtoOutputStream; using std::string; using std::vector; -LogEvent::LogEvent(log_msg& msg) { - mContext = - create_android_log_parser(msg.msg() + sizeof(uint32_t), msg.len() - sizeof(uint32_t)); - mLogdTimestampNs = msg.entry.sec * NS_PER_SEC + msg.entry.nsec; - mLogUid = msg.entry.uid; +// Msg is expected to begin at the start of the serialized atom -- it should not +// include the android_log_header_t or the StatsEventTag. +LogEvent::LogEvent(uint8_t* msg, uint32_t len, uint32_t uid) + : mBuf(msg), + mRemainingLen(len), + mLogdTimestampNs(time(nullptr)), + mLogUid(uid) +{ +#ifdef NEW_ENCODING_SCHEME + initNew(); +# else + mContext = create_android_log_parser((char*)msg, len); init(mContext); - if (mContext) { - // android_log_destroy will set mContext to NULL - android_log_destroy(&mContext); - } + if (mContext) android_log_destroy(&mContext); // set mContext to NULL +#endif } LogEvent::LogEvent(const LogEvent& event) { @@ -438,6 +443,186 @@ bool LogEvent::write(const AttributionNodeInternal& node) { return false; } +void LogEvent::parseInt32(int32_t* pos, int32_t depth, bool* last) { + int32_t value = readNextValue<int32_t>(); + addToValues(pos, depth, value, last); +} + +void LogEvent::parseInt64(int32_t* pos, int32_t depth, bool* last) { + int64_t value = readNextValue<int64_t>(); + addToValues(pos, depth, value, last); +} + +void LogEvent::parseString(int32_t* pos, int32_t depth, bool* last) { + int32_t numBytes = readNextValue<int32_t>(); + if ((uint32_t)numBytes > mRemainingLen) { + mValid = false; + return; + } + + string value = string((char*)mBuf, numBytes); + mBuf += numBytes; + mRemainingLen -= numBytes; + addToValues(pos, depth, value, last); +} + +void LogEvent::parseFloat(int32_t* pos, int32_t depth, bool* last) { + float value = readNextValue<float>(); + addToValues(pos, depth, value, last); +} + +void LogEvent::parseBool(int32_t* pos, int32_t depth, bool* last) { + // cast to int32_t because FieldValue does not support bools + int32_t value = (int32_t)readNextValue<uint8_t>(); + addToValues(pos, depth, value, last); +} + +void LogEvent::parseByteArray(int32_t* pos, int32_t depth, bool* last) { + int32_t numBytes = readNextValue<int32_t>(); + if ((uint32_t)numBytes > mRemainingLen) { + mValid = false; + return; + } + + vector<uint8_t> value(mBuf, mBuf + numBytes); + mBuf += numBytes; + mRemainingLen -= numBytes; + addToValues(pos, depth, value, last); +} + +void LogEvent::parseKeyValuePairs(int32_t* pos, int32_t depth, bool* last) { + int32_t numPairs = readNextValue<uint8_t>(); + + for (pos[1] = 1; pos[1] <= numPairs; pos[1]++) { + last[1] = (pos[1] == numPairs); + + // parse key + pos[2] = 1; + parseInt32(pos, 2, last); + + // parse value + last[2] = true; + uint8_t typeId = getTypeId(readNextValue<uint8_t>()); + switch (typeId) { + case INT32_TYPE: + pos[2] = 2; // pos[2] determined by index of type in KeyValuePair in atoms.proto + parseInt32(pos, 2, last); + break; + case INT64_TYPE: + pos[2] = 3; + parseInt64(pos, 2, last); + break; + case STRING_TYPE: + pos[2] = 4; + parseString(pos, 2, last); + break; + case FLOAT_TYPE: + pos[2] = 5; + parseFloat(pos, 2, last); + break; + default: + mValid = false; + } + } + + pos[1] = pos[2] = 1; + last[1] = last[2] = false; +} + +void LogEvent::parseAttributionChain(int32_t* pos, int32_t depth, bool* last) { + int32_t numNodes = readNextValue<uint8_t>(); + for (pos[1] = 1; pos[1] <= numNodes; pos[1]++) { + last[1] = (pos[1] == numNodes); + + // parse uid + pos[2] = 1; + parseInt32(pos, 2, last); + + // parse tag + pos[2] = 2; + last[2] = true; + parseString(pos, 2, last); + } + + pos[1] = pos[2] = 1; + last[1] = last[2] = false; +} + + +// This parsing logic is tied to the encoding scheme used in StatsEvent.java and +// stats_event.c +void LogEvent::initNew() { + int32_t pos[] = {1, 1, 1}; + bool last[] = {false, false, false}; + + // Beginning of buffer is OBJECT_TYPE | NUM_FIELDS | TIMESTAMP | ATOM_ID + uint8_t typeInfo = readNextValue<uint8_t>(); + if (getTypeId(typeInfo) != OBJECT_TYPE) mValid = false; + + uint8_t numElements = readNextValue<uint8_t>(); + if (numElements < 2 || numElements > 127) mValid = false; + + typeInfo = readNextValue<uint8_t>(); + if (getTypeId(typeInfo) != INT64_TYPE) mValid = false; + mElapsedTimestampNs = readNextValue<int64_t>(); + numElements--; + + typeInfo = readNextValue<uint8_t>(); + if (getTypeId(typeInfo) != INT32_TYPE) mValid = false; + mTagId = readNextValue<int32_t>(); + numElements--; + + + for (pos[0] = 1; pos[0] <= numElements && mValid; pos[0]++) { + typeInfo = readNextValue<uint8_t>(); + uint8_t typeId = getTypeId(typeInfo); + + last[0] = (pos[0] == numElements); + + // TODO(b/144373276): handle errors passed to the socket + // TODO(b/144373257): parse annotations + switch(typeId) { + case BOOL_TYPE: + parseBool(pos, 0, last); + break; + case INT32_TYPE: + parseInt32(pos, 0, last); + break; + case INT64_TYPE: + parseInt64(pos, 0, last); + break; + case FLOAT_TYPE: + parseFloat(pos, 0, last); + break; + case BYTE_ARRAY_TYPE: + parseByteArray(pos, 0, last); + break; + case STRING_TYPE: + parseString(pos, 0, last); + break; + case KEY_VALUE_PAIRS_TYPE: + parseKeyValuePairs(pos, 0, last); + break; + case ATTRIBUTION_CHAIN_TYPE: + parseAttributionChain(pos, 0, last); + break; + default: + mValid = false; + } + } + + if (mRemainingLen != 0) mValid = false; + mBuf = nullptr; +} + +uint8_t LogEvent::getTypeId(uint8_t typeInfo) { + return typeInfo & 0x0F; // type id in lower 4 bytes +} + +uint8_t LogEvent::getNumAnnotations(uint8_t typeInfo) { + return (typeInfo >> 4) & 0x0F; +} + /** * The elements of each log event are stored as a vector of android_log_list_elements. * The goal is to do as little preprocessing as possible, because we read a tiny fraction diff --git a/cmds/statsd/src/logd/LogEvent.h b/cmds/statsd/src/logd/LogEvent.h index f1f45a2d3bc7..1ff95f7240ac 100644 --- a/cmds/statsd/src/logd/LogEvent.h +++ b/cmds/statsd/src/logd/LogEvent.h @@ -24,6 +24,7 @@ #include <log/log_read.h> #include <private/android_logger.h> #include <stats_event_list.h> +#include <stats_event.h> #include <utils/Errors.h> #include <string> @@ -69,9 +70,9 @@ struct InstallTrainInfo { class LogEvent { public: /** - * Read a LogEvent from a log_msg. + * Read a LogEvent from the socket */ - explicit LogEvent(log_msg& msg); + explicit LogEvent(uint8_t* msg, uint32_t len, uint32_t uid); /** * Creates LogEvent from StatsLogEventWrapper. @@ -206,6 +207,10 @@ public: return &mValues; } + bool isValid() { + return mValid; + } + inline LogEvent makeCopy() { return LogEvent(*this); } @@ -216,6 +221,69 @@ private: */ LogEvent(const LogEvent&); + + /** + * Parsing function for new encoding scheme. + */ + void initNew(); + + void parseInt32(int32_t* pos, int32_t depth, bool* last); + void parseInt64(int32_t* pos, int32_t depth, bool* last); + void parseString(int32_t* pos, int32_t depth, bool* last); + void parseFloat(int32_t* pos, int32_t depth, bool* last); + void parseBool(int32_t* pos, int32_t depth, bool* last); + void parseByteArray(int32_t* pos, int32_t depth, bool* last); + void parseKeyValuePairs(int32_t* pos, int32_t depth, bool* last); + void parseAttributionChain(int32_t* pos, int32_t depth, bool* last); + + /** + * mBuf is a pointer to the current location in the buffer being parsed. + * Because the buffer lives on the StatsSocketListener stack, this pointer + * is only valid during the LogEvent constructor. It will be set to null at + * the end of initNew. + */ + uint8_t* mBuf; + + uint32_t mRemainingLen; // number of valid bytes left in the buffer being parsed + bool mValid = true; // stores whether the event we received from the socket is valid + + /** + * Side-effects: + * If there is enough space in buffer to read value of type T + * - move mBuf past the value that was just read + * - decrement mRemainingLen by size of T + * Else + * - set mValid to false + */ + template <class T> + T readNextValue() { + T value; + if (mRemainingLen < sizeof(T)) { + mValid = false; + value = 0; // all primitive types can successfully cast 0 + } else { + value = *((T*)mBuf); + mBuf += sizeof(T); + mRemainingLen -= sizeof(T); + } + return value; + } + + template <class T> + void addToValues(int32_t* pos, int32_t depth, T& value, bool* last) { + Field f = Field(mTagId, pos, depth); + // do not decorate last position at depth 0 + for (int i = 1; i < depth; i++) { + if (last[i]) f.decorateLastPos(i); + } + + Value v = Value(value); + mValues.push_back(FieldValue(f, v)); + } + + uint8_t getTypeId(uint8_t typeInfo); + uint8_t getNumAnnotations(uint8_t typeInfo); + /** * Parses a log_msg into a LogEvent object. */ diff --git a/cmds/statsd/src/socket/StatsSocketListener.cpp b/cmds/statsd/src/socket/StatsSocketListener.cpp index b59d88dc1cea..4308a1107039 100755 --- a/cmds/statsd/src/socket/StatsSocketListener.cpp +++ b/cmds/statsd/src/socket/StatsSocketListener.cpp @@ -39,8 +39,6 @@ namespace android { namespace os { namespace statsd { -static const int kLogMsgHeaderSize = 28; - StatsSocketListener::StatsSocketListener(std::shared_ptr<LogEventQueue> queue) : SocketListener(getLogSocket(), false /*start listen*/), mQueue(queue) { } @@ -95,7 +93,7 @@ bool StatsSocketListener::onDataAvailable(SocketClient* cli) { cred->uid = DEFAULT_OVERFLOWUID; } - char* ptr = ((char*)buffer) + sizeof(android_log_header_t); + uint8_t* ptr = ((uint8_t*)buffer) + sizeof(android_log_header_t); n -= sizeof(android_log_header_t); // When a log failed to write to statsd socket (e.g., due ot EBUSY), a special message would @@ -124,18 +122,13 @@ bool StatsSocketListener::onDataAvailable(SocketClient* cli) { } } - log_msg msg; - - msg.entry.len = n; - msg.entry.hdr_size = kLogMsgHeaderSize; - msg.entry.sec = time(nullptr); - msg.entry.pid = cred->pid; - msg.entry.uid = cred->uid; - - memcpy(msg.buf + kLogMsgHeaderSize, ptr, n + 1); + // move past the 4-byte StatsEventTag + uint8_t* msg = ptr + sizeof(uint32_t); + uint32_t len = n - sizeof(uint32_t); + uint32_t uid = cred->uid; int64_t oldestTimestamp; - if (!mQueue->push(std::make_unique<LogEvent>(msg), &oldestTimestamp)) { + if (!mQueue->push(std::make_unique<LogEvent>(msg, len, uid), &oldestTimestamp)) { StatsdStats::getInstance().noteEventQueueOverflow(oldestTimestamp); } diff --git a/cmds/statsd/tests/LogEvent_test.cpp b/cmds/statsd/tests/LogEvent_test.cpp index 0743480bf4ee..9f50701d5e9e 100644 --- a/cmds/statsd/tests/LogEvent_test.cpp +++ b/cmds/statsd/tests/LogEvent_test.cpp @@ -17,6 +17,8 @@ #include <log/log_event_list.h> #include "frameworks/base/cmds/statsd/src/atoms.pb.h" #include "frameworks/base/core/proto/android/stats/launcher/launcher.pb.h" +#include <stats_event.h> + #ifdef __ANDROID__ @@ -25,9 +27,277 @@ namespace os { namespace statsd { using std::string; +using std::vector; using util::ProtoOutputStream; using util::ProtoReader; + +#ifdef NEW_ENCODING_SCHEME + +Field getField(int32_t tag, const vector<int32_t>& pos, int32_t depth, const vector<bool>& last) { + Field f(tag, (int32_t*)pos.data(), depth); + + // For loop starts at 1 because the last field at depth 0 is not decorated. + for (int i = 1; i < depth; i++) { + if (last[i]) f.decorateLastPos(i); + } + + return f; +} + +TEST(LogEventTest, TestPrimitiveParsing) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + stats_event_write_int32(event, 10); + stats_event_write_int64(event, 0x123456789); + stats_event_write_float(event, 2.0); + stats_event_write_bool(event, true); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(4, values.size()); + + const FieldValue& int32Item = values[0]; + Field expectedField = getField(100, {1, 1, 1}, 0, {false, false, false}); + EXPECT_EQ(expectedField, int32Item.mField); + EXPECT_EQ(Type::INT, int32Item.mValue.getType()); + EXPECT_EQ(10, int32Item.mValue.int_value); + + const FieldValue& int64Item = values[1]; + expectedField = getField(100, {2, 1, 1}, 0, {false, false, false}); + EXPECT_EQ(expectedField, int64Item.mField); + EXPECT_EQ(Type::LONG, int64Item.mValue.getType()); + EXPECT_EQ(0x123456789, int64Item.mValue.long_value); + + const FieldValue& floatItem = values[2]; + expectedField = getField(100, {3, 1, 1}, 0, {false, false, false}); + EXPECT_EQ(expectedField, floatItem.mField); + EXPECT_EQ(Type::FLOAT, floatItem.mValue.getType()); + EXPECT_EQ(2.0, floatItem.mValue.float_value); + + const FieldValue& boolItem = values[3]; + expectedField = getField(100, {4, 1, 1}, 0, {true, false, false}); + EXPECT_EQ(expectedField, boolItem.mField); + EXPECT_EQ(Type::INT, boolItem.mValue.getType()); // FieldValue does not support boolean type + EXPECT_EQ(1, boolItem.mValue.int_value); + + stats_event_release(event); +} + + +TEST(LogEventTest, TestStringAndByteArrayParsing) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + string str = "test"; + stats_event_write_string8(event, str.c_str()); + stats_event_write_byte_array(event, (uint8_t*)str.c_str(), str.length()); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(2, values.size()); + + const FieldValue& stringItem = values[0]; + Field expectedField = getField(100, {1, 1, 1}, 0, {false, false, false}); + EXPECT_EQ(expectedField, stringItem.mField); + EXPECT_EQ(Type::STRING, stringItem.mValue.getType()); + EXPECT_EQ(str, stringItem.mValue.str_value); + + const FieldValue& storageItem = values[1]; + expectedField = getField(100, {2, 1, 1}, 0, {true, false, false}); + EXPECT_EQ(expectedField, storageItem.mField); + EXPECT_EQ(Type::STORAGE, storageItem.mValue.getType()); + vector<uint8_t> expectedValue = {'t', 'e', 's', 't'}; + EXPECT_EQ(expectedValue, storageItem.mValue.storage_value); + + stats_event_release(event); +} + +TEST(LogEventTest, TestEmptyString) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + string empty = ""; + stats_event_write_string8(event, empty.c_str()); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(1, values.size()); + + const FieldValue& item = values[0]; + Field expectedField = getField(100, {1, 1, 1}, 0, {true, false, false}); + EXPECT_EQ(expectedField, item.mField); + EXPECT_EQ(Type::STRING, item.mValue.getType()); + EXPECT_EQ(empty, item.mValue.str_value); + + stats_event_release(event); +} + +TEST(LogEventTest, TestByteArrayWithNullCharacter) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + uint8_t message[] = {'\t', 'e', '\0', 's', 't'}; + stats_event_write_byte_array(event, message, 5); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(1, values.size()); + + const FieldValue& item = values[0]; + Field expectedField = getField(100, {1, 1, 1}, 0, {true, false, false}); + EXPECT_EQ(expectedField, item.mField); + EXPECT_EQ(Type::STORAGE, item.mValue.getType()); + vector<uint8_t> expectedValue(message, message + 5); + EXPECT_EQ(expectedValue, item.mValue.storage_value); + + stats_event_release(event); +} + +TEST(LogEventTest, TestKeyValuePairs) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + + struct key_value_pair pairs[4]; + pairs[0] = {.key = 0, .valueType = INT32_TYPE, .int32Value = 1}; + pairs[1] = {.key = 1, .valueType = INT64_TYPE, .int64Value = 0x123456789}; + pairs[2] = {.key = 2, .valueType = FLOAT_TYPE, .floatValue = 2.0}; + string str = "test"; + pairs[3] = {.key = 3, .valueType = STRING_TYPE, .stringValue = str.c_str()}; + + stats_event_write_key_value_pairs(event, pairs, 4); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(8, values.size()); // 2 FieldValues per key-value pair + + // Check the keys first + for (int i = 0; i < values.size() / 2; i++) { + const FieldValue& item = values[2 * i]; + int32_t depth1Pos = i + 1; + bool depth1Last = i == (values.size() / 2 - 1); + Field expectedField = getField(100, {1, depth1Pos, 1}, 2, {true, depth1Last, false}); + + EXPECT_EQ(expectedField, item.mField); + EXPECT_EQ(Type::INT, item.mValue.getType()); + EXPECT_EQ(i, item.mValue.int_value); + } + + // Check the values now + // Note: pos[2] = index of type in KeyValuePair in atoms.proto + const FieldValue& int32Item = values[1]; + Field expectedField = getField(100, {1, 1, 2}, 2, {true, false, true}); + EXPECT_EQ(expectedField, int32Item.mField); + EXPECT_EQ(Type::INT, int32Item.mValue.getType()); + EXPECT_EQ(1, int32Item.mValue.int_value); + + const FieldValue& int64Item = values[3]; + expectedField = getField(100, {1, 2, 3}, 2, {true, false, true}); + EXPECT_EQ(expectedField, int64Item.mField); + EXPECT_EQ(Type::LONG, int64Item.mValue.getType()); + EXPECT_EQ(0x123456789, int64Item.mValue.long_value); + + const FieldValue& floatItem = values[5]; + expectedField = getField(100, {1, 3, 5}, 2, {true, false, true}); + EXPECT_EQ(expectedField, floatItem.mField); + EXPECT_EQ(Type::FLOAT, floatItem.mValue.getType()); + EXPECT_EQ(2.0, floatItem.mValue.float_value); + + const FieldValue& stringItem = values[7]; + expectedField = getField(100, {1, 4, 4}, 2, {true, true, true}); + EXPECT_EQ(expectedField, stringItem.mField); + EXPECT_EQ(Type::STRING, stringItem.mValue.getType()); + EXPECT_EQ(str, stringItem.mValue.str_value); + + stats_event_release(event); +} + +TEST(LogEventTest, TestAttributionChain) { + struct stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, 100); + + string tag1 = "tag1"; + string tag2 = "tag2"; + + uint32_t uids[] = {1001, 1002}; + const char* tags[] = {tag1.c_str(), tag2.c_str()}; + + stats_event_write_attribution_chain(event, uids, tags, 2); + stats_event_build(event); + + size_t size; + uint8_t* buf = stats_event_get_buffer(event, &size); + + LogEvent logEvent(buf, size, /*uid=*/ 1000); + EXPECT_TRUE(logEvent.isValid()); + EXPECT_EQ(100, logEvent.GetTagId()); + + const vector<FieldValue>& values = logEvent.getValues(); + EXPECT_EQ(4, values.size()); // 2 per attribution node + + // Check first attribution node + const FieldValue& uid1Item = values[0]; + Field expectedField = getField(100, {1, 1, 1}, 2, {true, false, false}); + EXPECT_EQ(expectedField, uid1Item.mField); + EXPECT_EQ(Type::INT, uid1Item.mValue.getType()); + EXPECT_EQ(1001, uid1Item.mValue.int_value); + + const FieldValue& tag1Item = values[1]; + expectedField = getField(100, {1, 1, 2}, 2, {true, false, true}); + EXPECT_EQ(expectedField, tag1Item.mField); + EXPECT_EQ(Type::STRING, tag1Item.mValue.getType()); + EXPECT_EQ(tag1, tag1Item.mValue.str_value); + + // Check second attribution nodes + const FieldValue& uid2Item = values[2]; + expectedField = getField(100, {1, 2, 1}, 2, {true, true, false}); + EXPECT_EQ(expectedField, uid2Item.mField); + EXPECT_EQ(Type::INT, uid2Item.mValue.getType()); + EXPECT_EQ(1002, uid2Item.mValue.int_value); + + const FieldValue& tag2Item = values[3]; + expectedField = getField(100, {1, 2, 2}, 2, {true, true, true}); + EXPECT_EQ(expectedField, tag2Item.mField); + EXPECT_EQ(Type::STRING, tag2Item.mValue.getType()); + EXPECT_EQ(tag2, tag2Item.mValue.str_value); + + stats_event_release(event); +} + +#else // NEW_ENCODING_SCHEME + TEST(LogEventTest, TestLogParsing) { LogEvent event1(1, 2000); @@ -659,6 +929,7 @@ TEST(LogEventTest, TestWriteExperimentIdsToProto) { EXPECT_EQ(proto[1], 0xae); EXPECT_EQ(proto[2], 0x27); } +#endif // NEW_ENCODING_SCHEME } // namespace statsd diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f54e841fd2a0..6bea68b446a4 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -769,17 +769,6 @@ public class Activity extends ContextThemeWrapper private static final String KEYBOARD_SHORTCUTS_RECEIVER_PKG_NAME = "com.android.systemui"; - private static final int LOG_AM_ON_CREATE_CALLED = 30057; - private static final int LOG_AM_ON_START_CALLED = 30059; - private static final int LOG_AM_ON_RESUME_CALLED = 30022; - private static final int LOG_AM_ON_PAUSE_CALLED = 30021; - private static final int LOG_AM_ON_STOP_CALLED = 30049; - private static final int LOG_AM_ON_RESTART_CALLED = 30058; - private static final int LOG_AM_ON_DESTROY_CALLED = 30060; - private static final int LOG_AM_ON_ACTIVITY_RESULT_CALLED = 30062; - private static final int LOG_AM_ON_TOP_RESUMED_GAINED_CALLED = 30064; - private static final int LOG_AM_ON_TOP_RESUMED_LOST_CALLED = 30065; - private static class ManagedDialog { Dialog mDialog; Bundle mArgs; @@ -1863,8 +1852,13 @@ public class Activity extends ContextThemeWrapper final void performTopResumedActivityChanged(boolean isTopResumedActivity, String reason) { onTopResumedActivityChanged(isTopResumedActivity); - writeEventLog(isTopResumedActivity - ? LOG_AM_ON_TOP_RESUMED_GAINED_CALLED : LOG_AM_ON_TOP_RESUMED_LOST_CALLED, reason); + if (isTopResumedActivity) { + EventLogTags.writeWmOnTopResumedGainedCalled(mIdent, getComponentName().getClassName(), + reason); + } else { + EventLogTags.writeWmOnTopResumedLostCalled(mIdent, getComponentName().getClassName(), + reason); + } } void setVoiceInteractor(IVoiceInteractor voiceInteractor) { @@ -7898,7 +7892,8 @@ public class Activity extends ContextThemeWrapper } else { onCreate(icicle); } - writeEventLog(LOG_AM_ON_CREATE_CALLED, "performCreate"); + EventLogTags.writeWmOnCreateCalled(mIdent, getComponentName().getClassName(), + "performCreate"); mActivityTransitionState.readState(icicle); mVisibleFromClient = !mWindow.getWindowStyle().getBoolean( @@ -7920,7 +7915,7 @@ public class Activity extends ContextThemeWrapper mCalled = false; mFragments.execPendingActions(); mInstrumentation.callActivityOnStart(this); - writeEventLog(LOG_AM_ON_START_CALLED, reason); + EventLogTags.writeWmOnStartCalled(mIdent, getComponentName().getClassName(), reason); if (!mCalled) { throw new SuperNotCalledException( @@ -7998,7 +7993,7 @@ public class Activity extends ContextThemeWrapper mCalled = false; mInstrumentation.callActivityOnRestart(this); - writeEventLog(LOG_AM_ON_RESTART_CALLED, reason); + EventLogTags.writeWmOnRestartCalled(mIdent, getComponentName().getClassName(), reason); if (!mCalled) { throw new SuperNotCalledException( "Activity " + mComponent.toShortString() + @@ -8031,7 +8026,7 @@ public class Activity extends ContextThemeWrapper mCalled = false; // mResumed is set by the instrumentation mInstrumentation.callActivityOnResume(this); - writeEventLog(LOG_AM_ON_RESUME_CALLED, reason); + EventLogTags.writeWmOnResumeCalled(mIdent, getComponentName().getClassName(), reason); if (!mCalled) { throw new SuperNotCalledException( "Activity " + mComponent.toShortString() + @@ -8070,7 +8065,8 @@ public class Activity extends ContextThemeWrapper mFragments.dispatchPause(); mCalled = false; onPause(); - writeEventLog(LOG_AM_ON_PAUSE_CALLED, "performPause"); + EventLogTags.writeWmOnPausedCalled(mIdent, getComponentName().getClassName(), + "performPause"); mResumed = false; if (!mCalled && getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.GINGERBREAD) { @@ -8110,7 +8106,7 @@ public class Activity extends ContextThemeWrapper mCalled = false; mInstrumentation.callActivityOnStop(this); - writeEventLog(LOG_AM_ON_STOP_CALLED, reason); + EventLogTags.writeWmOnStopCalled(mIdent, getComponentName().getClassName(), reason); if (!mCalled) { throw new SuperNotCalledException( "Activity " + mComponent.toShortString() + @@ -8140,7 +8136,8 @@ public class Activity extends ContextThemeWrapper mWindow.destroy(); mFragments.dispatchDestroy(); onDestroy(); - writeEventLog(LOG_AM_ON_DESTROY_CALLED, "performDestroy"); + EventLogTags.writeWmOnDestroyCalled(mIdent, getComponentName().getClassName(), + "performDestroy"); mFragments.doLoaderDestroy(); if (mVoiceInteractor != null) { mVoiceInteractor.detachActivity(); @@ -8233,7 +8230,9 @@ public class Activity extends ContextThemeWrapper frag.onActivityResult(requestCode, resultCode, data); } } - writeEventLog(LOG_AM_ON_ACTIVITY_RESULT_CALLED, reason); + + EventLogTags.writeWmOnActivityResultCalled(mIdent, getComponentName().getClassName(), + reason); } /** @@ -8660,11 +8659,6 @@ public class Activity extends ContextThemeWrapper } } - /** Log a lifecycle event for current user id and component class. */ - private void writeEventLog(int event, String reason) { - EventLog.writeEvent(event, mIdent, getComponentName().getClassName(), reason); - } - class HostCallbacks extends FragmentHostCallback<Activity> { public HostCallbacks() { super(Activity.this /*activity*/); diff --git a/core/java/android/app/EventLogTags.logtags b/core/java/android/app/EventLogTags.logtags new file mode 100644 index 000000000000..6296a689b6dd --- /dev/null +++ b/core/java/android/app/EventLogTags.logtags @@ -0,0 +1,36 @@ +# See system/core/logcat/event.logtags for a description of the format of this file. + +option java_package android.app + +# Do not change these names without updating the checkin_events setting in +# google3/googledata/wireless/android/provisioning/gservices.config !! +# +# The activity's onPause has been called. +30021 wm_on_paused_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onResume has been called. +30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3) + +# Attempting to stop an activity +30048 wm_stop_activity (User|1|5),(Token|1|5),(Component Name|3) +# The activity's onStop has been called. +30049 wm_on_stop_called (Token|1|5),(Component Name|3),(Reason|3) + +# The activity's onCreate has been called. +30057 wm_on_create_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onRestart has been called. +30058 wm_on_restart_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onStart has been called. +30059 wm_on_start_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onDestroy has been called. +30060 wm_on_destroy_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onActivityResult has been called. +30062 wm_on_activity_result_called (Token|1|5),(Component Name|3),(Reason|3) + +# The activity's onTopResumedActivityChanged(true) has been called. +30064 wm_on_top_resumed_gained_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onTopResumedActivityChanged(false) has been called. +30065 wm_on_top_resumed_lost_called (Token|1|5),(Component Name|3),(Reason|3) + +# An activity been add into stopping list +30066 wm_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3) + diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 9aca22360fd8..0957dba4eac1 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -21,6 +21,7 @@ import android.app.ITransientNotification; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; +import android.app.NotificationHistory; import android.app.NotificationManager; import android.content.ComponentName; import android.content.Intent; @@ -119,6 +120,8 @@ interface INotificationManager @UnsupportedAppUsage StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count); + NotificationHistory getNotificationHistory(String callingPkg); + void registerListener(in INotificationListener listener, in ComponentName component, int userid); void unregisterListener(in INotificationListener listener, int userid); diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 0bfd2c6f5f70..d9b3d3bf57e8 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -19,6 +19,7 @@ package android.app; import android.accounts.AccountManager; import android.accounts.IAccountManager; import android.annotation.NonNull; +import android.annotation.SystemApi; import android.app.ContextImpl.ServiceInitializationState; import android.app.admin.DevicePolicyManager; import android.app.admin.IDevicePolicyManager; @@ -193,6 +194,7 @@ import java.util.Map; * * @hide */ +@SystemApi public final class SystemServiceRegistry { private static final String TAG = "SystemServiceRegistry"; @@ -1191,7 +1193,6 @@ public final class SystemServiceRegistry { try { // Note: the following functions need to be @SystemApis, once they become mainline // modules. - JobSchedulerFrameworkInitializer.registerServiceWrappers(); BlobStoreManagerFrameworkInitializer.initialize(); TelephonyFrameworkInitializer.registerServiceWrappers(); @@ -1246,18 +1247,20 @@ public final class SystemServiceRegistry { /** * Callback interface used as a parameter to {@link #registerStaticService( - * String, Class, StaticServiceProducerNoBinder)}, which generates a service wrapper instance - * that's not tied to any context and does not take a service binder object in the constructor. + * String, Class, StaticServiceProducerWithoutBinder)}, which generates a service wrapper + * instance that's not tied to any context and does not take a service binder object in the + * constructor. * * @param <TServiceClass> type of the service wrapper class. * * @hide */ - //@SystemApi TODO Make it a system API. - public interface StaticServiceProducerNoBinder<TServiceClass> { + @SystemApi + public interface StaticServiceProducerWithoutBinder<TServiceClass> { /** * Return a new service wrapper of type {@code TServiceClass}. */ + @NonNull TServiceClass createService(); } @@ -1270,18 +1273,19 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public interface StaticServiceProducerWithBinder<TServiceClass> { /** * Return a new service wrapper of type {@code TServiceClass} backed by a given * service binder object. */ - TServiceClass createService(IBinder serviceBinder); + @NonNull + TServiceClass createService(@NonNull IBinder serviceBinder); } /** * Callback interface used as a parameter to {@link #registerContextAwareService( - * String, Class, ContextAwareServiceProducerNoBinder)}, + * String, Class, ContextAwareServiceProducerWithoutBinder)}, * which generates a service wrapper instance * that's tied to a specific context and does not take a service binder object in the * constructor. @@ -1290,15 +1294,15 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. - public interface ContextAwareServiceProducerNoBinder<TServiceClass> { + @SystemApi + public interface ContextAwareServiceProducerWithoutBinder<TServiceClass> { /** * Return a new service wrapper of type {@code TServiceClass} tied to a given * {@code context}. - * - * TODO Do we need to pass the "base context" too? */ - TServiceClass createService(Context context); + @NonNull + //TODO Do we need to pass the "base context" too? + TServiceClass createService(@NonNull Context context); } /** @@ -1311,15 +1315,15 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public interface ContextAwareServiceProducerWithBinder<TServiceClass> { /** * Return a new service wrapper of type {@code TServiceClass} backed by a given * service binder object that's tied to a given {@code context}. - * - * TODO Do we need to pass the "base context" too? */ - TServiceClass createService(Context context, IBinder serviceBinder); + @NonNull + //TODO Do we need to pass the "base context" too? + TServiceClass createService(@NonNull Context context, @NonNull IBinder serviceBinder); } /** @@ -1337,7 +1341,7 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public static <TServiceClass> void registerStaticService( @NonNull String serviceName, @NonNull Class<TServiceClass> serviceWrapperClass, @NonNull StaticServiceProducerWithBinder<TServiceClass> serviceProducer) { @@ -1361,10 +1365,10 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public static <TServiceClass> void registerStaticService( @NonNull String serviceName, @NonNull Class<TServiceClass> serviceWrapperClass, - @NonNull StaticServiceProducerNoBinder<TServiceClass> serviceProducer) { + @NonNull StaticServiceProducerWithoutBinder<TServiceClass> serviceProducer) { ensureInitializing("registerStaticService"); Preconditions.checkStringNotEmpty(serviceName); Preconditions.checkNotNull(serviceWrapperClass); @@ -1394,7 +1398,7 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public static <TServiceClass> void registerContextAwareService( @NonNull String serviceName, @NonNull Class<TServiceClass> serviceWrapperClass, @NonNull ContextAwareServiceProducerWithBinder<TServiceClass> serviceProducer) { @@ -1422,10 +1426,10 @@ public final class SystemServiceRegistry { * * @hide */ - //@SystemApi TODO Make it a system API. + @SystemApi public static <TServiceClass> void registerContextAwareService( @NonNull String serviceName, @NonNull Class<TServiceClass> serviceWrapperClass, - @NonNull ContextAwareServiceProducerNoBinder<TServiceClass> serviceProducer) { + @NonNull ContextAwareServiceProducerWithoutBinder<TServiceClass> serviceProducer) { ensureInitializing("registerContextAwareService"); Preconditions.checkStringNotEmpty(serviceName); Preconditions.checkNotNull(serviceWrapperClass); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9a5444cfcd57..73980a50e567 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -10832,28 +10832,38 @@ public class DevicePolicyManager { } /** - * Grants the profile owner of the given user access to device identifiers (such as - * serial number, IMEI and MEID). + * Deprecated. Use {@code markProfileOwnerOnOrganizationOwnedDevice} instead. + * Throws UnsupportedOperationException when called. * - * <p>This lets the profile owner request inclusion of device identifiers when calling - * {@link generateKeyPair}. - * - * <p>This grant is necessary to guarantee that profile owners can access device identifiers. - * - * <p>Privileged system API - meant to be called by the system, particularly the managed - * provisioning app, when a work profile is set up. + * @deprecated Use {@link #markProfileOwnerOnOrganizationOwnedDevice} instead. * * @hide */ + @Deprecated @SystemApi @RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional = true) public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) { + throw new UnsupportedOperationException( + "This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice instead" + + "."); + } + + /** + * Marks the profile owner of the given user as managing an organization-owned device. + * That will give it access to device identifiers (such as serial number, IMEI and MEID) + * as well as other privileges. + * + * @hide + */ + @RequiresPermission(value = android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED, + conditional = true) + public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull ComponentName who) { if (mService == null) { return; } try { - mService.grantDeviceIdsAccessToProfileOwner(who, myUserId()); + mService.markProfileOwnerOnOrganizationOwnedDevice(who, myUserId()); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 591d1510e6f4..df4b55483be5 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -426,7 +426,7 @@ interface IDevicePolicyManager { int getGlobalPrivateDnsMode(in ComponentName admin); String getGlobalPrivateDnsHost(in ComponentName admin); - void grantDeviceIdsAccessToProfileOwner(in ComponentName who, int userId); + void markProfileOwnerOnOrganizationOwnedDevice(in ComponentName who, int userId); void installUpdateFromFile(in ComponentName admin, in ParcelFileDescriptor updateFileDescriptor, in StartInstallingUpdateCallback listener); diff --git a/core/java/android/app/timedetector/ITimeDetectorService.aidl b/core/java/android/app/timedetector/ITimeDetectorService.aidl index ddc4932d6fec..9877fc741b7b 100644 --- a/core/java/android/app/timedetector/ITimeDetectorService.aidl +++ b/core/java/android/app/timedetector/ITimeDetectorService.aidl @@ -16,6 +16,7 @@ package android.app.timedetector; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; /** @@ -33,4 +34,5 @@ import android.app.timedetector.PhoneTimeSuggestion; */ interface ITimeDetectorService { void suggestPhoneTime(in PhoneTimeSuggestion timeSuggestion); + void suggestManualTime(in ManualTimeSuggestion timeSuggestion); } diff --git a/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl b/core/java/android/app/timedetector/ManualTimeSuggestion.aidl index 3af4666b8d9c..213940493114 100644 --- a/services/wifi/java/android/net/wifi/IWifiStackConnector.aidl +++ b/core/java/android/app/timedetector/ManualTimeSuggestion.aidl @@ -1,23 +1,19 @@ -/** - * Copyright (c) 2019, The Android Open Source Project +/* + * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing perNmissions and + * See the License for the specific language governing permissions and * limitations under the License. */ -package android.net.wifi; -import android.net.wifi.WifiApiServiceInfo; +package android.app.timedetector; -/** @hide */ -interface IWifiStackConnector { - List<WifiApiServiceInfo> getWifiApiServiceInfos(); -} +parcelable ManualTimeSuggestion; diff --git a/core/java/android/app/timedetector/ManualTimeSuggestion.java b/core/java/android/app/timedetector/ManualTimeSuggestion.java new file mode 100644 index 000000000000..e7d619a27607 --- /dev/null +++ b/core/java/android/app/timedetector/ManualTimeSuggestion.java @@ -0,0 +1,127 @@ +/* + * 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.app.timedetector; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.TimestampedValue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +/** + * A time signal from a manual (user provided) source. The value consists of the number of + * milliseconds elapsed since 1/1/1970 00:00:00 UTC and the time according to the elapsed realtime + * clock when that number was established. The elapsed realtime clock is considered accurate but + * volatile, so time signals must not be persisted across device resets. + * + * @hide + */ +public final class ManualTimeSuggestion implements Parcelable { + + public static final @NonNull Creator<ManualTimeSuggestion> CREATOR = + new Creator<ManualTimeSuggestion>() { + public ManualTimeSuggestion createFromParcel(Parcel in) { + return ManualTimeSuggestion.createFromParcel(in); + } + + public ManualTimeSuggestion[] newArray(int size) { + return new ManualTimeSuggestion[size]; + } + }; + + @NonNull + private final TimestampedValue<Long> mUtcTime; + @Nullable + private ArrayList<String> mDebugInfo; + + public ManualTimeSuggestion(@NonNull TimestampedValue<Long> utcTime) { + mUtcTime = Objects.requireNonNull(utcTime); + } + + private static ManualTimeSuggestion createFromParcel(Parcel in) { + TimestampedValue<Long> utcTime = in.readParcelable(null /* classLoader */); + ManualTimeSuggestion suggestion = new ManualTimeSuggestion(utcTime); + @SuppressWarnings("unchecked") + ArrayList<String> debugInfo = (ArrayList<String>) in.readArrayList(null /* classLoader */); + suggestion.mDebugInfo = debugInfo; + return suggestion; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeParcelable(mUtcTime, 0); + dest.writeList(mDebugInfo); + } + + @NonNull + public TimestampedValue<Long> getUtcTime() { + return mUtcTime; + } + + @NonNull + public List<String> getDebugInfo() { + return Collections.unmodifiableList(mDebugInfo); + } + + /** + * Associates information with the instance that can be useful for debugging / logging. The + * information is present in {@link #toString()} but is not considered for + * {@link #equals(Object)} and {@link #hashCode()}. + */ + public void addDebugInfo(String... debugInfos) { + if (mDebugInfo == null) { + mDebugInfo = new ArrayList<>(); + } + mDebugInfo.addAll(Arrays.asList(debugInfos)); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ManualTimeSuggestion that = (ManualTimeSuggestion) o; + return Objects.equals(mUtcTime, that.mUtcTime); + } + + @Override + public int hashCode() { + return Objects.hash(mUtcTime); + } + + @Override + public String toString() { + return "ManualTimeSuggestion{" + + "mUtcTime=" + mUtcTime + + ", mDebugInfo=" + mDebugInfo + + '}'; + } +} diff --git a/core/java/android/app/timedetector/PhoneTimeSuggestion.java b/core/java/android/app/timedetector/PhoneTimeSuggestion.java index 475a4aafd929..233dbbc42f50 100644 --- a/core/java/android/app/timedetector/PhoneTimeSuggestion.java +++ b/core/java/android/app/timedetector/PhoneTimeSuggestion.java @@ -29,7 +29,9 @@ import java.util.List; import java.util.Objects; /** - * A time signal from a telephony source. The value consists of the number of milliseconds elapsed + * A time signal from a telephony source. The value can be {@code null} to indicate that the + * telephony source has entered an "un-opinionated" state and any previously sent suggestions are + * being withdrawn. When not {@code null}, the value consists of the number of milliseconds elapsed * since 1/1/1970 00:00:00 UTC and the time according to the elapsed realtime clock when that number * was established. The elapsed realtime clock is considered accurate but volatile, so time signals * must not be persisted across device resets. @@ -50,20 +52,17 @@ public final class PhoneTimeSuggestion implements Parcelable { }; private final int mPhoneId; - @NonNull - private final TimestampedValue<Long> mUtcTime; - @Nullable - private ArrayList<String> mDebugInfo; + @Nullable private TimestampedValue<Long> mUtcTime; + @Nullable private ArrayList<String> mDebugInfo; - public PhoneTimeSuggestion(int phoneId, @NonNull TimestampedValue<Long> utcTime) { + public PhoneTimeSuggestion(int phoneId) { mPhoneId = phoneId; - mUtcTime = Objects.requireNonNull(utcTime); } private static PhoneTimeSuggestion createFromParcel(Parcel in) { int phoneId = in.readInt(); - TimestampedValue<Long> utcTime = in.readParcelable(null /* classLoader */); - PhoneTimeSuggestion suggestion = new PhoneTimeSuggestion(phoneId, utcTime); + PhoneTimeSuggestion suggestion = new PhoneTimeSuggestion(phoneId); + suggestion.setUtcTime(in.readParcelable(null /* classLoader */)); @SuppressWarnings("unchecked") ArrayList<String> debugInfo = (ArrayList<String>) in.readArrayList(null /* classLoader */); suggestion.mDebugInfo = debugInfo; @@ -86,7 +85,11 @@ public final class PhoneTimeSuggestion implements Parcelable { return mPhoneId; } - @NonNull + public void setUtcTime(@Nullable TimestampedValue<Long> utcTime) { + mUtcTime = utcTime; + } + + @Nullable public TimestampedValue<Long> getUtcTime() { return mUtcTime; } diff --git a/core/java/android/app/timedetector/TimeDetector.java b/core/java/android/app/timedetector/TimeDetector.java index 334e9582a145..48d5cd2d65a5 100644 --- a/core/java/android/app/timedetector/TimeDetector.java +++ b/core/java/android/app/timedetector/TimeDetector.java @@ -17,19 +17,22 @@ package android.app.timedetector; import android.annotation.NonNull; +import android.annotation.RequiresPermission; import android.annotation.SystemService; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceManager.ServiceNotFoundException; +import android.os.SystemClock; import android.util.Log; +import android.util.TimestampedValue; /** * The interface through which system components can send signals to the TimeDetectorService. * @hide */ @SystemService(Context.TIME_DETECTOR_SERVICE) -public final class TimeDetector { +public class TimeDetector { private static final String TAG = "timedetector.TimeDetector"; private static final boolean DEBUG = false; @@ -41,10 +44,11 @@ public final class TimeDetector { } /** - * Suggests the current time to the detector. The detector may ignore the signal if better - * signals are available such as those that come from more reliable sources or were - * determined more recently. + * Suggests the current phone-signal derived time to the detector. The detector may ignore the + * signal if better signals are available such as those that come from more reliable sources or + * were determined more recently. */ + @RequiresPermission(android.Manifest.permission.SET_TIME) public void suggestPhoneTime(@NonNull PhoneTimeSuggestion timeSuggestion) { if (DEBUG) { Log.d(TAG, "suggestPhoneTime called: " + timeSuggestion); @@ -56,4 +60,29 @@ public final class TimeDetector { } } + /** + * Suggests the user's manually entered current time to the detector. + */ + @RequiresPermission(android.Manifest.permission.SET_TIME) + public void suggestManualTime(@NonNull ManualTimeSuggestion timeSuggestion) { + if (DEBUG) { + Log.d(TAG, "suggestManualTime called: " + timeSuggestion); + } + try { + mITimeDetectorService.suggestManualTime(timeSuggestion); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + * A shared utility method to create a {@link ManualTimeSuggestion}. + */ + public static ManualTimeSuggestion createManualTimeSuggestion(long when, String why) { + TimestampedValue<Long> utcTime = + new TimestampedValue<>(SystemClock.elapsedRealtime(), when); + ManualTimeSuggestion manualTimeSuggestion = new ManualTimeSuggestion(utcTime); + manualTimeSuggestion.addDebugInfo(why); + return manualTimeSuggestion; + } } diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl index 83c1d611226d..1211c731e2e1 100644 --- a/core/java/android/app/usage/IUsageStatsManager.aidl +++ b/core/java/android/app/usage/IUsageStatsManager.aidl @@ -44,7 +44,6 @@ interface IUsageStatsManager { void setAppInactive(String packageName, boolean inactive, int userId); @UnsupportedAppUsage boolean isAppInactive(String packageName, int userId); - void whitelistAppTemporarily(String packageName, long duration, int userId); void onCarrierPrivilegedAppsChanged(); void reportChooserSelection(String packageName, int userId, String contentType, in String[] annotations, String action); diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 1f13a1e13d13..ab404d212730 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -29,6 +29,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.pm.ParceledListSlice; import android.os.Build; +import android.os.PowerWhitelistManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; @@ -1044,15 +1045,16 @@ public final class UsageStatsManager { * @param user The user for whom the package should be whitelisted. Passing in a user that is * not the same as the caller's process will require the INTERACT_ACROSS_USERS permission. * @see #isAppInactive(String) + * + * @deprecated Use + * {@link android.os.PowerWhitelistManager#whitelistAppTemporarily(String, long)} instead. */ @SystemApi @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) + @Deprecated public void whitelistAppTemporarily(String packageName, long duration, UserHandle user) { - try { - mService.whitelistAppTemporarily(packageName, duration, user.getIdentifier()); - } catch (RemoteException re) { - throw re.rethrowFromSystemServer(); - } + mContext.getSystemService(PowerWhitelistManager.class) + .whitelistAppTemporarily(packageName, duration); } /** diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 0fdb51359cf9..4a0fc6689fa7 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3864,14 +3864,6 @@ public abstract class Context { public static final String NETWORK_STACK_SERVICE = "network_stack"; /** - * Use with {@link android.os.ServiceManager.getService()} to retrieve a - * {@link android.net.WifiStackClient} IBinder for communicating with the network stack - * @hide - * @see android.net.WifiStackClient - */ - public static final String WIFI_STACK_SERVICE = "wifi_stack"; - - /** * Use with {@link #getSystemService(String)} to retrieve a * {@link android.net.IpSecManager} for encrypting Sockets or Networks with * IPSec. @@ -4917,6 +4909,14 @@ public abstract class Context { public static final String APP_SEARCH_SERVICE = "app_search"; /** + * Use with {@link #getSystemService(String)} to retrieve an + * {@link android.content.integrity.AppIntegrityManager}. + * @hide + */ + @SystemApi + public static final String APP_INTEGRITY_SERVICE = "app_integrity"; + + /** * Determine whether the given permission is allowed for a particular * process and user ID running in the system. * diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index ca374f938f1e..40aca0ef2033 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4417,6 +4417,22 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_VIEW_LOCUS = "android.intent.action.VIEW_LOCUS"; + /** + * Broadcast Action: Sent to the integrity component when a package + * needs to be verified. The data contains the package URI along with other relevant + * information. + * + * <p class="note"> + * This is a protected intent that can only be sent by the system. + * </p> + * + * @hide + */ + @SystemApi + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION = + "android.intent.action.PACKAGE_NEEDS_INTEGRITY_VERIFICATION"; + // --------------------------------------------------------------------- // --------------------------------------------------------------------- // Standard intent categories (see addCategory()). diff --git a/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java b/core/java/android/content/integrity/AppInstallMetadata.java index dfc373bb97dc..c9634758f63f 100644 --- a/services/core/java/com/android/server/integrity/model/AppInstallMetadata.java +++ b/core/java/android/content/integrity/AppInstallMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkNotNull; diff --git a/core/java/android/content/integrity/AppIntegrityManager.java b/core/java/android/content/integrity/AppIntegrityManager.java new file mode 100644 index 000000000000..e53ef66020f1 --- /dev/null +++ b/core/java/android/content/integrity/AppIntegrityManager.java @@ -0,0 +1,103 @@ +/* + * 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.content.integrity; + +import android.annotation.NonNull; +import android.annotation.SystemApi; +import android.annotation.SystemService; +import android.content.Context; +import android.content.IntentSender; +import android.content.pm.ParceledListSlice; +import android.os.RemoteException; + +/** + * Class for pushing rules used to check the integrity of app installs. + * + * <p>Note: applications using methods of this class must be a system app and have their package + * name whitelisted as an integrity rule provider. Otherwise a {@link SecurityException} will be + * thrown. + * + * @hide + */ +@SystemApi +@SystemService(Context.APP_INTEGRITY_SERVICE) +public class AppIntegrityManager { + + /** The operation succeeded. */ + public static final int STATUS_SUCCESS = 0; + + /** The operation failed. */ + public static final int STATUS_FAILURE = 1; + + /** + * Current status of an operation. Will be one of {@link #STATUS_SUCCESS}, {@link + * #STATUS_FAILURE}. + * + * <p>More information about a status may be available through additional extras; see the + * individual status documentation for details. + * + * @see android.content.Intent#getIntExtra(String, int) + */ + public static final String EXTRA_STATUS = "android.content.integrity.extra.STATUS"; + + IAppIntegrityManager mManager; + + /** @hide */ + public AppIntegrityManager(IAppIntegrityManager manager) { + mManager = manager; + } + + /** + * Update the rules to evaluate during install time. + * + * @param updateRequest request containing the data of the rule set update + * @param statusReceiver Called when the state of the session changes. Intents sent to this + * receiver contain {@link #EXTRA_STATUS}. Refer to the individual status codes on how to + * handle them. + */ + public void updateRuleSet( + @NonNull RuleSet updateRequest, @NonNull IntentSender statusReceiver) { + try { + mManager.updateRuleSet( + updateRequest.getVersion(), + new ParceledListSlice<>(updateRequest.getRules()), + statusReceiver); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } + + /** Get the current version of the rule set. */ + @NonNull + public String getCurrentRuleSetVersion() { + try { + return mManager.getCurrentRuleSetVersion(); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } + + /** Get the name of the package that provided the current rule set. */ + @NonNull + public String getCurrentRuleSetProvider() { + try { + return mManager.getCurrentRuleSetProvider(); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } +} diff --git a/services/core/java/com/android/server/integrity/model/AtomicFormula.java b/core/java/android/content/integrity/AtomicFormula.java index a16f6b9b5970..c8e164f1f232 100644 --- a/services/core/java/com/android/server/integrity/model/AtomicFormula.java +++ b/core/java/android/content/integrity/AtomicFormula.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; import static com.android.internal.util.Preconditions.checkArgument; diff --git a/services/core/java/com/android/server/integrity/model/OpenFormula.java b/core/java/android/content/integrity/CompoundFormula.java index f7ea9208f7fe..53a99534906c 100644 --- a/services/core/java/com/android/server/integrity/model/OpenFormula.java +++ b/core/java/android/content/integrity/CompoundFormula.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; import static com.android.internal.util.Preconditions.checkArgument; @@ -35,7 +35,8 @@ import java.util.List; import java.util.Objects; /** - * Represents a complex formula consisting of other simple and complex formulas. + * Represents a compound formula formed by joining other simple and complex formulas with boolean + * connectors. * * <p>Instances of this class are immutable. * @@ -43,12 +44,12 @@ import java.util.Objects; */ @SystemApi @VisibleForTesting -public final class OpenFormula implements Formula, Parcelable { +public final class CompoundFormula implements Formula, Parcelable { private static final String TAG = "OpenFormula"; @IntDef( value = { - AND, OR, NOT, + AND, OR, NOT, }) @Retention(RetentionPolicy.SOURCE) public @interface Connector {} @@ -66,16 +67,16 @@ public final class OpenFormula implements Formula, Parcelable { private final @NonNull List<Formula> mFormulas; @NonNull - public static final Creator<OpenFormula> CREATOR = - new Creator<OpenFormula>() { + public static final Creator<CompoundFormula> CREATOR = + new Creator<CompoundFormula>() { @Override - public OpenFormula createFromParcel(Parcel in) { - return new OpenFormula(in); + public CompoundFormula createFromParcel(Parcel in) { + return new CompoundFormula(in); } @Override - public OpenFormula[] newArray(int size) { - return new OpenFormula[size]; + public CompoundFormula[] newArray(int size) { + return new CompoundFormula[size]; } }; @@ -85,15 +86,15 @@ public final class OpenFormula implements Formula, Parcelable { * @throws IllegalArgumentException if the number of operands is not matching the requirements * for that operator (at least 2 for {@link #AND} and {@link #OR}, 1 for {@link #NOT}). */ - public OpenFormula(@Connector int connector, @NonNull List<Formula> formulas) { - checkArgument(isValidConnector(connector), - String.format("Unknown connector: %d", connector)); + public CompoundFormula(@Connector int connector, @NonNull List<Formula> formulas) { + checkArgument( + isValidConnector(connector), String.format("Unknown connector: %d", connector)); validateFormulas(connector, formulas); this.mConnector = connector; this.mFormulas = Collections.unmodifiableList(formulas); } - OpenFormula(Parcel in) { + CompoundFormula(Parcel in) { mConnector = in.readInt(); int length = in.readInt(); checkArgument(length >= 0, "Must have non-negative length. Got " + length); @@ -132,7 +133,7 @@ public final class OpenFormula implements Formula, Parcelable { @Override public int getTag() { - return Formula.OPEN_FORMULA_TAG; + return Formula.COMPOUND_FORMULA_TAG; } @Override @@ -160,7 +161,7 @@ public final class OpenFormula implements Formula, Parcelable { if (o == null || getClass() != o.getClass()) { return false; } - OpenFormula that = (OpenFormula) o; + CompoundFormula that = (CompoundFormula) o; return mConnector == that.mConnector && mFormulas.equals(that.mFormulas); } @@ -217,8 +218,6 @@ public final class OpenFormula implements Formula, Parcelable { } private static boolean isValidConnector(int connector) { - return connector == AND - || connector == OR - || connector == NOT; + return connector == AND || connector == OR || connector == NOT; } } diff --git a/services/core/java/com/android/server/integrity/model/Formula.java b/core/java/android/content/integrity/Formula.java index 67698277800f..030ff6b66e1f 100644 --- a/services/core/java/com/android/server/integrity/model/Formula.java +++ b/core/java/android/content/integrity/Formula.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.content.integrity.AtomicFormula.BooleanAtomicFormula; +import android.content.integrity.AtomicFormula.IntAtomicFormula; +import android.content.integrity.AtomicFormula.StringAtomicFormula; import android.os.Parcel; import android.os.Parcelable; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.integrity.model.AtomicFormula.BooleanAtomicFormula; -import com.android.server.integrity.model.AtomicFormula.IntAtomicFormula; -import com.android.server.integrity.model.AtomicFormula.StringAtomicFormula; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -40,7 +40,7 @@ import java.lang.annotation.RetentionPolicy; public interface Formula { @IntDef( value = { - OPEN_FORMULA_TAG, + COMPOUND_FORMULA_TAG, STRING_ATOMIC_FORMULA_TAG, INT_ATOMIC_FORMULA_TAG, BOOLEAN_ATOMIC_FORMULA_TAG @@ -48,7 +48,7 @@ public interface Formula { @Retention(RetentionPolicy.SOURCE) public @interface Tag {} - int OPEN_FORMULA_TAG = 0; + int COMPOUND_FORMULA_TAG = 0; int STRING_ATOMIC_FORMULA_TAG = 1; int INT_ATOMIC_FORMULA_TAG = 2; int BOOLEAN_ATOMIC_FORMULA_TAG = 3; @@ -87,8 +87,8 @@ public interface Formula { static Formula readFromParcel(@NonNull Parcel in) { int tag = in.readInt(); switch (tag) { - case OPEN_FORMULA_TAG: - return OpenFormula.CREATOR.createFromParcel(in); + case COMPOUND_FORMULA_TAG: + return CompoundFormula.CREATOR.createFromParcel(in); case STRING_ATOMIC_FORMULA_TAG: return StringAtomicFormula.CREATOR.createFromParcel(in); case INT_ATOMIC_FORMULA_TAG: diff --git a/core/java/android/content/integrity/IAppIntegrityManager.aidl b/core/java/android/content/integrity/IAppIntegrityManager.aidl new file mode 100644 index 000000000000..6b73fd70bb99 --- /dev/null +++ b/core/java/android/content/integrity/IAppIntegrityManager.aidl @@ -0,0 +1,28 @@ +/* +** +** Copyright 2019, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +package android.content.integrity; + +import android.content.integrity.Rule; +import android.content.IntentSender; +import android.content.pm.ParceledListSlice; + +/** @hide */ +interface IAppIntegrityManager { + void updateRuleSet(String version, in ParceledListSlice<Rule> rules, in IntentSender statusReceiver); + String getCurrentRuleSetVersion(); + String getCurrentRuleSetProvider(); +} diff --git a/core/java/android/content/integrity/Rule.aidl b/core/java/android/content/integrity/Rule.aidl new file mode 100644 index 000000000000..a6634ee67905 --- /dev/null +++ b/core/java/android/content/integrity/Rule.aidl @@ -0,0 +1,19 @@ +/* +** +** Copyright 2007, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +package android.content.integrity; + +parcelable Rule; diff --git a/services/core/java/com/android/server/integrity/model/Rule.java b/core/java/android/content/integrity/Rule.java index 3ad876292ab4..914f1479edf3 100644 --- a/services/core/java/com/android/server/integrity/model/Rule.java +++ b/core/java/android/content/integrity/Rule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkNotNull; diff --git a/core/java/android/content/integrity/RuleSet.java b/core/java/android/content/integrity/RuleSet.java new file mode 100644 index 000000000000..a78f8c97d553 --- /dev/null +++ b/core/java/android/content/integrity/RuleSet.java @@ -0,0 +1,92 @@ +/* + * 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.content.integrity; + +import static com.android.internal.util.Preconditions.checkNotNull; + +import android.annotation.NonNull; +import android.annotation.SystemApi; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Immutable data class encapsulating all parameters of a rule set. + * + * @hide + */ +@SystemApi +public class RuleSet { + private final String mVersion; + private final List<Rule> mRules; + + private RuleSet(String version, List<Rule> rules) { + mVersion = version; + mRules = Collections.unmodifiableList(rules); + } + + /** @see Builder#setVersion(String). */ + @NonNull + public String getVersion() { + return mVersion; + } + + /** @see Builder#addRules(List). */ + @NonNull + public List<Rule> getRules() { + return mRules; + } + + /** Builder class for RuleSetUpdateRequest. */ + public static class Builder { + private String mVersion; + private List<Rule> mRules; + + public Builder() { + mRules = new ArrayList<>(); + } + + /** + * Set a version string to identify this rule set. This can be retrieved by {@link + * AppIntegrityManager#getCurrentRuleSetVersion()}. + */ + @NonNull + public Builder setVersion(@NonNull String version) { + mVersion = version; + return this; + } + + /** Add the rules to include. */ + @NonNull + public Builder addRules(@NonNull List<Rule> rules) { + mRules.addAll(rules); + return this; + } + + /** + * Builds a {@link RuleSet}. + * + * @throws IllegalArgumentException if version is null + */ + @NonNull + public RuleSet build() { + checkNotNull(mVersion); + return new RuleSet(mVersion, mRules); + } + } +} diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index aa6f58e82bcf..c77c53f387e2 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -248,17 +248,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { @TestApi public static final int PROTECTION_FLAG_TELEPHONY = 0x400000; - /** - * Additional flag for {@link #protectionLevel}, corresponding - * to the <code>wifi</code> value of - * {@link android.R.attr#protectionLevel}. - * - * @hide - */ - @SystemApi - @TestApi - public static final int PROTECTION_FLAG_WIFI = 0x800000; - /** @hide */ @IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = { PROTECTION_FLAG_PRIVILEGED, @@ -281,7 +270,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { PROTECTION_FLAG_INCIDENT_REPORT_APPROVER, PROTECTION_FLAG_APP_PREDICTOR, PROTECTION_FLAG_TELEPHONY, - PROTECTION_FLAG_WIFI, }) @Retention(RetentionPolicy.SOURCE) public @interface ProtectionFlags {} @@ -528,9 +516,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { if ((level & PermissionInfo.PROTECTION_FLAG_TELEPHONY) != 0) { protLevel += "|telephony"; } - if ((level & PermissionInfo.PROTECTION_FLAG_WIFI) != 0) { - protLevel += "|wifi"; - } return protLevel; } diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java index a83c3da6975e..fff9cf399b67 100644 --- a/core/java/android/content/pm/UserInfo.java +++ b/core/java/android/content/pm/UserInfo.java @@ -26,6 +26,8 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.DebugUtils; +import com.android.internal.annotations.VisibleForTesting; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -385,6 +387,13 @@ public class UserInfo implements Parcelable { } } + // TODO(b/142482943): Get rid of this (after removing it from all tests) if feasible. + /** + * @deprecated This is dangerous since it doesn't set the mandatory fields. Use a different + * constructor instead. + */ + @Deprecated + @VisibleForTesting public UserInfo() { } diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 537cb9889805..62e83aa192aa 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -393,8 +393,13 @@ public final class UserHandle implements Parcelable { /** * Generate a text representation of the uid, breaking out its individual * components -- user, app, isolated, etc. + * + * @param uid The uid to format + * @return A string representing the UID with its individual components broken out * @hide */ + @SystemApi + @NonNull public static String formatUid(int uid) { StringBuilder sb = new StringBuilder(); formatUid(sb, uid); @@ -520,7 +525,7 @@ public final class UserHandle implements Parcelable { public int hashCode() { return mHandle; } - + public int describeContents() { return 0; } @@ -532,10 +537,10 @@ public final class UserHandle implements Parcelable { /** * Write a UserHandle to a Parcel, handling null pointers. Must be * read with {@link #readFromParcel(Parcel)}. - * + * * @param h The UserHandle to be written. * @param out The Parcel in which the UserHandle will be placed. - * + * * @see #readFromParcel(Parcel) */ public static void writeToParcel(UserHandle h, Parcel out) { @@ -545,23 +550,23 @@ public final class UserHandle implements Parcelable { out.writeInt(USER_NULL); } } - + /** * Read a UserHandle from a Parcel that was previously written * with {@link #writeToParcel(UserHandle, Parcel)}, returning either * a null or new object as appropriate. - * + * * @param in The Parcel from which to read the UserHandle * @return Returns a new UserHandle matching the previously written * object, or null if a null had been written. - * + * * @see #writeToParcel(UserHandle, Parcel) */ public static UserHandle readFromParcel(Parcel in) { int h = in.readInt(); return h != USER_NULL ? new UserHandle(h) : null; } - + public static final @android.annotation.NonNull Parcelable.Creator<UserHandle> CREATOR = new Parcelable.Creator<UserHandle>() { public UserHandle createFromParcel(Parcel in) { @@ -581,7 +586,7 @@ public final class UserHandle implements Parcelable { * must not use this with data written by * {@link #writeToParcel(UserHandle, Parcel)} since it is not possible * to handle a null UserHandle here. - * + * * @param in The Parcel containing the previously written UserHandle, * positioned at the location in the buffer where it was written. */ diff --git a/core/java/android/os/connectivity/WifiBatteryStats.java b/core/java/android/os/connectivity/WifiBatteryStats.java index d10a647cda1a..e9b3837c8853 100644 --- a/core/java/android/os/connectivity/WifiBatteryStats.java +++ b/core/java/android/os/connectivity/WifiBatteryStats.java @@ -48,9 +48,9 @@ public final class WifiBatteryStats implements Parcelable { private long[] mTimeInStateMillis = new long[BatteryStats.NUM_WIFI_STATES]; private long[] mTimeInSupplicantStateMillis = - new long[BatteryStats.NUM_WIFI_SIGNAL_STRENGTH_BINS]; - private long[] mTimeInRxSignalStrengthLevelMillis = new long[BatteryStats.NUM_WIFI_SUPPL_STATES]; + private long[] mTimeInRxSignalStrengthLevelMillis = + new long[BatteryStats.NUM_WIFI_SIGNAL_STRENGTH_BINS]; private long mMonitoredRailChargeConsumedMaMillis = 0; public static final @NonNull Parcelable.Creator<WifiBatteryStats> CREATOR = diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cc4ed4b221e0..703b86d3f878 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8168,6 +8168,15 @@ public final class Settings { public static final String NOTIFICATION_BADGING = "notification_badging"; /** + * When enabled the system will maintain a rolling history of received notifications. When + * disabled the history will be disabled and deleted. + * + * The value 1 - enable, 0 - disable + * @hide + */ + public static final String NOTIFICATION_HISTORY_ENABLED = "notification_history_enabled"; + + /** * Whether notifications are dismissed by a right-to-left swipe (instead of a left-to-right * swipe). * diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java index 48ba4295f3c8..4df43628b5d3 100644 --- a/core/java/android/service/autofill/SaveInfo.java +++ b/core/java/android/service/autofill/SaveInfo.java @@ -216,10 +216,21 @@ public final class SaveInfo implements Parcelable { */ public static final int NEGATIVE_BUTTON_STYLE_REJECT = 1; + /** + * Style for the negative button of the save UI to never do the + * save operation. This means that the user does not need to save + * any data on this activity or application. Once the user tapping + * the negative button, the service should never trigger the save + * UI again. In addition to this, must consider providing restore + * options for the user. + */ + public static final int NEGATIVE_BUTTON_STYLE_NEVER = 2; + /** @hide */ @IntDef(prefix = { "NEGATIVE_BUTTON_STYLE_" }, value = { NEGATIVE_BUTTON_STYLE_CANCEL, - NEGATIVE_BUTTON_STYLE_REJECT + NEGATIVE_BUTTON_STYLE_REJECT, + NEGATIVE_BUTTON_STYLE_NEVER }) @Retention(RetentionPolicy.SOURCE) @interface NegativeButtonStyle{} @@ -571,6 +582,7 @@ public final class SaveInfo implements Parcelable { * * @see #NEGATIVE_BUTTON_STYLE_CANCEL * @see #NEGATIVE_BUTTON_STYLE_REJECT + * @see #NEGATIVE_BUTTON_STYLE_NEVER * * @throws IllegalArgumentException If the style is invalid */ @@ -578,11 +590,7 @@ public final class SaveInfo implements Parcelable { @Nullable IntentSender listener) { throwIfDestroyed(); Preconditions.checkArgumentInRange(style, NEGATIVE_BUTTON_STYLE_CANCEL, - NEGATIVE_BUTTON_STYLE_REJECT, "style"); - if (style != NEGATIVE_BUTTON_STYLE_CANCEL - && style != NEGATIVE_BUTTON_STYLE_REJECT) { - throw new IllegalArgumentException("Invalid style: " + style); - } + NEGATIVE_BUTTON_STYLE_NEVER, "style"); mNegativeButtonStyle = style; mNegativeActionListener = listener; return this; diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index be4c598da789..1c94e02462d0 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1440,7 +1440,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { public static final int TOOL_TYPE_STYLUS = 2; /** - * Tool type constant: The tool is a mouse or trackpad. + * Tool type constant: The tool is a mouse. * * @see #getToolType */ diff --git a/core/java/android/view/WindowlessViewRoot.java b/core/java/android/view/WindowlessViewRoot.java index addf8e242e3d..68f2bde9c265 100644 --- a/core/java/android/view/WindowlessViewRoot.java +++ b/core/java/android/view/WindowlessViewRoot.java @@ -32,6 +32,14 @@ import android.os.IBinder; public class WindowlessViewRoot { private ViewRootImpl mViewRoot; private WindowlessWindowManager mWm; + + /** @hide */ + public WindowlessViewRoot(@NonNull Context c, @NonNull Display d, + @NonNull WindowlessWindowManager wwm) { + mWm = wwm; + mViewRoot = new ViewRootImpl(c, d, mWm); + } + public WindowlessViewRoot(@NonNull Context c, @NonNull Display d, @NonNull SurfaceControl rootSurface, @Nullable IBinder hostInputToken) { @@ -55,4 +63,12 @@ public class WindowlessViewRoot { public void dispose() { mViewRoot.dispatchDetachedFromWindow(); } + + /** + * Tell this viewroot to clean itself up. + * @hide + */ + public void die() { + mViewRoot.die(false /* immediate */); + } } diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index cf39979ff7f9..2ba09750b001 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -34,7 +34,7 @@ import java.util.HashMap; * By parcelling the root surface, the app can offer another app content for embedding. * @hide */ -class WindowlessWindowManager implements IWindowSession { +public class WindowlessWindowManager implements IWindowSession { private final static String TAG = "WindowlessWindowManager"; private class State { @@ -45,6 +45,7 @@ class WindowlessWindowManager implements IWindowSession { mParams.copyFrom(p); } }; + /** * Used to store SurfaceControl we've built for clients to * reconfigure them if relayout is called. @@ -67,13 +68,18 @@ class WindowlessWindowManager implements IWindowSession { private int mForceHeight = -1; private int mForceWidth = -1; - WindowlessWindowManager(Configuration c, SurfaceControl rootSurface, IBinder hostInputToken) { + public WindowlessWindowManager(Configuration c, SurfaceControl rootSurface, + IBinder hostInputToken) { mRootSurface = rootSurface; mConfiguration = new Configuration(c); mRealWm = WindowManagerGlobal.getWindowSession(); mHostInputToken = hostInputToken; } + protected void setConfiguration(Configuration configuration) { + mConfiguration.setTo(configuration); + } + /** * Utility API. */ @@ -125,6 +131,17 @@ class WindowlessWindowManager implements IWindowSession { @Override public void remove(android.view.IWindow window) throws RemoteException { mRealWm.remove(window); + State state; + synchronized (this) { + state = mStateForWindow.remove(window.asBinder()); + } + if (state == null) { + throw new IllegalArgumentException( + "Invalid window token (never added or removed already)"); + } + try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) { + t.remove(state.mSurfaceControl).apply(); + } } private boolean isOpaque(WindowManager.LayoutParams attrs) { @@ -165,10 +182,14 @@ class WindowlessWindowManager implements IWindowSession { int height = surfaceInsets != null ? attrs.height + surfaceInsets.top + surfaceInsets.bottom : attrs.height; - t.show(sc) - .setBufferSize(sc, width, height) - .setOpaque(sc, isOpaque(attrs)) - .apply(); + t.setBufferSize(sc, width, height) + .setOpaque(sc, isOpaque(attrs)); + if (viewFlags == View.VISIBLE) { + t.show(sc); + } else { + t.hide(sc); + } + t.apply(); outSurfaceControl.copyFrom(sc); outFrame.set(0, 0, attrs.width, attrs.height); diff --git a/core/java/android/view/accessibility/AccessibilityEvent.java b/core/java/android/view/accessibility/AccessibilityEvent.java index 32b0f413321a..34654edd00e8 100644 --- a/core/java/android/view/accessibility/AccessibilityEvent.java +++ b/core/java/android/view/accessibility/AccessibilityEvent.java @@ -17,6 +17,7 @@ package android.view.accessibility; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Parcel; @@ -796,10 +797,32 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par private ArrayList<AccessibilityRecord> mRecords; - /* - * Hide constructor from clients. + /** + * Creates a new {@link AccessibilityEvent}. */ - private AccessibilityEvent() { + public AccessibilityEvent() { + if (DEBUG_ORIGIN) originStackTrace = Thread.currentThread().getStackTrace(); + } + + + /** + * Creates a new {@link AccessibilityEvent} with the given <code>eventType</code>. + * + * @param eventType The event type. + */ + public AccessibilityEvent(int eventType) { + mEventType = eventType; + if (DEBUG_ORIGIN) originStackTrace = Thread.currentThread().getStackTrace(); + } + + /** + * Copy constructor. Creates a new {@link AccessibilityEvent}, and this instance is initialized + * from the given <code>event</code>. + * + * @param event The other event. + */ + public AccessibilityEvent(@NonNull AccessibilityEvent event) { + init(event); } /** @@ -816,6 +839,15 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par mWindowChangeTypes = event.mWindowChangeTypes; mEventTime = event.mEventTime; mPackageName = event.mPackageName; + if (event.mRecords != null) { + final int recordCount = event.mRecords.size(); + mRecords = new ArrayList<>(recordCount); + for (int i = 0; i < recordCount; i++) { + final AccessibilityRecord record = event.mRecords.get(i); + final AccessibilityRecord recordClone = new AccessibilityRecord(record); + mRecords.add(recordClone); + } + } if (DEBUG_ORIGIN) originStackTrace = event.originStackTrace; } @@ -1109,6 +1141,9 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par * Returns a cached instance if such is available or a new one is * instantiated with its type property set. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityEvent(int)} instead. + * * @param eventType The event type. * @return An instance. */ @@ -1123,23 +1158,15 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par * created. The returned instance is initialized from the given * <code>event</code>. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityEvent(AccessibilityEvent)} instead. + * * @param event The other event. * @return An instance. */ public static AccessibilityEvent obtain(AccessibilityEvent event) { AccessibilityEvent eventClone = AccessibilityEvent.obtain(); eventClone.init(event); - - if (event.mRecords != null) { - final int recordCount = event.mRecords.size(); - eventClone.mRecords = new ArrayList<AccessibilityRecord>(recordCount); - for (int i = 0; i < recordCount; i++) { - final AccessibilityRecord record = event.mRecords.get(i); - final AccessibilityRecord recordClone = AccessibilityRecord.obtain(record); - eventClone.mRecords.add(recordClone); - } - } - return eventClone; } @@ -1147,6 +1174,9 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par * Returns a cached instance if such is available or a new one is * instantiated. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityEvent()} instead. + * * @return An instance. */ public static AccessibilityEvent obtain() { @@ -1162,6 +1192,8 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par * <b>Note: You must not touch the object after calling this function.</b> * </p> * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. + * * @throws IllegalStateException If the event is already recycled. */ @Override diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index a38955540927..66bf982894aa 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -775,15 +775,38 @@ public class AccessibilityNodeInfo implements Parcelable { private TouchDelegateInfo mTouchDelegateInfo; /** - * Hide constructor from clients. + * Creates a new {@link AccessibilityNodeInfo}. */ - private AccessibilityNodeInfo() { - /* do nothing */ + public AccessibilityNodeInfo() { } - /** @hide */ - AccessibilityNodeInfo(AccessibilityNodeInfo info) { - init(info); + /** + * Creates a new {@link AccessibilityNodeInfo} with the given <code>source</code>. + * + * @param source The source view. + */ + public AccessibilityNodeInfo(@NonNull View source) { + setSource(source); + } + + /** + * Creates a new {@link AccessibilityNodeInfo} with the given <code>source</code>. + * + * @param root The root of the virtual subtree. + * @param virtualDescendantId The id of the virtual descendant. + */ + public AccessibilityNodeInfo(@NonNull View root, int virtualDescendantId) { + setSource(root, virtualDescendantId); + } + + /** + * Copy constructor. Creates a new {@link AccessibilityNodeInfo}, and this new instance is + * initialized from the given <code>info</code>. + * + * @param info The other info. + */ + public AccessibilityNodeInfo(@NonNull AccessibilityNodeInfo info) { + init(info, false /* usePoolingInfo */); } /** @@ -911,7 +934,7 @@ public class AccessibilityNodeInfo implements Parcelable { // when it is obtained. Enforce sealing again before we init to fail when a node has been // recycled during a refresh to catch such errors earlier. enforceSealed(); - init(refreshedInfo); + init(refreshedInfo, true /* usePoolingInfo */); refreshedInfo.recycle(); return true; } @@ -3299,6 +3322,9 @@ public class AccessibilityNodeInfo implements Parcelable { * Returns a cached instance if such is available otherwise a new one * and sets the source. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityNodeInfo(View)} instead. + * * @param source The source view. * @return An instance. * @@ -3314,6 +3340,9 @@ public class AccessibilityNodeInfo implements Parcelable { * Returns a cached instance if such is available otherwise a new one * and sets the source. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityNodeInfo(View, int)} instead. + * * @param root The root of the virtual subtree. * @param virtualDescendantId The id of the virtual descendant. * @return An instance. @@ -3329,6 +3358,9 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Returns a cached instance if such is available otherwise a new one. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityNodeInfo()} instead. + * * @return An instance. */ public static AccessibilityNodeInfo obtain() { @@ -3344,12 +3376,15 @@ public class AccessibilityNodeInfo implements Parcelable { * create. The returned instance is initialized from the given * <code>info</code>. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityNodeInfo(AccessibilityNodeInfo)} instead. + * * @param info The other info. * @return An instance. */ public static AccessibilityNodeInfo obtain(AccessibilityNodeInfo info) { AccessibilityNodeInfo infoClone = AccessibilityNodeInfo.obtain(); - infoClone.init(info); + infoClone.init(info, true /* usePoolingInfo */); return infoClone; } @@ -3358,6 +3393,8 @@ public class AccessibilityNodeInfo implements Parcelable { * <p> * <strong>Note:</strong> You must not touch the object after calling this function. * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. + * * @throws IllegalStateException If the info is already recycled. */ public void recycle() { @@ -3647,8 +3684,9 @@ public class AccessibilityNodeInfo implements Parcelable { * Initializes this instance from another one. * * @param other The other instance. + * @param usePoolingInfos whether using pooled object internally or not */ - private void init(AccessibilityNodeInfo other) { + private void init(AccessibilityNodeInfo other, boolean usePoolingInfos) { mSealed = other.mSealed; mSourceNodeId = other.mSourceNodeId; mParentNodeId = other.mParentNodeId; @@ -3707,6 +3745,18 @@ public class AccessibilityNodeInfo implements Parcelable { mExtras = other.mExtras != null ? new Bundle(other.mExtras) : null; + if (usePoolingInfos) { + initPoolingInfos(other); + } else { + initCopyInfos(other); + } + + final TouchDelegateInfo otherInfo = other.mTouchDelegateInfo; + mTouchDelegateInfo = (otherInfo != null) + ? new TouchDelegateInfo(otherInfo.mTargetMap, true) : null; + } + + private void initPoolingInfos(AccessibilityNodeInfo other) { if (mRangeInfo != null) mRangeInfo.recycle(); mRangeInfo = (other.mRangeInfo != null) ? RangeInfo.obtain(other.mRangeInfo) : null; @@ -3716,10 +3766,20 @@ public class AccessibilityNodeInfo implements Parcelable { if (mCollectionItemInfo != null) mCollectionItemInfo.recycle(); mCollectionItemInfo = (other.mCollectionItemInfo != null) ? CollectionItemInfo.obtain(other.mCollectionItemInfo) : null; + } - final TouchDelegateInfo otherInfo = other.mTouchDelegateInfo; - mTouchDelegateInfo = (otherInfo != null) - ? new TouchDelegateInfo(otherInfo.mTargetMap, true) : null; + private void initCopyInfos(AccessibilityNodeInfo other) { + RangeInfo ri = other.mRangeInfo; + mRangeInfo = (ri == null) ? null + : new RangeInfo(ri.mType, ri.mMin, ri.mMax, ri.mCurrent); + CollectionInfo ci = other.mCollectionInfo; + mCollectionInfo = (ci == null) ? null + : new CollectionInfo(ci.mRowCount, ci.mColumnCount, + ci.mHierarchical, ci.mSelectionMode); + CollectionItemInfo cii = other.mCollectionItemInfo; + mCollectionItemInfo = (cii == null) ? null + : new CollectionItemInfo(cii.mRowIndex, cii.mRowSpan, cii.mColumnIndex, + cii.mColumnSpan, cii.mHeading, cii.mSelected); } /** @@ -3854,7 +3914,7 @@ public class AccessibilityNodeInfo implements Parcelable { * Clears the state of this instance. */ private void clear() { - init(DEFAULT); + init(DEFAULT, true /* usePoolingInfo */); } private static boolean isDefaultStandardAction(AccessibilityAction action) { @@ -4709,6 +4769,10 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance that is a clone of another one. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link AccessibilityNodeInfo.RangeInfo#AccessibilityNodeInfo.RangeInfo(int, + * float, float, float)} instead. + * * @param other The instance to clone. * * @hide @@ -4720,6 +4784,10 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link AccessibilityNodeInfo.RangeInfo#AccessibilityNodeInfo.RangeInfo(int, + * float, float, float)} instead. + * * @param type The type of the range. * @param min The minimum value. Use {@code Float.NEGATIVE_INFINITY} if the range has no * minimum. @@ -4750,7 +4818,7 @@ public class AccessibilityNodeInfo implements Parcelable { * maximum. * @param current The current value. */ - private RangeInfo(int type, float min, float max, float current) { + public RangeInfo(int type, float min, float max, float current) { mType = type; mMin = min; mMax = max; @@ -4799,6 +4867,8 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Recycles this instance. + * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. */ void recycle() { clear(); @@ -4849,6 +4919,10 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance that is a clone of another one. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionInfo#AccessibilityNodeInfo.CollectionInfo} instead. + * * @param other The instance to clone. * @hide */ @@ -4860,6 +4934,11 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionInfo#AccessibilityNodeInfo.CollectionInfo(int, int, + * boolean)} instead. + * * @param rowCount The number of rows, or -1 if count is unknown. * @param columnCount The number of columns, or -1 if count is unknown. * @param hierarchical Whether the collection is hierarchical. @@ -4872,6 +4951,11 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionInfo#AccessibilityNodeInfo.CollectionInfo(int, int, + * boolean, int)} instead. + * * @param rowCount The number of rows. * @param columnCount The number of columns. * @param hierarchical Whether the collection is hierarchical. @@ -4902,9 +4986,20 @@ public class AccessibilityNodeInfo implements Parcelable { * @param rowCount The number of rows. * @param columnCount The number of columns. * @param hierarchical Whether the collection is hierarchical. + */ + public CollectionInfo(int rowCount, int columnCount, boolean hierarchical) { + this(rowCount, columnCount, hierarchical, SELECTION_MODE_NONE); + } + + /** + * Creates a new instance. + * + * @param rowCount The number of rows. + * @param columnCount The number of columns. + * @param hierarchical Whether the collection is hierarchical. * @param selectionMode The collection's selection mode. */ - private CollectionInfo(int rowCount, int columnCount, boolean hierarchical, + public CollectionInfo(int rowCount, int columnCount, boolean hierarchical, int selectionMode) { mRowCount = rowCount; mColumnCount = columnCount; @@ -4955,6 +5050,8 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Recycles this instance. + * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. */ void recycle() { clear(); @@ -4991,6 +5088,11 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance that is a clone of another one. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionItemInfo#AccessibilityNodeInfo.CollectionItemInfo} + * instead. + * * @param other The instance to clone. * @hide */ @@ -5002,6 +5104,11 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionItemInfo#AccessibilityNodeInfo.CollectionItemInfo(int, + * int, int, int, boolean)} instead. + * * @param rowIndex The row index at which the item is located. * @param rowSpan The number of rows the item spans. * @param columnIndex The column index at which the item is located. @@ -5017,6 +5124,11 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Obtains a pooled instance. * + * <p>In most situations object pooling is not beneficial. Creates a new instance using the + * constructor {@link + * AccessibilityNodeInfo.CollectionItemInfo#AccessibilityNodeInfo.CollectionItemInfo(int, + * int, int, int, boolean, boolean)} instead. + * * @param rowIndex The row index at which the item is located. * @param rowSpan The number of rows the item spans. * @param columnIndex The column index at which the item is located. @@ -5058,7 +5170,22 @@ public class AccessibilityNodeInfo implements Parcelable { * @param columnSpan The number of columns the item spans. * @param heading Whether the item is a heading. */ - private CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan, + public CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan, + boolean heading) { + this(rowIndex, rowSpan, columnIndex, columnSpan, heading, false); + } + + /** + * Creates a new instance. + * + * @param rowIndex The row index at which the item is located. + * @param rowSpan The number of rows the item spans. + * @param columnIndex The column index at which the item is located. + * @param columnSpan The number of columns the item spans. + * @param heading Whether the item is a heading. + * @param selected Whether the item is selected. + */ + public CollectionItemInfo(int rowIndex, int rowSpan, int columnIndex, int columnSpan, boolean heading, boolean selected) { mRowIndex = rowIndex; mRowSpan = rowSpan; @@ -5126,6 +5253,8 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Recycles this instance. + * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. */ void recycle() { clear(); diff --git a/core/java/android/view/accessibility/AccessibilityRecord.java b/core/java/android/view/accessibility/AccessibilityRecord.java index d7d7e210e5f4..4f6c9ef55220 100644 --- a/core/java/android/view/accessibility/AccessibilityRecord.java +++ b/core/java/android/view/accessibility/AccessibilityRecord.java @@ -18,6 +18,7 @@ package android.view.accessibility; import static com.android.internal.util.CollectionUtils.isEmpty; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.os.Parcelable; @@ -113,10 +114,20 @@ public class AccessibilityRecord { int mConnectionId = UNDEFINED; - /* - * Hide constructor. + /** + * Creates a new {@link AccessibilityRecord}. */ - AccessibilityRecord() { + public AccessibilityRecord() { + } + + /** + * Copy constructor. Creates a new {@link AccessibilityRecord}, and this instance is initialized + * with data from the given <code>record</code>. + * + * @param record The other record. + */ + public AccessibilityRecord(@NonNull AccessibilityRecord record) { + init(record); } /** @@ -790,6 +801,9 @@ public class AccessibilityRecord { * instantiated. The instance is initialized with data from the * given record. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityRecord(AccessibilityRecord)} instead. + * * @return An instance. */ public static AccessibilityRecord obtain(AccessibilityRecord record) { @@ -802,6 +816,9 @@ public class AccessibilityRecord { * Returns a cached instance if such is available or a new one is * instantiated. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityRecord()} instead. + * * @return An instance. */ public static AccessibilityRecord obtain() { @@ -823,6 +840,8 @@ public class AccessibilityRecord { * <p> * <strong>Note:</strong> You must not touch the object after calling this function. * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. + * * @throws IllegalStateException If the record is already recycled. */ public void recycle() { diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java index 5fa8a6e0e06b..2cc6e9aebd74 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java @@ -119,12 +119,19 @@ public final class AccessibilityWindowInfo implements Parcelable { private int mConnectionId = UNDEFINED_WINDOW_ID; - private AccessibilityWindowInfo() { - /* do nothing - hide constructor */ + /** + * Creates a new {@link AccessibilityWindowInfo}. + */ + public AccessibilityWindowInfo() { } - /** @hide */ - AccessibilityWindowInfo(AccessibilityWindowInfo info) { + /** + * Copy constructor. Creates a new {@link AccessibilityWindowInfo}, and this new instance is + * initialized from given <code>info</code>. + * + * @param info The other info. + */ + public AccessibilityWindowInfo(@NonNull AccessibilityWindowInfo info) { init(info); } @@ -469,6 +476,9 @@ public final class AccessibilityWindowInfo implements Parcelable { * Returns a cached instance if such is available or a new one is * created. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityWindowInfo()} instead. + * * @return An instance. */ public static AccessibilityWindowInfo obtain() { @@ -487,6 +497,9 @@ public final class AccessibilityWindowInfo implements Parcelable { * created. The returned instance is initialized from the given * <code>info</code>. * + * <p>In most situations object pooling is not beneficial. Create a new instance using the + * constructor {@link #AccessibilityWindowInfo(AccessibilityWindowInfo)} instead. + * * @param info The other info. * @return An instance. */ @@ -514,6 +527,8 @@ public final class AccessibilityWindowInfo implements Parcelable { * <strong>Note:</strong> You must not touch the object after calling this function. * </p> * + * <p>In most situations object pooling is not beneficial, and recycling is not necessary. + * * @throws IllegalStateException If the info is already recycled. */ public void recycle() { diff --git a/core/java/com/android/internal/app/SuspendedAppActivity.java b/core/java/com/android/internal/app/SuspendedAppActivity.java index 712774a12cdf..33b2113b0674 100644 --- a/core/java/com/android/internal/app/SuspendedAppActivity.java +++ b/core/java/com/android/internal/app/SuspendedAppActivity.java @@ -16,6 +16,8 @@ package com.android.internal.app; +import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; +import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE; import static android.content.res.Resources.ID_NULL; import android.Manifest; @@ -64,7 +66,8 @@ public class SuspendedAppActivity extends AlertActivity final Intent moreDetailsIntent = new Intent(Intent.ACTION_SHOW_SUSPENDED_APP_DETAILS) .setPackage(suspendingPackage); final String requiredPermission = Manifest.permission.SEND_SHOW_SUSPENDED_APP_DETAILS; - final ResolveInfo resolvedInfo = mPm.resolveActivityAsUser(moreDetailsIntent, 0, userId); + final ResolveInfo resolvedInfo = mPm.resolveActivityAsUser(moreDetailsIntent, + MATCH_DIRECT_BOOT_UNAWARE | MATCH_DIRECT_BOOT_AWARE, userId); if (resolvedInfo != null && resolvedInfo.activityInfo != null && requiredPermission.equals(resolvedInfo.activityInfo.permission)) { moreDetailsIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, suspendedPackage) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 865ec27e00c4..9ee79eada626 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -254,18 +254,6 @@ public class ZygoteInit { InputStream is; try { - // If we are profiling the boot image, avoid preloading classes. - // Can't use device_config since we are the zygote. - String prop = SystemProperties.get( - "persist.device_config.runtime_native_boot.profilebootclasspath", ""); - // Might be empty if the property is unset since the default is "". - if (prop.length() == 0) { - prop = SystemProperties.get("dalvik.vm.profilebootclasspath", ""); - } - if ("true".equals(prop)) { - return; - } - is = new FileInputStream(PRELOADED_CLASSES); } catch (FileNotFoundException e) { Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + "."); @@ -345,6 +333,22 @@ public class ZygoteInit { runtime.preloadDexCaches(); Trace.traceEnd(Trace.TRACE_TAG_DALVIK); + // If we are profiling the boot image, reset the Jit counters after preloading the + // classes. We want to preload for performance, and we can use method counters to + // infer what clases are used after calling resetJitCounters, for profile purposes. + // Can't use device_config since we are the zygote. + String prop = SystemProperties.get( + "persist.device_config.runtime_native_boot.profilebootclasspath", ""); + // Might be empty if the property is unset since the default is "". + if (prop.length() == 0) { + prop = SystemProperties.get("dalvik.vm.profilebootclasspath", ""); + } + if ("true".equals(prop)) { + Trace.traceBegin(Trace.TRACE_TAG_DALVIK, "ResetJitCounters"); + runtime.resetJitCounters(); + Trace.traceEnd(Trace.TRACE_TAG_DALVIK); + } + // Bring back root. We'll need it later if we're in the zygote. if (droppedPriviliges) { try { diff --git a/core/java/com/android/internal/util/BitUtils.java b/core/java/com/android/internal/util/BitUtils.java index b4bab809cc00..154ea52bf9ba 100644 --- a/core/java/com/android/internal/util/BitUtils.java +++ b/core/java/com/android/internal/util/BitUtils.java @@ -68,9 +68,9 @@ public final class BitUtils { int[] result = new int[size]; int index = 0; int bitPos = 0; - while (val > 0) { + while (val != 0) { if ((val & 1) == 1) result[index++] = bitPos; - val = val >> 1; + val = val >>> 1; bitPos++; } return result; @@ -79,7 +79,7 @@ public final class BitUtils { public static long packBits(int[] bits) { long packed = 0; for (int b : bits) { - packed |= (1 << b); + packed |= (1L << b); } return packed; } diff --git a/core/jni/android/graphics/Path.cpp b/core/jni/android/graphics/Path.cpp index d73affc057d1..1b2776525e47 100644 --- a/core/jni/android/graphics/Path.cpp +++ b/core/jni/android/graphics/Path.cpp @@ -132,14 +132,14 @@ public: static void addRect(JNIEnv* env, jclass clazz, jlong objHandle, jfloat left, jfloat top, jfloat right, jfloat bottom, jint dirHandle) { SkPath* obj = reinterpret_cast<SkPath*>(objHandle); - SkPath::Direction dir = static_cast<SkPath::Direction>(dirHandle); + SkPathDirection dir = static_cast<SkPathDirection>(dirHandle); obj->addRect(left, top, right, bottom, dir); } static void addOval(JNIEnv* env, jclass clazz, jlong objHandle, jfloat left, jfloat top, jfloat right, jfloat bottom, jint dirHandle) { SkPath* obj = reinterpret_cast<SkPath*>(objHandle); - SkPath::Direction dir = static_cast<SkPath::Direction>(dirHandle); + SkPathDirection dir = static_cast<SkPathDirection>(dirHandle); SkRect oval = SkRect::MakeLTRB(left, top, right, bottom); obj->addOval(oval, dir); } @@ -147,7 +147,7 @@ public: static void addCircle(JNIEnv* env, jclass clazz, jlong objHandle, jfloat x, jfloat y, jfloat radius, jint dirHandle) { SkPath* obj = reinterpret_cast<SkPath*>(objHandle); - SkPath::Direction dir = static_cast<SkPath::Direction>(dirHandle); + SkPathDirection dir = static_cast<SkPathDirection>(dirHandle); obj->addCircle(x, y, radius, dir); } @@ -162,7 +162,7 @@ public: jfloat right, jfloat bottom, jfloat rx, jfloat ry, jint dirHandle) { SkRect rect = SkRect::MakeLTRB(left, top, right, bottom); SkPath* obj = reinterpret_cast<SkPath*>(objHandle); - SkPath::Direction dir = static_cast<SkPath::Direction>(dirHandle); + SkPathDirection dir = static_cast<SkPathDirection>(dirHandle); obj->addRoundRect(rect, rx, ry, dir); } @@ -170,7 +170,7 @@ public: jfloat right, jfloat bottom, jfloatArray array, jint dirHandle) { SkRect rect = SkRect::MakeLTRB(left, top, right, bottom); SkPath* obj = reinterpret_cast<SkPath*>(objHandle); - SkPath::Direction dir = static_cast<SkPath::Direction>(dirHandle); + SkPathDirection dir = static_cast<SkPathDirection>(dirHandle); AutoJavaFloatArray afa(env, array, 8); #ifdef SK_SCALAR_IS_FLOAT const float* src = afa.ptr(); @@ -419,7 +419,7 @@ public: float errorSquared = acceptableError * acceptableError; float errorConic = acceptableError / 2; // somewhat arbitrary - while ((verb = pathIter.next(points, false)) != SkPath::kDone_Verb) { + while ((verb = pathIter.next(points)) != SkPath::kDone_Verb) { createVerbSegments(pathIter, verb, points, segmentPoints, lengths, errorSquared, errorConic); } @@ -555,8 +555,8 @@ static const JNINativeMethod methods[] = { int register_android_graphics_Path(JNIEnv* env) { return RegisterMethodsOrDie(env, "android/graphics/Path", methods, NELEM(methods)); - static_assert(0 == SkPath::kCW_Direction, "direction_mismatch"); - static_assert(1 == SkPath::kCCW_Direction, "direction_mismatch"); + static_assert(0 == (int)SkPathDirection::kCW, "direction_mismatch"); + static_assert(1 == (int)SkPathDirection::kCCW, "direction_mismatch"); } } diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 0cfb36b3f4d3..d181436d18f3 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -2451,4 +2451,14 @@ enum PageId { // CATEGORY: SETTINGS // OS: R SETTINGS_PLATFORM_COMPAT_DASHBOARD = 1805; + + // OPEN: Settings > Location -> Work profile tab + // CATEGORY: SETTINGS + // OS: R + LOCATION_WORK = 1806; + + // OPEN: Settings > Account -> Work profile tab + // CATEGORY: SETTINGS + // OS: R + ACCOUNT_WORK = 1807; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 220fdd2e889d..99dfffe51449 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -48,6 +48,7 @@ <protected-broadcast android:name="android.intent.action.PACKAGE_RESTARTED" /> <protected-broadcast android:name="android.intent.action.PACKAGE_DATA_CLEARED" /> <protected-broadcast android:name="android.intent.action.PACKAGE_FIRST_LAUNCH" /> + <protected-broadcast android:name="android.intent.action.PACKAGE_NEEDS_INTEGRITY_VERIFICATION" /> <protected-broadcast android:name="android.intent.action.PACKAGE_NEEDS_VERIFICATION" /> <protected-broadcast android:name="android.intent.action.PACKAGE_VERIFIED" /> <protected-broadcast android:name="android.intent.action.PACKAGES_SUSPENDED" /> @@ -108,8 +109,8 @@ <protected-broadcast android:name="android.app.action.ENTER_CAR_MODE" /> <protected-broadcast android:name="android.app.action.EXIT_CAR_MODE" /> - <protected-broadcast android:name="android.app.action.ENTER_CAR_MODE_PRIVILEGED" /> - <protected-broadcast android:name="android.app.action.EXIT_CAR_MODE_PRIVILEGED" /> + <protected-broadcast android:name="android.app.action.ENTER_CAR_MODE_PRIORITIZED" /> + <protected-broadcast android:name="android.app.action.EXIT_CAR_MODE_PRIORITIZED" /> <protected-broadcast android:name="android.app.action.ENTER_DESK_MODE" /> <protected-broadcast android:name="android.app.action.EXIT_DESK_MODE" /> <protected-broadcast android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" /> @@ -2269,7 +2270,7 @@ types of interactions @hide --> <permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" - android:protectionLevel="signature|installer|telephony|wifi" /> + android:protectionLevel="signature|installer|telephony" /> <!-- @SystemApi Allows an application to start its own activities, but on a different profile associated with the user. For example, an application running on the main profile of a user @@ -2951,7 +2952,7 @@ @hide --> <permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" - android:protectionLevel="signature|telephony|wifi" /> + android:protectionLevel="signature|telephony" /> <!-- @SystemApi Allows an application to use {@link android.view.WindowManager.LayoutsParams#SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS} @@ -3542,7 +3543,7 @@ <!-- Allows an application to manage the companion devices. @hide --> <permission android:name="android.permission.MANAGE_COMPANION_DEVICES" - android:protectionLevel="signature|wifi" /> + android:protectionLevel="signature" /> <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features. <p>Not for use by third-party applications. @@ -4595,10 +4596,17 @@ <!-- @SystemApi Allows an app to grant a profile owner access to device identifiers. <p>Not for use by third-party applications. + @deprecated @hide --> <permission android:name="android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS" android:protectionLevel="signature" /> + <!-- Allows an app to mark a profile owner as managing an organization-owned device. + <p>Not for use by third-party applications. + @hide --> + <permission android:name="android.permission.MARK_DEVICE_ORGANIZATION_OWNED" + android:protectionLevel="signature" /> + <!-- Allows financial apps to read filtered sms messages. Protection level: signature|appop --> <permission android:name="android.permission.SMS_FINANCIAL_TRANSACTIONS" diff --git a/core/res/res/layout/shutdown_dialog.xml b/core/res/res/layout/shutdown_dialog.xml index 2d214b32164b..ec67aa86bcc9 100644 --- a/core/res/res/layout/shutdown_dialog.xml +++ b/core/res/res/layout/shutdown_dialog.xml @@ -32,6 +32,19 @@ android:layout_height="32sp" android:text="@string/shutdown_progress" android:textDirection="locale" + android:textSize="18sp" + android:textAppearance="?attr/textAppearanceMedium" + android:gravity="center" + android:layout_marginBottom="24dp" + android:visibility="gone" + android:fontFamily="@string/config_headlineFontFamily"/> + + <TextView + android:id="@+id/text2" + android:layout_width="wrap_content" + android:layout_height="32sp" + android:text="@string/shutdown_progress" + android:textDirection="locale" android:textSize="24sp" android:textAppearance="?attr/textAppearanceLarge" android:gravity="center" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index db5b2cbeef85..d095690588f5 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Die werkprofiel se administrasieprogram ontbreek of is korrup. Gevolglik is jou werkprofiel en verwante data uitgevee. Kontak jou administrateur vir bystand."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Jou werkprofiel is nie meer op hierdie toestel beskikbaar nie"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Te veel wagwoordpogings"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Toestel word bestuur"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Jou organisasie bestuur hierdie toestel en kan netwerkverkeer monitor. Tik vir besonderhede."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Jou toestel sal uitgevee word"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Laai tans..."</string> <string name="capital_on" msgid="2770685323900821829">"AAN"</string> <string name="capital_off" msgid="7443704171014626777">"AF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"gemerk"</string> + <string name="not_checked" msgid="7972320087569023342">"nie gemerk nie"</string> <string name="whichApplication" msgid="5432266899591255759">"Voltooi handeling met"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Voltooi handeling met gebruik van %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Voltooi handeling"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 4e84c66aabed..75444ea595c2 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"የሥራ መገለጫ አስተዳዳሪ መተግበሪያው ወይም ይጎድላል ወይም ተበላሽቷል። በዚህ ምክንያት የሥራ መገለጫዎ እና ተዛማጅ ውሂብ ተሰርዘዋል። እርዳታን ለማግኘት አስተዳዳሪዎን ያነጋግሩ።"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"የሥራ መገለጫዎ ከዚህ በኋላ በዚህ መሣሪያ ላይ አይገኝም"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"በጣም ብዙ የይለፍ ቃል ሙከራዎች"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"መሣሪያው የሚተዳደር ነው"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"የእርስዎ ድርጅት ይህን መሣሪያ ያስተዳድራል፣ እና የአውታረ መረብ ትራፊክን ሊከታተል ይችላል። ዝርዝሮችን ለማግኘት መታ ያድርጉ።"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"የእርስዎ መሣሪያ ይደመሰሳል"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"በመጫን ላይ…"</string> <string name="capital_on" msgid="2770685323900821829">"በ"</string> <string name="capital_off" msgid="7443704171014626777">"ውጪ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ምልክት ተደርጎበታል"</string> + <string name="not_checked" msgid="7972320087569023342">"ምልክት አልተደረገበትም"</string> <string name="whichApplication" msgid="5432266899591255759">"... በመጠቀም ድርጊቱን አጠናቅ"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$sን ተጠቅመው እርምጃ ያጠናቅቁ"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"እርምጃውን አጠናቅቅ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"የተከፈለ ማያን ቀያይር"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"የማያ ገጽ ቁልፍ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ቅጽበታዊ ገጽ እይታ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"የ<xliff:g id="APP_NAME">%1$s</xliff:g> መተግበሪያ በብቅ-ባይ መስኮት ውስጥ።"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index bf9eeb2f78be..9928436b2a01 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -196,6 +196,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"تطبيق المشرف للملف الشخصي للعمل مفقود أو تالف لذا تم حذف الملف الشخصي للعمل والبيانات ذات الصلة. اتصل بالمشرف للحصول على المساعدة."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"لم يعد ملفك الشخصي للعمل متاحًا على هذا الجهاز"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"تم إجراء محاولات كثيرة جدًا لإدخال كلمة المرور"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"تتم إدارة الجهاز"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"تدير مؤسستك هذا الجهاز ويمكنها مراقبة حركة بيانات الشبكة. يمكنك النقر للحصول على تفاصيل."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"سيتم محو بيانات جهازك."</string> @@ -1196,10 +1198,8 @@ <string name="loading" msgid="3138021523725055037">"جارٍ التحميل…"</string> <string name="capital_on" msgid="2770685323900821829">"مفعّلة"</string> <string name="capital_off" msgid="7443704171014626777">"إيقاف"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"تم وضع علامة"</string> + <string name="not_checked" msgid="7972320087569023342">"لم يتم وضع علامة"</string> <string name="whichApplication" msgid="5432266899591255759">"إكمال الإجراء باستخدام"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"إكمال الإجراء باستخدام %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"إكمال الإجراء"</string> @@ -2140,6 +2140,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"تبديل \"تقسيم الشاشة\""</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"شاشة القفل"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"لقطة شاشة"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> في نافذة منبثقة"</string> </resources> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 7fa36deb967f..cfd62394fd79 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"কৰ্মস্থানৰ প্ৰ\'ফাইলৰ প্ৰশাসক এপ্ নাই বা ব্যৱহাৰযোগ্য হৈ থকা নাই। যাৰ ফলত আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল আৰু ইয়াৰ লগত জড়িত অন্য ডেটাসমূহ মচা হৈছে। সহায়ৰ বাবে আপোনাৰ প্ৰশাসকৰ সৈতে সম্পর্ক কৰক।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইল এই ডিভাইচটোত আৰু উপলব্ধ নহয়"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"বহুতবাৰ ভুলকৈ পাছৱৰ্ড দিয়া হৈছে"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"পৰিচালিত ডিভাইচ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"আপোনাৰ প্ৰতিষ্ঠানটোৱে এই ডিভাইচটো পৰিচালনা কৰে আৰু ই নেটৱৰ্কৰ ট্ৰেফিক পৰ্যবেক্ষণ কৰিব পাৰে। সবিশেষ জানিবলৈ টিপক।"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"আপোনাৰ ডিভাইচৰ ডেটা মচা হ\'ব"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ল\'ড কৰি থকা হৈছে…"</string> <string name="capital_on" msgid="2770685323900821829">"অন কৰক"</string> <string name="capital_off" msgid="7443704171014626777">"অফ কৰক"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"টিক চিহ্ন দিয়া হৈছে"</string> + <string name="not_checked" msgid="7972320087569023342">"টিক চিহ্ন দিয়া হোৱা নাই"</string> <string name="whichApplication" msgid="5432266899591255759">"এয়া ব্যৱহাৰ কৰি কার্য সম্পূর্ণ কৰক"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ব্যৱহাৰ কৰি কাৰ্যটো সম্পূৰ্ণ কৰক"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"কাৰ্য সম্পূৰ্ণ কৰক"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"বিভাজিত স্ক্ৰীন ট’গল কৰক"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"লক স্ক্ৰীন"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্ৰীণশ্বট"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"পপ আপ ৱিণ্ড’ত <xliff:g id="APP_NAME">%1$s</xliff:g> এপ্।"</string> </resources> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 85186faa8cf1..a26d49d79d28 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"İş profili admin tətbiqi ya yoxdur, ya da korlanıb. Nəticədə iş profili və onunla bağlı data silinib. Kömək üçün admin ilə əlaqə saxlayın."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"İş profili artıq bu cihazda əlçatan deyil"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Həddindən çox parol cəhdi"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Cihaz idarə olunur"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Təşkilat bu cihazı idarə edir və şəbəkənin ötürülməsinə nəzarət edə bilər. Detallar üçün klikləyin."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Cihazınız təmizlənəcəkdir"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Yüklənir…"</string> <string name="capital_on" msgid="2770685323900821829">"AÇIQ"</string> <string name="capital_off" msgid="7443704171014626777">"QAPALI"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"yoxlanılıb"</string> + <string name="not_checked" msgid="7972320087569023342">"yoxlanılmayıb"</string> <string name="whichApplication" msgid="5432266899591255759">"Əməliyyatı tamamlayın:"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s istifadə edərək əməliyyatı tamamlayın"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Əməliyyatı tamamlayın"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Bölünmüş Ekrana keçid"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Kilid Ekranı"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Ekran şəkli"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Açilən pəncərədə <xliff:g id="APP_NAME">%1$s</xliff:g> tətbiqi."</string> </resources> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index d576e8c7fc8d..6d0ae6bab591 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplikacija za administratore na profilu za Work nedostaje ili je oštećena. Zbog toga su profil za Work i povezani podaci izbrisani. Obratite se administratoru za pomoć."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Profil za Work više nije dostupan na ovom uređaju"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Previše pokušaja unosa lozinke"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Uređajem se upravlja"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organizacija upravlja ovim uređajem i može da nadgleda mrežni saobraćaj. Dodirnite za detalje."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Uređaj će biti obrisan"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Učitava se…"</string> <string name="capital_on" msgid="2770685323900821829">"DA"</string> <string name="capital_off" msgid="7443704171014626777">"NE"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"označeno je"</string> + <string name="not_checked" msgid="7972320087569023342">"nije označeno"</string> <string name="whichApplication" msgid="5432266899591255759">"Dovršavanje radnje pomoću"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Završite radnju pomoću aplikacije %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Završi radnju"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index f2fb72ee485f..390e8b190d92 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Праграма адміністратара для працоўнага профілю адсутнічае або пашкоджана. У выніку гэтага ваш працоўны профіль і звязаныя з ім даныя былі выдалены. Звярніцеся па дапамогу да адміністратара."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Ваш працоўны профіль больш не даступны на гэтай прыладзе"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Занадта шмат спроб уводу пароля"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Прылада знаходзіцца пад кіраваннем"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ваша арганізацыя кіруе гэтай прыладай і можа сачыць за сеткавым трафікам. Дакраніцеся для атрымання дадатковай інфармацыі."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Даныя вашай прылады будуць сцерты"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Загрузка..."</string> <string name="capital_on" msgid="2770685323900821829">"Уключыць"</string> <string name="capital_off" msgid="7443704171014626777">"Выключана"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"пазначана"</string> + <string name="not_checked" msgid="7972320087569023342">"не пазначана"</string> <string name="whichApplication" msgid="5432266899591255759">"Завяршыць дзеянне з дапамогай"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Завяршыць дзеянне з дапамогай %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Завяршыць дзеянне"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Пераключальнік падзеленага экрана"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Экран блакіроўкі"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Здымак экрана"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Праграма \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" ва ўсплывальным акне."</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index f89b985989df..d47229df5d40 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Приложението за администриране на служебния потребителски профил липсва или е повредено. В резултат на това той и свързаните с него данни са изтрити. За съдействие се свържете с администратора си."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Служебният ви потребителски профил вече не е налице на това устройство"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Опитите за паролата са твърде много"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Устройството се управлява"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Организацията ви управлява това устройство и може да наблюдава мрежовия трафик. Докоснете за подробности."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Данните на устройството ви ще бъдат изтрити"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Зарежда се..."</string> <string name="capital_on" msgid="2770685323900821829">"ВКЛ"</string> <string name="capital_off" msgid="7443704171014626777">"ИЗКЛ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"с отметка"</string> + <string name="not_checked" msgid="7972320087569023342">"без отметка"</string> <string name="whichApplication" msgid="5432266899591255759">"Изпълняване на действието чрез"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Завършване на действието посредством %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Изпълняване на действието"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Превключване на разделения екран"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Заключен екран"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Екранна снимка"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Приложението <xliff:g id="APP_NAME">%1$s</xliff:g> в изскачащ прозорец."</string> </resources> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 2086da70e8f5..a767a71265da 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"কর্মস্থলের প্রোফাইলের প্রশাসক অ্যাপটি হয় নেই, অথবা সেটি ক্ষতিগ্রস্ত হয়েছে৷ এর ফলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা মুছে ফেলা হয়েছে৷ সহায়তার জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন৷"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"আপনার কর্মস্থলের প্রোফাইলটি আর এই ডিভাইসে নেই"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"বহুবার ভুল পাসওয়ার্ড দিয়েছেন"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ডিভাইসটি পরিচালনা করা হচ্ছে"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে এবং এটির নেটওয়ার্ক ট্রাফিকের উপরে নজর রাখতে পারে। বিশদ বিবরণের জন্য ট্যাপ করুন।,"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"আপনার ডিভাইসটি মুছে ফেলা হবে"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"লোড হচ্ছে..."</string> <string name="capital_on" msgid="2770685323900821829">"চালু"</string> <string name="capital_off" msgid="7443704171014626777">"বন্ধ আছে"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"টিকচিহ্ন দেওয়া আছে"</string> + <string name="not_checked" msgid="7972320087569023342">"টিকচিহ্ন দেওয়া নেই"</string> <string name="whichApplication" msgid="5432266899591255759">"এটি ব্যবহার করে ক্রিয়াকলাপ সম্পূর্ণ করুন"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ব্যবহার করে ক্রিয়াকলাপ সম্পূর্ণ করুন"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ক্রিয়াকলাপ সম্পূর্ণ করুন"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"স্প্লিট স্ক্রিন টগল করুন"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"লক স্ক্রিন"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"স্ক্রিনশট"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"পপ-আপ উইন্ডোতে <xliff:g id="APP_NAME">%1$s</xliff:g> অ্যাপ।"</string> </resources> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index b30ea42659c9..f1c15001e6ae 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Nedostaje aplikacija administratora za radni profil ili je neispravna. Zbog toga su vaš radni profil i povezani podaci izbrisani. Obratite administratoru za pomoć."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Radni profil više nije dostupan na ovom uređaju"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Previše puta ste pokušali otključati uređaj"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Uređajem se upravlja."</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Vaša organizacija upravlja ovim uređajem i može pratiti mrežni saobraćaj. Dodirnite za detalje."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Uređaj će biti izbrisan"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Učitavanje..."</string> <string name="capital_on" msgid="2770685323900821829">"Uključeno"</string> <string name="capital_off" msgid="7443704171014626777">"Isključeno"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"označeno"</string> + <string name="not_checked" msgid="7972320087569023342">"nije označeno"</string> <string name="whichApplication" msgid="5432266899591255759">"Izvrši akciju koristeći"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Dovršite akciju koristeći %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Izvršiti akciju"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 560e49354b42..4b1940518584 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Falta l\'aplicació d\'administració del perfil professional o està malmesa. Com a conseqüència, s\'han suprimit el teu perfil professional i les dades relacionades. Contacta amb l\'administrador per obtenir ajuda."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"El teu perfil professional ja no està disponible en aquest dispositiu"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Has intentat introduir la contrasenya massa vegades"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"El dispositiu està gestionat"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"La teva organització gestiona aquest dispositiu i és possible que supervisi el trànsit de xarxa. Toca per obtenir més informació."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"El contingut del dispositiu s\'esborrarà"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"S\'està carregant…"</string> <string name="capital_on" msgid="2770685323900821829">"SÍ"</string> <string name="capital_off" msgid="7443704171014626777">"NO"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"seleccionat"</string> + <string name="not_checked" msgid="7972320087569023342">"no seleccionat"</string> <string name="whichApplication" msgid="5432266899591255759">"Completa l\'acció mitjançant"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Completa l\'acció amb %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Completa l\'acció"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Commuta Pantalla dividida"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Pantalla de bloqueig"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Captura de pantalla"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> a la finestra emergent."</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 9527c150e5ec..22fd4c6464ef 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplikace pro správu pracovního profilu chybí nebo je poškozena. Váš pracovní profil a související data proto byla smazána. Požádejte o pomoc administrátora."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Váš pracovní profil v tomto zařízení již není k dispozici"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Příliš mnoho pokusů o zadání hesla"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Zařízení je spravováno"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Toto zařízení je spravováno vaší organizací, která může sledovat síťový provoz. Podrobnosti zobrazíte klepnutím."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Zařízení bude vymazáno"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Načítání..."</string> <string name="capital_on" msgid="2770685323900821829">"I"</string> <string name="capital_off" msgid="7443704171014626777">"O"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"vybráno"</string> + <string name="not_checked" msgid="7972320087569023342">"nevybráno"</string> <string name="whichApplication" msgid="5432266899591255759">"Dokončit akci pomocí aplikace"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Dokončit akci pomocí aplikace %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Dokončit akci"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 852256e9c79f..4475a1bd3e13 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Administrationsappen til arbejdsprofilen mangler eller er beskadiget. Derfor er din arbejdsprofil og dine relaterede data blevet slettet. Kontakt din administrator for at få hjælp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Din arbejdsprofil er ikke længere tilgængelig på denne enhed"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"For mange mislykkede adgangskodeforsøg"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Dette er en administreret enhed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Din organisation administrerer denne enhed og kan overvåge netværkstrafik. Tryk for at se info."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Enheden slettes"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Indlæser…"</string> <string name="capital_on" msgid="2770685323900821829">"TIL"</string> <string name="capital_off" msgid="7443704171014626777">"FRA"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"slået til"</string> + <string name="not_checked" msgid="7972320087569023342">"slået fra"</string> <string name="whichApplication" msgid="5432266899591255759">"Brug"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Gennemfør handling ved hjælp af %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Afslut handling"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 8d86317b8bd2..2489fca648a9 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Die Admin-App für das Arbeitsprofil fehlt oder ist beschädigt. Daher wurden dein Arbeitsprofil und alle zugehörigen Daten gelöscht. Bitte wende dich für weitere Hilfe an deinen Administrator."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Dein Arbeitsprofil ist auf diesem Gerät nicht mehr verfügbar"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Zu viele falsche Passworteingaben"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Dies ist ein verwaltetes Gerät"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Deine Organisation verwaltet dieses Gerät und überprüft unter Umständen den Netzwerkverkehr. Tippe hier, um weitere Informationen zu erhalten."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Die Daten auf deinem Gerät werden gelöscht."</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Wird geladen…"</string> <string name="capital_on" msgid="2770685323900821829">"AN"</string> <string name="capital_off" msgid="7443704171014626777">"AUS"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"aktiviert"</string> + <string name="not_checked" msgid="7972320087569023342">"deaktiviert"</string> <string name="whichApplication" msgid="5432266899591255759">"Aktion durchführen mit"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Aktion mit %1$s abschließen"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Abschließen"</string> @@ -1539,7 +1539,7 @@ <string name="launchBrowserDefault" msgid="6328349989932924119">"Browser starten?"</string> <string name="SetupCallDefault" msgid="5581740063237175247">"Anruf annehmen?"</string> <string name="activity_resolver_use_always" msgid="5575222334666843269">"Immer"</string> - <string name="activity_resolver_set_always" msgid="4142825808921411476">"Auf \"Immer öffnen\" festlegen"</string> + <string name="activity_resolver_set_always" msgid="4142825808921411476">"Immer damit öffnen"</string> <string name="activity_resolver_use_once" msgid="948462794469672658">"Nur diesmal"</string> <string name="activity_resolver_app_settings" msgid="6758823206817748026">"Einstellungen"</string> <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"Das Arbeitsprofil wird von %1$s nicht unterstützt."</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 890a54881dee..6c76a1f3d2ef 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Η εφαρμογή διαχείρισης προφίλ εργασίας είτε λείπει είτε είναι κατεστραμμένη. Ως αποτέλεσμα, διαγράφηκε το προφίλ εργασίας και τα σχετικά δεδομένα. Επικοινωνήστε με τον διαχειριστή σας για βοήθεια."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Το προφίλ εργασίας σας δεν είναι πια διαθέσιμο σε αυτήν τη συσκευή"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Πάρα πολλές προσπάθειες εισαγωγής κωδικού πρόσβασης"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Η συσκευή είναι διαχειριζόμενη"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ο οργανισμός σας διαχειρίζεται αυτήν τη συσκευή και ενδέχεται να παρακολουθεί την επισκεψιμότητα δικτύου. Πατήστε για λεπτομέρειες."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Η συσκευή σας θα διαγραφεί"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Φόρτωση…"</string> <string name="capital_on" msgid="2770685323900821829">"Ενεργό"</string> <string name="capital_off" msgid="7443704171014626777">"Ανενεργό"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"επιλεγμένο"</string> + <string name="not_checked" msgid="7972320087569023342">"μη επιλεγμένο"</string> <string name="whichApplication" msgid="5432266899591255759">"Ολοκλήρωση ενέργειας με τη χρήση"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Ολοκληρωμένη ενέργεια με χρήση %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Ολοκλήρωση ενέργειας"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 468b9a3333db..e5f610b4629c 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Your work profile is no longer available on this device"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Too many password attempts"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organisation manages this device and may monitor network traffic. Tap for details."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Loading…"</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ticked"</string> + <string name="not_checked" msgid="7972320087569023342">"not ticked"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 2c715772d0a0..2cff16f93942 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Your work profile is no longer available on this device"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Too many password attempts"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organisation manages this device and may monitor network traffic. Tap for details."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Loading…"</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ticked"</string> + <string name="not_checked" msgid="7972320087569023342">"not ticked"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 468b9a3333db..e5f610b4629c 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Your work profile is no longer available on this device"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Too many password attempts"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organisation manages this device and may monitor network traffic. Tap for details."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Loading…"</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ticked"</string> + <string name="not_checked" msgid="7972320087569023342">"not ticked"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 468b9a3333db..e5f610b4629c 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Your work profile is no longer available on this device"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Too many password attempts"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organisation manages this device and may monitor network traffic. Tap for details."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Loading…"</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ticked"</string> + <string name="not_checked" msgid="7972320087569023342">"not ticked"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 03ed6a5c8de3..6d536e43a26c 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Your work profile is no longer available on this device"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Too many password attempts"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Device is managed"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Your organization manages this device and may monitor network traffic. Tap for details."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Your device will be erased"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Loading…"</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"checked"</string> + <string name="not_checked" msgid="7972320087569023342">"not checked"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete action using"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Complete action using %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Complete action"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 6d0caff65dbb..3b9c7ad74957 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"La app de administración de perfil de trabajo no se encuentra o está dañada. Por lo tanto, se borraron tu perfil de trabajo y los datos relacionados. Para obtener asistencia, comunícate con el administrador."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Tu perfil de trabajo ya no está disponible en este dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Demasiados intentos para ingresar la contraseña"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Dispositivo administrado"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Tu organización administra este dispositivo y es posible que controle el tráfico de red. Presiona para obtener más información."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Se borrarán los datos del dispositivo"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Cargando…"</string> <string name="capital_on" msgid="2770685323900821829">"Sí"</string> <string name="capital_off" msgid="7443704171014626777">"No"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"activado"</string> + <string name="not_checked" msgid="7972320087569023342">"desactivado"</string> <string name="whichApplication" msgid="5432266899591255759">"Completar la acción mediante"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Completar acción con %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Completar acción"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index ca5097bf3356..2e749043299a 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Falta la aplicación de administración del perfil de trabajo o está dañada. Por ello, se han eliminado tu perfil de trabajo y los datos relacionados. Ponte en contacto con el administrador para obtener ayuda."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Tu perfil de trabajo ya no está disponible en este dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Has fallado demasiadas veces al introducir la contraseña"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"El dispositivo está administrado"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Tu organización administra este dispositivo y puede supervisar el tráfico de red. Toca la notificación para obtener más información."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Tu dispositivo se borrará"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Cargando..."</string> <string name="capital_on" msgid="2770685323900821829">"ACTIVADO"</string> <string name="capital_off" msgid="7443704171014626777">"DESACTIVADO"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"seleccionado"</string> + <string name="not_checked" msgid="7972320087569023342">"no seleccionado"</string> <string name="whichApplication" msgid="5432266899591255759">"Completar acción utilizando"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Completar acción con %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Completar acción"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 6b01527df2c8..85612549de25 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Tööprofiili administraatori rakendus puudub või on rikutud. Seetõttu on teie tööprofiil ja seotud andmed kustutatud. Abi saamiseks võtke ühendust administraatoriga."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Teie tööprofiil pole selles seadmes enam saadaval"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Liiga palju paroolikatseid"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Seade on hallatud"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Teie organisatsioon haldab seda seadet ja võib jälgida võrguliiklust. Puudutage üksikasjade vaatamiseks."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Seade kustutatakse"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Laadimine ..."</string> <string name="capital_on" msgid="2770685323900821829">"SEES"</string> <string name="capital_off" msgid="7443704171014626777">"VÄLJAS"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"märgitud"</string> + <string name="not_checked" msgid="7972320087569023342">"märkimata"</string> <string name="whichApplication" msgid="5432266899591255759">"Lõpetage toiming rakendusega"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Toimingu lõpetamine, kasutades rakendust %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Vii toiming lõpule"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Vaheta jagatud ekraanikuva"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Lukustuskuva"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Ekraanipilt"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> on hüpikaknas."</string> </resources> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 66672ddf6ab0..263b5ed7e232 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Laneko profila administratzeko aplikazioa falta da edo hondatuta dago. Ondorioz, ezabatu egin dira laneko profila bera eta harekin erlazionatutako datuak. Laguntza lortzeko, jarri administratzailearekin harremanetan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Laneko profila ez dago erabilgarri gailu honetan"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Gehiegitan saiatu zara pasahitza idazten"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Jabeak kudeatzen du gailua"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Erakundeak kudeatzen du gailua eta baliteke sareko trafikoa gainbegiratzea. Sakatu hau xehetasunak ikusteko."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Gailuko datuak ezabatu egingo dira"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Kargatzen…"</string> <string name="capital_on" msgid="2770685323900821829">"AKTIBATUTA"</string> <string name="capital_off" msgid="7443704171014626777">"DESAKTIBATUTA"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"markatuta"</string> + <string name="not_checked" msgid="7972320087569023342">"markatu gabe"</string> <string name="whichApplication" msgid="5432266899591255759">"Gauzatu ekintza hau erabilita:"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Osatu ekintza %1$s erabiliz"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Osatu ekintza"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index c10dba53dd66..997b6aff7835 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"برنامه سرپرست نمایه کاری یا وجود ندارد یا خراب است. در نتیجه، نمایه کاری شما و دادههای مرتبط با آن حذف شده است. برای دریافت راهنمایی با سرپرست سیستم تماس بگیرید."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"نمایه کاری شما دیگر در این دستگاه دردسترس نیست"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"تلاشهای بسیار زیادی برای وارد کردن گذرواژه انجام شده است"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"دستگاه مدیریت میشود"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"سازمانتان این دستگاه را مدیریت میکند و ممکن است ترافیک شبکه را پایش کند. برای اطلاع از جزئیات، ضربه بزنید."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"دستگاهتان پاک خواهد شد"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"درحال بارکردن…"</string> <string name="capital_on" msgid="2770685323900821829">"روشن"</string> <string name="capital_off" msgid="7443704171014626777">"خاموش"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"علامتزدهشده"</string> + <string name="not_checked" msgid="7972320087569023342">"بدون علامت"</string> <string name="whichApplication" msgid="5432266899591255759">"تکمیل عملکرد با استفاده از"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"تکمیل عملکرد با استفاده از %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"تکمیل عملکرد"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"تغییر وضعیت صفحهٔ دونیمه"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"صفحه قفل"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"عکس صفحهنمایش"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"برنامه <xliff:g id="APP_NAME">%1$s</xliff:g> در پنجره بالاپر."</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 35addd127aad..86badf6dbf89 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Työprofiilin hallintasovellus puuttuu tai se on vioittunut. Tästä syystä työprofiilisi ja siihen liittyvät tiedot on poistettu. Pyydä ohjeita järjestelmänvalvojaltasi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Työprofiilisi ei ole enää käytettävissä tällä laitteella."</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Liikaa salasanayrityksiä"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Hallinnoitu laite"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organisaatiosi hallinnoi tätä laitetta ja voi tarkkailla verkkoliikennettä. Katso lisätietoja napauttamalla."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Laitteen tiedot poistetaan"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Ladataan…"</string> <string name="capital_on" msgid="2770685323900821829">"PÄÄLLÄ"</string> <string name="capital_off" msgid="7443704171014626777">"POIS"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"valittu"</string> + <string name="not_checked" msgid="7972320087569023342">"ei valittu"</string> <string name="whichApplication" msgid="5432266899591255759">"Tee toiminto käyttäen sovellusta"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Suorita sovelluksella %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Suorita toiminto"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 39dd90550956..2b890656d5dc 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Le profil professionnel de l\'application d\'administration est manquant ou corrompu. Votre profil professionnel et ses données connexes ont donc été supprimés. Communiquez avec votre administrateur pour obtenir de l\'assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Votre profil professionnel n\'est plus accessible sur cet appareil"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Trop de tentatives d\'entrée du mot de passe"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"L\'appareil est géré"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Votre organisation gère cet appareil et peut surveiller le trafic réseau. Touchez ici pour obtenir plus d\'information."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Le contenu de votre appareil sera effacé"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Chargement en cours..."</string> <string name="capital_on" msgid="2770685323900821829">"OUI"</string> <string name="capital_off" msgid="7443704171014626777">"NON"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"coché"</string> + <string name="not_checked" msgid="7972320087569023342">"non coché"</string> <string name="whichApplication" msgid="5432266899591255759">"Continuer avec"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Continuer avec %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Terminer l\'action"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Basculer l\'écran partagé"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Écran de verrouillage"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Capture d\'écran"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Application <xliff:g id="APP_NAME">%1$s</xliff:g> dans une fenêtre contextuelle."</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index edc050c11cf9..7522b5aa26fb 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"L\'application d\'administration du profil professionnel est manquante ou endommagée. Par conséquent, votre profil professionnel et toutes les données associées ont été supprimés. Pour obtenir de l\'aide, contactez l\'administrateur."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Votre profil professionnel n\'est plus disponible sur cet appareil"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Trop de tentatives de saisie du mot de passe"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"L\'appareil est géré"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Votre organisation gère cet appareil et peut surveiller le trafic réseau. Appuyez ici pour obtenir plus d\'informations."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Les données de votre appareil vont être effacées"</string> @@ -1066,7 +1068,7 @@ <string name="selectAll" msgid="1532369154488982046">"Tout sélectionner"</string> <string name="cut" msgid="2561199725874745819">"Couper"</string> <string name="copy" msgid="5472512047143665218">"Copier"</string> - <string name="failed_to_copy_to_clipboard" msgid="725919885138539875">"Échec de la copie dans le Presse-papiers"</string> + <string name="failed_to_copy_to_clipboard" msgid="725919885138539875">"Échec de la copie dans le presse-papiers"</string> <string name="paste" msgid="461843306215520225">"Coller"</string> <string name="paste_as_plain_text" msgid="7664800665823182587">"Coller au format texte brut"</string> <string name="replace" msgid="7842675434546657444">"Remplacer..."</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Chargement…"</string> <string name="capital_on" msgid="2770685323900821829">"OUI"</string> <string name="capital_off" msgid="7443704171014626777">"NON"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"activé"</string> + <string name="not_checked" msgid="7972320087569023342">"désactivé"</string> <string name="whichApplication" msgid="5432266899591255759">"Continuer avec"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Terminer l\'action avec %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Terminer l\'action"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 583cadf3b8d5..4d40e214b1ba 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Falta a aplicación de administración do perfil de traballo ou ben está danada. Como resultado, eliminouse o teu perfil de traballo e os datos relacionados. Para obter asistencia, contacta co administrador."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"O teu perfil de traballo xa non está dispoñible neste dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Demasiados intentos de introdución do contrasinal"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"O dispositivo está xestionado"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"A túa organización xestiona este dispositivo e pode controlar o tráfico de rede. Toca para obter máis detalles."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Borrarase o teu dispositivo"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Cargando..."</string> <string name="capital_on" msgid="2770685323900821829">"SI"</string> <string name="capital_off" msgid="7443704171014626777">"NON"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"seleccionado"</string> + <string name="not_checked" msgid="7972320087569023342">"non seleccionado"</string> <string name="whichApplication" msgid="5432266899591255759">"Completar a acción usando"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Completar a acción usando %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Completar acción"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Activar/desactivar pantalla dividida"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Pantalla de bloqueo"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Captura de pantalla"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> nunha ventá emerxente."</string> </resources> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index de315426c78c..ea3a573d7115 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"કાર્ય પ્રોફાઇલ વ્યવસ્થાપક ઍપ્લિકેશન ખૂટે છે અથવા તો દૂષિત છે. પરિણામે, તમારી કાર્યાલયની પ્રોફાઇલ અને તે સંબંધિત ડેટા કાઢી નાખવામાં આવ્યો છે. સહાયતા માટે તમારા વ્યવસ્થાપકનો સંપર્ક કરો."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"આ ઉપકરણ પર તમારી કાર્યાલયની પ્રોફાઇલ હવે ઉપલબ્ધ નથી"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"પાસવર્ડના ઘણા વધુ પ્રયત્નો"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ઉપકરણ સંચાલિત છે"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"તમારી સંસ્થા આ ઉપકરણનું સંચાલન કરે છે અને નેટવર્ક ટ્રાફિફનું નિયમન કરી શકે છે. વિગતો માટે ટૅપ કરો."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"તમારું ઉપકરણ કાઢી નાખવામાં આવશે"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"લોડ કરી રહ્યું છે…"</string> <string name="capital_on" msgid="2770685323900821829">"ચાલુ"</string> <string name="capital_off" msgid="7443704171014626777">"બંધ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ચેક કર્યું"</string> + <string name="not_checked" msgid="7972320087569023342">"ચેક કર્યું નથી"</string> <string name="whichApplication" msgid="5432266899591255759">"આના ઉપયોગથી ક્રિયા પૂર્ણ કરો"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ઉપયોગથી ક્રિયા પૂર્ણ કરો"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ક્રિયા પૂર્ણ કરો"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"સ્ક્રીનને વિભાજિત કરવાની ક્રિયા ટૉગલ કરો"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"લૉક સ્ક્રીન"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"સ્ક્રીનશૉટ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"પૉપ-અપ વિંડોમાં <xliff:g id="APP_NAME">%1$s</xliff:g> ઍપ."</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 5a422d8ad3af..e12fa08010b7 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"वर्क प्रोफ़ाइल व्यवस्थापक ऐप्लिकेशन या तो मौजूद नहीं है या वह खराब हो गया है. परिणामस्वरूप, आपकी वर्क प्रोफ़ाइल और उससे जुड़े डेटा को हटा दिया गया है. सहायता के लिए अपने व्यवस्थापक से संपर्क करें."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"आपकी वर्क प्रोफ़ाइल अब इस डिवाइस पर उपलब्ध नहीं है"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"कई बार गलत पासवर्ड डाला गया"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"डिवाइस प्रबंधित है"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"आपका संगठन इस डिवाइस का प्रबंधन करता है और वह नेटवर्क ट्रैफ़िक की निगरानी भी कर सकता है. विवरण के लिए टैप करें."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"आपके डिवाइस को मिटा दिया जाएगा"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"लोड हो रहे हैं..."</string> <string name="capital_on" msgid="2770685323900821829">"ऑन"</string> <string name="capital_off" msgid="7443704171014626777">"बंद"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"चालू है"</string> + <string name="not_checked" msgid="7972320087569023342">"बंद है"</string> <string name="whichApplication" msgid="5432266899591255759">"इसका इस्तेमाल करके कार्रवाई को पूरा करें"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s का उपयोग करके कार्रवाई पूरी करें"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"कार्रवाई पूरी करें"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"स्प्लिट स्क्रीन पर टॉगल करें"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"स्क्रीन लॉक करें"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"स्क्रीनशॉट लें"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"पॉप-अप विंडो में <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन."</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index ed7234bc49e0..0871d06bceff 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Administratorska aplikacija radnog profila nedostaje ili je oštećena. Zbog toga su radni profil i povezani podaci izbrisani. Za pomoć se obratite svom administratoru."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Vaš radni profil više nije dostupan na ovom uređaju"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Previše pokušaja unosa zaporke"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Uređaj je upravljan"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Vaša organizacija upravlja ovim uređajem i može nadzirati mrežni promet. Dodirnite za pojedinosti."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Uređaj će se izbrisati"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Učitavanje…"</string> <string name="capital_on" msgid="2770685323900821829">"Uklj."</string> <string name="capital_off" msgid="7443704171014626777">"Isklj."</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"potvrđeno"</string> + <string name="not_checked" msgid="7972320087569023342">"nije potvrđeno"</string> <string name="whichApplication" msgid="5432266899591255759">"Radnju dovrši pomoću stavke"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Dovršavanje radnje pomoću aplikacije %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Dovrši radnju"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index aab529824b1a..ce11fc628693 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"A munkaprofil rendszergazdai alkalmazása hiányzik vagy sérült. A rendszer ezért törölte a munkaprofilt, és az ahhoz kapcsolódó adatokat. Ha segítségre van szüksége, vegye fel a kapcsolatot rendszergazdájával."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Munkaprofilja már nem hozzáférhető ezen az eszközön."</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Túl sok jelszómegadási kísérlet"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Felügyelt eszköz"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ezt az eszközt szervezete kezeli, és lehetséges, hogy a hálózati forgalmat is figyelik. További részletekért koppintson."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"A rendszer törölni fogja eszközét"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Betöltés..."</string> <string name="capital_on" msgid="2770685323900821829">"Be"</string> <string name="capital_off" msgid="7443704171014626777">"Ki"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"kiválasztva"</string> + <string name="not_checked" msgid="7972320087569023342">"nincs kiválasztva"</string> <string name="whichApplication" msgid="5432266899591255759">"Művelet végrehajtása a következővel:"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Művelet elvégzése a(z) %1$s segítségével"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Művelet végrehajtása"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index ee461f50a24a..629b225072e0 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Աշխատանքային պրոֆիլի ադմինիստրատորի հավելվածը բացակայում է կամ վնասված է: Արդյունքում ձեր աշխատանքային պրոֆիլը և առնչվող տվյալները ջնջվել են: Օգնության համար դիմեք ձեր ադմինիստրատորին:"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Ձեր աշխատանքային պրոֆիլն այս սարքում այլևս հասանելի չէ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Գաղտնաբառը մուտքագրելու չափից շատ փորձեր են կատարվել"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Սարքը կառավարվում է"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ձեր կազմակերպությունը կառավարում է այս սարքը և կարող է վերահսկել ցանցի թրաֆիկը: Հպեք՝ մանրամասները դիտելու համար:"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Ձեր սարքը ջնջվելու է"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Բեռնում..."</string> <string name="capital_on" msgid="2770685323900821829">"I"</string> <string name="capital_off" msgid="7443704171014626777">"O"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"նշված է"</string> + <string name="not_checked" msgid="7972320087569023342">"նշված չէ"</string> <string name="whichApplication" msgid="5432266899591255759">"Ավարտել գործողությունը` օգտագործելով"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Եզրափակել գործողությունը՝ օգտագործելով %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Ավարտել գործողությունը"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Միացնել/անջատել էկրանի տրոհումը"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Կողպէկրան"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Սքրինշոթ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածը ելնող պատուհանում։"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index ece3a6c260cc..f99c1076de17 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplikasi admin profil kerja tidak ada atau rusak. Akibatnya, profil kerja dan data terkait telah dihapus. Hubungi admin untuk meminta bantuan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Profil kerja tidak tersedia lagi di perangkat ini"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Terlalu banyak percobaan memasukkan sandi"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Perangkat ini ada yang mengelola"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organisasi mengelola perangkat ini dan mungkin memantau traffic jaringan. Ketuk untuk melihat detailnya."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Perangkat akan dihapus"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Memuat..."</string> <string name="capital_on" msgid="2770685323900821829">"AKTIF"</string> <string name="capital_off" msgid="7443704171014626777">"MATI"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"dicentang"</string> + <string name="not_checked" msgid="7972320087569023342">"tidak dicentang"</string> <string name="whichApplication" msgid="5432266899591255759">"Tindakan lengkap menggunakan"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Selesaikan tindakan menggunakan %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Selesaikan tindakan"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 3bcdda63a404..0f4d6de4d399 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Stjórnunarforrit vinnusniðsins vantar eða er skemmt. Vinnusniðinu og gögnum því tengdu hefur því verið eytt. Hafðu samband við kerfisstjórann til að fá frekari aðstoð."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Vinnusniðið þitt er ekki lengur í boði á þessu tæki"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Of margar tilraunir til að slá inn aðgangsorð"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Tækinu er stjórnað"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Fyrirtækið þitt stjórnar þessu tæki og kann að fylgjast með netnotkun. Ýttu hér til að fá upplýsingar."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Tækið verður hreinsað"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Hleður…"</string> <string name="capital_on" msgid="2770685323900821829">"KVEIKT"</string> <string name="capital_off" msgid="7443704171014626777">"SLÖKKT"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"valið"</string> + <string name="not_checked" msgid="7972320087569023342">"ekki valið"</string> <string name="whichApplication" msgid="5432266899591255759">"Ljúka aðgerð með"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Ljúka aðgerð með %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Ljúka aðgerð"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Breyta skjáskiptingu"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Lásskjár"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Skjámynd"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Forritið <xliff:g id="APP_NAME">%1$s</xliff:g> í sprettiglugga."</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 01bb13665aee..f14e8582b374 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"L\'app di amministrazione dei profili di lavoro manca o è danneggiata. Di conseguenza, il tuo profilo di lavoro e i relativi dati sono stati eliminati. Contatta l\'amministratore per ricevere assistenza."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Il tuo profilo di lavoro non è più disponibile sul dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Troppi tentativi di inserimento della password"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Il dispositivo è gestito"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Questo dispositivo è gestito dalla tua organizzazione, che potrebbe monitorare il traffico di rete. Tocca per i dettagli."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Il dispositivo verrà resettato"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Caricamento..."</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"selezionato"</string> + <string name="not_checked" msgid="7972320087569023342">"deselezionato"</string> <string name="whichApplication" msgid="5432266899591255759">"Completa l\'azione con"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Completamento azione con %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Completa azione"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index ed2e66a03f3b..375d7d110a6b 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"אפליקציית הניהול של פרופיל העבודה חסרה או פגומה. כתוצאה מכך, פרופיל העבודה שלך נמחק, כולל כל הנתונים הקשורים אליו. לקבלת עזרה, פנה למנהל המערכת."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"פרופיל העבודה שלך אינו זמין עוד במכשיר הזה"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"בוצעו ניסיונות רבים מדי להזנת סיסמה"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"המכשיר מנוהל"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"הארגון שלך מנהל מכשיר זה ועשוי לנטר את התנועה ברשת. הקש לקבלת פרטים."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"תתבצע מחיקה של המכשיר"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"טוען..."</string> <string name="capital_on" msgid="2770685323900821829">"מופעל"</string> <string name="capital_off" msgid="7443704171014626777">"כבוי"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"מסומן"</string> + <string name="not_checked" msgid="7972320087569023342">"לא מסומן"</string> <string name="whichApplication" msgid="5432266899591255759">"השלמת פעולה באמצעות"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"להשלמת הפעולה באמצעות %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"השלם פעולה"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"החלפת מצב של מסך מפוצל"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"מסך הנעילה"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"צילום מסך"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> בחלון קופץ."</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 7ad1bc2aad1c..eb990ec02f87 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"仕事用プロファイルの管理アプリがないか、破損しています。そのため仕事用プロファイルと関連データが削除されました。管理者にサポートをご依頼ください。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"お使いの仕事用プロファイルはこのデバイスで使用できなくなりました"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"パスワード入力回数が上限を超えました"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"管理対象のデバイス"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"このデバイスは組織によって管理され、ネットワーク トラフィックが監視される場合があります。詳しくはタップしてください。"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"デバイスのデータが消去されます"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"読み込んでいます..."</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ON"</string> + <string name="not_checked" msgid="7972320087569023342">"OFF"</string> <string name="whichApplication" msgid="5432266899591255759">"アプリケーションを選択"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$sを使用してアクションを完了"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"アクションを実行"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"分割画面の切り替え"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ロック画面"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"スクリーンショット"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> アプリがポップアップ ウィンドウで開きます。"</string> </resources> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 7e4035d8d4b0..d2d1fed80059 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"სამსახურის პროფილის ადმინისტრატორის აპი მიუწვდომელია ან დაზიანებულია. ამის გამო, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები წაიშალა. დახმარებისთვის დაუკავშირდით თქვენს ადმინისტრატორს."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"თქვენი სამსახურის პროფილი აღარ არის ხელმისაწვდომი ამ მოწყობილობაზე"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"დაფიქსირდა პაროლის შეყვანის ზედმეტად ბევრი მცდელობა"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"მოწყობილობა მართულია"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ამ მოწყობილობას თქვენი ორგანიზაცია მართავს და მას ქსელის ტრაფიკის მონიტორინგი შეუძლია. შეეხეთ დამატებითი დეტალებისთვის."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"თქვენი მოწყობილობა წაიშლება"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ჩატვირთვა…"</string> <string name="capital_on" msgid="2770685323900821829">"ჩართ."</string> <string name="capital_off" msgid="7443704171014626777">"გამორთ."</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"მონიშნულია"</string> + <string name="not_checked" msgid="7972320087569023342">"არ არის მონიშნული"</string> <string name="whichApplication" msgid="5432266899591255759">"რა გამოვიყენოთ?"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"მოქმედების %1$s-ის გამოყენებით დასრულება"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"მოქმედების დასრულება"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"გაყოფილი ეკრანის გადართვა"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ჩაკეტილი ეკრანი"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ეკრანის ანაბეჭდი"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> აპი ამომხტარ ფანჯარაში."</string> </resources> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 661f7c1bce07..a1002f719a55 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Жұмыс профилінің әкімші қолданбасы жоқ немесе бүлінген. Нәтижесінде жұмыс профиліңіз және қатысты деректер жойылды. Көмек алу үшін әкімшіге хабарласыңыз."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Жұмыс профиліңіз осы құрылғыда енді қолжетімді емес"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Құпия сөз көп рет қате енгізілді"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Құрылғы басқарылады"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ұйымыңыз осы құрылғыны басқарады және желі трафигін бақылауы мүмкін. Мәліметтер алу үшін түртіңіз."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Құрылғыңыздағы деректер өшіріледі"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Жүктелуде…"</string> <string name="capital_on" msgid="2770685323900821829">"Қосулы"</string> <string name="capital_off" msgid="7443704171014626777">"Өшірулі"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"белгіленген"</string> + <string name="not_checked" msgid="7972320087569023342">"белгіленбеген"</string> <string name="whichApplication" msgid="5432266899591255759">"Әрекетті аяқтау"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Әрекетті %1$s қолданбасын пайдаланып аяқтау"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Әрекетті аяқтау"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Экранды бөлу мүмкіндігін қосу/өшіру"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Құлып экраны"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Скриншот"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Қалқымалы терезедегі <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы"</string> </resources> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index ded29998917b..61a3ec6fb444 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"កម្មវិធីអ្នកគ្រប់គ្រងកម្រងព័ត៌មានការងារនេះអាចបាត់ ឬមានបញ្ហា។ ដូច្នេះហើយទើបកម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធត្រូវបានលុប។ សូមទាក់ទងទៅអ្នកគ្រប់គ្រងរបស់អ្នក ដើម្បីទទួលបានជំនួយ។"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"កម្រងព័ត៌មានការងាររបស់អ្នកលែងមាននៅលើឧបករណ៍នេះទៀតហើយ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ការព្យាយាមបញ្ចូលពាក្យសម្ងាត់ច្រើនដងពេកហើយ"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ឧបករណ៍ស្ថិតក្រោមការគ្រប់គ្រង"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ស្ថាប័នរបស់អ្នកគ្រប់គ្រងឧបករណ៍នេះ ហើយអាចនឹងតាមដានចរាចរណ៍បណ្តាញ។ ចុចដើម្បីទទួលបានព័ត៌មានលម្អិត។"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ឧបករណ៍របស់អ្នកនឹងត្រូវបានលុប"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"កំពុងផ្ទុក..."</string> <string name="capital_on" msgid="2770685323900821829">"បើក"</string> <string name="capital_off" msgid="7443704171014626777">"បិទ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"បានធីក"</string> + <string name="not_checked" msgid="7972320087569023342">"មិនបានធីក"</string> <string name="whichApplication" msgid="5432266899591255759">"បញ្ចប់សកម្មភាពដោយប្រើ"</string> <!-- String.format failed for translation --> <!-- no translation found for whichApplicationNamed (6969946041713975681) --> @@ -2006,6 +2006,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"បិទ/បើកមុខងារបំបែកអេក្រង់"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"អេក្រង់ចាក់សោ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"រូបថតអេក្រង់"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"កម្មវិធី <xliff:g id="APP_NAME">%1$s</xliff:g> នៅក្នុងវិនដូលោតឡើង។"</string> </resources> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 10930af4069c..5524d400027f 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್ ಕಳೆದು ಹೋಗಿದೆ ಅಥವಾ ಹಾಳಾಗಿದೆ. ಇದರ ಪರಿಣಾಮವಾಗಿ ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಅದಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗಿದೆ. ಸಹಾಯಕ್ಕಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ನಿಮ್ಮ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಈ ಸಾಧನದಲ್ಲಿ ಈಗ ಲಭ್ಯವಿಲ್ಲ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ಹಲವಾರು ಪಾಸ್ವರ್ಡ್ ಪ್ರಯತ್ನಗಳು"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗುತ್ತಿದೆ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ಈ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸುತ್ತದೆ ಮತ್ತು ಅದು ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ ಮೇಲೆ ಗಮನವಿರಿಸಬಹುದು. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string> <string name="capital_on" msgid="2770685323900821829">"ಆನ್ ಮಾಡಿ"</string> <string name="capital_off" msgid="7443704171014626777">"ಆಫ್ ಮಾಡು"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ಪರಿಶೀಲಿಸಲಾಗಿದೆ"</string> + <string name="not_checked" msgid="7972320087569023342">"ಪರಿಶೀಲಿಸಲಾಗಿಲ್ಲ"</string> <string name="whichApplication" msgid="5432266899591255759">"ಇದನ್ನು ಬಳಸಿಕೊಂಡು ಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ಬಳಸಿಕೊಂಡು ಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"ಸ್ಪ್ಲಿಟ್-ಸ್ಕ್ರೀನ್ ಟಾಗಲ್ ಮಾಡಿ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ಲಾಕ್ ಸ್ಕ್ರೀನ್"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"ಪಾಪ್-ಅಪ್ ಸ್ಪೇಸ್ ವಿಂಡೋದಲ್ಲಿ <xliff:g id="APP_NAME">%1$s</xliff:g> ಆ್ಯಪ್."</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 431af176e0ac..423dbd6749cb 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"직장 프로필 관리 앱이 없거나 손상되어 직장 프로필 및 관련 데이터가 삭제되었습니다. 도움이 필요한 경우 관리자에게 문의하세요."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"직장 프로필을 이 기기에서 더 이상 사용할 수 없습니다."</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"비밀번호 입력을 너무 많이 시도함"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"관리되는 기기"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"조직에서 이 기기를 관리하며 네트워크 트래픽을 모니터링할 수도 있습니다. 자세한 내용을 보려면 탭하세요."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"기기가 삭제됩니다."</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"로드 중.."</string> <string name="capital_on" msgid="2770685323900821829">"ON"</string> <string name="capital_off" msgid="7443704171014626777">"OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"선택함"</string> + <string name="not_checked" msgid="7972320087569023342">"선택 안함"</string> <string name="whichApplication" msgid="5432266899591255759">"작업을 수행할 때 사용하는 애플리케이션"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s을(를) 사용하여 작업 완료"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"작업 완료"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"화면 분할 모드 전환"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"잠금 화면"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"스크린샷"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"팝업 창의 <xliff:g id="APP_NAME">%1$s</xliff:g> 앱"</string> </resources> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index c8116cc3ba25..d1d773c03d77 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Жумуш профилинин башкаруучу колдонмосу жок же бузулгандыктан, жумуш профилиңиз жана ага байланыштуу дайындар жок кылынды. Жардам алуу үчүн администраторуңузга кайрылыңыз."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Жумуш профилиңиз бул түзмөктөн жок кылынды"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Өтө көп жолу сырсөздү киргизүү аракети жасалды"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Түзмөктү ишкана башкарат"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ишканаңыз бул түзмөктү башкарат жана тармак трафигин көзөмөлдөшү мүмкүн. Чоо-жайын көрүү үчүн таптап коюңуз."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Түзмөгүңүз тазаланат"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Жүктөлүүдө…"</string> <string name="capital_on" msgid="2770685323900821829">"ЖАНДЫРЫЛГАН"</string> <string name="capital_off" msgid="7443704171014626777">"ӨЧҮК"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"белгиленген"</string> + <string name="not_checked" msgid="7972320087569023342">"белгилене элек"</string> <string name="whichApplication" msgid="5432266899591255759">"Аракет колдонууну бүтүрүү"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s аркылуу аракетти аягына чейин чыгаруу"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Аракетти аягына чыгаруу"</string> @@ -1307,8 +1307,7 @@ <string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"Тиркелген түзмөк бул телефонго шайкеш келбейт. Көбүрөөк маалымат алуу үчүн таптап коюңуз."</string> <string name="adb_active_notification_title" msgid="408390247354560331">"Мүчүлүштүктөрдү USB аркылуу оңдоо иштеп жатат"</string> <string name="adb_active_notification_message" msgid="5617264033476778211">"Өчүрүү үчүн тийип коюңуз"</string> - <!-- no translation found for adb_active_notification_message (6624498401272780855) --> - <skip /> + <string name="adb_active_notification_message" product="tv" msgid="6624498401272780855">"USB аркылуу мүчүлүштүктөрдү оңдоону өчүрүүнү тандаңыз."</string> <string name="test_harness_mode_notification_title" msgid="2282785860014142511">"Сыноо программасынын режими иштетилди"</string> <string name="test_harness_mode_notification_message" msgid="3039123743127958420">"Сыноо программасынын режимин өчүрүү үчүн, баштапкы жөндөөлөргө кайтарыңыз."</string> <string name="console_running_notification_title" msgid="6087888939261635904">"Сериялык консоль иштетилди"</string> @@ -2005,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Экранды бөлүүнү күйгүзүү же өчүрүү"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Кулпуланган экран"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Скриншот"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу Калкыма терезеде көрүндү."</string> </resources> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 9acb031172a1..ded2a4fbf8e2 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"ບໍ່ມີແອັບຜູ້ເບິ່ງແຍງລະບົບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ຫຼື ເສຍຫາຍ. ຜົນກໍຄື, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ກ່ຽວຂ້ອງຂອງທ່ານຖືກລຶບອອກແລ້ວ. ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບສຳລັບການຊ່ວຍເຫຼືອ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ອີກຕໍ່ໄປ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ລອງໃສ່ລະຫັດຜ່ານຫຼາຍເທື່ອເກີນໄປ"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ອຸປະກອນມີການຈັດການ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ອົງກອນຂອງທ່ານຈັດການອຸປະກອນນີ້ ແລະ ອາດກວດສອບທຣາບຟິກເຄືອຂ່າຍນຳ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ອຸປະກອນຂອງທ່ານຈະຖືກລຶບ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ກຳລັງໂຫລດ..."</string> <string name="capital_on" msgid="2770685323900821829">"ເປີດ"</string> <string name="capital_off" msgid="7443704171014626777">"ປິດ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ໝາຍຖືກແລ້ວ"</string> + <string name="not_checked" msgid="7972320087569023342">"ບໍ່ໄດ້ໝາຍຖືກ"</string> <string name="whichApplication" msgid="5432266899591255759">"ດຳເນີນການໂດຍໃຊ້"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"ສຳເລັດການດຳເນີນການໂດຍໃຊ້ %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ສຳເລັດຄຳສັ່ງ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"ເປີດ/ປິດການແບ່ງໜ້າຈໍ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ໜ້າຈໍລັອກ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ຮູບໜ້າຈໍ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"ແອັບ <xliff:g id="APP_NAME">%1$s</xliff:g> ໃນໜ້າຈໍປັອບອັບ."</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 30b551e1d406..eac535c7b3c2 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Trūksta darbo profilio administratoriaus programos arba ji sugadinta. Todėl darbo profilis ir susiję duomenys buvo ištrinti. Jei reikia pagalbos, susisiekite su administratoriumi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Darbo profilis nebepasiekiamas šiame įrenginyje"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Per daug slaptažodžio bandymų"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Įrenginys yra tvarkomas"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Šį įrenginį tvarko organizacija ir gali stebėti tinklo srautą. Palieskite, kad gautumėte daugiau informacijos."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Įrenginys bus ištrintas"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Įkeliama..."</string> <string name="capital_on" msgid="2770685323900821829">"ĮJ."</string> <string name="capital_off" msgid="7443704171014626777">"IŠJ."</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"pažymėta"</string> + <string name="not_checked" msgid="7972320087569023342">"nepažymėta"</string> <string name="whichApplication" msgid="5432266899591255759">"Užbaigti veiksmą naudojant"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Užbaigti veiksmą naudojant %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Užbaigti veiksmą"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index ae1831b76e91..f586212653ad 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Trūkst darba profila administratora lietotnes, vai šī lietotne ir bojāta. Šī iemesla dēļ jūsu darba profils un saistītie dati tika dzēsti. Lai saņemtu palīdzību, sazinieties ar administratoru."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Jūsu darba profils šai ierīcē vairs nav pieejams."</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Veikts pārāk daudz paroles ievadīšanas mēģinājumu."</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Ierīce tiek pārvaldīta"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Jūsu organizācija pārvalda šo ierīci un var uzraudzīt tīkla datplūsmu. Pieskarieties, lai saņemtu detalizētu informāciju."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Jūsu ierīces dati tiks dzēsti"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Notiek ielāde..."</string> <string name="capital_on" msgid="2770685323900821829">"IESLĒGT"</string> <string name="capital_off" msgid="7443704171014626777">"IZSL."</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"atzīmēts"</string> + <string name="not_checked" msgid="7972320087569023342">"nav atzīmēts"</string> <string name="whichApplication" msgid="5432266899591255759">"Izvēlieties lietotni"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Pabeigt darbību, izmantojot %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Pabeigt darbību"</string> @@ -2038,6 +2038,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Pārslēgt ekrāna sadalīšanu"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Bloķēt ekrānu"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Ekrānuzņēmums"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Lietotne <xliff:g id="APP_NAME">%1$s</xliff:g> uznirstošajā logā."</string> </resources> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 480561ff31f5..0d308a1d9b8d 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Апликацијата на администраторот за работниот профил или исчезна или е оштетена. Како резултат на тоа, вашиот работен профил и поврзаните податоци ќе се избришат. За помош, контактирајте со администраторот."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Вашиот работен профил веќе не е достапен на уредов"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Премногу обиди за внесување лозинка"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Некој управува со уредот"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Вашата организација управува со уредов и можно е да го следи сообраќајот на мрежата. Допрете за детали."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Уредот ќе се избрише"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Се вчитува..."</string> <string name="capital_on" msgid="2770685323900821829">"ВКЛУЧЕНО"</string> <string name="capital_off" msgid="7443704171014626777">"ИСКЛУЧЕНО"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"штиклирано"</string> + <string name="not_checked" msgid="7972320087569023342">"не е штиклирано"</string> <string name="whichApplication" msgid="5432266899591255759">"Заврши дејство со"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Остварете го дејството со %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Заврши го дејството"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index d3b9123a581f..63a7194c114f 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"ഔദ്യോഗിക പ്രൊഫൈൽ അഡ്മിൻ ആപ്പ് വിട്ടുപോയിരിക്കുന്നു അല്ലെങ്കിൽ കേടായിരിക്കുന്നു. ഫലമായി, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഇല്ലാതാക്കിയിരിക്കുന്നു. സഹായത്തിന് അഡ്മിനെ ബന്ധപ്പെടുക."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ഈ ഉപകരണത്തിൽ തുടർന്നങ്ങോട്ട് നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ ലഭ്യമല്ല"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"വളരെയധികം പാസ്വേഡ് ശ്രമങ്ങൾ"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ഉപകരണം മാനേജുചെയ്യുന്നുണ്ട്"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"നിങ്ങളുടെ സ്ഥാപനമാണ് ഈ ഉപകരണം മാനേജുചെയ്യുന്നത്, നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിക്കുകയും ചെയ്തേക്കാം, വിശദാംശങ്ങൾ അറിയാൻ ടാപ്പുചെയ്യുക."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"നിങ്ങളുടെ ഉപകരണം മായ്ക്കും"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ലോഡുചെയ്യുന്നു..."</string> <string name="capital_on" msgid="2770685323900821829">"ഓൺ"</string> <string name="capital_off" msgid="7443704171014626777">"ഓഫ്"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"പരിശോധിച്ചത്"</string> + <string name="not_checked" msgid="7972320087569023342">"പരിശോധിക്കാത്തത്"</string> <string name="whichApplication" msgid="5432266899591255759">"പൂർണ്ണമായ പ്രവർത്തനം ഉപയോഗിക്കുന്നു"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ഉപയോഗിച്ച് പ്രവർത്തനം പൂർത്തിയാക്കുക"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"പ്രവർത്തനം പൂർത്തിയാക്കുക"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"സ്ക്രീൻ വിഭജന മോഡ് മാറ്റുക"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ലോക്ക് സ്ക്രീൻ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"സ്ക്രീൻഷോട്ട്"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"പോപ്പ്-അപ്പ് വിൻഡോയിലെ <xliff:g id="APP_NAME">%1$s</xliff:g> ആപ്പ്."</string> </resources> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index e8f6a5028de4..b3cf5ce92aea 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Ажлын профайлын админ апп байхгүй эсвэл эвдэрсэн байна. Үүний улмаас таны ажлын профайл болон холбогдох мэдээллийг устгасан болно. Тусламж хэрэгтэй бол админтай холбогдоно уу."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Таны ажлын профайл энэ төхөөрөмжид боломжгүй байна"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Нууц үгийг хэт олон удаа буруу оруулсан байна"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Төхөөрөмжийг удирдсан"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Таны байгууллага энэ төхөөрөмжийг удирдаж, сүлжээний ачааллыг хянадаг. Дэлгэрэнгүй мэдээлэл авах бол товшино уу."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Таны төхөөрөмж устах болно."</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Ачааллаж байна..."</string> <string name="capital_on" msgid="2770685323900821829">"Идэвхтэй"</string> <string name="capital_off" msgid="7443704171014626777">"Идэвхгүй"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"тэмдэглэсэн"</string> + <string name="not_checked" msgid="7972320087569023342">"тэмдэглээгүй"</string> <string name="whichApplication" msgid="5432266899591255759">"Үйлдлийг дуусгах"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ашиглан үйлдлийг гүйцээх"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Үйлдлийг дуусгах"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Дэлгэц хуваахыг унтраах/асаах"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Дэлгэцийг түгжих"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Дэлгэцийн зураг дарах"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Үзэгдэх цонхонд байгаа <xliff:g id="APP_NAME">%1$s</xliff:g> апп."</string> </resources> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 18f091197986..22b1dcc4da9b 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"कार्य प्रोफाइल प्रशासक अॅप गहाळ आहे किंवा करप्ट आहे. परिणामी, तुमचे कार्य प्रोफाइल आणि संबंधित डेटा हटवले गेले आहेत. सहाय्यासाठी आपल्या प्रशासकाशी संपर्क साधा."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"तुमचे कार्य प्रोफाइल आता या डिव्हाइसवर उपलब्ध नाही"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"बर्याचदा पासवर्ड टाकण्याचा प्रयत्न केला"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"डिव्हाइस व्यवस्थापित केले आहे"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"तुमची संस्था हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे निरीक्षण करू शकते. तपशीलांसाठी टॅप करा."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"तुमचे डिव्हाइस मिटविले जाईल"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"लोड करत आहे..."</string> <string name="capital_on" msgid="2770685323900821829">"सुरू"</string> <string name="capital_off" msgid="7443704171014626777">"बंद"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"तपासले"</string> + <string name="not_checked" msgid="7972320087569023342">"तपासले नाही"</string> <string name="whichApplication" msgid="5432266899591255759">"याचा वापर करून क्रिया पूर्ण करा"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s वापरून क्रिया पूर्ण करा"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"क्रिया पूर्ण झाली"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"विभाजित स्क्रीन टॉगल करा"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"स्क्रीन लॉक करा"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"स्क्रीनशॉट"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"पॉप-अप विंडोमध्ये <xliff:g id="APP_NAME">%1$s</xliff:g> ॲप."</string> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 0a404e7bdea8..88c12b64636a 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Apl pentadbir profil kerja tiada atau rosak. Akibatnya, profil kerja anda dan data yang berkaitan telah dipadamkan. Hubungi pentadbir anda untuk mendapatkan bantuan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Profil kerja anda tidak lagi tersedia pada peranti ini"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Terlalu banyak percubaan kata laluan"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Peranti ini diurus"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organisasi anda mengurus peranti ini dan mungkin memantau trafik rangkaian. Ketik untuk mendapatkan butiran."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Peranti anda akan dipadam"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Memuatkan…"</string> <string name="capital_on" msgid="2770685323900821829">"HIDUP"</string> <string name="capital_off" msgid="7443704171014626777">"MATIKAN"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ditandai"</string> + <string name="not_checked" msgid="7972320087569023342">"tidak ditandai"</string> <string name="whichApplication" msgid="5432266899591255759">"Selesaikan tindakan menggunakan"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Selesaikan tindakan menggunakan %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Selesaikan tindakan"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Togol Skrin Pisah"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Skrin Kunci"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Tangkapan skrin"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Apl <xliff:g id="APP_NAME">%1$s</xliff:g> dalam tetingkap Timbul."</string> </resources> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index e34190dddc2f..cdf68cd3d53c 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"အလုပ်ပရိုဖိုင် စီမံခန့်ခွဲရန်အက်ပ် မရှိပါ သို့မဟုတ် ပျက်စီးနေပါသည်။ ထို့ကြောင့် သင်၏ အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်နေသော ဒေတာများကို ဖျက်လိုက်ပါပြီ။ အကူအညီရယူရန် သင်၏စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ဤစက်ပစ္စည်းတွင် သင်၏ အလုပ်ပရိုဖိုင်မရှိတော့ပါ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"စကားဝှက်ထည့်သွင်းရန် ကြိုးစားသည့် အကြိမ်အရေအတွက် အလွန်များသွား၍ ဖြစ်ပါသည်"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"စက်ပစ္စည်းကို စီမံခန့်ခွဲထားပါသည်"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ဤစက်ပစ္စည်းကို သင်၏ အဖွဲ့အစည်းက စီမံပြီး ကွန်ရက်အသွားအလာကို စောင့်ကြည့်နိုင်ပါသည်။ ထပ်မံလေ့လာရန် တို့ပါ။"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"သင့်ကိရိယာအား ပယ်ဖျက်လိမ့်မည်"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"တင်နေ…"</string> <string name="capital_on" msgid="2770685323900821829">"ဖွင့်ရန်"</string> <string name="capital_off" msgid="7443704171014626777">"ပိတ်"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"အမှန်ခြစ်ပြီး"</string> + <string name="not_checked" msgid="7972320087569023342">"ခြစ် မထား"</string> <string name="whichApplication" msgid="5432266899591255759">"အသုံးပြု၍ ဆောင်ရွက်မှုအားပြီးဆုံးစေခြင်း"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ကို သုံးပြီး လုပ်ဆောင်ချက် ပြီးဆုံးပါစေ"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"လုပ်ဆောင်ချက်ကို အပြီးသတ်ပါ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းကို နှိပ်ပါ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"လော့ခ်မျက်နှာပြင်"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ဖန်သားပြင်ဓာတ်ပုံ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"ပေါ့ပ်အပ်ဝင်းဒိုးတွင်ရှိသော <xliff:g id="APP_NAME">%1$s</xliff:g>အက်ပ်။"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 69ee0177a1bb..b129c3c01b00 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Administratorappen for jobbprofilen mangler eller er skadet. Dette har ført til at jobbprofilen og alle data knyttet til den, har blitt slettet. Ta kontakt med administratoren for å få hjelp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Jobbprofilen din er ikke lenger tilgjengelig på denne enheten"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"For mange passordforsøk"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Enheten administreres"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organisasjonen din kontrollerer denne enheten og kan overvåke nettverkstrafikk. Trykk for å få mer informasjon."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Enheten blir slettet"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Laster inn …"</string> <string name="capital_on" msgid="2770685323900821829">"På"</string> <string name="capital_off" msgid="7443704171014626777">"Av"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"avmerket"</string> + <string name="not_checked" msgid="7972320087569023342">"ikke avmerket"</string> <string name="whichApplication" msgid="5432266899591255759">"Fullfør med"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Fullfør handlingen med %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Fullfør handlingen"</string> @@ -1539,7 +1539,7 @@ <string name="launchBrowserDefault" msgid="6328349989932924119">"Vil du starte nettleseren?"</string> <string name="SetupCallDefault" msgid="5581740063237175247">"Vil du besvare anropet?"</string> <string name="activity_resolver_use_always" msgid="5575222334666843269">"Alltid"</string> - <string name="activity_resolver_set_always" msgid="4142825808921411476">"Angi som alltid åpen"</string> + <string name="activity_resolver_set_always" msgid="4142825808921411476">"Alltid"</string> <string name="activity_resolver_use_once" msgid="948462794469672658">"Bare én gang"</string> <string name="activity_resolver_app_settings" msgid="6758823206817748026">"Innstillinger"</string> <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s støtter ikke arbeidsprofiler"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Slå delt skjerm av/på"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Låseskjerm"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Skjermdump"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g>-appen i forgrunnsvindu."</string> </resources> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index cabb5c0c49dc..648f47c99871 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"उक्त कार्य प्रोफाइलको प्रशासकीय अनुप्रयोग छैन वा बिग्रेको छ। त्यसले गर्दा, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटालाई मेटिएको छ। सहायताका लागि आफ्ना प्रशासकलाई सम्पर्क गर्नुहोस्।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"तपाईंको कार्य प्रोफाइल अब उप्रान्त यस यन्त्रमा उपलब्ध छैन"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"पासवर्ड प्रविष्ट गर्ने अत्यधिक गलत प्रयासहरू भए"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"यन्त्र व्यवस्थित गरिएको छ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"तपाईंको संगठनले यस यन्त्रको व्यवस्थापन गर्दछ र नेटवर्क ट्राफिकको अनुगमन गर्न सक्छ। विवरणहरूका लागि ट्याप गर्नुहोस्।"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"तपाईंको यन्त्र मेटिनेछ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"लोड हुँदै..."</string> <string name="capital_on" msgid="2770685323900821829">"चालु"</string> <string name="capital_off" msgid="7443704171014626777">"बन्द"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"जाँच गरिएको"</string> + <string name="not_checked" msgid="7972320087569023342">"जाँच गरिएको छैन"</string> <string name="whichApplication" msgid="5432266899591255759">"प्रयोग गरेर कारबाही पुरा गर्नुहोस्"</string> <!-- String.format failed for translation --> <!-- no translation found for whichApplicationNamed (6969946041713975681) --> @@ -2010,6 +2010,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"विभाजित स्क्रिन टगल गर्नुहोस्"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"लक स्क्रिन"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"स्क्रिनसट"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"पपअप विन्डोमा <xliff:g id="APP_NAME">%1$s</xliff:g> अनुप्रयोग छ।"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 28fdfa5c8889..e248ca1ed1d0 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"De beheer-app van het werkprofiel ontbreekt of is beschadigd. Als gevolg hiervan zijn je werkprofiel en alle gerelateerde gegevens verwijderd. Neem contact op met je beheerder voor hulp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Je werkprofiel is niet meer beschikbaar op dit apparaat"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Te veel wachtwoordpogingen"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Apparaat wordt beheerd"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Dit apparaat wordt beheerd door je organisatie. Het netwerkverkeer kan worden bijgehouden. Tik voor meer informatie."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Je apparaat wordt gewist"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Laden..."</string> <string name="capital_on" msgid="2770685323900821829">"AAN"</string> <string name="capital_off" msgid="7443704171014626777">"UIT"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"aangevinkt"</string> + <string name="not_checked" msgid="7972320087569023342">"niet aangevinkt"</string> <string name="whichApplication" msgid="5432266899591255759">"Actie voltooien met"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Actie voltooien via %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Actie voltooien"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 23e04b70e06e..7a73cc61633d 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"ଆଡମିନ୍ ଆପ୍ ନାହିଁ କିମ୍ବା ଭୁଲ ଅଛି। ଫଳସ୍ୱରୂପ, ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ଏବଂ ସମ୍ବନ୍ଧୀୟ ଡାଟା ଡିଲିଟ୍ କରାଯାଇଛି। ସହାୟତା ପାଇଁ ଆପଣଙ୍କ ଆଡମିନଙ୍କୁ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ଏହି ଡିଭାଇସରେ ଆପଣଙ୍କ ୱର୍କ ପ୍ରୋଫାଇଲ୍ ଆଉ ଉପଲବ୍ଧ ନାହିଁ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ବହୁତ ଥର ଭୁଲ ପାସ୍ୱର୍ଡ ଲେଖିଛନ୍ତି"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ଡିଭାଇସକୁ ପରିଚାଳନା କରାଯାଉଛି"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ଆପଣଙ୍କ ସଂସ୍ଥା ଏହି ଡିଭାଇସକୁ ପରିଚାଳନା କରନ୍ତି ଏବଂ ନେଟୱର୍କ ଟ୍ରାଫିକ୍ ନୀରିକ୍ଷଣ କରନ୍ତି। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ବର୍ତ୍ତମାନ ଲିଭାଯିବ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ଲୋଡ୍ କରାଯାଉଛି…"</string> <string name="capital_on" msgid="2770685323900821829">"ଅନ୍"</string> <string name="capital_off" msgid="7443704171014626777">"ଅଫ୍"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ଯାଞ୍ଚ ହୋଇଛି"</string> + <string name="not_checked" msgid="7972320087569023342">"ଯାଞ୍ଚ ହୋଇନାହିଁ"</string> <string name="whichApplication" msgid="5432266899591255759">"ବ୍ୟବହାର କରି କାର୍ଯ୍ୟ ସମ୍ପୂର୍ଣ୍ଣ କରନ୍ତୁ"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ବ୍ୟବହାର କରି କାର୍ଯ୍ୟ ସମ୍ପୂର୍ଣ୍ଣ କରନ୍ତୁ"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"କାର୍ଯ୍ୟ ସମ୍ପୂର୍ଣ୍ଣ କରନ୍ତୁ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"ଦୁଇଟି ସ୍କ୍ରିନ୍ ମଧ୍ୟରେ ଟୋଗଲ୍ କରନ୍ତୁ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ସ୍କ୍ରିନ୍ ଲକ୍ କରନ୍ତୁ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ସ୍କ୍ରିନ୍ସଟ୍ ନିଅନ୍ତୁ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"ପପ୍-ଅପ୍ ୱିଣ୍ଡୋରେ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପ୍"</string> </resources> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 891f1f15795a..3a245e383bc5 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਜਾਂ ਤਾਂ ਗੁੰਮਸ਼ੁਦਾ ਹੈ ਜਾਂ ਖਰਾਬ ਹੈ। ਨਤੀਜੇ ਵਜੋਂ, ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸਬੰਧਿਤ ਡਾਟਾ ਮਿਟਾਇਆ ਗਿਆ ਹੈ। ਸਹਾਇਤਾ ਲਈ ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹੁਣ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ਕਈ ਵਾਰ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕੀਤਾ ਗਿਆ"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"ਡੀਵਾਈਸ ਪ੍ਰਬੰਧਨ ਅਧੀਨ ਹੈ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ਤੁਹਾਡਾ ਸੰਗਠਨ ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਦਾ ਹੈ ਅਤੇ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕਰ ਸਕਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾਇਆ ਜਾਏਗਾ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ..."</string> <string name="capital_on" msgid="2770685323900821829">"ਚਾਲੂ"</string> <string name="capital_off" msgid="7443704171014626777">"ਬੰਦ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਗਿਆ"</string> + <string name="not_checked" msgid="7972320087569023342">"ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string> <string name="whichApplication" msgid="5432266899591255759">"ਇਸਨੂੰ ਵਰਤਦੇ ਹੋਏ ਕਾਰਵਾਈ ਪੂਰੀ ਕਰੋ"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ਵਰਤਦੇ ਹੋਏ ਕਾਰਵਾਈ ਪੂਰੀ ਕਰੋ"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ਕਾਰਵਾਈ ਪੂਰੀ ਕਰੋ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਨੂੰ ਟੌਗਲ ਕਰੋ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"ਲਾਕ ਸਕ੍ਰੀਨ"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"ਪੌਪ-ਅੱਪ ਵਿੰਡੋ ਵਿੱਚ <xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ।"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 811c5d883914..7a86bd561546 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Brakuje aplikacji administratora profilu do pracy lub jest ona uszkodzona. Dlatego Twój profil służbowy i związane z nim dane zostały usunięte. Skontaktuj się ze swoim administratorem, by uzyskać pomoc."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Twój profil służbowy nie jest już dostępny na tym urządzeniu"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Zbyt wiele prób podania hasła"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Urządzenie jest zarządzane"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Twoja organizacja zarządza tym urządzeniem i może monitorować ruch w sieci. Kliknij, by dowiedzieć się więcej."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Twoje urządzenie zostanie wyczyszczone"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Wczytuję…"</string> <string name="capital_on" msgid="2770685323900821829">"Wł."</string> <string name="capital_off" msgid="7443704171014626777">"Wył."</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"wybrano"</string> + <string name="not_checked" msgid="7972320087569023342">"nie wybrano"</string> <string name="whichApplication" msgid="5432266899591255759">"Wykonaj czynność przez..."</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Wykonaj czynność w aplikacji %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Wykonaj działanie"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Przełącz podzielony ekran"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Ekran blokady"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Zrzut ekranu"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> w wyskakującym okienku."</string> </resources> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index ecd10c32eaeb..3f82a80453f1 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"O app para administrador do perfil de trabalho não foi encontrado ou está corrompido. Consequentemente, seu perfil de trabalho e os dados relacionados foram excluídos. Entre em contato com seu administrador para receber assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Seu perfil de trabalho não está mais disponível neste dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Muitas tentativas de senha"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"O dispositivo é gerenciado"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Sua organização gerencia este dispositivo e pode monitorar o tráfego de rede. Toque para ver detalhes."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Seu dispositivo será limpo"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Carregando…"</string> <string name="capital_on" msgid="2770685323900821829">"LIG"</string> <string name="capital_off" msgid="7443704171014626777">"DESL"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"marcado"</string> + <string name="not_checked" msgid="7972320087569023342">"não marcado"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete a ação usando"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Concluir a ação usando %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Concluir ação"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 0cfbf8cb467e..f67c96fa10ba 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"A aplicação de administração do perfil de trabalho está em falta ou danificada. Consequentemente, o seu perfil de trabalho e os dados relacionados foram eliminados. Contacte o gestor para obter assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"O seu perfil de trabalho já não está disponível neste dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Demasiadas tentativas de introdução da palavra-passe"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"O dispositivo é gerido"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"A sua entidade gere este dispositivo e pode monitorizar o tráfego de rede. Toque para obter mais detalhes."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"O seu dispositivo será apagado"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"A carregar…"</string> <string name="capital_on" msgid="2770685323900821829">"Ativado"</string> <string name="capital_off" msgid="7443704171014626777">"Desativado"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"selecionado"</string> + <string name="not_checked" msgid="7972320087569023342">"não selecionado"</string> <string name="whichApplication" msgid="5432266899591255759">"Concluir ação utilizando"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Concluir ação utilizando %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Concluir ação"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index ecd10c32eaeb..3f82a80453f1 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"O app para administrador do perfil de trabalho não foi encontrado ou está corrompido. Consequentemente, seu perfil de trabalho e os dados relacionados foram excluídos. Entre em contato com seu administrador para receber assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Seu perfil de trabalho não está mais disponível neste dispositivo"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Muitas tentativas de senha"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"O dispositivo é gerenciado"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Sua organização gerencia este dispositivo e pode monitorar o tráfego de rede. Toque para ver detalhes."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Seu dispositivo será limpo"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Carregando…"</string> <string name="capital_on" msgid="2770685323900821829">"LIG"</string> <string name="capital_off" msgid="7443704171014626777">"DESL"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"marcado"</string> + <string name="not_checked" msgid="7972320087569023342">"não marcado"</string> <string name="whichApplication" msgid="5432266899591255759">"Complete a ação usando"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Concluir a ação usando %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Concluir ação"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index f50103270133..846b9829fa9c 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplicația de administrare a profilului de serviciu lipsește sau este deteriorată. Prin urmare, profilul de serviciu și datele asociate au fost șterse. Pentru asistență, contactați administratorul."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Profilul de serviciu nu mai este disponibil pe acest dispozitiv"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Prea multe încercări de introducere a parolei"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Dispozitivul este gestionat"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organizația dvs. gestionează acest dispozitiv și poate monitoriza traficul în rețea. Atingeți pentru mai multe detalii."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Datele de pe dispozitiv vor fi șterse"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Se încarcă…"</string> <string name="capital_on" msgid="2770685323900821829">"DA"</string> <string name="capital_off" msgid="7443704171014626777">"NU"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"bifat"</string> + <string name="not_checked" msgid="7972320087569023342">"nebifat"</string> <string name="whichApplication" msgid="5432266899591255759">"Finalizare acțiune utilizând"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Finalizați acțiunea utilizând %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Finalizați acțiunea"</string> @@ -2038,6 +2038,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Activați ecranul împărțit"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Ecran de blocare"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Captură de ecran"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplicația <xliff:g id="APP_NAME">%1$s</xliff:g> în fereastră pop-up."</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index aefc37342bff..19fde9f45fb5 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Приложение для администрирования рабочего профиля отсутствует или повреждено. Из-за этого рабочий профиль и связанные с ним данные были удалены. Если у вас возникли вопросы, обратитесь к администратору."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Ваш рабочий профиль больше не доступен на этом устройстве"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Слишком много попыток ввести пароль."</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Это управляемое устройство"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Ваша организация управляет этим устройством и может отслеживать сетевой трафик. Подробнее…"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Все данные с устройства будут удалены"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Загрузка…"</string> <string name="capital_on" msgid="2770685323900821829">"I"</string> <string name="capital_off" msgid="7443704171014626777">"O"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"отмечено"</string> + <string name="not_checked" msgid="7972320087569023342">"не отмечено"</string> <string name="whichApplication" msgid="5432266899591255759">"Что использовать?"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Выполнить с помощью приложения \"%1$s\""</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Выполнить действие"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Включить или выключить разделение экрана"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Заблокированный экран"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Скриншот"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" в всплывающем окне."</string> </resources> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 67dfbd395e65..676b48f616f7 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"කාර්යාල පැතිකඩ පාලක යෙදුම නොමැති හෝ දූෂණය වී ඇත. ප්රතිඵලයක් ලෙස ඔබගේ කාර්යාල පැතිකඩ සහ අදාළ දත්ත මකා දමා ඇත. සහය සඳහා ඔබගේ පරිපාලකයා සම්බන්ධ කර ගන්න."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ඔබේ කාර්යාල පැතිකඩ මෙම උපාංගය මත තවදුරටත් ලබා ගැනීමට නොහැකිය"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"මුරපද උත්සාහ කිරීම් ඉතා වැඩි ගණනකි"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"උපාංගය කළමනාකරණය කෙරේ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"ඔබගේ ආයතනය මෙම උපාංගය කළමනාකරණය කරන අතර එය ජාල තදබදය නිරීක්ෂණය කළ හැක. විස්තර සඳහා තට්ටු කරන්න."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ඔබගේ උපාංගය මකා දැමෙනු ඇත"</string> @@ -1118,10 +1120,8 @@ <string name="loading" msgid="3138021523725055037">"පූරණය වෙමින්..."</string> <string name="capital_on" msgid="2770685323900821829">"සක්රීයයි"</string> <string name="capital_off" msgid="7443704171014626777">"ක්රියාවිරහිතයි"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"පරීක්ෂා කර ඇත"</string> + <string name="not_checked" msgid="7972320087569023342">"පරීක්ෂා කර නැත"</string> <string name="whichApplication" msgid="5432266899591255759">"පහත භාවිතයෙන් ක්රියාව සම්පූර්ණ කරන්න"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s භාවිතා කරමින් ක්රියාව සම්පුර්ණ කරන්න"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ක්රියාව සම්පූර්ණ කරන්න"</string> @@ -2006,6 +2006,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"බෙදුම් තිරය ටොගල කරන්න"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"අගුලු තිරය"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"තිර රුව"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"උත්පතන කවුළුව තුළ <xliff:g id="APP_NAME">%1$s</xliff:g> යෙදුම."</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index c1eec993af8a..cde5466db748 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplikácia na správu pracovného profilu buď chýba, alebo je poškodená. Z toho dôvodu bol odstránený pracovný profil aj k nemu priradené dáta. Ak potrebujete pomoc, kontaktujte svojho správcu."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Váš pracovný profil už v tomto zariadení nie je k dispozícii"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Príliš veľa pokusov o zadanie hesla"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Zariadenie je spravované"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Vaša organizácia spravuje toto zariadenie a môže sledovať sieťovú premávku. Klepnutím zobrazíte podrobnosti."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Vaše zariadenie bude vymazané"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Načítava sa…"</string> <string name="capital_on" msgid="2770685323900821829">"I"</string> <string name="capital_off" msgid="7443704171014626777">"O"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"začiarknuté"</string> + <string name="not_checked" msgid="7972320087569023342">"nezačiarknuté"</string> <string name="whichApplication" msgid="5432266899591255759">"Dokončiť akciu pomocou aplikácie"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Dokončiť akciu pomocou aplikácie %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Dokončiť akciu"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Prepnúť rozdelenú obrazovku"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Uzamknúť obrazovku"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Snímka obrazovky"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> vo vyskakovacom okne."</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index d15d6a96a70a..04940688c8fc 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Skrbniška aplikacija delovnega profila manjka ali pa je poškodovana, zaradi česar je bil delovni profil s povezanimi podatki izbrisan. Za pomoč se obrnite na skrbnika."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Vaš delovni profil ni več na voljo v tej napravi"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Preveč poskusov vnosa gesla"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Naprava je upravljana"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Vaša organizacija upravlja to napravo in lahko nadzira omrežni promet. Dotaknite se za podrobnosti."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Podatki v napravi bodo izbrisani"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Nalaganje …"</string> <string name="capital_on" msgid="2770685323900821829">"VKLOPLJENO"</string> <string name="capital_off" msgid="7443704171014626777">"IZKLOPLJENO"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"potrjeno"</string> + <string name="not_checked" msgid="7972320087569023342">"ni potrjeno"</string> <string name="whichApplication" msgid="5432266899591255759">"Dokončanje dejanja z"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Dokončanje dejanja z aplikacijo %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Izvedba dejanja"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Preklop razdeljenega zaslona"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Zaklenjen zaslon"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Posnetek zaslona"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> v pojavnem oknu."</string> </resources> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 6bf818403a6d..20e6ae513ada 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Aplikacioni i administratorit të profilit të punës mungon ose është dëmtuar. Si rezultat i kësaj, profili yt i punës dhe të dhënat përkatëse janë fshirë. Kontakto me administratorin për ndihmë."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Profili yt i punës nuk është më i disponueshëm në këtë pajisje"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Shumë përpjekje për fjalëkalimin"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Pajisja është e menaxhuar"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organizata jote e menaxhon këtë pajisje dhe mund të monitorojë trafikun e rrjetit. Trokit për detaje."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Pajisja do të spastrohet"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Po ngarkohet..."</string> <string name="capital_on" msgid="2770685323900821829">"Aktivizuar"</string> <string name="capital_off" msgid="7443704171014626777">"Çaktivizuar"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"u përzgjodh"</string> + <string name="not_checked" msgid="7972320087569023342">"nuk u përzgjodh"</string> <string name="whichApplication" msgid="5432266899591255759">"Përfundo veprimin duke përdorur"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Përfundo veprimin duke përdorur %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Përfundo veprimin"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Kalo tek ekrani i ndarë"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Ekrani i kyçjes"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Pamja e ekranit"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Aplikacioni <xliff:g id="APP_NAME">%1$s</xliff:g> në dritaren kërcyese."</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 37410a761a9e..db53b23d9813 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -190,6 +190,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Апликација за администраторе на профилу за Work недостаје или је оштећена. Због тога су профил за Work и повезани подаци избрисани. Обратите се администратору за помоћ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Профил за Work више није доступан на овом уређају"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Превише покушаја уноса лозинке"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Уређајем се управља"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Организација управља овим уређајем и може да надгледа мрежни саобраћај. Додирните за детаље."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Уређај ће бити обрисан"</string> @@ -1136,10 +1138,8 @@ <string name="loading" msgid="3138021523725055037">"Учитава се…"</string> <string name="capital_on" msgid="2770685323900821829">"ДА"</string> <string name="capital_off" msgid="7443704171014626777">"НЕ"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"означено је"</string> + <string name="not_checked" msgid="7972320087569023342">"није означено"</string> <string name="whichApplication" msgid="5432266899591255759">"Довршавање радње помоћу"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Завршите радњу помоћу апликације %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Заврши радњу"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index a5b657a4dd96..9e99aec5e9b1 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Administratörsappen för jobbprofilen saknas eller är skadad. Det innebär att jobbprofilen och all relaterad data har raderats. Kontakta administratören om du vill ha hjälp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Jobbprofilen är inte längre tillgänglig på enheten"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"För många försök med lösenord"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Enheten hanteras"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Organisationen hanterar den här enheten och kan övervaka nätverkstrafiken. Tryck om du vill veta mer."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Enheten kommer att rensas"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Läser in …"</string> <string name="capital_on" msgid="2770685323900821829">"PÅ"</string> <string name="capital_off" msgid="7443704171014626777">"AV"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"markerad"</string> + <string name="not_checked" msgid="7972320087569023342">"inte markerad"</string> <string name="whichApplication" msgid="5432266899591255759">"Slutför åtgärd genom att använda"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Slutför åtgärden med %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Slutför åtgärd"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index d587e2584c97..d7b3555bf2af 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Programu ya msimamizi wa wasifu wa kazini imepotea au ina hitilafu. Kwa sababu hiyo, wasifu wako wa kazini na data husika imefutwa. Wasiliana na msimamizi wako kwa usaidizi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Wasifu wako wa kazini haupatikani tena kwenye kifaa hiki"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Umejaribu kuweka nenosiri mara nyingi mno"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Kifaa kinadhibitiwa"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Shirika lako linadhibiti kifaa hiki na huenda likafuatilia shughuli kwenye mtandao. Gusa ili upate maelezo zaidi."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Data iliyomo kwenye kifaa chako itafutwa"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Inapakia…"</string> <string name="capital_on" msgid="2770685323900821829">"Washa"</string> <string name="capital_off" msgid="7443704171014626777">"ZIMA"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"imeteuliwa"</string> + <string name="not_checked" msgid="7972320087569023342">"haijateuliwa"</string> <string name="whichApplication" msgid="5432266899591255759">"Kamilisha kitendo ukitumia"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Kamilisha kitendo ukitumia %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Kamilisha kitendo"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Geuza Skrini Iliyogawanywa"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Skrini Iliyofungwa"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Picha ya skrini"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> katika dirisha Ibukizi."</string> </resources> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 90b8bc80e89a..569977c5013e 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"பணிக் கணக்கு நிர்வாகி ஆப்ஸ் இல்லை அல்லது அது சிதைந்துள்ளது. இதன் விளைவாக, உங்கள் பணிக் கணக்குமும் அதனுடன் தொடர்புடைய தரவும் நீக்கப்பட்டன. உதவிக்கு, நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"இந்தச் சாதனத்தில் இனி பணிக் கணக்கு கிடைக்காது"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"கடவுச்சொல்லை அதிக முறை தவறாக முயற்சித்துவிட்டீர்கள்"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"சாதனம் நிர்வகிக்கப்படுகிறது"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"உங்கள் நிறுவனம் இந்தச் சாதனத்தை நிர்வகிக்கும், அத்துடன் அது நெட்வொர்க் ட்ராஃபிக்கைக் கண்காணிக்கலாம். விவரங்களுக்கு, தட்டவும்."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"சாதனத் தரவு அழிக்கப்படும்"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"ஏற்றுகிறது..."</string> <string name="capital_on" msgid="2770685323900821829">"ஆன்"</string> <string name="capital_off" msgid="7443704171014626777">"ஆஃப்"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"இயக்கப்பட்டுள்ளது"</string> + <string name="not_checked" msgid="7972320087569023342">"முடக்கப்பட்டுள்ளது"</string> <string name="whichApplication" msgid="5432266899591255759">"இதைப் பயன்படுத்தி செயலை நிறைவுசெய்"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s ஐப் பயன்படுத்தி செயலை முடிக்கவும்"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"செயலை முடி"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"திரைப் பிரிப்பை நிலைமாற்று"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"பூட்டுத் திரை"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ஸ்கிரீன்ஷாட்"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸில் உள்ள பாப் அப் சாளரம்."</string> </resources> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 63821aa9008c..9600172079b7 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"కార్యాలయ ప్రొఫైల్ నిర్వాహక యాప్ లేదు లేదా పాడైంది. తత్ఫలితంగా, మీ కార్యాలయ ప్రొఫైల్ మరియు సంబంధిత డేటా తొలగించబడ్డాయి. సహాయం కోసం మీ నిర్వాహకులను సంప్రదించండి."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"ఈ పరికరంలో మీ కార్యాలయ ప్రొఫైల్ ఇప్పుడు అందుబాటులో లేదు"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"చాలా ఎక్కువ పాస్వర్డ్ ప్రయత్నాలు చేసారు"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"పరికరం నిర్వహించబడింది"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"మీ సంస్థ ఈ పరికరాన్ని నిర్వహిస్తుంది మరియు నెట్వర్క్ ట్రాఫిక్ని పర్యవేక్షించవచ్చు. వివరాల కోసం నొక్కండి."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"మీ పరికరంలోని డేటా తొలగించబడుతుంది"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"లోడ్ చేస్తోంది…"</string> <string name="capital_on" msgid="2770685323900821829">"ఆన్లో ఉంది"</string> <string name="capital_off" msgid="7443704171014626777">"ఆఫ్"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"ఎంచుకోబడింది"</string> + <string name="not_checked" msgid="7972320087569023342">"ఎంచుకోలేదు"</string> <string name="whichApplication" msgid="5432266899591255759">"దీన్ని ఉపయోగించి చర్యను పూర్తి చేయండి"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$sను ఉపయోగించి చర్యను పూర్తి చేయి"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"చర్యను పూర్తి చేయి"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"స్క్రీన్ విభజనను టోగుల్ చేయి"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"స్క్రీన్ను లాక్ చేయి"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"స్క్రీన్షాట్"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"పాప్-అప్ విండోలో <xliff:g id="APP_NAME">%1$s</xliff:g> యాప్ ఉంది."</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index d4646b94d388..4dd0d0fa54aa 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"แอปผู้ดูแลระบบโปรไฟล์งานไม่มีอยู่หรือเสียหาย ระบบจึงทำการลบโปรไฟล์งานและข้อมูลที่เกี่ยวข้องของคุณออก โปรดติดต่อผู้ดูแลระบบเพื่อรับความช่วยเหลือ"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"โปรไฟล์งานของคุณไม่สามารถใช้ในอุปกรณ์นี้อีกต่อไป"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"ลองป้อนรหัสผ่านหลายครั้งเกินไป"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"อุปกรณ์มีการจัดการ"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"องค์กรของคุณจัดการอุปกรณ์นี้และอาจตรวจสอบการจราจรของข้อมูลในเครือข่าย แตะเพื่อดูรายละเอียด"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"ระบบจะลบข้อมูลในอุปกรณ์ของคุณ"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"กำลังโหลด..."</string> <string name="capital_on" msgid="2770685323900821829">"เปิด"</string> <string name="capital_off" msgid="7443704171014626777">"ปิด"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"เลือกไว้"</string> + <string name="not_checked" msgid="7972320087569023342">"ยังไม่เลือก"</string> <string name="whichApplication" msgid="5432266899591255759">"ทำงานให้เสร็จโดยใช้"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"ดำเนินการให้เสร็จสมบูรณ์โดยใช้ %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"ทำงานให้เสร็จสิ้น"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"เปิด/ปิดการแบ่งหน้าจอ"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"หน้าจอล็อก"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"ภาพหน้าจอ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ในหน้าต่างป๊อปอัป"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 93ec51799fbc..bde4027fd73b 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Nawawala o nasira ang admin app ng profile sa trabaho. Dahil dito, na-delete ang profile mo sa trabaho at nauugnay na data. Makipag-ugnayan sa iyong admin para sa tulong."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Hindi na available sa device na ito ang iyong profile sa trabaho"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Masyadong maraming pagsubok sa password"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Pinamamahalaan ang device"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Pinamamahalaan ng iyong organisasyon ang device na ito, at maaari nitong subaybayan ang trapiko sa network. I-tap para sa mga detalye."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Buburahin ang iyong device"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Naglo-load…"</string> <string name="capital_on" msgid="2770685323900821829">"I-ON"</string> <string name="capital_off" msgid="7443704171014626777">"I-OFF"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"nilagyan ng check"</string> + <string name="not_checked" msgid="7972320087569023342">"hindi nilagyan ng check"</string> <string name="whichApplication" msgid="5432266899591255759">"Kumpletuhin ang pagkilos gamit ang"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Tapusin ang pagkilos gamit ang %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Gawin ang pagkilos"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"I-toggle ang Split Screen"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Lock Screen"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Screenshot"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"<xliff:g id="APP_NAME">%1$s</xliff:g> app sa Pop-up na window."</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 1a4d5324de5f..0168ba0af607 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"İş profili yönetici uygulaması eksik ya da bozuk. Bunun sonucunda iş profiliniz ve ilgili veriler silindi. Yardım almak için yöneticiniz ile iletişim kurun."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"İş profiliniz arık bu cihazda kullanılamıyor"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Çok fazla şifre denemesi yapıldı"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Cihaz yönetiliyor"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Kuruluşunuz bu cihazı yönetmekte olup ağ trafiğini izleyebilir. Ayrıntılar için dokunun."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Cihazınız silinecek"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Yükleniyor..."</string> <string name="capital_on" msgid="2770685323900821829">"AÇIK"</string> <string name="capital_off" msgid="7443704171014626777">"KAPALI"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"işaretli"</string> + <string name="not_checked" msgid="7972320087569023342">"işaretli değil"</string> <string name="whichApplication" msgid="5432266899591255759">"İşlemi şunu kullanarak tamamla"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"İşlemi %1$s kullanarak tamamla"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"İşlemi tamamla"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Bölünmüş Ekranı aç/kapat"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Kilit Ekranı"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Ekran görüntüsü"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Pop-up pencerede <xliff:g id="APP_NAME">%1$s</xliff:g> uygulaması."</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index b785e060f610..32042efd98be 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -192,6 +192,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Додаток адміністратора в робочому профілі відсутній або пошкоджений. У результаті ваш робочий профіль і пов’язані з ним дані видалено. Зверніться до свого адміністратора по допомогу."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Робочий профіль більше не доступний на цьому пристрої"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Забагато спроб ввести пароль"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Пристрій контролюється"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Адміністратор вашої організації контролює цей пристрій і відстежує мережевий трафік. Торкніться, щоб дізнатися більше."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"З вашого пристрою буде стерто всі дані"</string> @@ -1156,10 +1158,8 @@ <string name="loading" msgid="3138021523725055037">"Завантаження..."</string> <string name="capital_on" msgid="2770685323900821829">"УВІМК"</string> <string name="capital_off" msgid="7443704171014626777">"ВИМК"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"вибрано"</string> + <string name="not_checked" msgid="7972320087569023342">"не вибрано"</string> <string name="whichApplication" msgid="5432266899591255759">"Завершити дію за доп."</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Завершити дію за допомогою %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Завершити дію"</string> @@ -2072,6 +2072,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Розділити екран"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Заблокувати екран"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Знімок екрана"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> у спливаючому вікні."</string> </resources> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index b54653ed7c62..1dd8911fa4b3 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"دفتری پروفائل کی منتظم ایپ یا تو غائب ہے یا خراب ہے۔ اس کی وجہ سے، آپ کا دفتری پروفائل اور متعلقہ ڈیٹا حذف کر دیے گئے ہیں۔ مدد کیلئے اپنے منتظم سے رابطہ کریں۔"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"آپ کا دفتری پروفائل اس آلہ پر مزید دستیاب نہیں ہے"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"پاس ورڈ کی بہت ساری کوششیں"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"آلہ زیر انتظام ہے"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"آپ کی تنظیم اس آلے کا نظم کرتی ہے اور وہ نیٹ ورک ٹریفک کی نگرانی کر سکتی ہے۔ تفاصیل کیلئے تھپتھپائیں۔"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"آپ کا آلہ صاف کر دیا جائے گا"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"لوڈ ہو رہا ہے…"</string> <string name="capital_on" msgid="2770685323900821829">"آن"</string> <string name="capital_off" msgid="7443704171014626777">"آف"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"چیک کیا گیا"</string> + <string name="not_checked" msgid="7972320087569023342">"چیک نہیں کیا گیا"</string> <string name="whichApplication" msgid="5432266899591255759">"اس کا استعمال کرکے کارروائی مکمل کریں"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"%1$s کا استعمال کر کے کارروائی مکمل کریں"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"کارروائی مکمل کریں"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"اسپلٹ اسکرین ٹوگل کریں"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"مقفل اسکرین"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"اسکرین شاٹ"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"پوپ-اپ ونڈو میں <xliff:g id="APP_NAME">%1$s</xliff:g> ایپ۔"</string> </resources> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index c440e5321d46..4b7847d11de9 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Ishchi profilning administrator ilovasi yo‘q yoki buzilgan. Shuning uchun, ishchi profilingiz va unga aloqador ma’lumotlar o‘chirib tashlandi. Yordam olish uchun administratoringizga murojaat qiling."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Bu qurilmada endi ishchi profilingiz mavjud emas"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Parol ko‘p marta xato kiritildi"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Bu – boshqariladigan qurilma"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Tashkilotingiz bu qurilmani boshqaradi va tarmoq trafigini nazorat qilishi mumkin. Tafsilotlar uchun bosing."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Qurilmangizdagi ma’lumotlar o‘chirib tashlanadi"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Yuklanmoqda…"</string> <string name="capital_on" msgid="2770685323900821829">"I"</string> <string name="capital_off" msgid="7443704171014626777">"O"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"belgilandi"</string> + <string name="not_checked" msgid="7972320087569023342">"belgilanmadi"</string> <string name="whichApplication" msgid="5432266899591255759">"Ilovani tanlang"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"“%1$s” bilan ochish"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Amalni bajarish"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index e3623829a8bc..971cf34fd351 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Ứng dụng quản trị hồ sơ công việc bị thiếu hoặc hỏng. Do vậy, hồ sơ công việc của bạn và dữ liệu liên quan đã bị xóa. Hãy liên hệ với quản trị viên của bạn để được trợ giúp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Hồ sơ công việc của bạn không có sẵn trên thiết bị này nữa"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Quá nhiều lần nhập mật khẩu"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Thiết bị được quản lý"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Tổ chức của bạn sẽ quản lý thiết bị này và có thể theo dõi lưu lượng truy cập mạng. Nhấn để biết chi tiết."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Thiết bị của bạn sẽ bị xóa"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Đang tải…"</string> <string name="capital_on" msgid="2770685323900821829">"BẬT"</string> <string name="capital_off" msgid="7443704171014626777">"TẮT"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"đã chọn"</string> + <string name="not_checked" msgid="7972320087569023342">"chưa chọn"</string> <string name="whichApplication" msgid="5432266899591255759">"Hoàn tất tác vụ đang sử dụng"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Hoàn tất tác vụ bằng %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Hoàn thành tác vụ"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"Bật/tắt chế độ chia đôi màn hình"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"Khóa màn hình"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"Chụp ảnh màn hình"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"Ứng dụng <xliff:g id="APP_NAME">%1$s</xliff:g> trong Cửa sổ bật lên."</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 6df232adec81..d7dd8b19089b 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"工作资料管理应用缺失或损坏，因此系统已删除您的工作资料及相关数据。如需帮助，请与您的管理员联系。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"您的工作资料已不在此设备上"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"密码尝试次数过多"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"设备为受管理设备"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"贵单位会管理该设备，且可能会监控网络流量。点按即可了解详情。"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"系统将清空您的设备"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"正在加载..."</string> <string name="capital_on" msgid="2770685323900821829">"开启"</string> <string name="capital_off" msgid="7443704171014626777">"关闭"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"已勾选"</string> + <string name="not_checked" msgid="7972320087569023342">"未勾选"</string> <string name="whichApplication" msgid="5432266899591255759">"选择要使用的应用："</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"使用%1$s完成操作"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"完成操作"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"开启/关闭分屏"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"锁定屏幕"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"屏幕截图"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"以弹出式窗口形式打开的<xliff:g id="APP_NAME">%1$s</xliff:g>应用。"</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 41dcbed7001f..1a3784419393 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"工作設定檔管理員應用程式已遺失或損毀。因此，您的工作設定檔和相關資料已刪除。請聯絡您的管理員以取得協助。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"您的工作設定檔無法再在此裝置上使用"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"密碼輸入錯誤的次數過多"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"裝置已受管理"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"您的機構會管理此裝置，並可能會監控網絡流量。輕按即可瞭解詳情。"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"您的裝置將被清除"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"正在載入..."</string> <string name="capital_on" msgid="2770685323900821829">"開啟"</string> <string name="capital_off" msgid="7443704171014626777">"關"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"已勾選"</string> + <string name="not_checked" msgid="7972320087569023342">"未勾選"</string> <string name="whichApplication" msgid="5432266899591255759">"完成操作需使用"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"完成操作需使用 %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"完成操作"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"切換分割螢幕"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"將畫面上鎖"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"螢幕截圖"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式在彈出式視窗中顯示。"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index d49df97c2d79..5e655ac1faef 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"工作資料夾管理員應用程式遺失或已毀損，因此系統刪除了你的工作資料夾和相關資料。如需協助，請與你的管理員聯絡。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"你的工作資料夾已不在這個裝置上"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"密碼輸入錯誤的次數過多"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"裝置受到管理"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"貴機構會管理這個裝置，且可能監控網路流量。輕觸即可瞭解詳情。"</string> <string name="factory_reset_warning" msgid="6858705527798047809">"你的裝置資料將遭到清除"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"載入中…"</string> <string name="capital_on" msgid="2770685323900821829">"開啟"</string> <string name="capital_off" msgid="7443704171014626777">"關閉"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"已勾選"</string> + <string name="not_checked" msgid="7972320087569023342">"未勾選"</string> <string name="whichApplication" msgid="5432266899591255759">"選擇要使用的應用程式"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"完成操作需使用 %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"完成操作"</string> @@ -2004,6 +2004,5 @@ <string name="accessibility_system_action_toggle_split_screen_label" msgid="6626177163849387748">"切換分割畫面模式"</string> <string name="accessibility_system_action_lock_screen_label" msgid="5484190691945563838">"螢幕鎖定"</string> <string name="accessibility_system_action_screenshot_label" msgid="3581566515062741676">"擷取螢幕畫面"</string> - <!-- no translation found for accessibility_freeform_caption (7873194416838321119) --> - <skip /> + <string name="accessibility_freeform_caption" msgid="7873194416838321119">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」應用程式顯示在彈出式視窗中。"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index e99b592c395b..5f8d61ebc271 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -188,6 +188,8 @@ <string name="work_profile_deleted_details" msgid="3773706828364418016">"Uhlelo lokusebenza lokulawula lephrofayela yomsebenzi kungenzeka alukho noma lonakele. Njengomphumela, iphrofayela yakho yomsebenzi nedatha ehlobene isusiwe. Xhumana nomlawuli wakho ukuze uthole usizo."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="2477244968924647232">"Iphrofayela yakho yomsebenzi ayisatholakali kule divayisi"</string> <string name="work_profile_deleted_reason_maximum_password_failure" msgid="1080323158315663167">"Imizamo yamaphasiwedi eminingi kakhulu"</string> + <!-- no translation found for device_ownership_relinquished (4080886992183195724) --> + <skip /> <string name="network_logging_notification_title" msgid="554983187553845004">"Idivayisi iphethwe"</string> <string name="network_logging_notification_text" msgid="1327373071132562512">"Inhlangano yakho iphethe le divayisi futhi kungenzeka ingaqaphi ithrafikhi yenethiwekhi. Thephela imininingwane."</string> <string name="factory_reset_warning" msgid="6858705527798047809">"Idivayisi yakho izosulwa"</string> @@ -1116,10 +1118,8 @@ <string name="loading" msgid="3138021523725055037">"Iyalayisha…"</string> <string name="capital_on" msgid="2770685323900821829">"VULIWE"</string> <string name="capital_off" msgid="7443704171014626777">"VALIWE"</string> - <!-- no translation found for checked (9179896827054513119) --> - <skip /> - <!-- no translation found for not_checked (7972320087569023342) --> - <skip /> + <string name="checked" msgid="9179896827054513119">"kuhloliwe"</string> + <string name="not_checked" msgid="7972320087569023342">"akuhloliwe"</string> <string name="whichApplication" msgid="5432266899591255759">"Qedela isenzo usebenzisa"</string> <string name="whichApplicationNamed" msgid="6969946041713975681">"Qedela isenzo usebenzisa i-%1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"Qedela isenzo"</string> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index ffcfe4310f06..166cde0d7005 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -298,9 +298,6 @@ <!-- Additional flag from base permission type: this permission can be automatically granted to the system telephony apps --> <flag name="telephony" value="0x400000" /> - <!-- Additional flag from base permission type: this permission can be automatically - granted to the system wifi app--> - <flag name="wifi" value="0x800000" /> </attr> <!-- Flags indicating more context for a permission group. --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 74bb2cf6658d..6741feabe8b7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3517,6 +3517,7 @@ --> <string name="config_defaultWellbeingPackage" translatable="false"></string> + <!-- The package name for the system telephony apps. This package must be trusted, as it will be granted with permissions with special telephony protection level. Note, framework by default support multiple telephony apps, each package @@ -3525,13 +3526,6 @@ --> <string name="config_telephonyPackages" translatable="false">"com.android.phone,com.android.stk,com.android.providers.telephony,com.android.ons,com.android.cellbroadcastservice"</string> - <!-- The package name for the default system wifi app. - This package must be trusted, as it has the permissions to control wifi - connectivity on the device. - Example: "com.android.wifi" - --> - <string name="config_wifiPackage" translatable="false">"com.android.wifi"</string> - <!-- The component name for the default system attention service. This service must be trusted, as it can be activated without explicit consent of the user. See android.attention.AttentionManagerService. @@ -4179,4 +4173,10 @@ <!-- Whether or not to show the built-in charging animation when the device begins charging wirelessly. --> <bool name="config_showBuiltinWirelessChargingAnim">true</bool> + + <!-- A list of potential packages, in priority order, that can supply rules to + AppIntegrityManager. These need to be apps on the system partition. --> + <string-array name="config_integrityRuleProviderPackages" translatable="false"> + <!-- Add packages here --> + </string-array> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index a0aa18690b51..2d31f4910335 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5083,11 +5083,14 @@ data (for example, username, password and credit card info) [CHAR LIMIT=NONE] --> <string name="autofill_update_title_with_3types">Update these items in <b><xliff:g id="label" example="MyPass">%4$s</xliff:g></b>: <xliff:g id="type" example="Username">%1$s</xliff:g>, <xliff:g id="type" example="Password">%2$s</xliff:g>, and <xliff:g id="type" example="Credit Card">%3$s</xliff:g> ?</string> - <!-- Label for the autofill save button [CHAR LIMIT=NONE] --> <string name="autofill_save_yes">Save</string> <!-- Label for the autofill cancel button [CHAR LIMIT=NONE] --> <string name="autofill_save_no">No thanks</string> + <!-- Label for the autofill cancel button, saying not to save the filled data at this moment. [CHAR LIMIT=NONE] --> + <string name="autofill_save_notnow">Not now</string> + <!-- Label for the autofill reject button, saying never to save the filled data. [CHAR LIMIT=NONE] --> + <string name="autofill_save_never">Never</string> <!-- Label for the autofill update button [CHAR LIMIT=NONE] --> <string name="autofill_update_yes">Update</string> <!-- Label for the autofill continue button [CHAR LIMIT=NONE] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1d5133901064..130b31f092e0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -456,6 +456,7 @@ <java-symbol type="string" name="config_deviceSpecificDevicePolicyManagerService" /> <java-symbol type="string" name="config_deviceSpecificAudioService" /> <java-symbol type="integer" name="config_num_physical_slots" /> + <java-symbol type="array" name="config_integrityRuleProviderPackages" /> <java-symbol type="color" name="tab_indicator_text_v4" /> @@ -3247,6 +3248,8 @@ <java-symbol type="string" name="autofill_save_title_with_3types" /> <java-symbol type="string" name="autofill_save_yes" /> <java-symbol type="string" name="autofill_save_no" /> + <java-symbol type="string" name="autofill_save_notnow" /> + <java-symbol type="string" name="autofill_save_never" /> <java-symbol type="string" name="autofill_save_type_password" /> <java-symbol type="string" name="autofill_save_type_address" /> <java-symbol type="string" name="autofill_save_type_credit_card" /> @@ -3360,7 +3363,6 @@ <java-symbol type="array" name="config_defaultTextClassifierPackages" /> <java-symbol type="string" name="config_defaultWellbeingPackage" /> <java-symbol type="string" name="config_telephonyPackages" /> - <java-symbol type="string" name="config_wifiPackage" /> <java-symbol type="string" name="config_defaultContentCaptureService" /> <java-symbol type="string" name="config_defaultAugmentedAutofillService" /> <java-symbol type="string" name="config_defaultAppPredictionService" /> diff --git a/core/tests/coretests/src/android/app/timedetector/PhoneTimeSuggestionTest.java b/core/tests/coretests/src/android/app/timedetector/PhoneTimeSuggestionTest.java index 1b5ad8868a01..c9a86dcea84c 100644 --- a/core/tests/coretests/src/android/app/timedetector/PhoneTimeSuggestionTest.java +++ b/core/tests/coretests/src/android/app/timedetector/PhoneTimeSuggestionTest.java @@ -30,17 +30,22 @@ public class PhoneTimeSuggestionTest { @Test public void testEquals() { - PhoneTimeSuggestion one = - new PhoneTimeSuggestion(PHONE_ID, new TimestampedValue<>(1111L, 2222L)); + PhoneTimeSuggestion one = new PhoneTimeSuggestion(PHONE_ID); assertEquals(one, one); - PhoneTimeSuggestion two = - new PhoneTimeSuggestion(PHONE_ID, new TimestampedValue<>(1111L, 2222L)); + PhoneTimeSuggestion two = new PhoneTimeSuggestion(PHONE_ID); assertEquals(one, two); assertEquals(two, one); - PhoneTimeSuggestion three = - new PhoneTimeSuggestion(PHONE_ID + 1, new TimestampedValue<>(1111L, 2222L)); + one.setUtcTime(new TimestampedValue<>(1111L, 2222L)); + assertEquals(one, one); + + two.setUtcTime(new TimestampedValue<>(1111L, 2222L)); + assertEquals(one, two); + assertEquals(two, one); + + PhoneTimeSuggestion three = new PhoneTimeSuggestion(PHONE_ID + 1); + three.setUtcTime(new TimestampedValue<>(1111L, 2222L)); assertNotEquals(one, three); assertNotEquals(three, one); @@ -52,8 +57,10 @@ public class PhoneTimeSuggestionTest { @Test public void testParcelable() { - PhoneTimeSuggestion one = - new PhoneTimeSuggestion(PHONE_ID, new TimestampedValue<>(1111L, 2222L)); + PhoneTimeSuggestion one = new PhoneTimeSuggestion(PHONE_ID); + assertEquals(one, roundTripParcelable(one)); + + one.setUtcTime(new TimestampedValue<>(1111L, 2222L)); assertEquals(one, roundTripParcelable(one)); // DebugInfo should also be stored (but is not checked by equals() diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/AtomicFormulaTest.java b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java index 988e18b8e194..e48f1c3a89c7 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/model/AtomicFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/AtomicFormulaTest.java @@ -14,20 +14,19 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; -import static com.android.server.testutils.TestUtils.assertExpectException; +import static android.content.integrity.TestUtils.assertExpectException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import android.content.integrity.AtomicFormula.BooleanAtomicFormula; +import android.content.integrity.AtomicFormula.IntAtomicFormula; +import android.content.integrity.AtomicFormula.StringAtomicFormula; import android.os.Parcel; -import com.android.server.integrity.model.AtomicFormula.BooleanAtomicFormula; -import com.android.server.integrity.model.AtomicFormula.IntAtomicFormula; -import com.android.server.integrity.model.AtomicFormula.StringAtomicFormula; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -38,8 +37,8 @@ public class AtomicFormulaTest { @Test public void testValidAtomicFormula_stringValue() { StringAtomicFormula stringAtomicFormula = - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, - "com.test.app", /* isHashedValue= */ false); + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, "com.test.app", /* isHashedValue= */ false); assertEquals(AtomicFormula.PACKAGE_NAME, stringAtomicFormula.getKey()); } @@ -65,10 +64,12 @@ public class AtomicFormulaTest { assertExpectException( IllegalArgumentException.class, /* expectedExceptionMessageRegex */ - String.format( - "Key VERSION_CODE cannot be used with StringAtomicFormula"), - () -> new StringAtomicFormula(AtomicFormula.VERSION_CODE, "test-value", - /* isHashedValue= */ false)); + String.format("Key VERSION_CODE cannot be used with StringAtomicFormula"), + () -> + new StringAtomicFormula( + AtomicFormula.VERSION_CODE, + "test-value", + /* isHashedValue= */ false)); } @Test @@ -76,8 +77,7 @@ public class AtomicFormulaTest { assertExpectException( IllegalArgumentException.class, /* expectedExceptionMessageRegex */ - String.format( - "Key PACKAGE_NAME cannot be used with IntAtomicFormula"), + String.format("Key PACKAGE_NAME cannot be used with IntAtomicFormula"), () -> new IntAtomicFormula(AtomicFormula.PACKAGE_NAME, AtomicFormula.EQ, 1)); } @@ -86,16 +86,15 @@ public class AtomicFormulaTest { assertExpectException( IllegalArgumentException.class, /* expectedExceptionMessageRegex */ - String.format( - "Key PACKAGE_NAME cannot be used with BooleanAtomicFormula"), + String.format("Key PACKAGE_NAME cannot be used with BooleanAtomicFormula"), () -> new BooleanAtomicFormula(AtomicFormula.PACKAGE_NAME, true)); } @Test public void testIsSatisfiable_string_true() { StringAtomicFormula stringAtomicFormula = - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, - "com.test.app", /* isHashedValue= */ false); + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, "com.test.app", /* isHashedValue= */ false); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("com.test.app").build(); @@ -105,8 +104,8 @@ public class AtomicFormulaTest { @Test public void testIsSatisfiable_string_false() { StringAtomicFormula stringAtomicFormula = - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, - "com.test.app", /* isHashedValue= */ false); + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, "com.test.app", /* isHashedValue= */ false); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("com.foo.bar").build(); @@ -235,8 +234,9 @@ public class AtomicFormulaTest { @Test public void testParcelUnparcel_string() { - StringAtomicFormula formula = new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "abc", - /* isHashedValue= */ false); + StringAtomicFormula formula = + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, "abc", /* isHashedValue= */ false); Parcel p = Parcel.obtain(); formula.writeToParcel(p, 0); p.setDataPosition(0); diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/OpenFormulaTest.java b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java index b58ffd7dd6c6..927e4dbb5200 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/model/OpenFormulaTest.java +++ b/core/tests/coretests/src/android/content/integrity/CompoundFormulaTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; -import static com.android.server.testutils.TestUtils.assertExpectException; +import static android.content.integrity.TestUtils.assertExpectException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,21 +32,23 @@ import java.util.Arrays; import java.util.Collections; @RunWith(JUnit4.class) -public class OpenFormulaTest { +public class CompoundFormulaTest { private static final AtomicFormula ATOMIC_FORMULA_1 = - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "test1", - /* isHashedValue= */ false); + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, "test1", /* isHashedValue= */ false); private static final AtomicFormula ATOMIC_FORMULA_2 = new AtomicFormula.IntAtomicFormula(AtomicFormula.VERSION_CODE, AtomicFormula.EQ, 1); @Test - public void testValidOpenFormula() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + public void testValidCompoundFormula() { + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); - assertEquals(OpenFormula.AND, openFormula.getConnector()); - assertEquals(Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2), openFormula.getFormulas()); + assertEquals(CompoundFormula.AND, compoundFormula.getConnector()); + assertEquals( + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2), compoundFormula.getFormulas()); } @Test @@ -56,8 +58,8 @@ public class OpenFormulaTest { /* expectedExceptionMessageRegex */ "Connector AND must have at least 2 formulas", () -> - new OpenFormula( - OpenFormula.AND, Collections.singletonList(ATOMIC_FORMULA_1))); + new CompoundFormula( + CompoundFormula.AND, Collections.singletonList(ATOMIC_FORMULA_1))); } @Test @@ -67,158 +69,169 @@ public class OpenFormulaTest { /* expectedExceptionMessageRegex */ "Connector NOT must have 1 formula only", () -> - new OpenFormula( - OpenFormula.NOT, + new CompoundFormula( + CompoundFormula.NOT, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); } @Test public void testIsSatisfiable_notFalse_true() { - OpenFormula openFormula = new OpenFormula(OpenFormula.NOT, - Collections.singletonList(ATOMIC_FORMULA_1)); + CompoundFormula compoundFormula = + new CompoundFormula(CompoundFormula.NOT, Arrays.asList(ATOMIC_FORMULA_1)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test2").build(); // validate assumptions about the metadata assertFalse(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); - assertTrue(openFormula.isSatisfied(appInstallMetadata)); + assertTrue(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_notTrue_false() { - OpenFormula openFormula = new OpenFormula(OpenFormula.NOT, - Collections.singletonList(ATOMIC_FORMULA_1)); + CompoundFormula compoundFormula = + new CompoundFormula(CompoundFormula.NOT, Arrays.asList(ATOMIC_FORMULA_1)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test1").build(); // validate assumptions about the metadata assertTrue(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); - assertFalse(openFormula.isSatisfied(appInstallMetadata)); + assertFalse(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_trueAndTrue_true() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test1").setVersionCode(1).build(); // validate assumptions about the metadata assertTrue(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertTrue(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertTrue(openFormula.isSatisfied(appInstallMetadata)); + assertTrue(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_trueAndFalse_false() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test1").setVersionCode(2).build(); // validate assumptions about the metadata assertTrue(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertFalse(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertFalse(openFormula.isSatisfied(appInstallMetadata)); + assertFalse(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_falseAndTrue_false() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test2").setVersionCode(1).build(); // validate assumptions about the metadata assertFalse(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertTrue(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertFalse(openFormula.isSatisfied(appInstallMetadata)); + assertFalse(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_falseAndFalse_false() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test2").setVersionCode(2).build(); // validate assumptions about the metadata assertFalse(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertFalse(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertFalse(openFormula.isSatisfied(appInstallMetadata)); + assertFalse(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_trueOrTrue_true() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test1").setVersionCode(1).build(); // validate assumptions about the metadata assertTrue(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertTrue(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertTrue(openFormula.isSatisfied(appInstallMetadata)); + assertTrue(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_trueOrFalse_true() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test1").setVersionCode(2).build(); // validate assumptions about the metadata assertTrue(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertFalse(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertTrue(openFormula.isSatisfied(appInstallMetadata)); + assertTrue(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_falseOrTrue_true() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test2").setVersionCode(1).build(); // validate assumptions about the metadata assertFalse(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertTrue(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertTrue(openFormula.isSatisfied(appInstallMetadata)); + assertTrue(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testIsSatisfiable_falseOrFalse_false() { - OpenFormula openFormula = - new OpenFormula(OpenFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.OR, Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2)); AppInstallMetadata appInstallMetadata = getAppInstallMetadataBuilder().setPackageName("test2").setVersionCode(2).build(); // validate assumptions about the metadata assertFalse(ATOMIC_FORMULA_1.isSatisfied(appInstallMetadata)); assertFalse(ATOMIC_FORMULA_2.isSatisfied(appInstallMetadata)); - assertFalse(openFormula.isSatisfied(appInstallMetadata)); + assertFalse(compoundFormula.isSatisfied(appInstallMetadata)); } @Test public void testParcelUnparcel() { - OpenFormula formula = - new OpenFormula(OpenFormula.AND, Arrays.asList(ATOMIC_FORMULA_2, ATOMIC_FORMULA_1)); + CompoundFormula formula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(ATOMIC_FORMULA_2, ATOMIC_FORMULA_1)); Parcel p = Parcel.obtain(); formula.writeToParcel(p, 0); p.setDataPosition(0); - OpenFormula newFormula = OpenFormula.CREATOR.createFromParcel(p); + CompoundFormula newFormula = CompoundFormula.CREATOR.createFromParcel(p); assertEquals(formula, newFormula); } @Test - public void testInvalidOpenFormula_invalidConnector() { + public void testInvalidCompoundFormula_invalidConnector() { assertExpectException( IllegalArgumentException.class, /* expectedExceptionMessageRegex */ "Unknown connector: -1", - () -> new OpenFormula(/* connector= */ -1, - Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); + () -> + new CompoundFormula( + /* connector= */ -1, + Arrays.asList(ATOMIC_FORMULA_1, ATOMIC_FORMULA_2))); } /** Returns a builder with all fields filled with some dummy data. */ diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java b/core/tests/coretests/src/android/content/integrity/RuleTest.java index cad392826d42..19e74e6b93cc 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/model/RuleTest.java +++ b/core/tests/coretests/src/android/content/integrity/RuleTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.server.integrity.model; +package android.content.integrity; -import static com.android.server.testutils.TestUtils.assertExpectException; +import static android.content.integrity.TestUtils.assertExpectException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -60,11 +60,11 @@ public class RuleTest { @Test public void testToString() { - OpenFormula openFormula = - new OpenFormula( - OpenFormula.AND, + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList(PACKAGE_NAME_ATOMIC_FORMULA, APP_CERTIFICATE_ATOMIC_FORMULA)); - Rule rule = new Rule(openFormula, Rule.DENY); + Rule rule = new Rule(compoundFormula, Rule.DENY); assertEquals( String.format( @@ -93,12 +93,12 @@ public class RuleTest { public void testParcelUnparcel() { Rule rule = new Rule( - new OpenFormula( - OpenFormula.AND, + new CompoundFormula( + CompoundFormula.AND, Arrays.asList( APP_CERTIFICATE_ATOMIC_FORMULA, - new OpenFormula( - OpenFormula.NOT, + new CompoundFormula( + CompoundFormula.NOT, Arrays.asList(PACKAGE_NAME_ATOMIC_FORMULA)))), Rule.DENY); Parcel p = Parcel.obtain(); diff --git a/core/tests/coretests/src/android/content/integrity/TEST_MAPPING b/core/tests/coretests/src/android/content/integrity/TEST_MAPPING new file mode 100644 index 000000000000..2920716f5d5d --- /dev/null +++ b/core/tests/coretests/src/android/content/integrity/TEST_MAPPING @@ -0,0 +1,12 @@ +{ + "presubmit": [ + { + "name": "FrameworksCoreTests", + "options": [ + { + "include-filter": "android.content.integrity." + } + ] + } + ] +} diff --git a/core/tests/coretests/src/android/content/integrity/TestUtils.java b/core/tests/coretests/src/android/content/integrity/TestUtils.java new file mode 100644 index 000000000000..af984cf318f5 --- /dev/null +++ b/core/tests/coretests/src/android/content/integrity/TestUtils.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.content.integrity; + +import android.test.MoreAsserts; + +import junit.framework.Assert; + +/** Helper methods used in tests. */ +class TestUtils { + private TestUtils() {} + + public interface ExceptionRunnable { + void run() throws Exception; + } + + public static void assertExpectException( + Class<? extends Throwable> expectedExceptionType, + String expectedExceptionMessageRegex, + ExceptionRunnable r) { + try { + r.run(); + } catch (Throwable e) { + Assert.assertTrue( + "Expected exception type was " + + expectedExceptionType.getName() + + " but caught " + + e.getClass().getName(), + expectedExceptionType.isAssignableFrom(e.getClass())); + if (expectedExceptionMessageRegex != null) { + MoreAsserts.assertContainsRegex(expectedExceptionMessageRegex, e.getMessage()); + } + return; // Pass. + } + Assert.fail( + "Expected exception type " + expectedExceptionType.getName() + " was not thrown"); + } +} diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java index 17fe61d879f3..deb0f182156e 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java @@ -548,8 +548,10 @@ public class TextClassifierTest { } @Test - public void testSuggetsConversationActions_deduplicate() { - if (isTextClassifierDisabled()) return; + public void testSuggestConversationActions_deduplicate() { + Context context = new FakeContextBuilder() + .setIntentComponent(Intent.ACTION_SENDTO, FakeContextBuilder.DEFAULT_COMPONENT) + .build(); ConversationActions.Message message = new ConversationActions.Message.Builder( ConversationActions.Message.PERSON_USER_OTHERS) @@ -560,7 +562,8 @@ public class TextClassifierTest { .setMaxSuggestions(3) .build(); - ConversationActions conversationActions = mClassifier.suggestConversationActions(request); + TextClassifier classifier = new TextClassifierImpl(context, TC_CONSTANTS); + ConversationActions conversationActions = classifier.suggestConversationActions(request); Truth.assertThat(conversationActions.getConversationActions()).isEmpty(); } diff --git a/data/etc/preinstalled-packages-platform.xml b/data/etc/preinstalled-packages-platform.xml index ccd8b5bb5347..10fc59d2a999 100644 --- a/data/etc/preinstalled-packages-platform.xml +++ b/data/etc/preinstalled-packages-platform.xml @@ -16,19 +16,30 @@ <!-- This XML file declares which system packages should be initially installed for new users based on -the type of user. All system packages on the device should ideally have an entry in an xml file +their user type. All system packages on the device should ideally have an entry in an xml file (keys by its manifest name). -Main user-types (every user will be at least one of these types) are: +Base user-types (every user will be at least one of these types) are: SYSTEM (user 0) FULL (any non-profile human user) PROFILE (profile human user) - -Additional optional types are: GUEST, RESTRICTED, MANAGED_PROFILE, EPHEMERAL, DEMO - -The meaning of each of these user types is delineated by flags in +the precise meaning of which is defined in frameworks/base/core/java/android/content/pm/UserInfo.java. -See frameworks/base/services/core/java/com/android/server/pm/UserSystemPackageInstaller#getFlagsFromUserTypes +TODO(b/143784345): When UserInfo flags are categorized, reference the "base type" category here. + +More granular control is also available by specifying individual user types (every user is exactly +one of these user types). +This includes AOSP user types defined in frameworks/base/core/java/android/os/UserManager.java, like + android.os.usertype.full.SYSTEM + android.os.usertype.full.SECONDARY + android.os.usertype.full.GUEST + android.os.usertype.full.DEMO + android.os.usertype.full.RESTRICTED + android.os.usertype.profile.MANAGED + android.os.usertype.system.HEADLESS +as well as any OEM custom user types defined using +frameworks/base/services/core/java/com/android/server/pm/UserTypeFactory.java. +Any specified user types must be valid user types on the device (i.e. created in UserTypeFactory). The following three examples should cover most normal cases: @@ -63,16 +74,24 @@ Some system packages truly are required to be on all users, regardless of type, <install-in user-type="PROFILE"> </install-in-user-type> -More fine-grained options are also available (see below). Additionally, packages can blacklist -user types. Blacklists override any whitelisting (in any file). +More fine-grained options are also available by specifying individual user types. +E.g. + <install-in-user-type package="com.android.example"> + <install-in user-type="android.os.usertype.profile.MANAGED"> + <install-in user-type="android.os.usertype.full.GUEST"> + <install-in user-type="SYSTEM"> + </install-in-user-type> +which installs this package on any user whose user type is a managed profile or a guest, or is of +a SYSTEM base type. + +Additionally, packages can blacklist user types. Blacklists override any whitelisting (in any file). E.g. <install-in-user-type package="com.android.example"> <install-in user-type="FULL" /> - <do-not-install-in user-type="GUEST" /> + <do-not-install-in user-type="android.os.usertype.full.GUEST" /> </install-in-user-type> - -If a user is of type FULL and GUEST, this package will NOT be installed, because the -'do-not-install-in' takes precedence over 'install-in'. +If a user is of type android.os.usertype.full.GUEST (which itself is a subtype of FULL), this +package will NOT be installed, because the 'do-not-install-in' takes precedence over 'install-in'. The way that a device treats system packages that do not have any entry (for any user type) at all is determined by the config resource value config_userTypePackageWhitelistMode. diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index fe539e4ca22b..f2a6452d6e44 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -367,22 +367,4 @@ applications that come with the platform <permission name="android.permission.REBOOT"/> <permission name="android.permission.MANAGE_DYNAMIC_SYSTEM"/> </privapp-permissions> - - <privapp-permissions package="com.android.wifi"> - <permission name="android.permission.CHANGE_CONFIGURATION"/> - <permission name="android.permission.CONNECTIVITY_INTERNAL"/> - <permission name="android.permission.DUMP"/> - <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/> - <permission name="android.permission.INTERNAL_SYSTEM_WINDOW"/> - <permission name="android.permission.LOCAL_MAC_ADDRESS"/> - <permission name="android.permission.MANAGE_USERS"/> - <permission name="android.permission.PACKAGE_USAGE_STATS"/> - <permission name="android.permission.READ_DEVICE_CONFIG"/> - <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> - <permission name="android.permission.REQUEST_NETWORK_SCORES"/> - <permission name="android.permission.WRITE_SECURE_SETTINGS"/> - <permission name="android.permission.UPDATE_DEVICE_STATS"/> - <permission name="android.permission.UPDATE_APP_OPS_STATS"/> - <permission name="android.permission.LOCATION_HARDWARE"/> - </privapp-permissions> </permissions> diff --git a/libs/hwui/tests/unit/VectorDrawableTests.cpp b/libs/hwui/tests/unit/VectorDrawableTests.cpp index 60fd7a753f2d..6d4c57413f00 100644 --- a/libs/hwui/tests/unit/VectorDrawableTests.cpp +++ b/libs/hwui/tests/unit/VectorDrawableTests.cpp @@ -85,9 +85,9 @@ const static TestData sTestDataSet[] = { outPath->rCubicTo(8.0, 8.0, 8.0, 8.0, 8.0, 8.0); outPath->cubicTo(16.0, 16.0, 9.0, 9.0, 9.0, 9.0); outPath->rCubicTo(0.0, 0.0, 9.0, 9.0, 9.0, 9.0); - outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCW_Direction, 10.0, + outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPathDirection::kCW, 10.0, 10.0); - outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCW_Direction, 20.0, + outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPathDirection::kCW, 20.0, 20.0); }}, @@ -159,7 +159,7 @@ const static TestData sTestDataSet[] = { }, [](SkPath* outPath) { outPath->moveTo(300.0, 70.0); - outPath->arcTo(230.0, 230.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCCW_Direction, + outPath->arcTo(230.0, 230.0, 0.0, SkPath::kLarge_ArcSize, SkPathDirection::kCCW, 301.0, 70.0); outPath->close(); outPath->moveTo(300.0, 70.0); diff --git a/libs/hwui/utils/VectorDrawableUtils.cpp b/libs/hwui/utils/VectorDrawableUtils.cpp index 6b8f3154dd36..bd963df6750e 100644 --- a/libs/hwui/utils/VectorDrawableUtils.cpp +++ b/libs/hwui/utils/VectorDrawableUtils.cpp @@ -300,7 +300,7 @@ void PathResolver::addCommand(SkPath* outPath, char previousCmd, char cmd, // (rx ry x-axis-rotation large-arc-flag sweep-flag x y) outPath->arcTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), (SkPath::ArcSize) (points->at(k + 3) != 0), - (SkPath::Direction) (points->at(k + 4) == 0), + (SkPathDirection) (points->at(k + 4) == 0), points->at(k + 5) + currentX, points->at(k + 6) + currentY); currentX += points->at(k + 5); currentY += points->at(k + 6); @@ -310,7 +310,7 @@ void PathResolver::addCommand(SkPath* outPath, char previousCmd, char cmd, case 'A': // Draws an elliptical arc outPath->arcTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), (SkPath::ArcSize) (points->at(k + 3) != 0), - (SkPath::Direction) (points->at(k + 4) == 0), + (SkPathDirection) (points->at(k + 4) == 0), points->at(k + 5), points->at(k + 6)); currentX = points->at(k + 5); currentY = points->at(k + 6); diff --git a/location/TEST_MAPPING b/location/TEST_MAPPING index 2f386271dcb7..a9dbda458e3a 100644 --- a/location/TEST_MAPPING +++ b/location/TEST_MAPPING @@ -1,10 +1,13 @@ { "presubmit": [ { + "name": "CtsLocationFineTestCases" + }, + { "name": "CtsLocationCoarseTestCases" }, { "name": "CtsLocationNoneTestCases" } ] -} +}
\ No newline at end of file diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 4a50210d1a60..7b2922ba961b 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -50,6 +50,7 @@ import android.util.Log; import android.util.Pair; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.content.FileSystemProvider; import com.android.internal.util.IndentingPrintWriter; @@ -308,37 +309,26 @@ public class ExternalStorageProvider extends FileSystemProvider { @Override protected boolean shouldBlockFromTree(@NonNull String docId) { try { - final File dir = getFileForDocId(docId, true /* visible */).getCanonicalFile(); - if (!dir.isDirectory()) { + final File dir = getFileForDocId(docId, false /* visible */); + + // the file is null or it is not a directory + if (dir == null || !dir.isDirectory()) { return false; } - final String path = dir.getAbsolutePath(); + final String path = getPathFromDocId(docId); - // Block Download folder from tree - if (MediaStore.Downloads.isDownloadDir(path)) { + // Block the root of the storage + if (path.isEmpty()) { return true; } - final ArrayMap<String, RootInfo> roots = new ArrayMap<>(); - - synchronized (mRootsLock) { - roots.putAll(mRoots); + // Block Download folder from tree + if (TextUtils.equals(Environment.DIRECTORY_DOWNLOADS.toLowerCase(), + path.toLowerCase())) { + return true; } - // block root of storage - for (int i = 0; i < roots.size(); i++) { - RootInfo rootInfo = roots.valueAt(i); - // skip home root - if (TextUtils.equals(rootInfo.rootId, ROOT_ID_HOME)) { - continue; - } - - // block the root of storage - if (TextUtils.equals(path, rootInfo.visiblePath.getAbsolutePath())) { - return true; - } - } return false; } catch (IOException e) { throw new IllegalArgumentException( @@ -430,6 +420,23 @@ public class ExternalStorageProvider extends FileSystemProvider { return Pair.create(root, buildFile(root, docId, visible, true)); } + @VisibleForTesting + static String getPathFromDocId(String docId) { + final int splitIndex = docId.indexOf(':', 1); + final String path = docId.substring(splitIndex + 1); + + if (path.isEmpty()) { + return path; + } + + // remove trailing "/" + if (path.charAt(path.length() - 1) == '/') { + return path.substring(0, path.length() - 1); + } else { + return path; + } + } + private RootInfo getRootFromDocId(String docId) throws FileNotFoundException { final int splitIndex = docId.indexOf(':', 1); final String tag = docId.substring(0, splitIndex); diff --git a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java index fbf2e4b8ff19..ed8320fa7fef 100644 --- a/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java +++ b/packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java @@ -17,7 +17,10 @@ package com.android.externalstorage; import static com.android.externalstorage.ExternalStorageProvider.AUTHORITY; +import static com.android.externalstorage.ExternalStorageProvider.getPathFromDocId; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -51,4 +54,18 @@ public class ExternalStorageProviderTest { verify(spyProvider, atLeast(1)).updateVolumes(); } + + @Test + public void testGetPathFromDocId() throws Exception { + final String root = "root"; + final String path = "abc/def/ghi"; + String docId = root + ":" + path; + assertEquals(getPathFromDocId(docId), path); + + docId = root + ":" + path + "/"; + assertEquals(getPathFromDocId(docId), path); + + docId = root + ":"; + assertTrue(getPathFromDocId(docId).isEmpty()); + } } diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index 23754c5c73f9..23b16e811606 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -224,9 +224,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro mConnectivityManager = connectivityManager; // check if verbose logging developer option has been turned on or off - sVerboseLogging = Settings.Global.getInt( - mContext.getContentResolver(), - Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, 0) > 0; + sVerboseLogging = mWifiManager != null && (mWifiManager.getVerboseLoggingLevel() > 0); mFilter = filter; diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 146f30d788d3..3b929b901e49 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -126,6 +126,7 @@ public class SecureSettings { Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, Settings.Secure.SHOW_NOTIFICATION_SNOOZE, + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, Settings.Secure.ZEN_DURATION, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, Settings.Secure.SHOW_ZEN_SETTINGS_SUGGESTION, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 0c3254a5ed02..9460d27f7843 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -182,6 +182,7 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SHOW_NOTIFICATION_SNOOZE, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.NOTIFICATION_HISTORY_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ZEN_DURATION, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.SHOW_ZEN_SETTINGS_SUGGESTION, BOOLEAN_VALIDATOR); diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING new file mode 100644 index 000000000000..281406f24cb2 --- /dev/null +++ b/packages/SystemUI/TEST_MAPPING @@ -0,0 +1,23 @@ +{ + // Looking for unit test presubmit configuration? + // This currently lives in ATP config apct/system_ui/unit_test + "staged-platinum-postsubmit": [ + { + "name": "PlatformScenarioTests", + "options": [ + { + "include-filter": "android.platform.test.scenario.sysui" + }, + { + "include-filter": "android.platform.test.scenario.quicksettings" + }, + { + "include-filter": "android.platform.test.scenario.notification" + }, + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + } + ] +} diff --git a/packages/SystemUI/res/drawable/action_chip_background.xml b/packages/SystemUI/res/drawable/action_chip_background.xml new file mode 100644 index 000000000000..fc3dfeb9c1fd --- /dev/null +++ b/packages/SystemUI/res/drawable/action_chip_background.xml @@ -0,0 +1,27 @@ +<?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. + --> +<ripple + xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/global_screenshot_button_ripple"> + <item android:id="@android:id/background"> + <shape android:shape="rectangle"> + <stroke android:width="1dp" android:color="@color/global_screenshot_button_text"/> + <solid android:color="@color/global_screenshot_button_background"/> + <corners android:radius="@dimen/screenshot_button_corner_radius"/> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/action_chip_container_background.xml b/packages/SystemUI/res/drawable/action_chip_container_background.xml new file mode 100644 index 000000000000..095213e38e92 --- /dev/null +++ b/packages/SystemUI/res/drawable/action_chip_container_background.xml @@ -0,0 +1,21 @@ +<?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. + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="@color/global_screenshot_button_background"/> + <corners android:radius="@dimen/screenshot_action_container_corner_radius"/> +</shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/global_screenshot.xml b/packages/SystemUI/res/layout/global_screenshot.xml index 59952e09555f..6ac9da4291c6 100644 --- a/packages/SystemUI/res/layout/global_screenshot.xml +++ b/packages/SystemUI/res/layout/global_screenshot.xml @@ -39,4 +39,13 @@ android:layout_height="match_parent" android:visibility="gone" android:pointerIcon="crosshair"/> + <LinearLayout + android:id="@+id/global_screenshot_actions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center" + android:gravity="center" + android:paddingVertical="@dimen/screenshot_action_container_padding" + android:visibility="gone" + android:background="@drawable/action_chip_container_background"/> </FrameLayout> diff --git a/packages/SystemUI/res/layout/global_screenshot_action_chip.xml b/packages/SystemUI/res/layout/global_screenshot_action_chip.xml new file mode 100644 index 000000000000..6b424002d7ff --- /dev/null +++ b/packages/SystemUI/res/layout/global_screenshot_action_chip.xml @@ -0,0 +1,25 @@ +<?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. + --> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/global_screenshot_action_chip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/screenshot_action_chip_margin_horizontal" + android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical" + android:paddingHorizontal="@dimen/screenshot_action_chip_padding_horizontal" + android:background="@drawable/action_chip_background" + android:textColor="@color/global_screenshot_button_text"/> diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml index 0febc8ed4262..9a66e8bc8791 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -78,6 +78,11 @@ <!-- The color of the text in the Global Actions menu --> <color name="global_actions_alert_text">@color/GM2_red_300</color> + <!-- Global screenshot actions --> + <color name="global_screenshot_button_background">@color/GM2_grey_900</color> + <color name="global_screenshot_button_ripple">#42FFFFFF</color> + <color name="global_screenshot_button_text">@color/GM2_blue_300</color> + <!-- Biometric dialog colors --> <color name="biometric_dialog_gray">#ff888888</color> <color name="biometric_dialog_accent">#ff80cbc4</color> <!-- light teal --> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index bda1c52f27c0..92c74770a3c4 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -180,6 +180,11 @@ <!-- Color for the Assistant invocation lights --> <color name="default_invocation_lights_color">#ffffffff</color> <!-- white --> + <!-- Global screenshot actions --> + <color name="global_screenshot_button_background">#F5F5F5</color> + <color name="global_screenshot_button_ripple">#1f000000</color> + <color name="global_screenshot_button_text">@color/GM2_blue_500</color> + <!-- GM2 colors --> <color name="GM2_grey_50">#F8F9FA</color> <color name="GM2_grey_100">#F1F3F4</color> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 86ef0310b4eb..076cd226f931 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -281,7 +281,6 @@ <item>com.android.systemui.statusbar.phone.StatusBar</item> <item>com.android.systemui.usb.StorageNotification</item> <item>com.android.systemui.power.PowerUI</item> - <item>com.android.systemui.power.InattentiveSleepWarningController</item> <item>com.android.systemui.media.RingtonePlayer</item> <item>com.android.systemui.keyboard.KeyboardUI</item> <item>com.android.systemui.pip.PipUI</item> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 64b2892efc9a..f7b92b564dac 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -285,8 +285,18 @@ <!-- the padding between dots in the icon overflow --> <dimen name="overflow_icon_dot_padding">3dp</dimen> + <!-- Dimensions related to screenshots --> + <!-- The padding on the global screenshot background image --> <dimen name="global_screenshot_bg_padding">20dp</dimen> + <dimen name="screenshot_action_container_corner_radius">10dp</dimen> + <dimen name="screenshot_action_container_padding">20dp</dimen> + <!-- Radius of the chip background on global screenshot actions --> + <dimen name="screenshot_button_corner_radius">20dp</dimen> + <dimen name="screenshot_action_chip_margin_horizontal">10dp</dimen> + <dimen name="screenshot_action_chip_padding_vertical">10dp</dimen> + <dimen name="screenshot_action_chip_padding_horizontal">15dp</dimen> + <!-- The width of the view containing navigation buttons --> <dimen name="navigation_key_width">70dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java index 2ec09a9dbea2..793f8b9bc05b 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java @@ -686,6 +686,10 @@ public class StackAnimationController extends } else { // If there's no other bubbles, and we were in the dismiss target, reset the flag. mWithinDismissTarget = false; + // When all children are removed ensure stack position is sane + setStackPosition(mRestingStackPosition == null + ? getDefaultStartPosition() + : mRestingStackPosition); } } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java index 25986c5f4160..3cf14d65e5b8 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIBinder.java @@ -25,7 +25,6 @@ import com.android.systemui.biometrics.AuthController; import com.android.systemui.globalactions.GlobalActionsComponent; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.pip.PipUI; -import com.android.systemui.power.InattentiveSleepWarningController; import com.android.systemui.power.PowerUI; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsModule; @@ -103,13 +102,6 @@ public abstract class SystemUIBinder { @ClassKey(PowerUI.class) public abstract SystemUI bindPowerUI(PowerUI sysui); - /** Inject into InattentiveSleepWarningController. */ - @Binds - @IntoMap - @ClassKey(InattentiveSleepWarningController.class) - public abstract SystemUI bindInattentiveSleepWarningController( - InattentiveSleepWarningController sysui); - /** Inject into Recents. */ @Binds @IntoMap diff --git a/packages/SystemUI/src/com/android/systemui/dock/DockManager.java b/packages/SystemUI/src/com/android/systemui/dock/DockManager.java index c7637fb42889..b6f7cd04c75f 100644 --- a/packages/SystemUI/src/com/android/systemui/dock/DockManager.java +++ b/packages/SystemUI/src/com/android/systemui/dock/DockManager.java @@ -35,6 +35,12 @@ public interface DockManager { int STATE_DOCKED_HIDE = 2; /** + * Indicates there's no alignment info. This could happen when the device is unable to decide + * its alignment condition. + */ + int ALIGN_STATE_UNKNOWN = -1; + + /** * Indicates there's no alignment issue. */ int ALIGN_STATE_GOOD = 0; diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index d5f5a5a00500..53053fc27216 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -17,9 +17,11 @@ package com.android.systemui.globalactions; import static android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; +import android.annotation.Nullable; +import android.annotation.StringRes; import android.app.Dialog; -import android.app.KeyguardManager; import android.content.Context; +import android.os.PowerManager; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -134,14 +136,22 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks, int color = Utils.getColorAttrDefaultColor(mContext, com.android.systemui.R.attr.wallpaperTextColor); - boolean onKeyguard = mContext.getSystemService( - KeyguardManager.class).isKeyguardLocked(); ProgressBar bar = d.findViewById(R.id.progress); bar.getIndeterminateDrawable().setTint(color); - TextView message = d.findViewById(R.id.text1); - message.setTextColor(color); - if (isReboot) message.setText(R.string.reboot_to_reset_message); + + TextView reasonView = d.findViewById(R.id.text1); + TextView messageView = d.findViewById(R.id.text2); + + reasonView.setTextColor(color); + messageView.setTextColor(color); + + messageView.setText(getRebootMessage(isReboot, reason)); + String rebootReasonMessage = getReasonMessage(reason); + if (rebootReasonMessage != null) { + reasonView.setVisibility(View.VISIBLE); + reasonView.setText(rebootReasonMessage); + } GradientColors colors = Dependency.get(SysuiColorExtractor.class).getNeutralColors(); background.setColor(colors.getMainColor(), false); @@ -149,6 +159,30 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks, d.show(); } + @StringRes + private int getRebootMessage(boolean isReboot, @Nullable String reason) { + if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) { + return R.string.reboot_to_update_reboot; + } else if (reason != null && reason.equals(PowerManager.REBOOT_RECOVERY)) { + return R.string.reboot_to_reset_message; + } else if (isReboot) { + return R.string.reboot_to_reset_message; + } else { + return R.string.shutdown_progress; + } + } + + @Nullable + private String getReasonMessage(@Nullable String reason) { + if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) { + return mContext.getString(R.string.reboot_to_update_title); + } else if (reason != null && reason.equals(PowerManager.REBOOT_RECOVERY)) { + return mContext.getString(R.string.reboot_to_reset_title); + } else { + return null; + } + } + @Override public void disable(int displayId, int state1, int state2, boolean animate) { final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0; diff --git a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java b/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java deleted file mode 100644 index 7d4bd019e72b..000000000000 --- a/packages/SystemUI/src/com/android/systemui/power/InattentiveSleepWarningController.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.power; - -import android.content.Context; - -import com.android.systemui.SystemUI; -import com.android.systemui.statusbar.CommandQueue; - -import javax.inject.Inject; -import javax.inject.Singleton; - -/** - * Receives messages sent from {@link com.android.server.power.InattentiveSleepWarningController} - * and shows the appropriate inattentive sleep UI (e.g. {@link InattentiveSleepWarningView}). - */ -@Singleton -public class InattentiveSleepWarningController extends SystemUI implements CommandQueue.Callbacks { - private final CommandQueue mCommandQueue; - private InattentiveSleepWarningView mOverlayView; - - @Inject - public InattentiveSleepWarningController(Context context, CommandQueue commandQueue) { - super(context); - mCommandQueue = commandQueue; - } - - @Override - public void start() { - mCommandQueue.addCallback(this); - } - - @Override - public void showInattentiveSleepWarning() { - if (mOverlayView == null) { - mOverlayView = new InattentiveSleepWarningView(mContext); - } - - mOverlayView.show(); - } - - @Override - public void dismissInattentiveSleepWarning(boolean animated) { - if (mOverlayView != null) { - mOverlayView.dismiss(animated); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index f60d9db7ac9c..59ac329e1983 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -46,6 +46,7 @@ import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.broadcast.BroadcastDispatcher; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.StatusBar; import java.io.FileDescriptor; @@ -60,7 +61,7 @@ import javax.inject.Singleton; import dagger.Lazy; @Singleton -public class PowerUI extends SystemUI { +public class PowerUI extends SystemUI implements CommandQueue.Callbacks { static final String TAG = "PowerUI"; static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -80,6 +81,7 @@ public class PowerUI extends SystemUI { private PowerManager mPowerManager; private WarningsUI mWarnings; + private InattentiveSleepWarningView mOverlayView; private final Configuration mLastConfiguration = new Configuration(); private int mPlugType = 0; private int mInvalidCharger = 0; @@ -105,13 +107,15 @@ public class PowerUI extends SystemUI { private IThermalEventListener mSkinThermalEventListener; private IThermalEventListener mUsbThermalEventListener; private final BroadcastDispatcher mBroadcastDispatcher; + private final CommandQueue mCommandQueue; private final Lazy<StatusBar> mStatusBarLazy; @Inject public PowerUI(Context context, BroadcastDispatcher broadcastDispatcher, - Lazy<StatusBar> statusBarLazy) { + CommandQueue commandQueue, Lazy<StatusBar> statusBarLazy) { super(context); mBroadcastDispatcher = broadcastDispatcher; + mCommandQueue = commandQueue; mStatusBarLazy = statusBarLazy; } @@ -162,6 +166,7 @@ public class PowerUI extends SystemUI { } }); initThermalEventListeners(); + mCommandQueue.addCallback(this); } @Override @@ -581,6 +586,22 @@ public class PowerUI extends SystemUI { } } + @Override + public void showInattentiveSleepWarning() { + if (mOverlayView == null) { + mOverlayView = new InattentiveSleepWarningView(mContext); + } + + mOverlayView.show(); + } + + @Override + public void dismissInattentiveSleepWarning(boolean animated) { + if (mOverlayView != null) { + mOverlayView.dismiss(animated); + } + } + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.print("mLowBatteryAlertCloseLevel="); pw.println(mLowBatteryAlertCloseLevel); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 16a39750a9bd..001e09406e3a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -73,7 +73,6 @@ public class HotspotTile extends QSTileImpl<BooleanState> { if (listening) { refreshState(); } - mHotspotController.handleSetListening(listening); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index 66cd91996cea..fedd855a858e 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -19,6 +19,7 @@ package com.android.systemui.screenshot; import static android.content.Context.NOTIFICATION_SERVICE; import static android.os.AsyncTask.THREAD_POOL_EXECUTOR; import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI; +import static android.view.View.VISIBLE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.SCREENSHOT_CORNER_FLOW; @@ -69,6 +70,8 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.view.animation.Interpolator; import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; import android.widget.Toast; import com.android.internal.annotations.VisibleForTesting; @@ -89,7 +92,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; -import java.util.function.Function; import javax.inject.Inject; import javax.inject.Singleton; @@ -110,7 +112,7 @@ public class GlobalScreenshot { public Bitmap image; public Uri imageUri; public Consumer<Uri> finisher; - public Function<PendingIntent, Void> onEditReady; + public GlobalScreenshot.ActionsReadyListener mActionsReadyListener; public int iconSize; public int previewWidth; public int previewheight; @@ -127,6 +129,10 @@ public class GlobalScreenshot { } } + abstract static class ActionsReadyListener { + abstract void onActionsReady(PendingIntent shareAction, PendingIntent editAction); + } + // These strings are used for communicating the action invoked to // ScreenshotNotificationSmartActionsProvider. static final String EXTRA_ACTION_TYPE = "android:screenshot_action_type"; @@ -175,6 +181,10 @@ public class GlobalScreenshot { private ImageView mBackgroundView; private ImageView mScreenshotView; private ImageView mScreenshotFlash; + private LinearLayout mActionsView; + private TextView mShareAction; + private TextView mEditAction; + private TextView mScrollAction; private AnimatorSet mScreenshotAnimation; @@ -211,17 +221,31 @@ public class GlobalScreenshot { mScreenshotLayout = layoutInflater.inflate(R.layout.global_screenshot, null); mBackgroundView = mScreenshotLayout.findViewById(R.id.global_screenshot_background); mScreenshotView = mScreenshotLayout.findViewById(R.id.global_screenshot); + mActionsView = mScreenshotLayout.findViewById(R.id.global_screenshot_actions); + + mShareAction = (TextView) layoutInflater.inflate( + R.layout.global_screenshot_action_chip, mActionsView, false); + mEditAction = (TextView) layoutInflater.inflate( + R.layout.global_screenshot_action_chip, mActionsView, false); + mScrollAction = (TextView) layoutInflater.inflate( + R.layout.global_screenshot_action_chip, mActionsView, false); + + mShareAction.setText(com.android.internal.R.string.share); + mEditAction.setText(com.android.internal.R.string.screenshot_edit); + mScrollAction.setText("Scroll"); // TODO (mkephart): Add to resources and translate + + mActionsView.addView(mShareAction); + mActionsView.addView(mEditAction); + mActionsView.addView(mScrollAction); + mScreenshotFlash = mScreenshotLayout.findViewById(R.id.global_screenshot_flash); mScreenshotSelectorView = mScreenshotLayout.findViewById(R.id.global_screenshot_selector); mScreenshotLayout.setFocusable(true); mScreenshotSelectorView.setFocusable(true); mScreenshotSelectorView.setFocusableInTouchMode(true); - mScreenshotLayout.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - // Intercept and ignore all touch events - return true; - } + mScreenshotLayout.setOnTouchListener((v, event) -> { + // Intercept and ignore all touch events + return true; }); // Setup the window that we are going to use @@ -271,13 +295,13 @@ public class GlobalScreenshot { * Creates a new worker thread and saves the screenshot to the media store. */ private void saveScreenshotInWorkerThread( - Consumer<Uri> finisher, @Nullable Function<PendingIntent, Void> onEditReady) { + Consumer<Uri> finisher, @Nullable ActionsReadyListener actionsReadyListener) { SaveImageInBackgroundData data = new SaveImageInBackgroundData(); data.context = mContext; data.image = mScreenBitmap; data.iconSize = mNotificationIconSize; data.finisher = finisher; - data.onEditReady = onEditReady; + data.mActionsReadyListener = actionsReadyListener; data.previewWidth = mPreviewWidth; data.previewheight = mPreviewHeight; if (mSaveInBgTask != null) { @@ -395,6 +419,7 @@ public class GlobalScreenshot { // Clear any references to the bitmap mScreenBitmap = null; mScreenshotView.setImageBitmap(null); + mActionsView.setVisibility(View.GONE); mBackgroundView.setVisibility(View.GONE); mScreenshotView.setVisibility(View.GONE); mScreenshotView.setLayerType(View.LAYER_TYPE_NONE, null); @@ -441,24 +466,13 @@ public class GlobalScreenshot { saveScreenshotInWorkerThread(finisher); clearScreenshot(); } else { - mScreenshotView.requestFocus(); - mScreenshotView.setOnClickListener((v) -> { - // TODO: remove once we have a better UI to show that we aren't ready yet - Toast notReadyToast = Toast.makeText( - mContext, "Screenshot is not ready yet", Toast.LENGTH_SHORT); - notReadyToast.show(); - }); - saveScreenshotInWorkerThread(finisher, intent -> { - mScreenshotHandler.post(() -> mScreenshotView.setOnClickListener(v -> { - try { - intent.send(); - clearScreenshot(); - } catch (PendingIntent.CanceledException e) { - Log.e(TAG, "Edit intent cancelled", e); - } - mScreenshotHandler.removeMessages(MESSAGE_CORNER_TIMEOUT); - })); - return null; + saveScreenshotInWorkerThread(finisher, new ActionsReadyListener() { + @Override + void onActionsReady(PendingIntent shareAction, PendingIntent editAction) { + mScreenshotHandler.post(() -> + createScreenshotActionsShadeAnimation(shareAction, editAction) + .start()); + } }); mScreenshotHandler.sendMessageDelayed( mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT), @@ -664,6 +678,49 @@ public class GlobalScreenshot { return anim; } + private ValueAnimator createScreenshotActionsShadeAnimation( + PendingIntent shareAction, PendingIntent editAction) { + ValueAnimator animator = ValueAnimator.ofFloat(0, 1); + mActionsView.setY(mDisplayMetrics.heightPixels); + mActionsView.setVisibility(VISIBLE); + mActionsView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); + float actionsViewHeight = mActionsView.getMeasuredHeight(); + float screenshotStartHeight = mScreenshotView.getTranslationY(); + + animator.addUpdateListener(animation -> { + float t = animation.getAnimatedFraction(); + mScreenshotView.setTranslationY(screenshotStartHeight - actionsViewHeight * t); + mActionsView.setY(mDisplayMetrics.heightPixels - actionsViewHeight * t); + }); + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + super.onAnimationEnd(animation); + mScreenshotView.requestFocus(); + mShareAction.setOnClickListener(v -> { + try { + shareAction.send(); + clearScreenshot(); + } catch (PendingIntent.CanceledException e) { + Log.e(TAG, "Share intent cancelled", e); + } + }); + mEditAction.setOnClickListener(v -> { + try { + editAction.send(); + clearScreenshot(); + } catch (PendingIntent.CanceledException e) { + Log.e(TAG, "Edit intent cancelled", e); + } + }); + Toast scrollNotImplemented = Toast.makeText( + mContext, "Not implemented", Toast.LENGTH_SHORT); + mScrollAction.setOnClickListener(v -> scrollNotImplemented.show()); + } + }); + return animator; + } + static void notifyScreenshotError(Context context, NotificationManager nManager, int msgResId) { Resources r = context.getResources(); String errorMsg = r.getString(msgResId); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java b/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java index 5e5cf743b468..d2268e12c662 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java @@ -434,8 +434,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { R.drawable.ic_screenshot_edit, r.getString(com.android.internal.R.string.screenshot_edit), editAction); notificationBuilder.addAction(editActionBuilder.build()); - if (editAction != null && mParams.onEditReady != null) { - mParams.onEditReady.apply(editAction); + if (mParams.mActionsReadyListener != null) { + mParams.mActionsReadyListener.onActionsReady(shareAction, editAction); } // Create a delete action for the notification @@ -472,7 +472,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { GlobalScreenshot.notifyScreenshotError(mParams.context, mNotificationManager, mParams.errorMsgResId); } else { - if (mParams.onEditReady != null) { + if (mParams.mActionsReadyListener != null) { // Cancel the "saving screenshot" notification mNotificationManager.cancel( SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java index 8b06a9fa05a1..830b50e35490 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotController.java @@ -20,8 +20,6 @@ import com.android.systemui.Dumpable; import com.android.systemui.statusbar.policy.HotspotController.Callback; public interface HotspotController extends CallbackController<Callback>, Dumpable { - void handleSetListening(boolean listening); - boolean isHotspotEnabled(); boolean isHotspotTransient(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java index 6331a2d6db1c..cd6ec05d90ec 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java @@ -54,7 +54,6 @@ public class HotspotControllerImpl implements HotspotController, WifiManager.Sof private int mHotspotState; private volatile int mNumConnectedDevices; private boolean mWaitingForTerminalState; - private boolean mListening; /** * Controller used to retrieve information related to a hotspot. @@ -109,19 +108,14 @@ public class HotspotControllerImpl implements HotspotController, WifiManager.Sof if (DEBUG) Log.d(TAG, "addCallback " + callback); mCallbacks.add(callback); if (mWifiManager != null) { - if (mListening) { - if (mCallbacks.size() == 1) { - mWifiManager.registerSoftApCallback(new HandlerExecutor(mMainHandler), - this); - } else { - // mWifiManager#registerSoftApCallback triggers a call to - // onConnectedClientsChanged on the Main Handler. In order to always update - // the callback on added, we make this call when adding callbacks after the - // first. - mMainHandler.post(() -> - callback.onHotspotChanged(isHotspotEnabled(), - mNumConnectedDevices)); - } + if (mCallbacks.size() == 1) { + mWifiManager.registerSoftApCallback(new HandlerExecutor(mMainHandler), this); + } else { + // mWifiManager#registerSoftApCallback triggers a call to onNumClientsChanged + // on the Main Handler. In order to always update the callback on added, we + // make this call when adding callbacks after the first. + mMainHandler.post(() -> + callback.onHotspotChanged(isHotspotEnabled(), mNumConnectedDevices)); } } } @@ -133,24 +127,13 @@ public class HotspotControllerImpl implements HotspotController, WifiManager.Sof if (DEBUG) Log.d(TAG, "removeCallback " + callback); synchronized (mCallbacks) { mCallbacks.remove(callback); - if (mCallbacks.isEmpty() && mWifiManager != null && mListening) { + if (mCallbacks.isEmpty() && mWifiManager != null) { mWifiManager.unregisterSoftApCallback(this); } } } @Override - public void handleSetListening(boolean listening) { - // Wait for the first |handleSetListening(true))| to register softap callbacks (for lazy - // registration of the softap callbacks). - if (mListening || !listening) return; - mListening = true; - if (mCallbacks.size() >= 1) { - mWifiManager.registerSoftApCallback(new HandlerExecutor(mMainHandler), this); - } - } - - @Override public boolean isHotspotEnabled() { return mHotspotState == WifiManager.WIFI_AP_STATE_ENABLED; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 05a4b290fb7b..24492bf3ca5b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -325,7 +325,6 @@ public class NetworkControllerImpl extends BroadcastReceiver filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); filter.addAction(ConnectivityManager.INET_CONDITION_ACTION); filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); - filter.addAction(Intent.ACTION_BOOT_COMPLETED); filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED); mBroadcastDispatcher.registerReceiver(this, filter, mReceiverHandler); mListening = true; @@ -543,9 +542,6 @@ public class NetworkControllerImpl extends BroadcastReceiver recalculateEmergency(); } break; - case Intent.ACTION_BOOT_COMPLETED: - mWifiSignalController.handleBootCompleted(); - break; case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED: mConfig = Config.readConfig(mContext); mReceiverHandler.post(this::handleConfigurationChanged); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java index 5a4332105e57..e7d1c95db0e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java @@ -38,7 +38,6 @@ import java.util.Objects; public class WifiSignalController extends SignalController<WifiSignalController.WifiState, SignalController.IconGroup> { private final boolean mHasMobileData; - private final WifiManager mWifiManager; private final WifiStatusTracker mWifiTracker; public WifiSignalController(Context context, boolean hasMobileData, @@ -50,11 +49,13 @@ public class WifiSignalController extends context.getSystemService(NetworkScoreManager.class); ConnectivityManager connectivityManager = context.getSystemService(ConnectivityManager.class); - mWifiManager = wifiManager; mWifiTracker = new WifiStatusTracker(mContext, wifiManager, networkScoreManager, connectivityManager, this::handleStatusUpdated); mWifiTracker.setListening(true); mHasMobileData = hasMobileData; + if (wifiManager != null) { + wifiManager.registerTrafficStateCallback(new WifiTrafficStateCallback()); + } // WiFi only has one state. mCurrentState.iconGroup = mLastState.iconGroup = new IconGroup( "Wi-Fi Icons", @@ -127,10 +128,6 @@ public class WifiSignalController extends notifyListenersIfNecessary(); } - public void handleBootCompleted() { - mWifiManager.registerTrafficStateCallback(new WifiTrafficStateCallback()); - } - /** * Handler to receive the data activity on wifi. */ diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java index fd99ef389bec..286b7c049fc7 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java @@ -71,6 +71,7 @@ public class UsbConfirmActivity extends AlertActivity final AlertController.AlertParams ap = mAlertParams; ap.mTitle = appName; + boolean useRecordWarning = false; if (mDevice == null) { ap.mMessage = getString(R.string.usb_accessory_confirm_prompt, appName, mAccessory.getDescription()); @@ -83,7 +84,7 @@ public class UsbConfirmActivity extends AlertActivity packageName) == android.content.pm.PackageManager.PERMISSION_GRANTED; boolean isAudioCaptureDevice = mDevice.getHasAudioCapture(); - boolean useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; + useRecordWarning = isAudioCaptureDevice && !hasRecordPermission; int strID = useRecordWarning ? R.string.usb_device_confirm_prompt_warn @@ -98,22 +99,23 @@ public class UsbConfirmActivity extends AlertActivity ap.mNegativeButtonListener = this; // add "always use" checkbox - LayoutInflater inflater = (LayoutInflater)getSystemService( - Context.LAYOUT_INFLATER_SERVICE); - ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null); - mAlwaysUse = (CheckBox)ap.mView.findViewById(com.android.internal.R.id.alwaysUse); - if (mDevice == null) { - mAlwaysUse.setText(getString(R.string.always_use_accessory, appName, - mAccessory.getDescription())); - } else { - mAlwaysUse.setText(getString(R.string.always_use_device, appName, - mDevice.getProductName())); + if (!useRecordWarning) { + LayoutInflater inflater = (LayoutInflater) getSystemService( + Context.LAYOUT_INFLATER_SERVICE); + ap.mView = inflater.inflate(com.android.internal.R.layout.always_use_checkbox, null); + mAlwaysUse = (CheckBox) ap.mView.findViewById(com.android.internal.R.id.alwaysUse); + if (mDevice == null) { + mAlwaysUse.setText(getString(R.string.always_use_accessory, appName, + mAccessory.getDescription())); + } else { + mAlwaysUse.setText(getString(R.string.always_use_device, appName, + mDevice.getProductName())); + } + mAlwaysUse.setOnCheckedChangeListener(this); + mClearDefaultHint = (TextView) ap.mView.findViewById( + com.android.internal.R.id.clearDefaultHint); + mClearDefaultHint.setVisibility(View.GONE); } - mAlwaysUse.setOnCheckedChangeListener(this); - mClearDefaultHint = (TextView)ap.mView.findViewById( - com.android.internal.R.id.clearDefaultHint); - mClearDefaultHint.setVisibility(View.GONE); - setupAlert(); } @@ -133,7 +135,7 @@ public class UsbConfirmActivity extends AlertActivity IUsbManager service = IUsbManager.Stub.asInterface(b); final int uid = mResolveInfo.activityInfo.applicationInfo.uid; final int userId = UserHandle.myUserId(); - boolean alwaysUse = mAlwaysUse.isChecked(); + boolean alwaysUse = mAlwaysUse != null ? mAlwaysUse.isChecked() : false; Intent intent = null; if (mDevice != null) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java index e8f19238fdb8..167f361b341a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java @@ -48,6 +48,7 @@ import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.power.PowerUI.WarningsUI; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.phone.StatusBar; import org.junit.Before; @@ -87,6 +88,7 @@ public class PowerUITest extends SysuiTestCase { private IThermalEventListener mUsbThermalEventListener; private IThermalEventListener mSkinThermalEventListener; @Mock private BroadcastDispatcher mBroadcastDispatcher; + @Mock private CommandQueue mCommandQueue; @Mock private Lazy<StatusBar> mStatusBarLazy; @Mock private StatusBar mStatusBar; @@ -686,7 +688,7 @@ public class PowerUITest extends SysuiTestCase { } private void createPowerUi() { - mPowerUI = new PowerUI(mContext, mBroadcastDispatcher, mStatusBarLazy); + mPowerUI = new PowerUI(mContext, mBroadcastDispatcher, mCommandQueue, mStatusBarLazy); mPowerUI.mThermalService = mThermalServiceMock; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java index 3f32c66b2d03..6d85d37537ea 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsTest.java @@ -175,7 +175,7 @@ public class ScreenshotNotificationSmartActionsTest extends SysuiTestCase { data.image = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888); data.iconSize = 10; data.finisher = null; - data.onEditReady = null; + data.mActionsReadyListener = null; data.previewWidth = 10; data.previewheight = 10; SaveImageInBackgroundTask task = new SaveImageInBackgroundTask(mContext, data, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java index 811e6a06e607..631c580a490d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/HotspotControllerImplTest.java @@ -77,7 +77,6 @@ public class HotspotControllerImplTest extends SysuiTestCase { any(WifiManager.SoftApCallback.class)); mController = new HotspotControllerImpl(mContext, new Handler(mLooper.getLooper())); - mController.handleSetListening(true); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java index c9681ac558f9..016160aea433 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeHotspotController.java @@ -26,10 +26,6 @@ public class FakeHotspotController extends BaseLeakChecker<Callback> implements } @Override - public void handleSetListening(boolean listening) { - } - - @Override public boolean isHotspotEnabled() { return false; } diff --git a/services/Android.bp b/services/Android.bp index 35dc44e0ac65..041631b74380 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -28,7 +28,6 @@ filegroup { ":services.usage-sources", ":services.usb-sources", ":services.voiceinteraction-sources", - ":services.wifi-sources", ], visibility: ["//visibility:private"], } @@ -68,7 +67,6 @@ java_library { "services.usage", "services.usb", "services.voiceinteraction", - "services.wifi", "android.hidl.base-V1.0-java", ], diff --git a/services/autofill/java/com/android/server/autofill/ui/FillUi.java b/services/autofill/java/com/android/server/autofill/ui/FillUi.java index 70fb535bed57..57961423061f 100644 --- a/services/autofill/java/com/android/server/autofill/ui/FillUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/FillUi.java @@ -383,7 +383,7 @@ final class FillUi { } child.setOnClickListener((v) -> { if (sVerbose) { - Slog.v(TAG, "Applying " + id + " after " + v + " was clicked"); + Slog.v(TAG, " Cancelling session after " + v + " clicked"); } mCallback.cancelSession(); }); diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index d7114a0b9a62..8eea04759cdb 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -291,10 +291,17 @@ final class SaveUi { } final TextView noButton = view.findViewById(R.id.autofill_save_no); - if (info.getNegativeActionStyle() == SaveInfo.NEGATIVE_BUTTON_STYLE_REJECT) { - noButton.setText(R.string.save_password_notnow); - } else { - noButton.setText(R.string.autofill_save_no); + final int negativeActionStyle = info.getNegativeActionStyle(); + switch (negativeActionStyle) { + case SaveInfo.NEGATIVE_BUTTON_STYLE_REJECT: + noButton.setText(R.string.autofill_save_notnow); + break; + case SaveInfo.NEGATIVE_BUTTON_STYLE_NEVER: + noButton.setText(R.string.autofill_save_never); + break; + case SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL: + default: + noButton.setText(R.string.autofill_save_no); } noButton.setOnClickListener((v) -> mListener.onCancel(info.getNegativeActionListener())); diff --git a/services/core/Android.bp b/services/core/Android.bp index 594ac104ebd0..9291adc1896c 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -86,6 +86,7 @@ java_library_static { ":tethering-servicescore-srcs", "java/com/android/server/EventLogTags.logtags", "java/com/android/server/am/EventLogTags.logtags", + "java/com/android/server/wm/EventLogTags.logtags", "java/com/android/server/policy/EventLogTags.logtags", ], diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index e67d736796b9..413a79dc6acd 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -61,7 +61,6 @@ public abstract class PackageManagerInternal { public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 10; public static final int PACKAGE_APP_PREDICTOR = 11; public static final int PACKAGE_TELEPHONY = 12; - public static final int PACKAGE_WIFI = 13; @IntDef(value = { PACKAGE_SYSTEM, PACKAGE_SETUP_WIZARD, @@ -76,7 +75,6 @@ public abstract class PackageManagerInternal { PACKAGE_INCIDENT_REPORT_APPROVER, PACKAGE_APP_PREDICTOR, PACKAGE_TELEPHONY, - PACKAGE_WIFI, }) @Retention(RetentionPolicy.SOURCE) public @interface KnownPackage {} diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags index bec08f45188f..b595eb15ee15 100644 --- a/services/core/java/com/android/server/EventLogTags.logtags +++ b/services/core/java/com/android/server/EventLogTags.logtags @@ -175,27 +175,6 @@ option java_package com.android.server 3121 pm_package_stats (manual_time|2|3),(quota_time|2|3),(manual_data|2|2),(quota_data|2|2),(manual_cache|2|2),(quota_cache|2|2) # --------------------------- -# WindowManagerService.java -# --------------------------- -# Out of memory for surfaces. -31000 wm_no_surface_memory (Window|3),(PID|1|5),(Operation|3) -# Task created. -31001 wm_task_created (TaskId|1|5),(StackId|1|5) -# Task moved to top (1) or bottom (0). -31002 wm_task_moved (TaskId|1|5),(ToTop|1),(Index|1) -# Task removed with source explanation. -31003 wm_task_removed (TaskId|1|5),(Reason|3) -# Stack created. -31004 wm_stack_created (StackId|1|5) -# Home stack moved to top (1) or bottom (0). -31005 wm_home_stack_moved (ToTop|1) -# Stack removed. -31006 wm_stack_removed (StackId|1|5) -# bootanim finished: -31007 wm_boot_animation_done (time|2|3) - - -# --------------------------- # InputMethodManagerService.java # --------------------------- # Re-connecting to input method service because we haven't received its interface diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 770db58773eb..e119d1e995b4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2786,8 +2786,8 @@ public class ActivityManagerService extends IActivityManager.Stub int total = user + system + iowait + irq + softIrq + idle; if (total == 0) total = 1; - EventLog.writeEvent(EventLogTags.CPU, - ((user+system+iowait+irq+softIrq) * 100) / total, + EventLogTags.writeCpu( + ((user + system + iowait + irq + softIrq) * 100) / total, (user * 100) / total, (system * 100) / total, (iowait * 100) / total, @@ -3656,7 +3656,7 @@ public class ActivityManagerService extends IActivityManager.Stub final ArrayList<ProcessMemInfo> memInfos = doReport ? new ArrayList<ProcessMemInfo>(mProcessList.getLruSizeLocked()) : null; - EventLog.writeEvent(EventLogTags.AM_LOW_MEMORY, mProcessList.getLruSizeLocked()); + EventLogTags.writeAmLowMemory(mProcessList.getLruSizeLocked()); long now = SystemClock.uptimeMillis(); for (int i = mProcessList.mLruProcesses.size() - 1; i >= 0; i--) { ProcessRecord rec = mProcessList.mLruProcesses.get(i); @@ -3737,8 +3737,8 @@ public class ActivityManagerService extends IActivityManager.Stub mAllowLowerMemLevel = false; doLowMem = false; } - EventLog.writeEvent(EventLogTags.AM_PROC_DIED, app.userId, app.pid, app.processName, - app.setAdj, app.setProcState); + EventLogTags.writeAmProcDied(app.userId, app.pid, app.processName, app.setAdj, + app.setProcState); if (DEBUG_CLEANUP) Slog.v(TAG_CLEANUP, "Dying app: " + app + ", pid: " + pid + ", thread: " + thread.asBinder()); handleAppDiedLocked(app, false, true); @@ -3761,7 +3761,8 @@ public class ActivityManagerService extends IActivityManager.Stub // Execute the callback if there is any. doAppDiedCallbackLocked(app); - EventLog.writeEvent(EventLogTags.AM_PROC_DIED, app.userId, app.pid, app.processName); + EventLogTags.writeAmProcDied(app.userId, app.pid, app.processName, app.setAdj, + app.setProcState); } else if (DEBUG_PROCESSES) { Slog.d(TAG_PROCESSES, "Received spurious death notification for thread " + thread.asBinder()); @@ -3783,7 +3784,7 @@ public class ActivityManagerService extends IActivityManager.Stub } @GuardedBy("this") - private void waitForProcKillLocked(final ProcessRecord app, final String formatString, + void waitForProcKillLocked(final ProcessRecord app, final String formatString, final long startTime) { app.mAppDiedCallback = () -> { synchronized (ActivityManagerService.this) { @@ -4755,8 +4756,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (gone) { Slog.w(TAG, "Process " + app + " failed to attach"); - EventLog.writeEvent(EventLogTags.AM_PROCESS_START_TIMEOUT, app.userId, - pid, app.uid, app.processName); + EventLogTags.writeAmProcessStartTimeout(app.userId, pid, app.uid, app.processName); mProcessList.removeProcessNameLocked(app.processName, app.uid); mAtmInternal.clearHeavyWeightProcessIfEquals(app.getWindowProcessController()); mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid); @@ -4847,7 +4847,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (app == null) { Slog.w(TAG, "No pending application record for pid " + pid + " (IApplicationThread " + thread + "); dropping process"); - EventLog.writeEvent(EventLogTags.AM_DROP_PROCESS, pid); + EventLogTags.writeAmDropProcess(pid); if (pid > 0 && pid != MY_PID) { killProcessQuiet(pid); //TODO: killProcessGroup(app.info.uid, pid); @@ -4885,7 +4885,7 @@ public class ActivityManagerService extends IActivityManager.Stub return false; } - EventLog.writeEvent(EventLogTags.AM_PROC_BOUND, app.userId, app.pid, app.processName); + EventLogTags.writeAmProcBound(app.userId, app.pid, app.processName); app.curAdj = app.setAdj = app.verifiedAdj = ProcessList.INVALID_ADJ; mOomAdjuster.setAttachingSchedGroupLocked(app); @@ -7163,7 +7163,7 @@ public class ActivityManagerService extends IActivityManager.Stub + cpi.applicationInfo.packageName + "/" + cpi.applicationInfo.uid + " for provider " + name + ": launching app became null"); - EventLog.writeEvent(EventLogTags.AM_PROVIDER_LOST_PROCESS, + EventLogTags.writeAmProviderLostProcess( UserHandle.getUserId(cpi.applicationInfo.uid), cpi.applicationInfo.packageName, cpi.applicationInfo.uid, name); @@ -9156,7 +9156,8 @@ public class ActivityManagerService extends IActivityManager.Stub t.traceEnd(); // KillProcesses Slog.i(TAG, "System now ready"); - EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_AMS_READY, SystemClock.uptimeMillis()); + + EventLogTags.writeBootProgressAmsReady(SystemClock.uptimeMillis()); t.traceBegin("updateTopComponentForFactoryTest"); mAtmInternal.updateTopComponentForFactoryTest(); @@ -9410,7 +9411,8 @@ public class ActivityManagerService extends IActivityManager.Stub */ void handleApplicationCrashInner(String eventType, ProcessRecord r, String processName, ApplicationErrorReport.CrashInfo crashInfo) { - EventLog.writeEvent(EventLogTags.AM_CRASH, Binder.getCallingPid(), + + EventLogTags.writeAmCrash(Binder.getCallingPid(), UserHandle.getUserId(Binder.getCallingUid()), processName, r == null ? -1 : r.info.flags, crashInfo.exceptionClassName, @@ -9613,7 +9615,7 @@ public class ActivityManagerService extends IActivityManager.Stub final String processName = app == null ? "system_server" : (r == null ? "unknown" : r.processName); - EventLog.writeEvent(EventLogTags.AM_WTF, UserHandle.getUserId(callingUid), callingPid, + EventLogTags.writeAmWtf(UserHandle.getUserId(callingUid), callingPid, processName, r == null ? -1 : r.info.flags, tag, crashInfo.exceptionMessage); StatsLog.write(StatsLog.WTF_OCCURRED, callingUid, tag, processName, diff --git a/services/core/java/com/android/server/am/AppCompactor.java b/services/core/java/com/android/server/am/AppCompactor.java index b0f8f86ada6b..b7e206516640 100644 --- a/services/core/java/com/android/server/am/AppCompactor.java +++ b/services/core/java/com/android/server/am/AppCompactor.java @@ -189,10 +189,10 @@ public final class AppCompactor { @GuardedBy("mPhenotypeFlagLock") @VisibleForTesting volatile long mFullAnonRssThrottleKb = DEFAULT_COMPACT_FULL_RSS_THROTTLE_KB; - @GuardedBy("mPhenoypeFlagLock") + @GuardedBy("mPhenotypeFlagLock") @VisibleForTesting volatile long mFullDeltaRssThrottleKb = DEFAULT_COMPACT_FULL_DELTA_RSS_THROTTLE_KB; - @GuardedBy("mPhenoypeFlagLock") + @GuardedBy("mPhenotypeFlagLock") @VisibleForTesting final Set<Integer> mProcStateThrottle; // Handler on which compaction runs. diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags index cf0de061185f..23674bbd89c7 100644 --- a/services/core/java/com/android/server/am/EventLogTags.logtags +++ b/services/core/java/com/android/server/am/EventLogTags.logtags @@ -13,32 +13,14 @@ option java_package com.android.server.am # Do not change these names without updating the checkin_events setting in # google3/googledata/wireless/android/provisioning/gservices.config !! # -# An activity is being finished: -30001 am_finish_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Reason|3) -# A task is being brought to the front of the screen: -30002 am_task_to_front (User|1|5),(Task|1|5) -# An existing activity is being given a new intent: -30003 am_new_intent (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Action|3),(MIME Type|3),(URI|3),(Flags|1|5) -# A new task is being created: -30004 am_create_task (User|1|5),(Task ID|1|5) -# A new activity is being created in an existing task: -30005 am_create_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Action|3),(MIME Type|3),(URI|3),(Flags|1|5) -# An activity has been resumed into the foreground but was not already running: -30006 am_restart_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) -# An activity has been resumed and is now in the foreground: -30007 am_resume_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) # Application Not Responding 30008 am_anr (User|1|5),(pid|1|5),(Package Name|3),(Flags|1|5),(reason|3) -# Activity launch time -30009 am_activity_launch_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3) + # Application process bound to work 30010 am_proc_bound (User|1|5),(PID|1|5),(Process Name|3) # Application process died 30011 am_proc_died (User|1|5),(PID|1|5),(Process Name|3),(OomAdj|1|5),(ProcState|1|5) -# The Activity Manager failed to pause the given activity. -30012 am_failed_to_pause (User|1|5),(Token|1|5),(Wanting to pause|3),(Currently pausing|3) -# Attempting to pause the current activity -30013 am_pause_activity (User|1|5),(Token|1|5),(Component Name|3),(User Leaving|3) + # Application process has been started 30014 am_proc_start (User|1|5),(PID|1|5),(UID|1|5),(Process Name|3),(Type|3),(Component|3) # An application process has been marked as bad @@ -47,16 +29,7 @@ option java_package com.android.server.am 30016 am_proc_good (User|1|5),(UID|1|5),(Process Name|3) # Reporting to applications that memory is low 30017 am_low_memory (Num Processes|1|1) -# An activity is being destroyed: -30018 am_destroy_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Reason|3) -# An activity has been relaunched, resumed, and is now in the foreground: -30019 am_relaunch_resume_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) -# An activity has been relaunched: -30020 am_relaunch_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) -# The activity's onPause has been called. -30021 am_on_paused_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onResume has been called. -30022 am_on_resume_called (Token|1|5),(Component Name|3),(Reason|3) + # Kill a process to reclaim memory. 30023 am_kill (User|1|5),(PID|1|5),(Process Name|3),(OomAdj|1|5),(Reason|3) # Discard an undelivered serialized broadcast (timeout/ANR/crash) @@ -87,12 +60,6 @@ option java_package com.android.server.am # User switched 30041 am_switch_user (id|1|5) -# Activity set to resumed -30043 am_set_resumed_activity (User|1|5),(Component Name|3),(Reason|3) - -# Stack focus -30044 am_focused_stack (User|1|5),(Display Id|1|5),(Focused Stack Id|1|5),(Last Focused Stack Id|1|5),(Reason|3) - # Running pre boot receiver 30045 am_pre_boot (User|1|5),(Package|3) @@ -101,11 +68,6 @@ option java_package com.android.server.am # Report collection of memory used by a process 30047 am_pss (Pid|1|5),(UID|1|5),(Process Name|3),(Pss|2|2),(Uss|2|2),(SwapPss|2|2),(Rss|2|2),(StatType|1|5),(ProcState|1|5),(TimeToCollect|2|2) -# Attempting to stop an activity -30048 am_stop_activity (User|1|5),(Token|1|5),(Component Name|3) -# The activity's onStop has been called. -30049 am_on_stop_called (Token|1|5),(Component Name|3),(Reason|3) - # Report changing memory conditions (Values are ProcessStats.ADJ_MEM_FACTOR* constants) 30050 am_mem_factor (Current|1|5),(Previous|1|5) @@ -123,30 +85,6 @@ option java_package com.android.server.am # Note when a service is being forcibly stopped because its app went idle. 30056 am_stop_idle_service (UID|1|5),(Component Name|3) -# The activity's onCreate has been called. -30057 am_on_create_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onRestart has been called. -30058 am_on_restart_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onStart has been called. -30059 am_on_start_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onDestroy has been called. -30060 am_on_destroy_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onActivityResult has been called. -30062 am_on_activity_result_called (Token|1|5),(Component Name|3),(Reason|3) - -# The task is being removed from its parent stack -30061 am_remove_task (Task ID|1|5), (Stack ID|1|5) - # The task is being compacted 30063 am_compact (Pid|1|5),(Process Name|3),(Action|3),(BeforeRssTotal|2|2),(BeforeRssFile|2|2),(BeforeRssAnon|2|2),(BeforeRssSwap|2|2),(DeltaRssTotal|2|2),(DeltaRssFile|2|2),(DeltaRssAnon|2|2),(DeltaRssSwap|2|2),(Time|2|3),(LastAction|1|2),(LastActionTimestamp|2|3),(setAdj|1|2),(procState|1|2),(BeforeZRAMFree|2|2),(DeltaZRAMFree|2|2) -# The activity's onTopResumedActivityChanged(true) has been called. -30064 am_on_top_resumed_gained_called (Token|1|5),(Component Name|3),(Reason|3) -# The activity's onTopResumedActivityChanged(false) has been called. -30065 am_on_top_resumed_lost_called (Token|1|5),(Component Name|3),(Reason|3) - -# An activity been add into stopping list -30066 am_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3) - -# Keyguard status changed -+30067 am_set_keyguard_shown (keyguardShowing|1),(aodShowing|1),(keyguardGoingAway|1),(Reason|3)
\ No newline at end of file diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 2bb703545cad..375da8a2f385 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1421,7 +1421,7 @@ public final class ProcessList { if (app.pendingStart) { return true; } - long startTime = SystemClock.elapsedRealtime(); + long startTime = SystemClock.uptimeMillis(); if (app.pid > 0 && app.pid != ActivityManagerService.MY_PID) { checkSlow(startTime, "startProcess: removing from pids map"); mService.mPidsSelfLocked.remove(app); @@ -1856,7 +1856,7 @@ public final class ProcessList { boolean knownToBeDead, int intentFlags, HostingRecord hostingRecord, boolean allowWhileBooting, boolean isolated, int isolatedUid, boolean keepIfLarge, String abiOverride, String entryPoint, String[] entryPointArgs, Runnable crashHandler) { - long startTime = SystemClock.elapsedRealtime(); + long startTime = SystemClock.uptimeMillis(); ProcessRecord app; if (!isolated) { app = getProcessRecordLocked(processName, info.uid, keepIfLarge); @@ -1917,10 +1917,9 @@ public final class ProcessList { // An application record is attached to a previous process, // clean it up now. if (DEBUG_PROCESSES) Slog.v(TAG_PROCESSES, "App died: " + app); - checkSlow(startTime, "startProcess: bad proc running, killing"); ProcessList.killProcessGroup(app.uid, app.pid); - mService.handleAppDiedLocked(app, true, true); - checkSlow(startTime, "startProcess: done killing old proc"); + mService.waitForProcKillLocked(app, "startProcess: bad proc running, killing: %s", + startTime); } if (app == null) { diff --git a/services/core/java/com/android/server/compat/CompatChange.java b/services/core/java/com/android/server/compat/CompatChange.java index 87624359ef85..95582f73035a 100644 --- a/services/core/java/com/android/server/compat/CompatChange.java +++ b/services/core/java/com/android/server/compat/CompatChange.java @@ -38,6 +38,20 @@ import java.util.Map; */ public final class CompatChange extends CompatibilityChangeInfo { + /** + * Callback listener for when compat changes are updated for a package. + * See {@link #registerListener(ChangeListener)} for more details. + */ + public interface ChangeListener { + /** + * Called upon an override change for packageName and the change this listener is + * registered for. Called before the app is killed. + */ + void onCompatChange(String packageName); + } + + ChangeListener mListener = null; + private Map<String, Boolean> mPackageOverrides; public CompatChange(long changeId) { @@ -64,6 +78,15 @@ public final class CompatChange extends CompatibilityChangeInfo { change.getDisabled()); } + void registerListener(ChangeListener listener) { + if (mListener != null) { + throw new IllegalStateException( + "Listener for change " + toString() + " already registered."); + } + mListener = listener; + } + + /** * Force the enabled state of this change for a given package name. The change will only take * effect after that packages process is killed and restarted. @@ -78,6 +101,7 @@ public final class CompatChange extends CompatibilityChangeInfo { mPackageOverrides = new HashMap<>(); } mPackageOverrides.put(pname, enabled); + notifyListener(pname); } /** @@ -89,7 +113,9 @@ public final class CompatChange extends CompatibilityChangeInfo { */ void removePackageOverride(String pname) { if (mPackageOverrides != null) { - mPackageOverrides.remove(pname); + if (mPackageOverrides.remove(pname) != null) { + notifyListener(pname); + } } } @@ -131,4 +157,10 @@ public final class CompatChange extends CompatibilityChangeInfo { } return sb.append(")").toString(); } + + private void notifyListener(String packageName) { + if (mListener != null) { + mListener.onCompatChange(packageName); + } + } } diff --git a/services/core/java/com/android/server/compat/CompatConfig.java b/services/core/java/com/android/server/compat/CompatConfig.java index 490cce347188..39c6e7552e3c 100644 --- a/services/core/java/com/android/server/compat/CompatConfig.java +++ b/services/core/java/com/android/server/compat/CompatConfig.java @@ -228,7 +228,7 @@ final class CompatConfig { /** * Removes all overrides previously added via {@link #addOverride(long, String, boolean)} or - * {@link #addAppOverrides(CompatibilityChangeConfig, String)} for a certain package. + * {@link #addOverrides(CompatibilityChangeConfig, String)} for a certain package. * * <p>This restores the default behaviour for the given change and app, once any app * processes have been restarted. @@ -243,6 +243,27 @@ final class CompatConfig { } } + boolean registerListener(long changeId, CompatChange.ChangeListener listener) { + boolean alreadyKnown = true; + synchronized (mChanges) { + CompatChange c = mChanges.get(changeId); + if (c == null) { + alreadyKnown = false; + c = new CompatChange(changeId); + addChange(c); + } + c.registerListener(listener); + } + return alreadyKnown; + } + + @VisibleForTesting + void clearChanges() { + synchronized (mChanges) { + mChanges.clear(); + } + } + /** * Dumps the current list of compatibility config information. * diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 311e24fd5ee2..6ec4b9fbdb93 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -108,6 +108,23 @@ public class PlatformCompat extends IPlatformCompat.Stub { return enabled; } + /** + * Register a listener for change state overrides. Only one listener per change is allowed. + * + * <p>{@code listener.onCompatChange(String)} method is guaranteed to be called with + * packageName before the app is killed upon an override change. The state of a change is not + * guaranteed to change when {@code listener.onCompatChange(String)} is called. + * + * @param changeId to get updates for + * @param listener the listener that will be called upon a potential change for package. + * @throws IllegalStateException if a listener was already registered for changeId + * @returns {@code true} if a change with changeId was already known, or (@code false} + * otherwise. + */ + public boolean registerListener(long changeId, CompatChange.ChangeListener listener) { + return CompatConfig.get().registerListener(changeId, listener); + } + @Override public void setOverrides(CompatibilityChangeConfig overrides, String packageName) { CompatConfig.get().addOverrides(overrides, packageName); 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 f0bb192e3b61..b8202b6c0dc6 100644 --- a/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java +++ b/services/core/java/com/android/server/integrity/engine/RuleEvaluationEngine.java @@ -16,9 +16,10 @@ package com.android.server.integrity.engine; -import com.android.server.integrity.model.AppInstallMetadata; +import android.content.integrity.AppInstallMetadata; +import android.content.integrity.Rule; + import com.android.server.integrity.model.IntegrityCheckResult; -import com.android.server.integrity.model.Rule; import java.util.ArrayList; import java.util.List; @@ -26,8 +27,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"; @@ -36,9 +37,7 @@ public final class RuleEvaluationEngine { // installs against rules. private static RuleEvaluationEngine sRuleEvaluationEngine; - /** - * Provide a singleton instance of the rule evaluation engine. - */ + /** Provide a singleton instance of the rule evaluation engine. */ public static synchronized RuleEvaluationEngine getRuleEvaluationEngine() { if (sRuleEvaluationEngine == null) { return new RuleEvaluationEngine(); @@ -50,7 +49,7 @@ public final class RuleEvaluationEngine { * 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. + * against. * @return result of the integrity check */ public IntegrityCheckResult evaluate(AppInstallMetadata appInstallMetadata) { diff --git a/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java index 7deae466ac3f..ee51d4f87848 100644 --- a/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java +++ b/services/core/java/com/android/server/integrity/engine/RuleEvaluator.java @@ -16,18 +16,18 @@ package com.android.server.integrity.engine; -import static com.android.server.integrity.model.Rule.DENY; -import static com.android.server.integrity.model.Rule.FORCE_ALLOW; +import static android.content.integrity.Rule.DENY; +import static android.content.integrity.Rule.FORCE_ALLOW; import android.annotation.NonNull; +import android.content.integrity.AppInstallMetadata; +import android.content.integrity.AtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Formula; +import android.content.integrity.Rule; 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.IntegrityCheckResult; -import com.android.server.integrity.model.OpenFormula; -import com.android.server.integrity.model.Rule; import java.util.ArrayList; import java.util.List; @@ -89,17 +89,17 @@ final class RuleEvaluator { if (isAtomicFormula(formula)) { return true; } - OpenFormula openFormula = (OpenFormula) formula; - return openFormula.getConnector() == OpenFormula.AND - && openFormula.getFormulas().stream().allMatch(RuleEvaluator::isAtomicFormula); + CompoundFormula compoundFormula = (CompoundFormula) formula; + return compoundFormula.getConnector() == CompoundFormula.AND + && compoundFormula.getFormulas().stream().allMatch(RuleEvaluator::isAtomicFormula); } private static boolean isAtomicFormula(Formula formula) { if (formula instanceof AtomicFormula) { return true; } - OpenFormula openFormula = (OpenFormula) formula; - return openFormula.getConnector() == OpenFormula.NOT - && openFormula.getFormulas().get(0) instanceof AtomicFormula; + CompoundFormula compoundFormula = (CompoundFormula) formula; + return compoundFormula.getConnector() == CompoundFormula.NOT + && compoundFormula.getFormulas().get(0) instanceof AtomicFormula; } } diff --git a/services/core/java/com/android/server/integrity/engine/RuleLoader.java b/services/core/java/com/android/server/integrity/engine/RuleLoader.java index af24d7a21dc8..4ba2bfb00d05 100644 --- a/services/core/java/com/android/server/integrity/engine/RuleLoader.java +++ b/services/core/java/com/android/server/integrity/engine/RuleLoader.java @@ -16,7 +16,7 @@ package com.android.server.integrity.engine; -import com.android.server.integrity.model.Rule; +import android.content.integrity.Rule; import java.util.ArrayList; import java.util.List; diff --git a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java index ef0751d329d0..b3cb31ac8cb1 100644 --- a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java +++ b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java @@ -17,6 +17,7 @@ package com.android.server.integrity.model; import android.annotation.Nullable; +import android.content.integrity.Rule; /** * A class encapsulating the result from the evaluation engine after evaluating rules against app diff --git a/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java b/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java index 5ed282cd8b1f..111b95a05d24 100644 --- a/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java +++ b/services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java @@ -16,7 +16,7 @@ package com.android.server.integrity.parser; -import com.android.server.integrity.model.Rule; +import android.content.integrity.Rule; import java.io.InputStream; import java.util.List; diff --git a/services/core/java/com/android/server/integrity/parser/RuleParser.java b/services/core/java/com/android/server/integrity/parser/RuleParser.java index 08e0a5db8c20..4e1f9141c8ed 100644 --- a/services/core/java/com/android/server/integrity/parser/RuleParser.java +++ b/services/core/java/com/android/server/integrity/parser/RuleParser.java @@ -16,7 +16,7 @@ package com.android.server.integrity.parser; -import com.android.server.integrity.model.Rule; +import android.content.integrity.Rule; import java.io.InputStream; import java.util.List; diff --git a/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java b/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java index 1508c273f553..1212a083bfaa 100644 --- a/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java +++ b/services/core/java/com/android/server/integrity/parser/RuleXmlParser.java @@ -16,13 +16,12 @@ package com.android.server.integrity.parser; +import android.content.integrity.AtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Formula; +import android.content.integrity.Rule; import android.util.Xml; -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 org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -34,9 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -/** - * A helper class to parse rules into the {@link Rule} model from Xml representation. - */ +/** A helper class to parse rules into the {@link Rule} model from Xml representation. */ public final class RuleXmlParser implements RuleParser { public static final String TAG = "RuleXmlParser"; @@ -90,7 +87,8 @@ public final class RuleXmlParser implements RuleParser { // corrupt in the XML, it will be skipped to the next rule. if (!nodeName.equals(RULE_LIST_TAG)) { throw new RuntimeException( - String.format("Rules must start with RuleList <RL> tag. Found: %s at %s", + String.format( + "Rules must start with RuleList <RL> tag. Found: %s at %s", nodeName, parser.getPositionDescription())); } @@ -141,8 +139,8 @@ public final class RuleXmlParser implements RuleParser { private static Formula parseOpenFormula(XmlPullParser parser) throws IOException, XmlPullParserException { - int connector = Integer.parseInt( - extractAttributeValue(parser, CONNECTOR_ATTRIBUTE).orElse("-1")); + int connector = + Integer.parseInt(extractAttributeValue(parser, CONNECTOR_ATTRIBUTE).orElse("-1")); List<Formula> formulas = new ArrayList<>(); int eventType; @@ -171,17 +169,17 @@ public final class RuleXmlParser implements RuleParser { } } - return new OpenFormula(connector, formulas); + return new CompoundFormula(connector, formulas); } private static Formula parseAtomicFormula(XmlPullParser parser) throws IOException, XmlPullParserException { int key = Integer.parseInt(extractAttributeValue(parser, KEY_ATTRIBUTE).orElse("-1")); - int operator = Integer.parseInt( - extractAttributeValue(parser, OPERATOR_ATTRIBUTE).orElse("-1")); + int operator = + Integer.parseInt(extractAttributeValue(parser, OPERATOR_ATTRIBUTE).orElse("-1")); String value = extractAttributeValue(parser, VALUE_ATTRIBUTE).orElse(null); - String isHashedValue = extractAttributeValue(parser, IS_HASHED_VALUE_ATTRIBUTE).orElse( - null); + String isHashedValue = + extractAttributeValue(parser, IS_HASHED_VALUE_ATTRIBUTE).orElse(null); int eventType; while ((eventType = parser.next()) != XmlPullParser.END_DOCUMENT) { @@ -192,15 +190,18 @@ public final class RuleXmlParser implements RuleParser { return constructAtomicFormulaBasedOnKey(key, operator, value, isHashedValue); } - private static Formula constructAtomicFormulaBasedOnKey(@AtomicFormula.Key int key, - @AtomicFormula.Operator int operator, String value, String isHashedValue) { + private static Formula constructAtomicFormulaBasedOnKey( + @AtomicFormula.Key int key, + @AtomicFormula.Operator int operator, + String value, + String isHashedValue) { switch (key) { case AtomicFormula.PACKAGE_NAME: case AtomicFormula.INSTALLER_NAME: case AtomicFormula.APP_CERTIFICATE: case AtomicFormula.INSTALLER_CERTIFICATE: - return new AtomicFormula.StringAtomicFormula(key, value, - Boolean.parseBoolean(isHashedValue)); + return new AtomicFormula.StringAtomicFormula( + key, value, Boolean.parseBoolean(isHashedValue)); case AtomicFormula.PRE_INSTALLED: return new AtomicFormula.BooleanAtomicFormula(key, Boolean.parseBoolean(value)); case AtomicFormula.VERSION_CODE: diff --git a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java index ee95d2bb4d69..ace15bdfb028 100644 --- a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java +++ b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java @@ -16,7 +16,7 @@ package com.android.server.integrity.serializer; -import com.android.server.integrity.model.Rule; +import android.content.integrity.Rule; import java.io.OutputStream; import java.util.List; diff --git a/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java index 5c99c5a4c2da..c45f6beeffe1 100644 --- a/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java +++ b/services/core/java/com/android/server/integrity/serializer/RuleSerializer.java @@ -16,7 +16,7 @@ package com.android.server.integrity.serializer; -import com.android.server.integrity.model.Rule; +import android.content.integrity.Rule; import java.io.OutputStream; import java.util.List; diff --git a/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java index f2ba756ee0d1..5dd7891d15f9 100644 --- a/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java +++ b/services/core/java/com/android/server/integrity/serializer/RuleXmlSerializer.java @@ -16,13 +16,12 @@ package com.android.server.integrity.serializer; +import android.content.integrity.AtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Formula; +import android.content.integrity.Rule; import android.util.Xml; -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 org.xmlpull.v1.XmlSerializer; import java.io.IOException; @@ -31,9 +30,7 @@ import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.List; -/** - * A helper class to serialize rules from the {@link Rule} model to Xml representation. - */ +/** A helper class to serialize rules from the {@link Rule} model to Xml representation. */ public class RuleXmlSerializer implements RuleSerializer { public static final String TAG = "RuleXmlSerializer"; @@ -97,23 +94,23 @@ public class RuleXmlSerializer implements RuleSerializer { private void serializeFormula(Formula formula, XmlSerializer xmlSerializer) throws IOException { if (formula instanceof AtomicFormula) { serializeAtomicFormula((AtomicFormula) formula, xmlSerializer); - } else if (formula instanceof OpenFormula) { - serializeOpenFormula((OpenFormula) formula, xmlSerializer); + } else if (formula instanceof CompoundFormula) { + serializeOpenFormula((CompoundFormula) formula, xmlSerializer); } else { throw new IllegalArgumentException( String.format("Invalid formula type: %s", formula.getClass())); } } - private void serializeOpenFormula(OpenFormula openFormula, XmlSerializer xmlSerializer) + private void serializeOpenFormula(CompoundFormula compoundFormula, XmlSerializer xmlSerializer) throws IOException { - if (openFormula == null) { + if (compoundFormula == null) { return; } xmlSerializer.startTag(NAMESPACE, OPEN_FORMULA_TAG); - serializeAttributeValue(CONNECTOR_ATTRIBUTE, String.valueOf(openFormula.getConnector()), + serializeAttributeValue(CONNECTOR_ATTRIBUTE, String.valueOf(compoundFormula.getConnector()), xmlSerializer); - for (Formula formula : openFormula.getFormulas()) { + for (Formula formula : compoundFormula.getFormulas()) { serializeFormula(formula, xmlSerializer); } xmlSerializer.endTag(NAMESPACE, OPEN_FORMULA_TAG); diff --git a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java index 378ca4a51974..2247e54ac5f7 100644 --- a/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java +++ b/services/core/java/com/android/server/notification/NotificationHistoryDatabase.java @@ -183,6 +183,7 @@ public class NotificationHistoryDatabase { public NotificationHistory readNotificationHistory() { synchronized (mLock) { NotificationHistory notifications = new NotificationHistory(); + notifications.addNotificationsToWrite(mBuffer); for (AtomicFile file : mHistoryFiles) { try { @@ -223,6 +224,13 @@ public class NotificationHistoryDatabase { } } + public void disableHistory() { + synchronized (mLock) { + mHistoryDir.delete(); + mHistoryFiles.clear(); + } + } + /** * Remove any files that are too old and schedule jobs to clean up the rest */ @@ -241,6 +249,7 @@ public class NotificationHistoryDatabase { Slog.d(TAG, "Removed " + currentOldestFile.getBaseFile().getName()); } currentOldestFile.delete(); + // TODO: delete all relevant bitmaps, once they exist mHistoryFiles.removeLast(); } else { // all remaining files are newer than the cut off; schedule jobs to delete diff --git a/services/core/java/com/android/server/notification/NotificationHistoryManager.java b/services/core/java/com/android/server/notification/NotificationHistoryManager.java index a350a6b2acd5..1b56c7bb5b8f 100644 --- a/services/core/java/com/android/server/notification/NotificationHistoryManager.java +++ b/services/core/java/com/android/server/notification/NotificationHistoryManager.java @@ -21,9 +21,16 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.NotificationHistory; import android.app.NotificationHistory.HistoricalNotification; +import android.content.ContentResolver; import android.content.Context; +import android.content.pm.UserInfo; +import android.database.ContentObserver; +import android.net.Uri; import android.os.Environment; +import android.os.Handler; +import android.os.UserHandle; import android.os.UserManager; +import android.provider.Settings; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; @@ -49,6 +56,8 @@ public class NotificationHistoryManager { private final Context mContext; private final UserManager mUserManager; + @VisibleForTesting + final SettingsObserver mSettingsObserver; private final Object mLock = new Object(); @GuardedBy("mLock") private final SparseArray<NotificationHistoryDatabase> mUserState = new SparseArray<>(); @@ -57,19 +66,26 @@ public class NotificationHistoryManager { // TODO: does this need to be persisted across reboots? @GuardedBy("mLock") private final SparseArray<List<String>> mUserPendingPackageRemovals = new SparseArray<>(); + @GuardedBy("mLock") + private final SparseBooleanArray mHistoryEnabled = new SparseBooleanArray(); - public NotificationHistoryManager(Context context) { + public NotificationHistoryManager(Context context, Handler handler) { mContext = context; mUserManager = context.getSystemService(UserManager.class); + mSettingsObserver = new SettingsObserver(handler); } - public void onUserUnlocked(@UserIdInt int userId) { + void onBootPhaseAppsCanStart() { + mSettingsObserver.observe(); + } + + void onUserUnlocked(@UserIdInt int userId) { synchronized (mLock) { mUserUnlockedStates.put(userId, true); final NotificationHistoryDatabase userHistory = getUserHistoryAndInitializeIfNeededLocked(userId); if (userHistory == null) { - Slog.i(TAG, "Attempted to unlock stopped or removed user " + userId); + Slog.i(TAG, "Attempted to unlock gone/disabled user " + userId); return; } @@ -81,6 +97,11 @@ public class NotificationHistoryManager { } mUserPendingPackageRemovals.put(userId, null); } + + // delete history if it was disabled when the user was locked + if (!mHistoryEnabled.get(userId)) { + userHistory.disableHistory(); + } } } @@ -91,22 +112,25 @@ public class NotificationHistoryManager { } } - void onUserRemoved(@UserIdInt int userId) { + public void onUserRemoved(@UserIdInt int userId) { synchronized (mLock) { // Actual data deletion is handled by other parts of the system (the entire directory is // removed) - we just need clean up our internal state for GC mUserPendingPackageRemovals.put(userId, null); + mHistoryEnabled.put(userId, false); onUserStopped(userId); } } - void onPackageRemoved(int userId, String packageName) { + public void onPackageRemoved(int userId, String packageName) { synchronized (mLock) { if (!mUserUnlockedStates.get(userId, false)) { - List<String> userPendingRemovals = - mUserPendingPackageRemovals.get(userId, new ArrayList<>()); - userPendingRemovals.add(packageName); - mUserPendingPackageRemovals.put(userId, userPendingRemovals); + if (mHistoryEnabled.get(userId, false)) { + List<String> userPendingRemovals = + mUserPendingPackageRemovals.get(userId, new ArrayList<>()); + userPendingRemovals.add(packageName); + mUserPendingPackageRemovals.put(userId, userPendingRemovals); + } return; } final NotificationHistoryDatabase userHistory = mUserState.get(userId); @@ -118,7 +142,8 @@ public class NotificationHistoryManager { } } - void triggerWriteToDisk() { + // TODO: wire this up to AMS when power button is long pressed + public void triggerWriteToDisk() { synchronized (mLock) { final int userCount = mUserState.size(); for (int i = 0; i < userCount; i++) { @@ -139,7 +164,7 @@ public class NotificationHistoryManager { final NotificationHistoryDatabase userHistory = getUserHistoryAndInitializeIfNeededLocked(notification.getUserId()); if (userHistory == null) { - Slog.w(TAG, "Attempted to add notif for locked/gone user " + Slog.w(TAG, "Attempted to add notif for locked/gone/disabled user " + notification.getUserId()); return; } @@ -157,7 +182,7 @@ public class NotificationHistoryManager { final NotificationHistoryDatabase userHistory = getUserHistoryAndInitializeIfNeededLocked(userId); if (userHistory == null) { - Slog.i(TAG, "Attempted to read history for locked/gone user " +userId); + Slog.i(TAG, "Attempted to read history for locked/gone/disabled user " +userId); continue; } mergedHistory.addNotificationsToWrite(userHistory.readNotificationHistory()); @@ -172,7 +197,7 @@ public class NotificationHistoryManager { final NotificationHistoryDatabase userHistory = getUserHistoryAndInitializeIfNeededLocked(userId); if (userHistory == null) { - Slog.i(TAG, "Attempted to read history for locked/gone user " +userId); + Slog.i(TAG, "Attempted to read history for locked/gone/disabled user " +userId); return new android.app.NotificationHistory(); } @@ -180,9 +205,38 @@ public class NotificationHistoryManager { } } + boolean isHistoryEnabled(@UserIdInt int userId) { + synchronized (mLock) { + return mHistoryEnabled.get(userId); + } + } + + void onHistoryEnabledChanged(@UserIdInt int userId, boolean historyEnabled) { + synchronized (mLock) { + mHistoryEnabled.put(userId, historyEnabled); + + // These requests might fail if the user is locked; onUserUnlocked will pick up those + // cases + final NotificationHistoryDatabase userHistory = + getUserHistoryAndInitializeIfNeededLocked(userId); + if (userHistory != null) { + if (!historyEnabled) { + userHistory.disableHistory(); + } + } + } + } + @GuardedBy("mLock") private @Nullable NotificationHistoryDatabase getUserHistoryAndInitializeIfNeededLocked( int userId) { + if (!mHistoryEnabled.get(userId)) { + if (DEBUG) { + Slog.i(TAG, "History disabled for user " + userId); + } + mUserState.put(userId, null); + return null; + } NotificationHistoryDatabase userHistory = mUserState.get(userId); if (userHistory == null) { final File historyDir = new File(Environment.getDataSystemCeDirectory(userId), @@ -242,4 +296,39 @@ public class NotificationHistoryManager { return mUserPendingPackageRemovals.get(userId); } } + + final class SettingsObserver extends ContentObserver { + private final Uri NOTIFICATION_HISTORY_URI + = Settings.Secure.getUriFor(Settings.Secure.NOTIFICATION_HISTORY_ENABLED); + + SettingsObserver(Handler handler) { + super(handler); + } + + void observe() { + ContentResolver resolver = mContext.getContentResolver(); + resolver.registerContentObserver(NOTIFICATION_HISTORY_URI, + false, this, UserHandle.USER_ALL); + synchronized (mLock) { + for (UserInfo userInfo : mUserManager.getUsers()) { + update(null, userInfo.id); + } + } + } + + @Override + public void onChange(boolean selfChange, Uri uri, int userId) { + update(uri, userId); + } + + public void update(Uri uri, int userId) { + ContentResolver resolver = mContext.getContentResolver(); + if (uri == null || NOTIFICATION_HISTORY_URI.equals(uri)) { + boolean historyEnabled = Settings.Secure.getIntForUser(resolver, + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, userId) + != 0; + onHistoryEnabledChanged(userId, historyEnabled); + } + } + } } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index d5f2d7e550d7..863991cec3bd 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -103,6 +103,8 @@ import android.Manifest.permission; import android.annotation.CallbackExecutor; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; +import android.annotation.WorkerThread; import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.AlarmManager; @@ -116,6 +118,8 @@ import android.app.IUriGrantsManager; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; +import android.app.NotificationHistory; +import android.app.NotificationHistory.HistoricalNotification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.app.PendingIntent; @@ -160,6 +164,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.HandlerThread; import android.os.IBinder; import android.os.IDeviceIdleController; @@ -477,12 +482,14 @@ public class NotificationManagerService extends SystemService { private long mLastOverRateLogTime; private float mMaxPackageEnqueueRate = DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE; + private NotificationHistoryManager mHistoryManager; private SnoozeHelper mSnoozeHelper; private GroupHelper mGroupHelper; private int mAutoGroupAtCount; private boolean mIsTelevision; private boolean mIsAutomotive; private boolean mNotificationEffectsEnabledForAutomotive; + private DeviceConfig.OnPropertiesChangedListener mDeviceConfigChangedListener; private int mWarnRemoteViewsSizeBytes; private int mStripRemoteViewsSizeBytes; @@ -1547,6 +1554,7 @@ public class NotificationManagerService extends SystemService { mListeners.onUserRemoved(userId); mConditionProviders.onUserRemoved(userId); mAssistants.onUserRemoved(userId); + mHistoryManager.onUserRemoved(userId); handleSavePolicyFile(); } else if (action.equals(Intent.ACTION_USER_UNLOCKED)) { final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_NULL); @@ -1775,8 +1783,8 @@ public class NotificationManagerService extends SystemService { // TODO: All tests should use this init instead of the one-off setters above. @VisibleForTesting - void init(Looper looper, RankingHandler rankingHandler, IPackageManager packageManager, - PackageManager packageManagerClient, + void init(WorkerHandler handler, RankingHandler rankingHandler, + IPackageManager packageManager, PackageManager packageManagerClient, LightsManager lightsManager, NotificationListeners notificationListeners, NotificationAssistants notificationAssistants, ConditionProviders conditionProviders, ICompanionDeviceManager companionManager, SnoozeHelper snoozeHelper, @@ -1784,7 +1792,8 @@ public class NotificationManagerService extends SystemService { ActivityManager activityManager, GroupHelper groupHelper, IActivityManager am, UsageStatsManagerInternal appUsageStats, DevicePolicyManagerInternal dpm, IUriGrantsManager ugm, UriGrantsManagerInternal ugmInternal, AppOpsManager appOps, - UserManager userManager) { + UserManager userManager, NotificationHistoryManager historyManager) { + mHandler = handler; Resources resources = getContext().getResources(); mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(), Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, @@ -1810,7 +1819,6 @@ public class NotificationManagerService extends SystemService { mPlatformCompat = IPlatformCompat.Stub.asInterface( ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); - mHandler = new WorkerHandler(looper); mUiHandler = new Handler(UiThread.get().getLooper()); String[] extractorNames; try { @@ -1869,6 +1877,7 @@ public class NotificationManagerService extends SystemService { extractorNames); mSnoozeHelper = snoozeHelper; mGroupHelper = groupHelper; + mHistoryManager = historyManager; // This is a ManagedServices object that keeps track of the listeners. mListeners = notificationListeners; @@ -1966,7 +1975,9 @@ public class NotificationManagerService extends SystemService { final File systemDir = new File(Environment.getDataDirectory(), "system"); mRankingThread.start(); - init(Looper.myLooper(), new RankingHandlerWorker(mRankingThread.getLooper()), + WorkerHandler handler = new WorkerHandler(Looper.myLooper()); + + init(handler, new RankingHandlerWorker(mRankingThread.getLooper()), AppGlobals.getPackageManager(), getContext().getPackageManager(), getLocalService(LightsManager.class), new NotificationListeners(AppGlobals.getPackageManager()), @@ -1983,7 +1994,8 @@ public class NotificationManagerService extends SystemService { UriGrantsManager.getService(), LocalServices.getService(UriGrantsManagerInternal.class), (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE), - getContext().getSystemService(UserManager.class)); + getContext().getSystemService(UserManager.class), + new NotificationHistoryManager(getContext(), handler)); // register for various Intents IntentFilter filter = new IntentFilter(); @@ -2036,19 +2048,26 @@ public class NotificationManagerService extends SystemService { } private void registerDeviceConfigChange() { + mDeviceConfigChangedListener = properties -> { + if (!DeviceConfig.NAMESPACE_SYSTEMUI.equals(properties.getNamespace())) { + return; + } + if (properties.getKeyset() + .contains(SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE)) { + mAssistants.allowAdjustmentType(Adjustment.KEY_IMPORTANCE); + mAssistants.resetDefaultAssistantsIfNecessary(); + } + }; DeviceConfig.addOnPropertiesChangedListener( DeviceConfig.NAMESPACE_SYSTEMUI, - getContext().getMainExecutor(), - (properties) -> { - if (!DeviceConfig.NAMESPACE_SYSTEMUI.equals(properties.getNamespace())) { - return; - } - if (properties.getKeyset() - .contains(SystemUiDeviceConfigFlags.NAS_DEFAULT_SERVICE)) { - mAssistants.allowAdjustmentType(Adjustment.KEY_IMPORTANCE); - mAssistants.resetDefaultAssistantsIfNecessary(); - } - }); + new HandlerExecutor(mHandler), + mDeviceConfigChangedListener); + } + + void unregisterDeviceConfigChange() { + if (mDeviceConfigChangedListener != null) { + DeviceConfig.removeOnPropertiesChangedListener(mDeviceConfigChangedListener); + } } private GroupHelper getGroupHelper() { @@ -2134,10 +2153,21 @@ public class NotificationManagerService extends SystemService { mListeners.onBootPhaseAppsCanStart(); mAssistants.onBootPhaseAppsCanStart(); mConditionProviders.onBootPhaseAppsCanStart(); + mHistoryManager.onBootPhaseAppsCanStart(); registerDeviceConfigChange(); } } + @Override + public void onUnlockUser(@NonNull UserInfo userInfo) { + mHandler.post(() -> mHistoryManager.onUserUnlocked(userInfo.id)); + } + + @Override + public void onStopUser(@NonNull UserInfo userInfo) { + mHandler.post(() -> mHistoryManager.onUserStopped(userInfo.id)); + } + @GuardedBy("mNotificationLock") private void updateListenerHintsLocked() { final int hints = calculateHints(); @@ -2449,10 +2479,56 @@ public class NotificationManagerService extends SystemService { mAppUsageStats.reportInterruptiveNotification(r.sbn.getPackageName(), r.getChannel().getId(), getRealUserId(r.sbn.getUserId())); + mHistoryManager.addNotification(new HistoricalNotification.Builder() + .setPackage(r.sbn.getPackageName()) + .setUid(r.sbn.getUid()) + .setChannelId(r.getChannel().getId()) + .setChannelName(r.getChannel().getName().toString()) + .setPostedTimeMs(r.sbn.getPostTime()) + .setTitle(getHistoryTitle(r.getNotification())) + .setText(getHistoryText( + r.sbn.getPackageContext(getContext()), r.getNotification())) + .setIcon(r.getNotification().getSmallIcon()) + .build()); r.setRecordedInterruption(true); } } + private String getHistoryTitle(Notification n) { + CharSequence title = null; + if (n.extras != null) { + title = n.extras.getCharSequence(Notification.EXTRA_TITLE); + } + return title == null? null : String.valueOf(title); + } + + /** + * Returns the appropriate substring for this notification based on the style of notification. + */ + private String getHistoryText(Context appContext, Notification n) { + CharSequence text = null; + if (n.extras != null) { + text = n.extras.getCharSequence(Notification.EXTRA_TEXT); + + Notification.Builder nb = Notification.Builder.recoverBuilder(appContext, n); + + if (nb.getStyle() instanceof Notification.BigTextStyle) { + text = ((Notification.BigTextStyle) nb.getStyle()).getBigText(); + } else if (nb.getStyle() instanceof Notification.MessagingStyle) { + Notification.MessagingStyle ms = (Notification.MessagingStyle) nb.getStyle(); + final List<Notification.MessagingStyle.Message> messages = ms.getMessages(); + if (messages != null && messages.size() > 0) { + text = messages.get(messages.size() - 1).getText(); + } + } + + if (TextUtils.isEmpty(text)) { + text = n.extras.getCharSequence(Notification.EXTRA_TEXT); + } + } + return text == null ? null : String.valueOf(text); + } + /** * Report to usage stats that the user interacted with the notification. * @param r notification record @@ -3343,10 +3419,9 @@ public class NotificationManagerService extends SystemService { /** * System-only API for getting a list of recent (cleared, no longer shown) notifications. - * - * Requires ACCESS_NOTIFICATIONS which is signature|system. */ @Override + @RequiresPermission(android.Manifest.permission.ACCESS_NOTIFICATIONS) public StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count) { // enforce() will ensure the calling uid has the correct permission getContext().enforceCallingOrSelfPermission( @@ -3367,6 +3442,29 @@ public class NotificationManagerService extends SystemService { } /** + * System-only API for getting a list of historical notifications. May contain multiple days + * of notifications. + */ + @Override + @WorkerThread + @RequiresPermission(android.Manifest.permission.ACCESS_NOTIFICATIONS) + public NotificationHistory getNotificationHistory(String callingPkg) { + // enforce() will ensure the calling uid has the correct permission + getContext().enforceCallingOrSelfPermission( + android.Manifest.permission.ACCESS_NOTIFICATIONS, + "NotificationManagerService.getNotificationHistory"); + int uid = Binder.getCallingUid(); + + // noteOp will check to make sure the callingPkg matches the uid + if (mAppOps.noteOpNoThrow(AppOpsManager.OP_ACCESS_NOTIFICATIONS, uid, callingPkg) + == AppOpsManager.MODE_ALLOWED) { + IntArray currentUserIds = mUserProfiles.getCurrentProfileIds(); + return mHistoryManager.readNotificationHistory(currentUserIds.toArray()); + } + return new NotificationHistory(); + } + + /** * Register a listener binder directly with the notification manager. * * Only works with system callers. Apps should extend @@ -6831,7 +6929,7 @@ public class NotificationManagerService extends SystemService { } } - private void handleOnPackageChanged(boolean removingPackage, int changeUserId, + void handleOnPackageChanged(boolean removingPackage, int changeUserId, String[] pkgList, int[] uidList) { boolean preferencesChanged = removingPackage; mListeners.onPackagesChanged(removingPackage, pkgList, uidList); @@ -6839,6 +6937,14 @@ public class NotificationManagerService extends SystemService { mConditionProviders.onPackagesChanged(removingPackage, pkgList, uidList); preferencesChanged |= mPreferencesHelper.onPackagesChanged( removingPackage, changeUserId, pkgList, uidList); + if (removingPackage) { + int size = Math.min(pkgList.length, uidList.length); + for (int i = 0; i < size; i++) { + final String pkg = pkgList[i]; + final int uid = uidList[i]; + mHistoryManager.onPackageRemoved(UserHandle.getUserId(uid), pkg); + } + } if (preferencesChanged) { handleSavePolicyFile(); } diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 8125d0d653ad..9e32d0e81a47 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -374,9 +374,6 @@ public class SnoozeHelper { return; } NotificationRecord existing = pkgRecords.get(record.getKey()); - if (existing != null && existing.isCanceled) { - return; - } pkgRecords.put(record.getKey(), record); } diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index a09657be83d4..d63e7041ea52 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -959,9 +959,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { assertPreparedAndNotDestroyedLocked("commit"); assertNoWriteFileTransfersOpenLocked(); - if (forTransfer) { + final boolean enforceInstallPackages = forTransfer + || (android.provider.Settings.Secure.getInt(mContext.getContentResolver(), + android.provider.Settings.Secure.SECURE_FRP_MODE, 0) == 1); + if (enforceInstallPackages) { mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null); - + } + if (forTransfer) { if (mInstallerUid == mOriginalInstallerUid) { throw new IllegalArgumentException("Session has not been transferred"); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index eebc8d7db81f..0e075b117b81 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -1492,7 +1492,6 @@ public class PackageManagerService extends IPackageManager.Stub final @Nullable String mAppPredictionServicePackage; final @Nullable String mIncidentReportApproverPackage; final @Nullable String[] mTelephonyPackages; - final @Nullable String mWifiPackage; final @NonNull String mServicesSystemSharedLibraryPackageName; final @NonNull String mSharedSystemSharedLibraryPackageName; @@ -2974,7 +2973,6 @@ public class PackageManagerService extends IPackageManager.Stub mAppPredictionServicePackage = getAppPredictionServicePackageName(); mIncidentReportApproverPackage = getIncidentReportApproverPackageName(); mTelephonyPackages = getTelephonyPackageNames(); - mWifiPackage = mContext.getString(R.string.config_wifiPackage); // Now that we know all of the shared libraries, update all clients to have // the correct library paths. @@ -22938,8 +22936,6 @@ public class PackageManagerService extends IPackageManager.Stub return filterOnlySystemPackages(mAppPredictionServicePackage); case PackageManagerInternal.PACKAGE_TELEPHONY: return filterOnlySystemPackages(mTelephonyPackages); - case PackageManagerInternal.PACKAGE_WIFI: - return filterOnlySystemPackages(mWifiPackage); default: return ArrayUtils.emptyArray(String.class); } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 232374c6773e..6d86078e92e4 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -504,11 +504,9 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no package specified"); return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runPath"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } - return displayPackageFilePath(pkg, userId); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runPath"); + return displayPackageFilePath(pkg, translatedUserId); } private int runList() throws RemoteException { @@ -730,13 +728,14 @@ class PackageManagerShellCommand extends ShellCommand { final String filter = getNextArg(); - userId = translateUserId(userId, true /*allowAll*/, "runListPackages"); if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; + getFlags |= PackageManager.MATCH_KNOWN_PACKAGES; } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_SYSTEM, "runListPackages"); @SuppressWarnings("unchecked") final ParceledListSlice<PackageInfo> slice = - mInterface.getInstalledPackages(getFlags, userId); + mInterface.getInstalledPackages(getFlags, translatedUserId); final List<PackageInfo> packages = slice.getList(); final int count = packages.size(); @@ -900,29 +899,29 @@ class PackageManagerShellCommand extends ShellCommand { } private int runListStagedSessions() { - final IndentingPrintWriter pw = new IndentingPrintWriter( - getOutPrintWriter(), /* singleIndent */ " ", /* wrapLength */ 120); + try (IndentingPrintWriter pw = new IndentingPrintWriter( + getOutPrintWriter(), /* singleIndent */ " ", /* wrapLength */ 120)) { + final SessionDump sessionDump = new SessionDump(); + String opt; + while ((opt = getNextOption()) != null) { + if (!setSessionFlag(opt, sessionDump)) { + pw.println("Error: Unknown option: " + opt); + return -1; + } + } - SessionDump sessionDump = new SessionDump(); - String opt; - while ((opt = getNextOption()) != null) { - if (!setSessionFlag(opt, sessionDump)) { - pw.println("Error: Unknown option: " + opt); + try { + final List<SessionInfo> stagedSessions = + mInterface.getPackageInstaller().getStagedSessions().getList(); + printSessionList(pw, stagedSessions, sessionDump); + } catch (RemoteException e) { + pw.println("Failure [" + + e.getClass().getName() + " - " + + e.getMessage() + "]"); return -1; } + return 1; } - - try { - List<SessionInfo> stagedSessions = - mInterface.getPackageInstaller().getStagedSessions().getList(); - printSessionList(pw, stagedSessions, sessionDump); - } catch (RemoteException e) { - pw.println("Failure [" - + e.getClass().getName() + " - " - + e.getMessage() + "]"); - return -1; - } - return 1; } private void printSessionList(IndentingPrintWriter pw, List<SessionInfo> stagedSessions, @@ -1357,19 +1356,17 @@ class PackageManagerShellCommand extends ShellCommand { pw.println("Error: package name not specified"); return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runInstallExisting"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runInstallExisting"); int installReason = PackageManager.INSTALL_REASON_UNKNOWN; try { if (waitTillComplete) { final LocalIntentReceiver receiver = new LocalIntentReceiver(); final IPackageInstaller installer = mInterface.getPackageInstaller(); - pw.println("Installing package " + packageName + " for user: " + userId); + pw.println("Installing package " + packageName + " for user: " + translatedUserId); installer.installExistingPackage(packageName, installFlags, installReason, - receiver.getIntentSender(), userId, null); + receiver.getIntentSender(), translatedUserId, null); final Intent result = receiver.getResult(); final int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE); @@ -1377,12 +1374,12 @@ class PackageManagerShellCommand extends ShellCommand { return status == PackageInstaller.STATUS_SUCCESS ? 0 : 1; } - final int res = mInterface.installExistingPackageAsUser(packageName, userId, + final int res = mInterface.installExistingPackageAsUser(packageName, translatedUserId, installFlags, installReason, null); if (res == PackageManager.INSTALL_FAILED_INVALID_URI) { throw new NameNotFoundException("Package " + packageName + " doesn't exist"); } - pw.println("Package " + packageName + " installed for user: " + userId); + pw.println("Package " + packageName + " installed for user: " + translatedUserId); return 0; } catch (RemoteException | NameNotFoundException e) { pw.println(e.toString()); @@ -1845,36 +1842,37 @@ class PackageManagerShellCommand extends ShellCommand { return runRemoveSplits(packageName, splitNames); } - userId = translateUserId(userId, true /*allowAll*/, "runUninstall"); + if (userId == UserHandle.USER_ALL) { + flags |= PackageManager.DELETE_ALL_USERS; + } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_SYSTEM, "runUninstall"); final LocalIntentReceiver receiver = new LocalIntentReceiver(); - PackageManagerInternal internal = LocalServices.getService(PackageManagerInternal.class); + final PackageManagerInternal internal = + LocalServices.getService(PackageManagerInternal.class); if (internal.isApexPackage(packageName)) { - internal.uninstallApex(packageName, versionCode, userId, receiver.getIntentSender()); - } else { - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - flags |= PackageManager.DELETE_ALL_USERS; - } else { - final PackageInfo info = mInterface.getPackageInfo(packageName, - PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId); - if (info == null) { - pw.println("Failure [not installed for " + userId + "]"); - return 1; - } - final boolean isSystem = - (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; - // If we are being asked to delete a system app for just one - // user set flag so it disables rather than reverting to system - // version of the app. - if (isSystem) { - flags |= PackageManager.DELETE_SYSTEM_APP; - } + internal.uninstallApex( + packageName, versionCode, translatedUserId, receiver.getIntentSender()); + } else if ((flags & PackageManager.DELETE_ALL_USERS) != 0) { + final PackageInfo info = mInterface.getPackageInfo(packageName, + PackageManager.MATCH_STATIC_SHARED_LIBRARIES, translatedUserId); + if (info == null) { + pw.println("Failure [not installed for " + translatedUserId + "]"); + return 1; + } + final boolean isSystem = + (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; + // If we are being asked to delete a system app for just one + // user set flag so it disables rather than reverting to system + // version of the app. + if (isSystem) { + flags |= PackageManager.DELETE_SYSTEM_APP; } mInterface.getPackageInstaller().uninstall(new VersionedPackage(packageName, versionCode), null /*callerPackageName*/, flags, - receiver.getIntentSender(), userId); + receiver.getIntentSender(), translatedUserId); } final Intent result = receiver.getResult(); @@ -1948,8 +1946,10 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } - ClearDataObserver obs = new ClearDataObserver(); - ActivityManager.getService().clearApplicationUserData(pkg, false, obs, userId); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runClear"); + final ClearDataObserver obs = new ClearDataObserver(); + ActivityManager.getService().clearApplicationUserData(pkg, false, obs, translatedUserId); synchronized (obs) { while (!obs.finished) { try { @@ -1991,28 +1991,26 @@ class PackageManagerShellCommand extends ShellCommand { userId = UserHandle.parseUserArg(getNextArgRequired()); } - String pkg = getNextArg(); + final String pkg = getNextArg(); if (pkg == null) { getErrPrintWriter().println("Error: no package or component specified"); return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runSetEnabledSetting"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } - ComponentName cn = ComponentName.unflattenFromString(pkg); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetEnabledSetting"); + final ComponentName cn = ComponentName.unflattenFromString(pkg); if (cn == null) { - mInterface.setApplicationEnabledSetting(pkg, state, 0, userId, + mInterface.setApplicationEnabledSetting(pkg, state, 0, translatedUserId, "shell:" + android.os.Process.myUid()); getOutPrintWriter().println("Package " + pkg + " new state: " + enabledSettingToString( - mInterface.getApplicationEnabledSetting(pkg, userId))); + mInterface.getApplicationEnabledSetting(pkg, translatedUserId))); return 0; } else { - mInterface.setComponentEnabledSetting(cn, state, 0, userId); + mInterface.setComponentEnabledSetting(cn, state, 0, translatedUserId); getOutPrintWriter().println("Component " + cn.toShortString() + " new state: " + enabledSettingToString( - mInterface.getComponentEnabledSetting(cn, userId))); + mInterface.getComponentEnabledSetting(cn, translatedUserId))); return 0; } } @@ -2029,13 +2027,11 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no package or component specified"); return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runSetHiddenSetting"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } - mInterface.setApplicationHiddenSettingAsUser(pkg, state, userId); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetHiddenSetting"); + mInterface.setApplicationHiddenSettingAsUser(pkg, state, translatedUserId); getOutPrintWriter().println("Package " + pkg + " new hidden state: " - + mInterface.getApplicationHiddenSettingAsUser(pkg, userId)); + + mInterface.getApplicationHiddenSettingAsUser(pkg, translatedUserId)); return 0; } @@ -2102,16 +2098,14 @@ class PackageManagerShellCommand extends ShellCommand { info = null; } try { - userId = translateUserId(userId, true /*allowAll*/, "runSuspend"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSuspend"); mInterface.setPackagesSuspendedAsUser(new String[]{packageName}, suspendedState, ((appExtras.size() > 0) ? appExtras : null), ((launcherExtras.size() > 0) ? launcherExtras : null), - info, callingPackage, userId); + info, callingPackage, translatedUserId); pw.println("Package " + packageName + " new suspended state: " - + mInterface.isPackageSuspendedForUser(packageName, userId)); + + mInterface.isPackageSuspendedForUser(packageName, translatedUserId)); return 0; } catch (RemoteException | IllegalArgumentException e) { pw.println(e.toString()); @@ -2139,11 +2133,12 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: no permission specified"); return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runGrantRevokePermission"); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runGrantRevokePermission"); if (grant) { - mPermissionManager.grantRuntimePermission(pkg, perm, userId); + mPermissionManager.grantRuntimePermission(pkg, perm, translatedUserId); } else { - mPermissionManager.revokeRuntimePermission(pkg, perm, userId); + mPermissionManager.revokeRuntimePermission(pkg, perm, translatedUserId); } return 0; } @@ -2327,11 +2322,9 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runSetAppLink"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } - final PackageInfo info = mInterface.getPackageInfo(pkg, 0, userId); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetAppLink"); + final PackageInfo info = mInterface.getPackageInfo(pkg, 0, translatedUserId); if (info == null) { getErrPrintWriter().println("Error: package " + pkg + " not found."); return 1; @@ -2342,7 +2335,7 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } - if (!mInterface.updateIntentVerificationStatus(pkg, newMode, userId)) { + if (!mInterface.updateIntentVerificationStatus(pkg, newMode, translatedUserId)) { getErrPrintWriter().println("Error: unable to update app link status for " + pkg); return 1; } @@ -2371,11 +2364,9 @@ class PackageManagerShellCommand extends ShellCommand { return 1; } - userId = translateUserId(userId, true /*allowAll*/, "runGetAppLink"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } - final PackageInfo info = mInterface.getPackageInfo(pkg, 0, userId); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runGetAppLink"); + final PackageInfo info = mInterface.getPackageInfo(pkg, 0, translatedUserId); if (info == null) { getErrPrintWriter().println("Error: package " + pkg + " not found."); return 1; @@ -2388,7 +2379,7 @@ class PackageManagerShellCommand extends ShellCommand { } getOutPrintWriter().println(linkStateToString( - mInterface.getIntentVerificationStatus(pkg, userId))); + mInterface.getIntentVerificationStatus(pkg, translatedUserId))); return 0; } @@ -2565,9 +2556,11 @@ class PackageManagerShellCommand extends ShellCommand { getErrPrintWriter().println("Error: valid value not specified"); return 1; } - IUserManager um = IUserManager.Stub.asInterface( + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetUserRestriction"); + final IUserManager um = IUserManager.Stub.asInterface( ServiceManager.getService(Context.USER_SERVICE)); - um.setUserRestriction(restriction, value, userId); + um.setUserRestriction(restriction, value, translatedUserId); return 0; } @@ -2763,14 +2756,15 @@ class PackageManagerShellCommand extends ShellCommand { } pkgName = componentName.getPackageName(); } - userId = translateUserId(userId, true /*allowAll*/, "runInstallCreate"); + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetHomeActivity"); final CompletableFuture<Boolean> future = new CompletableFuture<>(); final RemoteCallback callback = new RemoteCallback(res -> future.complete(res != null)); try { IRoleManager roleManager = android.app.role.IRoleManager.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.ROLE_SERVICE)); roleManager.addRoleHolderAsUser(RoleManager.ROLE_HOME, pkgName, - 0, userId, callback); + 0, translatedUserId, callback); boolean success = future.get(); if (success) { pw.println("Success"); @@ -2859,14 +2853,12 @@ class PackageManagerShellCommand extends ShellCommand { } } - userId = translateUserId(userId, true /*allowAll*/, "runSetHarmfulAppWarning"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runSetHarmfulAppWarning"); final String packageName = getNextArgRequired(); final String warning = getNextArg(); - mInterface.setHarmfulAppWarning(packageName, warning, userId); + mInterface.setHarmfulAppWarning(packageName, warning, translatedUserId); return 0; } @@ -2884,12 +2876,10 @@ class PackageManagerShellCommand extends ShellCommand { } } - userId = translateUserId(userId, true /*allowAll*/, "runGetHarmfulAppWarning"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - } + final int translatedUserId = + translateUserId(userId, UserHandle.USER_NULL, "runGetHarmfulAppWarning"); final String packageName = getNextArgRequired(); - final CharSequence warning = mInterface.getHarmfulAppWarning(packageName, userId); + final CharSequence warning = mInterface.getHarmfulAppWarning(packageName, translatedUserId); if (!TextUtils.isEmpty(warning)) { getOutPrintWriter().println(warning); return 0; @@ -2917,21 +2907,22 @@ class PackageManagerShellCommand extends ShellCommand { throw new IllegalArgumentException("ABI " + abi + " not supported on this device"); } - private int translateUserId(int userId, boolean allowAll, String logContext) { - return ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), - userId, allowAll, true, logContext, "pm command"); + private int translateUserId(int userId, int allUserId, String logContext) { + final boolean allowAll = (allUserId != UserHandle.USER_NULL); + final int translatedUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), userId, allowAll, true, logContext, "pm command"); + return translatedUserId == UserHandle.USER_ALL ? allUserId : translatedUserId; } private int doCreateSession(SessionParams params, String installerPackageName, int userId) throws RemoteException { - userId = translateUserId(userId, true /*allowAll*/, "doCreateSession"); if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; params.installFlags |= PackageManager.INSTALL_ALL_USERS; } - + final int translatedUserId = + translateUserId(userId, UserHandle.USER_SYSTEM, "doCreateSession"); final int sessionId = mInterface.getPackageInstaller() - .createSession(params, installerPackageName, userId); + .createSession(params, installerPackageName, translatedUserId); return sessionId; } diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 8ddfad9ec81c..814433829733 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -564,7 +564,7 @@ public class UserManagerService extends IUserManager.Stub { readUserListLP(); sInstance = this; } - mSystemPackageInstaller = new UserSystemPackageInstaller(this); + mSystemPackageInstaller = new UserSystemPackageInstaller(this, mUserTypes); mLocalService = new LocalService(); LocalServices.addService(UserManagerInternal.class, mLocalService); mLockPatternUtils = new LockPatternUtils(mContext); @@ -1205,6 +1205,24 @@ public class UserManagerService extends IUserManager.Stub { } } + /** Returns whether the given user type is one of the FULL user types. */ + boolean isUserTypeSubtypeOfFull(String userType) { + UserTypeDetails userTypeDetails = mUserTypes.get(userType); + return userTypeDetails != null && userTypeDetails.isFull(); + } + + /** Returns whether the given user type is one of the PROFILE user types. */ + boolean isUserTypeSubtypeOfProfile(String userType) { + UserTypeDetails userTypeDetails = mUserTypes.get(userType); + return userTypeDetails != null && userTypeDetails.isProfile(); + } + + /** Returns whether the given user type is one of the SYSTEM user types. */ + boolean isUserTypeSubtypeOfSystem(String userType) { + UserTypeDetails userTypeDetails = mUserTypes.get(userType); + return userTypeDetails != null && userTypeDetails.isSystem(); + } + @Override public boolean hasBadge(@UserIdInt int userId) { checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "hasBadge"); @@ -3233,8 +3251,8 @@ public class UserManagerService extends IUserManager.Stub { StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE); t.traceEnd(); - final Set<String> installablePackages = // TODO(b/142482943): use userType - mSystemPackageInstaller.getInstallablePackagesForUserType(flags); + final Set<String> installablePackages = + mSystemPackageInstaller.getInstallablePackagesForUserType(userType); t.traceBegin("PM.createNewUser"); mPm.createNewUser(userId, installablePackages, disallowedPackages); t.traceEnd(); diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java index 95197b07deaf..6abfbdc19ae0 100644 --- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java +++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java @@ -22,7 +22,6 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.content.pm.PackageManagerInternal; import android.content.pm.PackageParser; -import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.SystemProperties; import android.os.UserHandle; @@ -37,6 +36,8 @@ import com.android.server.SystemConfig; import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; +import java.util.Map; import java.util.Set; /** @@ -111,31 +112,55 @@ class UserSystemPackageInstaller { public @interface PackageWhitelistMode {} /** - * Maps system package manifest names to the user flags on which they should be initially - * installed. - * <p>Packages that are whitelisted, but then blacklisted so that they aren't to be installed on + * Maps system package manifest names to a bitset representing (via {@link #getUserTypeMask}) + * the user types on which they should be initially installed. + * <p> + * E.g. if package "pkg1" should be installed on "usertype_d", which is the user type for which + * {@link #getUserTypeMask}("usertype_d") returns (1 << 3) + * then mWhitelistedPackagesForUserTypes.get("pkg1") will be a Long whose + * bit in position 3 will equal 1. + * <p> + * Packages that are whitelisted, but then blacklisted so that they aren't to be installed on * any user, are purposefully still present in this list. */ - private final ArrayMap<String, Integer> mWhitelistedPackagesForUserTypes; + private final ArrayMap<String, Long> mWhitelistedPackagesForUserTypes; private final UserManagerService mUm; - UserSystemPackageInstaller(UserManagerService ums) { - mUm = ums; + /** + * Alphabetically sorted list of user types. + * Throughout this class, a long (functioning as a bitset) has its ith bit representing + * the user type stored in mUserTypes[i]. + * mUserTypes cannot exceed Long.SIZE (since we are using long for our bitset). + */ + private final String[] mUserTypes; + + UserSystemPackageInstaller(UserManagerService um, ArrayMap<String, UserTypeDetails> userTypes) { + mUm = um; + mUserTypes = getAndSortKeysFromMap(userTypes); + if (mUserTypes.length > Long.SIZE) { + throw new IllegalArgumentException("Device contains " + userTypes.size() + + " user types. However, UserSystemPackageInstaller does not work if there are" + + " more than " + Long.SIZE + " user types."); + // UserSystemPackageInstaller could use a BitSet instead of Long in this case. + // But, currently, 64 user types is far beyond expectations, so we have not done so. + } mWhitelistedPackagesForUserTypes = determineWhitelistedPackagesForUserTypes(SystemConfig.getInstance()); } /** Constructor for testing purposes. */ @VisibleForTesting - UserSystemPackageInstaller(UserManagerService ums, ArrayMap<String, Integer> whitelist) { + UserSystemPackageInstaller(UserManagerService ums, ArrayMap<String, Long> whitelist, + String[] sortedUserTypes) { mUm = ums; + mUserTypes = sortedUserTypes; mWhitelistedPackagesForUserTypes = whitelist; } /** * During OTAs and first boot, install/uninstall all system packages for all users based on the - * user's UserInfo flags and the SystemConfig whitelist. + * user's user type and the SystemConfig whitelist. * We do NOT uninstall packages during an OTA though. * * This is responsible for enforcing the whitelist for pre-existing users (i.e. USER_SYSTEM); @@ -262,27 +287,27 @@ class UserSystemPackageInstaller { /** * Gets the system packages names that should be installed on the given user. - * See {@link #getInstallablePackagesForUserType(int)}. + * See {@link #getInstallablePackagesForUserType(String)}. */ private @Nullable Set<String> getInstallablePackagesForUserId(@UserIdInt int userId) { - return getInstallablePackagesForUserType(mUm.getUserInfo(userId).flags); + return getInstallablePackagesForUserType(mUm.getUserInfo(userId).userType); } /** - * Gets the system package names that should be installed on a user with the given flags, as + * Gets the system package names that should be installed on users of the given user type, as * determined by SystemConfig, the whitelist mode, and the apps actually on the device. * Names are the {@link PackageParser.Package#packageName}, not necessarily the manifest names. * - * Returns null if all system packages should be installed (due enforce-mode being off). + * Returns null if all system packages should be installed (due to enforce-mode being off). */ - @Nullable Set<String> getInstallablePackagesForUserType(int flags) { + @Nullable Set<String> getInstallablePackagesForUserType(String userType) { final int mode = getWhitelistMode(); if (!isEnforceMode(mode)) { return null; } - final boolean isSystemUser = (flags & UserInfo.FLAG_SYSTEM) != 0; + final boolean isSystemUser = mUm.isUserTypeSubtypeOfSystem(userType); final boolean isImplicitWhitelistMode = isImplicitWhitelistMode(mode); - final Set<String> whitelistedPackages = getWhitelistedPackagesForUserType(flags); + final Set<String> whitelistedPackages = getWhitelistedPackagesForUserType(userType); final Set<String> installPackages = new ArraySet<>(); final PackageManagerInternal pmInt = LocalServices.getService(PackageManagerInternal.class); @@ -304,8 +329,9 @@ class UserSystemPackageInstaller { * the given whitelist of system packages. * * @param sysPkg the system package. Must be a system package; no verification for this is done. - * @param userTypeWhitelist map of package manifest names to user flags on which they should be - * installed + * @param userTypeWhitelist map of package manifest names to user types on which they should be + * installed. This is only used for overriding the userWhitelist in + * certain situations (based on its keyset). * @param userWhitelist set of package manifest names that should be installed on this * particular user. This must be consistent with userTypeWhitelist, but is * passed in separately to avoid repeatedly calculating it from @@ -315,7 +341,7 @@ class UserSystemPackageInstaller { */ @VisibleForTesting static boolean shouldInstallPackage(PackageParser.Package sysPkg, - @NonNull ArrayMap<String, Integer> userTypeWhitelist, + @NonNull ArrayMap<String, Long> userTypeWhitelist, @NonNull Set<String> userWhitelist, boolean isImplicitWhitelistMode, boolean isSystemUser) { @@ -335,16 +361,17 @@ class UserSystemPackageInstaller { } /** - * Gets the package manifest names that are whitelisted for a user with the given flags, + * Gets the package manifest names that are whitelisted for users of the given user type, * as determined by SystemConfig. */ @VisibleForTesting - @NonNull Set<String> getWhitelistedPackagesForUserType(int flags) { - Set<String> installablePkgs = new ArraySet<>(mWhitelistedPackagesForUserTypes.size()); + @NonNull Set<String> getWhitelistedPackagesForUserType(String userType) { + final long userTypeMask = getUserTypeMask(userType); + final Set<String> installablePkgs = new ArraySet<>(mWhitelistedPackagesForUserTypes.size()); for (int i = 0; i < mWhitelistedPackagesForUserTypes.size(); i++) { - String pkgName = mWhitelistedPackagesForUserTypes.keyAt(i); - int whitelistedUserTypes = mWhitelistedPackagesForUserTypes.valueAt(i); - if ((flags & whitelistedUserTypes) != 0) { + final String pkgName = mWhitelistedPackagesForUserTypes.keyAt(i); + final long whitelistedUserTypes = mWhitelistedPackagesForUserTypes.valueAt(i); + if ((userTypeMask & whitelistedUserTypes) != 0) { installablePkgs.add(pkgName); } } @@ -364,7 +391,8 @@ class UserSystemPackageInstaller { } /** - * Returns a map of package manifest names to the user flags on which it is to be installed. + * Returns a map of package manifest names to the bit set representing (via + * {@link #getUserTypeMask}) the user types on which they are to be installed. * Also, clears this data from SystemConfig where it was stored inefficiently (and therefore * should be called exactly once, even if the data isn't useful). * @@ -375,89 +403,132 @@ class UserSystemPackageInstaller { * <li>Packages that never whitelisted at all (even if they are explicitly blacklisted) are * ignored.</li> * <li>Packages that are blacklisted whenever they are whitelisted will be stored with the - * flag 0 (since this is a valid scenario, e.g. if an OEM completely blacklists an AOSP - * app).</li> + * value 0 (since this is a valid scenario, e.g. if an OEM completely blacklists an + * AOSP app).</li> * </ul> + * + * @see #mWhitelistedPackagesForUserTypes */ @VisibleForTesting - static ArrayMap<String, Integer> determineWhitelistedPackagesForUserTypes( - SystemConfig sysConfig) { + ArrayMap<String, Long> determineWhitelistedPackagesForUserTypes(SystemConfig sysConfig) { + // We first get the list of user types that correspond to FULL, SYSTEM, and PROFILE. + final Map<String, Long> baseTypeBitSets = getBaseTypeBitSets(); final ArrayMap<String, Set<String>> whitelist = sysConfig.getAndClearPackageToUserTypeWhitelist(); // result maps packageName -> userTypes on which the package should be installed. - final ArrayMap<String, Integer> result = new ArrayMap<>(whitelist.size() + 1); + final ArrayMap<String, Long> result = new ArrayMap<>(whitelist.size() + 1); // First, do the whitelisted user types. for (int i = 0; i < whitelist.size(); i++) { final String pkgName = whitelist.keyAt(i).intern(); - final int flags = getFlagsFromUserTypes(whitelist.valueAt(i)); - if (flags != 0) { - result.put(pkgName, flags); + final long typesBitSet = getTypesBitSet(whitelist.valueAt(i), baseTypeBitSets); + if (typesBitSet != 0) { + result.put(pkgName, typesBitSet); } } // Then, un-whitelist any blacklisted user types. - // TODO(b/141370854): Right now, the blacklist is actually just an 'unwhitelist'. Which - // direction we go depends on how we design user subtypes, which is still - // being designed. For now, unwhitelisting works for current use-cases. final ArrayMap<String, Set<String>> blacklist = sysConfig.getAndClearPackageToUserTypeBlacklist(); for (int i = 0; i < blacklist.size(); i++) { final String pkgName = blacklist.keyAt(i).intern(); - final int nonFlags = getFlagsFromUserTypes(blacklist.valueAt(i)); - final Integer flags = result.get(pkgName); - if (flags != null) { - result.put(pkgName, flags & ~nonFlags); + final long nonTypesBitSet = getTypesBitSet(blacklist.valueAt(i), baseTypeBitSets); + final Long typesBitSet = result.get(pkgName); + if (typesBitSet != null) { + result.put(pkgName, typesBitSet & ~nonTypesBitSet); + } else if (nonTypesBitSet != 0) { + // Package was never whitelisted but is validly blacklisted. + result.put(pkgName, 0L); } } // Regardless of the whitelists/blacklists, ensure mandatory packages. - result.put("android", - UserInfo.FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.FLAG_PROFILE); + result.put("android", ~0L); return result; } - /** Converts a user types, as used in SystemConfig, to a UserInfo flag. */ - private static int getFlagsFromUserTypes(Iterable<String> userTypes) { - // TODO(b/142482943): Update all this for the new UserTypes. - int flags = 0; + /** + * Returns the bitmask (with exactly one 1) corresponding to the given userType. + * Returns 0 if no such userType exists. + */ + @VisibleForTesting + long getUserTypeMask(String userType) { + final int userTypeIndex = Arrays.binarySearch(mUserTypes, userType); + final long userTypeMask = userTypeIndex >= 0 ? (1 << userTypeIndex) : 0; + return userTypeMask; + } + + /** + * Returns the mapping from the name of each base type to the bitset (as defined by + * {@link #getUserTypeMask}) of user types to which it corresponds (i.e. the base's subtypes). + * <p> + * E.g. if "android.type.ex" is a FULL user type for which getUserTypeMask() returns (1 << 3), + * then getBaseTypeBitSets().get("FULL") will contain true (1) in position 3. + */ + private Map<String, Long> getBaseTypeBitSets() { + long typesBitSetFull = 0; + long typesBitSetSystem = 0; + long typesBitSetProfile = 0; + for (int idx = 0; idx < mUserTypes.length; idx++) { + if (mUm.isUserTypeSubtypeOfFull(mUserTypes[idx])) { + typesBitSetFull |= (1 << idx); + } + if (mUm.isUserTypeSubtypeOfSystem(mUserTypes[idx])) { + typesBitSetSystem |= (1 << idx); + } + if (mUm.isUserTypeSubtypeOfProfile(mUserTypes[idx])) { + typesBitSetProfile |= (1 << idx); + } + } + + Map<String, Long> result = new ArrayMap<>(3); + result.put("FULL", typesBitSetFull); + result.put("SYSTEM", typesBitSetSystem); + result.put("PROFILE", typesBitSetProfile); + return result; + } + + /** + * Converts a list of user types and base types, as used in SystemConfig, to a bit set + * representing (via {@link #getUserTypeMask}) user types. + * + * Returns 0 if userTypes does not contain any valid user or base types. + * + * @param baseTypeBitSets a map from the base types (FULL/SYSTEM/PROFILE) to their subtypes + * (represented as a bitset, as defined by {@link #getUserTypeMask}). + * (This can be created by {@link #getBaseTypeBitSets}.) + */ + private long getTypesBitSet(Iterable<String> userTypes, Map<String, Long> baseTypeBitSets) { + long resultBitSet = 0; for (String type : userTypes) { - switch (type) { - case "GUEST": - flags |= UserInfo.FLAG_GUEST; - break; - case "RESTRICTED": - flags |= UserInfo.FLAG_RESTRICTED; - break; - case "MANAGED_PROFILE": - flags |= UserInfo.FLAG_MANAGED_PROFILE; - break; - case "EPHEMERAL": - flags |= UserInfo.FLAG_EPHEMERAL; - break; - case "DEMO": - flags |= UserInfo.FLAG_DEMO; - break; - case "FULL": - flags |= UserInfo.FLAG_FULL; - break; - case "SYSTEM": - flags |= UserInfo.FLAG_SYSTEM; - break; - case "PROFILE": - flags |= UserInfo.FLAG_PROFILE; - break; - default: - Slog.w(TAG, "SystemConfig contained an invalid user type: " + type); - break; - // Other UserInfo flags are forbidden. - // In particular, FLAG_INITIALIZED, FLAG_DISABLED, FLAG_QUIET_MODE are inapplicable. - // The following are invalid now, but are reconsiderable: FLAG_PRIMARY, FLAG_ADMIN. + // See if userType is a base type, like FULL. + final Long baseTypeBitSet = baseTypeBitSets.get(type); + if (baseTypeBitSet != null) { + resultBitSet |= baseTypeBitSet; + continue; } + // userType wasn't a base type, so it should be the name of a specific user type. + final long userTypeBitSet = getUserTypeMask(type); + if (userTypeBitSet != 0) { + resultBitSet |= userTypeBitSet; + continue; + } + Slog.w(TAG, "SystemConfig contained an invalid user type: " + type); + } + return resultBitSet; + } + + /** Returns a sorted array consisting of the keyset of the provided map. */ + private static String[] getAndSortKeysFromMap(ArrayMap<String, ?> map) { + final String[] userTypeList = new String[map.size()]; + for (int i = 0; i < map.size(); i++) { + userTypeList[i] = map.keyAt(i); } - return flags; + Arrays.sort(userTypeList); + return userTypeList; } void dump(PrintWriter pw) { final String prefix = " "; + final String prefix2 = prefix + prefix; final int mode = getWhitelistMode(); pw.println("Whitelisted packages per user type"); pw.print(prefix); pw.print("Mode: "); @@ -467,18 +538,27 @@ class UserSystemPackageInstaller { pw.print(isImplicitWhitelistMode(mode) ? " (implicit)" : ""); pw.println(); + pw.print(prefix); pw.println("Legend"); + for (int idx = 0; idx < mUserTypes.length; idx++) { + pw.print(prefix2); pw.println(idx + " -> " + mUserTypes[idx]); + } + final int size = mWhitelistedPackagesForUserTypes.size(); if (size == 0) { pw.print(prefix); pw.println("No packages"); return; } - final String prefix2 = prefix + prefix; pw.print(prefix); pw.print(size); pw.println(" packages:"); - for (int i = 0; i < size; i++) { - final String pkgName = mWhitelistedPackagesForUserTypes.keyAt(i); - final String whitelistedUserTypes = - UserInfo.flagsToString(mWhitelistedPackagesForUserTypes.valueAt(i)); - pw.print(prefix2); pw.print(pkgName); pw.print(": "); pw.println(whitelistedUserTypes); + for (int pkgIdx = 0; pkgIdx < size; pkgIdx++) { + final String pkgName = mWhitelistedPackagesForUserTypes.keyAt(pkgIdx); + pw.print(prefix2); pw.print(pkgName); pw.print(": "); + final long userTypesBitSet = mWhitelistedPackagesForUserTypes.valueAt(pkgIdx); + for (int idx = 0; idx < mUserTypes.length; idx++) { + if ((userTypesBitSet & (1 << idx)) != 0) { + pw.print(idx); pw.print(" "); + } + } + pw.println(); } } } diff --git a/services/core/java/com/android/server/pm/UserTypeDetails.java b/services/core/java/com/android/server/pm/UserTypeDetails.java index 5fc3ba1fc538..1631df33587f 100644 --- a/services/core/java/com/android/server/pm/UserTypeDetails.java +++ b/services/core/java/com/android/server/pm/UserTypeDetails.java @@ -223,6 +223,14 @@ public final class UserTypeDetails { return (mBaseType & UserInfo.FLAG_PROFILE) != 0; } + public boolean isFull() { + return (mBaseType & UserInfo.FLAG_FULL) != 0; + } + + public boolean isSystem() { + return (mBaseType & UserInfo.FLAG_SYSTEM) != 0; + } + // TODO(b/142482943): Hook this up and don't return the original. public List<String> getDefaultRestrictions() { return mDefaultRestrictions; diff --git a/services/core/java/com/android/server/pm/permission/BasePermission.java b/services/core/java/com/android/server/pm/permission/BasePermission.java index 037912a66b3a..c39dcfefb2e8 100644 --- a/services/core/java/com/android/server/pm/permission/BasePermission.java +++ b/services/core/java/com/android/server/pm/permission/BasePermission.java @@ -279,9 +279,6 @@ public final class BasePermission { public boolean isTelephony() { return (protectionLevel & PermissionInfo.PROTECTION_FLAG_TELEPHONY) != 0; } - public boolean isWifi() { - return (protectionLevel & PermissionInfo.PROTECTION_FLAG_WIFI) != 0; - } public void transfer(@NonNull String origPackageName, @NonNull String newPackageName) { if (!origPackageName.equals(sourcePackageName)) { 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 e9aad4fa94d8..2ffba45be4a3 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -3292,13 +3292,6 @@ public class PermissionManagerService extends IPermissionManager.Stub { // Special permissions for the system telephony apps. allowed = true; } - if (!allowed && bp.isWifi() - && ArrayUtils.contains(mPackageManagerInt.getKnownPackageNames( - PackageManagerInternal.PACKAGE_WIFI, UserHandle.USER_SYSTEM), - pkg.packageName)) { - // Special permissions for the system wifi. - allowed = true; - } } return allowed; } diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java index 0a6b38fb2e9a..6da8fb4b1edb 100644 --- a/services/core/java/com/android/server/power/ShutdownThread.java +++ b/services/core/java/com/android/server/power/ShutdownThread.java @@ -47,8 +47,8 @@ import android.util.TimingsTraceLog; import android.view.WindowManager; import com.android.internal.telephony.ITelephony; -import com.android.server.RescueParty; import com.android.server.LocalServices; +import com.android.server.RescueParty; import com.android.server.pm.PackageManagerService; import com.android.server.statusbar.StatusBarManagerInternal; @@ -307,7 +307,9 @@ public final class ShutdownThread extends Thread { com.android.internal.R.string.reboot_to_update_reboot)); } } else if (mReason != null && mReason.equals(PowerManager.REBOOT_RECOVERY)) { - if (RescueParty.isAttemptingFactoryReset()) { + if (showSysuiReboot()) { + return null; + } else if (RescueParty.isAttemptingFactoryReset()) { // We're not actually doing a factory reset yet; we're rebooting // to ask the user if they'd like to reset, so give them a less // scary dialog message. diff --git a/services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java b/services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java index 9dbbf16e7734..3c79b2399fa3 100644 --- a/services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java +++ b/services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java @@ -16,9 +16,11 @@ package com.android.server.timedetector; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AlarmManager; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; import android.content.Intent; import android.util.Slog; @@ -27,6 +29,8 @@ import android.util.TimestampedValue; import com.android.internal.telephony.TelephonyIntents; import java.io.PrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * An implementation of TimeDetectorStrategy that passes only NITZ suggestions to @@ -38,10 +42,22 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { private final static String TAG = "timedetector.SimpleTimeDetectorStrategy"; + @IntDef({ ORIGIN_PHONE, ORIGIN_MANUAL }) + @Retention(RetentionPolicy.SOURCE) + public @interface Origin {} + + /** Used when a time value originated from a telephony signal. */ + @Origin + private static final int ORIGIN_PHONE = 1; + + /** Used when a time value originated from a user / manual settings. */ + @Origin + private static final int ORIGIN_MANUAL = 2; + /** * CLOCK_PARANOIA: The maximum difference allowed between the expected system clock time and the * actual system clock time before a warning is logged. Used to help identify situations where - * there is something other than this class setting the system clock. + * there is something other than this class setting the system clock automatically. */ private static final long SYSTEM_CLOCK_PARANOIA_THRESHOLD_MILLIS = 2 * 1000; @@ -52,11 +68,11 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { @Nullable private PhoneTimeSuggestion mLastPhoneSuggestion; // Information about the last time signal received: Used when toggling auto-time. - @Nullable private TimestampedValue<Long> mLastSystemClockTime; - private boolean mLastSystemClockTimeSendNetworkBroadcast; + @Nullable private TimestampedValue<Long> mLastAutoSystemClockTime; + private boolean mLastAutoSystemClockTimeSendNetworkBroadcast; // System clock state. - @Nullable private TimestampedValue<Long> mLastSystemClockTimeSet; + @Nullable private TimestampedValue<Long> mLastAutoSystemClockTimeSet; @Override public void initialize(@NonNull Callback callback) { @@ -67,23 +83,29 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { public void suggestPhoneTime(@NonNull PhoneTimeSuggestion timeSuggestion) { // NITZ logic + // Empty suggestions are just ignored as we don't currently keep track of suggestion origin. + if (timeSuggestion.getUtcTime() == null) { + return; + } + boolean timeSuggestionIsValid = validateNewPhoneSuggestion(timeSuggestion, mLastPhoneSuggestion); if (!timeSuggestionIsValid) { return; } // Always store the last NITZ value received, regardless of whether we go on to use it to - // update the system clock. This is so that we can validate future NITZ signals. + // update the system clock. This is so that we can validate future phone suggestions. mLastPhoneSuggestion = timeSuggestion; // System clock update logic. + final TimestampedValue<Long> newUtcTime = timeSuggestion.getUtcTime(); + setSystemClockIfRequired(ORIGIN_PHONE, newUtcTime, timeSuggestion); + } - // Historically, Android has sent a telephony broadcast only when setting the time using - // NITZ. - final boolean sendNetworkBroadcast = true; - + @Override + public void suggestManualTime(ManualTimeSuggestion timeSuggestion) { final TimestampedValue<Long> newUtcTime = timeSuggestion.getUtcTime(); - setSystemClockIfRequired(newUtcTime, sendNetworkBroadcast); + setSystemClockIfRequired(ORIGIN_MANUAL, newUtcTime, timeSuggestion); } private static boolean validateNewPhoneSuggestion(@NonNull PhoneTimeSuggestion newSuggestion, @@ -105,16 +127,31 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { } private void setSystemClockIfRequired( - TimestampedValue<Long> time, boolean sendNetworkBroadcast) { - - // Store the last candidate we've seen in all cases so we can set the system clock - // when/if time detection is enabled. - mLastSystemClockTime = time; - mLastSystemClockTimeSendNetworkBroadcast = sendNetworkBroadcast; - - if (!mCallback.isTimeDetectionEnabled()) { - Slog.d(TAG, "setSystemClockIfRequired: Time detection is not enabled. time=" + time); - return; + @Origin int origin, TimestampedValue<Long> time, Object cause) { + // Historically, Android has sent a TelephonyIntents.ACTION_NETWORK_SET_TIME broadcast only + // when setting the time using NITZ. + boolean sendNetworkBroadcast = origin == ORIGIN_PHONE; + + boolean isOriginAutomatic = isOriginAutomatic(origin); + if (isOriginAutomatic) { + // Store the last auto time candidate we've seen in all cases so we can set the system + // clock when/if time detection is off but later enabled. + mLastAutoSystemClockTime = time; + mLastAutoSystemClockTimeSendNetworkBroadcast = sendNetworkBroadcast; + + if (!mCallback.isAutoTimeDetectionEnabled()) { + Slog.d(TAG, "setSystemClockIfRequired: Auto time detection is not enabled." + + " time=" + time + + ", cause=" + cause); + return; + } + } else { + if (mCallback.isAutoTimeDetectionEnabled()) { + Slog.d(TAG, "setSystemClockIfRequired: Auto time detection is enabled." + + " time=" + time + + ", cause=" + cause); + return; + } } mCallback.acquireWakeLock(); @@ -122,37 +159,44 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { long elapsedRealtimeMillis = mCallback.elapsedRealtimeMillis(); long actualTimeMillis = mCallback.systemClockMillis(); - // CLOCK_PARANOIA : Check to see if this class owns the clock or if something else - // may be setting the clock. - if (mLastSystemClockTimeSet != null) { - long expectedTimeMillis = TimeDetectorStrategy.getTimeAt( - mLastSystemClockTimeSet, elapsedRealtimeMillis); - long absSystemClockDifference = Math.abs(expectedTimeMillis - actualTimeMillis); - if (absSystemClockDifference > SYSTEM_CLOCK_PARANOIA_THRESHOLD_MILLIS) { - Slog.w(TAG, "System clock has not tracked elapsed real time clock. A clock may" - + " be inaccurate or something unexpectedly set the system clock." - + " elapsedRealtimeMillis=" + elapsedRealtimeMillis - + " expectedTimeMillis=" + expectedTimeMillis - + " actualTimeMillis=" + actualTimeMillis); + if (isOriginAutomatic) { + // CLOCK_PARANOIA : Check to see if this class owns the clock or if something else + // may be setting the clock. + if (mLastAutoSystemClockTimeSet != null) { + long expectedTimeMillis = TimeDetectorStrategy.getTimeAt( + mLastAutoSystemClockTimeSet, elapsedRealtimeMillis); + long absSystemClockDifference = Math.abs(expectedTimeMillis - actualTimeMillis); + if (absSystemClockDifference > SYSTEM_CLOCK_PARANOIA_THRESHOLD_MILLIS) { + Slog.w(TAG, + "System clock has not tracked elapsed real time clock. A clock may" + + " be inaccurate or something unexpectedly set the system" + + " clock." + + " elapsedRealtimeMillis=" + elapsedRealtimeMillis + + " expectedTimeMillis=" + expectedTimeMillis + + " actualTimeMillis=" + actualTimeMillis); + } } } - final String reason = "New time signal"; adjustAndSetDeviceSystemClock( - time, sendNetworkBroadcast, elapsedRealtimeMillis, actualTimeMillis, reason); + time, sendNetworkBroadcast, elapsedRealtimeMillis, actualTimeMillis, cause); } finally { mCallback.releaseWakeLock(); } } + private static boolean isOriginAutomatic(@Origin int origin) { + return origin == ORIGIN_PHONE; + } + @Override public void handleAutoTimeDetectionToggle(boolean enabled) { // If automatic time detection is enabled we update the system clock instantly if we can. // Conversely, if automatic time detection is disabled we leave the clock as it is. if (enabled) { - if (mLastSystemClockTime != null) { + if (mLastAutoSystemClockTime != null) { // Only send the network broadcast if the last candidate would have caused one. - final boolean sendNetworkBroadcast = mLastSystemClockTimeSendNetworkBroadcast; + final boolean sendNetworkBroadcast = mLastAutoSystemClockTimeSendNetworkBroadcast; mCallback.acquireWakeLock(); try { @@ -160,7 +204,7 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { long actualTimeMillis = mCallback.systemClockMillis(); final String reason = "Automatic time detection enabled."; - adjustAndSetDeviceSystemClock(mLastSystemClockTime, sendNetworkBroadcast, + adjustAndSetDeviceSystemClock(mLastAutoSystemClockTime, sendNetworkBroadcast, elapsedRealtimeMillis, actualTimeMillis, reason); } finally { mCallback.releaseWakeLock(); @@ -169,22 +213,22 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { } else { // CLOCK_PARANOIA: We are losing "control" of the system clock so we cannot predict what // it should be in future. - mLastSystemClockTimeSet = null; + mLastAutoSystemClockTimeSet = null; } } @Override public void dump(@NonNull PrintWriter pw, @Nullable String[] args) { pw.println("mLastPhoneSuggestion=" + mLastPhoneSuggestion); - pw.println("mLastSystemClockTimeSet=" + mLastSystemClockTimeSet); - pw.println("mLastSystemClockTime=" + mLastSystemClockTime); - pw.println("mLastSystemClockTimeSendNetworkBroadcast=" - + mLastSystemClockTimeSendNetworkBroadcast); + pw.println("mLastAutoSystemClockTimeSet=" + mLastAutoSystemClockTimeSet); + pw.println("mLastAutoSystemClockTime=" + mLastAutoSystemClockTime); + pw.println("mLastAutoSystemClockTimeSendNetworkBroadcast=" + + mLastAutoSystemClockTimeSendNetworkBroadcast); } private void adjustAndSetDeviceSystemClock( TimestampedValue<Long> newTime, boolean sendNetworkBroadcast, - long elapsedRealtimeMillis, long actualSystemClockMillis, String reason) { + long elapsedRealtimeMillis, long actualSystemClockMillis, Object cause) { // Adjust for the time that has elapsed since the signal was received. long newSystemClockMillis = TimeDetectorStrategy.getTimeAt(newTime, elapsedRealtimeMillis); @@ -198,20 +242,20 @@ public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy { + " system clock are close enough." + " elapsedRealtimeMillis=" + elapsedRealtimeMillis + " newTime=" + newTime - + " reason=" + reason + + " cause=" + cause + " systemClockUpdateThreshold=" + systemClockUpdateThreshold + " absTimeDifference=" + absTimeDifference); return; } Slog.d(TAG, "Setting system clock using time=" + newTime - + " reason=" + reason + + " cause=" + cause + " elapsedRealtimeMillis=" + elapsedRealtimeMillis + " newTimeMillis=" + newSystemClockMillis); mCallback.setSystemClock(newSystemClockMillis); // CLOCK_PARANOIA : Record the last time this class set the system clock. - mLastSystemClockTimeSet = newTime; + mLastAutoSystemClockTimeSet = newTime; if (sendNetworkBroadcast) { // Send a broadcast that telephony code used to send after setting the clock. diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java index ee42279f7d50..09309751d493 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorService.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorService.java @@ -19,6 +19,7 @@ package com.android.server.timedetector; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.timedetector.ITimeDetectorService; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; import android.content.ContentResolver; import android.content.Context; @@ -97,7 +98,7 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { @Override public void suggestPhoneTime(@NonNull PhoneTimeSuggestion timeSignal) { - enforceSetTimePermission(); + enforceSuggestPhoneTimePermission(); Objects.requireNonNull(timeSignal); long idToken = Binder.clearCallingIdentity(); @@ -110,10 +111,25 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { } } + @Override + public void suggestManualTime(@NonNull ManualTimeSuggestion timeSignal) { + enforceSuggestManualTimePermission(); + Objects.requireNonNull(timeSignal); + + long idToken = Binder.clearCallingIdentity(); + try { + synchronized (mStrategyLock) { + mTimeDetectorStrategy.suggestManualTime(timeSignal); + } + } finally { + Binder.restoreCallingIdentity(idToken); + } + } + @VisibleForTesting public void handleAutoTimeDetectionToggle() { synchronized (mStrategyLock) { - final boolean timeDetectionEnabled = mCallback.isTimeDetectionEnabled(); + final boolean timeDetectionEnabled = mCallback.isAutoTimeDetectionEnabled(); mTimeDetectorStrategy.handleAutoTimeDetectionToggle(timeDetectionEnabled); } } @@ -128,7 +144,11 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { } } - private void enforceSetTimePermission() { + private void enforceSuggestPhoneTimePermission() { + mContext.enforceCallingPermission(android.Manifest.permission.SET_TIME, "set time"); + } + + private void enforceSuggestManualTimePermission() { mContext.enforceCallingPermission(android.Manifest.permission.SET_TIME, "set time"); } -}
\ No newline at end of file +} diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java index 7c2a945854f5..b60cebf57b45 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java @@ -18,6 +18,7 @@ package com.android.server.timedetector; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; import android.content.Intent; import android.util.TimestampedValue; @@ -47,7 +48,7 @@ public interface TimeDetectorStrategy { int systemClockUpdateThresholdMillis(); /** Returns true if automatic time detection is enabled. */ - boolean isTimeDetectionEnabled(); + boolean isAutoTimeDetectionEnabled(); /** Acquire a suitable wake lock. Must be followed by {@link #releaseWakeLock()} */ void acquireWakeLock(); @@ -71,9 +72,12 @@ public interface TimeDetectorStrategy { /** Initialize the strategy. */ void initialize(@NonNull Callback callback); - /** Process the suggested time. */ + /** Process the suggested time from telephony sources. */ void suggestPhoneTime(@NonNull PhoneTimeSuggestion timeSuggestion); + /** Process the suggested manually entered time. */ + void suggestManualTime(@NonNull ManualTimeSuggestion timeSuggestion); + /** Handle the auto-time setting being toggled on or off. */ void handleAutoTimeDetectionToggle(boolean enabled); diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java index 77b9e6281086..42d59d51c6af 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java @@ -72,7 +72,7 @@ public final class TimeDetectorStrategyCallbackImpl implements TimeDetectorStrat } @Override - public boolean isTimeDetectionEnabled() { + public boolean isAutoTimeDetectionEnabled() { try { return Settings.Global.getInt(mContentResolver, Settings.Global.AUTO_TIME) != 0; } catch (Settings.SettingNotFoundException snfe) { diff --git a/services/core/java/com/android/server/wm/ActivityDisplay.java b/services/core/java/com/android/server/wm/ActivityDisplay.java index be7dfe53c1c1..45e3c689e81e 100644 --- a/services/core/java/com/android/server/wm/ActivityDisplay.java +++ b/services/core/java/com/android/server/wm/ActivityDisplay.java @@ -74,7 +74,6 @@ import android.view.Display; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.function.pooled.PooledLambda; -import com.android.server.am.EventLogTags; import com.android.server.protolog.common.ProtoLog; import java.io.PrintWriter; @@ -299,7 +298,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { final ActivityStack currentFocusedStack = getFocusedStack(); if (currentFocusedStack != prevFocusedStack) { mLastFocusedStack = prevFocusedStack; - EventLogTags.writeAmFocusedStack(mRootActivityContainer.mCurrentUser, mDisplayId, + EventLogTags.writeWmFocusedStack(mRootActivityContainer.mCurrentUser, mDisplayId, currentFocusedStack == null ? -1 : currentFocusedStack.getStackId(), mLastFocusedStack == null ? -1 : mLastFocusedStack.getStackId(), updateLastFocusedStackReason); diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 0a861ade2900..9fa5d9f15f3e 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -56,13 +56,13 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_T import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_REPORTED_DRAWN_NO_BUNDLE; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_REPORTED_DRAWN_WITH_BUNDLE; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_WARM_LAUNCH; -import static com.android.server.am.EventLogTags.AM_ACTIVITY_LAUNCH_TIME; import static com.android.server.am.MemoryStatUtil.MemoryStat; import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_METRICS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_TIMEOUT; +import static com.android.server.wm.EventLogTags.WM_ACTIVITY_LAUNCH_TIME; import android.app.WaitResult; import android.app.WindowConfiguration.WindowingMode; @@ -805,7 +805,7 @@ class ActivityMetricsLogger { return; } - EventLog.writeEvent(AM_ACTIVITY_LAUNCH_TIME, + EventLog.writeEvent(WM_ACTIVITY_LAUNCH_TIME, info.userId, info.activityRecordIdHashCode, info.launchedActivityShortComponentName, info.windowsDrawnDelayMs); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 0acab9cb74c5..3de3578a09f1 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -122,8 +122,6 @@ import static com.android.server.am.ActivityRecordProto.STATE; import static com.android.server.am.ActivityRecordProto.TRANSLUCENT; import static com.android.server.am.ActivityRecordProto.VISIBLE; import static com.android.server.am.ActivityRecordProto.VISIBLE_REQUESTED; -import static com.android.server.am.EventLogTags.AM_RELAUNCH_ACTIVITY; -import static com.android.server.am.EventLogTags.AM_RELAUNCH_RESUME_ACTIVITY; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; @@ -306,7 +304,6 @@ import com.android.internal.util.XmlUtils; import com.android.server.AttributeCache; import com.android.server.LocalServices; import com.android.server.am.AppTimeTracker; -import com.android.server.am.EventLogTags; import com.android.server.am.PendingIntentRecord; import com.android.server.display.color.ColorDisplayService; import com.android.server.policy.WindowManagerPolicy; @@ -2379,8 +2376,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Make a local reference to its task since this.task could be set to null once this // activity is destroyed and detached from task. final Task task = getTask(); - EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY, - mUserId, System.identityHashCode(this), + EventLogTags.writeWmFinishActivity(mUserId, System.identityHashCode(this), task.mTaskId, shortComponentName, reason); final ArrayList<ActivityRecord> activities = task.mChildren; final int index = activities.indexOf(this); @@ -2655,8 +2651,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } - EventLog.writeEvent(EventLogTags.AM_DESTROY_ACTIVITY, mUserId, - System.identityHashCode(this), task.mTaskId, shortComponentName, reason); + EventLogTags.writeWmDestroyActivity(mUserId, System.identityHashCode(this), + task.mTaskId, shortComponentName, reason); final ActivityStack stack = getActivityStack(); if (hasProcess() && !stack.inLruList(this)) { @@ -4741,7 +4737,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (!mVisibleRequested) { setVisibility(false); } - EventLogTags.writeAmStopActivity( + EventLogTags.writeWmStopActivity( mUserId, System.identityHashCode(this), shortComponentName); mAtmService.getLifecycleManager().scheduleTransaction(app.getThread(), appToken, StopActivityItem.obtain(mVisibleRequested, configChangeFlags)); @@ -4810,8 +4806,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void addToStopping(boolean scheduleIdle, boolean idleDelayed, String reason) { if (!mStackSupervisor.mStoppingActivities.contains(this)) { - EventLog.writeEvent(EventLogTags.AM_ADD_TO_STOPPING, mUserId, - System.identityHashCode(this), shortComponentName, reason); + EventLogTags.writeWmAddToStopping(mUserId, System.identityHashCode(this), + shortComponentName, reason); mStackSupervisor.mStoppingActivities.add(this); } @@ -6942,9 +6938,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A "Relaunching: " + this + " with results=" + pendingResults + " newIntents=" + pendingNewIntents + " andResume=" + andResume + " preserveWindow=" + preserveWindow); - EventLog.writeEvent(andResume ? AM_RELAUNCH_RESUME_ACTIVITY - : AM_RELAUNCH_ACTIVITY, mUserId, System.identityHashCode(this), - task.mTaskId, shortComponentName); + if (andResume) { + EventLogTags.writeWmRelaunchResumeActivity(mUserId, System.identityHashCode(this), + task.mTaskId, shortComponentName); + } else { + EventLogTags.writeWmRelaunchActivity(mUserId, System.identityHashCode(this), + task.mTaskId, shortComponentName); + } startFreezingScreenLocked(0); diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java index f1c47eb8644c..6ddbb0df2ccc 100644 --- a/services/core/java/com/android/server/wm/ActivityStack.java +++ b/services/core/java/com/android/server/wm/ActivityStack.java @@ -84,7 +84,6 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TASKS; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_TRANSITION; import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_USER_LEAVING; -import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_VISIBILITY; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_ADD_REMOVE; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_APP; import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_CLEANUP; @@ -163,7 +162,6 @@ import android.os.UserHandle; import android.service.voice.IVoiceInteractionSession; import android.util.ArraySet; import android.util.DisplayMetrics; -import android.util.EventLog; import android.util.IntArray; import android.util.Log; import android.util.Slog; @@ -185,7 +183,6 @@ import com.android.server.Watchdog; import com.android.server.am.ActivityManagerService; import com.android.server.am.ActivityManagerService.ItemMatcher; import com.android.server.am.AppTimeTracker; -import com.android.server.am.EventLogTags; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -533,7 +530,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg mDockedStackMinimizeThickness = supervisor.mService.mWindowManager.mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.docked_stack_minimize_thickness); - EventLog.writeEvent(com.android.server.EventLogTags.WM_STACK_CREATED, stackId); + EventLogTags.writeWmStackCreated(stackId); mStackSupervisor = supervisor; mService = supervisor.mService; mRootActivityContainer = mService.mRootActivityContainer; @@ -1586,7 +1583,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg if (prev.attachedToProcess()) { if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueueing pending pause: " + prev); try { - EventLogTags.writeAmPauseActivity(prev.mUserId, System.identityHashCode(prev), + EventLogTags.writeWmPauseActivity(prev.mUserId, System.identityHashCode(prev), prev.shortComponentName, "userLeaving=" + userLeaving); mService.getLifecycleManager().scheduleTransaction(prev.app.getThread(), @@ -1663,10 +1660,9 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg } return; } else { - EventLog.writeEvent(EventLogTags.AM_FAILED_TO_PAUSE, - r.mUserId, System.identityHashCode(r), r.shortComponentName, - mPausingActivity != null - ? mPausingActivity.shortComponentName : "(none)"); + EventLogTags.writeWmFailedToPause(r.mUserId, System.identityHashCode(r), + r.shortComponentName, mPausingActivity != null + ? mPausingActivity.shortComponentName : "(none)"); if (r.isState(PAUSING)) { r.setState(PAUSED, "activityPausedLocked"); if (r.finishing) { @@ -2659,9 +2655,8 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg // Clear app token stopped state in window manager if needed. next.notifyAppResumed(next.stopped); - EventLog.writeEvent(EventLogTags.AM_RESUME_ACTIVITY, next.mUserId, - System.identityHashCode(next), next.getTask().mTaskId, - next.shortComponentName); + EventLogTags.writeWmResumeActivity(next.mUserId, System.identityHashCode(next), + next.getTask().mTaskId, next.shortComponentName); next.sleeping = false; mService.getAppWarningsLocked().onResumeActivity(next); @@ -3519,10 +3514,9 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg + " state=" + r.getState() + " callers=" + Debug.getCallers(5)); if (!r.finishing || isProcessRemoved) { Slog.w(TAG, "Force removing " + r + ": app died, no saved state"); - EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY, - r.mUserId, System.identityHashCode(r), - r.getTask().mTaskId, r.shortComponentName, - "proc died without state saved"); + EventLogTags.writeWmFinishActivity(r.mUserId, + System.identityHashCode(r), r.getTask().mTaskId, + r.shortComponentName, "proc died without state saved"); } } else { // We have the current state for this activity, so @@ -3634,7 +3628,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg } mRootActivityContainer.resumeFocusedStacksTopActivities(); - EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.mUserId, tr.mTaskId); + EventLogTags.writeWmTaskToFront(tr.mUserId, tr.mTaskId); mService.getTaskChangeNotificationController().notifyTaskMovedToFront(tr.getTaskInfo()); } finally { getDisplay().continueUpdateImeTarget(); @@ -4141,7 +4135,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg super.removeChild(child); - EventLog.writeEvent(EventLogTags.AM_REMOVE_TASK, child.mTaskId, mStackId); + EventLogTags.writeWmRemoveTask(child.mTaskId, mStackId); if (display.isSingleTaskInstance()) { mService.notifySingleTaskDisplayEmpty(display.mDisplayId); @@ -4820,9 +4814,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg } final int toTop = targetPosition == mChildren.size() - 1 ? 1 : 0; - EventLog.writeEvent(com.android.server.EventLogTags.WM_TASK_MOVED, child.mTaskId, toTop, - targetPosition); - + EventLogTags.writeWmTaskMoved(child.mTaskId, toTop, targetPosition); return targetPosition; } @@ -4872,8 +4864,7 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg } super.onParentChanged(newParent, oldParent); if (getParent() == null && mDisplayContent != null) { - EventLog.writeEvent(com.android.server.EventLogTags.WM_STACK_REMOVED, mStackId); - + EventLogTags.writeWmStackRemoved(mStackId); mDisplayContent = null; mWmService.mWindowPlacerLocked.requestTraversal(); } diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java index 304f2300e308..d088a5e286c1 100644 --- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java @@ -126,7 +126,6 @@ import android.os.WorkSource; import android.provider.MediaStore; import android.util.ArrayMap; import android.util.ArraySet; -import android.util.EventLog; import android.util.MergedConfiguration; import android.util.Slog; import android.util.SparseArray; @@ -141,7 +140,6 @@ import com.android.internal.os.logging.MetricsLoggerWrapper; import com.android.internal.util.ArrayUtils; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.am.ActivityManagerService; -import com.android.server.am.EventLogTags; import com.android.server.am.UserState; import java.io.FileDescriptor; @@ -823,8 +821,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { "Launching: " + r + " savedState=" + r.getSavedState() + " with results=" + results + " newIntents=" + newIntents + " andResume=" + andResume); - EventLog.writeEvent(EventLogTags.AM_RESTART_ACTIVITY, r.mUserId, - System.identityHashCode(r), task.mTaskId, r.shortComponentName); + EventLogTags.writeWmRestartActivity(r.mUserId, System.identityHashCode(r), + task.mTaskId, r.shortComponentName); if (r.isActivityTypeHome()) { // Home process is the root process of the task. updateHomeProcess(task.getChildAt(0).app); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 8455c6d04b3d..0f912f1a4956 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -60,7 +60,6 @@ import static android.os.Process.INVALID_UID; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; -import static com.android.server.am.EventLogTags.AM_NEW_INTENT; import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; import static com.android.server.wm.ActivityStackSupervisor.ON_TOP; @@ -114,14 +113,12 @@ import android.os.UserManager; import android.service.voice.IVoiceInteractionSession; import android.text.TextUtils; import android.util.ArraySet; -import android.util.EventLog; import android.util.Pools.SynchronizedPool; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.HeavyWeightSwitcherActivity; import com.android.internal.app.IVoiceInteractor; -import com.android.server.am.EventLogTags; import com.android.server.am.PendingIntentRecord; import com.android.server.pm.InstantAppResolver; import com.android.server.wm.ActivityStackSupervisor.PendingActivityLaunch; @@ -1550,11 +1547,12 @@ class ActivityStarter { UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) ); if (newTask) { - EventLog.writeEvent(EventLogTags.AM_CREATE_TASK, mStartActivity.mUserId, + EventLogTags.writeWmCreateTask(mStartActivity.mUserId, mStartActivity.getTask().mTaskId); } mStartActivity.logStartActivity( - EventLogTags.AM_CREATE_ACTIVITY, mStartActivity.getTask()); + EventLogTags.WM_CREATE_ACTIVITY, mStartActivity.getTask()); + mTargetStack.mLastPausedActivity = null; mRootActivityContainer.sendPowerHintForLaunchStartIfNeeded( @@ -2405,7 +2403,7 @@ class ActivityStarter { return; } - activity.logStartActivity(AM_NEW_INTENT, activity.getTask()); + activity.logStartActivity(EventLogTags.WM_NEW_INTENT, activity.getTask()); activity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); mIntentDelivered = true; diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index bef4f5a847f3..bcd5d369ee0c 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -83,6 +83,8 @@ import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.PRE import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.SCREEN_COMPAT_PACKAGES; import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.MODE; import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.PACKAGE; +import static com.android.server.am.EventLogTags.writeBootProgressEnableScreen; +import static com.android.server.am.EventLogTags.writeConfigurationChanged; import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING; import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME; @@ -215,7 +217,6 @@ import android.text.TextUtils; import android.text.format.TimeMigrationUtils; import android.util.ArrayMap; import android.util.ArraySet; -import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.util.SparseArray; @@ -258,7 +259,6 @@ import com.android.server.am.ActivityManagerServiceDumpActivitiesProto; import com.android.server.am.ActivityManagerServiceDumpProcessesProto; import com.android.server.am.AppTimeTracker; import com.android.server.am.BaseErrorDialog; -import com.android.server.am.EventLogTags; import com.android.server.am.PendingIntentController; import com.android.server.am.PendingIntentRecord; import com.android.server.am.UserState; @@ -5195,8 +5195,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.i(TAG_CONFIGURATION, "Updating global configuration to: " + values); - - EventLog.writeEvent(EventLogTags.CONFIGURATION_CHANGED, changes); + writeConfigurationChanged(changes); StatsLog.write(StatsLog.RESOURCE_CONFIGURATION_CHANGED, values.colorMode, values.densityDpi, @@ -5359,8 +5358,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } void enableScreenAfterBoot(boolean booted) { - EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_ENABLE_SCREEN, - SystemClock.uptimeMillis()); + writeBootProgressEnableScreen(SystemClock.uptimeMillis()); mWindowManager.enableScreenAfterBoot(); synchronized (mGlobalLock) { @@ -5491,7 +5489,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { applyUpdateLockStateLocked(r); applyUpdateVrModeLocked(r); - EventLogTags.writeAmSetResumedActivity( + EventLogTags.writeWmSetResumedActivity( r == null ? -1 : r.mUserId, r == null ? "NULL" : r.shortComponentName, reason); @@ -6419,8 +6417,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public void enableScreenAfterBoot(boolean booted) { synchronized (mGlobalLock) { - EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_ENABLE_SCREEN, - SystemClock.uptimeMillis()); + writeBootProgressEnableScreen(SystemClock.uptimeMillis()); mWindowManager.enableScreenAfterBoot(); updateEventDispatchingLocked(booted); } diff --git a/services/core/java/com/android/server/wm/EventLogTags.logtags b/services/core/java/com/android/server/wm/EventLogTags.logtags new file mode 100644 index 000000000000..aab901ebcdb6 --- /dev/null +++ b/services/core/java/com/android/server/wm/EventLogTags.logtags @@ -0,0 +1,77 @@ +# See system/core/logcat/event.logtags for a description of the format of this file. + +option java_package com.android.server.wm + +# Do not change these names without updating the checkin_events setting in +# google3/googledata/wireless/android/provisioning/gservices.config !! +# +# An activity is being finished: +30001 wm_finish_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Reason|3) +# A task is being brought to the front of the screen: +30002 wm_task_to_front (User|1|5),(Task|1|5) +# An existing activity is being given a new intent: +30003 wm_new_intent (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Action|3),(MIME Type|3),(URI|3),(Flags|1|5) +# A new task is being created: +30004 wm_create_task (User|1|5),(Task ID|1|5) +# A new activity is being created in an existing task: +30005 wm_create_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Action|3),(MIME Type|3),(URI|3),(Flags|1|5) +# An activity has been resumed into the foreground but was not already running: +30006 wm_restart_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) +# An activity has been resumed and is now in the foreground: +30007 wm_resume_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) + +# Activity launch time +30009 wm_activity_launch_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3) + +# The Activity Manager failed to pause the given activity. +30012 wm_failed_to_pause (User|1|5),(Token|1|5),(Wanting to pause|3),(Currently pausing|3) +# Attempting to pause the current activity +30013 wm_pause_activity (User|1|5),(Token|1|5),(Component Name|3),(User Leaving|3) +# Application process has been started + +# An activity is being destroyed: +30018 wm_destroy_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3),(Reason|3) +# An activity has been relaunched, resumed, and is now in the foreground: +30019 wm_relaunch_resume_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) +# An activity has been relaunched: +30020 wm_relaunch_activity (User|1|5),(Token|1|5),(Task ID|1|5),(Component Name|3) +# The activity's onPause has been called. +30021 wm_on_paused_called (Token|1|5),(Component Name|3),(Reason|3) +# The activity's onResume has been called. +30022 wm_on_resume_called (Token|1|5),(Component Name|3),(Reason|3) + +# Activity set to resumed +30043 wm_set_resumed_activity (User|1|5),(Component Name|3),(Reason|3) + +# Stack focus +30044 wm_focused_stack (User|1|5),(Display Id|1|5),(Focused Stack Id|1|5),(Last Focused Stack Id|1|5),(Reason|3) + +# Attempting to stop an activity +30048 wm_stop_activity (User|1|5),(Token|1|5),(Component Name|3) + +# The task is being removed from its parent stack +30061 wm_remove_task (Task ID|1|5), (Stack ID|1|5) + +# An activity been add into stopping list +30066 wm_add_to_stopping (User|1|5),(Token|1|5),(Component Name|3),(Reason|3) + +# Keyguard status changed +30067 wm_set_keyguard_shown (keyguardShowing|1),(aodShowing|1),(keyguardGoingAway|1),(Reason|3) + +# Out of memory for surfaces. +31000 wm_no_surface_memory (Window|3),(PID|1|5),(Operation|3) +# Task created. +31001 wm_task_created (TaskId|1|5),(StackId|1|5) +# Task moved to top (1) or bottom (0). +31002 wm_task_moved (TaskId|1|5),(ToTop|1),(Index|1) +# Task removed with source explanation. +31003 wm_task_removed (TaskId|1|5),(Reason|3) +# Stack created. +31004 wm_stack_created (StackId|1|5) +# Home stack moved to top (1) or bottom (0). +31005 wm_home_stack_moved (ToTop|1) +# Stack removed. +31006 wm_stack_removed (StackId|1|5) +# bootanim finished: +31007 wm_boot_animation_done (time|2|3) + diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 52cc422f8c51..3b58eca2ecb9 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -43,13 +43,11 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS import android.os.IBinder; import android.os.RemoteException; import android.os.Trace; -import android.util.EventLog; import android.util.Slog; import android.util.SparseArray; import android.util.proto.ProtoOutputStream; import com.android.internal.policy.IKeyguardDismissCallback; -import com.android.server.am.EventLogTags; import com.android.server.policy.WindowManagerPolicy; import com.android.server.wm.ActivityTaskManagerInternal.SleepToken; @@ -143,7 +141,7 @@ class KeyguardController { if (!keyguardChanged && !aodChanged) { return; } - EventLog.writeEvent(EventLogTags.AM_SET_KEYGUARD_SHOWN, + EventLogTags.writeWmSetKeyguardShown( keyguardShowing ? 1 : 0, aodShowing ? 1 : 0, mKeyguardGoingAway ? 1 : 0, @@ -184,7 +182,7 @@ class KeyguardController { mService.deferWindowLayout(); try { setKeyguardGoingAway(true); - EventLog.writeEvent(EventLogTags.AM_SET_KEYGUARD_SHOWN, + EventLogTags.writeWmSetKeyguardShown( 1 /* keyguardShowing */, mAodShowing ? 1 : 0, 1 /* keyguardGoingAway */, diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 565f95e3681b..5ec9599cf7b1 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -68,7 +68,6 @@ import android.os.RemoteException; import android.os.Trace; import android.os.UserHandle; import android.util.ArraySet; -import android.util.EventLog; import android.util.Slog; import android.util.SparseIntArray; import android.util.proto.ProtoOutputStream; @@ -77,7 +76,6 @@ import android.view.DisplayInfo; import android.view.SurfaceControl; import android.view.WindowManager; -import com.android.server.EventLogTags; import com.android.server.protolog.common.ProtoLog; import java.io.PrintWriter; @@ -488,10 +486,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> final WindowSurfaceController surfaceController = winAnimator.mSurfaceController; boolean leakedSurface = false; boolean killedApps = false; - - EventLog.writeEvent(EventLogTags.WM_NO_SURFACE_MEMORY, winAnimator.mWin.toString(), + EventLogTags.writeWmNoSurfaceMemory(winAnimator.mWin.toString(), winAnimator.mSession.mPid, operation); - final long callingIdentity = Binder.clearCallingIdentity(); try { // There was some problem...first, do a sanity check of the window list to make sure diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 28c5575b604b..619b71cd751a 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -56,8 +56,6 @@ import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.SurfaceControl.METADATA_TASK_ID; -import static com.android.server.EventLogTags.WM_TASK_CREATED; -import static com.android.server.EventLogTags.WM_TASK_REMOVED; import static com.android.server.am.TaskRecordProto.ACTIVITIES; import static com.android.server.am.TaskRecordProto.ACTIVITY_TYPE; import static com.android.server.am.TaskRecordProto.FULLSCREEN; @@ -128,7 +126,6 @@ import android.os.UserHandle; import android.provider.Settings; import android.service.voice.IVoiceInteractionSession; import android.util.DisplayMetrics; -import android.util.EventLog; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.Display; @@ -421,8 +418,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta ActivityStack stack) { super(atmService.mWindowManager); - EventLog.writeEvent(WM_TASK_CREATED, _taskId, - stack != null ? stack.mStackId : INVALID_STACK_ID); + EventLogTags.writeWmTaskCreated(_taskId, stack != null ? stack.mStackId : INVALID_STACK_ID); mAtmService = atmService; mTaskId = _taskId; mUserId = _userId; @@ -1301,7 +1297,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta } else if (!mReuseTask) { // Remove entire task if it doesn't have any activity left and it isn't marked for reuse mStack.removeChild(this, reason); - EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, + EventLogTags.writeWmTaskRemoved(mTaskId, "removeChild: last r=" + r + " in t=" + this); removeIfPossible(); } @@ -2311,7 +2307,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta @Override void removeImmediately() { if (DEBUG_STACK) Slog.i(TAG, "removeTask: removing taskId=" + mTaskId); - EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "removeTask"); + EventLogTags.writeWmTaskRemoved(mTaskId, "removeTask"); super.removeImmediately(); } @@ -2319,7 +2315,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta void reparent(ActivityStack stack, int position, boolean moveParents, String reason) { if (DEBUG_STACK) Slog.i(TAG, "reParentTask: removing taskId=" + mTaskId + " from stack=" + getTaskStack()); - EventLog.writeEvent(WM_TASK_REMOVED, mTaskId, "reParentTask"); + EventLogTags.writeWmTaskRemoved(mTaskId, "reParentTask"); final ActivityStack prevStack = getTaskStack(); final boolean wasTopFocusedStack = diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5afcab0cc11c..bbe9e4f5337a 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -193,7 +193,6 @@ import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.DisplayMetrics; -import android.util.EventLog; import android.util.Log; import android.util.MergedConfiguration; import android.util.Slog; @@ -265,7 +264,6 @@ import com.android.internal.util.function.pooled.PooledLambda; import com.android.internal.view.WindowManagerPolicyThread; import com.android.server.AnimationThread; import com.android.server.DisplayThread; -import com.android.server.EventLogTags; import com.android.server.FgThread; import com.android.server.LocalServices; import com.android.server.UiThread; @@ -3327,7 +3325,7 @@ public class WindowManagerService extends IWindowManager.Stub ProtoLog.e(WM_ERROR, "Boot completed: SurfaceFlinger is dead!"); } - EventLog.writeEvent(EventLogTags.WM_BOOT_ANIMATION_DONE, SystemClock.uptimeMillis()); + EventLogTags.writeWmBootAnimationDone(SystemClock.uptimeMillis()); Trace.asyncTraceEnd(TRACE_TAG_WINDOW_MANAGER, "Stop bootanim", 0); mDisplayEnabled = true; ProtoLog.i(WM_DEBUG_SCREEN_ON, "******************** ENABLING SCREEN!"); @@ -7692,7 +7690,9 @@ public class WindowManagerService extends IWindowManager.Stub mInputManager.registerInputChannel(serverChannel); mEmbeddedWindowController.add(serverChannel.getToken(), window, hostWindow, callingUid, callingPid); - if (hostWindow != null) { + + if (hostWindow != null + && hostWindow.mInputWindowHandle.inputApplicationHandle != null) { applicationHandle = new InputApplicationHandle( hostWindow.mInputWindowHandle.inputApplicationHandle); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ea987c097527..c4130d90a6bd 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -137,6 +137,8 @@ import android.app.admin.StartInstallingUpdateCallback; import android.app.admin.SystemUpdateInfo; import android.app.admin.SystemUpdatePolicy; import android.app.backup.IBackupManager; +import android.app.timedetector.ManualTimeSuggestion; +import android.app.timedetector.TimeDetector; import android.app.trust.TrustManager; import android.app.usage.UsageStatsManagerInternal; import android.compat.annotation.ChangeId; @@ -1956,6 +1958,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return mContext.getSystemService(AlarmManager.class); } + TimeDetector getTimeDetector() { + return mContext.getSystemService(TimeDetector.class); + } + ConnectivityManager getConnectivityManager() { return mContext.getSystemService(ConnectivityManager.class); } @@ -8009,7 +8015,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { private boolean canProfileOwnerAccessDeviceIds(int userId) { synchronized (getLockObject()) { - return mOwners.canProfileOwnerAccessDeviceIds(userId); + return mOwners.isProfileOwnerOfOrganizationOwnedDevice(userId); } } @@ -10987,31 +10993,20 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public void setLocationEnabled(ComponentName who, boolean locationEnabled) { Preconditions.checkNotNull(who, "ComponentName is null"); - int userId = mInjector.userHandleGetCallingUserId(); + enforceDeviceOwner(who); - synchronized (getLockObject()) { - getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); + UserHandle userHandle = mInjector.binderGetCallingUserHandle(); + mInjector.binderWithCleanCallingIdentity( + () -> mInjector.getLocationManager().setLocationEnabledForUser(locationEnabled, + userHandle)); - if (!isDeviceOwner(who, userId) && !isCurrentUserDemo()) { - throw new SecurityException( - "Permission denial: Profile owners cannot update location settings"); - } - } - - long ident = mInjector.binderClearCallingIdentity(); - try { - mInjector.getLocationManager().setLocationEnabledForUser( - locationEnabled, UserHandle.of(userId)); - DevicePolicyEventLogger - .createEvent(DevicePolicyEnums.SET_SECURE_SETTING) - .setAdmin(who) - .setStrings(Settings.Secure.LOCATION_MODE, Integer.toString( - locationEnabled ? Settings.Secure.LOCATION_MODE_ON - : Settings.Secure.LOCATION_MODE_OFF)) - .write(); - } finally { - mInjector.binderRestoreCallingIdentity(ident); - } + DevicePolicyEventLogger + .createEvent(DevicePolicyEnums.SET_SECURE_SETTING) + .setAdmin(who) + .setStrings(Settings.Secure.LOCATION_MODE, Integer.toString( + locationEnabled ? Settings.Secure.LOCATION_MODE_ON + : Settings.Secure.LOCATION_MODE_OFF)) + .write(); } @Override @@ -11022,7 +11017,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (mInjector.settingsGlobalGetInt(Global.AUTO_TIME, 0) == 1) { return false; } - mInjector.binderWithCleanCallingIdentity(() -> mInjector.getAlarmManager().setTime(millis)); + ManualTimeSuggestion manualTimeSuggestion = TimeDetector.createManualTimeSuggestion( + millis, "DevicePolicyManagerService: setTime"); + mInjector.binderWithCleanCallingIdentity( + () -> mInjector.getTimeDetector().suggestManualTime(manualTimeSuggestion)); return true; } @@ -12661,14 +12659,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return false; } - private boolean hasGrantProfileOwnerDevcieIdAccessPermission() { + private boolean hasMarkProfileOwnerOnOrganizationOwnedDevicePermission() { return mContext.checkCallingPermission( - android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS) + permission.MARK_DEVICE_ORGANIZATION_OWNED) == PackageManager.PERMISSION_GRANTED; } @Override - public void grantDeviceIdsAccessToProfileOwner(ComponentName who, int userId) { + public void markProfileOwnerOnOrganizationOwnedDevice(ComponentName who, int userId) { // As the caller is the system, it must specify the component name of the profile owner // as a sanity / safety check. Preconditions.checkNotNull(who); @@ -12677,16 +12675,24 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return; } - // Only privileged system apps can grant the Profile Owner access to Device IDs. - if (!(isCallerWithSystemUid() || isAdb() - || hasGrantProfileOwnerDevcieIdAccessPermission())) { + // Only adb or system apps with the right permission can mark a profile owner on + // organization-owned device. + if (!(isAdb() || hasMarkProfileOwnerOnOrganizationOwnedDevicePermission())) { throw new SecurityException( - "Only the system can grant Device IDs access for a profile owner."); + "Only the system can mark a profile owner of organization-owned device."); } - if (isAdb() && hasIncompatibleAccountsOrNonAdbNoLock(userId, who)) { - throw new SecurityException( - "Can only be called from ADB if the device has no accounts."); + if (isAdb()) { + if (hasIncompatibleAccountsOrNonAdbNoLock(userId, who)) { + throw new SecurityException( + "Can only be called from ADB if the device has no accounts."); + } + } else { + if (hasUserSetupCompleted(UserHandle.USER_SYSTEM)) { + throw new IllegalStateException( + "Cannot mark profile owner as managing an organization-owned device after" + + " set-up"); + } } // Grant access under lock. @@ -12699,8 +12705,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { who.flattenToString(), userId)); } - Slog.i(LOG_TAG, String.format("Granting Device ID access to %s, for user %d", - who.flattenToString(), userId)); + Slog.i(LOG_TAG, String.format( + "Marking %s as profile owner on organization-owned device for user %d", + who.flattenToString(), userId)); // First, set restriction on removing the profile. final long ident = mInjector.binderClearCallingIdentity(); @@ -12720,9 +12727,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mInjector.binderRestoreCallingIdentity(ident); } - // setProfileOwnerCanAccessDeviceIds will trigger writing of the profile owner + // markProfileOwnerOfOrganizationOwnedDevice will trigger writing of the profile owner // data, no need to do it manually. - mOwners.setProfileOwnerCanAccessDeviceIds(userId); + mOwners.markProfileOwnerOfOrganizationOwnedDevice(userId); } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java index 65bf86feb88f..f70fe909b459 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java @@ -101,7 +101,12 @@ class Owners { private static final String ATTR_USER_RESTRICTIONS_MIGRATED = "userRestrictionsMigrated"; private static final String ATTR_FREEZE_RECORD_START = "start"; private static final String ATTR_FREEZE_RECORD_END = "end"; + // Legacy attribute, its presence would mean the profile owner associated with it is + // managing a profile on an organization-owned device. private static final String ATTR_CAN_ACCESS_DEVICE_IDS = "canAccessDeviceIds"; + // New attribute for profile owner of organization-owned device. + private static final String ATTR_PROFILE_OWNER_OF_ORG_OWNED_DEVICE = + "isPoOrganizationOwnedDevice"; private final UserManager mUserManager; private final UserManagerInternal mUserManagerInternal; @@ -286,7 +291,7 @@ class Owners { // semantically compatible with the meaning of this flag. mDeviceOwner = new OwnerInfo(ownerName, admin, userRestrictionsMigrated, /* remoteBugreportUri =*/ null, /* remoteBugreportHash =*/ - null, /* canAccessDeviceIds =*/true); + null, /* isOrganizationOwnedDevice =*/true); mDeviceOwnerUserId = userId; mUserManagerInternal.setDeviceManaged(true); @@ -313,7 +318,7 @@ class Owners { // For a newly set PO, there's no need for migration. mProfileOwners.put(userId, new OwnerInfo(ownerName, admin, /* userRestrictionsMigrated =*/ true, /* remoteBugreportUri =*/ null, - /* remoteBugreportHash =*/ null, /* canAccessDeviceIds =*/ false)); + /* remoteBugreportHash =*/ null, /* isOrganizationOwnedDevice =*/ false)); mUserManagerInternal.setUserManaged(userId, true); pushToPackageManagerLocked(); pushToAppOpsLocked(); @@ -334,8 +339,8 @@ class Owners { final OwnerInfo ownerInfo = mProfileOwners.get(userId); final OwnerInfo newOwnerInfo = new OwnerInfo(target.getPackageName(), target, ownerInfo.userRestrictionsMigrated, ownerInfo.remoteBugreportUri, - ownerInfo.remoteBugreportHash, /* canAccessDeviceIds =*/ - ownerInfo.canAccessDeviceIds); + ownerInfo.remoteBugreportHash, /* isOrganizationOwnedDevice =*/ + ownerInfo.isOrganizationOwnedDevice); mProfileOwners.put(userId, newOwnerInfo); pushToPackageManagerLocked(); pushToAppOpsLocked(); @@ -348,8 +353,8 @@ class Owners { // See DevicePolicyManagerService#getDeviceOwnerName mDeviceOwner = new OwnerInfo(null, target, mDeviceOwner.userRestrictionsMigrated, mDeviceOwner.remoteBugreportUri, - mDeviceOwner.remoteBugreportHash, /* canAccessDeviceIds =*/ - mDeviceOwner.canAccessDeviceIds); + mDeviceOwner.remoteBugreportHash, /* isOrganizationOwnedDevice =*/ + mDeviceOwner.isOrganizationOwnedDevice); pushToPackageManagerLocked(); pushToActivityTaskManagerLocked(); pushToAppOpsLocked(); @@ -378,13 +383,13 @@ class Owners { } /** - * Returns true if {@code userId} has a profile owner and that profile owner was granted - * the ability to access device identifiers. + * Returns true if {@code userId} has a profile owner and that profile owner is on an + * organization-owned device, as indicated by the provisioning flow. */ - boolean canProfileOwnerAccessDeviceIds(int userId) { + boolean isProfileOwnerOfOrganizationOwnedDevice(int userId) { synchronized (mLock) { OwnerInfo profileOwner = mProfileOwners.get(userId); - return profileOwner != null ? profileOwner.canAccessDeviceIds : false; + return profileOwner != null ? profileOwner.isOrganizationOwnedDevice : false; } } @@ -523,15 +528,16 @@ class Owners { } } - /** Sets the grant to access device IDs, and also writes to file. */ - void setProfileOwnerCanAccessDeviceIds(int userId) { + /** Sets the indicator that the profile owner manages an organization-owned device, + * then write to file. */ + void markProfileOwnerOfOrganizationOwnedDevice(int userId) { synchronized (mLock) { OwnerInfo profileOwner = mProfileOwners.get(userId); if (profileOwner != null) { - profileOwner.canAccessDeviceIds = true; + profileOwner.isOrganizationOwnedDevice = true; } else { Slog.e(TAG, String.format( - "Cannot grant Device IDs access for user %d, no profile owner.", userId)); + "No profile owner for user %d to set as org-owned.", userId)); } writeProfileOwner(userId); } @@ -558,7 +564,7 @@ class Owners { String packageName = parser.getAttributeValue(null, ATTR_PACKAGE); mDeviceOwner = new OwnerInfo(name, packageName, /* userRestrictionsMigrated =*/ false, /* remoteBugreportUri =*/ null, - /* remoteBugreportHash =*/ null, /* canAccessDeviceIds =*/ true); + /* remoteBugreportHash =*/ null, /* isOrganizationOwnedDevice =*/ true); mDeviceOwnerUserId = UserHandle.USER_SYSTEM; } else if (tag.equals(TAG_DEVICE_INITIALIZER)) { // Deprecated tag @@ -575,7 +581,7 @@ class Owners { if (admin != null) { profileOwnerInfo = new OwnerInfo(profileOwnerName, admin, /* userRestrictionsMigrated =*/ false, null, - null, /* canAccessDeviceIds =*/ false); + null, /* isOrganizationOwnedDevice =*/ false); } else { // This shouldn't happen but switch from package name -> component name // might have written bad device owner files. b/17652534 @@ -587,7 +593,7 @@ class Owners { profileOwnerInfo = new OwnerInfo(profileOwnerName, profileOwnerPackageName, /* userRestrictionsMigrated =*/ false, /* remoteBugreportUri =*/ null, /* remoteBugreportHash =*/ - null, /* canAccessDeviceIds =*/ false); + null, /* isOrganizationOwnedDevice =*/ false); } mProfileOwners.put(userId, profileOwnerInfo); } else if (TAG_SYSTEM_UPDATE_POLICY.equals(tag)) { @@ -947,28 +953,30 @@ class Owners { public boolean userRestrictionsMigrated; public String remoteBugreportUri; public String remoteBugreportHash; - public boolean canAccessDeviceIds; + public boolean isOrganizationOwnedDevice; public OwnerInfo(String name, String packageName, boolean userRestrictionsMigrated, - String remoteBugreportUri, String remoteBugreportHash, boolean canAccessDeviceIds) { + String remoteBugreportUri, String remoteBugreportHash, + boolean isOrganizationOwnedDevice) { this.name = name; this.packageName = packageName; this.admin = new ComponentName(packageName, ""); this.userRestrictionsMigrated = userRestrictionsMigrated; this.remoteBugreportUri = remoteBugreportUri; this.remoteBugreportHash = remoteBugreportHash; - this.canAccessDeviceIds = canAccessDeviceIds; + this.isOrganizationOwnedDevice = isOrganizationOwnedDevice; } public OwnerInfo(String name, ComponentName admin, boolean userRestrictionsMigrated, - String remoteBugreportUri, String remoteBugreportHash, boolean canAccessDeviceIds) { + String remoteBugreportUri, String remoteBugreportHash, + boolean isOrganizationOwnedDevice) { this.name = name; this.admin = admin; this.packageName = admin.getPackageName(); this.userRestrictionsMigrated = userRestrictionsMigrated; this.remoteBugreportUri = remoteBugreportUri; this.remoteBugreportHash = remoteBugreportHash; - this.canAccessDeviceIds = canAccessDeviceIds; + this.isOrganizationOwnedDevice = isOrganizationOwnedDevice; } public void writeToXml(XmlSerializer out, String tag) throws IOException { @@ -988,9 +996,9 @@ class Owners { if (remoteBugreportHash != null) { out.attribute(null, ATTR_REMOTE_BUGREPORT_HASH, remoteBugreportHash); } - if (canAccessDeviceIds) { - out.attribute(null, ATTR_CAN_ACCESS_DEVICE_IDS, - String.valueOf(canAccessDeviceIds)); + if (isOrganizationOwnedDevice) { + out.attribute(null, ATTR_PROFILE_OWNER_OF_ORG_OWNED_DEVICE, + String.valueOf(isOrganizationOwnedDevice)); } out.endTag(null, tag); } @@ -1012,13 +1020,17 @@ class Owners { parser.getAttributeValue(null, ATTR_CAN_ACCESS_DEVICE_IDS); final boolean canAccessDeviceIds = ("true".equals(canAccessDeviceIdsStr)); + final String isOrgOwnedDeviceStr = + parser.getAttributeValue(null, ATTR_PROFILE_OWNER_OF_ORG_OWNED_DEVICE); + final boolean isOrgOwnedDevice = + ("true".equals(isOrgOwnedDeviceStr)) | canAccessDeviceIds; // Has component name? If so, return [name, component] if (componentName != null) { final ComponentName admin = ComponentName.unflattenFromString(componentName); if (admin != null) { return new OwnerInfo(name, admin, userRestrictionsMigrated, - remoteBugreportUri, remoteBugreportHash, canAccessDeviceIds); + remoteBugreportUri, remoteBugreportHash, isOrgOwnedDevice); } else { // This shouldn't happen but switch from package name -> component name // might have written bad device owner files. b/17652534 @@ -1029,14 +1041,14 @@ class Owners { // Else, build with [name, package] return new OwnerInfo(name, packageName, userRestrictionsMigrated, remoteBugreportUri, - remoteBugreportHash, canAccessDeviceIds); + remoteBugreportHash, isOrgOwnedDevice); } public void dump(IndentingPrintWriter pw) { pw.println("admin=" + admin); pw.println("name=" + name); pw.println("package=" + packageName); - pw.println("canAccessDeviceIds=" + canAccessDeviceIds); + pw.println("isOrganizationOwnedDevice=" + isOrganizationOwnedDevice); } } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index cb4e377c0110..f46857a26482 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -43,7 +43,6 @@ import android.database.sqlite.SQLiteGlobal; import android.hardware.display.DisplayManagerInternal; import android.net.ConnectivityModuleConnector; import android.net.NetworkStackClient; -import android.net.wifi.WifiStackClient; import android.os.BaseBundle; import android.os.Binder; import android.os.Build; @@ -1360,6 +1359,40 @@ public final class SystemServer { t.traceEnd(); if (context.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WIFI)) { + // Wifi Service must be started first for wifi-related services. + t.traceBegin("StartWifi"); + mSystemServiceManager.startService(WIFI_SERVICE_CLASS); + t.traceEnd(); + t.traceBegin("StartWifiScanning"); + mSystemServiceManager.startService( + "com.android.server.wifi.scanner.WifiScanningService"); + t.traceEnd(); + } + + if (context.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WIFI_RTT)) { + t.traceBegin("StartRttService"); + mSystemServiceManager.startService( + "com.android.server.wifi.rtt.RttService"); + t.traceEnd(); + } + + if (context.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WIFI_AWARE)) { + t.traceBegin("StartWifiAware"); + mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS); + t.traceEnd(); + } + + if (context.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WIFI_DIRECT)) { + t.traceBegin("StartWifiP2P"); + mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); + t.traceEnd(); + } + + if (context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_LOWPAN)) { t.traceBegin("StartLowpan"); mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS); @@ -2171,14 +2204,6 @@ public final class SystemServer { } t.traceEnd(); - t.traceBegin("StartWifiStack"); - try { - WifiStackClient.getInstance().start(); - } catch (Throwable e) { - reportWtf("starting Wifi Stack", e); - } - t.traceEnd(); - t.traceBegin("MakeCountryDetectionServiceReady"); try { if (countryDetectorF != null) { diff --git a/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java new file mode 100644 index 000000000000..c406876c5cee --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java @@ -0,0 +1,272 @@ +/* + * 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.compat; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.internal.verification.VerificationModeFactory.times; +import static org.testng.Assert.assertThrows; + +import android.compat.Compatibility; +import android.content.Context; +import android.content.pm.PackageManager; + +import com.android.internal.compat.CompatibilityChangeConfig; + +import com.google.common.collect.ImmutableSet; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class PlatformCompatTest { + private static final String PACKAGE_NAME = "my.package"; + + @Mock + private Context mContext; + @Mock + private PackageManager mPackageManager; + @Mock + CompatChange.ChangeListener mListener1, mListener2; + + + @Before + public void setUp() throws Exception { + when(mContext.getPackageManager()).thenReturn(mPackageManager); + when(mPackageManager.getPackageUid(eq(PACKAGE_NAME), eq(0))).thenThrow( + new PackageManager.NameNotFoundException()); + CompatConfig.get().clearChanges(); + } + + @Test + public void testRegisterListenerToSameIdThrows() { + PlatformCompat pc = new PlatformCompat(mContext); + + // Registering a listener to change 1 is successful. + pc.registerListener(1, mListener1); + // Registering a listener to change 2 is successful. + pc.registerListener(2, mListener1); + // Trying to register another listener to change id 1 fails. + assertThrows(IllegalStateException.class, () -> pc.registerListener(1, mListener1)); + } + + @Test + public void testRegisterListenerReturn() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of())), + PACKAGE_NAME); + + // Change id 1 is known (added in setOverrides). + assertThat(pc.registerListener(1, mListener1)).isTrue(); + // Change 2 is unknown. + assertThat(pc.registerListener(2, mListener1)).isFalse(); + } + + @Test + public void testListenerCalledOnSetOverrides() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener1); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of(2L))), + PACKAGE_NAME); + + verify(mListener1, times(2)).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerNotCalledOnWrongPackage() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener1); + + pc.setOverridesForTest( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of(2L))), + PACKAGE_NAME); + + verify(mListener1, never()).onCompatChange("other.package"); + } + + @Test + public void testListenerCalledOnSetOverridesTwoListeners() { + PlatformCompat pc = new PlatformCompat(mContext); + pc.registerListener(1, mListener1); + + final ImmutableSet<Long> enabled = ImmutableSet.of(1L); + final ImmutableSet<Long> disabled = ImmutableSet.of(2L); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(enabled, disabled)), + PACKAGE_NAME); + + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + + reset(mListener1); + reset(mListener2); + + pc.registerListener(2, mListener2); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(enabled, disabled)), + PACKAGE_NAME); + + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, times(1)).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnSetOverridesForTest() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener1); + + pc.setOverridesForTest( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of(2L))), + PACKAGE_NAME); + + verify(mListener1, times(2)).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnSetOverridesTwoListenersForTest() { + PlatformCompat pc = new PlatformCompat(mContext); + pc.registerListener(1, mListener1); + + final ImmutableSet<Long> enabled = ImmutableSet.of(1L); + final ImmutableSet<Long> disabled = ImmutableSet.of(2L); + + pc.setOverridesForTest( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(enabled, disabled)), + PACKAGE_NAME); + + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + + reset(mListener1); + reset(mListener2); + + pc.registerListener(2, mListener2); + pc.setOverridesForTest( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(enabled, disabled)), + PACKAGE_NAME); + + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, times(1)).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnClearOverrides() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener2); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of())), + PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + + reset(mListener1); + reset(mListener2); + + pc.clearOverrides(PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnClearOverridesMultipleOverrides() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener2); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of(2L))), + PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, times(1)).onCompatChange(PACKAGE_NAME); + + reset(mListener1); + reset(mListener2); + + pc.clearOverrides(PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, times(1)).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnClearOverrideExists() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + pc.registerListener(2, mListener2); + + pc.setOverrides( + new CompatibilityChangeConfig( + new Compatibility.ChangeConfig(ImmutableSet.of(1L), ImmutableSet.of())), + PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + + reset(mListener1); + reset(mListener2); + + pc.clearOverride(1, PACKAGE_NAME); + verify(mListener1, times(1)).onCompatChange(PACKAGE_NAME); + verify(mListener2, never()).onCompatChange(PACKAGE_NAME); + } + + @Test + public void testListenerCalledOnClearOverrideDoesntExist() { + PlatformCompat pc = new PlatformCompat(mContext); + + pc.registerListener(1, mListener1); + + pc.clearOverride(1, PACKAGE_NAME); + // Listener not called when a non existing override is removed. + verify(mListener1, never()).onCompatChange(PACKAGE_NAME); + } + + +} diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java index 64ea59d2fa2d..f86bacf67901 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java @@ -22,6 +22,7 @@ import android.app.IActivityTaskManager; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.backup.IBackupManager; +import android.app.timedetector.TimeDetector; import android.app.usage.UsageStatsManagerInternal; import android.content.Context; import android.content.Intent; @@ -229,6 +230,11 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi AlarmManager getAlarmManager() {return services.alarmManager;} @Override + TimeDetector getTimeDetector() { + return services.timeDetector; + } + + @Override LockPatternUtils newLockPatternUtils() { return services.lockPatternUtils; } 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 eef77ee1fed0..b6ed22b83b4e 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -66,6 +66,7 @@ import android.app.admin.DeviceAdminReceiver; import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManagerInternal; import android.app.admin.PasswordMetrics; +import android.app.timedetector.ManualTimeSuggestion; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Intent; @@ -3588,7 +3589,19 @@ public class DevicePolicyManagerTest extends DpmTestBase { mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; setupDeviceOwner(); dpm.setTime(admin1, 0); - verify(getServices().alarmManager).setTime(0); + + BaseMatcher<ManualTimeSuggestion> hasZeroTime = new BaseMatcher<ManualTimeSuggestion>() { + @Override + public boolean matches(Object item) { + final ManualTimeSuggestion suggestion = (ManualTimeSuggestion) item; + return suggestion.getUtcTime().getValue() == 0; + } + @Override + public void describeTo(Description description) { + description.appendText("ManualTimeSuggestion{utcTime.value=0}"); + } + }; + verify(getServices().timeDetector).suggestManualTime(argThat(hasZeroTime)); } public void testSetTimeFailWithPO() throws Exception { @@ -5143,7 +5156,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { configureContextForAccess(mContext, false); assertExpectException(SecurityException.class, /* messageRegex= */ null, - () -> dpm.setProfileOwnerCanAccessDeviceIds(admin2)); + () -> dpm.markProfileOwnerOnOrganizationOwnedDevice(admin2)); } public void testGrantDeviceIdsAccess_notByAuthorizedCaller() throws Exception { @@ -5151,20 +5164,20 @@ public class DevicePolicyManagerTest extends DpmTestBase { configureContextForAccess(mContext, false); assertExpectException(SecurityException.class, /* messageRegex= */ null, - () -> dpm.setProfileOwnerCanAccessDeviceIds(admin1)); + () -> dpm.markProfileOwnerOnOrganizationOwnedDevice(admin1)); } public void testGrantDeviceIdsAccess_byAuthorizedSystemCaller() throws Exception { setupProfileOwner(); // This method will throw if the system context could not call - // setProfileOwnerCanAccessDeviceIds successfully. - configureProfileOwnerForDeviceIdAccess(admin1, DpmMockContext.CALLER_USER_HANDLE); + // markProfileOwnerOfOrganizationOwnedDevice successfully. + configureProfileOwnerOfOrgOwnedDevice(admin1, DpmMockContext.CALLER_USER_HANDLE); } private void configureContextForAccess(DpmMockContext context, boolean granted) { when(context.spiedContext.checkCallingPermission( - android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS)) + permission.MARK_DEVICE_ORGANIZATION_OWNED)) .thenReturn(granted ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED); @@ -5183,7 +5196,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { DpmMockContext.CALLER_MANAGED_PROVISIONING_UID); try { runAsCaller(mServiceContext, dpms, dpm -> { - dpm.setProfileOwnerCanAccessDeviceIds(admin1); + dpm.markProfileOwnerOnOrganizationOwnedDevice(admin1); }); } finally { mServiceContext.binder.restoreCallingIdentity(ident); @@ -5221,7 +5234,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { admin1.getPackageName(), DpmMockContext.CALLER_SYSTEM_USER_UID)); setupProfileOwner(); - configureProfileOwnerForDeviceIdAccess(admin1, DpmMockContext.CALLER_USER_HANDLE); + configureProfileOwnerOfOrgOwnedDevice(admin1, DpmMockContext.CALLER_USER_HANDLE); // The profile owner is allowed to request Device ID attestation. mServiceContext.binder.callingUid = DpmMockContext.CALLER_UID; @@ -5258,7 +5271,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { dpm -> dpm.setDelegatedScopes(admin1, DpmMockContext.DELEGATE_PACKAGE_NAME, Arrays.asList(DELEGATION_CERT_INSTALL))); - configureProfileOwnerForDeviceIdAccess(admin1, DpmMockContext.CALLER_USER_HANDLE); + configureProfileOwnerOfOrgOwnedDevice(admin1, DpmMockContext.CALLER_USER_HANDLE); // Make sure that the profile owner can still request Device ID attestation. mServiceContext.binder.callingUid = DpmMockContext.CALLER_UID; @@ -5435,15 +5448,16 @@ public class DevicePolicyManagerTest extends DpmTestBase { assertTrue(dpm.isPackageAllowedToAccessCalendar(testPackage)); } - private void configureProfileOwnerForDeviceIdAccess(ComponentName who, int userId) { + private void configureProfileOwnerOfOrgOwnedDevice(ComponentName who, int userId) { when(getServices().userManager.getProfileParent(eq(UserHandle.of(userId)))) .thenReturn(UserHandle.SYSTEM); - final long ident = mServiceContext.binder.clearCallingIdentity(); mServiceContext.binder.callingUid = UserHandle.getUid(DpmMockContext.CALLER_USER_HANDLE, DpmMockContext.SYSTEM_UID); + + configureContextForAccess(mServiceContext, true); runAsCaller(mServiceContext, dpms, dpm -> { - dpm.setProfileOwnerCanAccessDeviceIds(who); + dpm.markProfileOwnerOnOrganizationOwnedDevice(who); }); mServiceContext.binder.restoreCallingIdentity(ident); } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java index bd513dc083be..1a67576c218f 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java @@ -207,6 +207,8 @@ public class DpmMockContext extends MockContext { switch (name) { case Context.ALARM_SERVICE: return mMockSystemServices.alarmManager; + case Context.TIME_DETECTOR_SERVICE: + return mMockSystemServices.timeDetector; case Context.USER_SERVICE: return mMockSystemServices.userManager; case Context.POWER_SERVICE: diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java index b0d0303a82d9..c9273642635e 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java @@ -31,6 +31,7 @@ import android.app.IActivityManager; import android.app.IActivityTaskManager; import android.app.NotificationManager; import android.app.backup.IBackupManager; +import android.app.timedetector.TimeDetector; import android.app.usage.UsageStatsManagerInternal; import android.content.BroadcastReceiver; import android.content.ContentValues; @@ -111,6 +112,7 @@ public class MockSystemServices { public final TelephonyManager telephonyManager; public final AccountManager accountManager; public final AlarmManager alarmManager; + public final TimeDetector timeDetector; public final KeyChain.KeyChainConnection keyChainConnection; /** Note this is a partial mock, not a real mock. */ public final PackageManager packageManager; @@ -152,6 +154,7 @@ public class MockSystemServices { telephonyManager = mock(TelephonyManager.class); accountManager = mock(AccountManager.class); alarmManager = mock(AlarmManager.class); + timeDetector = mock(TimeDetector.class); keyChainConnection = mock(KeyChain.KeyChainConnection.class, RETURNS_DEEP_STUBS); // Package manager is huge, so we use a partial mock instead. 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 index d6773d45c5ed..7a070ee72b5d 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/engine/RuleEvaluatorTest.java @@ -21,12 +21,13 @@ import static com.android.server.integrity.model.IntegrityCheckResult.Effect.DEN import static org.junit.Assert.assertEquals; -import com.android.server.integrity.model.AppInstallMetadata; -import com.android.server.integrity.model.AtomicFormula; -import com.android.server.integrity.model.AtomicFormula.StringAtomicFormula; +import android.content.integrity.AppInstallMetadata; +import android.content.integrity.AtomicFormula; +import android.content.integrity.AtomicFormula.StringAtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Rule; + import com.android.server.integrity.model.IntegrityCheckResult; -import com.android.server.integrity.model.OpenFormula; -import com.android.server.integrity.model.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,7 +64,9 @@ public class RuleEvaluatorTest { public void testEvaluateRules_noMatchedRules_allow() { Rule rule1 = new Rule( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_2, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_2, /* isHashedValue= */ false), Rule.DENY); @@ -77,12 +80,16 @@ public class RuleEvaluatorTest { public void testEvaluateRules_oneMatch_deny() { Rule rule1 = new Rule( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), Rule.DENY); Rule rule2 = new Rule( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_2, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_2, /* isHashedValue= */ false), Rule.DENY); @@ -97,19 +104,24 @@ public class RuleEvaluatorTest { public void testEvaluateRules_multipleMatches_deny() { Rule rule1 = new Rule( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), Rule.DENY); - OpenFormula openFormula2 = - new OpenFormula( - OpenFormula.AND, + CompoundFormula compoundFormula2 = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), new StringAtomicFormula( - AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, /* isHashedValue= */ false))); - Rule rule2 = new Rule(openFormula2, Rule.DENY); + Rule rule2 = new Rule(compoundFormula2, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); @@ -120,14 +132,15 @@ public class RuleEvaluatorTest { @Test public void testEvaluateRules_ruleWithNot_deny() { - OpenFormula openFormula = - new OpenFormula( - OpenFormula.NOT, + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.NOT, Collections.singletonList( new StringAtomicFormula( AtomicFormula.PACKAGE_NAME, - PACKAGE_NAME_2, /* isHashedValue= */ false))); - Rule rule = new Rule(openFormula, Rule.DENY); + PACKAGE_NAME_2, + /* isHashedValue= */ false))); + Rule rule = new Rule(compoundFormula, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); @@ -153,16 +166,19 @@ public class RuleEvaluatorTest { @Test public void testEvaluateRules_validForm_deny() { - OpenFormula openFormula = - new OpenFormula( - OpenFormula.AND, + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), new StringAtomicFormula( - AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, /* isHashedValue= */ false))); - Rule rule = new Rule(openFormula, Rule.DENY); + Rule rule = new Rule(compoundFormula, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); @@ -173,16 +189,19 @@ public class RuleEvaluatorTest { @Test public void testEvaluateRules_ruleNotInDNF_ignoreAndAllow() { - OpenFormula openFormula = - new OpenFormula( - OpenFormula.OR, + CompoundFormula compoundFormula = + new CompoundFormula( + CompoundFormula.OR, Arrays.asList( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), new StringAtomicFormula( - AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, /* isHashedValue= */ false))); - Rule rule = new Rule(openFormula, Rule.DENY); + Rule rule = new Rule(compoundFormula, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); @@ -191,19 +210,22 @@ public class RuleEvaluatorTest { } @Test - public void testEvaluateRules_openFormulaWithNot_allow() { - OpenFormula openSubFormula = - new OpenFormula( - OpenFormula.AND, + public void testEvaluateRules_compoundFormulaWithNot_allow() { + CompoundFormula openSubFormula = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_2, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_2, /* isHashedValue= */ false), new StringAtomicFormula( - AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, /* isHashedValue= */ false))); - OpenFormula openFormula = - new OpenFormula(OpenFormula.NOT, Collections.singletonList(openSubFormula)); - Rule rule = new Rule(openFormula, Rule.DENY); + CompoundFormula compoundFormula = + new CompoundFormula(CompoundFormula.NOT, Collections.singletonList(openSubFormula)); + Rule rule = new Rule(compoundFormula, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Collections.singletonList(rule), APP_INSTALL_METADATA); @@ -215,19 +237,24 @@ public class RuleEvaluatorTest { public void testEvaluateRules_forceAllow() { Rule rule1 = new Rule( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), Rule.FORCE_ALLOW); - OpenFormula openFormula2 = - new OpenFormula( - OpenFormula.AND, + CompoundFormula compoundFormula2 = + new CompoundFormula( + CompoundFormula.AND, Arrays.asList( - new StringAtomicFormula(AtomicFormula.PACKAGE_NAME, PACKAGE_NAME_1, + new StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + PACKAGE_NAME_1, /* isHashedValue= */ false), new StringAtomicFormula( - AtomicFormula.APP_CERTIFICATE, APP_CERTIFICATE, + AtomicFormula.APP_CERTIFICATE, + APP_CERTIFICATE, /* isHashedValue= */ false))); - Rule rule2 = new Rule(openFormula2, Rule.DENY); + Rule rule2 = new Rule(compoundFormula2, Rule.DENY); IntegrityCheckResult result = RuleEvaluator.evaluateRules(Arrays.asList(rule1, rule2), APP_INSTALL_METADATA); diff --git a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java index 7d71cd4c1b7f..495923d9ccf9 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/parser/RuleXmlParserTest.java @@ -20,9 +20,9 @@ import static com.android.server.testutils.TestUtils.assertExpectException; import static com.google.common.truth.Truth.assertThat; -import com.android.server.integrity.model.AtomicFormula; -import com.android.server.integrity.model.OpenFormula; -import com.android.server.integrity.model.Rule; +import android.content.integrity.AtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,27 +40,37 @@ import java.util.Map; public class RuleXmlParserTest { @Test - public void testXmlStream_validOpenFormula() throws Exception { + public void testXmlStream_validCompoundFormula() throws Exception { Map<String, String> atomicFormulaAttrs = new HashMap<>(); atomicFormulaAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); atomicFormulaAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - InputStream inputStream = new ByteArrayInputStream(ruleXmlOpenFormula.getBytes()); - Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false))), - Rule.DENY); + InputStream inputStream = new ByteArrayInputStream(ruleXmlCompoundFormula.getBytes()); + Rule expectedRule = + new Rule( + new CompoundFormula( + CompoundFormula.NOT, + Collections.singletonList( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false))), + Rule.DENY); List<Rule> rules = xmlParser.parse(inputStream); @@ -68,127 +78,172 @@ public class RuleXmlParserTest { } @Test - public void testXmlString_validOpenFormula_notConnector() throws Exception { + public void testXmlString_validCompoundFormula_notConnector() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false))), - Rule.DENY); - - List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula); + Rule expectedRule = + new Rule( + new CompoundFormula( + CompoundFormula.NOT, + Collections.singletonList( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false))), + Rule.DENY); + + List<Rule> rules = xmlParser.parse(ruleXmlCompoundFormula); assertThat(rules).isEqualTo(Collections.singletonList(expectedRule)); } @Test - public void testXmlString_validOpenFormula_andConnector() throws Exception { + public void testXmlString_validCompoundFormula_andConnector() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); Map<String, String> appCertificateAttrs = new HashMap<>(); appCertificateAttrs.put("K", String.valueOf(AtomicFormula.APP_CERTIFICATE)); appCertificateAttrs.put("V", "test_cert"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.AND)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + generateTagWithAttribute(/* tag= */ "AF", appCertificateAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.AND)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + generateTagWithAttribute( + /* tag= */ "AF", appCertificateAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule(new OpenFormula(OpenFormula.AND, Arrays.asList( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false), - new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, "test_cert", - /* isHashedValue= */ false))), - Rule.DENY); - - List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula); + Rule expectedRule = + new Rule( + new CompoundFormula( + CompoundFormula.AND, + Arrays.asList( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false), + new AtomicFormula.StringAtomicFormula( + AtomicFormula.APP_CERTIFICATE, + "test_cert", + /* isHashedValue= */ false))), + Rule.DENY); + List<Rule> rules = xmlParser.parse(ruleXmlCompoundFormula); assertThat(rules).isEqualTo(Collections.singletonList(expectedRule)); } @Test - public void testXmlString_validOpenFormula_orConnector() throws Exception { + public void testXmlString_validCompoundFormula_orConnector() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); Map<String, String> appCertificateAttrs = new HashMap<>(); appCertificateAttrs.put("K", String.valueOf(AtomicFormula.APP_CERTIFICATE)); appCertificateAttrs.put("V", "test_cert"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.OR)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + generateTagWithAttribute(/* tag= */ "AF", appCertificateAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.OR)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + generateTagWithAttribute( + /* tag= */ "AF", appCertificateAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule(new OpenFormula(OpenFormula.OR, Arrays.asList( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false), - new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, "test_cert", - /* isHashedValue= */ false))), - Rule.DENY); - - List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula); + Rule expectedRule = + new Rule( + new CompoundFormula( + CompoundFormula.OR, + Arrays.asList( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false), + new AtomicFormula.StringAtomicFormula( + AtomicFormula.APP_CERTIFICATE, + "test_cert", + /* isHashedValue= */ false))), + Rule.DENY); + + List<Rule> rules = xmlParser.parse(ruleXmlCompoundFormula); assertThat(rules).isEqualTo(Collections.singletonList(expectedRule)); } @Test - public void testXmlString_validOpenFormula_differentTagOrder() throws Exception { + public void testXmlString_validCompoundFormula_differentTagOrder() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule(new OpenFormula(OpenFormula.NOT, Collections.singletonList( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false))), - Rule.DENY); - - List<Rule> rules = xmlParser.parse(ruleXmlOpenFormula); + Rule expectedRule = + new Rule( + new CompoundFormula( + CompoundFormula.NOT, + Collections.singletonList( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false))), + Rule.DENY); + + List<Rule> rules = xmlParser.parse(ruleXmlCompoundFormula); assertThat(rules).isEqualTo(Collections.singletonList(expectedRule)); } @Test - public void testXmlString_invalidOpenFormula_invalidNumberOfFormulas() throws Exception { + public void testXmlString_invalidCompoundFormula_invalidNumberOfFormulas() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); @@ -196,98 +251,116 @@ public class RuleXmlParserTest { versionCodeAttrs.put("K", String.valueOf(AtomicFormula.VERSION_CODE)); versionCodeAttrs.put("O", String.valueOf(AtomicFormula.EQ)); versionCodeAttrs.put("V", "1"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + generateTagWithAttribute(/* tag= */ "AF", versionCodeAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + generateTagWithAttribute( + /* tag= */ "AF", versionCodeAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, /* expectedExceptionMessageRegex */ "Connector NOT must have 1 formula only", - () -> xmlParser.parse(ruleXmlOpenFormula)); + () -> xmlParser.parse(ruleXmlCompoundFormula)); } @Test - public void testXmlString_invalidOpenFormula_invalidOperator() throws Exception { + public void testXmlString_invalidCompoundFormula_invalidOperator() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("O", "INVALID_OPERATOR"); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, /* expectedExceptionMessageRegex */ "For input string: \"INVALID_OPERATOR\"", - () -> xmlParser.parse(ruleXmlOpenFormula)); + () -> xmlParser.parse(ruleXmlCompoundFormula)); } @Test - public void testXmlString_invalidOpenFormula_invalidEffect() throws Exception { + public void testXmlString_invalidCompoundFormula_invalidEffect() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", "INVALID_EFFECT"), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", "INVALID_EFFECT"), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, /* expectedExceptionMessageRegex */ "For input string: \"INVALID_EFFECT\"", - () -> xmlParser.parse(ruleXmlOpenFormula)); + () -> xmlParser.parse(ruleXmlCompoundFormula)); } @Test - public void testXmlString_invalidOpenFormula_invalidTags() throws Exception { + public void testXmlString_invalidCompoundFormula_invalidTags() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "InvalidAtomicFormula", - packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "InvalidAtomicFormula", + packageNameAttrs, + /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, /* expectedExceptionMessageRegex */ "Found unexpected tag: InvalidAtomicFormula", - () -> xmlParser.parse(ruleXmlOpenFormula)); + () -> xmlParser.parse(ruleXmlCompoundFormula)); } @Test @@ -295,18 +368,24 @@ public class RuleXmlParserTest { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false), - Rule.DENY); + Rule expectedRule = + new Rule( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false), + Rule.DENY); List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula); @@ -319,17 +398,22 @@ public class RuleXmlParserTest { versionCodeAttrs.put("K", String.valueOf(AtomicFormula.VERSION_CODE)); versionCodeAttrs.put("O", String.valueOf(AtomicFormula.EQ)); versionCodeAttrs.put("V", "1"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", versionCodeAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", versionCodeAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule( - new AtomicFormula.IntAtomicFormula(AtomicFormula.VERSION_CODE, AtomicFormula.EQ, 1), - Rule.DENY); + Rule expectedRule = + new Rule( + new AtomicFormula.IntAtomicFormula( + AtomicFormula.VERSION_CODE, AtomicFormula.EQ, 1), + Rule.DENY); List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula); @@ -341,17 +425,21 @@ public class RuleXmlParserTest { Map<String, String> preInstalledAttrs = new HashMap<>(); preInstalledAttrs.put("K", String.valueOf(AtomicFormula.PRE_INSTALLED)); preInstalledAttrs.put("V", "true"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", preInstalledAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", preInstalledAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule( - new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), - Rule.DENY); + Rule expectedRule = + new Rule( + new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), + Rule.DENY); List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula); @@ -363,18 +451,24 @@ public class RuleXmlParserTest { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); - Rule expectedRule = new Rule( - new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", - /* isHashedValue= */ false), - Rule.DENY); + Rule expectedRule = + new Rule( + new AtomicFormula.StringAtomicFormula( + AtomicFormula.PACKAGE_NAME, + "com.app.test", + /* isHashedValue= */ false), + Rule.DENY); List<Rule> rules = xmlParser.parse(ruleXmlAtomicFormula); @@ -386,13 +480,16 @@ public class RuleXmlParserTest { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("BadKey", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( @@ -406,13 +503,16 @@ public class RuleXmlParserTest { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("BadEffect", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("BadEffect", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, @@ -421,26 +521,31 @@ public class RuleXmlParserTest { } @Test - public void testXmlString_invalidOpenFormula_invalidAttribute() throws Exception { + public void testXmlString_invalidCompoundFormula_invalidAttribute() throws Exception { Map<String, String> packageNameAttrs = new HashMap<>(); packageNameAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlOpenFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("BadConnector", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</OF>" - + "</R>" - + "</RL>"; + String ruleXmlCompoundFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap( + "BadConnector", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</OF>" + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( RuleParseException.class, /* expectedExceptionMessageRegex */ "Unknown connector: -1", - () -> xmlParser.parse(ruleXmlOpenFormula)); + () -> xmlParser.parse(ruleXmlCompoundFormula)); } @Test @@ -449,13 +554,16 @@ public class RuleXmlParserTest { packageNameAttrs.put("K", String.valueOf(AtomicFormula.VERSION_CODE)); packageNameAttrs.put("O", String.valueOf(AtomicFormula.EQ)); packageNameAttrs.put("V", "com.app.test"); - String ruleXmlAtomicFormula = "<RL>" - + generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) - + "</R>" - + "</RL>"; + String ruleXmlAtomicFormula = + "<RL>" + + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", packageNameAttrs, /* closed= */ true) + + "</R>" + + "</RL>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( @@ -469,15 +577,19 @@ public class RuleXmlParserTest { Map<String, String> atomicFormulaAttrs = new HashMap<>(); atomicFormulaAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); atomicFormulaAttrs.put("V", "com.app.test"); - String ruleXmlWithNoRuleList = generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) - + "</OF>" - + "</R>"; + String ruleXmlWithNoRuleList = + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) + + "</OF>" + + "</R>"; RuleParser xmlParser = new RuleXmlParser(); assertExpectException( @@ -491,15 +603,19 @@ public class RuleXmlParserTest { Map<String, String> atomicFormulaAttrs = new HashMap<>(); atomicFormulaAttrs.put("K", String.valueOf(AtomicFormula.PACKAGE_NAME)); atomicFormulaAttrs.put("V", "com.app.test"); - String ruleXmlWithNoRuleList = generateTagWithAttribute(/* tag= */ "R", - Collections.singletonMap("E", String.valueOf(Rule.DENY)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), - /* closed= */ false) - + generateTagWithAttribute(/* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) - + "</OF>" - + "</R>"; + String ruleXmlWithNoRuleList = + generateTagWithAttribute( + /* tag= */ "R", + Collections.singletonMap("E", String.valueOf(Rule.DENY)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "OF", + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), + /* closed= */ false) + + generateTagWithAttribute( + /* tag= */ "AF", atomicFormulaAttrs, /* closed= */ true) + + "</OF>" + + "</R>"; InputStream inputStream = new ByteArrayInputStream(ruleXmlWithNoRuleList.getBytes()); RuleParser xmlParser = new RuleXmlParser(); @@ -509,8 +625,8 @@ public class RuleXmlParserTest { () -> xmlParser.parse(inputStream)); } - private String generateTagWithAttribute(String tag, Map<String, String> attributeValues, - boolean closed) { + private String generateTagWithAttribute( + String tag, Map<String, String> attributeValues, boolean closed) { StringBuilder res = new StringBuilder("<"); res.append(tag); for (String attribute : attributeValues.keySet()) { diff --git a/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java index 7eac0b912bf8..40e89ba1e9c7 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleXmlSerializerTest.java @@ -20,13 +20,13 @@ import static com.android.server.testutils.TestUtils.assertExpectException; import static org.junit.Assert.assertEquals; -import androidx.annotation.NonNull; +import android.content.integrity.AppInstallMetadata; +import android.content.integrity.AtomicFormula; +import android.content.integrity.CompoundFormula; +import android.content.integrity.Formula; +import android.content.integrity.Rule; -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 androidx.annotation.NonNull; import org.junit.Test; import org.junit.runner.RunWith; @@ -80,7 +80,7 @@ public class RuleXmlSerializerTest { @Test public void testXmlStream_serializeValidOpenFormula() throws Exception { - Rule rule = new Rule(new OpenFormula(OpenFormula.NOT, + Rule rule = new Rule(new CompoundFormula(CompoundFormula.NOT, Collections.singletonList( new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", /* isHashedValue= */ false))), Rule.DENY); @@ -95,7 +95,7 @@ public class RuleXmlSerializerTest { Collections.singletonMap("E", String.valueOf(Rule.DENY)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) + "</OF>" @@ -110,7 +110,7 @@ public class RuleXmlSerializerTest { @Test public void testXmlString_serializeValidOpenFormula_notConnector() throws Exception { - Rule rule = new Rule(new OpenFormula(OpenFormula.NOT, + Rule rule = new Rule(new CompoundFormula(CompoundFormula.NOT, Collections.singletonList( new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", /* isHashedValue= */ false))), Rule.DENY); @@ -124,7 +124,7 @@ public class RuleXmlSerializerTest { Collections.singletonMap("E", String.valueOf(Rule.DENY)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.NOT)), + Collections.singletonMap("C", String.valueOf(CompoundFormula.NOT)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) + "</OF>" @@ -138,7 +138,7 @@ public class RuleXmlSerializerTest { @Test public void testXmlString_serializeValidOpenFormula_andConnector() throws Exception { - Rule rule = new Rule(new OpenFormula(OpenFormula.AND, + Rule rule = new Rule(new CompoundFormula(CompoundFormula.AND, Arrays.asList(new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", /* isHashedValue= */ false), new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, @@ -157,7 +157,7 @@ public class RuleXmlSerializerTest { Collections.singletonMap("E", String.valueOf(Rule.DENY)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.AND)), + Collections.singletonMap("C", String.valueOf(CompoundFormula.AND)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) + generateTagWithAttribute(/* tag= */ "AF", appCertificateAttrs, /* closed= */ true) @@ -172,7 +172,7 @@ public class RuleXmlSerializerTest { @Test public void testXmlString_serializeValidOpenFormula_orConnector() throws Exception { - Rule rule = new Rule(new OpenFormula(OpenFormula.OR, + Rule rule = new Rule(new CompoundFormula(CompoundFormula.OR, Arrays.asList(new AtomicFormula.StringAtomicFormula(AtomicFormula.PACKAGE_NAME, "com.app.test", /* isHashedValue= */ false), new AtomicFormula.StringAtomicFormula(AtomicFormula.APP_CERTIFICATE, @@ -191,7 +191,7 @@ public class RuleXmlSerializerTest { Collections.singletonMap("E", String.valueOf(Rule.DENY)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "OF", - Collections.singletonMap("C", String.valueOf(OpenFormula.OR)), + Collections.singletonMap("C", String.valueOf(CompoundFormula.OR)), /* closed= */ false) + generateTagWithAttribute(/* tag= */ "AF", packageNameAttrs, /* closed= */ true) + generateTagWithAttribute(/* tag= */ "AF", appCertificateAttrs, /* closed= */ true) diff --git a/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java index f492932a0d77..601e2e9e3e03 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java @@ -16,10 +16,9 @@ package com.android.server.pm; -import static android.content.pm.UserInfo.FLAG_FULL; -import static android.content.pm.UserInfo.FLAG_GUEST; -import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE; -import static android.content.pm.UserInfo.FLAG_SYSTEM; +import static android.os.UserManager.USER_TYPE_FULL_GUEST; +import static android.os.UserManager.USER_TYPE_FULL_SECONDARY; +import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED; import static com.android.server.pm.UserSystemPackageInstaller.PACKAGE_WHITELIST_MODE_PROP; import static com.android.server.pm.UserSystemPackageInstaller.USER_TYPE_PACKAGE_WHITELIST_MODE_DEVICE_DEFAULT; @@ -98,7 +97,8 @@ public class UserSystemPackageInstallerTest { LocalServices.removeServiceForTest(UserManagerInternal.class); UserManagerService ums = new UserManagerService(InstrumentationRegistry.getContext()); - mUserSystemPackageInstaller = new UserSystemPackageInstaller(ums); + ArrayMap<String, UserTypeDetails> userTypes = UserTypeFactory.getUserTypes(); + mUserSystemPackageInstaller = new UserSystemPackageInstaller(ums, userTypes); mContext = InstrumentationRegistry.getTargetContext(); } @@ -130,9 +130,10 @@ public class UserSystemPackageInstallerTest { public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeWhitelist() { ArrayMap<String, Set<String>> r = new ArrayMap<>(); r.put("com.android.package1", new ArraySet<>(Arrays.asList( - "PROFILE", "SYSTEM", "GUEST", "FULL", "invalid-garbage1"))); + "PROFILE", "SYSTEM", USER_TYPE_FULL_GUEST, "invalid-garbage1"))); r.put("com.android.package2", new ArraySet<>(Arrays.asList( - "MANAGED_PROFILE"))); + USER_TYPE_PROFILE_MANAGED))); + r.put("com.android.package3", new ArraySet<>(Arrays.asList("FULL"))); return r; } @@ -140,18 +141,46 @@ public class UserSystemPackageInstallerTest { public ArrayMap<String, Set<String>> getAndClearPackageToUserTypeBlacklist() { ArrayMap<String, Set<String>> r = new ArrayMap<>(); r.put("com.android.package1", new ArraySet<>(Arrays.asList( - "FULL", "RESTRICTED", "invalid-garbage2"))); + USER_TYPE_PROFILE_MANAGED, "invalid-garbage2"))); + // com.android.package2 has nothing blacklisted + r.put("com.android.package3", new ArraySet<>(Arrays.asList("SYSTEM"))); return r; } }; - final ArrayMap<String, Integer> expectedOutput = getNewPackageToWhitelistedFlagsMap(); - expectedOutput.put("com.android.package1", - UserInfo.FLAG_PROFILE | FLAG_SYSTEM | FLAG_GUEST); - expectedOutput.put("com.android.package2", - UserInfo.FLAG_MANAGED_PROFILE); + final ArrayMap<String, UserTypeDetails> userTypes = UserTypeFactory.getUserTypes(); + // Determine the expected userTypeBitSets based on getUserTypeMask. + long expectedUserTypeBitSet1 = 0; + expectedUserTypeBitSet1 + |= mUserSystemPackageInstaller.getUserTypeMask(USER_TYPE_FULL_GUEST); + for (int i = 0; i < userTypes.size(); i++) { + final String userType = userTypes.keyAt(i); + final UserTypeDetails details = userTypes.valueAt(i); + if (details.isSystem() || details.isProfile()) { + expectedUserTypeBitSet1 |= mUserSystemPackageInstaller.getUserTypeMask(userType); + } + } + expectedUserTypeBitSet1 + &= ~mUserSystemPackageInstaller.getUserTypeMask(USER_TYPE_PROFILE_MANAGED); + + final long expectedUserTypeBitSet2 = + mUserSystemPackageInstaller.getUserTypeMask(USER_TYPE_PROFILE_MANAGED); + + long expectedUserTypeBitSet3 = 0; + for (int i = 0; i < userTypes.size(); i++) { + final String userType = userTypes.keyAt(i); + final UserTypeDetails details = userTypes.valueAt(i); + if (details.isFull() && !details.isSystem()) { + expectedUserTypeBitSet3 |= mUserSystemPackageInstaller.getUserTypeMask(userType); + } + } - final ArrayMap<String, Integer> actualOutput = + final ArrayMap<String, Long> expectedOutput = getNewPackageToWhitelistedBitSetMap(); + expectedOutput.put("com.android.package1", expectedUserTypeBitSet1); + expectedOutput.put("com.android.package2", expectedUserTypeBitSet2); + expectedOutput.put("com.android.package3", expectedUserTypeBitSet3); + + final ArrayMap<String, Long> actualOutput = mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); assertEquals("Incorrect package-to-user mapping.", expectedOutput, actualOutput); @@ -189,11 +218,12 @@ public class UserSystemPackageInstallerTest { } }; - final ArrayMap<String, Integer> expectedOutput = getNewPackageToWhitelistedFlagsMap(); - expectedOutput.put("com.android.package3", 0); - expectedOutput.put("com.android.package4", 0); + final ArrayMap<String, Long> expectedOutput = getNewPackageToWhitelistedBitSetMap(); + expectedOutput.put("com.android.package2", 0L); + expectedOutput.put("com.android.package3", 0L); + expectedOutput.put("com.android.package4", 0L); - final ArrayMap<String, Integer> actualOutput = + final ArrayMap<String, Long> actualOutput = mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); assertEquals("Incorrect package-to-user mapping.", expectedOutput, actualOutput); @@ -209,17 +239,16 @@ public class UserSystemPackageInstallerTest { final String packageName3 = "pkg3"; // whitelisted for a different user type final String packageName4 = "pkg4"; // not whitelisted nor blacklisted at all - final ArrayMap<String, Integer> pkgFlgMap = new ArrayMap<>(); // Whitelist: pkgs per flags - pkgFlgMap.put(packageName1, FLAG_FULL); - pkgFlgMap.put(packageName2, 0); - pkgFlgMap.put(packageName3, FLAG_MANAGED_PROFILE); + // Whitelist: user type bitset for each pkg (for the test, all that matters is 0 vs non-0). + final ArrayMap<String, Long> pkgBitSetMap = new ArrayMap<>(); + pkgBitSetMap.put(packageName1, 0b01L); + pkgBitSetMap.put(packageName2, 0L); + pkgBitSetMap.put(packageName3, 0b10L); - // Whitelist of pkgs for this specific user, i.e. subset of pkgFlagMap for this user. + // Whitelist of pkgs for this specific user, i.e. subset of pkgBitSetMap for this user. final Set<String> userWhitelist = new ArraySet<>(); userWhitelist.add(packageName1); - final UserSystemPackageInstaller uspi = new UserSystemPackageInstaller(null, pkgFlgMap); - final PackageParser.Package pkg1 = new PackageParser.Package(packageName1); final PackageParser.Package pkg2 = new PackageParser.Package(packageName2); final PackageParser.Package pkg3 = new PackageParser.Package(packageName3); @@ -228,26 +257,38 @@ public class UserSystemPackageInstallerTest { // No implicit whitelist, so only install pkg1. boolean implicit = false; boolean isSysUser = false; - assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertTrue(UserSystemPackageInstaller.shouldInstallPackage( + pkg1, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg2, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg3, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg4, pkgBitSetMap, userWhitelist, implicit, isSysUser)); // Use implicit whitelist, so install pkg1 and pkg4 implicit = true; isSysUser = false; - assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertTrue(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertTrue(UserSystemPackageInstaller.shouldInstallPackage( + pkg1, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg2, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg3, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertTrue(UserSystemPackageInstaller.shouldInstallPackage( + pkg4, pkgBitSetMap, userWhitelist, implicit, isSysUser)); // For user 0 specifically, we always implicitly whitelist. implicit = false; isSysUser = true; - assertTrue(uspi.shouldInstallPackage(pkg1, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg2, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertFalse(uspi.shouldInstallPackage(pkg3, pkgFlgMap, userWhitelist, implicit, isSysUser)); - assertTrue(uspi.shouldInstallPackage(pkg4, pkgFlgMap, userWhitelist, implicit, isSysUser)); + assertTrue(UserSystemPackageInstaller.shouldInstallPackage( + pkg1, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg2, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertFalse(UserSystemPackageInstaller.shouldInstallPackage( + pkg3, pkgBitSetMap, userWhitelist, implicit, isSysUser)); + assertTrue(UserSystemPackageInstaller.shouldInstallPackage( + pkg4, pkgBitSetMap, userWhitelist, implicit, isSysUser)); } /** @@ -256,31 +297,38 @@ public class UserSystemPackageInstallerTest { */ @Test public void testGetWhitelistedPackagesForUserType() { - final String packageName1 = "pkg1"; // whitelisted for FULL + final String[] sortedUserTypes = new String[]{"type_a", "type_b", "type_c", "type_d"}; + final String nameOfTypeA = sortedUserTypes[0]; + final String nameOfTypeB = sortedUserTypes[1]; + final String nameOfTypeC = sortedUserTypes[2]; + final long maskOfTypeA = 0b0001L; + final long maskOfTypeC = 0b0100L; + + final String packageName1 = "pkg1"; // whitelisted for user type A final String packageName2 = "pkg2"; // blacklisted whenever whitelisted - final String packageName3 = "pkg3"; // whitelisted for SYSTEM - final String packageName4 = "pkg4"; // whitelisted for FULL + final String packageName3 = "pkg3"; // whitelisted for user type C + final String packageName4 = "pkg4"; // whitelisted for user type A - final ArrayMap<String, Integer> pkgFlagMap = new ArrayMap<>(); // Whitelist: pkgs per flags - pkgFlagMap.put(packageName1, FLAG_FULL); - pkgFlagMap.put(packageName2, 0); - pkgFlagMap.put(packageName3, FLAG_SYSTEM); - pkgFlagMap.put(packageName4, FLAG_FULL); + final ArrayMap<String, Long> pkgBitSetMap = new ArrayMap<>(); // Whitelist: bitset per pkg + pkgBitSetMap.put(packageName1, maskOfTypeA); + pkgBitSetMap.put(packageName2, 0L); + pkgBitSetMap.put(packageName3, maskOfTypeC); + pkgBitSetMap.put(packageName4, maskOfTypeA); - // Whitelist of pkgs for this specific user, i.e. subset of pkgFlagMap for this user. - final Set<String> expectedUserWhitelist = new ArraySet<>(); - expectedUserWhitelist.add(packageName1); + UserSystemPackageInstaller uspi = + new UserSystemPackageInstaller(null, pkgBitSetMap, sortedUserTypes); - UserSystemPackageInstaller uspi = new UserSystemPackageInstaller(null, pkgFlagMap); - - Set<String> output = uspi.getWhitelistedPackagesForUserType(FLAG_FULL); + Set<String> output = uspi.getWhitelistedPackagesForUserType(nameOfTypeA); assertEquals("Whitelist for FULL is the wrong size", 2, output.size()); - assertTrue("Whitelist for FULL doesn't contain pkg1", output.contains(packageName1)); - assertTrue("Whitelist for FULL doesn't contain pkg4", output.contains(packageName4)); + assertTrue("Whitelist for A doesn't contain pkg1", output.contains(packageName1)); + assertTrue("Whitelist for A doesn't contain pkg4", output.contains(packageName4)); + + output = uspi.getWhitelistedPackagesForUserType(nameOfTypeB); + assertEquals("Whitelist for B is the wrong size", 0, output.size()); - output = uspi.getWhitelistedPackagesForUserType(FLAG_SYSTEM); - assertEquals("Whitelist for SYSTEM is the wrong size", 1, output.size()); - assertTrue("Whitelist for SYSTEM doesn't contain pkg1", output.contains(packageName3)); + output = uspi.getWhitelistedPackagesForUserType(nameOfTypeC); + assertEquals("Whitelist for C is the wrong size", 1, output.size()); + assertTrue("Whitelist for C doesn't contain pkg1", output.contains(packageName3)); } /** @@ -291,22 +339,23 @@ public class UserSystemPackageInstallerTest { */ @Test public void testPackagesForCreateUser_full() { - final int userFlags = UserInfo.FLAG_FULL; + final String userTypeToCreate = USER_TYPE_FULL_SECONDARY; + final long userTypeMask = mUserSystemPackageInstaller.getUserTypeMask(userTypeToCreate); setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE); PackageManager pm = mContext.getPackageManager(); final SystemConfig sysConfig = new SystemConfigTestClass(true); - final ArrayMap<String, Integer> packageMap = + final ArrayMap<String, Long> packageMap = mUserSystemPackageInstaller.determineWhitelistedPackagesForUserTypes(sysConfig); final Set<String> expectedPackages = new ArraySet<>(packageMap.size()); for (int i = 0; i < packageMap.size(); i++) { - if ((userFlags & packageMap.valueAt(i)) != 0) { + if ((userTypeMask & packageMap.valueAt(i)) != 0) { expectedPackages.add(packageMap.keyAt(i)); } } final UserManager um = UserManager.get(mContext); - final UserInfo user = um.createUser("Test User", userFlags); + final UserInfo user = um.createUser("Test User", userTypeToCreate, 0); assertNotNull(user); mRemoveUsers.add(user.id); @@ -387,10 +436,11 @@ public class UserSystemPackageInstallerTest { } } - private ArrayMap<String, Integer> getNewPackageToWhitelistedFlagsMap() { - final ArrayMap<String, Integer> pkgFlagMap = new ArrayMap<>(); - // "android" is always treated as whitelisted, regardless of the xml file. - pkgFlagMap.put("android", FLAG_SYSTEM | UserInfo.FLAG_FULL | UserInfo.FLAG_PROFILE); - return pkgFlagMap; + /** @see UserSystemPackageInstaller#mWhitelistedPackagesForUserTypes */ + private ArrayMap<String, Long> getNewPackageToWhitelistedBitSetMap() { + final ArrayMap<String, Long> pkgBitSetMap = new ArrayMap<>(); + // "android" is always treated as whitelisted for all types, regardless of the xml file. + pkgBitSetMap.put("android", ~0L); + return pkgBitSetMap; } } diff --git a/services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeZoneDetectorStrategyTest.java b/services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeZoneDetectorStrategyTest.java index d79795593456..317fd4d566ae 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeZoneDetectorStrategyTest.java +++ b/services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeZoneDetectorStrategyTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; import android.content.Intent; import android.icu.util.Calendar; @@ -36,6 +37,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import java.time.Duration; + @RunWith(AndroidJUnit4.class) public class SimpleTimeZoneDetectorStrategyTest { @@ -47,6 +50,8 @@ public class SimpleTimeZoneDetectorStrategyTest { private static final int ARBITRARY_PHONE_ID = 123456; + private static final long ONE_DAY_MILLIS = Duration.ofDays(1).toMillis(); + private Script mScript; @Before @@ -55,7 +60,7 @@ public class SimpleTimeZoneDetectorStrategyTest { } @Test - public void testSuggestPhoneTime_nitz_timeDetectionEnabled() { + public void testSuggestPhoneTime_autoTimeEnabled() { Scenario scenario = SCENARIO_1; mScript.pokeFakeClocks(scenario) .pokeTimeDetectionEnabled(true); @@ -67,7 +72,20 @@ public class SimpleTimeZoneDetectorStrategyTest { mScript.simulateTimePassing(clockIncrement) .simulatePhoneTimeSuggestion(timeSuggestion) - .verifySystemClockWasSetAndResetCallTracking(expectSystemClockMillis); + .verifySystemClockWasSetAndResetCallTracking( + expectSystemClockMillis, true /* expectNetworkBroadcast */); + } + + @Test + public void testSuggestPhoneTime_emptySuggestionIgnored() { + Scenario scenario = SCENARIO_1; + mScript.pokeFakeClocks(scenario) + .pokeTimeDetectionEnabled(true); + + PhoneTimeSuggestion timeSuggestion = createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, null); + + mScript.simulatePhoneTimeSuggestion(timeSuggestion) + .verifySystemClockWasNotSetAndResetCallTracking(); } @Test @@ -91,7 +109,8 @@ public class SimpleTimeZoneDetectorStrategyTest { // Send the first time signal. It should be used. mScript.simulatePhoneTimeSuggestion(timeSuggestion1) - .verifySystemClockWasSetAndResetCallTracking(expectSystemClockMillis1); + .verifySystemClockWasSetAndResetCallTracking( + expectSystemClockMillis1, true /* expectNetworkBroadcast */); // Now send another time signal, but one that is too similar to the last one and should be // ignored. @@ -99,7 +118,8 @@ public class SimpleTimeZoneDetectorStrategyTest { TimestampedValue<Long> utcTime2 = new TimestampedValue<>( mScript.peekElapsedRealtimeMillis(), mScript.peekSystemClockMillis() + underThresholdMillis); - PhoneTimeSuggestion timeSuggestion2 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); + PhoneTimeSuggestion timeSuggestion2 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); mScript.simulateTimePassing(clockIncrement) .simulatePhoneTimeSuggestion(timeSuggestion2) .verifySystemClockWasNotSetAndResetCallTracking(); @@ -109,18 +129,20 @@ public class SimpleTimeZoneDetectorStrategyTest { mScript.peekElapsedRealtimeMillis(), mScript.peekSystemClockMillis() + systemClockUpdateThresholdMillis); - PhoneTimeSuggestion timeSuggestion3 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime3); + PhoneTimeSuggestion timeSuggestion3 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime3); mScript.simulateTimePassing(clockIncrement); long expectSystemClockMillis3 = TimeDetectorStrategy.getTimeAt(utcTime3, mScript.peekElapsedRealtimeMillis()); mScript.simulatePhoneTimeSuggestion(timeSuggestion3) - .verifySystemClockWasSetAndResetCallTracking(expectSystemClockMillis3); + .verifySystemClockWasSetAndResetCallTracking( + expectSystemClockMillis3, true /* expectNetworkBroadcast */); } @Test - public void testSuggestPhoneTime_nitz_timeDetectionDisabled() { + public void testSuggestPhoneTime_autoTimeDisabled() { Scenario scenario = SCENARIO_1; mScript.pokeFakeClocks(scenario) .pokeTimeDetectionEnabled(false); @@ -132,7 +154,7 @@ public class SimpleTimeZoneDetectorStrategyTest { } @Test - public void testSuggestPhoneTime_nitz_invalidNitzReferenceTimesIgnored() { + public void testSuggestPhoneTime_invalidNitzReferenceTimesIgnored() { Scenario scenario = SCENARIO_1; final int systemClockUpdateThreshold = 2000; mScript.pokeFakeClocks(scenario) @@ -147,7 +169,8 @@ public class SimpleTimeZoneDetectorStrategyTest { long expectedSystemClockMillis1 = TimeDetectorStrategy.getTimeAt(utcTime1, mScript.peekElapsedRealtimeMillis()); mScript.simulatePhoneTimeSuggestion(timeSuggestion1) - .verifySystemClockWasSetAndResetCallTracking(expectedSystemClockMillis1); + .verifySystemClockWasSetAndResetCallTracking( + expectedSystemClockMillis1, true /* expectNetworkBroadcast */); // The UTC time increment should be larger than the system clock update threshold so we // know it shouldn't be ignored for other reasons. @@ -158,7 +181,8 @@ public class SimpleTimeZoneDetectorStrategyTest { long referenceTimeBeforeLastSignalMillis = utcTime1.getReferenceTimeMillis() - 1; TimestampedValue<Long> utcTime2 = new TimestampedValue<>( referenceTimeBeforeLastSignalMillis, validUtcTimeMillis); - PhoneTimeSuggestion timeSuggestion2 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); + PhoneTimeSuggestion timeSuggestion2 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); mScript.simulatePhoneTimeSuggestion(timeSuggestion2) .verifySystemClockWasNotSetAndResetCallTracking(); @@ -168,7 +192,8 @@ public class SimpleTimeZoneDetectorStrategyTest { utcTime1.getReferenceTimeMillis() + Integer.MAX_VALUE + 1; TimestampedValue<Long> utcTime3 = new TimestampedValue<>( referenceTimeInFutureMillis, validUtcTimeMillis); - PhoneTimeSuggestion timeSuggestion3 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime3); + PhoneTimeSuggestion timeSuggestion3 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime3); mScript.simulatePhoneTimeSuggestion(timeSuggestion3) .verifySystemClockWasNotSetAndResetCallTracking(); @@ -178,9 +203,11 @@ public class SimpleTimeZoneDetectorStrategyTest { validReferenceTimeMillis, validUtcTimeMillis); long expectedSystemClockMillis4 = TimeDetectorStrategy.getTimeAt(utcTime4, mScript.peekElapsedRealtimeMillis()); - PhoneTimeSuggestion timeSuggestion4 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime4); + PhoneTimeSuggestion timeSuggestion4 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime4); mScript.simulatePhoneTimeSuggestion(timeSuggestion4) - .verifySystemClockWasSetAndResetCallTracking(expectedSystemClockMillis4); + .verifySystemClockWasSetAndResetCallTracking( + expectedSystemClockMillis4, true /* expectNetworkBroadcast */); } @Test @@ -212,7 +239,8 @@ public class SimpleTimeZoneDetectorStrategyTest { // Turn on auto time detection. mScript.simulateAutoTimeDetectionToggle() - .verifySystemClockWasSetAndResetCallTracking(expectedSystemClockMillis1); + .verifySystemClockWasSetAndResetCallTracking( + expectedSystemClockMillis1, true /* expectNetworkBroadcast */); // Turn off auto time detection. mScript.simulateAutoTimeDetectionToggle() @@ -223,7 +251,8 @@ public class SimpleTimeZoneDetectorStrategyTest { TimestampedValue<Long> utcTime2 = new TimestampedValue<>( mScript.peekElapsedRealtimeMillis(), mScript.peekSystemClockMillis() + systemClockUpdateThreshold); - PhoneTimeSuggestion timeSuggestion2 = new PhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); + PhoneTimeSuggestion timeSuggestion2 = + createPhoneTimeSuggestion(ARBITRARY_PHONE_ID, utcTime2); // Simulate more time passing. mScript.simulateTimePassing(clockIncrementMillis); @@ -238,7 +267,99 @@ public class SimpleTimeZoneDetectorStrategyTest { // Turn on auto time detection. mScript.simulateAutoTimeDetectionToggle() - .verifySystemClockWasSetAndResetCallTracking(expectedSystemClockMillis2); + .verifySystemClockWasSetAndResetCallTracking( + expectedSystemClockMillis2, true /* expectNetworkBroadcast */); + } + + @Test + public void testSuggestManualTime_autoTimeDisabled() { + Scenario scenario = SCENARIO_1; + mScript.pokeFakeClocks(scenario) + .pokeTimeDetectionEnabled(false); + + ManualTimeSuggestion timeSuggestion = scenario.createManualTimeSuggestionForActual(); + final int clockIncrement = 1000; + long expectSystemClockMillis = scenario.getActualTimeMillis() + clockIncrement; + + mScript.simulateTimePassing(clockIncrement) + .simulateManualTimeSuggestion(timeSuggestion) + .verifySystemClockWasSetAndResetCallTracking( + expectSystemClockMillis, false /* expectNetworkBroadcast */); + } + + @Test + public void testSuggestManualTime_retainsAutoSignal() { + Scenario scenario = SCENARIO_1; + + // Configure the start state. + mScript.pokeFakeClocks(scenario) + .pokeTimeDetectionEnabled(true); + + // Simulate a phone suggestion. + PhoneTimeSuggestion phoneTimeSuggestion = + scenario.createPhoneTimeSuggestionForActual(ARBITRARY_PHONE_ID); + long expectedAutoClockMillis = phoneTimeSuggestion.getUtcTime().getValue(); + final int clockIncrement = 1000; + + // Simulate the passage of time. + mScript.simulateTimePassing(clockIncrement); + expectedAutoClockMillis += clockIncrement; + + mScript.simulatePhoneTimeSuggestion(phoneTimeSuggestion) + .verifySystemClockWasSetAndResetCallTracking( + expectedAutoClockMillis, true /* expectNetworkBroadcast */); + + // Simulate the passage of time. + mScript.simulateTimePassing(clockIncrement); + expectedAutoClockMillis += clockIncrement; + + // Switch to manual. + mScript.simulateAutoTimeDetectionToggle() + .verifySystemClockWasNotSetAndResetCallTracking(); + + // Simulate the passage of time. + mScript.simulateTimePassing(clockIncrement); + expectedAutoClockMillis += clockIncrement; + + + // Simulate a manual suggestion 1 day different from the auto suggestion. + long manualTimeMillis = SCENARIO_1.getActualTimeMillis() + ONE_DAY_MILLIS; + long expectedManualClockMillis = manualTimeMillis; + ManualTimeSuggestion manualTimeSuggestion = createManualTimeSuggestion(manualTimeMillis); + mScript.simulateManualTimeSuggestion(manualTimeSuggestion) + .verifySystemClockWasSetAndResetCallTracking( + expectedManualClockMillis, false /* expectNetworkBroadcast */); + + // Simulate the passage of time. + mScript.simulateTimePassing(clockIncrement); + expectedAutoClockMillis += clockIncrement; + + // Switch back to auto. + mScript.simulateAutoTimeDetectionToggle(); + + mScript.verifySystemClockWasSetAndResetCallTracking( + expectedAutoClockMillis, true /* expectNetworkBroadcast */); + + // Switch back to manual - nothing should happen to the clock. + mScript.simulateAutoTimeDetectionToggle() + .verifySystemClockWasNotSetAndResetCallTracking(); + } + + /** + * Manual suggestions should be ignored if auto time is enabled. + */ + @Test + public void testSuggestManualTime_autoTimeEnabled() { + Scenario scenario = SCENARIO_1; + mScript.pokeFakeClocks(scenario) + .pokeTimeDetectionEnabled(true); + + ManualTimeSuggestion timeSuggestion = scenario.createManualTimeSuggestionForActual(); + final int clockIncrement = 1000; + + mScript.simulateTimePassing(clockIncrement) + .simulateManualTimeSuggestion(timeSuggestion) + .verifySystemClockWasNotSetAndResetCallTracking(); } /** @@ -262,7 +383,7 @@ public class SimpleTimeZoneDetectorStrategyTest { } @Override - public boolean isTimeDetectionEnabled() { + public boolean isAutoTimeDetectionEnabled() { return mTimeDetectionEnabled; } @@ -408,8 +529,13 @@ public class SimpleTimeZoneDetectorStrategyTest { return this; } + Script simulateManualTimeSuggestion(ManualTimeSuggestion timeSuggestion) { + mSimpleTimeDetectorStrategy.suggestManualTime(timeSuggestion); + return this; + } + Script simulateAutoTimeDetectionToggle() { - boolean enabled = !mFakeCallback.isTimeDetectionEnabled(); + boolean enabled = !mFakeCallback.isAutoTimeDetectionEnabled(); mFakeCallback.pokeTimeDetectionEnabled(enabled); mSimpleTimeDetectorStrategy.handleAutoTimeDetectionToggle(enabled); return this; @@ -427,9 +553,12 @@ public class SimpleTimeZoneDetectorStrategyTest { return this; } - Script verifySystemClockWasSetAndResetCallTracking(long expectSystemClockMillis) { + Script verifySystemClockWasSetAndResetCallTracking( + long expectSystemClockMillis, boolean expectNetworkBroadcast) { mFakeCallback.verifySystemClockWasSet(expectSystemClockMillis); - mFakeCallback.verifyIntentWasBroadcast(); + if (expectNetworkBroadcast) { + mFakeCallback.verifyIntentWasBroadcast(); + } mFakeCallback.resetCallTracking(); return this; } @@ -465,7 +594,13 @@ public class SimpleTimeZoneDetectorStrategyTest { PhoneTimeSuggestion createPhoneTimeSuggestionForActual(int phoneId) { TimestampedValue<Long> time = new TimestampedValue<>( mInitialDeviceRealtimeMillis, mActualTimeMillis); - return new PhoneTimeSuggestion(phoneId, time); + return createPhoneTimeSuggestion(phoneId, time); + } + + ManualTimeSuggestion createManualTimeSuggestionForActual() { + TimestampedValue<Long> time = new TimestampedValue<>( + mInitialDeviceRealtimeMillis, mActualTimeMillis); + return new ManualTimeSuggestion(time); } static class Builder { @@ -500,6 +635,19 @@ public class SimpleTimeZoneDetectorStrategyTest { } } + private static PhoneTimeSuggestion createPhoneTimeSuggestion(int phoneId, + TimestampedValue<Long> utcTime) { + PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(phoneId); + timeSuggestion.setUtcTime(utcTime); + return timeSuggestion; + } + + private ManualTimeSuggestion createManualTimeSuggestion(long timeMillis) { + TimestampedValue<Long> utcTime = + new TimestampedValue<>(mScript.peekElapsedRealtimeMillis(), timeMillis); + return new ManualTimeSuggestion(utcTime); + } + private static long createUtcTime(int year, int monthInYear, int day, int hourOfDay, int minute, int second) { Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("Etc/UTC")); diff --git a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java index 37da01824e88..4efe771a4e95 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.timedetector.ManualTimeSuggestion; import android.app.timedetector.PhoneTimeSuggestion; import android.content.Context; import android.content.pm.PackageManager; @@ -90,6 +91,19 @@ public class TimeDetectorServiceTest { } @Test + public void testSuggestManualTime() { + doNothing().when(mMockContext).enforceCallingPermission(anyString(), any()); + + ManualTimeSuggestion manualTimeSuggestion = createManualTimeSuggestion(); + mTimeDetectorService.suggestManualTime(manualTimeSuggestion); + + verify(mMockContext).enforceCallingPermission( + eq(android.Manifest.permission.SET_TIME), + anyString()); + mStubbedTimeDetectorStrategy.verifySuggestManualTimeCalled(manualTimeSuggestion); + } + + @Test public void testDump() { when(mMockContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)) .thenReturn(PackageManager.PERMISSION_GRANTED); @@ -102,13 +116,13 @@ public class TimeDetectorServiceTest { @Test public void testAutoTimeDetectionToggle() { - when(mMockCallback.isTimeDetectionEnabled()).thenReturn(true); + when(mMockCallback.isAutoTimeDetectionEnabled()).thenReturn(true); mTimeDetectorService.handleAutoTimeDetectionToggle(); mStubbedTimeDetectorStrategy.verifyHandleAutoTimeDetectionToggleCalled(true); - when(mMockCallback.isTimeDetectionEnabled()).thenReturn(false); + when(mMockCallback.isAutoTimeDetectionEnabled()).thenReturn(false); mTimeDetectorService.handleAutoTimeDetectionToggle(); @@ -117,14 +131,22 @@ public class TimeDetectorServiceTest { private static PhoneTimeSuggestion createPhoneTimeSuggestion() { int phoneId = 1234; + PhoneTimeSuggestion suggestion = new PhoneTimeSuggestion(phoneId); TimestampedValue<Long> timeValue = new TimestampedValue<>(100L, 1_000_000L); - return new PhoneTimeSuggestion(phoneId, timeValue); + suggestion.setUtcTime(timeValue); + return suggestion; + } + + private static ManualTimeSuggestion createManualTimeSuggestion() { + TimestampedValue<Long> timeValue = new TimestampedValue<>(100L, 1_000_000L); + return new ManualTimeSuggestion(timeValue); } private static class StubbedTimeDetectorStrategy implements TimeDetectorStrategy { // Call tracking. private PhoneTimeSuggestion mLastPhoneSuggestion; + private ManualTimeSuggestion mLastManualSuggestion; private Boolean mLastAutoTimeDetectionToggle; private boolean mDumpCalled; @@ -139,6 +161,12 @@ public class TimeDetectorServiceTest { } @Override + public void suggestManualTime(ManualTimeSuggestion timeSuggestion) { + resetCallTracking(); + mLastManualSuggestion = timeSuggestion; + } + + @Override public void handleAutoTimeDetectionToggle(boolean enabled) { resetCallTracking(); mLastAutoTimeDetectionToggle = enabled; @@ -152,12 +180,17 @@ public class TimeDetectorServiceTest { void resetCallTracking() { mLastPhoneSuggestion = null; + mLastManualSuggestion = null; mLastAutoTimeDetectionToggle = null; mDumpCalled = false; } - void verifySuggestPhoneTimeCalled(PhoneTimeSuggestion expectedSignal) { - assertEquals(expectedSignal, mLastPhoneSuggestion); + void verifySuggestPhoneTimeCalled(PhoneTimeSuggestion expectedSuggestion) { + assertEquals(expectedSuggestion, mLastPhoneSuggestion); + } + + public void verifySuggestManualTimeCalled(ManualTimeSuggestion expectedSuggestion) { + assertEquals(expectedSuggestion, mLastManualSuggestion); } void verifyHandleAutoTimeDetectionToggleCalled(boolean expectedEnable) { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java index a00afecda072..9ad6986f2f90 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.AlarmManager; +import android.app.NotificationHistory; import android.app.NotificationHistory.HistoricalNotification; import android.content.Context; import android.graphics.drawable.Icon; @@ -199,6 +200,16 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase { } @Test + public void testReadNotificationHistory_readsBuffer() throws Exception { + HistoricalNotification hn = getHistoricalNotification(1); + mDataBase.addNotification(hn); + + NotificationHistory nh = mDataBase.readNotificationHistory(); + + assertThat(nh.getNotificationsToWrite()).contains(hn); + } + + @Test public void testReadNotificationHistory_withNumFilterDoesNotReadExtraFiles() throws Exception { AtomicFile af = mock(AtomicFile.class); when(af.getBaseFile()).thenReturn(new File(mRootDir, "af")); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryManagerTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryManagerTest.java index aa3c4659c413..92c05466deb5 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryManagerTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryManagerTest.java @@ -15,11 +15,12 @@ */ package com.android.server.notification; -import static android.os.UserHandle.USER_ALL; +import static android.os.UserHandle.MIN_SECONDARY_USER_ID; import static android.os.UserHandle.USER_SYSTEM; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -28,9 +29,11 @@ import static org.mockito.Mockito.when; import android.app.NotificationHistory; import android.app.NotificationHistory.HistoricalNotification; -import android.content.Context; +import android.content.pm.UserInfo; import android.graphics.drawable.Icon; +import android.os.Handler; import android.os.UserManager; +import android.provider.Settings; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; @@ -44,23 +47,22 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.util.ArrayList; +import java.util.List; + @RunWith(AndroidJUnit4.class) public class NotificationHistoryManagerTest extends UiServiceTestCase { @Mock - Context mContext; - @Mock UserManager mUserManager; @Mock NotificationHistoryDatabase mDb; + @Mock + Handler mHandler; + List<UserInfo> mUsers; NotificationHistoryManager mHistoryManager; - private HistoricalNotification getHistoricalNotification(int index) { - return getHistoricalNotification("package" + index, index); - } - private HistoricalNotification getHistoricalNotification(String packageName, int index) { String expectedChannelName = "channelName" + index; String expectedChannelId = "channelId" + index; @@ -88,13 +90,28 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); - when(mContext.getUser()).thenReturn(getContext().getUser()); - when(mContext.getPackageName()).thenReturn(getContext().getPackageName()); + + getContext().addMockSystemService(UserManager.class, mUserManager); + + mUsers = new ArrayList<>(); + UserInfo userSystem = new UserInfo(); + userSystem.id = USER_SYSTEM; + mUsers.add(userSystem); + UserInfo userAll = new UserInfo(); + userAll.id = MIN_SECONDARY_USER_ID; + mUsers.add(userAll); + mUsers.add(userAll); + when(mUserManager.getUsers()).thenReturn(mUsers); + + for (UserInfo info : mUsers) { + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 1, info.id); + } NotificationHistoryDatabaseFactory.setTestingNotificationHistoryDatabase(mDb); - mHistoryManager = new NotificationHistoryManager(mContext); + mHistoryManager = new NotificationHistoryManager(getContext(), mHandler); + mHistoryManager.onBootPhaseAppsCanStart(); } @Test @@ -107,6 +124,20 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { verify(mDb, times(1)).init(); } + public void testOnUserUnlocked_historyDisabled() { + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + assertThat(mHistoryManager.doesHistoryExistForUser(USER_SYSTEM)).isFalse(); + assertThat(mHistoryManager.isUserUnlocked(USER_SYSTEM)).isFalse(); + + mHistoryManager.onUserUnlocked(USER_SYSTEM); + + assertThat(mHistoryManager.doesHistoryExistForUser(USER_SYSTEM)).isFalse(); + assertThat(mHistoryManager.isUserUnlocked(USER_SYSTEM)).isFalse(); + verify(mDb, times(1)).disableHistory(); + } + @Test public void testOnUserUnlocked_cleansUpRemovedPackages() { String pkg = "pkg"; @@ -144,6 +175,7 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { assertThat(mHistoryManager.doesHistoryExistForUser(USER_SYSTEM)).isFalse(); assertThat(mHistoryManager.isUserUnlocked(USER_SYSTEM)).isFalse(); + assertThat(mHistoryManager.isHistoryEnabled(USER_SYSTEM)).isFalse(); } @Test @@ -187,6 +219,18 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { } @Test + public void testOnPackageRemoved_historyDisabled() { + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + String pkg = "pkg"; + mHistoryManager.onPackageRemoved(USER_SYSTEM, pkg); + + assertThat(mHistoryManager.getPendingPackageRemovalsForUser(USER_SYSTEM)) + .isNull(); + } + + @Test public void testOnPackageRemoved_multiUser() { String pkg = "pkg"; NotificationHistoryDatabase userHistorySystem = mock(NotificationHistoryDatabase.class); @@ -195,8 +239,8 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { mHistoryManager.onUserUnlocked(USER_SYSTEM); mHistoryManager.replaceNotificationHistoryDatabase(USER_SYSTEM, userHistorySystem); - mHistoryManager.onUserUnlocked(USER_ALL); - mHistoryManager.replaceNotificationHistoryDatabase(USER_ALL, userHistoryAll); + mHistoryManager.onUserUnlocked(MIN_SECONDARY_USER_ID); + mHistoryManager.replaceNotificationHistoryDatabase(MIN_SECONDARY_USER_ID, userHistoryAll); mHistoryManager.onPackageRemoved(USER_SYSTEM, pkg); @@ -212,8 +256,8 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { mHistoryManager.onUserUnlocked(USER_SYSTEM); mHistoryManager.replaceNotificationHistoryDatabase(USER_SYSTEM, userHistorySystem); - mHistoryManager.onUserUnlocked(USER_ALL); - mHistoryManager.replaceNotificationHistoryDatabase(USER_ALL, userHistoryAll); + mHistoryManager.onUserUnlocked(MIN_SECONDARY_USER_ID); + mHistoryManager.replaceNotificationHistoryDatabase(MIN_SECONDARY_USER_ID, userHistoryAll); mHistoryManager.triggerWriteToDisk(); @@ -229,9 +273,9 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { mHistoryManager.onUserUnlocked(USER_SYSTEM); mHistoryManager.replaceNotificationHistoryDatabase(USER_SYSTEM, userHistorySystem); - mHistoryManager.onUserUnlocked(USER_ALL); - mHistoryManager.replaceNotificationHistoryDatabase(USER_ALL, userHistoryAll); - mHistoryManager.onUserStopped(USER_ALL); + mHistoryManager.onUserUnlocked(MIN_SECONDARY_USER_ID); + mHistoryManager.replaceNotificationHistoryDatabase(MIN_SECONDARY_USER_ID, userHistoryAll); + mHistoryManager.onUserStopped(MIN_SECONDARY_USER_ID); mHistoryManager.triggerWriteToDisk(); @@ -240,6 +284,21 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { } @Test + public void testTriggerWriteToDisk_historyDisabled() { + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + NotificationHistoryDatabase userHistorySystem = mock(NotificationHistoryDatabase.class); + + mHistoryManager.onUserUnlocked(USER_SYSTEM); + mHistoryManager.replaceNotificationHistoryDatabase(USER_SYSTEM, userHistorySystem); + + mHistoryManager.triggerWriteToDisk(); + + verify(userHistorySystem, never()).forceWriteToDisk(); + } + + @Test public void testAddNotification_userLocked_noCrash() { HistoricalNotification hn = getHistoricalNotification("pkg", 1); @@ -247,9 +306,23 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { } @Test + public void testAddNotification_historyDisabled() { + HistoricalNotification hn = getHistoricalNotification("pkg", 1); + + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, hn.getUserId()); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + + mHistoryManager.onUserUnlocked(hn.getUserId()); + mHistoryManager.addNotification(hn); + + verify(mDb, never()).addNotification(any()); + } + + @Test public void testAddNotification() { HistoricalNotification hnSystem = getHistoricalNotification("pkg", USER_SYSTEM); - HistoricalNotification hnAll = getHistoricalNotification("pkg", USER_ALL); + HistoricalNotification hnAll = getHistoricalNotification("pkg", MIN_SECONDARY_USER_ID); NotificationHistoryDatabase userHistorySystem = mock(NotificationHistoryDatabase.class); NotificationHistoryDatabase userHistoryAll = mock(NotificationHistoryDatabase.class); @@ -257,8 +330,8 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { mHistoryManager.onUserUnlocked(USER_SYSTEM); mHistoryManager.replaceNotificationHistoryDatabase(USER_SYSTEM, userHistorySystem); - mHistoryManager.onUserUnlocked(USER_ALL); - mHistoryManager.replaceNotificationHistoryDatabase(USER_ALL, userHistoryAll); + mHistoryManager.onUserUnlocked(MIN_SECONDARY_USER_ID); + mHistoryManager.replaceNotificationHistoryDatabase(MIN_SECONDARY_USER_ID, userHistoryAll); mHistoryManager.addNotification(hnSystem); mHistoryManager.addNotification(hnAll); @@ -270,7 +343,7 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { @Test public void testReadNotificationHistory() { HistoricalNotification hnSystem = getHistoricalNotification("pkg", USER_SYSTEM); - HistoricalNotification hnAll = getHistoricalNotification("pkg", USER_ALL); + HistoricalNotification hnAll = getHistoricalNotification("pkg", MIN_SECONDARY_USER_ID); NotificationHistoryDatabase userHistorySystem = mock(NotificationHistoryDatabase.class); NotificationHistoryDatabase userHistoryAll = mock(NotificationHistoryDatabase.class); @@ -283,8 +356,8 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { when(nhSystem.getNotificationsToWrite()).thenReturn(nhSystemList); when(userHistorySystem.readNotificationHistory()).thenReturn(nhSystem); - mHistoryManager.onUserUnlocked(USER_ALL); - mHistoryManager.replaceNotificationHistoryDatabase(USER_ALL, userHistoryAll); + mHistoryManager.onUserUnlocked(MIN_SECONDARY_USER_ID); + mHistoryManager.replaceNotificationHistoryDatabase(MIN_SECONDARY_USER_ID, userHistoryAll); NotificationHistory nhAll = mock(NotificationHistory.class); ArrayList<HistoricalNotification> nhAllList = new ArrayList<>(); nhAllList.add(hnAll); @@ -293,13 +366,47 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { // ensure read history returns both historical notifs NotificationHistory nh = mHistoryManager.readNotificationHistory( - new int[] {USER_SYSTEM, USER_ALL}); + new int[] {USER_SYSTEM, MIN_SECONDARY_USER_ID}); assertThat(nh.getNotificationsToWrite()).contains(hnSystem); assertThat(nh.getNotificationsToWrite()).contains(hnAll); } @Test - public void readFilteredNotificationHistory_userUnlocked() { + public void testReadNotificationHistory_historyDisabled() { + HistoricalNotification hnSystem = getHistoricalNotification("pkg", USER_SYSTEM); + + mHistoryManager.onUserUnlocked(USER_SYSTEM); + NotificationHistory nhSystem = mock(NotificationHistory.class); + ArrayList<HistoricalNotification> nhSystemList = new ArrayList<>(); + nhSystemList.add(hnSystem); + when(nhSystem.getNotificationsToWrite()).thenReturn(nhSystemList); + when(mDb.readNotificationHistory()).thenReturn(nhSystem); + + mHistoryManager.onUserUnlocked(USER_SYSTEM); + + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + + NotificationHistory nh = + mHistoryManager.readNotificationHistory(new int[] {USER_SYSTEM,}); + assertThat(nh.getNotificationsToWrite()).isEmpty(); + } + + @Test + public void testReadFilteredNotificationHistory_userLocked() { + NotificationHistory nh = + mHistoryManager.readFilteredNotificationHistory(USER_SYSTEM, "", "", 1000); + assertThat(nh.getNotificationsToWrite()).isEmpty(); + } + + @Test + public void testReadFilteredNotificationHistory_historyDisabled() { + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + + mHistoryManager.onUserUnlocked(USER_SYSTEM); NotificationHistory nh = mHistoryManager.readFilteredNotificationHistory(USER_SYSTEM, "", "", 1000); assertThat(nh.getNotificationsToWrite()).isEmpty(); @@ -312,4 +419,15 @@ public class NotificationHistoryManagerTest extends UiServiceTestCase { mHistoryManager.readFilteredNotificationHistory(USER_SYSTEM, "pkg", "chn", 1000); verify(mDb, times(1)).readNotificationHistory("pkg", "chn", 1000); } + + @Test + public void testIsHistoryEnabled() { + assertThat(mHistoryManager.isHistoryEnabled(USER_SYSTEM)).isTrue(); + + Settings.Secure.putIntForUser(getContext().getContentResolver(), + Settings.Secure.NOTIFICATION_HISTORY_ENABLED, 0, USER_SYSTEM); + mHistoryManager.mSettingsObserver.update(null, USER_SYSTEM); + + assertThat(mHistoryManager.isHistoryEnabled(USER_SYSTEM)).isFalse(); + } } 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 21de668e10c3..876e77acde86 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -218,6 +218,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { @Mock RankingHandler mRankingHandler; + private static final int MAX_POST_DELAY = 1000; + private NotificationChannel mTestNotificationChannel = new NotificationChannel( TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_DEFAULT); @@ -246,6 +248,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { mNotificationAssistantAccessGrantedCallback; @Mock UserManager mUm; + @Mock + NotificationHistoryManager mHistoryManager; // Use a Testable subclass so we can simulate calls from the system without failing. private static class TestableNotificationManagerService extends NotificationManagerService { @@ -404,13 +408,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { when(mAssistants.isAdjustmentAllowed(anyString())).thenReturn(true); - mService.init(mTestableLooper.getLooper(), mRankingHandler, - mPackageManager, mPackageManagerClient, mockLightsManager, + mService.init(mService.new WorkerHandler(mTestableLooper.getLooper()), + mRankingHandler, mPackageManager, mPackageManagerClient, mockLightsManager, mListeners, mAssistants, mConditionProviders, mCompanionMgr, mSnoozeHelper, mUsageStats, mPolicyFile, mActivityManager, mGroupHelper, mAm, mAppUsageStats, mock(DevicePolicyManagerInternal.class), mUgm, mUgmInternal, - mAppOpsManager, mUm); + mAppOpsManager, mUm, mHistoryManager); mService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY); mService.setAudioManager(mAudioManager); @@ -430,6 +434,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { public void tearDown() throws Exception { if (mFile != null) mFile.delete(); clearDeviceConfig(); + mService.unregisterDeviceConfigChange(); InstrumentationRegistry.getInstrumentation() .getUiAutomation().dropShellPermissionIdentity(); } @@ -5947,4 +5952,61 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { } // TODO: add tests for the rest of the non-empty cases + + @Test + public void testOnUnlockUser() { + UserInfo ui = new UserInfo(); + ui.id = 10; + mService.onUnlockUser(ui); + waitForIdle(); + + verify(mHistoryManager, timeout(MAX_POST_DELAY).times(1)).onUserUnlocked(ui.id); + } + + @Test + public void testOnStopUser() { + UserInfo ui = new UserInfo(); + ui.id = 10; + mService.onStopUser(ui); + waitForIdle(); + + verify(mHistoryManager, timeout(MAX_POST_DELAY).times(1)).onUserStopped(ui.id); + } + + @Test + public void testOnBootPhase() { + mService.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); + + verify(mHistoryManager, never()).onBootPhaseAppsCanStart(); + + mService.onBootPhase(SystemService.PHASE_THIRD_PARTY_APPS_CAN_START); + + verify(mHistoryManager, times(1)).onBootPhaseAppsCanStart(); + } + + @Test + public void testHandleOnPackageChanged() { + String[] pkgs = new String[] {PKG, PKG_N_MR1}; + int[] uids = new int[] {mUid, UserHandle.PER_USER_RANGE + 1}; + + mService.handleOnPackageChanged(false, USER_SYSTEM, pkgs, uids); + + verify(mHistoryManager, never()).onPackageRemoved(anyInt(), anyString()); + + mService.handleOnPackageChanged(true, USER_SYSTEM, pkgs, uids); + + verify(mHistoryManager, times(1)).onPackageRemoved(UserHandle.getUserId(uids[0]), pkgs[0]); + verify(mHistoryManager, times(1)).onPackageRemoved(UserHandle.getUserId(uids[1]), pkgs[1]); + } + + @Test + public void testNotificationHistory_addNoisyNotification() throws Exception { + NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel, + null /* tvExtender */, false); + mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.sbn.getTag(), + nr.sbn.getId(), nr.sbn.getNotification(), nr.sbn.getUserId()); + waitForIdle(); + + verify(mHistoryManager, times(1)).addNotification(any()); + } } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java index 7f9f489c509a..c828f02901b3 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java @@ -129,7 +129,8 @@ public class RoleObserverTest extends UiServiceTestCase { mRoleObserver = mService.new RoleObserver(mRoleManager, mPm, mExecutor); try { - mService.init(mock(Looper.class), mock(RankingHandler.class), + mService.init(mService.new WorkerHandler(mock(Looper.class)), + mock(RankingHandler.class), mock(IPackageManager.class), mock(PackageManager.class), mock(LightsManager.class), mock(NotificationListeners.class), mock(NotificationAssistants.class), @@ -140,7 +141,7 @@ public class RoleObserverTest extends UiServiceTestCase { mock(UsageStatsManagerInternal.class), mock(DevicePolicyManagerInternal.class), mock(IUriGrantsManager.class), mock(UriGrantsManagerInternal.class), - mock(AppOpsManager.class), mUm); + mock(AppOpsManager.class), mUm, mock(NotificationHistoryManager.class)); } catch (SecurityException e) { if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) { throw e; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java index 36175a93f667..5841e59ab3a0 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java @@ -350,6 +350,26 @@ public class SnoozeHelperTest extends UiServiceTestCase { } @Test + public void testUpdateAfterCancel() throws Exception { + // snooze a notification + NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + mSnoozeHelper.snooze(r , 1000); + + // cancel the notification + mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, false); + + // update the notification + r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + mSnoozeHelper.update(UserHandle.USER_SYSTEM, r); + + // verify callback is called when repost (snooze is expired) + verify(mCallback, never()).repost(anyInt(), any(NotificationRecord.class)); + mSnoozeHelper.repost(r.getKey(), UserHandle.USER_SYSTEM); + verify(mCallback, times(1)).repost(UserHandle.USER_SYSTEM, r); + assertFalse(r.isCanceled); + } + + @Test public void testGetSnoozedByUser() throws Exception { NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); NotificationRecord r2 = getNotificationRecord("pkg", 2, "two", UserHandle.SYSTEM); diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 63b062e91c98..ba4a4484f09b 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -62,12 +62,10 @@ import android.os.Environment; import android.os.FileUtils; import android.os.Handler; import android.os.IBinder; -import android.os.IDeviceIdleController; import android.os.Looper; import android.os.Message; import android.os.Process; import android.os.RemoteException; -import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; @@ -150,7 +148,6 @@ public class UsageStatsService extends SystemService implements UserManager mUserManager; PackageManager mPackageManager; PackageManagerInternal mPackageManagerInternal; - IDeviceIdleController mDeviceIdleController; // Do not use directly. Call getDpmInternal() instead DevicePolicyManagerInternal mDpmInternal; @@ -265,9 +262,6 @@ public class UsageStatsService extends SystemService implements // initialize mDpmInternal getDpmInternal(); - mDeviceIdleController = IDeviceIdleController.Stub.asInterface( - ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER)); - if (ENABLE_KERNEL_UPDATES && KERNEL_COUNTER_FILE.exists()) { try { ActivityManager.getService().registerUidObserver(mUidObserver, @@ -1626,16 +1620,6 @@ public class UsageStatsService extends SystemService implements } @Override - public void whitelistAppTemporarily(String packageName, long duration, int userId) - throws RemoteException { - StringBuilder reason = new StringBuilder(32); - reason.append("from:"); - UserHandle.formatUid(reason, Binder.getCallingUid()); - mDeviceIdleController.addPowerSaveTempWhitelistApp(packageName, duration, userId, - reason.toString()); - } - - @Override public void onCarrierPrivilegedAppsChanged() { if (DEBUG) { Slog.i(TAG, "Carrier privileged apps changed"); diff --git a/services/wifi/Android.bp b/services/wifi/Android.bp deleted file mode 100644 index 8a7f73fcf501..000000000000 --- a/services/wifi/Android.bp +++ /dev/null @@ -1,16 +0,0 @@ -filegroup { - name: "services.wifi-sources", - srcs: [ - "java/**/*.java", - "java/**/*.aidl", - ], - path: "java", - visibility: ["//frameworks/base/services"], -} - -// Interfaces between the core system and the wifi mainline module. -java_library_static { - name: "services.wifi", - srcs: [":services.wifi-sources"], - libs: ["services.net"], -} diff --git a/services/wifi/java/android/net/wifi/WifiStackClient.java b/services/wifi/java/android/net/wifi/WifiStackClient.java deleted file mode 100644 index dcdfbc54687c..000000000000 --- a/services/wifi/java/android/net/wifi/WifiStackClient.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.net.wifi; - -import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_HIGH; -import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL; - -import android.annotation.NonNull; -import android.content.Context; -import android.net.ConnectivityModuleConnector; -import android.os.IBinder; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.util.Log; - -import java.util.List; - -/** - * Service used to communicate with the wifi stack, which could be running in a separate - * module. - * @hide - */ -public class WifiStackClient { - public static final String PERMISSION_MAINLINE_WIFI_STACK = - "android.permission.MAINLINE_WIFI_STACK"; - - private static final String TAG = WifiStackClient.class.getSimpleName(); - private static WifiStackClient sInstance; - - private WifiStackClient() { } - - /** - * Get the WifiStackClient singleton instance. - */ - public static synchronized WifiStackClient getInstance() { - if (sInstance == null) { - sInstance = new WifiStackClient(); - } - return sInstance; - } - - private class WifiStackConnection implements - ConnectivityModuleConnector.ModuleServiceCallback { - @Override - public void onModuleServiceConnected(IBinder service) { - Log.i(TAG, "Wifi stack connected"); - registerWifiStackService(service); - - IWifiStackConnector connector = IWifiStackConnector.Stub.asInterface(service); - - List<WifiApiServiceInfo> wifiApiServiceInfos; - try { - wifiApiServiceInfos = connector.getWifiApiServiceInfos(); - } catch (RemoteException e) { - throw new RuntimeException("Failed to getWifiApiServiceInfos()", e); - } - - for (WifiApiServiceInfo wifiApiServiceInfo : wifiApiServiceInfos) { - String serviceName = wifiApiServiceInfo.name; - IBinder binder = wifiApiServiceInfo.binder; - Log.i(TAG, "Registering " + serviceName); - ServiceManager.addService(serviceName, binder); - } - } - } - - private void registerWifiStackService(@NonNull IBinder service) { - ServiceManager.addService(Context.WIFI_STACK_SERVICE, service, - false /* allowIsolated */, - DUMP_FLAG_PRIORITY_HIGH | DUMP_FLAG_PRIORITY_NORMAL); - Log.i(TAG, "Wifi stack service registered"); - } - - /** - * Start the wifi stack. Should be called only once on device startup. - * - * <p>This method will start the wifi stack either in the wifi stack - * process, or inside the system server on devices that do not support the wifi stack - * module. - */ - public void start() { - Log.i(TAG, "Starting wifi stack"); - ConnectivityModuleConnector.getInstance().startModuleService( - IWifiStackConnector.class.getName(), PERMISSION_MAINLINE_WIFI_STACK, - new WifiStackConnection()); - } -} diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/common/com/android/internal/telephony/EncodeException.java index cdc853e09895..cdc853e09895 100644 --- a/telephony/java/com/android/internal/telephony/EncodeException.java +++ b/telephony/common/com/android/internal/telephony/EncodeException.java diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 43d9c1102b1a..fbbf75a85a9b 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2713,9 +2713,14 @@ public class SubscriptionManager { if (executor == null || callback == null) { return; } - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(result); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(result); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } } }; iSub.setPreferredDataSubscriptionId(subId, needValidation, callbackStub); @@ -3110,7 +3115,11 @@ public class SubscriptionManager { } /** - * Enables or disables a subscription. This is currently used in the settings page. + * Enables or disables a subscription. This is currently used in the settings page. It will + * fail and return false if operation is not supported or failed. + * + * To disable an active subscription on a physical (non-Euicc) SIM, + * {@link #canDisablePhysicalSubscription} needs to be true. * * <p> * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required @@ -3142,6 +3151,38 @@ public class SubscriptionManager { } /** + * Whether it's supported to disable / re-enable a subscription on a physical (non-euicc) SIM. + * + * Physical SIM refers non-euicc, or aka non-programmable SIM. + * + * It provides whether a physical SIM card can be disabled without taking it out, which is done + * via {@link #setSubscriptionEnabled(int, boolean)} API. + * + * Requires Permission: READ_PRIVILEGED_PHONE_STATE. + * + * @return whether can disable subscriptions on physical SIMs. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) + public boolean canDisablePhysicalSubscription() { + if (VDBG) { + logd("canDisablePhysicalSubscription"); + } + try { + ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); + if (iSub != null) { + return iSub.canDisablePhysicalSubscription(); + } + } catch (RemoteException ex) { + // ignore it + } + + return false; + } + + /** * DO NOT USE. * This API is designed for features that are not finished at this point. Do not call this API. * @hide diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 9f8a213600da..1dd11858b3f8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5682,16 +5682,24 @@ public class TelephonyManager { new ICellInfoCallback.Stub() { @Override public void onCellInfo(List<CellInfo> cellInfo) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> callback.onCellInfo(cellInfo))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> callback.onCellInfo(cellInfo)); + } finally { + Binder.restoreCallingIdentity(identity); + } } @Override public void onError(int errorCode, String exceptionName, String message) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> callback.onError( - errorCode, - createThrowableByClassName(exceptionName, message)))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> callback.onError( + errorCode, + createThrowableByClassName(exceptionName, message))); + } finally { + Binder.restoreCallingIdentity(identity); + } } }, getOpPackageName(), getFeatureId()); } catch (RemoteException ex) { @@ -5724,16 +5732,25 @@ public class TelephonyManager { new ICellInfoCallback.Stub() { @Override public void onCellInfo(List<CellInfo> cellInfo) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> callback.onCellInfo(cellInfo))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> callback.onCellInfo(cellInfo)); + } finally { + Binder.restoreCallingIdentity(identity); + } + } @Override public void onError(int errorCode, String exceptionName, String message) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> callback.onError( - errorCode, - createThrowableByClassName(exceptionName, message)))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> callback.onError( + errorCode, + createThrowableByClassName(exceptionName, message))); + } finally { + Binder.restoreCallingIdentity(identity); + } } }, getOpPackageName(), getFeatureId(), workSource); } catch (RemoteException ex) { @@ -6598,16 +6615,24 @@ public class TelephonyManager { INumberVerificationCallback internalCallback = new INumberVerificationCallback.Stub() { @Override public void onCallReceived(String phoneNumber) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> - callback.onCallReceived(phoneNumber))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> + callback.onCallReceived(phoneNumber)); + } finally { + Binder.restoreCallingIdentity(identity); + } } @Override public void onVerificationFailed(int reason) { - Binder.withCleanCallingIdentity(() -> - executor.execute(() -> - callback.onVerificationFailed(reason))); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> + callback.onVerificationFailed(reason)); + } finally { + Binder.restoreCallingIdentity(identity); + } } }; @@ -11507,9 +11532,14 @@ public class TelephonyManager { if (executor == null || callback == null) { return; } - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(SET_OPPORTUNISTIC_SUB_REMOTE_SERVICE_EXCEPTION); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(SET_OPPORTUNISTIC_SUB_REMOTE_SERVICE_EXCEPTION); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } return; } ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() { @@ -11518,9 +11548,14 @@ public class TelephonyManager { if (executor == null || callback == null) { return; } - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(result); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(result); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } } }; @@ -11594,13 +11629,23 @@ public class TelephonyManager { return; } if (iOpportunisticNetworkService == null) { - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(UPDATE_AVAILABLE_NETWORKS_REMOTE_SERVICE_EXCEPTION); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(UPDATE_AVAILABLE_NETWORKS_REMOTE_SERVICE_EXCEPTION); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } } else { - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } } return; } @@ -11611,9 +11656,14 @@ public class TelephonyManager { if (executor == null || callback == null) { return; } - Binder.withCleanCallingIdentity(() -> executor.execute(() -> { - callback.accept(result); - })); + final long identity = Binder.clearCallingIdentity(); + try { + executor.execute(() -> { + callback.accept(result); + }); + } finally { + Binder.restoreCallingIdentity(identity); + } } }; iOpportunisticNetworkService.updateAvailableNetworks(availableNetworks, callbackStub, diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 151aae89a3ff..c5d58ac24904 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -298,4 +298,6 @@ interface ISub { boolean setAlwaysAllowMmsData(int subId, boolean alwaysAllow); int getActiveDataSubscriptionId(); + + boolean canDisablePhysicalSubscription(); } diff --git a/tests/net/java/com/android/internal/util/BitUtilsTest.java b/tests/net/java/com/android/internal/util/BitUtilsTest.java index 01fb0df2d47e..d2fbdce9771a 100644 --- a/tests/net/java/com/android/internal/util/BitUtilsTest.java +++ b/tests/net/java/com/android/internal/util/BitUtilsTest.java @@ -21,11 +21,14 @@ import static com.android.internal.util.BitUtils.bytesToLEInt; import static com.android.internal.util.BitUtils.getUint16; import static com.android.internal.util.BitUtils.getUint32; import static com.android.internal.util.BitUtils.getUint8; +import static com.android.internal.util.BitUtils.packBits; import static com.android.internal.util.BitUtils.uint16; import static com.android.internal.util.BitUtils.uint32; import static com.android.internal.util.BitUtils.uint8; +import static com.android.internal.util.BitUtils.unpackBits; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -34,6 +37,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) @@ -110,20 +115,66 @@ public class BitUtilsTest { @Test public void testUnsignedGetters() { - ByteBuffer b = ByteBuffer.allocate(4); - b.putInt(0xffff); + ByteBuffer b = ByteBuffer.allocate(4); + b.putInt(0xffff); - assertEquals(0x0, getUint8(b, 0)); - assertEquals(0x0, getUint8(b, 1)); - assertEquals(0xff, getUint8(b, 2)); - assertEquals(0xff, getUint8(b, 3)); + assertEquals(0x0, getUint8(b, 0)); + assertEquals(0x0, getUint8(b, 1)); + assertEquals(0xff, getUint8(b, 2)); + assertEquals(0xff, getUint8(b, 3)); - assertEquals(0x0, getUint16(b, 0)); - assertEquals(0xffff, getUint16(b, 2)); + assertEquals(0x0, getUint16(b, 0)); + assertEquals(0xffff, getUint16(b, 2)); - b.rewind(); - b.putInt(0xffffffff); - assertEquals(0xffffffffL, getUint32(b, 0)); + b.rewind(); + b.putInt(0xffffffff); + assertEquals(0xffffffffL, getUint32(b, 0)); + } + + @Test + public void testBitsPacking() { + BitPackingTestCase[] testCases = { + new BitPackingTestCase(0, ints()), + new BitPackingTestCase(1, ints(0)), + new BitPackingTestCase(2, ints(1)), + new BitPackingTestCase(3, ints(0, 1)), + new BitPackingTestCase(4, ints(2)), + new BitPackingTestCase(6, ints(1, 2)), + new BitPackingTestCase(9, ints(0, 3)), + new BitPackingTestCase(~Long.MAX_VALUE, ints(63)), + new BitPackingTestCase(~Long.MAX_VALUE + 1, ints(0, 63)), + new BitPackingTestCase(~Long.MAX_VALUE + 2, ints(1, 63)), + }; + for (BitPackingTestCase tc : testCases) { + int[] got = unpackBits(tc.packedBits); + assertTrue( + "unpackBits(" + + tc.packedBits + + "): expected " + + Arrays.toString(tc.bits) + + " but got " + + Arrays.toString(got), + Arrays.equals(tc.bits, got)); + } + for (BitPackingTestCase tc : testCases) { + long got = packBits(tc.bits); + assertEquals( + "packBits(" + + Arrays.toString(tc.bits) + + "): expected " + + tc.packedBits + + " but got " + + got, + tc.packedBits, + got); + } + + long[] moreTestCases = { + 0, 1, -1, 23895, -908235, Long.MAX_VALUE, Long.MIN_VALUE, new Random().nextLong(), + }; + for (long l : moreTestCases) { + assertEquals(l, packBits(unpackBits(l))); + } } static byte[] bytes(int b1, int b2, int b3, int b4) { @@ -133,4 +184,18 @@ public class BitUtilsTest { static byte b(int i) { return (byte) i; } + + static int[] ints(int... array) { + return array; + } + + static class BitPackingTestCase { + final int[] bits; + final long packedBits; + + BitPackingTestCase(long packedBits, int[] bits) { + this.bits = bits; + this.packedBits = packedBits; + } + } } diff --git a/tools/aapt2/cmd/Util_test.cpp b/tools/aapt2/cmd/Util_test.cpp index 7e492610b658..2f090bb1c552 100644 --- a/tools/aapt2/cmd/Util_test.cpp +++ b/tools/aapt2/cmd/Util_test.cpp @@ -383,12 +383,13 @@ TEST (UtilTest, AdjustSplitConstraintsForMinSdk) { EXPECT_NE(*adjusted_contraints[1].configs.begin(), ConfigDescription::DefaultConfig()); } -TEST(UtilTest, RegularExperssions) { +// TODO(127793905): Enable test +/*TEST(UtilTest, RegularExperssions) { std::string valid(".bc$"); std::regex expression = GetRegularExpression(valid); EXPECT_TRUE(std::regex_search("file.abc", expression)); EXPECT_TRUE(std::regex_search("file.123bc", expression)); EXPECT_FALSE(std::regex_search("abc.zip", expression)); -} +}*/ } // namespace aapt diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 31d205e1b9c9..6c3bcf039be1 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -428,7 +428,7 @@ void JavaClassGenerator::ProcessStyleable(const ResourceNameRef& name, const Res out_rewrite_method->AppendStatement( StringPrintf(" if ((styleable.%s[i] & 0xff000000) == 0) {", array_field_name.data())); out_rewrite_method->AppendStatement( - StringPrintf(" styleable.%s[i] = (styleable.%s[i] & 0x00ffffff) | (p << 24);", + StringPrintf(" styleable.%s[i] = (styleable.%s[i] & 0x00ffffff) | packageIdBits;", array_field_name.data(), array_field_name.data())); out_rewrite_method->AppendStatement(" }"); out_rewrite_method->AppendStatement("}"); @@ -487,9 +487,9 @@ void JavaClassGenerator::ProcessResource(const ResourceNameRef& name, const Reso if (out_rewrite_method != nullptr) { const StringPiece& type_str = to_string(name.type); - out_rewrite_method->AppendStatement(StringPrintf("%s.%s = (%s.%s & 0x00ffffff) | (p << 24);", - type_str.data(), field_name.data(), - type_str.data(), field_name.data())); + out_rewrite_method->AppendStatement( + StringPrintf("%s.%s = (%s.%s & 0x00ffffff) | packageIdBits;", type_str.data(), + field_name.data(), type_str.data(), field_name.data())); } } @@ -599,6 +599,7 @@ bool JavaClassGenerator::Generate(const StringPiece& package_name_to_generate, rewrite_method->AppendStatement( StringPrintf("%s.R.onResourcesLoaded(p);", package_to_callback.data())); } + rewrite_method->AppendStatement("final int packageIdBits = p << 24;"); } for (const auto& package : table_->packages) { diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 4f51fc48c80e..1e1fe4740c6b 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -522,9 +522,15 @@ TEST(JavaClassGeneratorTest, GenerateOnResourcesLoadedCallbackForSharedLibrary) ASSERT_TRUE(generator.Generate("android", &out)); out.Flush(); - EXPECT_THAT(output, HasSubstr("void onResourcesLoaded")); - EXPECT_THAT(output, HasSubstr("com.foo.R.onResourcesLoaded")); - EXPECT_THAT(output, HasSubstr("com.boo.R.onResourcesLoaded")); + EXPECT_THAT(output, HasSubstr( + R"( public static void onResourcesLoaded(int p) { + com.foo.R.onResourcesLoaded(p); + com.boo.R.onResourcesLoaded(p); + final int packageIdBits = p << 24; + attr.foo = (attr.foo & 0x00ffffff) | packageIdBits; + id.foo = (id.foo & 0x00ffffff) | packageIdBits; + style.foo = (style.foo & 0x00ffffff) | packageIdBits; + })")); } TEST(JavaClassGeneratorTest, OnlyGenerateRText) { diff --git a/wifi/java/android/net/wifi/WifiFrameworkInitializer.java b/wifi/java/android/net/wifi/WifiFrameworkInitializer.java index 775043ae3291..002820b1bcc8 100644 --- a/wifi/java/android/net/wifi/WifiFrameworkInitializer.java +++ b/wifi/java/android/net/wifi/WifiFrameworkInitializer.java @@ -72,7 +72,10 @@ public class WifiFrameworkInitializer { SystemServiceRegistry.registerContextAwareService( Context.WIFI_SERVICE, WifiManager.class, - context -> new WifiManager(context, getInstanceLooper()) + (context, serviceBinder) -> { + IWifiManager service = IWifiManager.Stub.asInterface(serviceBinder); + return new WifiManager(context, service, getInstanceLooper()); + } ); SystemServiceRegistry.registerStaticService( Context.WIFI_P2P_SERVICE, diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 2a0211b77450..6557bbeec039 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -50,7 +50,6 @@ import android.os.HandlerExecutor; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; -import android.os.ServiceManager; import android.os.WorkSource; import android.text.TextUtils; import android.util.Log; @@ -58,7 +57,6 @@ import android.util.Pair; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.ArrayUtils; import com.android.server.net.NetworkPinner; import dalvik.system.CloseGuard; @@ -69,6 +67,7 @@ import java.lang.ref.WeakReference; import java.net.InetAddress; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -1211,46 +1210,24 @@ public class WifiManager { /** * Create a new WifiManager instance. * Applications will almost always want to use - * {@link android.content.Context#getSystemService Context.getSystemService()} to retrieve + * {@link android.content.Context#getSystemService Context.getSystemService} to retrieve * the standard {@link android.content.Context#WIFI_SERVICE Context.WIFI_SERVICE}. * * @param context the application context + * @param service the Binder interface * @param looper the Looper used to deliver callbacks - * - * @hide + * @hide - hide this because it takes in a parameter of type IWifiManager, which + * is a system private class. */ - public WifiManager(@NonNull Context context, @NonNull Looper looper) { + public WifiManager(@NonNull Context context, @NonNull IWifiManager service, + @NonNull Looper looper) { mContext = context; + mService = service; mLooper = looper; mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion; - } - - /** - * This is used only for unit testing. - * @hide - */ - @VisibleForTesting - public WifiManager(Context context, IWifiManager service, Looper looper) { - this(context, looper); - mService = service; updateVerboseLoggingEnabledFromService(); } - private IWifiManager getIWifiManager() { - if (mService == null) { - synchronized (this) { - mService = IWifiManager.Stub.asInterface( - ServiceManager.getService(Context.WIFI_SERVICE)); - if (mService != null) { - updateVerboseLoggingEnabledFromService(); - } else { - Log.e(TAG, "Wifi Service not running yet, ignoring WifiManager API call"); - } - } - } - return mService; - } - /** * Return a list of all the networks configured for the current foreground * user. @@ -1290,10 +1267,8 @@ public class WifiManager { @RequiresPermission(allOf = {ACCESS_FINE_LOCATION, ACCESS_WIFI_STATE}) public List<WifiConfiguration> getConfiguredNetworks() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyList(); ParceledListSlice<WifiConfiguration> parceledList = - iWifiManager.getConfiguredNetworks(mContext.getOpPackageName(), + mService.getConfiguredNetworks(mContext.getOpPackageName(), mContext.getFeatureId()); if (parceledList == null) { return Collections.emptyList(); @@ -1309,10 +1284,8 @@ public class WifiManager { @RequiresPermission(allOf = {ACCESS_FINE_LOCATION, ACCESS_WIFI_STATE, READ_WIFI_CREDENTIAL}) public List<WifiConfiguration> getPrivilegedConfiguredNetworks() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyList(); ParceledListSlice<WifiConfiguration> parceledList = - iWifiManager.getPrivilegedConfiguredNetworks(mContext.getOpPackageName(), + mService.getPrivilegedConfiguredNetworks(mContext.getOpPackageName(), mContext.getFeatureId()); if (parceledList == null) { return Collections.emptyList(); @@ -1344,16 +1317,14 @@ public class WifiManager { @NonNull List<ScanResult> scanResults) { List<Pair<WifiConfiguration, Map<Integer, List<ScanResult>>>> configs = new ArrayList<>(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyList(); Map<String, Map<Integer, List<ScanResult>>> results = - iWifiManager.getAllMatchingFqdnsForScanResults( + mService.getAllMatchingFqdnsForScanResults( scanResults); if (results.isEmpty()) { return configs; } List<WifiConfiguration> wifiConfigurations = - iWifiManager.getWifiConfigsForPasspointProfiles( + mService.getWifiConfigsForPasspointProfiles( new ArrayList<>(results.keySet())); for (WifiConfiguration configuration : wifiConfigurations) { Map<Integer, List<ScanResult>> scanResultsPerNetworkType = results.get( @@ -1388,12 +1359,10 @@ public class WifiManager { public Map<OsuProvider, List<ScanResult>> getMatchingOsuProviders( @Nullable List<ScanResult> scanResults) { if (scanResults == null) { - return Collections.emptyMap(); + return new HashMap<>(); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyMap(); - return iWifiManager.getMatchingOsuProviders(scanResults); + return mService.getMatchingOsuProviders(scanResults); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1420,9 +1389,7 @@ public class WifiManager { public Map<OsuProvider, PasspointConfiguration> getMatchingPasspointConfigsForOsuProviders( @NonNull Set<OsuProvider> osuProviders) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyMap(); - return iWifiManager.getMatchingPasspointConfigsForOsuProviders( + return mService.getMatchingPasspointConfigsForOsuProviders( new ArrayList<>(osuProviders)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1507,9 +1474,7 @@ public class WifiManager { */ private int addOrUpdateNetwork(WifiConfiguration config) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return -1; - return iWifiManager.addOrUpdateNetwork(config, mContext.getOpPackageName()); + return mService.addOrUpdateNetwork(config, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1756,11 +1721,7 @@ public class WifiManager { Binder binder = new Binder(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.registerNetworkRequestMatchCallback( + mService.registerNetworkRequestMatchCallback( binder, new NetworkRequestMatchCallbackProxy(executor, callback), callback.hashCode()); } catch (RemoteException e) { @@ -1787,11 +1748,7 @@ public class WifiManager { Log.v(TAG, "unregisterNetworkRequestMatchCallback: callback=" + callback); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.unregisterNetworkRequestMatchCallback(callback.hashCode()); + mService.unregisterNetworkRequestMatchCallback(callback.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1824,9 +1781,7 @@ public class WifiManager { public @NetworkSuggestionsStatusCode int addNetworkSuggestions( @NonNull List<WifiNetworkSuggestion> networkSuggestions) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL; - return iWifiManager.addNetworkSuggestions( + return mService.addNetworkSuggestions( networkSuggestions, mContext.getOpPackageName(), mContext.getFeatureId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1835,8 +1790,9 @@ public class WifiManager { /** * Remove some or all of the network suggestions that were previously provided by the app. - * If the current network is a suggestion being removed and if it was only provided by this app - * and is not a saved network then the framework will immediately disconnect. + * If one of the suggestions being removed was used to establish connection to the current + * network, then the device will immediately disconnect from that network. + * * See {@link WifiNetworkSuggestion} for a detailed explanation of the parameters. * See {@link WifiNetworkSuggestion#equals(Object)} for the equivalence evaluation used. * @@ -1850,9 +1806,7 @@ public class WifiManager { public @NetworkSuggestionsStatusCode int removeNetworkSuggestions( @NonNull List<WifiNetworkSuggestion> networkSuggestions) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL; - return iWifiManager.removeNetworkSuggestions( + return mService.removeNetworkSuggestions( networkSuggestions, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1868,9 +1822,7 @@ public class WifiManager { @RequiresPermission(ACCESS_WIFI_STATE) public @NonNull List<WifiNetworkSuggestion> getNetworkSuggestions() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyList(); - return iWifiManager.getNetworkSuggestions(mContext.getOpPackageName()); + return mService.getNetworkSuggestions(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } @@ -1900,13 +1852,7 @@ public class WifiManager { */ public void addOrUpdatePasspointConfiguration(PasspointConfiguration config) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (config == null) return; - throw new RemoteException("Wifi service is not running"); - } - if (!iWifiManager.addOrUpdatePasspointConfiguration( - config, mContext.getOpPackageName())) { + if (!mService.addOrUpdatePasspointConfiguration(config, mContext.getOpPackageName())) { throw new IllegalArgumentException(); } } catch (RemoteException e) { @@ -1930,13 +1876,7 @@ public class WifiManager { }) public void removePasspointConfiguration(String fqdn) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (TextUtils.isEmpty(fqdn)) return; - throw new RemoteException("Wifi service is not running"); - } - if (!iWifiManager.removePasspointConfiguration( - fqdn, mContext.getOpPackageName())) { + if (!mService.removePasspointConfiguration(fqdn, mContext.getOpPackageName())) { throw new IllegalArgumentException(); } } catch (RemoteException e) { @@ -1959,9 +1899,7 @@ public class WifiManager { }) public List<PasspointConfiguration> getPasspointConfigurations() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) Collections.emptyList(); - return iWifiManager.getPasspointConfigurations(mContext.getOpPackageName()); + return mService.getPasspointConfigurations(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1981,12 +1919,7 @@ public class WifiManager { */ public void queryPasspointIcon(long bssid, String fileName) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (bssid == 0L || TextUtils.isEmpty(fileName)) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.queryPasspointIcon(bssid, fileName); + mService.queryPasspointIcon(bssid, fileName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2000,9 +1933,7 @@ public class WifiManager { */ public int matchProviderWithCurrentNetwork(String fqdn) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return -1; - return iWifiManager.matchProviderWithCurrentNetwork(fqdn); + return mService.matchProviderWithCurrentNetwork(fqdn); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2018,11 +1949,7 @@ public class WifiManager { */ public void deauthenticateNetwork(long holdoff, boolean ess) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.deauthenticateNetwork(holdoff, ess); + mService.deauthenticateNetwork(holdoff, ess); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2052,9 +1979,7 @@ public class WifiManager { @Deprecated public boolean removeNetwork(int netId) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.removeNetwork(netId, mContext.getOpPackageName()); + return mService.removeNetwork(netId, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2109,10 +2034,7 @@ public class WifiManager { boolean success; try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - success = iWifiManager.enableNetwork( - netId, attemptConnect, mContext.getOpPackageName()); + success = mService.enableNetwork(netId, attemptConnect, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2148,9 +2070,7 @@ public class WifiManager { @Deprecated public boolean disableNetwork(int netId) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.disableNetwork(netId, mContext.getOpPackageName()); + return mService.disableNetwork(netId, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2173,9 +2093,7 @@ public class WifiManager { @Deprecated public boolean disconnect() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.disconnect(mContext.getOpPackageName()); + return mService.disconnect(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2199,9 +2117,7 @@ public class WifiManager { @Deprecated public boolean reconnect() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.reconnect(mContext.getOpPackageName()); + return mService.reconnect(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2225,9 +2141,7 @@ public class WifiManager { @Deprecated public boolean reassociate() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.reassociate(mContext.getOpPackageName()); + return mService.reassociate(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2323,9 +2237,7 @@ public class WifiManager { private long getSupportedFeatures() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return 0L; - return iWifiManager.getSupportedFeatures(); + return mService.getSupportedFeatures(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2482,10 +2394,8 @@ public class WifiManager { */ public WifiActivityEnergyInfo getControllerActivityEnergyInfo() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; synchronized(this) { - return iWifiManager.reportActivityInfo(); + return mService.reportActivityInfo(); } } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2524,11 +2434,9 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public boolean startScan(WorkSource workSource) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; String packageName = mContext.getOpPackageName(); String featureId = mContext.getFeatureId(); - return iWifiManager.startScan(packageName, featureId); + return mService.startScan(packageName, featureId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2557,9 +2465,7 @@ public class WifiManager { */ public WifiInfo getConnectionInfo() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; - return iWifiManager.getConnectionInfo(mContext.getOpPackageName(), + return mService.getConnectionInfo(mContext.getOpPackageName(), mContext.getFeatureId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2574,9 +2480,7 @@ public class WifiManager { */ public List<ScanResult> getScanResults() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return Collections.emptyList(); - return iWifiManager.getScanResults(mContext.getOpPackageName(), + return mService.getScanResults(mContext.getOpPackageName(), mContext.getFeatureId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2596,9 +2500,7 @@ public class WifiManager { @Deprecated public boolean isScanAlwaysAvailable() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.isScanAlwaysAvailable(); + return mService.isScanAlwaysAvailable(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2631,9 +2533,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public String getCountryCode() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; - return iWifiManager.getCountryCode(); + return mService.getCountryCode(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2648,9 +2548,7 @@ public class WifiManager { @SystemApi public boolean isDualBandSupported() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.isDualBandSupported(); + return mService.isDualBandSupported(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2673,9 +2571,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean isDualModeSupported() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.needs5GHzToAnyApBandConversion(); + return mService.needs5GHzToAnyApBandConversion(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2688,9 +2584,7 @@ public class WifiManager { */ public DhcpInfo getDhcpInfo() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; - return iWifiManager.getDhcpInfo(); + return mService.getDhcpInfo(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2717,9 +2611,7 @@ public class WifiManager { @Deprecated public boolean setWifiEnabled(boolean enabled) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.setWifiEnabled(mContext.getOpPackageName(), enabled); + return mService.setWifiEnabled(mContext.getOpPackageName(), enabled); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2734,9 +2626,7 @@ public class WifiManager { */ public int getWifiState() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return WIFI_STATE_UNKNOWN; - return iWifiManager.getWifiEnabledState(); + return mService.getWifiEnabledState(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2764,11 +2654,7 @@ public class WifiManager { TxPacketCountListenerProxy listenerProxy = new TxPacketCountListenerProxy(mLooper, listener); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.getTxPacketCount(mContext.getOpPackageName(), binder, listenerProxy, + mService.getTxPacketCount(mContext.getOpPackageName(), binder, listenerProxy, listener.hashCode()); } catch (RemoteException e) { listenerProxy.onFailure(ERROR); @@ -2811,11 +2697,7 @@ public class WifiManager { */ public int calculateSignalLevel(int rssi) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - return iWifiManager.calculateSignalLevel(rssi); + return mService.calculateSignalLevel(rssi); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2861,12 +2743,7 @@ public class WifiManager { }) public void updateInterfaceIpState(@Nullable String ifaceName, @IfaceIpMode int mode) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (TextUtils.isEmpty(ifaceName) || mode == IFACE_IP_MODE_UNSPECIFIED) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.updateInterfaceIpState(ifaceName, mode); + mService.updateInterfaceIpState(ifaceName, mode); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2890,9 +2767,7 @@ public class WifiManager { }) public boolean startSoftAp(@Nullable WifiConfiguration wifiConfig) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.startSoftAp(wifiConfig); + return mService.startSoftAp(wifiConfig); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2912,9 +2787,7 @@ public class WifiManager { }) public boolean stopSoftAp() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.stopSoftAp(); + return mService.stopSoftAp(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3032,13 +2905,9 @@ public class WifiManager { LocalOnlyHotspotCallbackProxy proxy = new LocalOnlyHotspotCallbackProxy(this, executor, callback); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } String packageName = mContext.getOpPackageName(); String featureId = mContext.getFeatureId(); - int returnCode = iWifiManager.startLocalOnlyHotspot(proxy, packageName, featureId, + int returnCode = mService.startLocalOnlyHotspot(proxy, packageName, featureId, config); if (returnCode != LocalOnlyHotspotCallback.REQUEST_REGISTERED) { // Send message to the proxy to make sure we call back on the correct thread @@ -3090,11 +2959,7 @@ public class WifiManager { } mLOHSCallbackProxy = null; try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.stopLocalOnlyHotspot(); + mService.stopLocalOnlyHotspot(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3126,11 +2991,7 @@ public class WifiManager { mLOHSObserverProxy = new LocalOnlyHotspotObserverProxy(this, executor, observer); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.startWatchLocalOnlyHotspot(mLOHSObserverProxy); + mService.startWatchLocalOnlyHotspot(mLOHSObserverProxy); mLOHSObserverProxy.registered(); } catch (RemoteException e) { mLOHSObserverProxy = null; @@ -3153,11 +3014,7 @@ public class WifiManager { } mLOHSObserverProxy = null; try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.stopWatchLocalOnlyHotspot(); + mService.stopWatchLocalOnlyHotspot(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3177,9 +3034,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return WIFI_AP_STATE_FAILED; - return iWifiManager.getWifiApEnabledState(); + return mService.getWifiApEnabledState(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3208,9 +3063,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public WifiConfiguration getWifiApConfiguration() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; - return iWifiManager.getWifiApConfiguration(); + return mService.getWifiApConfiguration(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3227,10 +3080,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(WifiConfiguration wifiConfig) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.setWifiApConfiguration( - wifiConfig, mContext.getOpPackageName()); + return mService.setWifiApConfiguration(wifiConfig, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3258,12 +3108,7 @@ public class WifiManager { */ public void setTdlsEnabled(InetAddress remoteIPAddress, boolean enable) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (remoteIPAddress == null || !enable) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.enableTdls(remoteIPAddress.getHostAddress(), enable); + mService.enableTdls(remoteIPAddress.getHostAddress(), enable); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3277,12 +3122,7 @@ public class WifiManager { */ public void setTdlsEnabledWithMacAddress(String remoteMacAddress, boolean enable) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (TextUtils.isEmpty(remoteMacAddress) || !enable) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.enableTdlsWithMacAddress(remoteMacAddress, enable); + mService.enableTdlsWithMacAddress(remoteMacAddress, enable); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3573,11 +3413,7 @@ public class WifiManager { Binder binder = new Binder(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.registerSoftApCallback( + mService.registerSoftApCallback( binder, new SoftApCallbackProxy(executor, callback), callback.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3599,11 +3435,7 @@ public class WifiManager { Log.v(TAG, "unregisterSoftApCallback: callback=" + callback); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.unregisterSoftApCallback(callback.hashCode()); + mService.unregisterSoftApCallback(callback.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3931,11 +3763,7 @@ public class WifiManager { binder = new Binder(); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.connect(config, networkId, binder, listenerProxy, + mService.connect(config, networkId, binder, listenerProxy, listener == null ? 0 : listener.hashCode()); } catch (RemoteException e) { if (listenerProxy != null) listenerProxy.onFailure(ERROR); @@ -4028,11 +3856,7 @@ public class WifiManager { binder = new Binder(); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.save(config, binder, listenerProxy, + mService.save(config, binder, listenerProxy, listener == null ? 0 : listener.hashCode()); } catch (RemoteException e) { if (listenerProxy != null) listenerProxy.onFailure(ERROR); @@ -4069,11 +3893,7 @@ public class WifiManager { binder = new Binder(); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.forget(netId, binder, listenerProxy, + mService.forget(netId, binder, listenerProxy, listener == null ? 0 : listener.hashCode()); } catch (RemoteException e) { if (listenerProxy != null) listenerProxy.onFailure(ERROR); @@ -4126,11 +3946,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void allowAutojoin(int netId, boolean choice) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.allowAutojoin(netId, choice); + mService.allowAutojoin(netId, choice); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4153,11 +3969,7 @@ public class WifiManager { throw new IllegalArgumentException("SSID cannot be null or empty!"); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.disableEphemeralNetwork(ssid, mContext.getOpPackageName()); + mService.disableEphemeralNetwork(ssid, mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4245,14 +4057,10 @@ public class WifiManager { synchronized (mBinder) { if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.acquireWifiLock(mBinder, mLockType, mTag, mWorkSource); + mService.acquireWifiLock(mBinder, mLockType, mTag, mWorkSource); synchronized (WifiManager.this) { if (mActiveLockCount >= MAX_ACTIVE_LOCKS) { - iWifiManager.releaseWifiLock(mBinder); + mService.releaseWifiLock(mBinder); throw new UnsupportedOperationException( "Exceeded maximum number of wifi locks"); } @@ -4282,11 +4090,7 @@ public class WifiManager { synchronized (mBinder) { if (mRefCounted ? (--mRefCount == 0) : (mHeld)) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.releaseWifiLock(mBinder); + mService.releaseWifiLock(mBinder); synchronized (WifiManager.this) { mActiveLockCount--; } @@ -4349,11 +4153,7 @@ public class WifiManager { } if (changed && mHeld) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.updateWifiLockWorkSource(mBinder, mWorkSource); + mService.updateWifiLockWorkSource(mBinder, mWorkSource); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4381,11 +4181,7 @@ public class WifiManager { synchronized (mBinder) { if (mHeld) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.releaseWifiLock(mBinder); + mService.releaseWifiLock(mBinder); synchronized (WifiManager.this) { mActiveLockCount--; } @@ -4498,14 +4294,10 @@ public class WifiManager { synchronized (mBinder) { if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.acquireMulticastLock(mBinder, mTag); + mService.acquireMulticastLock(mBinder, mTag); synchronized (WifiManager.this) { if (mActiveLockCount >= MAX_ACTIVE_LOCKS) { - iWifiManager.releaseMulticastLock(mTag); + mService.releaseMulticastLock(mTag); throw new UnsupportedOperationException( "Exceeded maximum number of wifi locks"); } @@ -4547,11 +4339,7 @@ public class WifiManager { synchronized (mBinder) { if (mRefCounted ? (--mRefCount == 0) : (mHeld)) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.releaseMulticastLock(mTag); + mService.releaseMulticastLock(mTag); synchronized (WifiManager.this) { mActiveLockCount--; } @@ -4628,9 +4416,7 @@ public class WifiManager { */ public boolean isMulticastEnabled() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - return iWifiManager.isMulticastEnabled(); + return mService.isMulticastEnabled(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4643,9 +4429,7 @@ public class WifiManager { @UnsupportedAppUsage public boolean initializeMulticastFiltering() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return false; - iWifiManager.initializeMulticastFiltering(); + mService.initializeMulticastFiltering(); return true; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -4664,12 +4448,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void enableVerboseLogging (int verbose) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (verbose == 0) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.enableVerboseLogging(verbose); + mService.enableVerboseLogging(verbose); } catch (Exception e) { //ignore any failure here Log.e(TAG, "enableVerboseLogging " + e.toString()); @@ -4688,9 +4467,7 @@ public class WifiManager { @SystemApi public int getVerboseLoggingLevel() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return -1; - return iWifiManager.getVerboseLoggingLevel(); + return mService.getVerboseLoggingLevel(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4706,11 +4483,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.factoryReset(mContext.getOpPackageName()); + mService.factoryReset(mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4725,9 +4498,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public Network getCurrentNetwork() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return null; - return iWifiManager.getCurrentNetwork(); + return mService.getCurrentNetwork(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4759,12 +4530,7 @@ public class WifiManager { */ public void enableWifiConnectivityManager(boolean enabled) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (enabled) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.enableWifiConnectivityManager(enabled); + mService.enableWifiConnectivityManager(enabled); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4781,9 +4547,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveBackupData() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return new byte[0]; - return iWifiManager.retrieveBackupData(); + return mService.retrieveBackupData(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4798,12 +4562,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreBackupData(@NonNull byte[] data) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (ArrayUtils.isEmpty(data)) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.restoreBackupData(data); + mService.restoreBackupData(data); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4824,12 +4583,7 @@ public class WifiManager { public void restoreSupplicantBackupData( @NonNull byte[] supplicantData, @NonNull byte[] ipConfigData) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (ArrayUtils.isEmpty(supplicantData) && ArrayUtils.isEmpty(ipConfigData)) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.restoreSupplicantBackupData(supplicantData, ipConfigData); + mService.restoreSupplicantBackupData(supplicantData, ipConfigData); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4858,11 +4612,7 @@ public class WifiManager { throw new IllegalArgumentException("callback must not be null"); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.startSubscriptionProvisioning(provider, + mService.startSubscriptionProvisioning(provider, new ProvisioningCallbackProxy(executor, callback)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -4996,11 +4746,7 @@ public class WifiManager { Binder binder = new Binder(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.registerTrafficStateCallback( + mService.registerTrafficStateCallback( binder, new TrafficStateCallbackProxy(executor, callback), callback.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -5021,11 +4767,7 @@ public class WifiManager { Log.v(TAG, "unregisterTrafficStateCallback: callback=" + callback); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.unregisterTrafficStateCallback(callback.hashCode()); + mService.unregisterTrafficStateCallback(callback.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5083,9 +4825,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) return new String[0]; - return iWifiManager.getFactoryMacAddresses(); + return mService.getFactoryMacAddresses(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5154,12 +4894,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.WIFI_SET_DEVICE_MOBILITY_STATE) public void setDeviceMobilityState(@DeviceMobilityState int state) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - if (state == DEVICE_MOBILITY_STATE_UNKNOWN) return; - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.setDeviceMobilityState(state); + mService.setDeviceMobilityState(state); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5214,13 +4949,8 @@ public class WifiManager { @NonNull EasyConnectStatusCallback callback) { Binder binder = new Binder(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.startDppAsConfiguratorInitiator( - binder, enrolleeUri, selectedNetworkId, enrolleeNetworkRole, - new EasyConnectCallbackProxy(executor, callback)); + mService.startDppAsConfiguratorInitiator(binder, enrolleeUri, selectedNetworkId, + enrolleeNetworkRole, new EasyConnectCallbackProxy(executor, callback)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5245,11 +4975,7 @@ public class WifiManager { @NonNull EasyConnectStatusCallback callback) { Binder binder = new Binder(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.startDppAsEnrolleeInitiator(binder, configuratorUri, + mService.startDppAsEnrolleeInitiator(binder, configuratorUri, new EasyConnectCallbackProxy(executor, callback)); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -5270,12 +4996,8 @@ public class WifiManager { android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void stopEasyConnectSession() { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } /* Request lower layers to stop/abort and clear resources */ - iWifiManager.stopDppSession(); + mService.stopDppSession(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5374,11 +5096,7 @@ public class WifiManager { Log.v(TAG, "addOnWifiUsabilityStatsListener: listener=" + listener); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.addOnWifiUsabilityStatsListener(new Binder(), + mService.addOnWifiUsabilityStatsListener(new Binder(), new IOnWifiUsabilityStatsListener.Stub() { @Override public void onWifiUsabilityStats(int seqNum, boolean isSameBssidAndFreq, @@ -5415,11 +5133,7 @@ public class WifiManager { Log.v(TAG, "removeOnWifiUsabilityStatsListener: listener=" + listener); } try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.removeOnWifiUsabilityStatsListener(listener.hashCode()); + mService.removeOnWifiUsabilityStatsListener(listener.hashCode()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5442,11 +5156,7 @@ public class WifiManager { @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void updateWifiUsabilityScore(int seqNum, int score, int predictionHorizonSec) { try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.updateWifiUsabilityScore(seqNum, score, predictionHorizonSec); + mService.updateWifiUsabilityScore(seqNum, score, predictionHorizonSec); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5545,11 +5255,7 @@ public class WifiManager { ScanResultsCallback.ScanResultsCallbackProxy proxy = callback.getProxy(); proxy.initProxy(executor, callback); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.registerScanResultsCallback(proxy); + mService.registerScanResultsCallback(proxy); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5567,11 +5273,7 @@ public class WifiManager { Log.v(TAG, "unregisterScanResultsCallback: Callback=" + callback); ScanResultsCallback.ScanResultsCallbackProxy proxy = callback.getProxy(); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.unregisterScanResultsCallback(proxy); + mService.unregisterScanResultsCallback(proxy); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } finally { @@ -5647,11 +5349,7 @@ public class WifiManager { Log.v(TAG, "addSuggestionConnectionStatusListener listener=" + listener + ", executor=" + executor); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.registerSuggestionConnectionStatusListener(new Binder(), + mService.registerSuggestionConnectionStatusListener(new Binder(), new SuggestionConnectionStatusListenerProxy(executor, listener), listener.hashCode(), mContext.getOpPackageName(), mContext.getFeatureId()); } catch (RemoteException e) { @@ -5672,11 +5370,7 @@ public class WifiManager { if (listener == null) throw new IllegalArgumentException("Listener cannot be null"); Log.v(TAG, "removeSuggestionConnectionStatusListener: listener=" + listener); try { - IWifiManager iWifiManager = getIWifiManager(); - if (iWifiManager == null) { - throw new RemoteException("Wifi service is not running"); - } - iWifiManager.unregisterSuggestionConnectionStatusListener(listener.hashCode(), + mService.unregisterSuggestionConnectionStatusListener(listener.hashCode(), mContext.getOpPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); |