Merge "8/ Updating bubbles to run on shell thread" into sc-dev
diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
index d4ee9bb..f6a1b8a 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -151,7 +151,8 @@
static final boolean DEBUG_BG_LIMIT = localLOGV || false;
static final boolean DEBUG_STANDBY = localLOGV || false;
static final boolean RECORD_ALARMS_IN_HISTORY = true;
- static final boolean RECORD_DEVICE_IDLE_ALARMS = false;
+ // TODO(b/178484639) : Turn off once alarms and reminders work is complete.
+ static final boolean RECORD_DEVICE_IDLE_ALARMS = true;
static final String TIMEZONE_PROPERTY = "persist.sys.timezone";
static final int TICK_HISTORY_DEPTH = 10;
@@ -1731,8 +1732,8 @@
if (RECORD_DEVICE_IDLE_ALARMS) {
IdleDispatchEntry ent = new IdleDispatchEntry();
ent.uid = a.uid;
- ent.pkg = a.operation.getCreatorPackage();
- ent.tag = a.operation.getTag("");
+ ent.pkg = a.sourcePackage;
+ ent.tag = a.statsTag;
ent.op = "START IDLE";
ent.elapsedRealtime = mInjector.getElapsedRealtime();
ent.argRealtime = a.getWhenElapsed();
@@ -3151,8 +3152,8 @@
if (RECORD_DEVICE_IDLE_ALARMS) {
IdleDispatchEntry ent = new IdleDispatchEntry();
ent.uid = alarm.uid;
- ent.pkg = alarm.operation.getCreatorPackage();
- ent.tag = alarm.operation.getTag("");
+ ent.pkg = alarm.sourcePackage;
+ ent.tag = alarm.statsTag;
ent.op = "END IDLE";
ent.elapsedRealtime = mInjector.getElapsedRealtime();
ent.argRealtime = alarm.getWhenElapsed();
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 0915d07..2b9f171 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -157,6 +157,7 @@
package android.net {
public class ConnectivityManager {
+ method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @Nullable android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);
}
@@ -164,6 +165,14 @@
method public int getResourceId();
}
+ public final class NetworkAgentConfig implements android.os.Parcelable {
+ method @Nullable public String getSubscriberId();
+ }
+
+ public static final class NetworkAgentConfig.Builder {
+ method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);
+ }
+
public final class NetworkCapabilities implements android.os.Parcelable {
field public static final int TRANSPORT_TEST = 7; // 0x7
}
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 0a0f77e..f40bf5d 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1628,8 +1628,10 @@
package android.apphibernation {
public final class AppHibernationManager {
- method public boolean isHibernating(@NonNull String);
- method public void setHibernating(@NonNull String, boolean);
+ method public boolean isHibernatingForUser(@NonNull String);
+ method public boolean isHibernatingGlobally(@NonNull String);
+ method public void setHibernatingForUser(@NonNull String, boolean);
+ method public void setHibernatingGlobally(@NonNull String, boolean);
}
}
@@ -2608,6 +2610,17 @@
public class FontManager {
method @Nullable public android.text.FontConfig getFontConfig();
+ method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.os.ParcelFileDescriptor, @NonNull byte[], @IntRange(from=0) int);
+ field public static final int RESULT_ERROR_DOWNGRADING = -5; // 0xfffffffb
+ field public static final int RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE = -1; // 0xffffffff
+ field public static final int RESULT_ERROR_FAILED_UPDATE_CONFIG = -6; // 0xfffffffa
+ field public static final int RESULT_ERROR_FONT_UPDATER_DISABLED = -7; // 0xfffffff9
+ field public static final int RESULT_ERROR_INVALID_FONT_FILE = -3; // 0xfffffffd
+ field public static final int RESULT_ERROR_INVALID_FONT_NAME = -4; // 0xfffffffc
+ field public static final int RESULT_ERROR_REMOTE_EXCEPTION = -9; // 0xfffffff7
+ field public static final int RESULT_ERROR_VERIFICATION_FAILURE = -2; // 0xfffffffe
+ field public static final int RESULT_ERROR_VERSION_MISMATCH = -8; // 0xfffffff8
+ field public static final int RESULT_SUCCESS = 0; // 0x0
}
}
@@ -13660,7 +13673,9 @@
public final class FontConfig implements android.os.Parcelable {
method public int describeContents();
method @NonNull public java.util.List<android.text.FontConfig.Alias> getAliases();
+ method @IntRange(from=0) public int getConfigVersion();
method @NonNull public java.util.List<android.text.FontConfig.FontFamily> getFontFamilies();
+ method public long getLastModifiedTimeMillis();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.text.FontConfig> CREATOR;
}
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index ea7dc03..445824a 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -281,6 +281,7 @@
}
public final class PendingIntent implements android.os.Parcelable {
+ method @Nullable @RequiresPermission("android.permission.GET_INTENT_SENDER_INTENT") public java.util.List<android.content.pm.ResolveInfo> queryIntentComponents(int);
field @Deprecated public static final int FLAG_MUTABLE_UNAUDITED = 33554432; // 0x2000000
}
@@ -825,6 +826,17 @@
public class FontManager {
method @Nullable public android.text.FontConfig getFontConfig();
+ method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.os.ParcelFileDescriptor, @NonNull byte[], @IntRange(from=0) int);
+ field public static final int RESULT_ERROR_DOWNGRADING = -5; // 0xfffffffb
+ field public static final int RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE = -1; // 0xffffffff
+ field public static final int RESULT_ERROR_FAILED_UPDATE_CONFIG = -6; // 0xfffffffa
+ field public static final int RESULT_ERROR_FONT_UPDATER_DISABLED = -7; // 0xfffffff9
+ field public static final int RESULT_ERROR_INVALID_FONT_FILE = -3; // 0xfffffffd
+ field public static final int RESULT_ERROR_INVALID_FONT_NAME = -4; // 0xfffffffc
+ field public static final int RESULT_ERROR_REMOTE_EXCEPTION = -9; // 0xfffffff7
+ field public static final int RESULT_ERROR_VERIFICATION_FAILURE = -2; // 0xfffffffe
+ field public static final int RESULT_ERROR_VERSION_MISMATCH = -8; // 0xfffffff8
+ field public static final int RESULT_SUCCESS = 0; // 0x0
}
}
@@ -2032,7 +2044,9 @@
public final class FontConfig implements android.os.Parcelable {
method public int describeContents();
method @NonNull public java.util.List<android.text.FontConfig.Alias> getAliases();
+ method @IntRange(from=0) public int getConfigVersion();
method @NonNull public java.util.List<android.text.FontConfig.FontFamily> getFontFamilies();
+ method public long getLastModifiedTimeMillis();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.text.FontConfig> CREATOR;
}
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
index afa1560..e6aa7a7 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -47,8 +47,19 @@
per-file *Zen* = file:/packages/SystemUI/OWNERS
per-file *StatusBar* = file:/packages/SystemUI/OWNERS
+# PackageManager
+per-file ApplicationPackageManager.java = file:/services/core/java/com/android/server/pm/OWNERS
+per-file InstantAppResolverService.java = file:/services/core/java/com/android/server/pm/OWNERS
+per-file LoadedApk.java = file:/services/core/java/com/android/server/pm/OWNERS
+per-file PackageDeleteObserver.java = file:/services/core/java/com/android/server/pm/OWNERS
+per-file PackageInstallObserver.java = file:/services/core/java/com/android/server/pm/OWNERS
+per-file EphemeralResolveInfo.aidl = file:/services/core/java/com/android/server/pm/OWNERS
+per-file IEphemeralResolver.aidl = file:/services/core/java/com/android/server/pm/OWNERS
+per-file IInstantAppResolver.aidl = file:/services/core/java/com/android/server/pm/OWNERS
+per-file InstantAppResolveInfo.aidl = file:/services/core/java/com/android/server/pm/OWNERS
+
# ResourcesManager
-per-file ResourcesManager = rtmitchell@google.com, toddke@google.com
+per-file ResourcesManager.java = rtmitchell@google.com, toddke@google.com
# VoiceInteraction
per-file *VoiceInteract* = file:/core/java/android/service/voice/OWNERS
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java
index 8635222..534f3e2 100644
--- a/core/java/android/app/PendingIntent.java
+++ b/core/java/android/app/PendingIntent.java
@@ -1277,6 +1277,7 @@
*/
@RequiresPermission(permission.GET_INTENT_SENDER_INTENT)
@SystemApi(client = Client.MODULE_LIBRARIES)
+ @TestApi
public @Nullable List<ResolveInfo> queryIntentComponents(@ResolveInfoFlags int flags) {
try {
return ActivityManager.getService()
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index d5f0149..1498dae7 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -72,6 +72,7 @@
import android.content.rollback.RollbackManagerFrameworkInitializer;
import android.debug.AdbManager;
import android.debug.IAdbManager;
+import android.graphics.GameManager;
import android.graphics.fonts.FontManager;
import android.hardware.ConsumerIrManager;
import android.hardware.ISerialManager;
@@ -1426,6 +1427,16 @@
return new MediaMetricsManager(service, ctx.getUserId());
}});
+ registerService(Context.GAME_SERVICE, GameManager.class,
+ new CachedServiceFetcher<GameManager>() {
+ @Override
+ public GameManager createService(ContextImpl ctx)
+ throws ServiceNotFoundException {
+ return new GameManager(ctx.getOuterContext(),
+ ctx.mMainThread.getHandler());
+ }
+ });
+
sInitializing = true;
try {
// Note: the following functions need to be @SystemApis, once they become mainline
diff --git a/core/java/android/apphibernation/AppHibernationManager.java b/core/java/android/apphibernation/AppHibernationManager.java
index 8f1934c..7281d50 100644
--- a/core/java/android/apphibernation/AppHibernationManager.java
+++ b/core/java/android/apphibernation/AppHibernationManager.java
@@ -49,31 +49,61 @@
}
/**
- * Returns true if the package is hibernating, false otherwise.
+ * Returns true if the package is hibernating for this context's user, false otherwise.
*
* @hide
*/
@SystemApi
- public boolean isHibernating(@NonNull String packageName) {
+ public boolean isHibernatingForUser(@NonNull String packageName) {
try {
- return mIAppHibernationService.isHibernating(packageName, mContext.getUserId());
+ return mIAppHibernationService.isHibernatingForUser(packageName, mContext.getUserId());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
- * Set whether the package is hibernating.
+ * Set whether the package is hibernating for this context's user.
*
* @hide
*/
@SystemApi
- public void setHibernating(@NonNull String packageName, boolean isHibernating) {
+ public void setHibernatingForUser(@NonNull String packageName, boolean isHibernating) {
try {
- mIAppHibernationService.setHibernating(packageName, mContext.getUserId(),
+ mIAppHibernationService.setHibernatingForUser(packageName, mContext.getUserId(),
isHibernating);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
+
+ /**
+ * Returns true if app is hibernating globally / at the package level.
+ *
+ * @hide
+ */
+ @SystemApi
+ public boolean isHibernatingGlobally(@NonNull String packageName) {
+ try {
+ return mIAppHibernationService.isHibernatingGlobally(packageName);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Set whether a package should be globally hibernating. This hibernates the package at a
+ * package level. User-level hibernation (e.g.. {@link #isHibernatingForUser} is independent
+ * from global hibernation.
+ *
+ * @hide
+ */
+ @SystemApi
+ public void setHibernatingGlobally(@NonNull String packageName, boolean isHibernating) {
+ try {
+ mIAppHibernationService.setHibernatingGlobally(packageName, isHibernating);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
}
diff --git a/core/java/android/apphibernation/IAppHibernationService.aidl b/core/java/android/apphibernation/IAppHibernationService.aidl
index db57ecb..6a068ee 100644
--- a/core/java/android/apphibernation/IAppHibernationService.aidl
+++ b/core/java/android/apphibernation/IAppHibernationService.aidl
@@ -21,6 +21,8 @@
* @hide
*/
interface IAppHibernationService {
- boolean isHibernating(String packageName, int userId);
- void setHibernating(String packageName, int userId, boolean isHibernating);
+ boolean isHibernatingForUser(String packageName, int userId);
+ void setHibernatingForUser(String packageName, int userId, boolean isHibernating);
+ boolean isHibernatingGlobally(String packageName);
+ void setHibernatingGlobally(String packageName, boolean isHibernating);
}
\ No newline at end of file
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 0c50446..6a2329e 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5418,6 +5418,16 @@
public static final String SPEECH_RECOGNITION_SERVICE = "speech_recognition";
/**
+ * Use with {@link #getSystemService(String)} to retrieve a
+ * {@link android.graphics.GameManager}.
+ *
+ * @see #getSystemService(String)
+ *
+ * @hide
+ */
+ public static final String GAME_SERVICE = "game";
+
+ /**
* Determine whether the given permission is allowed for a particular
* process and user ID running in the system.
*
diff --git a/core/java/android/graphics/fonts/FontManager.java b/core/java/android/graphics/fonts/FontManager.java
index eca56b3..f0b218c 100644
--- a/core/java/android/graphics/fonts/FontManager.java
+++ b/core/java/android/graphics/fonts/FontManager.java
@@ -16,13 +16,17 @@
package android.graphics.fonts;
+import android.Manifest;
import android.annotation.IntDef;
+import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.content.Context;
+import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.text.FontConfig;
import android.util.Log;
@@ -35,6 +39,10 @@
/**
* This class gives you control of system installed font files.
+ *
+ * <p>
+ * This class gives you the information of system font configuration and ability of changing them.
+ *
* @hide
*/
@SystemApi
@@ -45,68 +53,87 @@
private final @NonNull IFontManager mIFontManager;
/** @hide */
- @IntDef(prefix = "ERROR_CODE_",
- value = { ERROR_CODE_OK, ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
- ERROR_CODE_VERIFICATION_FAILURE, ERROR_CODE_FONT_NAME_MISMATCH,
- ERROR_CODE_INVALID_FONT_FILE, ERROR_CODE_MISSING_POST_SCRIPT_NAME,
- ERROR_CODE_DOWNGRADING, ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE,
- ERROR_CODE_FONT_UPDATER_DISABLED })
+ @IntDef(prefix = "RESULT_",
+ value = { RESULT_SUCCESS, RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
+ RESULT_ERROR_VERIFICATION_FAILURE, RESULT_ERROR_VERSION_MISMATCH,
+ RESULT_ERROR_INVALID_FONT_FILE, RESULT_ERROR_INVALID_FONT_NAME,
+ RESULT_ERROR_DOWNGRADING, RESULT_ERROR_FAILED_UPDATE_CONFIG,
+ RESULT_ERROR_FONT_UPDATER_DISABLED, RESULT_ERROR_REMOTE_EXCEPTION })
@Retention(RetentionPolicy.SOURCE)
- public @interface ErrorCode {}
+ public @interface ResultCode {}
/**
- * Indicates an operation has processed successfully.
- * @hide
+ * Indicates that the request has been processed successfully.
*/
- public static final int ERROR_CODE_OK = 0;
+ public static final int RESULT_SUCCESS = 0;
/**
- * Indicates a failure of writing font files.
- * @hide
+ * Indicates that a failure occurred while writing the font file to disk.
+ *
+ * This is an internal error that the system cannot place the font file for being used by
+ * application.
*/
- public static final int ERROR_CODE_FAILED_TO_WRITE_FONT_FILE = -1;
+ public static final int RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE = -1;
/**
- * Indicates a failure of fs-verity setup.
- * @hide
+ * Indicates that a failure occurred during the verification of the font file.
+ *
+ * The system failed to verify given font file contents and signature with system installed
+ * certificate.
*/
- public static final int ERROR_CODE_VERIFICATION_FAILURE = -2;
+ public static final int RESULT_ERROR_VERIFICATION_FAILURE = -2;
/**
- * Indicates a failure of verifying the font name with PostScript name.
- * @hide
+ * Indicates that a failure occurred as a result of invalid font format or content.
+ *
+ * Android only accepts OpenType compliant font files.
*/
- public static final int ERROR_CODE_FONT_NAME_MISMATCH = -3;
+ public static final int RESULT_ERROR_INVALID_FONT_FILE = -3;
/**
- * Indicates a failure of placing fonts due to unexpected font contents.
- * @hide
+ * Indicates a failure due to missing PostScript name in font's name table.
+ *
+ * Indicates that a failure occurred since PostScript name in the name table(ID=6) was missing.
+ * The font is expected to have a PostScript name.
*/
- public static final int ERROR_CODE_INVALID_FONT_FILE = -4;
+ public static final int RESULT_ERROR_INVALID_FONT_NAME = -4;
/**
- * Indicates a failure due to missing PostScript name in name table.
- * @hide
+ * Indicates that a failure occurred due to downgrading the font version.
+ *
+ * The font must have equal or newer revision in its head table.
*/
- public static final int ERROR_CODE_MISSING_POST_SCRIPT_NAME = -5;
+ public static final int RESULT_ERROR_DOWNGRADING = -5;
/**
- * Indicates a failure of placing fonts due to downgrading.
- * @hide
+ * Indicates that a failure occurred while updating system font configuration.
+ *
+ * This is an internal error that the system couldn't update the {@link FontConfig}.
*/
- public static final int ERROR_CODE_DOWNGRADING = -6;
-
- /**
- * Indicates a failure of writing system font configuration XML file.
- * @hide
- */
- public static final int ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE = -7;
+ public static final int RESULT_ERROR_FAILED_UPDATE_CONFIG = -6;
/**
* Indicates a failure due to disabled font updater.
- * @hide
+ *
+ * This is typically returned due to missing Linux kernel feature.
+ * The font updater only works with the Linux kernel that has fs-verity feature. The fs-verity
+ * is required after the device shipped with Android 11. Thus the updated device may not have
+ * fs-verity feature and font updater is disabled.
*/
- public static final int ERROR_CODE_FONT_UPDATER_DISABLED = -8;
+ public static final int RESULT_ERROR_FONT_UPDATER_DISABLED = -7;
+
+ /**
+ * Indicates that a failure occurred because provided {@code baseVersion} did not match.
+ *
+ * The {@code baseVersion} provided does not match to the current {@link FontConfig} version.
+ * Please get the latest configuration and update {@code baseVersion} accordingly.
+ */
+ public static final int RESULT_ERROR_VERSION_MISMATCH = -8;
+
+ /**
+ * Indicates a failure due to IPC communication.
+ */
+ public static final int RESULT_ERROR_REMOTE_EXCEPTION = -9;
/**
* Indicates a failure of opening font file.
@@ -115,7 +142,7 @@
*
* @hide
*/
- public static final int ERROR_CODE_FAILED_TO_OPEN_FONT_FILE = -10001;
+ public static final int RESULT_ERROR_FAILED_TO_OPEN_FONT_FILE = -10001;
/**
* Indicates a failure of opening signature file.
@@ -124,7 +151,7 @@
*
* @hide
*/
- public static final int ERROR_CODE_FAILED_TO_OPEN_SIGNATURE_FILE = -10002;
+ public static final int RESULT_ERROR_FAILED_TO_OPEN_SIGNATURE_FILE = -10002;
/**
* Indicates a failure of invalid shell command arguments.
@@ -133,7 +160,7 @@
*
* @hide
*/
- public static final int ERROR_CODE_INVALID_SHELL_ARGUMENT = -10003;
+ public static final int RESULT_ERROR_INVALID_SHELL_ARGUMENT = -10003;
/**
* Indicates a failure of reading signature file.
@@ -142,7 +169,7 @@
*
* @hide
*/
- public static final int ERROR_CODE_INVALID_SIGNATURE_FILE = -10004;
+ public static final int RESULT_ERROR_INVALID_SIGNATURE_FILE = -10004;
/**
* Indicates a failure due to exceeding allowed signature file size (8kb).
@@ -151,7 +178,7 @@
*
* @hide
*/
- public static final int ERROR_CODE_SIGNATURE_TOO_LARGE = -10005;
+ public static final int RESULT_ERROR_SIGNATURE_TOO_LARGE = -10005;
private FontManager(@NonNull IFontManager iFontManager) {
@@ -178,6 +205,70 @@
}
/**
+ * Update system installed font file.
+ *
+ * <p>
+ * To protect devices, system font updater relies on the Linux Kernel feature called fs-verity.
+ * If the device is not ready for fs-verity, {@link #RESULT_ERROR_FONT_UPDATER_DISABLED} will be
+ * returned.
+ *
+ * Android only accepts OpenType compliant font files. If other font files are provided,
+ * {@link #RESULT_ERROR_INVALID_FONT_FILE} will be returned.
+ *
+ * The font file to be updated is identified by PostScript name stored in name table. If the
+ * font file doesn't have PostScript name entry, {@link #RESULT_ERROR_INVALID_FONT_NAME} will be
+ * returned.
+ *
+ * The entire font file is verified with the given signature for the system installed
+ * certificate. If the system cannot verify the font contents,
+ * {@link #RESULT_ERROR_VERIFICATION_FAILURE} will be returned.
+ *
+ * The font file must have newer or equal revision number in the head table. In other words, the
+ * downgrading font file is not allowed. If the older font file is provided,
+ * {@link #RESULT_ERROR_DOWNGRADING} will be returned.
+ *
+ * The caller must specify the base config version for keeping consist system configuration. If
+ * the system configuration is updated for some reason between you get config with
+ * {@link #getFontConfig()} and calling this method, {@link #RESULT_ERROR_VERSION_MISMATCH} will
+ * be returned. Get the latest font configuration by calling {@link #getFontConfig()} again and
+ * try with the latest config version again.
+ *
+ * @param pfd A file descriptor of the font file.
+ * @param signature A PKCS#7 detached signature for verifying entire font files.
+ * @param baseVersion A base config version to be updated. You can get latest config version by
+ * {@link FontConfig#getConfigVersion()} via {@link #getFontConfig()}. If the
+ * system has newer config version, the update will fail with
+ * {@link #RESULT_ERROR_VERSION_MISMATCH}. Try to get the latest config and
+ * try update again.
+ * @return result code.
+ *
+ * @see FontConfig#getConfigVersion()
+ * @see #getFontConfig()
+ * @see #RESULT_SUCCESS
+ * @see #RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE
+ * @see #RESULT_ERROR_VERIFICATION_FAILURE
+ * @see #RESULT_ERROR_VERSION_MISMATCH
+ * @see #RESULT_ERROR_INVALID_FONT_FILE
+ * @see #RESULT_ERROR_INVALID_FONT_NAME
+ * @see #RESULT_ERROR_DOWNGRADING
+ * @see #RESULT_ERROR_FAILED_UPDATE_CONFIG
+ * @see #RESULT_ERROR_FONT_UPDATER_DISABLED
+ * @see #RESULT_ERROR_REMOTE_EXCEPTION
+ */
+ @RequiresPermission(Manifest.permission.UPDATE_FONTS) public @ResultCode int updateFontFile(
+ @NonNull ParcelFileDescriptor pfd,
+ @NonNull byte[] signature,
+ @IntRange(from = 0) int baseVersion
+ ) {
+ try {
+ return mIFontManager.updateFont(pfd, signature, baseVersion);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to call updateFont API", e);
+ return RESULT_ERROR_REMOTE_EXCEPTION;
+ }
+ }
+
+ /**
* Factory method of the FontManager.
*
* Do not use this method directly. Use getSystemService(Context.FONT_SERVICE) instead.
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 2e45ed8..ac8f9c9 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -15,7 +15,9 @@
*/
package android.net;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import static android.net.IpSecManager.INVALID_RESOURCE_ID;
+import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST;
import static android.net.NetworkRequest.Type.LISTEN;
import static android.net.NetworkRequest.Type.REQUEST;
import static android.net.NetworkRequest.Type.TRACK_DEFAULT;
@@ -28,6 +30,7 @@
import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.app.PendingIntent;
@@ -4964,4 +4967,92 @@
}
return null;
}
+
+ /**
+ * Request a network to satisfy a set of {@link android.net.NetworkCapabilities}, but
+ * does not cause any networks to retain the NET_CAPABILITY_FOREGROUND capability. This can
+ * be used to request that the system provide a network without causing the network to be
+ * in the foreground.
+ *
+ * <p>This method will attempt to find the best network that matches the passed
+ * {@link NetworkRequest}, and to bring up one that does if none currently satisfies the
+ * criteria. The platform will evaluate which network is the best at its own discretion.
+ * Throughput, latency, cost per byte, policy, user preference and other considerations
+ * may be factored in the decision of what is considered the best network.
+ *
+ * <p>As long as this request is outstanding, the platform will try to maintain the best network
+ * matching this request, while always attempting to match the request to a better network if
+ * possible. If a better match is found, the platform will switch this request to the now-best
+ * network and inform the app of the newly best network by invoking
+ * {@link NetworkCallback#onAvailable(Network)} on the provided callback. Note that the platform
+ * will not try to maintain any other network than the best one currently matching the request:
+ * a network not matching any network request may be disconnected at any time.
+ *
+ * <p>For example, an application could use this method to obtain a connected cellular network
+ * even if the device currently has a data connection over Ethernet. This may cause the cellular
+ * radio to consume additional power. Or, an application could inform the system that it wants
+ * a network supporting sending MMSes and have the system let it know about the currently best
+ * MMS-supporting network through the provided {@link NetworkCallback}.
+ *
+ * <p>The status of the request can be followed by listening to the various callbacks described
+ * in {@link NetworkCallback}. The {@link Network} object passed to the callback methods can be
+ * used to direct traffic to the network (although accessing some networks may be subject to
+ * holding specific permissions). Callers will learn about the specific characteristics of the
+ * network through
+ * {@link NetworkCallback#onCapabilitiesChanged(Network, NetworkCapabilities)} and
+ * {@link NetworkCallback#onLinkPropertiesChanged(Network, LinkProperties)}. The methods of the
+ * provided {@link NetworkCallback} will only be invoked due to changes in the best network
+ * matching the request at any given time; therefore when a better network matching the request
+ * becomes available, the {@link NetworkCallback#onAvailable(Network)} method is called
+ * with the new network after which no further updates are given about the previously-best
+ * network, unless it becomes the best again at some later time. All callbacks are invoked
+ * in order on the same thread, which by default is a thread created by the framework running
+ * in the app.
+ *
+ * <p>This{@link NetworkRequest} will live until released via
+ * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits, at
+ * which point the system may let go of the network at any time.
+ *
+ * <p>It is presently unsupported to request a network with mutable
+ * {@link NetworkCapabilities} such as
+ * {@link NetworkCapabilities#NET_CAPABILITY_VALIDATED} or
+ * {@link NetworkCapabilities#NET_CAPABILITY_CAPTIVE_PORTAL}
+ * as these {@code NetworkCapabilities} represent states that a particular
+ * network may never attain, and whether a network will attain these states
+ * is unknown prior to bringing up the network so the framework does not
+ * know how to go about satisfying a request with these capabilities.
+ *
+ * <p>To avoid performance issues due to apps leaking callbacks, the system will limit the
+ * number of outstanding requests to 100 per app (identified by their UID), shared with
+ * all variants of this method, of {@link #registerNetworkCallback} as well as
+ * {@link ConnectivityDiagnosticsManager#registerConnectivityDiagnosticsCallback}.
+ * Requesting a network with this method will count toward this limit. If this limit is
+ * exceeded, an exception will be thrown. To avoid hitting this issue and to conserve resources,
+ * make sure to unregister the callbacks with
+ * {@link #unregisterNetworkCallback(NetworkCallback)}.
+ *
+ * @param request {@link NetworkRequest} describing this request.
+ * @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
+ * If null, the callback is invoked on the default internal Handler.
+ * @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note
+ * the callback must not be shared - it uniquely specifies this request.
+ * @throws IllegalArgumentException if {@code request} contains invalid network capabilities.
+ * @throws SecurityException if missing the appropriate permissions.
+ * @throws RuntimeException if the app already has too many callbacks registered.
+ *
+ * @hide
+ */
+ @SystemApi(client = MODULE_LIBRARIES)
+ @SuppressLint("ExecutorRegistration")
+ @RequiresPermission(anyOf = {
+ android.Manifest.permission.NETWORK_SETTINGS,
+ android.Manifest.permission.NETWORK_STACK,
+ NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK
+ })
+ public void requestBackgroundNetwork(@NonNull NetworkRequest request,
+ @Nullable Handler handler, @NonNull NetworkCallback networkCallback) {
+ final NetworkCapabilities nc = request.networkCapabilities;
+ sendRequestForNetwork(nc, networkCallback, 0, BACKGROUND_REQUEST,
+ TYPE_NONE, handler == null ? getDefaultHandler() : new CallbackHandler(handler));
+ }
}
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 7197831..1b4d2e4 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -31,7 +31,6 @@
import android.net.NetworkState;
import android.net.ProxyInfo;
import android.net.UidRange;
-import android.net.VpnInfo;
import android.net.QosSocketInfo;
import android.os.Bundle;
import android.os.IBinder;
diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl
index d5aede7..0baf11e 100644
--- a/core/java/android/net/INetworkStatsService.aidl
+++ b/core/java/android/net/INetworkStatsService.aidl
@@ -23,7 +23,7 @@
import android.net.NetworkStats;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.os.IBinder;
@@ -70,7 +70,7 @@
in Network[] defaultNetworks,
in NetworkState[] networkStates,
in String activeIface,
- in VpnInfo[] vpnInfos);
+ in UnderlyingNetworkInfo[] underlyingNetworkInfos);
/** Force update of statistics. */
@UnsupportedAppUsage
void forceUpdate();
diff --git a/core/java/android/net/MatchAllNetworkSpecifier.java b/core/java/android/net/MatchAllNetworkSpecifier.java
index 84985b6..9a11be0 100644
--- a/core/java/android/net/MatchAllNetworkSpecifier.java
+++ b/core/java/android/net/MatchAllNetworkSpecifier.java
@@ -32,17 +32,6 @@
*/
@SystemApi
public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements Parcelable {
- /**
- * Utility method which verifies that the ns argument is not a MatchAllNetworkSpecifier and
- * throws an IllegalArgumentException if it is.
- * @hide
- */
- public static void checkNotMatchAllNetworkSpecifier(NetworkSpecifier ns) {
- if (ns instanceof MatchAllNetworkSpecifier) {
- throw new IllegalArgumentException("A MatchAllNetworkSpecifier is not permitted");
- }
- }
-
/** @hide */
@Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
diff --git a/core/java/android/net/NetworkAgentConfig.java b/core/java/android/net/NetworkAgentConfig.java
index fe1268d..664c265 100644
--- a/core/java/android/net/NetworkAgentConfig.java
+++ b/core/java/android/net/NetworkAgentConfig.java
@@ -16,6 +16,8 @@
package android.net;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -125,6 +127,7 @@
* @return the subscriber ID, or null if none.
* @hide
*/
+ @SystemApi(client = MODULE_LIBRARIES)
@Nullable
public String getSubscriberId() {
return subscriberId;
@@ -275,6 +278,7 @@
* @hide
*/
@NonNull
+ @SystemApi(client = MODULE_LIBRARIES)
public Builder setSubscriberId(@Nullable String subscriberId) {
mConfig.subscriberId = subscriberId;
return this;
diff --git a/core/java/android/net/VpnInfo.aidl b/core/java/android/net/UnderlyingNetworkInfo.aidl
similarity index 94%
rename from core/java/android/net/VpnInfo.aidl
rename to core/java/android/net/UnderlyingNetworkInfo.aidl
index 8bcaa81..a56f2f4 100644
--- a/core/java/android/net/VpnInfo.aidl
+++ b/core/java/android/net/UnderlyingNetworkInfo.aidl
@@ -16,4 +16,4 @@
package android.net;
-parcelable VpnInfo;
+parcelable UnderlyingNetworkInfo;
diff --git a/core/java/android/net/UnderlyingNetworkInfo.java b/core/java/android/net/UnderlyingNetworkInfo.java
new file mode 100644
index 0000000..8fb4832
--- /dev/null
+++ b/core/java/android/net/UnderlyingNetworkInfo.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2015 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;
+
+import android.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A lightweight container used to carry information on the networks that underly a given
+ * virtual network.
+ *
+ * @hide
+ */
+public final class UnderlyingNetworkInfo implements Parcelable {
+ /** The owner of this network. */
+ public final int ownerUid;
+ /** The interface name of this network. */
+ @NonNull
+ public final String iface;
+ /** The names of the interfaces underlying this network. */
+ @NonNull
+ public final List<String> underlyingIfaces;
+
+ public UnderlyingNetworkInfo(int ownerUid, @NonNull String iface,
+ @NonNull List<String> underlyingIfaces) {
+ Objects.requireNonNull(iface);
+ Objects.requireNonNull(underlyingIfaces);
+ this.ownerUid = ownerUid;
+ this.iface = iface;
+ this.underlyingIfaces = underlyingIfaces;
+ }
+
+ private UnderlyingNetworkInfo(@NonNull Parcel in) {
+ this.ownerUid = in.readInt();
+ this.iface = in.readString();
+ this.underlyingIfaces = new ArrayList<>();
+ in.readList(this.underlyingIfaces, null /*classLoader*/);
+ }
+
+ @Override
+ public String toString() {
+ return "UnderlyingNetworkInfo{"
+ + "ownerUid=" + ownerUid
+ + ", iface='" + iface + '\''
+ + ", underlyingIfaces='" + underlyingIfaces.toString() + '\''
+ + '}';
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(@NonNull Parcel dest, int flags) {
+ dest.writeInt(ownerUid);
+ dest.writeString(iface);
+ dest.writeList(underlyingIfaces);
+ }
+
+ @NonNull
+ public static final Parcelable.Creator<UnderlyingNetworkInfo> CREATOR =
+ new Parcelable.Creator<UnderlyingNetworkInfo>() {
+ @NonNull
+ @Override
+ public UnderlyingNetworkInfo createFromParcel(@NonNull Parcel in) {
+ return new UnderlyingNetworkInfo(in);
+ }
+
+ @NonNull
+ @Override
+ public UnderlyingNetworkInfo[] newArray(int size) {
+ return new UnderlyingNetworkInfo[size];
+ }
+ };
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof UnderlyingNetworkInfo)) return false;
+ final UnderlyingNetworkInfo that = (UnderlyingNetworkInfo) o;
+ return ownerUid == that.ownerUid
+ && Objects.equals(iface, that.iface)
+ && Objects.equals(underlyingIfaces, that.underlyingIfaces);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(ownerUid, iface, underlyingIfaces);
+ }
+}
diff --git a/core/java/android/net/VpnInfo.java b/core/java/android/net/VpnInfo.java
deleted file mode 100644
index cf58c57..0000000
--- a/core/java/android/net/VpnInfo.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2015 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;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Arrays;
-
-/**
- * A lightweight container used to carry information of the ongoing VPN.
- * Internal use only.
- *
- * @hide
- */
-public class VpnInfo implements Parcelable {
- public final int ownerUid;
- @Nullable
- public final String vpnIface;
- @Nullable
- public final String[] underlyingIfaces;
-
- public VpnInfo(int ownerUid, @Nullable String vpnIface, @Nullable String[] underlyingIfaces) {
- this.ownerUid = ownerUid;
- this.vpnIface = vpnIface;
- this.underlyingIfaces = underlyingIfaces;
- }
-
- private VpnInfo(@NonNull Parcel in) {
- this.ownerUid = in.readInt();
- this.vpnIface = in.readString();
- this.underlyingIfaces = in.createStringArray();
- }
-
- @Override
- public String toString() {
- return "VpnInfo{"
- + "ownerUid=" + ownerUid
- + ", vpnIface='" + vpnIface + '\''
- + ", underlyingIfaces='" + Arrays.toString(underlyingIfaces) + '\''
- + '}';
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(@NonNull Parcel dest, int flags) {
- dest.writeInt(ownerUid);
- dest.writeString(vpnIface);
- dest.writeStringArray(underlyingIfaces);
- }
-
- @NonNull
- public static final Parcelable.Creator<VpnInfo> CREATOR = new Parcelable.Creator<VpnInfo>() {
- @NonNull
- @Override
- public VpnInfo createFromParcel(@NonNull Parcel in) {
- return new VpnInfo(in);
- }
-
- @NonNull
- @Override
- public VpnInfo[] newArray(int size) {
- return new VpnInfo[size];
- }
- };
-}
diff --git a/core/java/android/net/vcn/IVcnManagementService.aidl b/core/java/android/net/vcn/IVcnManagementService.aidl
index 80ac64b..4f293ee 100644
--- a/core/java/android/net/vcn/IVcnManagementService.aidl
+++ b/core/java/android/net/vcn/IVcnManagementService.aidl
@@ -16,8 +16,11 @@
package android.net.vcn;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;
import android.net.vcn.VcnConfig;
+import android.net.vcn.VcnUnderlyingNetworkPolicy;
import android.os.ParcelUuid;
/**
@@ -29,4 +32,5 @@
void addVcnUnderlyingNetworkPolicyListener(in IVcnUnderlyingNetworkPolicyListener listener);
void removeVcnUnderlyingNetworkPolicyListener(in IVcnUnderlyingNetworkPolicyListener listener);
+ VcnUnderlyingNetworkPolicy getUnderlyingNetworkPolicy(in NetworkCapabilities nc, in LinkProperties lp);
}
diff --git a/core/java/android/net/vcn/VcnManager.java b/core/java/android/net/vcn/VcnManager.java
index 2d0a6d7..33beb6a 100644
--- a/core/java/android/net/vcn/VcnManager.java
+++ b/core/java/android/net/vcn/VcnManager.java
@@ -21,6 +21,8 @@
import android.annotation.RequiresPermission;
import android.annotation.SystemService;
import android.content.Context;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.os.ParcelUuid;
import android.os.RemoteException;
import android.os.ServiceSpecificException;
@@ -62,7 +64,7 @@
* @hide
*/
@SystemService(Context.VCN_MANAGEMENT_SERVICE)
-public final class VcnManager {
+public class VcnManager {
@NonNull private static final String TAG = VcnManager.class.getSimpleName();
/** @hide */
@@ -223,6 +225,37 @@
}
/**
+ * Queries the underlying network policy for a network with the given parameters.
+ *
+ * <p>Prior to a new NetworkAgent being registered, or upon notification that Carrier VCN policy
+ * may have changed via {@link VcnUnderlyingNetworkPolicyListener#onPolicyChanged()}, a Network
+ * Provider MUST poll for the updated Network policy based on that Network's capabilities and
+ * properties.
+ *
+ * @param networkCapabilities the NetworkCapabilities to be used in determining the Network
+ * policy for this Network.
+ * @param linkProperties the LinkProperties to be used in determining the Network policy for
+ * this Network.
+ * @throws SecurityException if the caller does not have permission NETWORK_FACTORY
+ * @return the VcnUnderlyingNetworkPolicy to be used for this Network.
+ * @hide
+ */
+ @NonNull
+ @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY)
+ public VcnUnderlyingNetworkPolicy getUnderlyingNetworkPolicy(
+ @NonNull NetworkCapabilities networkCapabilities,
+ @NonNull LinkProperties linkProperties) {
+ requireNonNull(networkCapabilities, "networkCapabilities must not be null");
+ requireNonNull(linkProperties, "linkProperties must not be null");
+
+ try {
+ return mService.getUnderlyingNetworkPolicy(networkCapabilities, linkProperties);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Binder wrapper for added VcnUnderlyingNetworkPolicyListeners to receive signals from System
* Server.
*
diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java
index 71344f9..f853e67 100644
--- a/core/java/android/os/ServiceManager.java
+++ b/core/java/android/os/ServiceManager.java
@@ -288,6 +288,20 @@
}
/**
+ * Get service debug info.
+ * @return an array of information for each service (like listServices, but with PIDs)
+ * @hide
+ */
+ public static ServiceDebugInfo[] getServiceDebugInfo() {
+ try {
+ return getIServiceManager().getServiceDebugInfo();
+ } catch (RemoteException e) {
+ Log.e(TAG, "error in getServiceDebugInfo", e);
+ return null;
+ }
+ }
+
+ /**
* This is only intended to be called when the process is first being brought
* up and bound by the activity manager. There is only one thread in the process
* at that time, so no locking is done.
diff --git a/core/java/android/os/ServiceManagerNative.java b/core/java/android/os/ServiceManagerNative.java
index b70b6b5..60acc57 100644
--- a/core/java/android/os/ServiceManagerNative.java
+++ b/core/java/android/os/ServiceManagerNative.java
@@ -103,6 +103,10 @@
throw new RemoteException();
}
+ public ServiceDebugInfo[] getServiceDebugInfo() throws RemoteException {
+ return mServiceManager.getServiceDebugInfo();
+ }
+
/**
* Same as mServiceManager but used by apps.
*
diff --git a/core/java/android/os/incremental/IIncrementalService.aidl b/core/java/android/os/incremental/IIncrementalService.aidl
index 7db5a80..3fbc284 100644
--- a/core/java/android/os/incremental/IIncrementalService.aidl
+++ b/core/java/android/os/incremental/IIncrementalService.aidl
@@ -38,14 +38,20 @@
* Opens or creates a storage given a target path and data loader params. Returns the storage ID.
*/
int openStorage(in @utf8InCpp String path);
- int createStorage(in @utf8InCpp String path, in DataLoaderParamsParcel params, int createMode,
- in IDataLoaderStatusListener statusListener,
- in StorageHealthCheckParams healthCheckParams,
- in IStorageHealthListener healthListener,
- in PerUidReadTimeouts[] perUidReadTimeouts);
+ int createStorage(in @utf8InCpp String path, in DataLoaderParamsParcel params, int createMode);
int createLinkedStorage(in @utf8InCpp String path, int otherStorageId, int createMode);
/**
+ * Loops DataLoader through bind/create/start with params.
+ */
+ boolean startLoading(int storageId,
+ in DataLoaderParamsParcel params,
+ in IDataLoaderStatusListener statusListener,
+ in StorageHealthCheckParams healthCheckParams,
+ in IStorageHealthListener healthListener,
+ in PerUidReadTimeouts[] perUidReadTimeouts);
+
+ /**
* Bind-mounts a path under a storage to a full path. Can be permanent or temporary.
*/
const int BIND_TEMPORARY = 0;
@@ -101,6 +107,14 @@
int isFileFullyLoaded(int storageId, in @utf8InCpp String path);
/**
+ * Checks if all files in the storage are fully loaded.
+ * 0 - fully loaded
+ * >0 - certain pages missing
+ * <0 - -errcode
+ */
+ int isFullyLoaded(int storageId);
+
+ /**
* Returns overall loading progress of all the files on a storage, progress value between [0,1].
* Returns a negative value on error.
*/
@@ -113,11 +127,6 @@
byte[] getMetadataById(int storageId, in byte[] fileId);
/**
- * Starts loading data for a storage.
- */
- boolean startLoading(int storageId);
-
- /**
* Deletes a storage given its ID. Deletes its bind mounts and unmount it. Stop its data loader.
*/
void deleteStorage(int storageId);
diff --git a/core/java/android/os/incremental/IncrementalFileStorages.java b/core/java/android/os/incremental/IncrementalFileStorages.java
index 59292baa..f2fe719 100644
--- a/core/java/android/os/incremental/IncrementalFileStorages.java
+++ b/core/java/android/os/incremental/IncrementalFileStorages.java
@@ -37,7 +37,6 @@
import android.content.pm.DataLoaderParams;
import android.content.pm.IDataLoaderStatusListener;
import android.content.pm.InstallationFileParcel;
-import android.text.TextUtils;
import java.io.File;
import java.io.IOException;
@@ -53,6 +52,7 @@
private @NonNull final IncrementalManager mIncrementalManager;
private @NonNull final File mStageDir;
+ private @Nullable IncrementalStorage mInheritedStorage;
private @Nullable IncrementalStorage mDefaultStorage;
/**
@@ -65,6 +65,7 @@
*/
public static IncrementalFileStorages initialize(Context context,
@NonNull File stageDir,
+ @Nullable File inheritedDir,
@NonNull DataLoaderParams dataLoaderParams,
@Nullable IDataLoaderStatusListener statusListener,
@Nullable StorageHealthCheckParams healthCheckParams,
@@ -79,9 +80,8 @@
throw new IOException("Failed to obtain incrementalManager.");
}
- final IncrementalFileStorages result = new IncrementalFileStorages(stageDir,
- incrementalManager, dataLoaderParams, statusListener, healthCheckParams,
- healthListener, perUidReadTimeouts);
+ final IncrementalFileStorages result = new IncrementalFileStorages(stageDir, inheritedDir,
+ incrementalManager, dataLoaderParams);
for (InstallationFileParcel file : addedFiles) {
if (file.location == LOCATION_DATA_APP) {
try {
@@ -95,42 +95,45 @@
throw new IOException("Unknown file location: " + file.location);
}
}
-
- result.startLoading();
+ result.startLoading(dataLoaderParams, statusListener, healthCheckParams, healthListener,
+ perUidReadTimeouts);
return result;
}
private IncrementalFileStorages(@NonNull File stageDir,
+ @Nullable File inheritedDir,
@NonNull IncrementalManager incrementalManager,
- @NonNull DataLoaderParams dataLoaderParams,
- @Nullable IDataLoaderStatusListener statusListener,
- @Nullable StorageHealthCheckParams healthCheckParams,
- @Nullable IStorageHealthListener healthListener,
- @NonNull PerUidReadTimeouts[] perUidReadTimeouts) throws IOException {
+ @NonNull DataLoaderParams dataLoaderParams) throws IOException {
try {
mStageDir = stageDir;
mIncrementalManager = incrementalManager;
- if (dataLoaderParams.getComponentName().getPackageName().equals("local")) {
- final String incrementalPath = dataLoaderParams.getArguments();
- if (TextUtils.isEmpty(incrementalPath)) {
- throw new IOException("Failed to create storage: incrementalPath is empty");
+ if (inheritedDir != null && IncrementalManager.isIncrementalPath(
+ inheritedDir.getAbsolutePath())) {
+ mInheritedStorage = mIncrementalManager.openStorage(
+ inheritedDir.getAbsolutePath());
+ if (mInheritedStorage != null) {
+ if (!mInheritedStorage.isFullyLoaded()) {
+ throw new IOException("Inherited storage has missing pages.");
+ }
+
+ mDefaultStorage = mIncrementalManager.createStorage(stageDir.getAbsolutePath(),
+ mInheritedStorage, IncrementalManager.CREATE_MODE_CREATE
+ | IncrementalManager.CREATE_MODE_TEMPORARY_BIND);
+ if (mDefaultStorage == null) {
+ throw new IOException(
+ "Couldn't create linked incremental storage at " + stageDir);
+ }
+ return;
}
- mDefaultStorage = mIncrementalManager.openStorage(incrementalPath);
- if (mDefaultStorage == null) {
- throw new IOException(
- "Couldn't open incremental storage at " + incrementalPath);
- }
- mDefaultStorage.bind(stageDir.getAbsolutePath());
- } else {
- mDefaultStorage = mIncrementalManager.createStorage(stageDir.getAbsolutePath(),
- dataLoaderParams, IncrementalManager.CREATE_MODE_CREATE
- | IncrementalManager.CREATE_MODE_TEMPORARY_BIND, false,
- statusListener, healthCheckParams, healthListener, perUidReadTimeouts);
- if (mDefaultStorage == null) {
- throw new IOException(
- "Couldn't create incremental storage at " + stageDir);
- }
+ }
+
+ mDefaultStorage = mIncrementalManager.createStorage(stageDir.getAbsolutePath(),
+ dataLoaderParams, IncrementalManager.CREATE_MODE_CREATE
+ | IncrementalManager.CREATE_MODE_TEMPORARY_BIND);
+ if (mDefaultStorage == null) {
+ throw new IOException(
+ "Couldn't create incremental storage at " + stageDir);
}
} catch (IOException e) {
cleanUp();
@@ -149,9 +152,16 @@
/**
* Starts or re-starts loading of data.
*/
- public void startLoading() throws IOException {
- if (!mDefaultStorage.startLoading()) {
- throw new IOException("Failed to start loading data for Incremental installation.");
+ void startLoading(
+ @NonNull DataLoaderParams dataLoaderParams,
+ @Nullable IDataLoaderStatusListener statusListener,
+ @Nullable StorageHealthCheckParams healthCheckParams,
+ @Nullable IStorageHealthListener healthListener,
+ @NonNull PerUidReadTimeouts[] perUidReadTimeouts) throws IOException {
+ if (!mDefaultStorage.startLoading(dataLoaderParams, statusListener, healthCheckParams,
+ healthListener, perUidReadTimeouts)) {
+ throw new IOException(
+ "Failed to start or restart loading data for Incremental installation.");
}
}
@@ -163,6 +173,21 @@
}
/**
+ * Creates a hardlink from inherited storage to default.
+ */
+ public boolean makeLink(@NonNull String relativePath, @NonNull String fromBase,
+ @NonNull String toBase) throws IOException {
+ if (mInheritedStorage == null) {
+ return false;
+ }
+ final File sourcePath = new File(fromBase, relativePath);
+ final File destPath = new File(toBase, relativePath);
+ mInheritedStorage.makeLink(sourcePath.getAbsolutePath(), mDefaultStorage,
+ destPath.getAbsolutePath());
+ return true;
+ }
+
+ /**
* Permanently disables readlogs.
*/
public void disallowReadLogs() {
diff --git a/core/java/android/os/incremental/IncrementalManager.java b/core/java/android/os/incremental/IncrementalManager.java
index 4b93270..7e7057f 100644
--- a/core/java/android/os/incremental/IncrementalManager.java
+++ b/core/java/android/os/incremental/IncrementalManager.java
@@ -22,7 +22,6 @@
import android.annotation.SystemService;
import android.content.Context;
import android.content.pm.DataLoaderParams;
-import android.content.pm.IDataLoaderStatusListener;
import android.content.pm.IPackageLoadingProgressCallback;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
@@ -95,32 +94,20 @@
* @param params IncrementalDataLoaderParams object to configure data loading.
* @param createMode Mode for opening an old Incremental File System mount or creating
* a new mount.
- * @param autoStartDataLoader Set true to immediately start data loader after creating storage.
* @return IncrementalStorage object corresponding to the mounted directory.
*/
@Nullable
public IncrementalStorage createStorage(@NonNull String path,
@NonNull DataLoaderParams params,
- @CreateMode int createMode,
- boolean autoStartDataLoader,
- @Nullable IDataLoaderStatusListener statusListener,
- @Nullable StorageHealthCheckParams healthCheckParams,
- @Nullable IStorageHealthListener healthListener,
- @NonNull PerUidReadTimeouts[] perUidReadTimeouts) {
+ @CreateMode int createMode) {
Objects.requireNonNull(path);
Objects.requireNonNull(params);
- Objects.requireNonNull(perUidReadTimeouts);
try {
- final int id = mService.createStorage(path, params.getData(), createMode,
- statusListener, healthCheckParams, healthListener, perUidReadTimeouts);
+ final int id = mService.createStorage(path, params.getData(), createMode);
if (id < 0) {
return null;
}
- final IncrementalStorage storage = new IncrementalStorage(mService, id);
- if (autoStartDataLoader) {
- storage.startLoading();
- }
- return storage;
+ return new IncrementalStorage(mService, id);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -281,15 +268,18 @@
* Unbinds the target dir and deletes the corresponding storage instance.
* Deletes the package name and associated storage id from maps.
*/
- public void onPackageRemoved(@NonNull String codePath) {
+ public void onPackageRemoved(@NonNull File codeFile) {
try {
+ final String codePath = codeFile.getAbsolutePath();
final IncrementalStorage storage = openStorage(codePath);
if (storage == null) {
return;
}
mLoadingProgressCallbacks.cleanUpCallbacks(storage);
unregisterHealthListener(codePath);
- mService.deleteStorage(storage.getId());
+
+ // Parent since we bind-mount a folder one level above.
+ mService.deleteBindMount(storage.getId(), codeFile.getParent());
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/os/incremental/IncrementalStorage.java b/core/java/android/os/incremental/IncrementalStorage.java
index 5b688bb..e6ce8cd 100644
--- a/core/java/android/os/incremental/IncrementalStorage.java
+++ b/core/java/android/os/incremental/IncrementalStorage.java
@@ -18,11 +18,14 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.content.pm.DataLoaderParams;
+import android.content.pm.IDataLoaderStatusListener;
import android.os.RemoteException;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.Objects;
import java.util.UUID;
/**
@@ -323,6 +326,24 @@
}
}
+
+ /**
+ * Checks if all files in the storage are fully loaded.
+ */
+ public boolean isFullyLoaded() throws IOException {
+ try {
+ final int res = mService.isFullyLoaded(mId);
+ if (res < 0) {
+ throw new IOException(
+ "isFullyLoaded() failed at querying loading progress, errno " + -res);
+ }
+ return res == 0;
+ } catch (RemoteException e) {
+ e.rethrowFromSystemServer();
+ return false;
+ }
+ }
+
/**
* Returns the loading progress of a storage
*
@@ -376,13 +397,21 @@
}
/**
- * Informs the data loader service associated with the current storage to start data loader
- *
- * @return True if data loader is successfully started.
+ * Iinitializes and starts the DataLoader.
+ * This makes sure all install-time parameters are applied.
+ * Does not affect persistent DataLoader params.
+ * @return True if start request was successfully queued.
*/
- public boolean startLoading() {
+ public boolean startLoading(
+ @NonNull DataLoaderParams dataLoaderParams,
+ @Nullable IDataLoaderStatusListener statusListener,
+ @Nullable StorageHealthCheckParams healthCheckParams,
+ @Nullable IStorageHealthListener healthListener,
+ @NonNull PerUidReadTimeouts[] perUidReadTimeouts) {
+ Objects.requireNonNull(perUidReadTimeouts);
try {
- return mService.startLoading(mId);
+ return mService.startLoading(mId, dataLoaderParams.getData(), statusListener,
+ healthCheckParams, healthListener, perUidReadTimeouts);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
return false;
diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java
index 53fe1ba..2de7558 100644
--- a/core/java/android/text/FontConfig.java
+++ b/core/java/android/text/FontConfig.java
@@ -53,7 +53,7 @@
public final class FontConfig implements Parcelable {
private final @NonNull List<FontFamily> mFamilies;
private final @NonNull List<Alias> mAliases;
- private final long mLastModifiedDate;
+ private final long mLastModifiedTimeMillis;
private final int mConfigVersion;
/**
@@ -65,10 +65,10 @@
* @hide Only system server can create this instance and passed via IPC.
*/
public FontConfig(@NonNull List<FontFamily> families, @NonNull List<Alias> aliases,
- long lastModifiedDate, @IntRange(from = 0) int configVersion) {
+ long lastModifiedTimeMillis, @IntRange(from = 0) int configVersion) {
mFamilies = families;
mAliases = aliases;
- mLastModifiedDate = lastModifiedDate;
+ mLastModifiedTimeMillis = lastModifiedTimeMillis;
mConfigVersion = configVersion;
}
@@ -93,20 +93,21 @@
}
/**
- * Returns the last modified date as Java epoch seconds.
+ * Returns the last modified time in milliseconds.
+ *
+ * This is a value of {@link System#currentTimeMillis()} when the system font configuration was
+ * modified last time.
*
* If there is no update, this return 0.
- * @hide
*/
- public long getLastModifiedDate() {
- return mLastModifiedDate;
+ public long getLastModifiedTimeMillis() {
+ return mLastModifiedTimeMillis;
}
/**
* Returns the monotonically increasing config version value.
*
* The config version is reset to 0 when the system is restarted.
- * @hide
*/
public @IntRange(from = 0) int getConfigVersion() {
return mConfigVersion;
@@ -132,7 +133,7 @@
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeParcelableList(mFamilies, flags);
dest.writeParcelableList(mAliases, flags);
- dest.writeLong(mLastModifiedDate);
+ dest.writeLong(mLastModifiedTimeMillis);
dest.writeInt(mConfigVersion);
}
diff --git a/core/java/android/view/SyncRtSurfaceTransactionApplier.java b/core/java/android/view/SyncRtSurfaceTransactionApplier.java
index acbcbfa..b10370a 100644
--- a/core/java/android/view/SyncRtSurfaceTransactionApplier.java
+++ b/core/java/android/view/SyncRtSurfaceTransactionApplier.java
@@ -85,13 +85,12 @@
for (int i = params.length - 1; i >= 0; i--) {
SurfaceParams surfaceParams = params[i];
SurfaceControl surface = surfaceParams.surface;
+ if (frame > 0) {
+ t.deferTransactionUntil(surface, mTargetSc, frame);
+ }
applyParams(t, surfaceParams, mTmpFloat9);
}
- if (mTargetViewRootImpl != null) {
- mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
- } else {
- t.apply();
- }
+ t.apply();
}
public static void applyParams(Transaction t, SurfaceParams params, float[] tmpFloat9) {
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 52d0062..844fc26 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -10109,7 +10109,7 @@
* Merges the transaction passed in with the next transaction in BLASTBufferQueue. This ensures
* you can add transactions to the upcoming frame.
*/
- public void mergeWithNextTransaction(Transaction t, long frameNumber) {
+ void mergeWithNextTransaction(Transaction t, long frameNumber) {
if (mBlastBufferQueue != null) {
mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber);
}
diff --git a/core/java/com/android/internal/graphics/fonts/IFontManager.aidl b/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
index a11c7ef..cafe0de 100644
--- a/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
+++ b/core/java/com/android/internal/graphics/fonts/IFontManager.aidl
@@ -16,6 +16,7 @@
package com.android.internal.graphics.fonts;
+import android.os.ParcelFileDescriptor;
import android.text.FontConfig;
import android.graphics.fonts.SystemFontState;
@@ -26,4 +27,6 @@
*/
interface IFontManager {
FontConfig getFontConfig();
+
+ int updateFont(in ParcelFileDescriptor fd, in byte[] signature, int baseVersion);
}
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index eb45a6a..8746afa 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Net Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g>-oorkruis-SIM-oproepe"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nie aangestuur nie"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> na <xliff:g id="TIME_DELAY">{2}</xliff:g> sekondes"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensorkennisgewingdiens"</string>
<string name="twilight_service" msgid="8964898045693187224">"Skemerdiens"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tydsonebespeurder (geen konnektiwiteit nie)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS-tydopdateringdiens"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Jou toestel sal uitgevee word"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Die administrasieprogram kan nie gebruik word nie. Jou toestel sal nou uitgevee word.\n\nKontak jou organisasie se administrateur as jy vrae het."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Druk is gedeaktiveer deur <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Jy kan nou jou hele skerm of \'n deel daarvan vergroot"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Skakel aan in Instellings"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Maak toe"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Om voort te gaan, moet <b><xliff:g id="APP">%s</xliff:g></b> toegang tot jou toestel se mikrofoon hê."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Om voort te gaan, moet <b><xliff:g id="APP">%s</xliff:g></b> toegang tot jou toestel se kamera hê."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Skakel aan"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensorprivaatheid"</string>
</resources>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index 43a14dc..4daa9e3 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi ብቻ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> የሲም መካከል የሚደረግ ጥሪ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>፡አልተላለፈም"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>፡<xliff:g id="DIALING_NUMBER">{1}</xliff:g> ከ<xliff:g id="TIME_DELAY">{2}</xliff:g> ሰከንዶች በኋላ"</string>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index 4469117..a2d3671 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -152,7 +152,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi فقط"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> الاتصال عبر شرائح SIM"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: لم تتم إعادة التوجيه"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> بعد <xliff:g id="TIME_DELAY">{2}</xliff:g> ثانية"</string>
@@ -211,8 +212,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"خدمة إشعارات جهاز الاستشعار"</string>
<string name="twilight_service" msgid="8964898045693187224">"خدمة الغسق"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"أداة التعرّف على المنطقة الزمنية (ليس هناك حاجة للاتصال بالشبكة)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"خدمة تعديل وقت GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"سيتم محو بيانات جهازك."</string>
<string name="factory_reset_message" msgid="2657049595153992213">"تعذّر استخدام تطبيق المشرف. سيتم محو بيانات جهازك الآن.\n\nإذا كانت لديك أسئلة، اتصل بمشرف مؤسستك."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"تم إيقاف الطباعة بواسطة <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2341,12 +2341,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"يمكنك الآن تكبير الشاشة كلها أو جزء منها."</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"التفعيل من خلال \"الإعدادات\""</string>
<string name="dismiss_action" msgid="1728820550388704784">"إغلاق"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"للمتابعة، يحتاج <b><xliff:g id="APP">%s</xliff:g></b> إلى الوصول إلى ميكروفون الجهاز."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"للمتابعة، يحتاج تطبيق <b><xliff:g id="APP">%s</xliff:g></b> إلى الوصول إلى كاميرا الجهاز."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"تفعيل"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"الخصوصية في جهاز الاستشعار"</string>
</resources>
diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml
index b6eb959..0a9ef97 100644
--- a/core/res/res/values-as/strings.xml
+++ b/core/res/res/values-as/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"কোৱল ৱাই-ফাই"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ক্ৰছ-ছিম কলিং"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ফৰৱাৰ্ড কৰা নহ\'ল"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> ছেকেণ্ডৰ পাছত"</string>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index f7e4169..2f937e0 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Yalnız Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Çarpaz SİM Zəngi"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Yönləndirilmədi"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> saniyə sonra"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensor Bildiriş Xidməti"</string>
<string name="twilight_service" msgid="8964898045693187224">"Alaqaranlıq Xidməti"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Saat Qurşağı Aşkarlayıcısı (Bağlantı yoxdur)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Zaman Güncəlləmə Xidməti"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Cihazınız təmizlənəcəkdir"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Admin tətbiqini istifadə etmək mümkün deyil. Cihaz indi təmizlənəcək.\n\nSualınız varsa, təşkilatın admini ilə əlaqə saxlayın."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Çap <xliff:g id="OWNER_APP">%s</xliff:g> tərəfindən deaktiv edildi."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"İndi ekranı qismən və ya tam şəkildə böyüdə bilərsiniz"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Ayarlarda aktiv edin"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Qapadın"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Davam etmək üçün <b><xliff:g id="APP">%s</xliff:g></b> tətbiqi cihazın mikrofonuna giriş tələb edir."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Davam etmək üçün <b><xliff:g id="APP">%s</xliff:g></b> tətbiqi cihazın kamerasına giriş tələb edir."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktiv edin"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensor Məxfiliyi"</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 76a278a..b3323b3 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Samo WiFi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Pozivi sa više SIM kartica za operatera <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nije prosleđeno"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> nakon <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunde/i"</string>
@@ -205,8 +206,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Usluga obaveštenja senzora"</string>
<string name="twilight_service" msgid="8964898045693187224">"Usluga Sumrak"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detektor vremenske zone (nema internet veze)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS usluga za ažuriranje vremena"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Uređaj će biti obrisan"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Ne možete da koristite ovu aplikaciju za administratore. Uređaj će sada biti obrisan.\n\nAko imate pitanja, kontaktirajte administratora organizacije."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Štampanje je onemogućila aplikacija <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2239,12 +2239,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Možete da uvećate deo ekrana ili ceo ekran"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Uključite u Podešavanjima"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Odbaci"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> zahteva pristup mikrofonu uređaja radi nastavljanja."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> zahteva pristup kameri uređaja radi nastavljanja."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Uključi"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privatnost senzora"</string>
</resources>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index deb9218..80f67d0 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Толькі Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Тэлефанія паміж SIM-картамі"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не пераадрасоўваецца"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> праз <xliff:g id="TIME_DELAY">{2}</xliff:g> с."</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Служба апавяшчэнняў датчыка"</string>
<string name="twilight_service" msgid="8964898045693187224">"Служба Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Дэтэктар часавога пояса (няма падключэння)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Служба абнаўлення часу GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Даныя вашай прылады будуць сцерты"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Немагчыма выкарыстоўваць праграму адміністравання. Звесткі на вашай прыладзе будуць выдалены.\n\nКалі ў вас ёсць пытанні, звярніцеся да адміністратара арганізацыі."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Друк адключаны ўладальнікам праграмы <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Цяпер можна павялічваць увесь экран ці яго частку."</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Уключыць у Наладах"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Адхіліць"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Каб працягнуць, дайце праграме <b><xliff:g id="APP">%s</xliff:g></b> доступ да мікрафона прылады."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Каб працягнуць, дайце праграме <b><xliff:g id="APP">%s</xliff:g></b> доступ да камеры прылады."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Уключыць"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Прыватнасць інфармацыі з датчыка"</string>
</resources>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 9ee0d99..173f9b5 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Само Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Обаждания през друга SIM карта от <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Не е пренасочено"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> след <xliff:g id="TIME_DELAY">{2}</xliff:g> секунди"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Услуга за известия за сензорите"</string>
<string name="twilight_service" msgid="8964898045693187224">"Услуга Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Инструмент за установяване на часовата зона (няма връзка)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Услуга на GNSS за актуализиране на часа"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Данните на устройството ви ще бъдат изтрити"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Приложението за администриране не може да се използва. Сега данните на устройството ви ще бъдат изтрити.\n\nАко имате въпроси, свържете се с администратора на организацията си."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Отпечатването е деактивиранo от <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Можете да увеличите целия екран или част от него"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Включете от настройките"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Отхвърляне"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"За да продължите, <b><xliff:g id="APP">%s</xliff:g></b> се нуждае от достъп до микрофона на устройството ви."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"За да продължите, <b><xliff:g id="APP">%s</xliff:g></b> се нуждае от достъп до камерата на устройството ви."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Включване"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Поверителност на сензорните данни"</string>
</resources>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index 3ce96c7..51d09b2 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"শুধুমাত্র ওয়াই-ফাই"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ক্রস সিম কল করা"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ফরওয়ার্ড করা হয়নি"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> সেকেন্ড পরে"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"সেন্সর বিজ্ঞপ্তি পরিষেবা"</string>
<string name="twilight_service" msgid="8964898045693187224">"গোধূলি পরিষেবা"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"টাইম জোন ডিটেক্টর (কানেকশন নেই)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS সময় আপডেট পরিষেবা"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"আপনার ডিভাইসটি মুছে ফেলা হবে"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"অ্যাডমিন অ্যাপটি ব্যবহার করা যাবে না। আপনার ডিভাইসে থাকা সবকিছু এখন মুছে ফেলা হবে।\n\nকোনও প্রশ্ন থাকলে আপনার প্রতিষ্ঠানের অ্যাডমিনের সাথে যোগাযোগ করুন।"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> প্রিন্টিং বন্ধ রেখেছে।"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"এখন আপনি কিছু বা সবকটি স্ক্রিন বড় করে দেখতে পারেন"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"সেটিংস থেকে চালু করুন"</string>
<string name="dismiss_action" msgid="1728820550388704784">"বাতিল করুন"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"চালিয়ে যেতে, <b><xliff:g id="APP">%s</xliff:g></b> আপনার ডিভাইসের মাইক্রোফোন অ্যাক্সেস করতে চায়।"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"চালিয়ে যেতে, <b><xliff:g id="APP">%s</xliff:g></b> আপনার ডিভাইসের ক্যামেরা অ্যাক্সেস করতে চায়।"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"চালু করুন"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"সেন্সর গোপনীয়তা"</string>
</resources>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 6c54eb1..1c8644e 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Samo WiFi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> – pozivanje na različitim SIM-ovima"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nije proslijeđen"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> za <xliff:g id="TIME_DELAY">{2}</xliff:g> sekundi"</string>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index 6d81104..d369134 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Només Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Trucades entre targetes SIM de l\'operador <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: no s\'ha desviat"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> després de <xliff:g id="TIME_DELAY">{2}</xliff:g> segons"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Servei de notificacions de sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Servei Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de zona horària (sense connectivitat)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Servei GNSS d\'actualització horària"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"El contingut del dispositiu s\'esborrarà"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"No es pot utilitzar l\'aplicació d\'administració. S\'esborraran les dades del dispositiu.\n\nSi tens cap dubte, contacta amb l\'administrador de la teva organització."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ha desactivat la impressió."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Ara pots ampliar la pantalla completa o una part"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activa a Configuració"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Ignora"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Per continuar, <b><xliff:g id="APP">%s</xliff:g></b> necessita accedir al micròfon del dispositiu."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Per continuar, <b><xliff:g id="APP">%s</xliff:g></b> necessita accedir a la càmera del dispositiu."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Activa"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privadesa dels sensors"</string>
</resources>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 00b607c..7936adc 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Pouze Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> – volání napříč SIM kartami"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nepřesměrováno"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> po <xliff:g id="TIME_DELAY">{2}</xliff:g> sek."</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Služba oznámení ze senzoru"</string>
<string name="twilight_service" msgid="8964898045693187224">"Služba detekce soumraku"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detektor časového pásma (bez připojení)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS – služba pro aktualizaci času"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Zařízení bude vymazáno"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Aplikaci pro správu nelze použít. Zařízení teď bude vymazáno.\n\nV případě dotazů vám pomůže administrátor organizace."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Aplikace <xliff:g id="OWNER_APP">%s</xliff:g> tisk zakazuje."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Nyní můžete zvětšit celou obrazovku nebo její část"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Zapnout v Nastavení"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Zavřít"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Než budete pokračovat, udělte aplikaci <b><xliff:g id="APP">%s</xliff:g></b> přístup k mikrofonu na zařízení."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Než budete pokračovat, udělte aplikaci <b><xliff:g id="APP">%s</xliff:g></b> přístup k fotoaparátu na zařízení."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Zapnout"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Ochrana soukromí – senzor"</string>
</resources>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 6e9a7e7..ba0ef7f 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Kun Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Opkald på tværs af SIM-kort"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke viderestillet"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> efter <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunder"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Tjenesten Sensor Notification"</string>
<string name="twilight_service" msgid="8964898045693187224">"Tjenesten Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tidszoneregistrering (ingen forbindelse)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Tjeneste til opdatering af GNSS-tid"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Enheden slettes"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administrationsappen kan ikke bruges. Enheden vil nu blive ryddet. \n\nKontakt din organisations administrator, hvis du har spørgsmål."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Udskrivning er deaktiveret af <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2207,12 +2207,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Du kan nu forstørre dele af eller hele skærmen"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aktivér i Indstillinger"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Luk"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> skal have adgang til din enheds mikrofon, før den kan fortsætte."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> skal have adgang til din enheds kamera, før den kan fortsætte."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktivér"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Beskyttelse af sensoroplysninger"</string>
</resources>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index ef7e628..f8066e2 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Nur WLAN"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM-übergreifende Anrufe"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nicht weitergeleitet"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g><xliff:g id="DIALING_NUMBER">{1}</xliff:g> nach <xliff:g id="TIME_DELAY">{2}</xliff:g> Sekunden."</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensor Notification Service"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Zeitzonen-Erkennung (keine Verbindung)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS-Zeitaktualisierungsdienst"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Die Daten auf deinem Gerät werden gelöscht."</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Die Admin-App kann nicht verwendet werden. Die Daten auf deinem Gerät werden nun gelöscht.\n\nBitte wende dich bei Fragen an den Administrator deiner Organisation."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Drucken wurde von <xliff:g id="OWNER_APP">%s</xliff:g> deaktiviert."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Du kannst das Display teilweise oder ganz vergrößern"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"In den Einstellungen aktivieren"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Schließen"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Zum Fortfahren benötigt, <b><xliff:g id="APP">%s</xliff:g></b> Zugriff auf das Mikrofon deines Geräts."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Zum Fortfahren benötigt <b><xliff:g id="APP">%s</xliff:g></b> Zugriff auf die Kamera deines Geräts."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktivieren"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Datenschutz für Sensoren"</string>
</resources>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 614fc95..ea56ee2 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Μόνο Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Κλήση με πολλές SIM <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Δεν προωθήθηκε"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> μετά από <xliff:g id="TIME_DELAY">{2}</xliff:g> δευτερόλεπτα"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Υπηρεσία ειδοποίησης αισθητήρα"</string>
<string name="twilight_service" msgid="8964898045693187224">"Υπηρεσία Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Εντοπισμός ζώνης ώρας (χωρίς συνδεσιμότητα)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Υπηρεσία ενημέρωσης ώρας GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Η συσκευή σας θα διαγραφεί"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Δεν είναι δυνατή η χρήση της εφαρμογής διαχειριστή. Η συσκευή σας θα διαγραφεί.\n\nΕάν έχετε ερωτήσεις, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Η εκτύπωση απενεργοποιήθηκε από τον χρήστη <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Μεγεθύνετε μέρος ή ολόκληρη την οθόνη σας"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Ενεργοποίηση στις Ρυθμίσεις"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Παράβλεψη"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Για να συνεχίσετε, η εφαρμογή <b><xliff:g id="APP">%s</xliff:g></b> χρειάζεται πρόσβαση στο μικρόφωνο της συσκευής σας."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Για να συνεχίσετε, η εφαρμογή <b><xliff:g id="APP">%s</xliff:g></b> χρειάζεται πρόσβαση στην κάμερα της συσκευής σας."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Ενεργοποίηση"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Απόρρητο αισθητήρα"</string>
</resources>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 6d760d0..9f3bc7d 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM calling"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup calling"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index c529338..766e372 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM calling"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup calling"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 1d4a614..16da211 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM calling"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup calling"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 0b7e11a..150830e 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM calling"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup calling"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml
index 0fbfcc3..e952cac 100644
--- a/core/res/res/values-en-rXC/strings.xml
+++ b/core/res/res/values-en-rXC/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi only"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM Calling"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"<xliff:g id="SPN">%s</xliff:g> Backup Calling"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 75973ae..4ee4b8e 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Solo Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Llamadas entre tarjetas SIM de <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: no se ha remitido"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> después de <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index e84fd00..39f8ef4f 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Solo Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Llamadas entre tarjetas SIM de <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: No desviada"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> transcurridos <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Servicio de notificación de sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Servicio de Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de zona horaria (sin conexión)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Servicio de actualización de tiempo GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Tu dispositivo se borrará"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"No se puede utilizar la aplicación de administración. Se borrarán todos los datos del dispositivo.\n\nSi tienes alguna pregunta, ponte en contacto con el administrador de tu organización."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ha inhabilitado la impresión."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Ahora puedes ampliar toda la pantalla o una parte"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activar en Ajustes"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Cerrar"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> necesita tener acceso al micrófono del dispositivo."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> necesita tener acceso a la cámara del dispositivo."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Activar"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privacidad del sensor"</string>
</resources>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index f7d053d..faf1b74 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Ainult WiFi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> – helistamine mitme SIM-kaardi kaudu"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: pole suunatud"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> sekundi pärast"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Anduri märguande teenus"</string>
<string name="twilight_service" msgid="8964898045693187224">"Teenus Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Ajavööndi tuvastaja (ühenduvus puudub)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS-i aja värskendamise teenus"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Seade kustutatakse"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administraatori rakendust ei saa kasutada. Teie seade tühjendatakse nüüd.\n\nKui teil on küsimusi, võtke ühendust organisatsiooni administraatoriga."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Rakendus <xliff:g id="OWNER_APP">%s</xliff:g> on printimise keelanud."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Nüüd saab suurendada kogu ekraanikuva või osa sellest"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Lülitage sisse menüüs Seaded"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Loobu"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Jätkamiseks vajab rakendus <b><xliff:g id="APP">%s</xliff:g></b> juurdepääsu teie seadme mikrofonile."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Jätkamiseks vajab rakendus <b><xliff:g id="APP">%s</xliff:g></b> juurdepääsu teie seadme kaamerale."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Lülita sisse"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Anduri privaatsus"</string>
</resources>
diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml
index b22a777..bc691a5 100644
--- a/core/res/res/values-eu/strings.xml
+++ b/core/res/res/values-eu/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wifi-sarea soilik"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> operadorearen beste SIM txartel batetik deitzeko aukera"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ez da desbideratu"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> zenbakira <xliff:g id="TIME_DELAY">{2}</xliff:g> segundotan"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sentsorearen jakinarazpen-zerbitzua"</string>
<string name="twilight_service" msgid="8964898045693187224">"Ilunabarreko zerbitzua"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Ordu-zonaren hautemailea (ez zaude konektatuta sarera)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS ordua eguneratzeko zerbitzua"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Gailuko datuak ezabatu egingo dira"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Ezin da erabili administratzeko aplikazioa. Ezabatu egingo da gailuko eduki guztia.\n\nZalantzarik baduzu, jarri erakundeko administratzailearekin harremanetan."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> aplikazioak desgaitu egin du inprimatzeko aukera."</string>
@@ -1589,7 +1589,7 @@
<string name="display_manager_built_in_display_name" msgid="1015775198829722440">"Pantaila integratua"</string>
<string name="display_manager_hdmi_display_name" msgid="1022758026251534975">"HDMI pantaila"</string>
<string name="display_manager_overlay_display_name" msgid="5306088205181005861">"<xliff:g id="ID">%1$d</xliff:g>. gainjartzea"</string>
- <string name="display_manager_overlay_display_title" msgid="1480158037150469170">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> x <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi"</string>
+ <string name="display_manager_overlay_display_title" msgid="1480158037150469170">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> × <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi"</string>
<string name="display_manager_overlay_display_secure_suffix" msgid="2810034719482834679">", segurua"</string>
<string name="kg_forgot_pattern_button_text" msgid="406145459223122537">"Eredua ahaztu zaizu"</string>
<string name="kg_wrong_pattern" msgid="1342812634464179931">"Eredu okerra"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Orain, pantaila osoa edo haren zati bat handi dezakezu"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aktibatu ezarpenetan"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Baztertu"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Aurrera egiteko, gailuaren mikrofonoa atzitzeko baimena behar du <b><xliff:g id="APP">%s</xliff:g></b> aplikazioak."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Aurrera egiteko, gailuaren kamera atzitzeko baimena behar du <b><xliff:g id="APP">%s</xliff:g></b> aplikazioak."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktibatu"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sentsoreen pribatutasuna"</string>
</resources>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 98d715b..9258b30 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"فقط Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"تماس بین سیمکارت <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: هدایت نشده"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> پس از <xliff:g id="TIME_DELAY">{2}</xliff:g> ثانیه"</string>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index 159e1b4..034ee0b 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Vain Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"SIM-korttien väliset puhelut: <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ei siirretty"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunnin päästä"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Anturin ilmoituspalvelu"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight-palvelu"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Aikavyöhykkeen tunnistin (ei yhteyttä)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS-ajanpäivityspalvelu"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Laitteen tiedot poistetaan"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Hallintasovellusta ei voi käyttää. Laitteen tiedot pyyhitään.\n\nPyydä ohjeita järjestelmänvalvojaltasi."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> on poistanut tulostuksen käytöstä."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Voit nyt suurentaa näytön osittain tai kokonaan"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Laita päälle asetuksista"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Hylkää"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Jotta voit jatkaa, <b><xliff:g id="APP">%s</xliff:g></b> tarvitsee pääsyn laitteesi mikrofoniin."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Jotta voit jatkaa, <b><xliff:g id="APP">%s</xliff:g></b> tarvitsee pääsyn laitteesi kameraan."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Laita päälle"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Anturin tietosuoja"</string>
</resources>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index e34bf8b..849f9594 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi seulement"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Appels multiSIM avec <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : non transféré"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : <xliff:g id="DIALING_NUMBER">{1}</xliff:g> au bout de <xliff:g id="TIME_DELAY">{2}</xliff:g> secondes"</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index b6eade2..60138c4 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi uniquement"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Appels par cartes SIM croisées <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : non transféré"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : <xliff:g id="DIALING_NUMBER">{1}</xliff:g> au bout de <xliff:g id="TIME_DELAY">{2}</xliff:g> secondes"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Service de notification du capteur"</string>
<string name="twilight_service" msgid="8964898045693187224">"Service Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Outil de détection du fuseau horaire (aucune connectivité)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Service de mise à jour de l\'heure GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Les données de votre appareil vont être effacées"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Impossible d\'utiliser l\'application d\'administration. Les données de votre appareil vont maintenant être effacées.\n\nSi vous avez des questions, contactez l\'administrateur de votre organisation."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Impression désactivée par <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Vous pouvez agrandir tout ou partie de l\'écran"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activer dans les paramètres"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Fermer"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Pour continuer, <b><xliff:g id="APP">%s</xliff:g></b> a besoin d\'accéder au micro de votre appareil."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Pour continuer, <b><xliff:g id="APP">%s</xliff:g></b> a besoin d\'accéder à l\'appareil photo de votre appareil."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Activer"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Confidentialité du capteur"</string>
</resources>
diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml
index 04b4236..8418604 100644
--- a/core/res/res/values-gl/strings.xml
+++ b/core/res/res/values-gl/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Só por wifi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Chamadas doutra SIM a través desta (<xliff:g id="SPN">%s</xliff:g>)"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: non desviada"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> tras <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Servizo de notificacións dos sensores"</string>
<string name="twilight_service" msgid="8964898045693187224">"Servizo Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de fuso horario (non require conexión)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Servizo de actualización horaria mediante o GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Borrarase o teu dispositivo"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Non se pode utilizar a aplicación de administración. Borrarase o teu dispositivo.\n\nSe tes preguntas, contacta co administrador da organización."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> desactivou a impresión."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Agora podes ampliar toda a pantalla ou parte dela"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activar en Configuración"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Ignorar"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> precisa acceder ao micrófono do dispositivo."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Para continuar, <b><xliff:g id="APP">%s</xliff:g></b> precisa acceder á cámara do dispositivo."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Activar"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privacidade do sensor"</string>
</resources>
diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml
index 7bab2ad..86416bc 100644
--- a/core/res/res/values-gu/strings.xml
+++ b/core/res/res/values-gu/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"ફક્ત વાઇ-ફાઇ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ક્રૉસ સિમ કૉલિંગ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ફોરવર્ડ કર્યો નથી"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="TIME_DELAY">{2}</xliff:g> સેકન્ડ પછી <xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"સેન્સર નોટિફિકેશન સેવા"</string>
<string name="twilight_service" msgid="8964898045693187224">"ટ્વાઇલાઇટ સેવા"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"સમય ઝોન શોધવાની સુવિધા (કનેક્ટિવિટી જરૂરી નથી)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS સમય અપડેટ કરવાની સેવા"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"તમારું ઉપકરણ કાઢી નાખવામાં આવશે"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"વ્યવસ્થાપક ઍપનો ઉપયોગ કરી શકાશે નહીં. તમારું ઉપકરણ હવે કાઢી નાખવામાં આવશે.\n\nજો તમને પ્રશ્નો હોય, તો તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> દ્વારા પ્રિન્ટ કરવાનું બંધ કરાયું છે."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"હવે તમે તમારી કેટલીક કે આખી સ્ક્રીનને મોટી કરી શકો છો"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"સેટિંગમાં ચાલુ કરો"</string>
<string name="dismiss_action" msgid="1728820550388704784">"છોડી દો"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ચાલુ રાખવા માટે, <b><xliff:g id="APP">%s</xliff:g></b>ને તમારા ડિવાઇસના માઇક્રોફોનના ઍક્સેસની જરૂર છે."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ચાલુ રાખવા માટે, <b><xliff:g id="APP">%s</xliff:g></b>ને તમારા ડિવાઇસના કૅમેરાના ઍક્સેસની જરૂર છે."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ચાલુ કરો"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"સેન્સર પ્રાઇવસી સંબંધિત નોટિફિકેશન"</string>
</resources>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index dbdfd4a..f3cf7aa 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -57,7 +57,7 @@
<string name="imei" msgid="2157082351232630390">"आईएमईआई"</string>
<string name="meid" msgid="3291227361605924674">"MEID"</string>
<string name="ClipMmi" msgid="4110549342447630629">"इनकमिंग कॉलर आईडी"</string>
- <string name="ClirMmi" msgid="6752346475055446417">"आउटगोइंग कॉल करने पर अपना कॉलर आईडी छिपाएं"</string>
+ <string name="ClirMmi" msgid="6752346475055446417">"आउटगोइंग कॉल करने पर अपना नाम और नंबर छिपाएं"</string>
<string name="ColpMmi" msgid="4736462893284419302">"कनेक्ट किया गया लाइन आईडी"</string>
<string name="ColrMmi" msgid="5889782479745764278">"कनेक्ट किया गया लाइन आईडी प्रतिबंध"</string>
<string name="CfMmi" msgid="8390012691099787178">"कॉल आगे भेजना"</string>
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"केवल वाई-फ़ाई"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> क्रॉस सिम कॉलिंग"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: अग्रेषित नहीं किया गया"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> सेकंड के बाद"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"सेंसर से जुड़ी सूचना सेवा"</string>
<string name="twilight_service" msgid="8964898045693187224">"ट्वाइलाइट समय बताने वाली सेवा"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"समय क्षेत्र का पता लगाने वाली सुविधा (ऑफ़लाइन होने पर)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS समय अपडेट सेवा"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"आपके डिवाइस को मिटा दिया जाएगा"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"एडमिन ऐप्लिकेशन का इस्तेमाल नहीं किया जा सकता. आपके डिवाइस पर मौजूद डेटा अब मिटा दिया जाएगा.\n\nअगर आप कुछ पूछना चाहते हैं तो, अपने संगठन के एडमिन से संपर्क करें."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ने प्रिंटिंग सुविधा बंद कर दी है."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"अब अपनी पूरी स्क्रीन या कुछ हिस्से को ज़ूम करके देख सकते हैं"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"सेटिंग में जाकर, इस सुविधा को चालू करें"</string>
<string name="dismiss_action" msgid="1728820550388704784">"खारिज करें"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"जारी रखने के लिए, <b><xliff:g id="APP">%s</xliff:g></b> को आपके डिवाइस का माइक्रोफ़ोन ऐक्सेस करने की ज़रूरत है."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"जारी रखने के लिए, <b><xliff:g id="APP">%s</xliff:g></b> को आपके डिवाइस का कैमरा ऐक्सेस करने की ज़रूरत है."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"चालू करें"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"सेंसर से जुड़ी निजता के बारे में सूचना"</string>
</resources>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 56f3978..aac0650 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Samo Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Preusmjeravanje poziva na drugi SIM"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nije proslijeđeno"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> nakon <xliff:g id="TIME_DELAY">{2}</xliff:g> s"</string>
@@ -205,8 +206,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Usluga Obavijesti senzora"</string>
<string name="twilight_service" msgid="8964898045693187224">"Usluga Sumrak"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detektor vremenske zone (nije povezan)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS – usluga ažuriranja vremena"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Uređaj će se izbrisati"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administratorska aplikacija ne može se upotrebljavati. Uređaj će se izbrisati.\n\nAko imate pitanja, obratite se administratoru organizacije."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Ispis je onemogućila aplikacija <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2239,12 +2239,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Sad možete povećati dio zaslona ili cijeli zaslon"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Uključite u Postavkama"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Odbaci"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Da bi nastavila s radom, aplikacija <b><xliff:g id="APP">%s</xliff:g></b> treba pristupiti mikrofonu vašeg uređaja."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Da bi nastavila s radom, aplikacija <b><xliff:g id="APP">%s</xliff:g></b> treba pristupiti fotoaparatu vašeg uređaja."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Uključi"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privatnost senzora"</string>
</resources>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index 96997c0..841553a 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Csak Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM-eken keresztüli hívás"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: nincs átirányítva"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> másodperc után"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Szenzoros értesítési szolgáltatás"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight szolgáltatás"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Időzóna-felismerő (Offline)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS időfrissítési szolgáltatás"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"A rendszer törölni fogja eszközét"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"A rendszergazdai alkalmazás nem használható. A rendszer most törli az eszközt.\n\nKérdéseivel forduljon szervezete rendszergazdájához."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"A(z) <xliff:g id="OWNER_APP">%s</xliff:g> letiltotta a nyomtatást."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Ezután nagyíthatja a képernyőt vagy egy részét"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Bekapcsolás a Beállításokban"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Elvetés"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"A folytatáshoz a(z) <b><xliff:g id="APP">%s</xliff:g></b> alkalmazásnak hozzáférésre van szüksége az eszköze mikrofonjához."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"A folytatáshoz a(z) <b><xliff:g id="APP">%s</xliff:g></b> alkalmazásnak hozzáférésre van szüksége az eszköze kamerájához."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Bekapcsolás"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Érzékelőkkel kapcsolatos adatvédelem"</string>
</resources>
diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml
index 996454a..cddcfe6 100644
--- a/core/res/res/values-hy/strings.xml
+++ b/core/res/res/values-hy/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Միայն Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM քարտերով խաչաձև զանգեր"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>. Չի վերահասցեավորվել"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>. <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>. <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> վայրկյանից"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Տվիչների ծանուցումների մշակման ծառայություն"</string>
<string name="twilight_service" msgid="8964898045693187224">"Մթնշաղի սկիզբը որոշող ծառայություն"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Ժամային գոտու դետեկտոր (աշխատում է առանց ինտերնետի)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Ժամանակի թարմացման GNSS ծառայություն"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Ձեր սարքը ջնջվելու է"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Հնարավոր չէ օգտագործել ադմինիստրատորի հավելվածը։ Ձեր սարքից բոլոր տվյալները կջնջվեն։\n\nՀարցեր ունենալու դեպքում դիմեք ձեր կազմակերպության ադմինիստրատորին։"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Տպումն անջատված է <xliff:g id="OWNER_APP">%s</xliff:g> հավելվածի կողմից։"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Այժմ կարող եք խոշորացնել ամբողջ էկրանը կամ դրա մի մասը"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Միացնել կարգավորումներում"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Փակել"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Շարունակելու համար <b><xliff:g id="APP">%s</xliff:g></b> հավելվածին անհրաժեշտ է սարքի խոսափողի օգտագործման թույլտվություն։"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Շարունակելու համար <b><xliff:g id="APP">%s</xliff:g></b> հավելվածին անհրաժեշտ է ձեր սարքի տեսախցիկի օգտագործման թույլտվություն։"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Միացնել"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Տվիչների գաղտնիություն"</string>
</resources>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index bb91a6c..8bd34c3 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Khusus Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Panggilan Lintas-SIM <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Tidak diteruskan"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> setelah <xliff:g id="TIME_DELAY">{2}</xliff:g> detik"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Layanan Notifikasi Sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Layanan Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Pendeteksi Zona Waktu (Tidak ada konektivitas)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Layanan Pembaruan Waktu GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Perangkat akan dihapus"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Aplikasi admin tidak dapat digunakan. Perangkat Anda kini akan dihapus.\n\nJika ada pertanyaan, hubungi admin organisasi."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Fitur pencetakan dinonaktifkan oleh <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Anda bisa memperbesar sebagian atau seluruh layar"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aktifkan di Setelan"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Tutup"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Untuk melanjutkan, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses ke mikrofon perangkat."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Untuk melanjutkan, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses ke kamera perangkat."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktifkan"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privasi Sensor"</string>
</resources>
diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml
index ec11ad2..f9536fe 100644
--- a/core/res/res/values-is/strings.xml
+++ b/core/res/res/values-is/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi eingöngu"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Skipt á milli SIM-korta"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ekki áframsent"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> eftir <xliff:g id="TIME_DELAY">{2}</xliff:g> sekúndur"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Tilkynningaþjónusta nema"</string>
<string name="twilight_service" msgid="8964898045693187224">"Ljósaskiptaþjónusta"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tímabeltisgreinir (engin tenging)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Tímastillingarþjónusta hnattræna gervihnattaleiðsögukerfisins (GNSS)"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Tækið verður hreinsað"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Ekki er hægt að nota stjórnunarforritið. Tækinu verður eytt.\n\nEf spurningar vakna skaltu hafa samband við kerfisstjóra fyrirtækisins."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> lokaði á prentun."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Nú geturðu stækkað allan skjáinn eða hluta hans"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Kveikja á í stillingum"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Hunsa"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Til að halda áfram þarf <b><xliff:g id="APP">%s</xliff:g></b> aðgang að hljóðnema tækisins."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Til að halda áfram þarf <b><xliff:g id="APP">%s</xliff:g></b> aðgang að myndavél tækisins."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Kveikja"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Persónuvernd skynjara"</string>
</resources>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index df35881..2fcc273 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -57,7 +57,7 @@
<string name="imei" msgid="2157082351232630390">"IMEI"</string>
<string name="meid" msgid="3291227361605924674">"MEID"</string>
<string name="ClipMmi" msgid="4110549342447630629">"ID chiamante in entrata"</string>
- <string name="ClirMmi" msgid="6752346475055446417">"Nascondi ID chiamante in uscita"</string>
+ <string name="ClirMmi" msgid="6752346475055446417">"Nascondi ID chiamante per le chiamate in uscita"</string>
<string name="ColpMmi" msgid="4736462893284419302">"ID linea connessa"</string>
<string name="ColrMmi" msgid="5889782479745764278">"Limitazione ID linea connessa"</string>
<string name="CfMmi" msgid="8390012691099787178">"Deviazione chiamate"</string>
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Solo Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Chiamate tramite più SIM <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: inoltro non effettuato"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g><xliff:g id="DIALING_NUMBER">{1}</xliff:g> dopo <xliff:g id="TIME_DELAY">{2}</xliff:g> secondi"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Servizio di notifica dei sensori"</string>
<string name="twilight_service" msgid="8964898045693187224">"Servizio Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Rilevatore di fuso orario (connessione a Internet non necessaria)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Servizio di aggiornamento dell\'orario GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Il dispositivo verrà resettato"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Impossibile usare l\'app di amministrazione. Il dispositivo verrà resettato.\n\nPer eventuali domande, contatta l\'amministratore della tua organizzazione."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Stampa disattivata da <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Puoi ingrandire lo schermo in parte o per intero"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Attiva nelle Impostazioni"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Ignora"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Per continuare, l\'app <b><xliff:g id="APP">%s</xliff:g></b> deve accedere al microfono del dispositivo."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Per continuare, l\'app <b><xliff:g id="APP">%s</xliff:g></b> deve accedere alla videocamera del dispositivo."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Attiva"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privacy relativa ai sensori"</string>
</resources>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index f80750a..409b378 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi בלבד"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"העברת שיחות בין כרטיסי SIM של <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ללא העברה"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> כעבור <xliff:g id="TIME_DELAY">{2}</xliff:g> שניות"</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"שירות להתראות מחיישנים"</string>
<string name="twilight_service" msgid="8964898045693187224">"שירות דמדומים"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"מזהה אזור זמן (ללא צורך בקישוריות)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"שירות עדכון הזמן של GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"תתבצע מחיקה של המכשיר"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"לא ניתן להשתמש באפליקציה של מנהל המערכת.\n\nאם יש לך שאלות, יש ליצור קשר עם מנהל המערכת של הארגון."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"ההדפסה הושבתה על ידי <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"עכשיו אפשר להגדיל את המסך או חלקים ממנו"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"הפעלה בהגדרות"</string>
<string name="dismiss_action" msgid="1728820550388704784">"סגירה"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"כדי להמשיך, האפליקציה <b><xliff:g id="APP">%s</xliff:g></b> צריכה גישה למיקרופון של המכשיר שלך."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"כדי להמשיך, האפליקציה <b><xliff:g id="APP">%s</xliff:g></b> צריכה גישה למצלמה של המכשיר שלך."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"הפעלה"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"פרטיות חיישנים"</string>
</resources>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 04a0058..0696580 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fiのみ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM 通話"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:転送できません"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:<xliff:g id="DIALING_NUMBER">{1}</xliff:g> (<xliff:g id="TIME_DELAY">{2}</xliff:g>秒後)"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"センサー通知サービス"</string>
<string name="twilight_service" msgid="8964898045693187224">"トワイライト サービス"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Time Zone Detector（未接続）"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Time Update Service"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"デバイスのデータが消去されます"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"管理アプリを使用できません。デバイスのデータはこれから消去されます。\n\nご不明な点がある場合は、組織の管理者にお問い合わせください。"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"「<xliff:g id="OWNER_APP">%s</xliff:g>」により印刷は無効にされています。"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"画面の一部または全体を拡大できるようになりました"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"[設定] で ON にする"</string>
<string name="dismiss_action" msgid="1728820550388704784">"閉じる"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"続行するには、<b><xliff:g id="APP">%s</xliff:g></b> にデバイスのマイクへのアクセスを許可する必要があります。"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"続行するには、<b><xliff:g id="APP">%s</xliff:g></b> にデバイスのカメラへのアクセスを許可する必要があります。"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ON にする"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"センサー プライバシー"</string>
</resources>
diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml
index 6a128ab..ae1e6eb 100644
--- a/core/res/res/values-ka/strings.xml
+++ b/core/res/res/values-ka/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"მხოლოდ Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM-თაშორისი დარეკვა"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: არ არის გადამისამართებული"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> წამის შემდეგ"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"სენსორის შეტყობინების სერვისი"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight სერვისი"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"სასაათო სარტყლის დეტექტორი (კავშირის გარეშე)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS დროის განახლების სერვისი"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"თქვენი მოწყობილობა წაიშლება"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ადმინისტრატორის აპის გამოყენება ვერ მოხერხდება. თქვენი მოწყობილობა ახლა ამოიშლება.\n\nთუ შეკითხვები გაქვთ, დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"ბეჭდვა გათიშულია <xliff:g id="OWNER_APP">%s</xliff:g>-ის მიერ."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ახლა შეგიძლიათ, გაადიდოთ ეკრანი ან მისი ნაწილი"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ჩართვა პარამეტრებში"</string>
<string name="dismiss_action" msgid="1728820550388704784">"უარყოფა"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"გასაგრძელებლად <b><xliff:g id="APP">%s</xliff:g></b>-ს თქვენი მოწყობილობის მიკროფონზე წვდომა სჭირდება."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"გასაგრძელებლად <b><xliff:g id="APP">%s</xliff:g></b>-ს თქვენი მოწყობილობის კამერაზე წვდომა სჭირდება."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ჩართვა"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"სენსორის კონფიდენციალურობა"</string>
</resources>
diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml
index 8000fc4..aec2312 100644
--- a/core/res/res/values-kk/strings.xml
+++ b/core/res/res/values-kk/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Тек Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM карталары арасында қоңырау шалу"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Басқа нөмірге бағытталмады"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> секундтан кейін"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Датчик хабарландыруы қызметі"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight қызметі"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Уақыт белдеуін анықтағыш (қосылу мүмкіндігі жоқ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS уақыт жаңарту жүйесі"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Құрылғыңыздағы деректер өшіріледі"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Әкімші қолданбасын пайдалану мүмкін емес. Қазір құрылғыдағы деректер өшіріледі\n\nСұрақтарыңыз болса, ұйым әкімшісіне хабарласыңыз."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Басып шығаруды <xliff:g id="OWNER_APP">%s</xliff:g> өшірді."</string>
@@ -1809,8 +1809,8 @@
<string name="confirm_battery_saver" msgid="5247976246208245754">"Жарайды"</string>
<string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Батарея жұмысының ұзақтығын арттыру үшін Батареяны үнемдеу режимі:\n\n•қараңғы тақырыпты іске қосады;\n•фондық әрекеттерді, кейбір көрнекі әсерлерді және \"Ok Google\" сияқты басқа да функцияларды өшіреді не шектейді.\n\n"<annotation id="url">"Толығырақ"</annotation></string>
<string name="battery_saver_description" msgid="6794188153647295212">"Батарея ұзағырақ жұмыс істеуі үшін, Battery Saver:\n\n• қараңғы тақырыпты қосады;\n•фондық жұмысты, кейбір визуалды әсерлерді және \"Ok Google\" сияқты басқа функцияларды өшіреді не шектейді."</string>
- <string name="data_saver_description" msgid="4995164271550590517">"Дерек шығынын азайту үшін Data Saver функциясы кейбір қолданбаларға деректерді фондық режимде жіберуге және алуға жол бермейді. Ашық тұрған қолданба деректерді пайдаланады, бірақ шектеулі шамада (мысалы, кескіндер оларды түрткенге дейін көрсетілмейді)."</string>
- <string name="data_saver_enable_title" msgid="7080620065745260137">"Data Saver функциясын қосу керек пе?"</string>
+ <string name="data_saver_description" msgid="4995164271550590517">"Дерек шығынын азайту үшін Трафикті үнемдеу функциясы кейбір қолданбаларға деректерді фондық режимде жіберуге және алуға жол бермейді. Ашық тұрған қолданба деректерді пайдаланады, бірақ шектеулі шамада (мысалы, кескіндер оларды түрткенге дейін көрсетілмейді)."</string>
+ <string name="data_saver_enable_title" msgid="7080620065745260137">"Трафикті үнемдеу функциясын қосу керек пе?"</string>
<string name="data_saver_enable_button" msgid="4399405762586419726">"Қосу"</string>
<plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="2877101784123058273">
<item quantity="other">%1$d минут бойы (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін)</item>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Енді экранның бір бөлігін не барлығын ұлғайта аласыз."</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Параметрлер бөлімінен қосу"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Қабылдамау"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Жалғастыру үшін <b><xliff:g id="APP">%s</xliff:g></b> қолданбасы құрылғыңыздың микрофонына рұқсат алу керек."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Жалғастыру үшін <b><xliff:g id="APP">%s</xliff:g></b> қолданбасы құрылғыңыздың камерасына рұқсат алу керек."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Қосу"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Датчикке қатысты құпиялылық"</string>
</resources>
diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml
index e6a2fc6..fac878d 100644
--- a/core/res/res/values-km/strings.xml
+++ b/core/res/res/values-km/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi តែប៉ុណ្ណោះ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"ការហៅទូរសព្ទឆ្លងស៊ីមតាមរយៈ <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> ៖ មិនបានបញ្ជូនបន្ត"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> បន្ទាប់ពី <xliff:g id="TIME_DELAY">{2}</xliff:g> វិនាទី"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"សេវាកម្មជូនដំណឹងឧបករណ៍ចាប់សញ្ញា"</string>
<string name="twilight_service" msgid="8964898045693187224">"សេវាកម្មព្រលប់"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ឧបករណ៍សម្គាល់ល្វែងម៉ោង (គ្មានការតភ្ជាប់ទេ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"សេវាកម្មធ្វើបច្ចុប្បន្នភាពពេលវេលា GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ឧបករណ៍របស់អ្នកនឹងត្រូវបានលុប"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"មិនអាចប្រើកម្មវិធីអ្នកគ្រប់គ្រងបានទេ។ ឧបករណ៍របស់អ្នកនឹងលុបឥឡូវនេះ។\n\nប្រសិនបើអ្នកមានសំណួរផ្សេងៗ សូមទាក់ទងទៅអ្នកគ្រប់គ្រងស្ថាប័នរបស់អ្នក។"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"ការបោះពុម្ពត្រូវបានបិទដោយ <xliff:g id="OWNER_APP">%s</xliff:g> ។"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ឥឡូវនេះ អ្នកអាចពង្រីកផ្នែកខ្លះ ឬទាំងអស់នៃអេក្រង់របស់អ្នក"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"បើកនៅក្នុងការកំណត់"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ច្រានចោល"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ដើម្បីបន្ត <b><xliff:g id="APP">%s</xliff:g></b> ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនរបស់ឧបករណ៍អ្នក។"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ដើម្បីបន្ត <b><xliff:g id="APP">%s</xliff:g></b> ត្រូវការសិទ្ធិចូលប្រើកាមេរ៉ារបស់ឧបករណ៍អ្នក។"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"បើក"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ឯកជនភាពឧបករណ៍ចាប់សញ្ញា"</string>
</resources>
diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml
index f2d91f2..afeb1bd 100644
--- a/core/res/res/values-kn/strings.xml
+++ b/core/res/res/values-kn/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"ವೈ-ಫೈ ಮಾತ್ರ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ಕ್ರಾಸ್-ಸಿಮ್ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> ಸೆಕೆಂಡುಗಳ ನಂತರ <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"ಸೆನ್ಸರ್ ಅಧಿಸೂಚನೆ ಸೇವೆ"</string>
<string name="twilight_service" msgid="8964898045693187224">"ಟ್ವಿಲೈಟ್ ಸೇವೆ"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ಸಮಯವಲಯ ಡಿಟೆಕ್ಟರ್ (ಯಾವುದೇ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆ ಇಲ್ಲ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS ಸಮಯದ ಅಪ್ಡೇಟ್ ಸೇವೆ"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಇದೀಗ ಅಳಿಸಲಾಗುತ್ತದೆ.\n\nನಿಮ್ಮಲ್ಲಿ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ಮೂಲಕ ಪ್ರಿಂಟಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ಈಗ ಕೆಲವು ಅಥವಾ ಎಲ್ಲಾ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಹಿಗ್ಗಿಸಬಹುದು"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಆನ್ ಮಾಡಿ"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ವಜಾಗೊಳಿಸಿ"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ಮುಂದುವರಿಯಲು, <b><xliff:g id="APP">%s</xliff:g></b> ಗೆ ನಿಮ್ಮ ಸಾಧನದ ಮೈಕ್ರೋಫೋನ್ನ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ಮುಂದುವರಿಯಲು, <b><xliff:g id="APP">%s</xliff:g></b> ಗೆ ನಿಮ್ಮ ಸಾಧನದ ಕ್ಯಾಮರಾದ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ಆನ್ ಮಾಡಿ"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ಸೆನ್ಸರ್ ಗೌಪ್ಯತೆ"</string>
</resources>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index ea5de596..acc5a6a 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi에서만"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross SIM 통화"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: 착신전환 안됨"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g><xliff:g id="TIME_DELAY">{2}</xliff:g>초 후"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"센서 알림 서비스"</string>
<string name="twilight_service" msgid="8964898045693187224">"새벽 서비스"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"시간대 감지(연결되지 않음)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS 시간 업데이트 서비스"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"기기가 삭제됩니다."</string>
<string name="factory_reset_message" msgid="2657049595153992213">"관리자 앱을 사용할 수 없습니다. 곧 기기가 삭제됩니다.\n\n궁금한 점이 있으면 조직의 관리자에게 문의하세요."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g>에 의해 사용 중지되었습니다."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"이제 화면 일부 또는 전체를 확대할 수 있습니다."</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"설정에서 사용 설정"</string>
<string name="dismiss_action" msgid="1728820550388704784">"닫기"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"계속하려면 <b><xliff:g id="APP">%s</xliff:g></b>에서 기기 마이크에 액세스해야 합니다."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"계속하려면 <b><xliff:g id="APP">%s</xliff:g></b>에서 기기 카메라에 액세스해야 합니다."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"사용"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"센서 개인정보 보호"</string>
</resources>
diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml
index 5137a22..d6ff927 100644
--- a/core/res/res/values-ky/strings.xml
+++ b/core/res/res/values-ky/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi гана"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM карталарынан кайчылаш чалуу"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Багытталган эмес"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> секунддан кийин"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Сенсордун билдирмелеринин кызматы"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight кызматы"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Убакыт алкагын аныктагыч (байланыш жок)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Убакытты жаңыртуу кызматы"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Түзмөгүңүз тазаланат"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Түзмөктү башкаруучу колдонмо жараксыз. Түзмөгүңүз азыр тазаланат.\n\nСуроолоруңуз болсо, ишканаңыздын администраторуна кайрылыңыз."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Басып чыгаруу <xliff:g id="OWNER_APP">%s</xliff:g> тарабынан өчүрүлдү."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Эми толук экранды же анын бөлүгүн чоңойто аласыз"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Жөндөөлөрдөн күйгүзүү"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Жабуу"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Улантуу үчүн <b><xliff:g id="APP">%s</xliff:g></b> колдонмосуна түзмөгүңүздүн микрофонун пайдаланууга уруксат беришиңиз керек."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Улантуу үчүн <b><xliff:g id="APP">%s</xliff:g></b> колдонмосуна түзмөгүңүздүн камерасын пайдаланууга уруксат беришиңиз керек."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Күйгүзүү"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Сенсордун купуялыгы"</string>
</resources>
diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml
index 7de2a91..9977f9f 100644
--- a/core/res/res/values-lo/strings.xml
+++ b/core/res/res/values-lo/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi ເທົ່ານັ້ນ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ການໂທຂ້າມຊິມ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ບໍ່ຖືກສົ່ງຕໍ່"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> ຫຼັງຈາກ <xliff:g id="TIME_DELAY">{2}</xliff:g> ວິນາທີ"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"ບໍລິການການແຈ້ງເຕືອນເຊັນເຊີ"</string>
<string name="twilight_service" msgid="8964898045693187224">"ບໍລິການ Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ຕົວກວດຫາເຂດເວລາ (ບໍ່ມີການເຊື່ອມຕໍ່)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"ບໍລິການອັບເດດເວລາ GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ອຸປະກອນຂອງທ່ານຈະຖືກລຶບ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ບໍ່ສາມາດໃຊ້ແອັບຜູ້ເບິ່ງແຍງລະບົບໄດ້. ອຸປະກອນຂອງທ່ານຈະຖືກລຶບຂໍ້ມູນໃນຕອນນີ້.\n\nຫາກທ່ານມີຄຳຖາມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"ການພິມຖືກປິດໄວ້ໂດຍ <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ຕອນນີ້ທ່ານສາມາດຂະຫຍາຍບາງສ່ວນ ຫຼື ທັງໝົດຂອງໜ້າຈໍໄດ້"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ເປີດໃຊ້ໃນການຕັ້ງຄ່າ"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ປິດໄວ້"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ເພື່ອດຳເນີນການຕໍ່, <b><xliff:g id="APP">%s</xliff:g></b> ຕ້ອງການສິດເຂົ້າເຖິງໄມໂຄຣໂຟນອຸປະກອນທ່ານ."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ເພື່ອດຳເນີນການຕໍ່, <b><xliff:g id="APP">%s</xliff:g></b> ຕ້ອງການສິດເຂົ້າເຖິງກ້ອງຖ່າຍຮູບຂອງອຸປະກອນທ່ານ."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ເປີດໃຊ້"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ຄວາມເປັນສ່ວນຕົວເຊັນເຊີ"</string>
</resources>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 155d4cfb..5c65d06 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Tik „Wi-Fi“"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"„<xliff:g id="SPN">%s</xliff:g>“: skambinimas per SIM korteles"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neperadresuota"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> po <xliff:g id="TIME_DELAY">{2}</xliff:g> sek."</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Jutiklių pranešimų paslauga"</string>
<string name="twilight_service" msgid="8964898045693187224">"Paslauga „Twilight“"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Laiko juostos aptikimo priemonė (nėra ryšio)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS laiko atnaujinimo paslauga"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Įrenginys bus ištrintas"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administratoriaus programos negalima naudoti. Dabar įrenginio duomenys bus ištrinti.\n\nJei turite klausimų, susisiekite su organizacijos administratoriumi."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Neleidžiama spausdinti (<xliff:g id="OWNER_APP">%s</xliff:g>)."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Dabar galite padidinti dalį ekrano ar jį visą"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Įjungti nustatymuose"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Atmesti"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Kad būtų galima tęsti, <b><xliff:g id="APP">%s</xliff:g></b> reikalinga prieiga prie įrenginio mikrofono."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Kad būtų galima tęsti, <b><xliff:g id="APP">%s</xliff:g></b> reikalinga prieiga prie įrenginio fotoaparato."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Įjungti"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Jutiklių privatumas"</string>
</resources>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index cd88997..2840429 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Tikai Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g>: zvanīšana, izmantojot dažādas SIM kartes"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: nav pāradresēts"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> pēc <xliff:g id="TIME_DELAY">{2}</xliff:g> sekundes(-ēm)"</string>
@@ -205,8 +206,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensoru paziņojumu pakalpojums"</string>
<string name="twilight_service" msgid="8964898045693187224">"Krēslas noteikšanas pakalpojums"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Laika joslas noteikšanas rīks (nav savienojuma)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS laika atjaunināšanas pakalpojums"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Jūsu ierīces dati tiks dzēsti"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administratora lietotni nevar izmantot. Ierīcē saglabātie dati tiks dzēsti.\n\nJa jums ir kādi jautājumi, sazinieties ar savas organizācijas administratoru."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Drukāšanu atspējoja <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2239,12 +2239,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Tagad varat palielināt ekrāna daļu vai visu ekrānu"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Ieslēgt sadaļā Iestatījumi"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Nerādīt"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Lai turpinātu, lietotnei <b><xliff:g id="APP">%s</xliff:g></b> nepieciešama piekļuve jūsu ierīces mikrofonam."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Lai turpinātu, lietotnei <b><xliff:g id="APP">%s</xliff:g></b> nepieciešama piekļuve jūsu ierīces kamerai."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Ieslēgt"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensoru konfidencialitāte"</string>
</resources>
diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml
index d8ecc54..3466bca 100644
--- a/core/res/res/values-mk/strings.xml
+++ b/core/res/res/values-mk/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Само Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Повици преку повеќе SIM-картички на <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не е препратено"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> по <xliff:g id="TIME_DELAY">{2}</xliff:g> секунди"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Услуга за известување од сензорот"</string>
<string name="twilight_service" msgid="8964898045693187224">"Услуга за самрак"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Откривач на временска зона (не може да се поврзе)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Услуга за ажурирање на времето на GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Уредот ќе се избрише"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Апликацијата на администраторот не може да се користи. Уредот ќе се избрише сега.\n\nАко имате прашања, контактирајте со администраторот на организацијата."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Печатењето е оневозможено од <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Сега може се зголеми целиот екран или само дел"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Вклучи во „Поставки“"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Отфрли"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"За да продолжи, на <b><xliff:g id="APP">%s</xliff:g></b> ѝ е потребен пристап до микрофонот на уредот."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"За да продолжи, на <b><xliff:g id="APP">%s</xliff:g></b> ѝ е потребен пристап до камерата на уредот."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Вклучи"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Приватност на сензорот"</string>
</resources>
diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml
index f7a3161..e0d4b01 100644
--- a/core/res/res/values-ml/strings.xml
+++ b/core/res/res/values-ml/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"വൈഫൈ മാത്രം"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ക്രോസ് സിം കോളിംഗ്"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: കൈമാറിയില്ല"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> നിമിഷത്തിനുശേഷം <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"സെൻസർ അറിയിപ്പ് സേവനം"</string>
<string name="twilight_service" msgid="8964898045693187224">"സന്ധ്യാസമയത്തെ സേവനം"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"സമയമേഖല കണ്ടെത്താനുള്ള സംവിധാനം (കണക്റ്റിവിറ്റി ഇല്ല)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS സമയ അപ്ഡേറ്റ് സേവനം"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"നിങ്ങളുടെ ഉപകരണം മായ്ക്കും"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"അഡ്മിൻ ആപ്പ് ഉപയോഗിക്കാനാകില്ല. നിങ്ങളുടെ ഉപകരണം ഇപ്പോൾ മായ്ക്കപ്പെടും.\n\nനിങ്ങൾക്ക് ചോദ്യങ്ങൾ ഉണ്ടെങ്കിൽ, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്മിനെ ബന്ധപ്പെടുക."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> പ്രിന്റിംഗ് പ്രവർത്തനരഹിതമാക്കി."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"സ്ക്രീനിന്റെ ഭാഗങ്ങളോ മുഴുവനുമോ മാഗ്നിഫൈ ചെയ്യാം"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ക്രമീകരണത്തിൽ ഓണാക്കുക"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ഡിസ്മിസ് ചെയ്യുക"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"തുടരാൻ, <b><xliff:g id="APP">%s</xliff:g></b> ആപ്പിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ മൈക്രോഫോണിലേക്ക് ആക്സസ് നൽകേണ്ടതുണ്ട്."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"തുടരാൻ, <b><xliff:g id="APP">%s</xliff:g></b> ആപ്പിന് നിങ്ങളുടെ ഉപകരണത്തിന്റെ ക്യാമറയിലേക്ക് ആക്സസ് നൽകേണ്ടതുണ്ട്."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ഓണാക്കുക"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"സെൻസർ സ്വകാര്യത"</string>
</resources>
diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml
index cb3f00d..2c44adc 100644
--- a/core/res/res/values-mn/strings.xml
+++ b/core/res/res/values-mn/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Зөвхөн Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> SIM хоорондын дуудлага"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: дамжуулагдаагүй"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> секундын дараа"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Мэдрэгчийн мэдэгдлийн үйлчилгээ"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight үйлчилгээ"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Цагийн бүс илрүүлэгч (Холболт байхгүй)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Хугацаа шинэчлэлтийн үйлчилгээ"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Таны төхөөрөмж устах болно."</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Админ аппыг ашиглах боломжгүй. Таны төхөөрөмжийг одоо устгана.\n\nХэрэв танд асуулт байгаа бол байгууллагынхаа админтай холбогдоно уу."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> хэвлэх үйлдлийг идэвхгүй болгосон."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Та одоо зарим эсвэл бүх дэлгэцээ томруулж болно"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Тохиргоонд асаана уу"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Үл хэрэгсэх"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Үргэлжлүүлэхийн тулд, <b><xliff:g id="APP">%s</xliff:g></b> таны төхөөрөмжийн микрофонд хандах шаардлагатай."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Үргэлжлүүлэхийн тулд <b><xliff:g id="APP">%s</xliff:g></b> таны төхөөрөмжийн камерт хандах шаардлагатай."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Асаах"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Мэдрэгчийн нууцлал"</string>
</resources>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index 4921f25..d57c4c1 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -57,8 +57,7 @@
<string name="imei" msgid="2157082351232630390">"IMEI"</string>
<string name="meid" msgid="3291227361605924674">"MEID"</string>
<string name="ClipMmi" msgid="4110549342447630629">"येणारा कॉलर आयडी"</string>
- <!-- no translation found for ClirMmi (6752346475055446417) -->
- <skip />
+ <string name="ClirMmi" msgid="6752346475055446417">"आउटगोइंग कॉलर आयडी लपवा"</string>
<string name="ColpMmi" msgid="4736462893284419302">"कनेक्ट केलेला रेखा आयडी"</string>
<string name="ColrMmi" msgid="5889782479745764278">"कनेक्ट केलेला रेखा आयडी प्रतिबंध"</string>
<string name="CfMmi" msgid="8390012691099787178">"कॉल फॉरवर्डिंग"</string>
@@ -149,12 +148,13 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"केवळ वाय-फाय"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> क्रॉस सिम कॉलिंग"</string>
- <string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: अग्रेषित केला नाही"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
+ <string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: फॉरवर्ड केला नाही"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> सेकंदांनंतर <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
- <string name="cfTemplateRegistered" msgid="5619930473441550596">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: अग्रेषित केला नाही"</string>
- <string name="cfTemplateRegisteredTime" msgid="5222794399642525045">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: अग्रेषित केला नाही"</string>
+ <string name="cfTemplateRegistered" msgid="5619930473441550596">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: फॉरवर्ड केला नाही"</string>
+ <string name="cfTemplateRegisteredTime" msgid="5222794399642525045">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: फॉरवर्ड केला नाही"</string>
<string name="fcComplete" msgid="1080909484660507044">"वैशिष्ट्य कोड पूर्ण."</string>
<string name="fcError" msgid="5325116502080221346">"कनेक्शन समस्या किंवा अवैध फीचर कोड."</string>
<string name="httpErrorOk" msgid="6206751415788256357">"ठीक"</string>
@@ -204,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"सेन्सर सूचना सेवा"</string>
<string name="twilight_service" msgid="8964898045693187224">"ट्वायलाइट सेवा"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"टाइम झोन डिटेक्टर (कनेक्टिव्हिटी नाही)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS ची वेळ अपडेट करणारी सेवा"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"तुमचे डिव्हाइस मिटविले जाईल"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"प्रशासक अॅप वापरता येणार नाही. तुमचे डिव्हाइस आता साफ केले जाईल.\n\nतुम्हाला कुठलेही प्रश्न असल्यास, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> नी प्रिंट करणे बंद केले आहे."</string>
@@ -2206,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"आता स्क्रीन अंशतः किंवा पूर्ण मॅग्निफाय करू शकता"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"सेटिंग्ज मध्ये सुरू करा"</string>
<string name="dismiss_action" msgid="1728820550388704784">"डिसमिस करा"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"पुढे सुरू ठेवण्यासाठी, <b><xliff:g id="APP">%s</xliff:g></b> ला तुमच्या डिव्हाइसचा मायक्रोफोन अॅक्सेस करण्याची आवश्यकता आहे."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"पुढे सुरू ठेवण्यासाठी, <b><xliff:g id="APP">%s</xliff:g></b> ला तुमच्या डिव्हाइसचा कॅमेरा अॅक्सेस करण्याची आवश्यकता आहे."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"सुरू करा"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"सेन्सरशी संबंधित गोपनीयतेबाबत सूचना"</string>
</resources>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 557d64d..128675e 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi sahaja"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Panggilan Silang Sim"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Tidak dimajukan"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> selepas <xliff:g id="TIME_DELAY">{2}</xliff:g> saat"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Perkhidmatan Pemberitahuan Penderia"</string>
<string name="twilight_service" msgid="8964898045693187224">"Perkhidmatan Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Pengesan Zon Waktu (Tiada kesambungan)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Perkhidmatan Kemaskinian Waktu GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Peranti anda akan dipadam"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Apl pentadbir tidak dapat digunakan. Peranti anda akan dipadamkan sekarang.\n\nJika anda ingin mengemukakan soalan, hubungi pentadbir organisasi anda."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Pencetakan dilumpuhkan oleh <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Besarkan sebahagian atau keseluruhan skrin anda"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Hidupkan dalam Tetapan"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Tolak"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Untuk meneruskan proses, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses kepada mikrofon peranti anda."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Untuk meneruskan proses, <b><xliff:g id="APP">%s</xliff:g></b> memerlukan akses kepada kamera peranti anda."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Hidupkan"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privasi Penderia"</string>
</resources>
diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml
index 49387d8..62d2d85 100644
--- a/core/res/res/values-my/strings.xml
+++ b/core/res/res/values-my/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"ကြိုးမဲ့အင်တာနက် သာလျှင်"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Cross-SIM ခေါ်ဆိုမှု"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ထပ်ဆင့်မပို့နိုင်ပါ"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> နောက် <xliff:g id="TIME_DELAY">{2}</xliff:g> စက္ကန့်"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"အာရုံခံကိရိယာ အကြောင်းကြားချက် ဝန်ဆောင်မှု"</string>
<string name="twilight_service" msgid="8964898045693187224">"နေဝင်ဆည်းဆာ ဝန်ဆောင်မှု"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ဒေသစံတော်ချိန် ရှာဖွေစနစ် (ချိတ်ဆက်နိုင်မှု မလိုပါ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS အချိန်အပ်ဒိတ် ဝန်ဆောင်မှု"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"သင့်ကိရိယာအား ပယ်ဖျက်လိမ့်မည်"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"စီမံခန့်ခွဲမှု အက်ပ်ကို သုံး၍မရပါ။ သင်၏ စက်ပစ္စည်းအတွင်းရှိ အရာများကို ဖျက်လိုက်ပါမည်\n\nမေးစရာများရှိပါက သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> က ပုံနှိပ်ထုတ်ယူခြင်းကို ပိတ်ထားသည်။"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်း (သို့) တစ်ခုလုံး ချဲ့နိုင်ပါပြီ"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"\'ဆက်တင်များ\' တွင် ဖွင့်ရန်"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ပယ်ရန်"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ဆက်လက်လုပ်ဆောင်ရန် <b><xliff:g id="APP">%s</xliff:g></b> က သင့်စက်၏ မိုက်ခရိုဖုန်းကို အသုံးပြုခွင့်ရရန် လိုအပ်သည်။"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ဆက်လက်လုပ်ဆောင်ရန် <b><xliff:g id="APP">%s</xliff:g></b> က သင့်စက်၏ ကင်မရာကို အသုံးပြုခွင့်ရရန် လိုအပ်သည်။"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ဖွင့်ရန်"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"အာရုံခံကိရိယာ လုံခြုံရေး"</string>
</resources>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 2be1dab..b20111e 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Bare Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Ringing mellom SIM-kort med <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Ikke viderekoblet"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> etter <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunder"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensor Notification Service"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tidssoneoppdagelse (ingen tilkobling)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS-tjeneste for tidsoppdatering"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Enheten blir slettet"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administratorappen kan ikke brukes. Enheten din blir nå tømt.\n\nTa kontakt med administratoren for organisasjonen din hvis du har spørsmål."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> har slått av utskrift."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Nå kan du forstørre deler av eller hele skjermen"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Slå på i innstillingene"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Avvis"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"For å fortsette må <b><xliff:g id="APP">%s</xliff:g></b> ha tilgang til enhetsmikrofonen."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"For å fortsette må <b><xliff:g id="APP">%s</xliff:g></b> ha tilgang til enhetskameraet."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Slå på"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensorpersonvern"</string>
</resources>
diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml
index b309e4a..541ace8 100644
--- a/core/res/res/values-ne/strings.xml
+++ b/core/res/res/values-ne/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi मात्र"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> क्रस SIM कलिङ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: अगाडि पठाइएको छैन"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> पछि <xliff:g id="TIME_DELAY">{2}</xliff:g> सेकेन्ड"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"सेन्सरको सूचनासम्बन्धी सेवा"</string>
<string name="twilight_service" msgid="8964898045693187224">"ट्वाइलाइट सेवा"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"समय क्षेत्र पत्ता लगाउने सुविधा (नेटवर्क कनेक्सन नहुँदा)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS को समय अपडेट गर्ने सेवा"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"तपाईंको यन्त्र मेटिनेछ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"प्रशासकको एप प्रयोग गर्न मिल्दैन। तपाईंको यन्त्रको डेटा अब मेटाइने छ।\n\nतपाईंसँग प्रश्नहरू भएका खण्डमा आफ्नो संगठनका प्रशासकसँग सम्पर्क गर्नुहोस्।"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ले छाप्ने कार्यलाई असक्षम पार्यो।"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"तपाईं अब स्क्रिनको केही वा सबै भाग जुम इन गर्न सक्नुहुन्छ"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"सेटिङमा गई यो सुविधा अन गर्नुहोस्"</string>
<string name="dismiss_action" msgid="1728820550388704784">"हटाउनुहोस्"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"जारी राख्न <b><xliff:g id="APP">%s</xliff:g></b> लाई तपाईंको यन्त्रको माइक्रोफोन प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ।"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"जारी राख्न <b><xliff:g id="APP">%s</xliff:g></b> लाई तपाईंको यन्त्रको क्यामेरा प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ।"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"अन गर्नुहोस्"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"सेन्सरसम्बन्धी गोपनीयता"</string>
</resources>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index c8621a1..7f23cbb 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Alleen wifi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Bellen met meerdere simkaarten van <xliff:g id="SPN">%s</xliff:g>"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"Reserveoptie voor bellen van <xliff:g id="SPN">%s</xliff:g>"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: niet doorgeschakeld"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> na <xliff:g id="TIME_DELAY">{2}</xliff:g> seconden"</string>
@@ -203,8 +203,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Service voor sensormeldingen"</string>
<string name="twilight_service" msgid="8964898045693187224">"Service voor schemering"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tijdzonedetector (Geen verbinding)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Updateservice voor GNSS-tijd"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Je apparaat wordt gewist"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"De beheer-app kan niet worden gebruikt. Je apparaat wordt nu gewist.\n\nNeem contact op met de beheerder van je organisatie als je vragen hebt."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Afdrukken uitgeschakeld door <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2204,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Je kunt je scherm nu (gedeeltelijk) vergroten"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Inschakelen in Instellingen"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Sluiten"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> heeft toegang tot de microfoon van je apparaat nodig om door te gaan."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> heeft toegang tot de camera van je apparaat nodig om door te gaan."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aanzetten"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensorprivacy"</string>
</resources>
diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml
index 6e07d75..f02d157 100644
--- a/core/res/res/values-or/strings.xml
+++ b/core/res/res/values-or/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"କେବଳ ୱାଇ-ଫାଇ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> କ୍ରସ୍ SIM କଲିଂ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ଫରୱାର୍ଡ କରାଯାଇନାହିଁ"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> ସେକେଣ୍ଡ ପରେ"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"ସେନ୍ସର୍ ନୋଟିଫିକେସନ୍ ସର୍ଭିସ୍"</string>
<string name="twilight_service" msgid="8964898045693187224">"ଟ୍ୱିଲାଇଟ୍ ସର୍ଭିସ୍"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ଟାଇମ୍ ଜୋନ୍ ଡିଟେକ୍ଟର୍ (କୌଣସି ସଂଯୋଗ ନାହିଁ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS ସମୟ ଅପଡେଟ୍ ସେବା"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ବର୍ତ୍ତମାନ ଲିଭାଯିବ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ଆଡମିନ୍ ଆପ୍ ବ୍ୟବହାର କରାଯାଇପାରିବ ନାହିଁ। ଆପଣଙ୍କ ଡିଭାଇସ୍ର ସମସ୍ତ ଡାଟାକୁ ବର୍ତ୍ତମାନ ଲିଭାଇଦିଆଯିବ। \n\nଯଦି ଆପଣଙ୍କର କୌଣସି ପ୍ରଶ୍ନ ରହିଥାଏ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନ୍ଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ଦ୍ଵାରା ପ୍ରିଣ୍ଟିଙ୍ଗ ଅକ୍ଷମ କରାଯାଇଛି"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ଆପଣ ଏବେ ଆଂଶିକ ବା ସମ୍ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍ ବଡ଼ କରିପାରିବେ"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ସେଟିଂସରେ ଚାଲୁ କରନ୍ତୁ"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ଖାରଜ କରନ୍ତୁ"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ଜାରି ରଖିବାକୁ, <b><xliff:g id="APP">%s</xliff:g></b> ଆପଣଙ୍କ ଡିଭାଇସର ମାଇକ୍ରୋଫୋନକୁ ଆକ୍ସେସ୍ ଆବଶ୍ୟକ କରେ।"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ଜାରି ରଖିବାକୁ, <b><xliff:g id="APP">%s</xliff:g></b> ଆପଣଙ୍କ ଡିଭାଇସର କ୍ୟାମେରାକୁ ଆକ୍ସେସ୍ ଆବଶ୍ୟକ କରେ।"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ଚାଲୁ କରନ୍ତୁ"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ସେନ୍ସର୍ ଗୋପନୀୟତା"</string>
</resources>
diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml
index 52e124c..a717af6 100644
--- a/core/res/res/values-pa/strings.xml
+++ b/core/res/res/values-pa/strings.xml
@@ -57,8 +57,7 @@
<string name="imei" msgid="2157082351232630390">"IMEI"</string>
<string name="meid" msgid="3291227361605924674">"MEID"</string>
<string name="ClipMmi" msgid="4110549342447630629">"ਇਨਕਮਿੰਗ ਕਾਲਰ ਆਈ.ਡੀ."</string>
- <!-- no translation found for ClirMmi (6752346475055446417) -->
- <skip />
+ <string name="ClirMmi" msgid="6752346475055446417">"ਆਊਟਗੋਇੰਗ ਕਾਲਰ ਆਈਡੀ ਲੁਕਾਓ"</string>
<string name="ColpMmi" msgid="4736462893284419302">"ਕਨੈਕਟ ਕੀਤੀ ਲਾਈਨ ਆਈ.ਡੀ."</string>
<string name="ColrMmi" msgid="5889782479745764278">"ਕਨੈਕਟ ਕੀਤੀ ਲਾਈਨ ਆਈ.ਡੀ. ਪ੍ਰਤਿਬੰਧ"</string>
<string name="CfMmi" msgid="8390012691099787178">"ਕਾਲ ਫਾਰਵਰਡਿੰਗ"</string>
@@ -149,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> ਕ੍ਰਾਸ-ਸਿਮ ਕਾਲਿੰਗ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ਅੱਗੇ ਨਹੀਂ ਭੇਜਿਆ ਗਿਆ"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> ਸਕਿੰਟਾਂ ਬਾਅਦ"</string>
@@ -204,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"ਸੈਂਸਰ ਸੂਚਨਾ ਸੇਵਾ"</string>
<string name="twilight_service" msgid="8964898045693187224">"ਟਵੀਲਾਈਟ ਸੇਵਾ"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ਸਮਾਂ ਖੇਤਰ ਦਾ ਪਤਾ ਲਗਾਉਣ ਦੀ ਸੁਵਿਧਾ (ਕੋਈ ਕਨੈਕਟੀਵਿਟੀ ਨਹੀਂ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS ਸਮਾਂ ਅੱਪਡੇਟ ਸੇਵਾ"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾਇਆ ਜਾਏਗਾ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਵਰਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ। ਹੁਣ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।\n\nਜੇਕਰ ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਸਵਾਲ ਹਨ, ਤਾਂ ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਿੰਟ ਕਰਨਾ ਬੰਦ ਕੀਤਾ ਗਿਆ।"</string>
@@ -2206,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ਹੁਣ ਤੁਸੀਂ ਕੁਝ ਜਾਂ ਪੂਰੀ ਸਕ੍ਰੀਨ ਵੱਡਦਰਸ਼ੀ ਕਰ ਸਕਦੇ ਹੋ"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਚਾਲੂ ਕਰੋ"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ਖਾਰਜ ਕਰੋ"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"ਜਾਰੀ ਰੱਖਣ ਲਈ, <b><xliff:g id="APP">%s</xliff:g></b> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"ਜਾਰੀ ਰੱਖਣ ਲਈ, <b><xliff:g id="APP">%s</xliff:g></b> ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੇ ਕੈਮਰਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ਚਾਲੂ ਕਰੋ"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ਸੈਂਸਰ ਪਰਦੇਦਾਰੀ"</string>
</resources>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 3711cb7..9ee5e19 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Tylko Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Połączenia przez różne karty SIM z <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: nieprzekierowane"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> po <xliff:g id="TIME_DELAY">{2}</xliff:g> sekundach"</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Usługa powiadomień czujnika"</string>
<string name="twilight_service" msgid="8964898045693187224">"Usługa Zmierzch"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Wykrywanie strefy czasowej (brak połączenia)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Usługa synchronizacji czasu na podstawie sygnału GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Twoje urządzenie zostanie wyczyszczone"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Nie można użyć aplikacji administratora. Dane z urządzenia zostaną wykasowane.\n\nJeśli masz pytania, skontaktuj się z administratorem organizacji."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Drukowanie wyłączone przez: <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Możesz teraz powiększyć część lub całość ekranu"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Włącz w Ustawieniach"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Odrzuć"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Aby kontynuować, musisz przyznać aplikacji „<xliff:g id="APP">%s</xliff:g>” dostęp do mikrofonu urządzenia."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Aby kontynuować, musisz przyznać aplikacji „<xliff:g id="APP">%s</xliff:g>” dostęp do aparatu urządzenia."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Włącz"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Poufność danych z czujników"</string>
</resources>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index 89b57ef..0663ec7 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Somente Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Chamadas entre chips da <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Não encaminhado"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> após <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
@@ -203,7 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Serviço de notificações do sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Serviço de crepúsculo"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de fuso horário (sem conectividade)"</string>
- <string name="gnss_time_update_service" msgid="9039489496037616095">"Serviço de atualização de horário do GNSS"</string>
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Serviço de atualização de horário do Sistema Global de Navegação por Satélites (GNSS, na sigla em inglês)"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Seu dispositivo será limpo"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Não é possível usar o aplicativo para administrador. Seu dispositivo passará por uma limpeza agora.\n\nEm caso de dúvidas, entre em contato com o administrador da sua organização."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Impressão desativada por <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 4fe13f8..ccb7a64 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Apenas Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Chamadas com vários cartões SIM"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Não reencaminhado"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> após <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
@@ -2068,7 +2069,7 @@
<string name="conversation_single_line_name_display" msgid="8958948312915255999">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>:"</string>
<string name="conversation_single_line_image_placeholder" msgid="6983271082911936900">"enviou uma imagem"</string>
<string name="conversation_title_fallback_one_to_one" msgid="1980753619726908614">"Conversa"</string>
- <string name="conversation_title_fallback_group_chat" msgid="456073374993104303">"Conversa de grupo"</string>
+ <string name="conversation_title_fallback_group_chat" msgid="456073374993104303">"Conversa em grupo"</string>
<string name="unread_convo_overflow" msgid="920517615597353833">"> <xliff:g id="MAX_UNREAD_COUNT">%1$d</xliff:g>"</string>
<string name="resolver_personal_tab" msgid="2051260504014442073">"Pessoal"</string>
<string name="resolver_work_tab" msgid="2690019516263167035">"Trabalho"</string>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 89b57ef..0663ec7 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Somente Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Chamadas entre chips da <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Não encaminhado"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> após <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos"</string>
@@ -203,7 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Serviço de notificações do sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Serviço de crepúsculo"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de fuso horário (sem conectividade)"</string>
- <string name="gnss_time_update_service" msgid="9039489496037616095">"Serviço de atualização de horário do GNSS"</string>
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Serviço de atualização de horário do Sistema Global de Navegação por Satélites (GNSS, na sigla em inglês)"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Seu dispositivo será limpo"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Não é possível usar o aplicativo para administrador. Seu dispositivo passará por uma limpeza agora.\n\nEm caso de dúvidas, entre em contato com o administrador da sua organização."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Impressão desativada por <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 38f9854..e08cb57 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Numai Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Apelare pe mai multe carduri SIM <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționată"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> după <xliff:g id="TIME_DELAY">{2}</xliff:g> secunde"</string>
@@ -205,8 +206,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Serviciu pentru notificări de la senzori"</string>
<string name="twilight_service" msgid="8964898045693187224">"Serviciul Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector de fus orar (fără conexiune)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Serviciul de actualizare a orei bazat pe GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Datele de pe dispozitiv vor fi șterse"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Aplicația de administrare nu poate fi utilizată. Dispozitivul va fi șters.\n\nDacă aveți întrebări, contactați administratorul organizației dvs."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Printare dezactivată de <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2239,12 +2239,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Acum puteți mări o parte sau tot ecranul"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Activați din Setări"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Respingeți"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Pentru a continua, <b><xliff:g id="APP">%s</xliff:g></b> necesită acces la microfonul dispozitivului."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Pentru a continua, <b><xliff:g id="APP">%s</xliff:g></b> necesită acces la camera dispozitivului."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Activați"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Confidențialitatea privind senzorii"</string>
</resources>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 6408cce..f800195 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Только Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Перекрестная работа SIM-карт от \"<xliff:g id="SPN">%s</xliff:g>\""</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не переадресовано"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> через <xliff:g id="TIME_DELAY">{2}</xliff:g> с."</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Сервис для обработки уведомлений от датчиков"</string>
<string name="twilight_service" msgid="8964898045693187224">"Сервис для определения наступления сумерек"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Определитель часового пояса (работает без Интернета)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Синхронизация времени с помощью ГНСС"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Все данные с устройства будут удалены"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Невозможно использовать приложение для администрирования. С устройства будут удалены все данные.\n\nЕсли у вас возникли вопросы, обратитесь к администратору."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Функция печати отключена приложением \"<xliff:g id="OWNER_APP">%s</xliff:g>\""</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Теперь можно увеличивать весь экран или его часть."</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Включить в настройках"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Закрыть"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Чтобы продолжить, предоставьте приложению <b><xliff:g id="APP">%s</xliff:g></b> доступ к микрофону устройства."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Чтобы продолжить, предоставьте приложению <b><xliff:g id="APP">%s</xliff:g></b> доступ к камере устройства."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Включить"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Конфиденциальность датчиков"</string>
</resources>
diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml
index a6d54f4..322c03c 100644
--- a/core/res/res/values-si/strings.xml
+++ b/core/res/res/values-si/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi පමණයි"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> හරස් SIM ඇමතුම"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ඉදිරියට නොයවන ලදි"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: තත්පර <xliff:g id="TIME_DELAY">{2}</xliff:g> ට පසුව <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"සංවේදක දැනුම් දීමේ සේවාව"</string>
<string name="twilight_service" msgid="8964898045693187224">"ඇඳිරි සේවාව"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"වේලා කලාප අනාවරකය (සම්බන්ධතාවක් නොමැත)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS වේලා යාවත්කාලීන සේවාව"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ඔබගේ උපාංගය මකා දැමෙනු ඇත"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"පරිපාලක යෙදුම භාවිතා කළ නොහැකිය. ඔබේ උපාංගය දැන් මකා දමනු ඇත.\n\nඔබට ප්රශ්න තිබේ නම්, ඔබේ සංවිධානයේ පරිපාලකට අමතන්න."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> විසින් මුද්රණය කිරීම අබල කර ඇත."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"ඔබට දැන් තිරයේ සමහර හෝ සියලු දේ විශාලනය කළ හැකිය"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"සැකසීම් තුළ ක්රියාත්මක කරන්න"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ඉවත ලන්න"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"දිගටම කර ගෙන යාමට, <b><xliff:g id="APP">%s</xliff:g></b> හට ඔබගේ උපාංගයෙහි මයික්රෆෝනයට ප්රවේශය අවශ්යයි."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"දිගටම කර ගෙන යාමට, <b><xliff:g id="APP">%s</xliff:g></b> හට ඔබගේ උපාංගයෙහි කැමරාවට ප්රවේශය අවශ්යයි."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ක්රියාත්මක කරන්න"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"සංවේදක පෞද්ගලිකත්වය"</string>
</resources>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index a478083..7172cab 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Len Wi‑Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Volanie naprieč SIM kartami"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nepresmerované"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> po <xliff:g id="TIME_DELAY">{2}</xliff:g> s"</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Služba upozornení senzora"</string>
<string name="twilight_service" msgid="8964898045693187224">"Služba stmievania"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detektor časového pásma (bez pripojenia)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Služba na aktualizáciu času globálneho družicového polohového systému"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Vaše zariadenie bude vymazané"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Daná aplikácia na správu sa nedá použiť. Vaše zariadenie bude vymazané.\n\nV prípade otázok kontaktujte správcu organizácie."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Tlač zakázala aplikácia <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Teraz môžete zväčšiť celú obrazovku alebo jej časť"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Zapnúť v Nastaveniach"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Zavrieť"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Ak chcete pokračovať, <b><xliff:g id="APP">%s</xliff:g></b> požaduje prístup k mikrofónu zariadenia."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Ak chcete pokračovať, <b><xliff:g id="APP">%s</xliff:g></b> požaduje prístup k fotoaparátu zariadenia."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Zapnúť"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Ochrana súkromia senzorov"</string>
</resources>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index b353f45..d09ef04 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Samo Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Klicanje ne glede na kartico SIM operaterja <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ni posredovano"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> po toliko sekundah: <xliff:g id="TIME_DELAY">{2}</xliff:g>"</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Storitev obvestil tipal"</string>
<string name="twilight_service" msgid="8964898045693187224">"Storitev Somrak"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Zaznavanje časovnega pasu (brez povezave)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Storitev posodobitve ure po sistemu GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Podatki v napravi bodo izbrisani"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Skrbniške aplikacije ni mogoče uporabljati. Podatki v napravi bodo izbrisani.\n\nČe imate vprašanja, se obrnite na skrbnika organizacije."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Tiskanje je onemogočil pravilnik <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Zdaj lahko povečate del zaslona ali celotni zaslon"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Vklopite v nastavitvah"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Opusti"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Za nadaljevanje potrebuje aplikacija <b><xliff:g id="APP">%s</xliff:g></b> dostop do mikrofona v napravi."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Za nadaljevanje potrebuje aplikacija <b><xliff:g id="APP">%s</xliff:g></b> dostop do fotoaparata v napravi."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Vklopi"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Zasebnost pri uporabi tipal"</string>
</resources>
diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml
index 86f191f..592e54d 100644
--- a/core/res/res/values-sq/strings.xml
+++ b/core/res/res/values-sq/strings.xml
@@ -148,7 +148,7 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Vetëm Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Telefonatat e kryqëzuara të kartës SIM nga <xliff:g id="SPN">%s</xliff:g>"</string>
+ <string name="crossSimFormat_spn_cross_sim_calling" msgid="5620807020002879057">"Opsioni rezervë i telefonatave të <xliff:g id="SPN">%s</xliff:g>"</string>
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Nuk u transferua"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> pas <xliff:g id="TIME_DELAY">{2}</xliff:g> sekondash"</string>
@@ -203,8 +203,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Shërbimi i njoftimeve të sensorit"</string>
<string name="twilight_service" msgid="8964898045693187224">"Shërbimi i muzgut"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Zbuluesi i brezit orar (nuk nevojitet lidhja)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Shërbimi i përditësimit të kohës GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Pajisja do të spastrohet"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Aplikacioni i administratorit nuk mund të përdoret. Pajisja jote tani do të fshihet.\n\nNëse ke pyetje, kontakto me administratorin e organizatës."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Printimi është çaktivizuar nga <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2204,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Tani mund t\'i zmadhosh një pjesë apo të gjithë ekranin tënd"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aktivizo te \"Cilësimet\""</string>
<string name="dismiss_action" msgid="1728820550388704784">"Hiq"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Për të vazhduar, <b><xliff:g id="APP">%s</xliff:g></b> ka nevojë të qaset në mikrofonin e pajisjes sate."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Për të vazhduar, <b><xliff:g id="APP">%s</xliff:g></b> ka nevojë të qaset në kamerën e pajisjes sate."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktivizo"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privatësia e sensorit"</string>
</resources>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 594a2ee..af03b61 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -149,7 +149,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Само WiFi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Позиви са више SIM картица за оператера <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Није прослеђено"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> након <xliff:g id="TIME_DELAY">{2}</xliff:g> секунде/и"</string>
@@ -205,8 +206,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Услуга обавештења сензора"</string>
<string name="twilight_service" msgid="8964898045693187224">"Услуга Сумрак"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Детектор временске зоне (нема интернет везе)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS услуга за ажурирање времена"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Уређај ће бити обрисан"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Не можете да користите ову апликацију за администраторе. Уређај ће сада бити обрисан.\n\nАко имате питања, контактирајте администратора организације."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Штампање је онемогућила апликација <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2239,12 +2239,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Можете да увећате део екрана или цео екран"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Укључите у Подешавањима"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Одбаци"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> захтева приступ микрофону уређаја ради настављања."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> захтева приступ камери уређаја ради настављања."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Укључи"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Приватност сензора"</string>
</resources>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index bf498ab..b87e12b 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Endast Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> – samtal mellan SIM-kort"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Vidarebefordras inte"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g><xliff:g id="DIALING_NUMBER">{1}</xliff:g> efter <xliff:g id="TIME_DELAY">{2}</xliff:g> sekunder"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensor Notification Service"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Tidszondetektering (ingen anslutning)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Tjänst för uppdatering av GNSS-tid"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Enheten kommer att rensas"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Det går inte att använda administratörsappen. Enheten rensas.\n\nKontakta organisationens administratör om du har några frågor."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Utskrift har inaktiverats av <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Nu kan du förstora delar av eller hela skärmen"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Aktivera i inställningarna"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Stäng"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> behöver behörighet till enhetens mikrofon för att fortsätta."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> behöver behörighet till enhetens kamera för att fortsätta."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aktivera"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensorintegritet"</string>
</resources>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index 93f0ed9..397a3b8 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi pekee"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Kipengele cha Kupiga Simu Kupitia SIM Tofauti"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Haijatumiwa mwingine"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> baada ya sekunde <xliff:g id="TIME_DELAY">{2}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Huduma ya Arifa ya Kitambuzi"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Kitambua Saa za Eneo (Hakuna muunganisho)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Huduma ya Kusasisha Saa za GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Data iliyomo kwenye kifaa chako itafutwa"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Huwezi kutumia programu ya msimamizi. Sasa data iliyo kwenye kifaa chako itafutwa.\n\nIkiwa una maswali yoyote, wasiliana na msimamizi wa shirika lako."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Kipengele cha kuchapisha kimezimwa na <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Sasa unaweza kukuza sehemu ya au skrini yako yote"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Washa katika Mipangilio"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Ondoa"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Ili uendelee, <b><xliff:g id="APP">%s</xliff:g></b> inahitaji ruhusa ya kufikia maikrofoni ya kifaa chako."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Ili uendelee, <b><xliff:g id="APP">%s</xliff:g></b> inahitaji ruhusa ya kufikia kamera ya kifaa chako."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Washa"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Faragha ya Kitambuzi"</string>
</resources>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index 527c50f..3c24672 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"வைஃபை மட்டும்"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> கிராஸ்-சிம் அழைப்பு"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: பகிரப்படவில்லை"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> வினாடிகளுக்குப் பிறகு <xliff:g id="DIALING_NUMBER">{1}</xliff:g> ஐப் பகிர்"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"சென்சார் அறிவிப்புச் சேவை"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight சேவை"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"நேர மண்டல டிடெக்டர் (இணைப்பு இல்லை)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS நேரப் புதுப்பிப்புச் சேவை"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"சாதனத் தரவு அழிக்கப்படும்"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"நிர்வாகி ஆப்ஸை உபயோகிக்க முடியாது. இப்போது, உங்கள் சாதனம் ஆரம்ப நிலைக்கு மீட்டமைக்கப்படும்.\n\nஏதேனும் கேள்விகள் இருப்பின், உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"பிரிண்ட் செய்வதை <xliff:g id="OWNER_APP">%s</xliff:g> தடுத்துள்ளது."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"திரை முழுவதையுமோ ஒரு பகுதியையோ பெரிதாக்கலாம்"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"அமைப்புகளில் ஆன் செய்க"</string>
<string name="dismiss_action" msgid="1728820550388704784">"மூடுக"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"தொடர, உங்கள் சாதனத்தின் மைக்ரோஃபோனை அணுகுவதற்கு <b><xliff:g id="APP">%s</xliff:g></b> ஆப்ஸுக்கு அனுமதி வேண்டும்."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"தொடர, உங்கள் சாதனத்தின் கேமராவை அணுகுவதற்கு <b><xliff:g id="APP">%s</xliff:g></b> ஆப்ஸுக்கு அனுமதி வேண்டும்."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ஆன் செய்"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"சென்சார் தனியுரிமை"</string>
</resources>
diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml
index 2de91ba..b0726e8 100644
--- a/core/res/res/values-te/strings.xml
+++ b/core/res/res/values-te/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi మాత్రమే"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> క్రాస్-SIM కాలింగ్"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ఫార్వార్డ్ చేయబడలేదు"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> సెకన్ల తర్వాత <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"సెన్సార్ నోటిఫికేషన్ సర్వీస్"</string>
<string name="twilight_service" msgid="8964898045693187224">"ట్విలైట్ సర్వీస్"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"టైమ్ జోన్ డిటెక్టర్ (కనెక్టివిటీ లేదు)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS సమయ అప్డేట్ సర్వీస్"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"మీ పరికరంలోని డేటా తొలగించబడుతుంది"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"నిర్వాహక యాప్ ఉపయోగించడం సాధ్యపడదు. మీ పరికరంలోని డేటా ఇప్పుడు తొలగించబడుతుంది.\n\nమీకు ప్రశ్నలు ఉంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"ముద్రణ <xliff:g id="OWNER_APP">%s</xliff:g> ద్వారా నిలిపివేయబడింది."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"స్క్రీన్ మొత్తం లేదా కొంత భాగాన్ని జూమ్ చేయవచ్చు"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"సెట్టింగ్లలో ఆన్ చేయండి"</string>
<string name="dismiss_action" msgid="1728820550388704784">"విస్మరించు"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"కొనసాగించడానికి, <b><xliff:g id="APP">%s</xliff:g></b>కు మీ పరికరం యొక్క మైక్రోఫోన్ యాక్సెస్ అవసరం."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"కొనసాగించడానికి, <b><xliff:g id="APP">%s</xliff:g></b&gtకు మీ పరికరం యొక్క కెమెరా యాక్సెస్ అవసరం."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"ఆన్ చేయి"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"సెన్సార్ గోప్యత"</string>
</resources>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index aa3331a..6012c0a2 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi เท่านั้น"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"การโทรข้ามซิม <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ไม่ได้โอนสาย"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> หลังผ่านไป <xliff:g id="TIME_DELAY">{2}</xliff:g> วินาที"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"บริการแจ้งเตือนเกี่ยวกับเซ็นเซอร์"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight Service"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ตัวตรวจจับเขตเวลา (ไม่มีการเชื่อมต่อ)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"บริการอัปเดตเวลาของ GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"ระบบจะลบข้อมูลในอุปกรณ์ของคุณ"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"ใช้แอปผู้ดูแลระบบนี้ไม่ได้ ขณะนี้ระบบจะลบข้อมูลในอุปกรณ์ของคุณ\n\nโปรดติดต่อผู้ดูแลระบบขององค์กรหากมีคำถาม"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> ปิดใช้การพิมพ์แล้ว"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"คุณสามารถขยายหน้าจอบางส่วนหรือทั้งหมดได้แล้วตอนนี้"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"เปิดในการตั้งค่า"</string>
<string name="dismiss_action" msgid="1728820550388704784">"ปิด"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"<b><xliff:g id="APP">%s</xliff:g></b> ต้องได้รับสิทธิ์เข้าถึงไมโครโฟนของอุปกรณ์เพื่อดำเนินการต่อ"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"<b><xliff:g id="APP">%s</xliff:g></b> ต้องได้รับสิทธิ์เข้าถึงกล้องของอุปกรณ์เพื่อดำเนินการต่อ"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"เปิด"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"ความเป็นส่วนตัวสำหรับเซ็นเซอร์"</string>
</resources>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index d3a1fe7..9e677c3 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Wi-Fi lang"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"Cross-SIM na Pagtawag sa <xliff:g id="SPN">%s</xliff:g>"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Hindi naipasa"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> pagkatapos ng <xliff:g id="TIME_DELAY">{2}</xliff:g> (na) segundo"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Serbisyo ng Notification ng Sensor"</string>
<string name="twilight_service" msgid="8964898045693187224">"Serbisyo ng Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Detector ng Time Zone (Walang koneksyon)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Serbisyo sa Pag-update ng Oras ng GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Buburahin ang iyong device"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Hindi magamit ang admin app. Mabubura na ang iyong device.\n\nKung mayroon kang mga tanong, makipag-ugnayan sa admin ng iyong organisasyon."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Na-disable ng <xliff:g id="OWNER_APP">%s</xliff:g> ang pag-print."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Mama-magnify na ang bahagi o kabuuan ng screen mo"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"I-on sa Mga Setting"</string>
<string name="dismiss_action" msgid="1728820550388704784">"I-dismiss"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Para magpatuloy, kailangan ng <b><xliff:g id="APP">%s</xliff:g></b> ng access sa mikropono ng iyong device."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Para magpatuloy, kailangan ng <b><xliff:g id="APP">%s</xliff:g></b> ng access sa camera ng iyong device."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"I-on"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Privacy ng Sensor"</string>
</resources>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 26108fb..fb23a29 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Yalnızca kablosuz"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Çapraz SIM Araması"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Yönlendirilmedi"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> saniye sonra <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensör Bildirim Hizmeti"</string>
<string name="twilight_service" msgid="8964898045693187224">"Alacakaranlık Hizmeti"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Zaman Dilimi Algılayıcı (Bağlantı yok)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS Zaman Güncelleme Hizmeti"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Cihazınız silinecek"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Yönetim uygulaması kullanılamıyor. Cihazınız şimdi silinecek.\n\nSorularınız varsa kuruluşunuzun yöneticisine başvurun."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Yazdırma işlemi <xliff:g id="OWNER_APP">%s</xliff:g> tarafından devre dışı bırakıldı."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Artık ekranınızın bir kısmını veya tamamını büyütebilirsiniz"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Ayarlar\'da aç"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Kapat"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Devam etmek için <b><xliff:g id="APP">%s</xliff:g></b> uygulamasının cihazınızın mikrofonuna erişmesi gerekiyor."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Devam etmek için <b><xliff:g id="APP">%s</xliff:g></b> uygulamasının cihazınızın kamerasına erişmesi gerekiyor."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Aç"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensör Gizliliği"</string>
</resources>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index abb1b7d..ecfcb1b 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -150,7 +150,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Лише Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> – виклики між SIM-картами"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не переслано"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> після <xliff:g id="TIME_DELAY">{2}</xliff:g> сек."</string>
@@ -207,8 +208,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Сервіс \"Сповіщення датчика\""</string>
<string name="twilight_service" msgid="8964898045693187224">"Сервіс \"Сутінки\""</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Визначення часового поясу (без Інтернету)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Сервіс оновлення часу GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"З вашого пристрою буде стерто всі дані"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Не можна запускати додаток для адміністраторів. Буде відновлено заводські налаштування пристрою.\n\nЯкщо у вас є запитання, зв’яжіться з адміністратором своєї організації."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Додаток <xliff:g id="OWNER_APP">%s</xliff:g> вимкнув друк."</string>
@@ -2273,12 +2273,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Тепер можна збільшити весь екран або його частину"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Увімкнути в налаштуваннях"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Закрити"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Щоб продовжити, надайте додатку <b><xliff:g id="APP">%s</xliff:g></b> доступ до мікрофона пристрою."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Щоб продовжити, надайте додатку <b><xliff:g id="APP">%s</xliff:g></b> доступ до камери пристрою."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Увімкнути"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Конфіденційність датчиків"</string>
</resources>
diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml
index f247889..64fb2fc 100644
--- a/core/res/res/values-ur/strings.xml
+++ b/core/res/res/values-ur/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"صرف Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> کراس sim کالنگ"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g> : فارورڈ نہیں کی گئی"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> بعد از <xliff:g id="TIME_DELAY">{2}</xliff:g> سیکنڈ"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"سینسر نوٹیفکیشن سروس"</string>
<string name="twilight_service" msgid="8964898045693187224">"شفقی سروس"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"ٹائم زون ڈیٹیکٹر (کوئی کنیکٹوٹی نہیں ہے)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS کی ٹائم اپ ڈیٹ سروس"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"آپ کا آلہ صاف کر دیا جائے گا"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"منتظم کی ایپ استعمال نہیں کی جا سکتی۔ آپ کا آلہ اب مٹا دیا جائے گا۔\n\nاگر آپ کے سوالات ہیں تو اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> نے پرنٹنگ کو غیر فعال کر دیا ہے۔"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"اب آپ اپنی تمام یا کچھ اسکرین کو بڑا کر سکتے ہیں"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"ترتیبات میں آن کریں"</string>
<string name="dismiss_action" msgid="1728820550388704784">"برخاست کریں"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"جاری رکھنے کیلئے <xliff:g id="APP">%s</xliff:g><b><b> کو آپ کے آلے کے مائیکروفون تک رسائی درکار ہے۔"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"جاری رکھنے کیلئے <b><xliff:g id="APP">%s</xliff:g></b> کو آپ کے آلے کے کیمرے تک رسائی درکار ہے۔"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"آن کریں"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"سینسر کی رازداری"</string>
</resources>
diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml
index e72114a..0b48dc1 100644
--- a/core/res/res/values-uz/strings.xml
+++ b/core/res/res/values-uz/strings.xml
@@ -57,7 +57,7 @@
<string name="imei" msgid="2157082351232630390">"IMEI"</string>
<string name="meid" msgid="3291227361605924674">"MEID"</string>
<string name="ClipMmi" msgid="4110549342447630629">"Kiruvchi raqami"</string>
- <string name="ClirMmi" msgid="6752346475055446417">"Chaqiruvchi raqamini yashirish"</string>
+ <string name="ClirMmi" msgid="6752346475055446417">"Abonent raqamini berkitish"</string>
<string name="ColpMmi" msgid="4736462893284419302">"Qo‘ng‘iroq qiluvchining raqami"</string>
<string name="ColrMmi" msgid="5889782479745764278">"Qo‘ng‘iroq qiluvchining raqamini cheklash"</string>
<string name="CfMmi" msgid="8390012691099787178">"Chaqiruvlarni uzatish"</string>
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Faqat Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Kross-SIM chaqiruvlar"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Yo‘naltirilmadi"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> <xliff:g id="TIME_DELAY">{2}</xliff:g> soniyadan so‘ng"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Sensorli bildirishnoma xizmati"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight xizmati"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Vaqt mintaqasini aniqlagich (Oflayn)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS yordamida vaqtni yangilash xizmati"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Qurilmangizdagi ma’lumotlar o‘chirib tashlanadi"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Administrator ilovasini ishlatib bo‘lmaydi. Qurilmada barcha ma’lumotlar o‘chirib tashlanadi.\n\nSavollaringiz bo‘lsa, administrator bilan bog‘laning."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Chop etish funksiyasi <xliff:g id="OWNER_APP">%s</xliff:g> tomonidan faolsizlantirilgan."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Ekranni toʻliq yoki qisman kattalashtirish mumkin"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Sozlamalar orqali yoqish"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Yopish"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Davom etish uchun <b><xliff:g id="APP">%s</xliff:g></b> mikrofoningizdan foydalanishi kerak."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Davom etish uchun <b><xliff:g id="APP">%s</xliff:g></b> qurilmangiz kamerasiga kirishi kerak."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Yoqish"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Sensorlar maxfiyligi"</string>
</resources>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index 55f5f19..438befd 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"Chỉ Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> Gọi bằng nhiều SIM"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Không được chuyển tiếp"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> sau <xliff:g id="TIME_DELAY">{2}</xliff:g> giây"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Dịch vụ Thông báo của cảm biến"</string>
<string name="twilight_service" msgid="8964898045693187224">"Dịch vụ Twilight"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Trình phát hiện múi giờ (Không có kết nối)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Dịch vụ cập nhật thời gian GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Thiết bị của bạn sẽ bị xóa"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Không thể sử dụng ứng dụng quản trị. Thiết bị của bạn sẽ bị xóa ngay bây giờ.\n\nHãy liên hệ với quản trị viên của tổ chức nếu bạn có thắc mắc."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"<xliff:g id="OWNER_APP">%s</xliff:g> đã tắt tính năng in."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Giờ đây, bạn có thể phóng to một phần hoặc toàn màn hình"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Bật trong phần Cài đặt"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Đóng"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Để tiếp tục, <b><xliff:g id="APP">%s</xliff:g></b> cần quyền truy cập vào micrô trên thiết bị của bạn."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Để tiếp tục, <b><xliff:g id="APP">%s</xliff:g></b> cần quyền truy cập vào máy ảnh trên thiết bị của bạn."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Bật"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Quyền riêng tư khi sử dụng cảm biến"</string>
</resources>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 347ad56..20048f1 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"仅限 WLAN"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> 跨 SIM 卡通话"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：无法转接"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="TIME_DELAY">{2}</xliff:g>秒后<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"传感器通知服务"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight 服务"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"时区检测器（无网络连接）"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS 时间更新服务"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"系统将清空您的设备"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"无法使用管理应用，系统现在将清空您的设备。\n\n如有疑问，请与您所在单位的管理员联系。"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"“<xliff:g id="OWNER_APP">%s</xliff:g>”已停用打印功能。"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"您现在可以放大屏幕上的部分或所有内容"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"在“设置”中开启"</string>
<string name="dismiss_action" msgid="1728820550388704784">"关闭"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"如要继续操作，请向<b><xliff:g id="APP">%s</xliff:g></b>授予设备的麦克风使用权。"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"如要继续操作，请向<b><xliff:g id="APP">%s</xliff:g></b>授予设备的相机使用权。"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"开启"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"传感器隐私权"</string>
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 79ce664..544cf1e 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"只限 Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g> 跨 SIM 卡通話"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：尚未轉接"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:<xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> 於 <xliff:g id="TIME_DELAY">{2}</xliff:g> 秒後轉接"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"感應器通知服務"</string>
<string name="twilight_service" msgid="8964898045693187224">"暮光服務"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"時區偵測器 (沒有連線)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS 時間更新服務"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"您的裝置將被清除"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"無法使用管理員應用程式。系統會現在清除您的裝置。\n\n如有任何疑問，請聯絡您的機構管理員。"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"「<xliff:g id="OWNER_APP">%s</xliff:g>」暫停了列印。"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"您現在可以放大部分或整個畫面"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"在「設定」中開啟"</string>
<string name="dismiss_action" msgid="1728820550388704784">"關閉"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"如要繼續，<b><xliff:g id="APP">%s</xliff:g></b> 需要裝置的麥克風存取權。"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"如要繼續，<b><xliff:g id="APP">%s</xliff:g></b> 需要裝置的相機存取權。"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"開啟"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"感應器私隱"</string>
</resources>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 15a1201..d9b51e0 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"只限 Wi-Fi"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"「<xliff:g id="SPN">%s</xliff:g>」跨 SIM 卡通話"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：未轉接"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="TIME_DELAY">{2}</xliff:g> 秒後 <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"感應器通知服務"</string>
<string name="twilight_service" msgid="8964898045693187224">"Twilight 服務"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"時區偵測器 (不必連上網路)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"GNSS 時間更新服務"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"你的裝置資料將遭到清除"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"無法使用管理應用程式，系統現在將清除你裝置中的資料。\n\n如有任何問題，請與貴機構的管理員聯絡。"</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"「<xliff:g id="OWNER_APP">%s</xliff:g>」已停用列印功能。"</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"你可以放大局部或整個畫面"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"在「設定」中開啟"</string>
<string name="dismiss_action" msgid="1728820550388704784">"關閉"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"如要繼續操作，請將裝置的麥克風存取權授予「<xliff:g id="APP">%s</xliff:g>」<b></b>。"</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"如要繼續操作，請將裝置的相機存取權授予「<xliff:g id="APP">%s</xliff:g>」<b></b>。"</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"開啟"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"感應器隱私權"</string>
</resources>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index b18afe7..029c569 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -148,7 +148,8 @@
<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"I-Wi-Fi kuphela"</string>
<!-- no translation found for crossSimFormat_spn (9125246077491634262) -->
<skip />
- <string name="crossSimFormat_spn_cross_sim_calling" msgid="779976494687695991">"<xliff:g id="SPN">%s</xliff:g>Ukwenza ikholi kwe-Cross Sim"</string>
+ <!-- no translation found for crossSimFormat_spn_cross_sim_calling (5620807020002879057) -->
+ <skip />
<string name="cfTemplateNotForwarded" msgid="862202427794270501">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Akudlulisiwe"</string>
<string name="cfTemplateForwarded" msgid="9132506315842157860">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string>
<string name="cfTemplateForwardedTime" msgid="735042369233323609">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> emuva kwamasekhondi angu-<xliff:g id="TIME_DELAY">{2}</xliff:g>"</string>
@@ -203,8 +204,7 @@
<string name="sensor_notification_service" msgid="7474531979178682676">"Isevisi Yesaziso Senzwa"</string>
<string name="twilight_service" msgid="8964898045693187224">"Isevisi Yangovivi"</string>
<string name="offline_location_time_zone_detection_service_attribution" msgid="303754195048744816">"Isitholi Sezoni Yesikhathi (Akukho ukuxhumana)"</string>
- <!-- no translation found for gnss_time_update_service (9039489496037616095) -->
- <skip />
+ <string name="gnss_time_update_service" msgid="9039489496037616095">"Isevisi Ebuyekeziwe Yesikhathi se-GNSS"</string>
<string name="factory_reset_warning" msgid="6858705527798047809">"Idivayisi yakho izosulwa"</string>
<string name="factory_reset_message" msgid="2657049595153992213">"Uhlelo lokusebenza lomlawuli alikwazi ukusetshenziswa. Idivayisi yakho manje izosuswa.\n\nUma unemibuzo, xhumana nomlawuli wezinhlangano zakho."</string>
<string name="printing_disabled_by" msgid="3517499806528864633">"Ukuphrinta kukhutshazwe nge-<xliff:g id="OWNER_APP">%s</xliff:g>."</string>
@@ -2205,12 +2205,8 @@
<string name="window_magnification_prompt_content" msgid="4166711383253283838">"Manje usungakwazi ukukhulisa esinye noma sonke isikrini sakho"</string>
<string name="turn_on_magnification_settings_action" msgid="8521433346684847700">"Vula Kumasethingi"</string>
<string name="dismiss_action" msgid="1728820550388704784">"Cashisa"</string>
- <!-- no translation found for sensor_privacy_start_use_mic_notification_content (8063355861118105607) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_camera_notification_content (4738005643315863736) -->
- <skip />
- <!-- no translation found for sensor_privacy_start_use_dialog_turn_on_button (7921147002346108119) -->
- <skip />
- <!-- no translation found for sensor_privacy_notification_channel_label (936036783155261349) -->
- <skip />
+ <string name="sensor_privacy_start_use_mic_notification_content" msgid="8063355861118105607">"Ukuze uqhubeke, <b>i-<xliff:g id="APP">%s</xliff:g></b> idinga ukufinyelela imakrofoni yedivayisi yakho."</string>
+ <string name="sensor_privacy_start_use_camera_notification_content" msgid="4738005643315863736">"Ukuze uqhubeke, <b>i-<xliff:g id="APP">%s</xliff:g></b> idinga ukufinyelela ikhamera yakho."</string>
+ <string name="sensor_privacy_start_use_dialog_turn_on_button" msgid="7921147002346108119">"Vula"</string>
+ <string name="sensor_privacy_notification_channel_label" msgid="936036783155261349">"Ubumfihlo Benzwa"</string>
</resources>
diff --git a/core/tests/GameManagerTests/Android.bp b/core/tests/GameManagerTests/Android.bp
new file mode 100644
index 0000000..e178776
--- /dev/null
+++ b/core/tests/GameManagerTests/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+android_test {
+ name: "FrameworksCoreGameManagerTests",
+ // Include all test java files
+ srcs: ["src/**/*.java"],
+ static_libs: [
+ "androidx.test.rules",
+ "frameworks-base-testutils",
+ "junit",
+ "truth-prebuilt",
+ ],
+ libs: ["android.test.runner"],
+ platform_apis: true,
+ certificate: "platform",
+ test_suites: ["device-tests"],
+}
diff --git a/core/tests/GameManagerTests/AndroidManifest.xml b/core/tests/GameManagerTests/AndroidManifest.xml
new file mode 100644
index 0000000..da6636b
--- /dev/null
+++ b/core/tests/GameManagerTests/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.graphics.gamemanagertests"
+ android:sharedUserId="android.uid.system" >
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.graphics.gamemanagertests"
+ android:label="Game Manager Tests"/>
+
+</manifest>
diff --git a/core/tests/GameManagerTests/AndroidTest.xml b/core/tests/GameManagerTests/AndroidTest.xml
new file mode 100644
index 0000000..bfb9802
--- /dev/null
+++ b/core/tests/GameManagerTests/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration description="Runs Game Manager Tests.">
+ <option name="test-suite-tag" value="apct"/>
+ <option name="test-suite-tag" value="apct-instrumentation"/>
+
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="FrameworksCoreGameManagerTests.apk" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.graphics.gamemanagertests" />
+ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="hidden-api-checks" value="false" />
+ </test>
+</configuration>
diff --git a/core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java b/core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java
new file mode 100644
index 0000000..d861a89
--- /dev/null
+++ b/core/tests/GameManagerTests/src/android/graphics/GameManagerTests.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.graphics;
+
+import static junit.framework.Assert.assertEquals;
+
+import android.graphics.GameManager.GameMode;
+import android.util.ArrayMap;
+import android.util.Pair;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Unit tests for {@link GameManager}.
+ */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public final class GameManagerTests {
+ private static final String PACKAGE_NAME_0 = "com.android.app0";
+ private static final String PACKAGE_NAME_1 = "com.android.app1";
+
+ private TestGameManagerService mService;
+ private GameManager mGameManager;
+
+ @Before
+ public void setUp() {
+ mService = new TestGameManagerService();
+ mGameManager = new GameManager(
+ InstrumentationRegistry.getContext(), mService);
+ }
+
+ @Test
+ public void testGameModeGetterSetter() {
+ assertEquals(GameManager.GAME_MODE_UNSUPPORTED,
+ mGameManager.getGameMode(PACKAGE_NAME_0));
+
+ mGameManager.setGameMode(PACKAGE_NAME_1, GameManager.GAME_MODE_STANDARD);
+ assertEquals(GameManager.GAME_MODE_STANDARD,
+ mGameManager.getGameMode(PACKAGE_NAME_1));
+
+ mGameManager.setGameMode(PACKAGE_NAME_1, GameManager.GAME_MODE_PERFORMANCE);
+ assertEquals(GameManager.GAME_MODE_PERFORMANCE,
+ mGameManager.getGameMode(PACKAGE_NAME_1));
+ }
+
+ private final class TestGameManagerService extends IGameManagerService.Stub {
+ private final ArrayMap<Pair<String, Integer>, Integer> mGameModes = new ArrayMap<>();
+
+ @Override
+ public @GameMode int getGameMode(String packageName, int userId) {
+ final Pair key = Pair.create(packageName, userId);
+ if (mGameModes.containsKey(key)) {
+ return mGameModes.get(key);
+ }
+ return GameManager.GAME_MODE_UNSUPPORTED;
+ }
+
+ @Override
+ public void setGameMode(String packageName, @GameMode int gameMode, int userId) {
+ mGameModes.put(Pair.create(packageName, userId), gameMode);
+ }
+ }
+}
diff --git a/core/tests/mockingcoretests/src/android/view/OWNERS b/core/tests/mockingcoretests/src/android/view/OWNERS
new file mode 100644
index 0000000..9c9f824
--- /dev/null
+++ b/core/tests/mockingcoretests/src/android/view/OWNERS
@@ -0,0 +1,2 @@
+# Display
+per-file Display*.java = file:/services/core/java/com/android/server/display/OWNERS
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index f84d947..ae8e3ce 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -355,7 +355,6 @@
<permission name="android.permission.MOVE_PACKAGE"/>
<!-- Needed for test only -->
<permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/>
- <permission name="android.permission.NETWORK_AIRPLANE_MODE"/>
<permission name="android.permission.OBSERVE_APP_USAGE"/>
<permission name="android.permission.NETWORK_SCAN"/>
<permission name="android.permission.PACKAGE_USAGE_STATS" />
diff --git a/graphics/java/android/graphics/GameManager.java b/graphics/java/android/graphics/GameManager.java
new file mode 100644
index 0000000..a58aeb4
--- /dev/null
+++ b/graphics/java/android/graphics/GameManager.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.graphics;
+
+import android.annotation.IntDef;
+import android.annotation.SystemService;
+import android.annotation.UserHandleAware;
+import android.content.Context;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.ServiceManager.ServiceNotFoundException;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * The GameManager allows system apps to modify and query the game mode of apps.
+ *
+ * @hide
+ */
+@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+@SystemService(Context.GAME_SERVICE)
+public final class GameManager {
+
+ private static final String TAG = "GameManager";
+
+ private final Context mContext;
+ private final IGameManagerService mService;
+
+ @IntDef(flag = false, prefix = { "GAME_MODE_" }, value = {
+ GAME_MODE_UNSUPPORTED, // 0
+ GAME_MODE_STANDARD, // 1
+ GAME_MODE_PERFORMANCE, // 2
+ GAME_MODE_BATTERY, // 3
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface GameMode {}
+
+ public static final int GAME_MODE_UNSUPPORTED = 0;
+ public static final int GAME_MODE_STANDARD = 1;
+ public static final int GAME_MODE_PERFORMANCE = 2;
+ public static final int GAME_MODE_BATTERY = 3;
+
+ public GameManager(Context context, Handler handler) throws ServiceNotFoundException {
+ mContext = context;
+ mService = IGameManagerService.Stub.asInterface(
+ ServiceManager.getServiceOrThrow(Context.GAME_SERVICE));
+ }
+
+ @VisibleForTesting
+ public GameManager(Context context, IGameManagerService gameManagerService) {
+ mContext = context;
+ mService = gameManagerService;
+ }
+
+ /**
+ * Returns the game mode for the given package.
+ */
+ // TODO(b/178111358): Add @RequiresPermission.
+ @UserHandleAware
+ public @GameMode int getGameMode(String packageName) {
+ try {
+ return mService.getGameMode(packageName, mContext.getUserId());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Sets the game mode for the given package.
+ */
+ // TODO(b/178111358): Add @RequiresPermission.
+ @UserHandleAware
+ public void setGameMode(String packageName, @GameMode int gameMode) {
+ try {
+ mService.setGameMode(packageName, gameMode, mContext.getUserId());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+}
diff --git a/graphics/java/android/graphics/IGameManagerService.aidl b/graphics/java/android/graphics/IGameManagerService.aidl
new file mode 100644
index 0000000..7d3a4fb
--- /dev/null
+++ b/graphics/java/android/graphics/IGameManagerService.aidl
@@ -0,0 +1,25 @@
+/*
+** Copyright 2021, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+package android.graphics;
+
+/**
+ * @hide
+ */
+interface IGameManagerService {
+ int getGameMode(String packageName, int userId);
+ void setGameMode(String packageName, int gameMode, int userId);
+}
\ No newline at end of file
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index decf68f..67a2c49 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -166,6 +166,11 @@
"tv_tuner_aidl_interface-ndk_platform",
"tv_tuner_resource_manager_aidl_interface-ndk_platform"
],
+
+ static_libs: [
+ "libaidlcommonsupport",
+ ],
+
defaults: [
"libcodec2-impl-defaults",
],
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index eb63d76..9ec84d9 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -1458,7 +1458,7 @@
ALOGE("frontend is not initialized");
return (int)Result::INVALID_STATE;
}
- return (int) mFeClient->tune(settings,settingsExt1_1);
+ return (int) mFeClient->tune(settings, settingsExt1_1);
}
int JTuner::stopTune() {
diff --git a/media/jni/tuner/DemuxClient.cpp b/media/jni/tuner/DemuxClient.cpp
index e290c60..1a2f8c0 100644
--- a/media/jni/tuner/DemuxClient.cpp
+++ b/media/jni/tuner/DemuxClient.cpp
@@ -142,7 +142,16 @@
}
sp<DvrClient> DemuxClient::openDvr(DvrType dvbType, int bufferSize, sp<DvrClientCallback> cb) {
- // TODO: pending aidl interface
+ if (mTunerDemux != NULL) {
+ shared_ptr<ITunerDvr> tunerDvr;
+ shared_ptr<TunerDvrCallback> callback =
+ ::ndk::SharedRefBase::make<TunerDvrCallback>(cb);
+ Status s = mTunerDemux->openDvr((int)dvbType, bufferSize, callback, &tunerDvr);
+ if (ClientHelper::getServiceSpecificErrorCode(s) != Result::SUCCESS) {
+ return NULL;
+ }
+ return new DvrClient(tunerDvr);
+ }
if (mDemux != NULL) {
sp<HidlDvrCallback> callback = new HidlDvrCallback(cb);
@@ -178,7 +187,10 @@
}
Result DemuxClient::close() {
- // TODO: pending aidl interface
+ if (mTunerDemux != NULL) {
+ Status s = mTunerDemux->close();
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mDemux != NULL) {
Result res = mDemux->close();
diff --git a/media/jni/tuner/DvrClient.cpp b/media/jni/tuner/DvrClient.cpp
index be592af..0400485 100644
--- a/media/jni/tuner/DvrClient.cpp
+++ b/media/jni/tuner/DvrClient.cpp
@@ -210,14 +210,13 @@
return res;
}
- AidlMQDesc* aidlMqDesc = NULL;
- s = mTunerDvr->getQueueDesc(aidlMqDesc);
+ AidlMQDesc aidlMqDesc;
+ s = mTunerDvr->getQueueDesc(&aidlMqDesc);
res = ClientHelper::getServiceSpecificErrorCode(s);
if (res != Result::SUCCESS) {
return res;
}
-
- mDvrMQ = new (nothrow) AidlMQ(*aidlMqDesc);
+ mDvrMQ = new (nothrow) AidlMQ(aidlMqDesc);
EventFlag::createEventFlag(mDvrMQ->getEventFlagWord(), &mDvrMQEventFlag);
return res;
}
diff --git a/media/jni/tuner/FilterClient.cpp b/media/jni/tuner/FilterClient.cpp
index bcef0a2..bdc8a4f 100644
--- a/media/jni/tuner/FilterClient.cpp
+++ b/media/jni/tuner/FilterClient.cpp
@@ -16,14 +16,21 @@
#define LOG_TAG "FilterClient"
+#include <aidlcommonsupport/NativeHandle.h>
#include <android-base/logging.h>
#include <utils/Log.h>
#include "FilterClient.h"
+using ::aidl::android::media::tv::tuner::TunerFilterAvSettings;
+using ::aidl::android::media::tv::tuner::TunerFilterSharedHandleInfo;
+using ::aidl::android::media::tv::tuner::TunerFilterTsConfiguration;
+
using ::android::hardware::tv::tuner::V1_0::DemuxQueueNotifyBits;
using ::android::hardware::tv::tuner::V1_0::DemuxFilterMainType;
using ::android::hardware::tv::tuner::V1_0::DemuxMmtpFilterType;
+using ::android::hardware::tv::tuner::V1_0::DemuxStreamId;
+using ::android::hardware::tv::tuner::V1_0::DemuxTsFilterSettings;
using ::android::hardware::tv::tuner::V1_0::DemuxTsFilterType;
namespace android {
@@ -48,7 +55,6 @@
void FilterClient::setHidlFilter(sp<IFilter> filter) {
mFilter = filter;
mFilter_1_1 = ::android::hardware::tv::tuner::V1_1::IFilter::castFrom(mFilter);
- handleAvShareMemory();
}
int FilterClient::read(uint8_t* buffer, int size) {
@@ -66,23 +72,20 @@
}
SharedHandleInfo FilterClient::getAvSharedHandleInfo() {
+ handleAvShareMemory();
SharedHandleInfo info{
- .sharedHandle = NULL,
- .size = 0,
+ .sharedHandle = mAvSharedHandle,
+ .size = mAvSharedMemSize,
};
- // TODO: pending aidl interface
-
- if (mFilter_1_1 != NULL) {
- info.sharedHandle = mAvSharedHandle;
- info.size = mAvSharedMemSize;
- }
-
return info;
}
Result FilterClient::configure(DemuxFilterSettings configure) {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->configure(getAidlFilterSettings(configure));
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
return mFilter->configure(configure);
@@ -122,7 +125,10 @@
}
Result FilterClient::start() {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->start();
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
return mFilter->start();
@@ -132,7 +138,10 @@
}
Result FilterClient::stop() {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->stop();
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
return mFilter->stop();
@@ -142,7 +151,10 @@
}
Result FilterClient::flush() {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->flush();
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
return mFilter->flush();
@@ -192,7 +204,10 @@
}
Result FilterClient::releaseAvHandle(native_handle_t* handle, uint64_t avDataId) {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->releaseAvHandle(makeToAidl(handle), avDataId);
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
return mFilter->releaseAvHandle(hidl_handle(handle), avDataId);
@@ -216,13 +231,18 @@
}
Result FilterClient::close() {
- // TODO: pending aidl interface
+ if (mTunerFilter != NULL) {
+ Status s = mTunerFilter->close();
+ closeAvSharedMemory();
+ return ClientHelper::getServiceSpecificErrorCode(s);
+ }
if (mFilter != NULL) {
Result res = mFilter->close();
if (res == Result::SUCCESS) {
mFilter = NULL;
}
+ closeAvSharedMemory();
return res;
}
@@ -269,13 +289,103 @@
return Status::fromServiceSpecificError(static_cast<int32_t>(Result::INVALID_STATE));
}
-Status TunerFilterCallback::onFilterEvent(vector<TunerFilterEvent>* /*filterEvent*/) {
- // TODO: complete onFilterEvent
+Status TunerFilterCallback::onFilterEvent(const vector<TunerFilterEvent>& filterEvents) {
+ if (mFilterClientCallback == NULL) {
+ return Status::fromServiceSpecificError(static_cast<int32_t>(Result::INVALID_STATE));
+ }
+
+ DemuxFilterEvent event;
+ DemuxFilterEventExt eventExt;
+ getHidlFilterEvent(filterEvents, event, eventExt);
+ if (eventExt.events.size() > 0) {
+ mFilterClientCallback->onFilterEvent_1_1(event, eventExt);
+ } else {
+ mFilterClientCallback->onFilterEvent(event);
+ }
+
return Status::ok();
}
/////////////// FilterClient Helper Methods ///////////////////////
+TunerFilterConfiguration FilterClient::getAidlFilterSettings(DemuxFilterSettings configure) {
+ TunerFilterConfiguration config;
+ // TODO: complete filter setting conversion
+ switch (configure.getDiscriminator()) {
+ case DemuxFilterSettings::hidl_discriminator::ts: {
+ TunerFilterSettings filterSettings;
+ switch (configure.ts().filterSettings.getDiscriminator()) {
+ case DemuxTsFilterSettings::FilterSettings::hidl_discriminator::av: {
+ TunerFilterAvSettings av{
+ .isPassthrough = configure.ts().filterSettings.av().isPassthrough,
+ };
+ filterSettings.set<TunerFilterSettings::av>(av);
+ break;
+ }
+ default:
+ break;
+ }
+
+ TunerFilterTsConfiguration ts{
+ .tpid = configure.ts().tpid,
+ .filterSettings = filterSettings,
+ };
+ config.set<TunerFilterConfiguration::ts>(ts);
+
+ return config;
+ }
+ case DemuxFilterSettings::hidl_discriminator::mmtp:
+ break;
+ case DemuxFilterSettings::hidl_discriminator::ip:
+ break;
+ case DemuxFilterSettings::hidl_discriminator::tlv:
+ break;
+ default:
+ break;
+ }
+ return config;
+}
+
+
+void TunerFilterCallback::getHidlFilterEvent(const vector<TunerFilterEvent>& filterEvents,
+ DemuxFilterEvent& event, DemuxFilterEventExt& /*eventExt*/) {
+ // TODO: finish handling extended evets and other filter event types
+ switch (filterEvents[0].getTag()) {
+ case TunerFilterEvent::media: {
+ for (int i = 0; i < filterEvents.size(); i++) {
+ hidl_handle handle = hidl_handle(
+ makeFromAidl(filterEvents[i].get<TunerFilterEvent::media>().avMemory));
+ int size = event.events.size();
+ event.events.resize(size + 1);
+ event.events[size].media({
+ .avMemory = handle,
+ .streamId = static_cast<DemuxStreamId>(
+ filterEvents[i].get<TunerFilterEvent::media>().streamId),
+ .isPtsPresent =
+ filterEvents[i].get<TunerFilterEvent::media>().isPtsPresent,
+ .pts = static_cast<uint64_t>(
+ filterEvents[i].get<TunerFilterEvent::media>().pts),
+ .dataLength = static_cast<uint32_t>(
+ filterEvents[i].get<TunerFilterEvent::media>().dataLength),
+ .offset = static_cast<uint32_t>(
+ filterEvents[i].get<TunerFilterEvent::media>().offset),
+ .isSecureMemory =
+ filterEvents[i].get<TunerFilterEvent::media>().isSecureMemory,
+ .avDataId = static_cast<uint64_t>(
+ filterEvents[i].get<TunerFilterEvent::media>().avDataId),
+ .mpuSequenceNumber = static_cast<uint32_t>(
+ filterEvents[i].get<TunerFilterEvent::media>().offset),
+ .isPesPrivateData =
+ filterEvents[i].get<TunerFilterEvent::media>().isPesPrivateData,
+ });
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
Result FilterClient::getFilterMq() {
if (mFilter == NULL) {
return Result::INVALID_STATE;
@@ -333,6 +443,20 @@
}
void FilterClient::handleAvShareMemory() {
+ if (mAvSharedHandle != NULL) {
+ return;
+ }
+
+ if (mTunerFilter != NULL && mIsMediaFilter) {
+ TunerFilterSharedHandleInfo aidlHandleInfo;
+ Status s = mTunerFilter->getAvSharedHandleInfo(&aidlHandleInfo);
+ if (ClientHelper::getServiceSpecificErrorCode(s) == Result::SUCCESS) {
+ mAvSharedHandle = native_handle_clone(makeFromAidl(aidlHandleInfo.handle));
+ mAvSharedMemSize = aidlHandleInfo.size;
+ }
+ return;
+ }
+
if (mFilter_1_1 != NULL && mIsMediaFilter) {
mFilter_1_1->getAvSharedHandle([&](Result r, hidl_handle avMemory, uint64_t avMemSize) {
if (r == Result::SUCCESS) {
@@ -342,4 +466,10 @@
});
}
}
+
+void FilterClient::closeAvSharedMemory() {
+ native_handle_close(mAvSharedHandle);
+ native_handle_delete(mAvSharedHandle);
+ mAvSharedMemSize = 0;
+}
} // namespace android
diff --git a/media/jni/tuner/FilterClient.h b/media/jni/tuner/FilterClient.h
index 7c85125..f5539e0 100644
--- a/media/jni/tuner/FilterClient.h
+++ b/media/jni/tuner/FilterClient.h
@@ -20,6 +20,8 @@
#include <aidl/android/media/tv/tuner/ITunerFilter.h>
#include <aidl/android/media/tv/tuner/BnTunerFilterCallback.h>
#include <aidl/android/media/tv/tuner/TunerFilterEvent.h>
+#include <aidl/android/media/tv/tuner/TunerFilterSettings.h>
+#include <aidlcommonsupport/NativeHandle.h>
#include <android/hardware/tv/tuner/1.1/IFilter.h>
#include <android/hardware/tv/tuner/1.1/IFilterCallback.h>
#include <android/hardware/tv/tuner/1.1/types.h>
@@ -31,7 +33,9 @@
using Status = ::ndk::ScopedAStatus;
using ::aidl::android::media::tv::tuner::BnTunerFilterCallback;
using ::aidl::android::media::tv::tuner::ITunerFilter;
+using ::aidl::android::media::tv::tuner::TunerFilterConfiguration;
using ::aidl::android::media::tv::tuner::TunerFilterEvent;
+using ::aidl::android::media::tv::tuner::TunerFilterSettings;
using ::android::hardware::EventFlag;
using ::android::hardware::MessageQueue;
@@ -61,11 +65,13 @@
public:
TunerFilterCallback(sp<FilterClientCallback> filterClientCallback);
- // TODO: complete TunerFilterCallback
Status onFilterStatus(int status);
- Status onFilterEvent(vector<TunerFilterEvent>* filterEvent);
+ Status onFilterEvent(const vector<TunerFilterEvent>& filterEvents);
private:
+ void getHidlFilterEvent(const vector<TunerFilterEvent>& filterEvents,
+ DemuxFilterEvent& event, DemuxFilterEventExt& eventExt);
+
sp<FilterClientCallback> mFilterClientCallback;
};
@@ -174,10 +180,12 @@
Result close();
private:
+ TunerFilterConfiguration getAidlFilterSettings(DemuxFilterSettings configure);
Result getFilterMq();
int copyData(uint8_t* buffer, int size);
void checkIsMediaFilter(DemuxFilterType type);
void handleAvShareMemory();
+ void closeAvSharedMemory();
/**
* An AIDL Tuner Filter Singleton assigned at the first time when the Tuner Client
diff --git a/media/jni/tuner/FrontendClient.cpp b/media/jni/tuner/FrontendClient.cpp
index ef8f57f..0540aac 100644
--- a/media/jni/tuner/FrontendClient.cpp
+++ b/media/jni/tuner/FrontendClient.cpp
@@ -21,8 +21,8 @@
#include "FrontendClient.h"
+using ::aidl::android::media::tv::tuner::TunerFrontendDvbtSettings;
using ::aidl::android::media::tv::tuner::TunerFrontendScanAtsc3PlpInfo;
-using ::aidl::android::media::tv::tuner::TunerFrontendSettings;
using ::android::hardware::tv::tuner::V1_0::FrontendAnalogSifStandard;
using ::android::hardware::tv::tuner::V1_0::FrontendAnalogType;
@@ -86,10 +86,9 @@
Result FrontendClient::tune(const FrontendSettings& settings,
const FrontendSettingsExt1_1& settingsExt1_1) {
if (mTunerFrontend != NULL) {
- // TODO: parse hidl settings to aidl settings
// TODO: aidl frontend settings to include Tuner HAL 1.1 settings
- TunerFrontendSettings settings;
- Status s = mTunerFrontend->tune(settings);
+ TunerFrontendSettings tunerFeSettings = getAidlFrontendSettings(settings, settingsExt1_1);
+ Status s = mTunerFrontend->tune(tunerFeSettings);
return ClientHelper::getServiceSpecificErrorCode(s);
}
@@ -124,10 +123,9 @@
Result FrontendClient::scan(const FrontendSettings& settings, FrontendScanType type,
const FrontendSettingsExt1_1& settingsExt1_1) {
if (mTunerFrontend != NULL) {
- // TODO: parse hidl settings to aidl settings
// TODO: aidl frontend settings to include Tuner HAL 1.1 settings
- TunerFrontendSettings settings;
- Status s = mTunerFrontend->scan(settings, (int)type);
+ TunerFrontendSettings tunerFeSettings = getAidlFrontendSettings(settings, settingsExt1_1);
+ Status s = mTunerFrontend->scan(tunerFeSettings, (int)type);
return ClientHelper::getServiceSpecificErrorCode(s);
}
@@ -279,7 +277,6 @@
Result FrontendClient::close() {
if (mTunerFrontend != NULL) {
- // TODO: handle error message.
Status s = mTunerFrontend->close();
return ClientHelper::getServiceSpecificErrorCode(s);
}
@@ -304,6 +301,61 @@
return mId;
}
+TunerFrontendSettings FrontendClient::getAidlFrontendSettings(const FrontendSettings& settings,
+ const FrontendSettingsExt1_1& /*settingsExt1_1*/) {
+ // TODO: complete hidl to aidl frontend settings conversion
+ TunerFrontendSettings s;
+ switch (settings.getDiscriminator()) {
+ case FrontendSettings::hidl_discriminator::analog: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::atsc: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::atsc3: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::dvbs: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::dvbc: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::dvbt: {
+ TunerFrontendDvbtSettings dvbtSettings{
+ .frequency = (int)settings.dvbt().frequency,
+ .transmissionMode = (int)settings.dvbt().transmissionMode,
+ .bandwidth = (int)settings.dvbt().bandwidth,
+ .constellation = (int)settings.dvbt().constellation,
+ .hierarchy = (int)settings.dvbt().hierarchy,
+ .hpCodeRate = (int)settings.dvbt().hpCoderate,
+ .lpCodeRate = (int)settings.dvbt().lpCoderate,
+ .guardInterval = (int)settings.dvbt().guardInterval,
+ .isHighPriority = settings.dvbt().isHighPriority,
+ .standard = (int)settings.dvbt().standard,
+ .isMiso = settings.dvbt().isMiso,
+ .plpMode = (int)settings.dvbt().plpMode,
+ .plpId = (int)settings.dvbt().plpId,
+ .plpGroupId = (int)settings.dvbt().plpGroupId,
+ };
+ s.set<TunerFrontendSettings::dvbt>(dvbtSettings);
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::isdbs: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::isdbs3: {
+ break;
+ }
+ case FrontendSettings::hidl_discriminator::isdbt: {
+ break;
+ }
+ default:
+ break;
+ }
+ return s;
+}
+
/////////////// TunerFrontendCallback ///////////////////////
TunerFrontendCallback::TunerFrontendCallback(sp<FrontendClientCallback> frontendClientCallback)
diff --git a/media/jni/tuner/FrontendClient.h b/media/jni/tuner/FrontendClient.h
index 03ebb87..17fd583 100644
--- a/media/jni/tuner/FrontendClient.h
+++ b/media/jni/tuner/FrontendClient.h
@@ -32,6 +32,7 @@
using ::aidl::android::media::tv::tuner::BnTunerFrontendCallback;
using ::aidl::android::media::tv::tuner::ITunerFrontend;
using ::aidl::android::media::tv::tuner::TunerFrontendScanMessage;
+using ::aidl::android::media::tv::tuner::TunerFrontendSettings;
using ::android::hardware::Return;
using ::android::hardware::Void;
@@ -171,6 +172,9 @@
int getId();
private:
+ TunerFrontendSettings getAidlFrontendSettings(const FrontendSettings& settings,
+ const FrontendSettingsExt1_1& settingsExt1_1);
+
/**
* An AIDL Tuner Frontend Singleton assigned at the first time when the Tuner Client
* opens a frontend cient. Default null when the service does not exist.
diff --git a/media/jni/tuner/TunerClient.cpp b/media/jni/tuner/TunerClient.cpp
index 4498f54..14393a1 100644
--- a/media/jni/tuner/TunerClient.cpp
+++ b/media/jni/tuner/TunerClient.cpp
@@ -235,7 +235,8 @@
}
}
- return NULL;}
+ return NULL;
+}
sp<LnbClient> TunerClient::openLnb(int lnbHandle) {
if (mTunerService != NULL) {
diff --git a/media/native/midi/include/amidi/AMidi.h b/media/native/midi/include/amidi/AMidi.h
index 0f930b5..742db34 100644
--- a/media/native/midi/include/amidi/AMidi.h
+++ b/media/native/midi/include/amidi/AMidi.h
@@ -61,8 +61,6 @@
AMIDI_DEVICE_TYPE_BLUETOOTH = 3 /* A MIDI device connected via BlueTooth */
};
-#if __ANDROID_API__ >= 29
-
/*
* Device API
*/
@@ -249,8 +247,6 @@
*/
void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCED_IN(29);
-#endif /* __ANDROID_API__ >= 29 */
-
#ifdef __cplusplus
}
#endif
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 266bfe0..6568bff 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -846,8 +846,8 @@
try {
stmt = db.compileStatement("INSERT INTO system(name,value)"
+ " VALUES(?,?);");
- loadBooleanSetting(stmt, Settings.System.USER_ROTATION,
- R.integer.def_user_rotation); // should be zero degrees
+ loadIntegerSetting(stmt, Settings.System.USER_ROTATION,
+ R.integer.def_user_rotation);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
@@ -2265,6 +2265,8 @@
loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION,
R.bool.def_accelerometer_rotation);
+ loadIntegerSetting(stmt, Settings.System.USER_ROTATION, R.integer.def_user_rotation);
+
loadDefaultHapticSettings(stmt);
loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 7eab559..1af7781 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -304,9 +304,6 @@
<uses-permission android:name="android.permission.RESTART_WIFI_SUBSYSTEM" />
<!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
- <uses-permission android:name="android.permission.NETWORK_AIRPLANE_MODE" />
-
- <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
<uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" />
<!-- Permission needed to use wifi usability API's for CtsNetTestCases -->
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
index 80c8a28..35a2195 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
@@ -76,7 +76,7 @@
android:textSize="100dp"
android:includeFontPadding="false"
android:fontFamily="@font/clock"
- android:lineSpacingMultiplier=".65"
+ android:lineSpacingMultiplier=".7"
android:typeface="monospace"
android:elegantTextHeight="false"
dozeWeight="200"
@@ -97,7 +97,7 @@
android:gravity="center_horizontal"
android:textSize="@dimen/large_clock_text_size"
android:includeFontPadding="false"
- android:lineSpacingMultiplier=".65"
+ android:lineSpacingMultiplier=".7"
android:fontFamily="@font/clock"
android:typeface="monospace"
android:elegantTextHeight="false"
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
index 796123db..04e645b 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
@@ -32,9 +32,8 @@
<com.android.keyguard.KeyguardSecurityContainer
android:id="@+id/keyguard_security_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:padding="0dp"
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
index dc77bd3..70f495c 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
@@ -46,7 +46,6 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
- android:layout_weight="1"
android:layoutDirection="ltr"
>
<include layout="@layout/keyguard_esim_area"
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java
index fbabaa4..70021b6 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java
@@ -114,13 +114,10 @@
for (int i = params.length - 1; i >= 0; i--) {
SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams =
params[i];
+ t.deferTransactionUntil(surfaceParams.surface, mBarrierSurfaceControl, frame);
surfaceParams.applyTo(t);
}
- if (mTargetViewRootImpl != null) {
- mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
- } else {
- t.apply();
- }
+ t.apply();
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
.sendToTarget();
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java
index 89c60f1..4a28d56 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java
@@ -56,12 +56,4 @@
});
}
}
-
- public void mergeWithNextTransaction(SurfaceControl.Transaction t, long frame) {
- if (mViewRoot != null) {
- mViewRoot.mergeWithNextTransaction(t, frame);
- } else {
- t.apply();
- }
- }
}
diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
index 62d3093..ca99563 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.java
@@ -38,7 +38,7 @@
* The time's text color is a gradient that changes its colors based on its controller.
*/
public class AnimatableClockView extends TextView {
- private static final CharSequence FORMAT_12_HOUR = "h\nmm";
+ private static final CharSequence FORMAT_12_HOUR = "hh\nmm";
private static final CharSequence FORMAT_24_HOUR = "HH\nmm";
private static final long ANIM_DURATION = 300;
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
index a40dc7a..85e9ca0 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
@@ -16,6 +16,7 @@
package com.android.keyguard;
import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.Display.DEFAULT_DISPLAY_GROUP;
import android.app.Presentation;
import android.content.Context;
@@ -116,6 +117,14 @@
if (DEBUG) Log.i(TAG, "Do not show KeyguardPresentation on a private display");
return false;
}
+ if (mTmpDisplayInfo.displayGroupId != DEFAULT_DISPLAY_GROUP) {
+ if (DEBUG) {
+ Log.i(TAG,
+ "Do not show KeyguardPresentation on a non-default group display");
+ }
+ return false;
+ }
+
return true;
}
/**
@@ -130,8 +139,7 @@
final int displayId = display.getDisplayId();
Presentation presentation = mPresentations.get(displayId);
if (presentation == null) {
- final Presentation newPresentation = new KeyguardPresentation(mContext, display,
- mKeyguardStatusViewComponentFactory);
+ final Presentation newPresentation = createPresentation(display);
newPresentation.setOnDismissListener(dialog -> {
if (newPresentation.equals(mPresentations.get(displayId))) {
mPresentations.remove(displayId);
@@ -152,6 +160,10 @@
return false;
}
+ KeyguardPresentation createPresentation(Display display) {
+ return new KeyguardPresentation(mContext, display, mKeyguardStatusViewComponentFactory);
+ }
+
/**
* @param displayId The id of the display to hide the presentation off.
*/
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java
new file mode 100644
index 0000000..826be2b
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.keyguard;
+
+import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManagerGlobal;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+import android.view.Display;
+import android.view.DisplayInfo;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.keyguard.dagger.KeyguardStatusViewComponent;
+import com.android.systemui.SysuiTestCase;
+import com.android.systemui.navigationbar.NavigationBarController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.Executor;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+@TestableLooper.RunWithLooper
+public class KeyguardDisplayManagerTest extends SysuiTestCase {
+
+ @Mock
+ private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
+
+ @Mock
+ private DisplayManager mDisplayManager;
+
+ @Mock
+ private KeyguardDisplayManager.KeyguardPresentation mKeyguardPresentation;
+
+ private Executor mBackgroundExecutor = Runnable::run;
+ private KeyguardDisplayManager mManager;
+
+ // The default and secondary displays are both in the default group
+ private Display mDefaultDisplay;
+ private Display mSecondaryDisplay;
+
+ // This display is in a different group from the default and secondary displays.
+ private Display mDifferentGroupDisplay;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext.addMockSystemService(DisplayManager.class, mDisplayManager);
+ mDependency.injectMockDependency(NavigationBarController.class);
+ mManager = spy(new KeyguardDisplayManager(mContext, mKeyguardStatusViewComponentFactory,
+ mBackgroundExecutor));
+ doReturn(mKeyguardPresentation).when(mManager).createPresentation(any());
+
+ mDefaultDisplay = new Display(DisplayManagerGlobal.getInstance(), Display.DEFAULT_DISPLAY,
+ new DisplayInfo(), DEFAULT_DISPLAY_ADJUSTMENTS);
+ mSecondaryDisplay = new Display(DisplayManagerGlobal.getInstance(),
+ Display.DEFAULT_DISPLAY + 1,
+ new DisplayInfo(), DEFAULT_DISPLAY_ADJUSTMENTS);
+
+ DisplayInfo differentGroupInfo = new DisplayInfo();
+ differentGroupInfo.displayId = Display.DEFAULT_DISPLAY + 2;
+ differentGroupInfo.displayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1;
+ mDifferentGroupDisplay = new Display(DisplayManagerGlobal.getInstance(),
+ Display.DEFAULT_DISPLAY,
+ differentGroupInfo, DEFAULT_DISPLAY_ADJUSTMENTS);
+ }
+
+ @Test
+ public void testShow_defaultDisplayOnly() {
+ when(mDisplayManager.getDisplays()).thenReturn(new Display[]{mDefaultDisplay});
+ mManager.show();
+ verify(mManager, never()).createPresentation(any());
+ }
+
+ @Test
+ public void testShow_includeSecondaryDisplay() {
+ when(mDisplayManager.getDisplays()).thenReturn(
+ new Display[]{mDefaultDisplay, mSecondaryDisplay});
+ mManager.show();
+ verify(mManager, times(1)).createPresentation(eq(mSecondaryDisplay));
+ }
+
+ @Test
+ public void testShow_includeNonDefaultGroupDisplay() {
+ when(mDisplayManager.getDisplays()).thenReturn(
+ new Display[]{mDefaultDisplay, mDifferentGroupDisplay});
+
+ mManager.show();
+ verify(mManager, never()).createPresentation(any());
+ }
+
+ @Test
+ public void testShow_includeSecondaryAndNonDefaultGroupDisplays() {
+ when(mDisplayManager.getDisplays()).thenReturn(
+ new Display[]{mDefaultDisplay, mSecondaryDisplay, mDifferentGroupDisplay});
+
+ mManager.show();
+ verify(mManager, times(1)).createPresentation(eq(mSecondaryDisplay));
+ }
+}
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d129b9c..554edc6 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -132,8 +132,8 @@
import android.net.TetheringManager;
import android.net.UidRange;
import android.net.UidRangeParcel;
+import android.net.UnderlyingNetworkInfo;
import android.net.Uri;
-import android.net.VpnInfo;
import android.net.VpnManager;
import android.net.VpnService;
import android.net.metrics.INetdEventListener;
@@ -4854,28 +4854,28 @@
*
* <p>Must be called on the handler thread.
*/
- private VpnInfo[] getAllVpnInfo() {
+ private UnderlyingNetworkInfo[] getAllVpnInfo() {
ensureRunningOnConnectivityServiceThread();
synchronized (mVpns) {
if (mLockdownEnabled) {
- return new VpnInfo[0];
+ return new UnderlyingNetworkInfo[0];
}
}
- List<VpnInfo> infoList = new ArrayList<>();
+ List<UnderlyingNetworkInfo> infoList = new ArrayList<>();
for (NetworkAgentInfo nai : mNetworkAgentInfos) {
- VpnInfo info = createVpnInfo(nai);
+ UnderlyingNetworkInfo info = createVpnInfo(nai);
if (info != null) {
infoList.add(info);
}
}
- return infoList.toArray(new VpnInfo[infoList.size()]);
+ return infoList.toArray(new UnderlyingNetworkInfo[infoList.size()]);
}
/**
* @return VPN information for accounting, or null if we can't retrieve all required
* information, e.g underlying ifaces.
*/
- private VpnInfo createVpnInfo(NetworkAgentInfo nai) {
+ private UnderlyingNetworkInfo createVpnInfo(NetworkAgentInfo nai) {
if (!nai.isVPN()) return null;
Network[] underlyingNetworks = nai.declaredUnderlyingNetworks;
@@ -4907,11 +4907,11 @@
// Must be non-null or NetworkStatsService will crash.
// Cannot happen in production code because Vpn only registers the NetworkAgent after the
// tun or ipsec interface is created.
+ // TODO: Remove this check.
if (nai.linkProperties.getInterfaceName() == null) return null;
- return new VpnInfo(nai.networkCapabilities.getOwnerUid(),
- nai.linkProperties.getInterfaceName(),
- interfaces.toArray(new String[0]));
+ return new UnderlyingNetworkInfo(nai.networkCapabilities.getOwnerUid(),
+ nai.linkProperties.getInterfaceName(), interfaces);
}
/**
@@ -5707,6 +5707,9 @@
networkCapabilities = createDefaultNetworkCapabilitiesForUid(callingUid);
enforceAccessPermission();
break;
+ case BACKGROUND_REQUEST:
+ enforceNetworkStackOrSettingsPermission();
+ // Fall-through since other checks are the same with normal requests.
case REQUEST:
networkCapabilities = new NetworkCapabilities(networkCapabilities);
enforceNetworkRequestPermissions(networkCapabilities, callingPackageName,
@@ -7998,10 +8001,10 @@
activeIface = activeLinkProperties.getInterfaceName();
}
- final VpnInfo[] vpnInfos = getAllVpnInfo();
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos = getAllVpnInfo();
try {
- mStatsService.forceUpdateIfaces(
- getDefaultNetworks(), getAllNetworkState(), activeIface, vpnInfos);
+ mStatsService.forceUpdateIfaces(getDefaultNetworks(), getAllNetworkState(), activeIface,
+ underlyingNetworkInfos);
} catch (Exception ignored) {
}
}
@@ -8261,6 +8264,7 @@
return getVpnIfOwner(mDeps.getCallingUid());
}
+ // TODO: stop calling into Vpn.java and get this information from data in this class.
@GuardedBy("mVpns")
private Vpn getVpnIfOwner(int uid) {
final int user = UserHandle.getUserId(uid);
@@ -8269,7 +8273,7 @@
if (vpn == null) {
return null;
} else {
- final VpnInfo info = vpn.getVpnInfo();
+ final UnderlyingNetworkInfo info = vpn.getUnderlyingNetworkInfo();
return (info == null || info.ownerUid != uid) ? null : vpn;
}
}
diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index 76db019..8562b0d 100644
--- a/services/core/java/com/android/server/VcnManagementService.java
+++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -25,9 +25,12 @@
import android.app.AppOpsManager;
import android.content.Context;
import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.net.vcn.IVcnManagementService;
import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;
import android.net.vcn.VcnConfig;
+import android.net.vcn.VcnUnderlyingNetworkPolicy;
import android.os.Binder;
import android.os.Handler;
import android.os.HandlerThread;
@@ -527,7 +530,7 @@
@NonNull IVcnUnderlyingNetworkPolicyListener listener) {
requireNonNull(listener, "listener was null");
- mContext.enforceCallingPermission(
+ mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.NETWORK_FACTORY,
"Must have permission NETWORK_FACTORY to register a policy listener");
@@ -561,4 +564,27 @@
}
}
}
+
+ /**
+ * Gets the UnderlyingNetworkPolicy as determined by the provided NetworkCapabilities and
+ * LinkProperties.
+ */
+ @NonNull
+ @Override
+ public VcnUnderlyingNetworkPolicy getUnderlyingNetworkPolicy(
+ @NonNull NetworkCapabilities networkCapabilities,
+ @NonNull LinkProperties linkProperties) {
+ requireNonNull(networkCapabilities, "networkCapabilities was null");
+ requireNonNull(linkProperties, "linkProperties was null");
+
+ mContext.enforceCallingOrSelfPermission(
+ android.Manifest.permission.NETWORK_FACTORY,
+ "Must have permission NETWORK_FACTORY or be the SystemServer to get underlying"
+ + " Network policies");
+
+ // TODO(b/175914059): implement policy generation once VcnManagementService is able to
+ // determine policies
+
+ return new VcnUnderlyingNetworkPolicy(false /* isTearDownRequested */, networkCapabilities);
+ }
}
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index efe82df..d63a6c3 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -31,6 +31,7 @@
import android.os.Looper;
import android.os.Process;
import android.os.RemoteException;
+import android.os.ServiceDebugInfo;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.SystemProperties;
@@ -136,6 +137,11 @@
"android.system.suspend@1.0::ISystemSuspend"
);
+ public static final String[] AIDL_INTERFACE_PREFIXES_OF_INTEREST = new String[] {
+ "android.hardware.light.ILights/",
+ "android.hardware.power.stats.IPowerStats/",
+ };
+
private static Watchdog sWatchdog;
private final Thread mThread;
@@ -527,12 +533,11 @@
return builder.toString();
}
- private static ArrayList<Integer> getInterestingHalPids() {
+ private static void addInterestingHidlPids(HashSet<Integer> pids) {
try {
IServiceManager serviceManager = IServiceManager.getService();
ArrayList<IServiceManager.InstanceDebugInfo> dump =
serviceManager.debugDump();
- HashSet<Integer> pids = new HashSet<>();
for (IServiceManager.InstanceDebugInfo info : dump) {
if (info.pid == IServiceManager.PidConstant.NO_PID) {
continue;
@@ -544,24 +549,37 @@
pids.add(info.pid);
}
- return new ArrayList<Integer>(pids);
} catch (RemoteException e) {
- return new ArrayList<Integer>();
+ Log.w(TAG, e);
+ }
+ }
+
+ private static void addInterestingAidlPids(HashSet<Integer> pids) {
+ ServiceDebugInfo[] infos = ServiceManager.getServiceDebugInfo();
+ if (infos == null) return;
+
+ for (ServiceDebugInfo info : infos) {
+ for (String prefix : AIDL_INTERFACE_PREFIXES_OF_INTEREST) {
+ if (info.name.startsWith(prefix)) {
+ pids.add(info.debugPid);
+ }
+ }
}
}
static ArrayList<Integer> getInterestingNativePids() {
- ArrayList<Integer> pids = getInterestingHalPids();
+ HashSet<Integer> pids = new HashSet<>();
+ addInterestingAidlPids(pids);
+ addInterestingHidlPids(pids);
int[] nativePids = Process.getPidsForCommands(NATIVE_STACKS_OF_INTEREST);
if (nativePids != null) {
- pids.ensureCapacity(pids.size() + nativePids.length);
for (int i : nativePids) {
pids.add(i);
}
}
- return pids;
+ return new ArrayList<Integer>(pids);
}
private void run() {
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index e476ca9..02613cf 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -900,7 +900,7 @@
String callingPackage, @Nullable String callingFeatureId, int callingUid,
Intent service, boolean callerFg, final int userId,
final boolean isBinding, final IServiceConnection connection) {
- if (mAm.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ if (mAm.getPackageManagerInternal().isPermissionsReviewRequired(
r.packageName, r.userId)) {
// Show a permission review UI only for starting/binding from a foreground app
@@ -932,7 +932,7 @@
// binding request is still valid, so hook them up. We
// proceed only if the caller cleared the review requirement
// otherwise we unbind because the user didn't approve.
- if (!mAm.getPackageManagerInternalLocked()
+ if (!mAm.getPackageManagerInternal()
.isPermissionsReviewRequired(r.packageName,
r.userId)) {
try {
@@ -941,9 +941,14 @@
callerFg,
false /* whileRestarting */,
false /* permissionsReviewRequired */,
- false /* packageFrozen */);
+ false /* packageFrozen */,
+ true /* enqueueOomAdj */);
} catch (RemoteException e) {
/* ignore - local call */
+ } finally {
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(
+ OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
}
} else {
unbindServiceLocked(connection);
@@ -994,7 +999,7 @@
int callingUid, int callingPid, boolean fgRequired, boolean callerFg, int userId,
boolean allowBackgroundActivityStarts, @Nullable IBinder backgroundActivityStartsToken,
boolean isBinding, IServiceConnection connection) {
- final PackageManagerInternal pm = mAm.getPackageManagerInternalLocked();
+ final PackageManagerInternal pm = mAm.getPackageManagerInternal();
final boolean frozen = pm.isPackageFrozen(s.packageName, callingUid, s.userId);
if (!frozen) {
// Not frozen, it's okay to go
@@ -1025,9 +1030,14 @@
bringUpServiceLocked(s, serviceIntent.getFlags(), callerFg,
false /* whileRestarting */,
false /* permissionsReviewRequired */,
- false /* packageFrozen */);
+ false /* packageFrozen */,
+ true /* enqueueOomAdj */);
} catch (TransactionTooLargeException e) {
/* ignore - local call */
+ } finally {
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(
+ OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
}
} else { // Starting a service
try {
@@ -1091,7 +1101,13 @@
FrameworkStatsLog.write(FrameworkStatsLog.SERVICE_STATE_CHANGED, uid, packageName,
serviceName, FrameworkStatsLog.SERVICE_STATE_CHANGED__STATE__START);
mAm.mBatteryStatsService.noteServiceStartRunning(uid, packageName, serviceName);
- String error = bringUpServiceLocked(r, service.getFlags(), callerFg, false, false, false);
+ String error = bringUpServiceLocked(r, service.getFlags(), callerFg,
+ false /* whileRestarting */,
+ false /* permissionsReviewRequired */,
+ false /* packageFrozen */,
+ true /* enqueueOomAdj */);
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
if (error != null) {
return new ComponentName("!!", error);
}
@@ -1117,7 +1133,7 @@
return r.name;
}
- private void stopServiceLocked(ServiceRecord service) {
+ private void stopServiceLocked(ServiceRecord service, boolean enqueueOomAdj) {
if (service.delayed) {
// If service isn't actually running, but is being held in the
// delayed list, then we need to keep it started but note that it
@@ -1140,7 +1156,7 @@
}
service.callStart = false;
- bringDownServiceIfNeededLocked(service, false, false);
+ bringDownServiceIfNeededLocked(service, false, false, enqueueOomAdj);
}
int stopServiceLocked(IApplicationThread caller, Intent service,
@@ -1163,7 +1179,7 @@
if (r.record != null) {
final long origId = Binder.clearCallingIdentity();
try {
- stopServiceLocked(r.record);
+ stopServiceLocked(r.record, false);
} finally {
Binder.restoreCallingIdentity(origId);
}
@@ -1213,11 +1229,15 @@
}
}
if (stopping != null) {
- for (int i=stopping.size()-1; i>=0; i--) {
+ final int size = stopping.size();
+ for (int i = size - 1; i >= 0; i--) {
ServiceRecord service = stopping.get(i);
service.delayed = false;
services.ensureNotStartingBackgroundLocked(service);
- stopServiceLocked(service);
+ stopServiceLocked(service, true);
+ }
+ if (size > 0) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
}
}
}
@@ -1226,7 +1246,7 @@
void killMisbehavingService(ServiceRecord r,
int appUid, int appPid, String localPackageName) {
synchronized (mAm) {
- stopServiceLocked(r);
+ stopServiceLocked(r, false);
mAm.crashApplication(appUid, appPid, localPackageName, -1,
"Bad notification for startForeground", true /*force*/);
}
@@ -1301,7 +1321,7 @@
}
r.callStart = false;
final long origId = Binder.clearCallingIdentity();
- bringDownServiceIfNeededLocked(r, false, false);
+ bringDownServiceIfNeededLocked(r, false, false, false);
Binder.restoreCallingIdentity(origId);
return true;
}
@@ -2229,12 +2249,12 @@
mAm.updateProcessForegroundLocked(proc, anyForeground, fgServiceTypes, oomAdj);
}
- private void updateWhitelistManagerLocked(ProcessRecord proc) {
- proc.whitelistManager = false;
+ private void updateAllowlistManagerLocked(ProcessRecord proc) {
+ proc.mAllowlistManager = false;
for (int i = proc.numberOfRunningServices() - 1; i >= 0; i--) {
ServiceRecord sr = proc.getRunningServiceAt(i);
if (sr.whitelistManager) {
- proc.whitelistManager = true;
+ proc.mAllowlistManager = true;
break;
}
}
@@ -2475,10 +2495,13 @@
}
clist.add(c);
+ boolean needOomAdj = false;
if ((flags&Context.BIND_AUTO_CREATE) != 0) {
s.lastActivity = SystemClock.uptimeMillis();
+ needOomAdj = true;
if (bringUpServiceLocked(s, service.getFlags(), callerFg, false,
- permissionsReviewRequired, packageFrozen) != null) {
+ permissionsReviewRequired, packageFrozen, true) != null) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_BIND_SERVICE);
return 0;
}
}
@@ -2489,7 +2512,7 @@
s.app.treatLikeActivity = true;
}
if (s.whitelistManager) {
- s.app.whitelistManager = true;
+ s.app.mAllowlistManager = true;
}
// This could have made the service more important.
mAm.updateLruProcessLocked(s.app,
@@ -2497,7 +2520,11 @@
|| (callerApp.getCurProcState() <= ActivityManager.PROCESS_STATE_TOP
&& (flags & Context.BIND_TREAT_LIKE_ACTIVITY) != 0),
b.client);
- mAm.updateOomAdjLocked(s.app, OomAdjuster.OOM_ADJ_REASON_BIND_SERVICE);
+ needOomAdj = true;
+ mAm.enqueueOomAdjTargetLocked(s.app);
+ }
+ if (needOomAdj) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_BIND_SERVICE);
}
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "Bind " + s + " with " + b
@@ -2591,7 +2618,7 @@
}
}
- serviceDoneExecutingLocked(r, mDestroyingServices.contains(r), false);
+ serviceDoneExecutingLocked(r, mDestroyingServices.contains(r), false, false);
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -2647,7 +2674,7 @@
try {
while (clist.size() > 0) {
ConnectionRecord r = clist.get(0);
- removeConnectionLocked(r, null, null);
+ removeConnectionLocked(r, null, null, true);
if (clist.size() > 0 && clist.get(0) == r) {
// In case it didn't get removed above, do it now.
Slog.wtf(TAG, "Connection " + r + " not removed for binder " + binder);
@@ -2656,8 +2683,8 @@
final ProcessRecord app = r.binding.service.app;
if (app != null) {
- if (app.whitelistManager) {
- updateWhitelistManagerLocked(app);
+ if (app.mAllowlistManager) {
+ updateAllowlistManagerLocked(app);
}
// This could have made the service less important.
if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) {
@@ -2716,7 +2743,7 @@
}
}
- serviceDoneExecutingLocked(r, inDestroying, false);
+ serviceDoneExecutingLocked(r, inDestroying, false, false);
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -2803,7 +2830,7 @@
flags |= PackageManager.MATCH_INSTANT;
}
// TODO: come back and remove this assumption to triage all services
- ResolveInfo rInfo = mAm.getPackageManagerInternalLocked().resolveService(service,
+ ResolveInfo rInfo = mAm.getPackageManagerInternal().resolveService(service,
resolvedType, flags, userId, callingUid);
ServiceInfo sInfo = rInfo != null ? rInfo.serviceInfo : null;
if (sInfo == null) {
@@ -2876,7 +2903,7 @@
final long token = Binder.clearCallingIdentity();
try {
ResolveInfo rInfoForUserId0 =
- mAm.getPackageManagerInternalLocked().resolveService(service,
+ mAm.getPackageManagerInternal().resolveService(service,
resolvedType, flags, userId, callingUid);
if (rInfoForUserId0 == null) {
Slog.w(TAG_SERVICE,
@@ -3055,13 +3082,13 @@
// Keep the executeNesting count accurate.
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "Crashed while binding " + r, e);
final boolean inDestroying = mDestroyingServices.contains(r);
- serviceDoneExecutingLocked(r, inDestroying, inDestroying);
+ serviceDoneExecutingLocked(r, inDestroying, inDestroying, false);
throw e;
} catch (RemoteException e) {
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "Crashed while binding " + r);
// Keep the executeNesting count accurate.
final boolean inDestroying = mDestroyingServices.contains(r);
- serviceDoneExecutingLocked(r, inDestroying, inDestroying);
+ serviceDoneExecutingLocked(r, inDestroying, inDestroying, false);
return false;
}
}
@@ -3217,9 +3244,12 @@
}
try {
bringUpServiceLocked(r, r.intent.getIntent().getFlags(), r.createdFromFg, true, false,
- false);
+ false, true);
} catch (TransactionTooLargeException e) {
// Ignore, it's been logged and nothing upstack cares.
+ } finally {
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
}
}
@@ -3262,7 +3292,8 @@
}
private String bringUpServiceLocked(ServiceRecord r, int intentFlags, boolean execInFg,
- boolean whileRestarting, boolean permissionsReviewRequired, boolean packageFrozen)
+ boolean whileRestarting, boolean permissionsReviewRequired, boolean packageFrozen,
+ boolean enqueueOomAdj)
throws TransactionTooLargeException {
if (r.app != null && r.app.thread != null) {
sendServiceArgsLocked(r, execInFg, false);
@@ -3299,7 +3330,7 @@
+ r.appInfo.uid + " for service "
+ r.intent.getIntent() + ": user " + r.userId + " is stopped";
Slog.w(TAG, msg);
- bringDownServiceLocked(r);
+ bringDownServiceLocked(r, enqueueOomAdj);
return msg;
}
@@ -3325,7 +3356,7 @@
if (app != null && app.thread != null) {
try {
app.addPackage(r.appInfo.packageName, r.appInfo.longVersionCode, mAm.mProcessStats);
- realStartServiceLocked(r, app, execInFg);
+ realStartServiceLocked(r, app, execInFg, enqueueOomAdj);
return null;
} catch (TransactionTooLargeException e) {
throw e;
@@ -3366,7 +3397,7 @@
+ r.appInfo.uid + " for service "
+ r.intent.getIntent() + ": process is bad";
Slog.w(TAG, msg);
- bringDownServiceLocked(r);
+ bringDownServiceLocked(r, enqueueOomAdj);
return msg;
}
if (isolated) {
@@ -3379,7 +3410,7 @@
Slog.v(TAG, "Whitelisting " + UserHandle.formatUid(r.appInfo.uid)
+ " for fg-service launch");
}
- mAm.tempWhitelistUidLocked(r.appInfo.uid,
+ mAm.tempAllowlistUidLocked(r.appInfo.uid,
SERVICE_START_FOREGROUND_TIMEOUT, "fg-service-launch",
BroadcastOptions.TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED);
}
@@ -3394,7 +3425,7 @@
if (r.startRequested) {
if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE,
"Applying delayed stop (in bring up): " + r);
- stopServiceLocked(r);
+ stopServiceLocked(r, enqueueOomAdj);
}
}
@@ -3417,7 +3448,7 @@
* from bindService() as well.
*/
private final void realStartServiceLocked(ServiceRecord r,
- ProcessRecord app, boolean execInFg) throws RemoteException {
+ ProcessRecord app, boolean execInFg, boolean enqueueOomAdj) throws RemoteException {
if (app.thread == null) {
throw new RemoteException();
}
@@ -3431,7 +3462,11 @@
bumpServiceExecutingLocked(r, execInFg, "create");
mAm.updateLruProcessLocked(app, false, null);
updateServiceForegroundLocked(r.app, /* oomAdj= */ false);
- mAm.updateOomAdjLocked(app, OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
+ if (enqueueOomAdj) {
+ mAm.enqueueOomAdjTargetLocked(app);
+ } else {
+ mAm.updateOomAdjLocked(app, OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
+ }
boolean created = false;
try {
@@ -3466,7 +3501,7 @@
if (!created) {
// Keep the executeNesting count accurate.
final boolean inDestroying = mDestroyingServices.contains(r);
- serviceDoneExecutingLocked(r, inDestroying, inDestroying);
+ serviceDoneExecutingLocked(r, inDestroying, inDestroying, false);
// Cleanup.
if (newService) {
@@ -3482,7 +3517,7 @@
}
if (r.whitelistManager) {
- app.whitelistManager = true;
+ app.mAllowlistManager = true;
}
requestServiceBindingsLocked(r, execInFg);
@@ -3515,7 +3550,7 @@
if (r.startRequested) {
if (DEBUG_DELAYED_STARTS) Slog.v(TAG_SERVICE,
"Applying delayed stop (from start): " + r);
- stopServiceLocked(r);
+ stopServiceLocked(r, enqueueOomAdj);
}
}
}
@@ -3603,9 +3638,11 @@
if (caughtException != null) {
// Keep nesting count correct
final boolean inDestroying = mDestroyingServices.contains(r);
- for (int i = 0; i < args.size(); i++) {
- serviceDoneExecutingLocked(r, inDestroying, inDestroying);
+ for (int i = 0, size = args.size(); i < size; i++) {
+ serviceDoneExecutingLocked(r, inDestroying, inDestroying, true);
}
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
if (caughtException instanceof TransactionTooLargeException) {
throw (TransactionTooLargeException)caughtException;
}
@@ -3631,7 +3668,7 @@
}
private final void bringDownServiceIfNeededLocked(ServiceRecord r, boolean knowConn,
- boolean hasConn) {
+ boolean hasConn, boolean enqueueOomAdj) {
//Slog.i(TAG, "Bring down service:");
//r.dump(" ");
@@ -3644,10 +3681,10 @@
return;
}
- bringDownServiceLocked(r);
+ bringDownServiceLocked(r, enqueueOomAdj);
}
- private final void bringDownServiceLocked(ServiceRecord r) {
+ private void bringDownServiceLocked(ServiceRecord r, boolean enqueueOomAdj) {
//Slog.i(TAG, "Bring down service:");
//r.dump(" ");
@@ -3672,9 +3709,9 @@
}
}
+ boolean needOomAdj = false;
// Tell the service that it has been unbound.
if (r.app != null && r.app.thread != null) {
- boolean needOomAdj = false;
for (int i = r.bindings.size() - 1; i >= 0; i--) {
IntentBindRecord ibr = r.bindings.valueAt(i);
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "Bringing down binding " + ibr
@@ -3691,15 +3728,11 @@
Slog.w(TAG, "Exception when unbinding service "
+ r.shortInstanceName, e);
needOomAdj = false;
- serviceProcessGoneLocked(r);
+ serviceProcessGoneLocked(r, enqueueOomAdj);
break;
}
}
}
- if (needOomAdj) {
- mAm.updateOomAdjLocked(r.app, true,
- OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
- }
}
// Check to see if the service had been started as foreground, but being
@@ -3801,7 +3834,7 @@
r.app.stopService(r);
r.app.updateBoundClientUids();
if (r.whitelistManager) {
- updateWhitelistManagerLocked(r.app);
+ updateAllowlistManagerLocked(r.app);
}
if (r.app.thread != null) {
updateServiceForegroundLocked(r.app, false);
@@ -3815,7 +3848,7 @@
} catch (Exception e) {
Slog.w(TAG, "Exception when destroying service "
+ r.shortInstanceName, e);
- serviceProcessGoneLocked(r);
+ serviceProcessGoneLocked(r, enqueueOomAdj);
}
} else {
if (DEBUG_SERVICE) Slog.v(
@@ -3826,6 +3859,13 @@
TAG_SERVICE, "Removed service that is not running: " + r);
}
+ if (needOomAdj) {
+ if (enqueueOomAdj) {
+ mAm.enqueueOomAdjTargetLocked(r.app);
+ } else {
+ mAm.updateOomAdjLocked(r.app, true, OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ }
+ }
if (r.bindings.size() > 0) {
r.bindings.clear();
}
@@ -3849,7 +3889,7 @@
}
void removeConnectionLocked(ConnectionRecord c, ProcessRecord skipApp,
- ActivityServiceConnectionsHolder skipAct) {
+ ActivityServiceConnectionsHolder skipAct, boolean enqueueOomAdj) {
IBinder binder = c.conn.asBinder();
AppBindRecord b = c.binding;
ServiceRecord s = b.service;
@@ -3875,7 +3915,7 @@
if ((c.flags&Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) {
s.updateWhitelistManager();
if (!s.whitelistManager && s.app != null) {
- updateWhitelistManagerLocked(s.app);
+ updateAllowlistManagerLocked(s.app);
}
}
// And do the same for bg activity starts ability.
@@ -3918,8 +3958,12 @@
// it to go down there and we want it to start out near the top.
mAm.updateLruProcessLocked(s.app, false, null);
}
- mAm.updateOomAdjLocked(s.app, true,
- OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ if (enqueueOomAdj) {
+ mAm.enqueueOomAdjTargetLocked(s.app);
+ } else {
+ mAm.updateOomAdjLocked(s.app, true,
+ OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ }
b.intent.hasBound = false;
// Assume the client doesn't want to know about a rebind;
// we will deal with that later if it asks for one.
@@ -3927,7 +3971,7 @@
s.app.thread.scheduleUnbindService(s, b.intent.intent.getIntent());
} catch (Exception e) {
Slog.w(TAG, "Exception when unbinding service " + s.shortInstanceName, e);
- serviceProcessGoneLocked(s);
+ serviceProcessGoneLocked(s, enqueueOomAdj);
}
}
@@ -3946,12 +3990,13 @@
SystemClock.uptimeMillis());
}
}
- bringDownServiceIfNeededLocked(s, true, hasAutoCreate);
+ bringDownServiceIfNeededLocked(s, true, hasAutoCreate, enqueueOomAdj);
}
}
}
- void serviceDoneExecutingLocked(ServiceRecord r, int type, int startId, int res) {
+ void serviceDoneExecutingLocked(ServiceRecord r, int type, int startId, int res,
+ boolean enqueueOomAdj) {
boolean inDestroying = mDestroyingServices.contains(r);
if (r != null) {
if (type == ActivityThread.SERVICE_DONE_EXECUTING_START) {
@@ -4024,7 +4069,7 @@
}
}
final long origId = Binder.clearCallingIdentity();
- serviceDoneExecutingLocked(r, inDestroying, inDestroying);
+ serviceDoneExecutingLocked(r, inDestroying, inDestroying, enqueueOomAdj);
Binder.restoreCallingIdentity(origId);
} else {
Slog.w(TAG, "Done executing unknown service from pid "
@@ -4032,7 +4077,7 @@
}
}
- private void serviceProcessGoneLocked(ServiceRecord r) {
+ private void serviceProcessGoneLocked(ServiceRecord r, boolean enqueueOomAdj) {
if (r.tracker != null) {
int memFactor = mAm.mProcessStats.getMemFactorLocked();
long now = SystemClock.uptimeMillis();
@@ -4041,11 +4086,11 @@
r.tracker.setBound(false, memFactor, now);
r.tracker.setStarted(false, memFactor, now);
}
- serviceDoneExecutingLocked(r, true, true);
+ serviceDoneExecutingLocked(r, true, true, enqueueOomAdj);
}
private void serviceDoneExecutingLocked(ServiceRecord r, boolean inDestroying,
- boolean finishing) {
+ boolean finishing, boolean enqueueOomAdj) {
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "<<< DONE EXECUTING " + r
+ ": nesting=" + r.executeNesting
+ ", inDestroying=" + inDestroying + ", app=" + r.app);
@@ -4077,7 +4122,11 @@
mDestroyingServices.remove(r);
r.bindings.clear();
}
- mAm.updateOomAdjLocked(r.app, true, OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ if (enqueueOomAdj) {
+ mAm.enqueueOomAdjTargetLocked(r.app);
+ } else {
+ mAm.updateOomAdjLocked(r.app, true, OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ }
}
r.executeFg = false;
if (r.tracker != null) {
@@ -4095,7 +4144,7 @@
r.app.stopService(r);
r.app.updateBoundClientUids();
if (r.whitelistManager) {
- updateWhitelistManagerLocked(r.app);
+ updateAllowlistManagerLocked(r.app);
}
}
r.setProcess(null);
@@ -4121,15 +4170,17 @@
i--;
proc.addPackage(sr.appInfo.packageName, sr.appInfo.longVersionCode,
mAm.mProcessStats);
- realStartServiceLocked(sr, proc, sr.createdFromFg);
+ realStartServiceLocked(sr, proc, sr.createdFromFg, true);
didSomething = true;
if (!isServiceNeededLocked(sr, false, false)) {
// We were waiting for this service to start, but it is actually no
// longer needed. This could happen because bringDownServiceIfNeeded
// won't bring down a service that is pending... so now the pending
// is done, so let's drop it.
- bringDownServiceLocked(sr);
+ bringDownServiceLocked(sr, true);
}
+ /* Will be a no-op if nothing pending */
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_START_SERVICE);
}
} catch (RemoteException e) {
Slog.w(TAG, "Exception in new application when starting service "
@@ -4157,7 +4208,8 @@
}
void processStartTimedOutLocked(ProcessRecord proc) {
- for (int i=0; i<mPendingServices.size(); i++) {
+ boolean needOomAdj = false;
+ for (int i = 0, size = mPendingServices.size(); i < size; i++) {
ServiceRecord sr = mPendingServices.get(i);
if ((proc.uid == sr.appInfo.uid
&& proc.processName.equals(sr.processName))
@@ -4166,9 +4218,13 @@
sr.isolatedProc = null;
mPendingServices.remove(i);
i--;
- bringDownServiceLocked(sr);
+ needOomAdj = true;
+ bringDownServiceLocked(sr, true);
}
}
+ if (needOomAdj) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ }
}
private boolean collectPackageServicesLocked(String packageName, Set<String> filterByClasses,
@@ -4191,7 +4247,7 @@
service.app.stopService(service);
service.app.updateBoundClientUids();
if (service.whitelistManager) {
- updateWhitelistManagerLocked(service.app);
+ updateAllowlistManagerLocked(service.app);
}
}
service.setProcess(null);
@@ -4237,8 +4293,12 @@
}
if (mTmpCollectionResults != null) {
- for (int i = mTmpCollectionResults.size() - 1; i >= 0; i--) {
- bringDownServiceLocked(mTmpCollectionResults.get(i));
+ final int size = mTmpCollectionResults.size();
+ for (int i = size - 1; i >= 0; i--) {
+ bringDownServiceLocked(mTmpCollectionResults.get(i), true);
+ }
+ if (size > 0) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
}
mTmpCollectionResults.clear();
}
@@ -4279,12 +4339,14 @@
}
// Take care of any running services associated with the app.
+ boolean needOomAdj = false;
for (int i = services.size() - 1; i >= 0; i--) {
ServiceRecord sr = services.get(i);
if (sr.startRequested) {
if ((sr.serviceInfo.flags&ServiceInfo.FLAG_STOP_WITH_TASK) != 0) {
Slog.i(TAG, "Stopping service " + sr.shortInstanceName + ": remove task");
- stopServiceLocked(sr);
+ needOomAdj = true;
+ stopServiceLocked(sr, true);
} else {
sr.pendingStarts.add(new ServiceRecord.StartItem(sr, true,
sr.getLastStartId(), baseIntent, null, 0));
@@ -4300,6 +4362,9 @@
}
}
}
+ if (needOomAdj) {
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+ }
}
final void killServicesLocked(ProcessRecord app, boolean allowRestart) {
@@ -4333,12 +4398,12 @@
// Clean up any connections this application has to other services.
for (int i = app.connections.size() - 1; i >= 0; i--) {
ConnectionRecord r = app.connections.valueAt(i);
- removeConnectionLocked(r, app, null);
+ removeConnectionLocked(r, app, null, true);
}
updateServiceConnectionActivitiesLocked(app);
app.connections.clear();
- app.whitelistManager = false;
+ app.mAllowlistManager = false;
// Clear app state from services.
for (int i = app.numberOfRunningServices() - 1; i >= 0; i--) {
@@ -4435,10 +4500,10 @@
+ " times, stopping: " + sr);
EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH,
sr.userId, sr.crashCount, sr.shortInstanceName, app.pid);
- bringDownServiceLocked(sr);
+ bringDownServiceLocked(sr, true);
} else if (!allowRestart
|| !mAm.mUserController.isUserRunning(sr.userId, 0)) {
- bringDownServiceLocked(sr);
+ bringDownServiceLocked(sr, true);
} else {
final boolean scheduled = scheduleServiceRestartLocked(sr, true /* allowCancel */);
@@ -4446,7 +4511,7 @@
// extreme case of so many attempts to deliver a command
// that it failed we also will stop it here.
if (!scheduled) {
- bringDownServiceLocked(sr);
+ bringDownServiceLocked(sr, true);
} else if (sr.canStopIfKilled(false /* isStartCanceled */)) {
// Update to stopped state because the explicit start is gone. The service is
// scheduled to restart for other reason (e.g. connections) so we don't bring
@@ -4460,6 +4525,8 @@
}
}
+ mAm.updateOomAdjPendingTargetsLocked(OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);
+
if (!allowRestart) {
app.stopAllServices();
app.clearBoundClientUids();
@@ -4684,7 +4751,7 @@
Slog.i(TAG, "Service foreground-required timeout for " + r);
}
r.fgWaiting = false;
- stopServiceLocked(r);
+ stopServiceLocked(r, false);
}
if (app != null) {
@@ -5490,7 +5557,7 @@
}
if (ret == FGS_FEATURE_DENIED) {
- if (mAm.isWhitelistedForFgsStartLocked(callingUid)) {
+ if (mAm.isAllowlistedForFgsStartLocked(callingUid)) {
// uid is on DeviceIdleController's user/system allowlist
// or AMS's FgsStartTempAllowList.
ret = FGS_FEATURE_ALLOWED_BY_DEVICE_IDLE_ALLOW_LIST;
@@ -5593,7 +5660,7 @@
case FGS_FEATURE_ALLOWED_BY_BACKGROUND_FGS_PERMISSION:
return "ALLOWED_BY_BACKGROUND_FGS_PERMISSION";
case FGS_FEATURE_ALLOWED_BY_ALLOWLIST:
- return "ALLOWED_BY_WHITELIST";
+ return "ALLOWED_BY_ALLOWLIST";
case FGS_FEATURE_ALLOWED_BY_DEVICE_OWNER:
return "ALLOWED_BY_DEVICE_OWNER";
case FGS_FEATURE_ALLOWED_BY_DEVICE_IDLE_ALLOW_LIST:
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 05f2fa0..f63b994 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -99,7 +99,6 @@
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_OOM_ADJ;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_POWER;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESSES;
-import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBSERVERS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SERVICE;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_WHITELISTS;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BACKUP;
@@ -251,7 +250,6 @@
import android.os.PowerManagerInternal;
import android.os.Process;
import android.os.RemoteCallback;
-import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
@@ -278,7 +276,6 @@
import android.text.style.SuggestionSpan;
import android.util.ArrayMap;
import android.util.ArraySet;
-import android.util.DebugUtils;
import android.util.EventLog;
import android.util.IntArray;
import android.util.Log;
@@ -395,6 +392,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
public class ActivityManagerService extends IActivityManager.Stub
implements Watchdog.Monitor, BatteryStatsImpl.BatteryCallback {
@@ -535,16 +533,16 @@
public OomAdjProfiler mOomAdjProfiler = new OomAdjProfiler();
// Whether we should use SCHED_FIFO for UI and RenderThreads.
- boolean mUseFifoUiScheduling = false;
+ final boolean mUseFifoUiScheduling;
// Use an offload queue for long broadcasts, e.g. BOOT_COMPLETED.
// For simplicity, since we statically declare the size of the array of BroadcastQueues,
// we still create this new offload queue, but never ever put anything on it.
- boolean mEnableOffloadQueue;
+ final boolean mEnableOffloadQueue;
- BroadcastQueue mFgBroadcastQueue;
- BroadcastQueue mBgBroadcastQueue;
- BroadcastQueue mOffloadBroadcastQueue;
+ final BroadcastQueue mFgBroadcastQueue;
+ final BroadcastQueue mBgBroadcastQueue;
+ final BroadcastQueue mOffloadBroadcastQueue;
// Convenient for easy iteration over the queues. Foreground is first
// so that dispatch of foreground broadcasts gets precedence.
final BroadcastQueue[] mBroadcastQueues = new BroadcastQueue[3];
@@ -662,9 +660,9 @@
final ProcessStatsService mProcessStats;
/**
- * Non-persistent appId whitelist for background restrictions
+ * Non-persistent appId allowlist for background restrictions
*/
- int[] mBackgroundAppIdWhitelist = new int[] {
+ int[] mBackgroundAppIdAllowlist = new int[] {
BLUETOOTH_UID
};
@@ -881,11 +879,6 @@
*/
final ArrayList<ProcessRecord> mPersistentStartingProcesses = new ArrayList<ProcessRecord>();
- /**
- * List of processes that should gc as soon as things are idle.
- */
- final ArrayList<ProcessRecord> mProcessesToGc = new ArrayList<ProcessRecord>();
-
private final ActivityMetricsLaunchObserver mActivityLaunchObserver =
new ActivityMetricsLaunchObserver() {
@Override
@@ -915,7 +908,7 @@
}
};
- private boolean mBinderTransactionTrackingEnabled = false;
+ private volatile boolean mBinderTransactionTrackingEnabled = false;
/**
* Fingerprints (hashCode()) of stack traces that we've
@@ -923,6 +916,7 @@
* something (rogue user app) forces this over
* MAX_DUP_SUPPRESSED_STACKS entries, the contents are cleared.
*/
+ @GuardedBy("mAlreadyLoggedViolatedStacks")
private final HashSet<Integer> mAlreadyLoggedViolatedStacks = new HashSet<Integer>();
private static final int MAX_DUP_SUPPRESSED_STACKS = 5000;
@@ -1062,7 +1056,7 @@
/**
* Information about component usage
*/
- UsageStatsManagerInternal mUsageStatsService;
+ volatile UsageStatsManagerInternal mUsageStatsService;
/**
* Access to DeviceIdleController service.
@@ -1072,29 +1066,29 @@
/**
* Power-save whitelisted app-ids (not including except-idle-whitelisted ones).
*/
- int[] mDeviceIdleWhitelist = new int[0];
+ int[] mDeviceIdleAllowlist = new int[0];
/**
* Power-save whitelisted app-ids (including except-idle-whitelisted ones).
*/
- int[] mDeviceIdleExceptIdleWhitelist = new int[0];
+ int[] mDeviceIdleExceptIdleAllowlist = new int[0];
/**
* Set of app ids that are temporarily allowed to escape bg check due to high-pri message
*/
- int[] mDeviceIdleTempWhitelist = new int[0];
+ int[] mDeviceIdleTempAllowlist = new int[0];
- static final class PendingTempWhitelist {
+ static final class PendingTempAllowlist {
final int targetUid;
final long duration;
final String tag;
final int type;
- PendingTempWhitelist(int _targetUid, long _duration, String _tag, int _type) {
- targetUid = _targetUid;
- duration = _duration;
- tag = _tag;
- type = _type;
+ PendingTempAllowlist(int targetUid, long duration, String tag, int type) {
+ this.targetUid = targetUid;
+ this.duration = duration;
+ this.tag = tag;
+ this.type = type;
}
void dumpDebug(ProtoOutputStream proto, long fieldId) {
@@ -1107,7 +1101,7 @@
}
}
- final PendingTempWhitelists mPendingTempWhitelist = new PendingTempWhitelists(this);
+ final PendingTempAllowlists mPendingTempAllowlist = new PendingTempAllowlists(this);
/**
* The temp-allowlist that is allowed to start FGS from background.
@@ -1162,7 +1156,7 @@
/**
* State of external calls telling us if the device is awake or asleep.
*/
- int mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ AtomicInteger mWakefulness = new AtomicInteger(PowerManagerInternal.WAKEFULNESS_AWAKE);
/**
* The uptime of the last time we performed idle maintenance.
@@ -1172,10 +1166,18 @@
/**
* For reporting to battery stats the current top application.
*/
+ @GuardedBy("mCurResumedAppLock")
private String mCurResumedPackage = null;
+
+ @GuardedBy("mCurResumedAppLock")
private int mCurResumedUid = -1;
/**
+ * Dedicated lock for {@link #mCurResumedPackage} and {@link #mCurResumedUid}.
+ */
+ private final Object mCurResumedAppLock = new Object();
+
+ /**
* For reporting to battery stats the apps currently running foreground
* service. The ProcessMap is package/uid tuples; each of these contain
* an array of the currently foreground processes.
@@ -1213,16 +1215,17 @@
int foregroundServiceTypes;
}
- // TODO: Move below 4 members and code to ProcessList
- final RemoteCallbackList<IProcessObserver> mProcessObservers = new RemoteCallbackList<>();
- ProcessChangeItem[] mActiveProcessChanges = new ProcessChangeItem[5];
-
- final ArrayList<ProcessChangeItem> mPendingProcessChanges = new ArrayList<>();
- final ArrayList<ProcessChangeItem> mAvailProcessChanges = new ArrayList<>();
-
+ @GuardedBy("mOomAdjObserverLock")
OomAdjObserver mCurOomAdjObserver;
+
+ @GuardedBy("mOomAdjObserverLock")
int mCurOomAdjUid;
+ /**
+ * Dedicated lock for {@link #mCurOomAdjObserver} and {@link #mCurOomAdjUid}.
+ */
+ final Object mOomAdjObserverLock = new Object();
+
interface OomAdjObserver {
void onOomAdjMessage(String msg);
}
@@ -1301,7 +1304,7 @@
static final int IDLE_UIDS_MSG = 58;
static final int HANDLE_TRUST_STORAGE_UPDATE_MSG = 63;
static final int SERVICE_FOREGROUND_TIMEOUT_MSG = 66;
- static final int PUSH_TEMP_WHITELIST_UI_MSG = 68;
+ static final int PUSH_TEMP_ALLOWLIST_UI_MSG = 68;
static final int SERVICE_FOREGROUND_CRASH_MSG = 69;
static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70;
static final int KILL_APP_ZYGOTE_MSG = 71;
@@ -1312,13 +1315,11 @@
static final String SERVICE_RECORD_KEY = "servicerecord";
- long mLastMemUsageReportTime = 0;
-
/**
* Flag whether the current user is a "monkey", i.e. whether
* the UI is driven by a UI automation tool.
*/
- private boolean mUserIsMonkey;
+ private volatile boolean mUserIsMonkey;
@VisibleForTesting
public final ServiceThread mHandlerThread;
@@ -1351,7 +1352,7 @@
/**
* Used to notify activity lifecycle events.
*/
- @Nullable ContentCaptureManagerInternal mContentCaptureService;
+ @Nullable volatile ContentCaptureManagerInternal mContentCaptureService;
/*
* The default duration for the binder heavy hitter auto sampler
@@ -1438,7 +1439,7 @@
}
} break;
case DISPATCH_PROCESSES_CHANGED_UI_MSG: {
- dispatchProcessesChanged();
+ mProcessList.dispatchProcessesChanged();
break;
}
case DISPATCH_PROCESS_DIED_UI_MSG: {
@@ -1447,14 +1448,14 @@
}
final int pid = msg.arg1;
final int uid = msg.arg2;
- dispatchProcessDied(pid, uid);
+ mProcessList.dispatchProcessDied(pid, uid);
break;
}
case DISPATCH_OOM_ADJ_OBSERVER_MSG: {
dispatchOomAdjObserver((String) msg.obj);
} break;
- case PUSH_TEMP_WHITELIST_UI_MSG: {
- pushTempWhitelist();
+ case PUSH_TEMP_ALLOWLIST_UI_MSG: {
+ pushTempAllowlist();
} break;
}
}
@@ -1470,18 +1471,18 @@
switch (msg.what) {
case GC_BACKGROUND_PROCESSES_MSG: {
synchronized (ActivityManagerService.this) {
- performAppGcsIfAppropriateLocked();
+ mAppProfiler.performAppGcsIfAppropriateLocked();
}
} break;
case SERVICE_TIMEOUT_MSG: {
- mServices.serviceTimeout((ProcessRecord)msg.obj);
+ mServices.serviceTimeout((ProcessRecord) msg.obj);
} break;
case SERVICE_FOREGROUND_TIMEOUT_MSG: {
- mServices.serviceForegroundTimeout((ServiceRecord)msg.obj);
+ mServices.serviceForegroundTimeout((ServiceRecord) msg.obj);
} break;
case SERVICE_FOREGROUND_CRASH_MSG: {
- mServices.serviceForegroundCrash(
- (ProcessRecord) msg.obj, msg.getData().getCharSequence(SERVICE_RECORD_KEY));
+ mServices.serviceForegroundCrash((ProcessRecord) msg.obj,
+ msg.getData().getCharSequence(SERVICE_RECORD_KEY));
} break;
case UPDATE_TIME_ZONE: {
synchronized (ActivityManagerService.this) {
@@ -1491,7 +1492,8 @@
try {
r.thread.updateTimeZone();
} catch (RemoteException ex) {
- Slog.w(TAG, "Failed to update time zone for: " + r.info.processName);
+ Slog.w(TAG, "Failed to update time zone for: "
+ + r.info.processName);
}
}
}
@@ -1506,13 +1508,13 @@
mProcessList.setAllHttpProxy();
} break;
case PROC_START_TIMEOUT_MSG: {
- ProcessRecord app = (ProcessRecord)msg.obj;
+ ProcessRecord app = (ProcessRecord) msg.obj;
synchronized (ActivityManagerService.this) {
processStartTimedOutLocked(app);
}
} break;
case CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG: {
- ProcessRecord app = (ProcessRecord)msg.obj;
+ ProcessRecord app = (ProcessRecord) msg.obj;
synchronized (ActivityManagerService.this) {
mCpHelper.processContentProviderPublishTimedOutLocked(app);
}
@@ -1521,13 +1523,14 @@
synchronized (ActivityManagerService.this) {
final int appId = msg.arg1;
final int userId = msg.arg2;
- Bundle bundle = (Bundle)msg.obj;
+ Bundle bundle = (Bundle) msg.obj;
String pkg = bundle.getString("pkg");
String reason = bundle.getString("reason");
forceStopPackageLocked(pkg, appId, false, false, true, false,
false, userId, reason);
}
} break;
+
case KILL_APP_ZYGOTE_MSG: {
synchronized (ActivityManagerService.this) {
final AppZygote appZygote = (AppZygote) msg.obj;
@@ -1541,10 +1544,10 @@
sendMessageDelayed(nmsg, mConstants.POWER_CHECK_INTERVAL);
} break;
case REPORT_MEM_USAGE_MSG: {
- final ArrayList<ProcessMemInfo> memInfos = (ArrayList<ProcessMemInfo>)msg.obj;
+ final ArrayList<ProcessMemInfo> memInfos = (ArrayList<ProcessMemInfo>) msg.obj;
Thread thread = new Thread() {
@Override public void run() {
- reportMemUsage(memInfos);
+ mAppProfiler.reportMemUsage(memInfos);
}
};
thread.start();
@@ -1680,7 +1683,10 @@
}
}
- public void setUsageStatsManager(UsageStatsManagerInternal usageStatsManager) {
+ /**
+ * @param usageStatsManager shouldn't be null
+ */
+ public void setUsageStatsManager(@NonNull UsageStatsManagerInternal usageStatsManager) {
mUsageStatsService = usageStatsManager;
mActivityTaskManager.setUsageStatsManager(usageStatsManager);
}
@@ -2034,6 +2040,9 @@
mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class);
mInternal = new LocalService();
mPendingStartActivityUids = new PendingStartActivityUids(mContext);
+ mUseFifoUiScheduling = false;
+ mEnableOffloadQueue = false;
+ mFgBroadcastQueue = mBgBroadcastQueue = mOffloadBroadcastQueue = null;
}
// Note: This method is invoked on the main thread but may need to attach various
@@ -2128,9 +2137,7 @@
mPendingIntentController = new PendingIntentController(
mHandlerThread.getLooper(), mUserController, mConstants);
- if (SystemProperties.getInt("sys.use_fifo_ui", 0) != 0) {
- mUseFifoUiScheduling = true;
- }
+ mUseFifoUiScheduling = SystemProperties.getInt("sys.use_fifo_ui", 0) != 0;
mTrackingAssociations = "1".equals(SystemProperties.get("debug.track-associations"));
mIntentFirewall = new IntentFirewall(new IntentFirewallInterface(), mHandler);
@@ -2244,7 +2251,7 @@
ArrayMap<String, ArraySet<String>> allowedAssociations =
SystemConfig.getInstance().getAllowedAssociations();
mAllowedAssociations = new ArrayMap<>(allowedAssociations.size());
- PackageManagerInternal pm = getPackageManagerInternalLocked();
+ PackageManagerInternal pm = getPackageManagerInternal();
for (int i = 0; i < allowedAssociations.size(); i++) {
final String pkg = allowedAssociations.keyAt(i);
final ArraySet<String> asc = allowedAssociations.valueAt(i);
@@ -2323,8 +2330,8 @@
}
}
- void updateCpuStatsLocked() {
- mAppProfiler.updateCpuStatsLocked();
+ void updateCpuStats() {
+ mAppProfiler.updateCpuStats();
}
void updateCpuStatsNow() {
@@ -2457,9 +2464,7 @@
}
void notifyPackageUse(String packageName, int reason) {
- synchronized(this) {
- getPackageManagerInternalLocked().notifyPackageUse(packageName, reason);
- }
+ getPackageManagerInternal().notifyPackageUse(packageName, reason);
}
boolean startIsolatedProcess(String entryPoint, String[] entryPointArgs,
@@ -2538,10 +2543,11 @@
if (mUsageStatsService != null) {
mUsageStatsService.reportEvent(activity, userId, event, appToken.hashCode(), taskRoot);
}
- if (mContentCaptureService != null && (event == Event.ACTIVITY_PAUSED
+ final ContentCaptureManagerInternal contentCaptureService = mContentCaptureService;
+ if (contentCaptureService != null && (event == Event.ACTIVITY_PAUSED
|| event == Event.ACTIVITY_RESUMED || event == Event.ACTIVITY_STOPPED
|| event == Event.ACTIVITY_DESTROYED)) {
- mContentCaptureService.notifyActivityEvent(userId, activity, event);
+ contentCaptureService.notifyActivityEvent(userId, activity, event);
}
}
@@ -2616,8 +2622,8 @@
for (int i=mProcessList.mLruProcesses.size()-1; i>=0; i--) {
final ProcessRecord proc = mProcessList.mLruProcesses.get(i);
if (procState > proc.setProcState) {
- if (proc.pkgList.containsKey(packageName) ||
- (proc.pkgDeps != null && proc.pkgDeps.contains(packageName))) {
+ if (proc.getPkgList().containsKey(packageName)
+ || (proc.pkgDeps != null && proc.pkgDeps.contains(packageName))) {
procState = proc.setProcState;
}
}
@@ -2640,7 +2646,7 @@
if (app.thread == null) {
throw new IllegalArgumentException("Process has no app thread");
}
- if (app.trimMemoryLevel >= level) {
+ if (app.mProfile.getTrimMemoryLevel() >= level) {
throw new IllegalArgumentException(
"Unable to set a higher trim level than current level");
}
@@ -2650,119 +2656,14 @@
+ "on a foreground process");
}
app.thread.scheduleTrimMemory(level);
- app.trimMemoryLevel = level;
+ app.mProfile.setTrimMemoryLevel(level);
return true;
}
}
- private void dispatchProcessesChanged() {
- int N;
- synchronized (this) {
- N = mPendingProcessChanges.size();
- if (mActiveProcessChanges.length < N) {
- mActiveProcessChanges = new ProcessChangeItem[N];
- }
- mPendingProcessChanges.toArray(mActiveProcessChanges);
- mPendingProcessChanges.clear();
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "*** Delivering " + N + " process changes");
- }
-
- int i = mProcessObservers.beginBroadcast();
- while (i > 0) {
- i--;
- final IProcessObserver observer = mProcessObservers.getBroadcastItem(i);
- if (observer != null) {
- try {
- for (int j=0; j<N; j++) {
- ProcessChangeItem item = mActiveProcessChanges[j];
- if ((item.changes&ProcessChangeItem.CHANGE_ACTIVITIES) != 0) {
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "ACTIVITIES CHANGED pid=" + item.pid + " uid="
- + item.uid + ": " + item.foregroundActivities);
- observer.onForegroundActivitiesChanged(item.pid, item.uid,
- item.foregroundActivities);
- }
- if ((item.changes & ProcessChangeItem.CHANGE_FOREGROUND_SERVICES) != 0) {
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "FOREGROUND SERVICES CHANGED pid=" + item.pid + " uid="
- + item.uid + ": " + item.foregroundServiceTypes);
- observer.onForegroundServicesChanged(item.pid, item.uid,
- item.foregroundServiceTypes);
- }
- }
- } catch (RemoteException e) {
- }
- }
- }
- mProcessObservers.finishBroadcast();
-
- synchronized (this) {
- for (int j=0; j<N; j++) {
- mAvailProcessChanges.add(mActiveProcessChanges[j]);
- }
- }
- }
-
- @GuardedBy("this")
- ProcessChangeItem enqueueProcessChangeItemLocked(int pid, int uid) {
- int i = mPendingProcessChanges.size()-1;
- ActivityManagerService.ProcessChangeItem item = null;
- while (i >= 0) {
- item = mPendingProcessChanges.get(i);
- if (item.pid == pid) {
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "Re-using existing item: " + item);
- break;
- }
- i--;
- }
-
- if (i < 0) {
- // No existing item in pending changes; need a new one.
- final int NA = mAvailProcessChanges.size();
- if (NA > 0) {
- item = mAvailProcessChanges.remove(NA-1);
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "Retrieving available item: " + item);
- } else {
- item = new ActivityManagerService.ProcessChangeItem();
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "Allocating new item: " + item);
- }
- item.changes = 0;
- item.pid = pid;
- item.uid = uid;
- if (mPendingProcessChanges.size() == 0) {
- if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
- "*** Enqueueing dispatch processes changed!");
- mUiHandler.obtainMessage(DISPATCH_PROCESSES_CHANGED_UI_MSG)
- .sendToTarget();
- }
- mPendingProcessChanges.add(item);
- }
-
- return item;
- }
-
- private void dispatchProcessDied(int pid, int uid) {
- int i = mProcessObservers.beginBroadcast();
- while (i > 0) {
- i--;
- final IProcessObserver observer = mProcessObservers.getBroadcastItem(i);
- if (observer != null) {
- try {
- observer.onProcessDied(pid, uid);
- } catch (RemoteException e) {
- }
- }
- }
- mProcessObservers.finishBroadcast();
- }
-
void dispatchOomAdjObserver(String msg) {
OomAdjObserver observer;
- synchronized (this) {
+ synchronized (mOomAdjObserverLock) {
observer = mCurOomAdjObserver;
}
@@ -2772,32 +2673,26 @@
}
void setOomAdjObserver(int uid, OomAdjObserver observer) {
- synchronized (this) {
+ synchronized (mOomAdjObserverLock) {
mCurOomAdjUid = uid;
mCurOomAdjObserver = observer;
}
}
void clearOomAdjObserver() {
- synchronized (this) {
+ synchronized (mOomAdjObserverLock) {
mCurOomAdjUid = -1;
mCurOomAdjObserver = null;
}
}
- void reportOomAdjMessageLocked(String tag, String msg) {
- Slog.d(tag, msg);
- if (mCurOomAdjObserver != null) {
- mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg).sendToTarget();
- }
- }
-
void reportUidInfoMessageLocked(String tag, String msg, int uid) {
Slog.i(TAG, msg);
- if (mCurOomAdjObserver != null && uid == mCurOomAdjUid) {
- mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg).sendToTarget();
+ synchronized (mOomAdjObserverLock) {
+ if (mCurOomAdjObserver != null && uid == mCurOomAdjUid) {
+ mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg).sendToTarget();
+ }
}
-
}
/**
@@ -2969,57 +2864,6 @@
return null;
}
- final void doLowMemReportIfNeededLocked(ProcessRecord dyingProc) {
- // If there are no longer any background processes running,
- // and the app that died was not running instrumentation,
- // then tell everyone we are now low on memory.
- if (!mProcessList.haveBackgroundProcessLocked()) {
- boolean doReport = Build.IS_DEBUGGABLE;
- if (doReport) {
- long now = SystemClock.uptimeMillis();
- if (now < (mLastMemUsageReportTime+5*60*1000)) {
- doReport = false;
- } else {
- mLastMemUsageReportTime = now;
- }
- }
- final ArrayList<ProcessMemInfo> memInfos
- = doReport ? new ArrayList<ProcessMemInfo>(mProcessList.getLruSizeLocked())
- : null;
- EventLogTags.writeAmLowMemory(mProcessList.getLruSizeLocked());
- long now = SystemClock.uptimeMillis();
- for (int i = mProcessList.mLruProcesses.size() - 1; i >= 0; i--) {
- ProcessRecord rec = mProcessList.mLruProcesses.get(i);
- if (rec == dyingProc || rec.thread == null) {
- continue;
- }
- if (doReport) {
- memInfos.add(new ProcessMemInfo(rec.processName, rec.pid, rec.setAdj,
- rec.setProcState, rec.adjType, rec.makeAdjReason()));
- }
- if ((rec.lastLowMemory+mConstants.GC_MIN_INTERVAL) <= now) {
- // The low memory report is overriding any current
- // state for a GC request. Make sure to do
- // heavy/important/visible/foreground processes first.
- if (rec.setAdj <= ProcessList.HEAVY_WEIGHT_APP_ADJ) {
- rec.lastRequestedGc = 0;
- } else {
- rec.lastRequestedGc = rec.lastLowMemory;
- }
- rec.reportLowMemory = true;
- rec.lastLowMemory = now;
- mProcessesToGc.remove(rec);
- addProcessToGcListLocked(rec);
- }
- }
- if (doReport) {
- Message msg = mHandler.obtainMessage(REPORT_MEM_USAGE_MSG, memInfos);
- mHandler.sendMessage(msg);
- }
- scheduleAppGcsLocked();
- }
- }
-
@GuardedBy("this")
final void appDiedLocked(ProcessRecord app, String reason) {
appDiedLocked(app, app.pid, app.thread, false, reason);
@@ -3076,7 +2920,7 @@
updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_PROCESS_END);
}
if (doLowMem) {
- doLowMemReportIfNeededLocked(app);
+ mAppProfiler.doLowMemReportIfNeededLocked(app);
}
} else if (app.pid != pid) {
// A new process has already been started.
@@ -3379,55 +3223,55 @@
final long callingId = Binder.clearCallingIdentity();
try {
IPackageManager pm = AppGlobals.getPackageManager();
- synchronized(this) {
- // Instant packages are not protected
- if (getPackageManagerInternalLocked().isPackageDataProtected(
- resolvedUserId, packageName)) {
- throw new SecurityException(
- "Cannot clear data for a protected package: " + packageName);
- }
+ // Instant packages are not protected
+ if (getPackageManagerInternal().isPackageDataProtected(
+ resolvedUserId, packageName)) {
+ throw new SecurityException(
+ "Cannot clear data for a protected package: " + packageName);
+ }
- ApplicationInfo applicationInfo = null;
- try {
- applicationInfo = pm.getApplicationInfo(packageName,
- MATCH_UNINSTALLED_PACKAGES, resolvedUserId);
- } catch (RemoteException e) {
- /* ignore */
- }
- appInfo = applicationInfo;
+ ApplicationInfo applicationInfo = null;
+ try {
+ applicationInfo = pm.getApplicationInfo(packageName,
+ MATCH_UNINSTALLED_PACKAGES, resolvedUserId);
+ } catch (RemoteException e) {
+ /* ignore */
+ }
+ appInfo = applicationInfo;
- final boolean clearingOwnUidData = appInfo != null && appInfo.uid == uid;
+ final boolean clearingOwnUidData = appInfo != null && appInfo.uid == uid;
- if (!clearingOwnUidData && checkComponentPermission(permission.CLEAR_APP_USER_DATA,
+ if (!clearingOwnUidData && checkComponentPermission(permission.CLEAR_APP_USER_DATA,
pid, uid, -1, true) != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("PID " + pid + " does not have permission "
- + android.Manifest.permission.CLEAR_APP_USER_DATA + " to clear data"
- + " of package " + packageName);
- }
+ throw new SecurityException("PID " + pid + " does not have permission "
+ + android.Manifest.permission.CLEAR_APP_USER_DATA + " to clear data"
+ + " of package " + packageName);
+ }
- final boolean hasInstantMetadata = getPackageManagerInternalLocked()
- .hasInstantApplicationMetadata(packageName, resolvedUserId);
- final boolean isUninstalledAppWithoutInstantMetadata =
- (appInfo == null && !hasInstantMetadata);
- isInstantApp = (appInfo != null && appInfo.isInstantApp())
- || hasInstantMetadata;
- final boolean canAccessInstantApps = checkComponentPermission(
- permission.ACCESS_INSTANT_APPS, pid, uid, -1, true)
- == PackageManager.PERMISSION_GRANTED;
+ final boolean hasInstantMetadata = getPackageManagerInternal()
+ .hasInstantApplicationMetadata(packageName, resolvedUserId);
+ final boolean isUninstalledAppWithoutInstantMetadata =
+ (appInfo == null && !hasInstantMetadata);
+ isInstantApp = (appInfo != null && appInfo.isInstantApp())
+ || hasInstantMetadata;
+ final boolean canAccessInstantApps = checkComponentPermission(
+ permission.ACCESS_INSTANT_APPS, pid, uid, -1, true)
+ == PackageManager.PERMISSION_GRANTED;
- if (isUninstalledAppWithoutInstantMetadata || (isInstantApp
+ if (isUninstalledAppWithoutInstantMetadata || (isInstantApp
&& !canAccessInstantApps)) {
- Slog.w(TAG, "Invalid packageName: " + packageName);
- if (observer != null) {
- try {
- observer.onRemoveCompleted(packageName, false);
- } catch (RemoteException e) {
- Slog.i(TAG, "Observer no longer exists.");
- }
+ Slog.w(TAG, "Invalid packageName: " + packageName);
+ if (observer != null) {
+ try {
+ observer.onRemoveCompleted(packageName, false);
+ } catch (RemoteException e) {
+ Slog.i(TAG, "Observer no longer exists.");
}
- return false;
}
+ return false;
+ }
+ synchronized (this) {
if (appInfo != null) {
forceStopPackageLocked(packageName, appInfo.uid, "clear data");
mAtmInternal.removeRecentTasksByPackageName(packageName, resolvedUserId);
@@ -3566,7 +3410,7 @@
ApplicationExitInfo.SUBREASON_UNKNOWN,
"kill all background");
- doLowMemReportIfNeededLocked(null);
+ mAppProfiler.doLowMemReportIfNeededLocked(null);
}
} finally {
Binder.restoreCallingIdentity(callingId);
@@ -3623,7 +3467,7 @@
int[] users = userId == UserHandle.USER_ALL
? mUserController.getUsers() : new int[] { userId };
for (int user : users) {
- if (getPackageManagerInternalLocked().isPackageStateProtected(
+ if (getPackageManagerInternal().isPackageStateProtected(
packageName, user)) {
Slog.w(TAG, "Ignoring request to force stop protected package "
+ packageName + " u" + user);
@@ -3660,17 +3504,17 @@
@Override
public void addPackageDependency(String packageName) {
- synchronized (this) {
- int callingPid = Binder.getCallingPid();
- if (callingPid == myPid()) {
- // Yeah, um, no.
- return;
- }
- ProcessRecord proc;
- synchronized (mPidsSelfLocked) {
- proc = mPidsSelfLocked.get(Binder.getCallingPid());
- }
- if (proc != null) {
+ int callingPid = Binder.getCallingPid();
+ if (callingPid == myPid()) {
+ // Yeah, um, no.
+ return;
+ }
+ ProcessRecord proc;
+ synchronized (mPidsSelfLocked) {
+ proc = mPidsSelfLocked.get(Binder.getCallingPid());
+ }
+ if (proc != null) {
+ synchronized (this) {
if (proc.pkgDeps == null) {
proc.pkgDeps = new ArraySet<String>(1);
}
@@ -3743,15 +3587,22 @@
}
}
- Debug.MemoryInfo[] infos = new Debug.MemoryInfo[pids.length];
+ final Debug.MemoryInfo[] infos = new Debug.MemoryInfo[pids.length];
for (int i=pids.length-1; i>=0; i--) {
- infos[i] = new Debug.MemoryInfo();
+ final Debug.MemoryInfo mi = infos[i] = new Debug.MemoryInfo();
final ProcessRecord proc;
final int oomAdj;
- synchronized (this) {
+ final ProcessProfileRecord profile;
+ synchronized (mAppProfiler.mProfilerLock) {
synchronized (mPidsSelfLocked) {
proc = mPidsSelfLocked.get(pids[i]);
- oomAdj = proc != null ? proc.setAdj : 0;
+ if (proc != null) {
+ profile = proc.mProfile;
+ oomAdj = profile.getSetAdj();
+ } else {
+ profile = null;
+ oomAdj = 0;
+ }
}
}
final int targetUid = (proc != null) ? proc.uid : -1;
@@ -3766,43 +3617,43 @@
continue; // Not allowed to see other users.
}
}
- if (proc != null && proc.lastMemInfoTime >= lastNow && proc.lastMemInfo != null
- && !isCallerInstrumentedFromShell) {
- // It hasn't been long enough that we want to take another sample; return
- // the last one.
- infos[i].set(proc.lastMemInfo);
- continue;
+ if (proc != null) {
+ synchronized (mAppProfiler.mProfilerLock) {
+ if (profile.getLastMemInfoTime() >= lastNow && profile.getLastMemInfo() != null
+ && !isCallerInstrumentedFromShell) {
+ // It hasn't been long enough that we want to take another sample; return
+ // the last one.
+ mi.set(profile.getLastMemInfo());
+ continue;
+ }
+ }
}
final long startTime = SystemClock.currentThreadTimeMillis();
final Debug.MemoryInfo memInfo = new Debug.MemoryInfo();
Debug.getMemoryInfo(pids[i], memInfo);
- final long endTime = SystemClock.currentThreadTimeMillis();
- infos[i].set(memInfo);
+ final long duration = SystemClock.currentThreadTimeMillis() - startTime;
+ mi.set(memInfo);
if (proc != null) {
- synchronized (this) {
- proc.lastMemInfo = memInfo;
- proc.lastMemInfoTime = SystemClock.uptimeMillis();
- if (proc.thread != null && proc.setAdj == oomAdj) {
+ synchronized (mAppProfiler.mProfilerLock) {
+ profile.setLastMemInfo(memInfo);
+ profile.setLastMemInfoTime(SystemClock.uptimeMillis());
+ if (profile.getThread() != null && profile.getSetAdj() == oomAdj) {
// Record this for posterity if the process has been stable.
- synchronized (mProcessStats.mLock) {
- proc.baseProcessTracker.addPss(infos[i].getTotalPss(),
- infos[i].getTotalUss(), infos[i].getTotalRss(), false,
- ProcessStats.ADD_PSS_EXTERNAL_SLOW, endTime - startTime,
- proc.pkgList.mPkgList);
- }
- for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
+ profile.addPss(mi.getTotalPss(),
+ mi.getTotalUss(), mi.getTotalRss(), false,
+ ProcessStats.ADD_PSS_EXTERNAL_SLOW, duration);
+ proc.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
proc.info.uid,
holder.state.getName(),
holder.state.getPackage(),
- infos[i].getTotalPss(),
- infos[i].getTotalUss(),
- infos[i].getTotalRss(),
+ mi.getTotalPss(),
+ mi.getTotalUss(),
+ mi.getTotalRss(),
ProcessStats.ADD_PSS_EXTERNAL_SLOW,
- endTime-startTime,
+ duration,
holder.appVersion);
- }
+ });
}
}
}
@@ -3823,7 +3674,7 @@
final boolean allUids = mAtmInternal.isGetTasksAllowed(
"getProcessPss", callingPid, callingUid);
- long[] pss = new long[pids.length];
+ final long[] pss = new long[pids.length];
for (int i=pids.length-1; i>=0; i--) {
ProcessRecord proc;
int oomAdj;
@@ -3838,29 +3689,29 @@
// just leave it empty.
continue;
}
- long[] tmpUss = new long[3];
- long startTime = SystemClock.currentThreadTimeMillis();
- pss[i] = Debug.getPss(pids[i], tmpUss, null);
- long endTime = SystemClock.currentThreadTimeMillis();
+ final long[] tmpUss = new long[3];
+ final long startTime = SystemClock.currentThreadTimeMillis();
+ final long pi = pss[i] = Debug.getPss(pids[i], tmpUss, null);
+ final long duration = SystemClock.currentThreadTimeMillis() - startTime;
if (proc != null) {
- synchronized (this) {
- if (proc.thread != null && proc.setAdj == oomAdj) {
+ final ProcessProfileRecord profile = proc.mProfile;
+ synchronized (mAppProfiler.mProfilerLock) {
+ if (profile.getThread() != null && profile.getSetAdj() == oomAdj) {
// Record this for posterity if the process has been stable.
- synchronized (mProcessStats.mLock) {
- proc.baseProcessTracker.addPss(pss[i], tmpUss[0], tmpUss[2], false,
- ProcessStats.ADD_PSS_EXTERNAL, endTime - startTime,
- proc.pkgList.mPkgList);
- }
- for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
+ profile.addPss(pi, tmpUss[0], tmpUss[2], false,
+ ProcessStats.ADD_PSS_EXTERNAL, duration);
+ proc.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
proc.info.uid,
holder.state.getName(),
holder.state.getPackage(),
- pss[i], tmpUss[0], tmpUss[2],
- ProcessStats.ADD_PSS_EXTERNAL, endTime-startTime,
+ pi,
+ tmpUss[0],
+ tmpUss[2],
+ ProcessStats.ADD_PSS_EXTERNAL,
+ duration,
holder.appVersion);
- }
+ });
}
}
}
@@ -4051,7 +3902,7 @@
Slog.i(TAG, "Force stopping u" + userId + ": " + reason);
}
- mAppErrors.resetProcessCrashTimeLocked(packageName == null, appId, userId);
+ mAppErrors.resetProcessCrashTime(packageName == null, appId, userId);
}
// Notify first that the package is stopped, so its process won't be restarted unexpectedly
@@ -4425,7 +4276,11 @@
checkTime(startTime, "attachApplicationLocked: immediately after bindApplication");
mProcessList.updateLruProcessLocked(app, false, null);
checkTime(startTime, "attachApplicationLocked: after updateLruProcessLocked");
- app.lastRequestedGc = app.lastLowMemory = SystemClock.uptimeMillis();
+ final long now = SystemClock.uptimeMillis();
+ synchronized (mAppProfiler.mProfilerLock) {
+ app.mProfile.setLastRequestedGc(now);
+ app.mProfile.setLastLowMemory(now);
+ }
} catch (Exception e) {
// We need kill the process group here. (b/148588589)
Slog.wtf(TAG, "Exception thrown during bind of " + app, e);
@@ -5439,7 +5294,7 @@
// If force-background-check is enabled, restrict all apps that aren't whitelisted.
if (mForceBackgroundCheck &&
!UserHandle.isCore(uid) &&
- !isOnDeviceIdleWhitelistLocked(uid, /*allowExceptIdleToo=*/ true)) {
+ !isOnDeviceIdleAllowlistLocked(uid, /*allowExceptIdleToo=*/ true)) {
if (DEBUG_BACKGROUND_CHECK) {
Slog.i(TAG, "Force background check: " +
uid + "/" + packageName + " restricted");
@@ -5468,7 +5323,7 @@
}
// Non-persistent but background whitelisted?
- if (uidOnBackgroundWhitelist(uid)) {
+ if (uidOnBackgroundAllowlist(uid)) {
if (DEBUG_BACKGROUND_CHECK) {
Slog.i(TAG, "App " + uid + "/" + packageName
+ " on background whitelist; not restricted in background");
@@ -5477,7 +5332,7 @@
}
// Is this app on the battery whitelist?
- if (isOnDeviceIdleWhitelistLocked(uid, /*allowExceptIdleToo=*/ false)) {
+ if (isOnDeviceIdleAllowlistLocked(uid, /*allowExceptIdleToo=*/ false)) {
if (DEBUG_BACKGROUND_CHECK) {
Slog.i(TAG, "App " + uid + "/" + packageName
+ " on idle whitelist; not restricted in background");
@@ -5501,7 +5356,7 @@
if (uidRec == null || alwaysRestrict || forcedStandby || uidRec.idle) {
boolean ephemeral;
if (uidRec == null) {
- ephemeral = getPackageManagerInternalLocked().isPackageEphemeral(
+ ephemeral = getPackageManagerInternal().isPackageEphemeral(
UserHandle.getUserId(uid), packageName);
} else {
ephemeral = uidRec.ephemeral;
@@ -5525,8 +5380,8 @@
if (DEBUG_BACKGROUND_CHECK) {
Slog.d(TAG, "checkAllowBackground: uid=" + uid
+ " pkg=" + packageName + " startMode=" + startMode
- + " onwhitelist=" + isOnDeviceIdleWhitelistLocked(uid, false)
- + " onwhitelist(ei)=" + isOnDeviceIdleWhitelistLocked(uid, true));
+ + " onallowlist=" + isOnDeviceIdleAllowlistLocked(uid, false)
+ + " onallowlist(ei)=" + isOnDeviceIdleAllowlistLocked(uid, true));
}
if (startMode == ActivityManager.APP_START_MODE_DELAYED) {
// This is an old app that has been forced into a "compatible as possible"
@@ -5552,38 +5407,38 @@
}
/**
- * @return whether a UID is in the system, user or temp doze whitelist.
+ * @return whether a UID is in the system, user or temp doze allowlist.
*/
- boolean isOnDeviceIdleWhitelistLocked(int uid, boolean allowExceptIdleToo) {
+ boolean isOnDeviceIdleAllowlistLocked(int uid, boolean allowExceptIdleToo) {
final int appId = UserHandle.getAppId(uid);
- final int[] whitelist = allowExceptIdleToo
- ? mDeviceIdleExceptIdleWhitelist
- : mDeviceIdleWhitelist;
+ final int[] allowlist = allowExceptIdleToo
+ ? mDeviceIdleExceptIdleAllowlist
+ : mDeviceIdleAllowlist;
- return Arrays.binarySearch(whitelist, appId) >= 0
- || Arrays.binarySearch(mDeviceIdleTempWhitelist, appId) >= 0
- || mPendingTempWhitelist.indexOfKey(uid) >= 0;
+ return Arrays.binarySearch(allowlist, appId) >= 0
+ || Arrays.binarySearch(mDeviceIdleTempAllowlist, appId) >= 0
+ || mPendingTempAllowlist.indexOfKey(uid) >= 0;
}
- boolean isWhitelistedForFgsStartLocked(int uid) {
- return Arrays.binarySearch(mDeviceIdleExceptIdleWhitelist, UserHandle.getAppId(uid)) >= 0
+ boolean isAllowlistedForFgsStartLocked(int uid) {
+ return Arrays.binarySearch(mDeviceIdleExceptIdleAllowlist, UserHandle.getAppId(uid)) >= 0
|| mFgsStartTempAllowList.isAllowed(uid);
}
/**
- * @return whitelist tag for a uid from mPendingTempWhitelist, null if not currently on
- * the whitelist
+ * @return allowlist tag for a uid from mPendingTempAllowlist, null if not currently on
+ * the allowlist
*/
- String getPendingTempWhitelistTagForUidLocked(int uid) {
- final PendingTempWhitelist ptw = mPendingTempWhitelist.get(uid);
+ String getPendingTempAllowlistTagForUidLocked(int uid) {
+ final PendingTempAllowlist ptw = mPendingTempAllowlist.get(uid);
return ptw != null ? ptw.tag : null;
}
@VisibleForTesting
public void grantImplicitAccess(int userId, Intent intent, int visibleUid, int recipientAppId) {
- getPackageManagerInternalLocked().
- grantImplicitAccess(userId, intent, recipientAppId, visibleUid, true /*direct*/);
+ getPackageManagerInternal()
+ .grantImplicitAccess(userId, intent, recipientAppId, visibleUid, true /*direct*/);
}
/**
@@ -5831,14 +5686,18 @@
}
@VisibleForTesting
- public PackageManagerInternal getPackageManagerInternalLocked() {
+ public PackageManagerInternal getPackageManagerInternal() {
+ // Intentionally hold no locks: in case of race conditions, the mPackageManagerInt will
+ // be set to the same value anyway.
if (mPackageManagerInt == null) {
mPackageManagerInt = LocalServices.getService(PackageManagerInternal.class);
}
return mPackageManagerInt;
}
- private PermissionManagerServiceInternal getPermissionManagerInternalLocked() {
+ private PermissionManagerServiceInternal getPermissionManagerInternal() {
+ // Intentionally hold no locks: in case of race conditions, the mPermissionManagerInt will
+ // be set to the same value anyway.
if (mPermissionManagerInt == null) {
mPermissionManagerInt =
LocalServices.getService(PermissionManagerServiceInternal.class);
@@ -5983,12 +5842,11 @@
// GLOBAL MANAGEMENT
// =========================================================
- private boolean uidOnBackgroundWhitelist(final int uid) {
+ private boolean uidOnBackgroundAllowlist(final int uid) {
final int appId = UserHandle.getAppId(uid);
- final int[] whitelist = mBackgroundAppIdWhitelist;
- final int N = whitelist.length;
- for (int i = 0; i < N; i++) {
- if (appId == whitelist[i]) {
+ final int[] allowlist = mBackgroundAppIdAllowlist;
+ for (int i = 0, len = allowlist.length; i < len; i++) {
+ if (appId == allowlist[i]) {
return true;
}
}
@@ -6028,11 +5886,11 @@
Slog.i(TAG, "Adding uid " + uid + " to bg uid whitelist");
}
synchronized (this) {
- final int N = mBackgroundAppIdWhitelist.length;
- int[] newList = new int[N+1];
- System.arraycopy(mBackgroundAppIdWhitelist, 0, newList, 0, N);
- newList[N] = UserHandle.getAppId(uid);
- mBackgroundAppIdWhitelist = newList;
+ final int num = mBackgroundAppIdAllowlist.length;
+ int[] newList = new int[num + 1];
+ System.arraycopy(mBackgroundAppIdAllowlist, 0, newList, 0, num);
+ newList[num] = UserHandle.getAppId(uid);
+ mBackgroundAppIdAllowlist = newList;
}
}
@@ -6150,16 +6008,16 @@
}
void reportCurWakefulnessUsageEvent() {
- reportGlobalUsageEvent(mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE
+ reportGlobalUsageEvent(mWakefulness.get() == PowerManagerInternal.WAKEFULNESS_AWAKE
? UsageEvents.Event.SCREEN_INTERACTIVE
: UsageEvents.Event.SCREEN_NON_INTERACTIVE);
}
void onWakefulnessChanged(int wakefulness) {
synchronized(this) {
- boolean wasAwake = mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
+ boolean wasAwake = mWakefulness.getAndSet(wakefulness)
+ == PowerManagerInternal.WAKEFULNESS_AWAKE;
boolean isAwake = wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
- mWakefulness = wakefulness;
if (wasAwake != isAwake) {
// Also update state in a special way for running foreground services UI.
@@ -6269,17 +6127,16 @@
*/
@Override
public void setAgentApp(@NonNull String packageName, @Nullable String agent) {
- synchronized (this) {
- // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
- // its own permission.
- if (checkCallingPermission(
- android.Manifest.permission.SET_ACTIVITY_WATCHER) !=
- PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException(
- "Requires permission " + android.Manifest.permission.SET_ACTIVITY_WATCHER);
- }
+ // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
+ // its own permission.
+ if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException(
+ "Requires permission " + android.Manifest.permission.SET_ACTIVITY_WATCHER);
+ }
- mAppProfiler.setAgentAppLocked(packageName, agent);
+ synchronized (mAppProfiler.mProfilerLock) {
+ mAppProfiler.setAgentAppLPf(packageName, agent);
}
}
@@ -6296,7 +6153,7 @@
}
void setProfileApp(ApplicationInfo app, String processName, ProfilerInfo profilerInfo) {
- synchronized (this) {
+ synchronized (mAppProfiler.mProfilerLock) {
if (!Build.IS_DEBUGGABLE) {
boolean isAppDebuggable = (app.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
boolean isAppProfileable = app.isProfileableByShell();
@@ -6305,7 +6162,7 @@
+ "and not profileable by shell: " + app.packageName);
}
}
- mAppProfiler.setProfileAppLocked(processName, profilerInfo);
+ mAppProfiler.setProfileAppLPf(processName, profilerInfo);
}
}
@@ -6391,8 +6248,8 @@
Slog.w(TAG, "system process not in mPidsSelfLocked: " + myPid());
return;
}
- synchronized (this) {
- mAppProfiler.startHeapDumpLocked(pr, true);
+ synchronized (mAppProfiler.mProfilerLock) {
+ mAppProfiler.startHeapDumpLPf(pr.mProfile, true);
}
}
@@ -6572,16 +6429,12 @@
public void registerProcessObserver(IProcessObserver observer) {
enforceCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER,
"registerProcessObserver()");
- synchronized (this) {
- mProcessObservers.register(observer);
- }
+ mProcessList.registerProcessObserver(observer);
}
@Override
public void unregisterProcessObserver(IProcessObserver observer) {
- synchronized (this) {
- mProcessObservers.unregister(observer);
- }
+ mProcessList.unregisterProcessObserver(observer);
}
@Override
@@ -6603,17 +6456,13 @@
enforceCallingPermission(android.Manifest.permission.PACKAGE_USAGE_STATS,
"registerUidObserver");
}
- synchronized (this) {
- mUidObserverController.register(observer, which, cutpoint, callingPackage,
- Binder.getCallingUid());
- }
+ mUidObserverController.register(observer, which, cutpoint, callingPackage,
+ Binder.getCallingUid());
}
@Override
public void unregisterUidObserver(IUidObserver observer) {
- synchronized (this) {
- mUidObserverController.unregister(observer);
- }
+ mUidObserverController.unregister(observer);
}
@Override
@@ -7205,28 +7054,35 @@
for (int i = mProcessList.mLruProcesses.size() - 1 ; i >= 0 ; i--) {
ProcessRecord proc = mProcessList.mLruProcesses.get(i);
+ final ProcessProfileRecord pr = proc.mProfile;
if (proc.notCachedSinceIdle) {
if (proc.setProcState >= ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE
&& proc.setProcState <= ActivityManager.PROCESS_STATE_SERVICE) {
- if (doKilling && proc.initialIdlePss != 0
- && proc.lastPss > ((proc.initialIdlePss * 3) / 2)
- && proc.lastPss > (proc.initialIdlePss + memoryGrowthThreshold)) {
+ final long initialIdlePss, lastPss, lastSwapPss;
+ synchronized (mAppProfiler.mProfilerLock) {
+ initialIdlePss = pr.getInitialIdlePss();
+ lastPss = pr.getLastPss();
+ lastSwapPss = pr.getLastSwapPss();
+ }
+ if (doKilling && initialIdlePss != 0
+ && lastPss > ((initialIdlePss * 3) / 2)
+ && lastPss > (initialIdlePss + memoryGrowthThreshold)) {
sb = new StringBuilder(128);
sb.append("Kill");
sb.append(proc.processName);
sb.append(" in idle maint: pss=");
- sb.append(proc.lastPss);
+ sb.append(lastPss);
sb.append(", swapPss=");
- sb.append(proc.lastSwapPss);
+ sb.append(lastSwapPss);
sb.append(", initialPss=");
- sb.append(proc.initialIdlePss);
+ sb.append(initialIdlePss);
sb.append(", period=");
TimeUtils.formatDuration(timeSinceLastIdle, sb);
sb.append(", lowRamPeriod=");
TimeUtils.formatDuration(lowRamSinceLastIdle, sb);
Slog.wtfQuiet(TAG, sb.toString());
- proc.kill("idle maint (pss " + proc.lastPss
- + " from " + proc.initialIdlePss + ")",
+ proc.kill("idle maint (pss " + lastPss
+ + " from " + initialIdlePss + ")",
ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_MEMORY_PRESSURE,
true);
@@ -7235,8 +7091,11 @@
} else if (proc.setProcState < ActivityManager.PROCESS_STATE_HOME
&& proc.setProcState >= ActivityManager.PROCESS_STATE_PERSISTENT) {
proc.notCachedSinceIdle = true;
- proc.initialIdlePss = 0;
- mAppProfiler.updateNextPssTimeLocked(proc.setProcState, proc, now, true);
+ synchronized (mAppProfiler.mProfilerLock) {
+ pr.setInitialIdlePss(0);
+ mAppProfiler.updateNextPssTimeLPf(
+ proc.setProcState, proc.mProfile, now, true);
+ }
}
}
}
@@ -7277,14 +7136,13 @@
mAppProfiler.retrieveSettings();
+ final Resources res;
synchronized (this) {
mDebugApp = mOrigDebugApp = debugApp;
mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger;
mAlwaysFinishActivities = alwaysFinishActivities;
// Load resources only after the current configuration has been set.
- final Resources res = mContext.getResources();
- mAppErrors.loadAppsNotReportingCrashesFromConfigLocked(res.getString(
- com.android.internal.R.string.config_appsNotReportingCrashes));
+ res = mContext.getResources();
final boolean userSwitchUiEnabled = !res.getBoolean(
com.android.internal.R.bool.config_customUserSwitchUi);
final int maxRunningUsers = res.getInteger(
@@ -7295,6 +7153,8 @@
delayUserDataLocking);
mWaitForNetworkTimeoutMs = waitForNetworkTimeoutMs;
}
+ mAppErrors.loadAppsNotReportingCrashesFromConfig(res.getString(
+ com.android.internal.R.string.config_appsNotReportingCrashes));
}
/**
@@ -7714,9 +7574,8 @@
if ((penaltyMask & StrictMode.PENALTY_DIALOG) != 0) {
AppErrorResult result = new AppErrorResult();
- synchronized (this) {
- final long origId = Binder.clearCallingIdentity();
-
+ final long origId = Binder.clearCallingIdentity();
+ try {
Message msg = Message.obtain();
msg.what = SHOW_STRICT_MODE_VIOLATION_UI_MSG;
HashMap<String, Object> data = new HashMap<String, Object>();
@@ -7725,7 +7584,7 @@
data.put("info", info);
msg.obj = data;
mUiHandler.sendMessage(msg);
-
+ } finally {
Binder.restoreCallingIdentity(origId);
}
int res = result.get();
@@ -7927,8 +7786,7 @@
int flags = process.info.flags;
IPackageManager pm = AppGlobals.getPackageManager();
sb.append("Flags: 0x").append(Integer.toHexString(flags)).append("\n");
- for (int ip=0; ip<process.pkgList.size(); ip++) {
- String pkg = process.pkgList.keyAt(ip);
+ process.getPkgList().forEachPackage(pkg -> {
sb.append("Package: ").append(pkg);
try {
PackageInfo pi = pm.getPackageInfo(pkg, 0, UserHandle.getCallingUserId());
@@ -7942,7 +7800,7 @@
Slog.e(TAG, "Error getting package info: " + pkg, e);
}
sb.append("\n");
- }
+ });
if (process.info.isInstantApp()) {
sb.append("Instant-App: true\n");
}
@@ -8373,7 +8231,7 @@
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
- dumpPermissionsLocked(fd, pw, args, opti, dumpAll, dumpPackage);
+ dumpPermissions(fd, pw, args, opti, dumpAll, dumpPackage);
pw.println();
sdumper = mServices.newServiceDumperLocked(fd, pw, args, opti, dumpAll, dumpPackage);
if (!dumpClient) {
@@ -8470,12 +8328,12 @@
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
- dumpProcessesLocked(fd, pw, args, opti, dumpAll, dumpPackage, dumpAppId);
+ mProcessList.dumpProcessesLocked(fd, pw, args, opti, dumpAll, dumpPackage, dumpAppId);
pw.println();
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
- dumpUsersLocked(pw);
+ dumpUsers(pw);
}
}
@@ -8574,7 +8432,7 @@
}
// output proto is ProcessProto
synchronized (this) {
- writeProcessesToProtoLocked(proto, dumpPackage);
+ mProcessList.writeProcessesToProtoLocked(proto, dumpPackage);
}
} else {
// default option, dump everything, output is ActivityManagerServiceProto
@@ -8593,7 +8451,7 @@
proto.end(serviceToken);
long processToken = proto.start(ActivityManagerServiceProto.PROCESSES);
- writeProcessesToProtoLocked(proto, dumpPackage);
+ mProcessList.writeProcessesToProtoLocked(proto, dumpPackage);
proto.end(processToken);
}
}
@@ -8660,20 +8518,19 @@
dumpPackage = args[opti];
opti++;
}
- synchronized (this) {
- mPendingIntentController.dumpPendingIntents(pw, true, dumpPackage);
- }
+ mPendingIntentController.dumpPendingIntents(pw, true, dumpPackage);
} else if ("processes".equals(cmd) || "p".equals(cmd)) {
if (opti < args.length) {
dumpPackage = args[opti];
opti++;
}
synchronized (this) {
- dumpProcessesLocked(fd, pw, args, opti, true, dumpPackage, dumpAppId);
+ mProcessList.dumpProcessesLocked(
+ fd, pw, args, opti, true, dumpPackage, dumpAppId);
}
} else if ("oom".equals(cmd) || "o".equals(cmd)) {
synchronized (this) {
- dumpOomLocked(fd, pw, false, args, opti, true, dumpPackage, true);
+ mProcessList.dumpOomLocked(fd, pw, false, args, opti, true, dumpPackage, true);
}
} else if ("lmk".equals(cmd)) {
synchronized (this) {
@@ -8681,12 +8538,10 @@
}
} else if ("lru".equals(cmd)) {
synchronized (this) {
- dumpLruLocked(pw, dumpPackage, null);
+ mProcessList.dumpLruLocked(pw, dumpPackage, null);
}
} else if ("permissions".equals(cmd) || "perm".equals(cmd)) {
- synchronized (this) {
- dumpPermissionsLocked(fd, pw, args, opti, true, dumpPackage);
- }
+ dumpPermissions(fd, pw, args, opti, true, dumpPackage);
} else if ("provider".equals(cmd)) {
String[] newArgs;
String name;
@@ -8779,9 +8634,7 @@
} else if ("locks".equals(cmd)) {
LockGuard.dump(fd, pw, args);
} else if ("users".equals(cmd)) {
- synchronized (this) {
- dumpUsersLocked(pw);
- }
+ dumpUsers(pw);
} else if ("exit-info".equals(cmd)) {
if (opti < args.length) {
dumpPackage = args[opti];
@@ -8918,7 +8771,7 @@
}
}
- private int getAppId(String dumpPackage) {
+ int getAppId(String dumpPackage) {
if (dumpPackage != null) {
try {
ApplicationInfo info = mContext.getPackageManager().getApplicationInfo(
@@ -8983,177 +8836,12 @@
" Counts of Binder Proxies held by SYSTEM");
}
- void dumpLruEntryLocked(PrintWriter pw, int index, ProcessRecord proc, String prefix) {
- pw.print(prefix);
- pw.print('#');
- if (index < 10) {
- pw.print(' ');
- }
- pw.print(index);
- pw.print(": ");
- pw.print(ProcessList.makeOomAdjString(proc.setAdj, false));
- pw.print(' ');
- pw.print(ProcessList.makeProcStateString(proc.getCurProcState()));
- pw.print(' ');
- ActivityManager.printCapabilitiesSummary(pw, proc.curCapability);
- pw.print(' ');
- pw.print(proc.toShortString());
- if (proc.hasActivitiesOrRecentTasks() || proc.hasClientActivities()
- || proc.treatLikeActivity) {
- pw.print(" act:");
- boolean printed = false;
- if (proc.hasActivities()) {
- pw.print("activities");
- printed = true;
- }
- if (proc.hasRecentTasks()) {
- if (printed) {
- pw.print("|");
- }
- pw.print("recents");
- printed = true;
- }
- if (proc.hasClientActivities()) {
- if (printed) {
- pw.print("|");
- }
- pw.print("client");
- printed = true;
- }
- if (proc.treatLikeActivity) {
- if (printed) {
- pw.print("|");
- }
- pw.print("treated");
- }
- }
- pw.println();
- }
-
- // TODO: Move to ProcessList?
- boolean dumpLruLocked(PrintWriter pw, String dumpPackage, String prefix) {
- final int N = mProcessList.mLruProcesses.size();
- final String innerPrefix;
- if (prefix == null) {
- pw.println("ACTIVITY MANAGER LRU PROCESSES (dumpsys activity lru)");
- innerPrefix = " ";
- } else {
- boolean haveAny = false;
- for (int i = N - 1; i >= 0; i--) {
- final ProcessRecord r = mProcessList.mLruProcesses.get(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- haveAny = true;
- break;
- }
- if (!haveAny) {
- return false;
- }
- pw.print(prefix);
- pw.println("Raw LRU list (dumpsys activity lru):");
- innerPrefix = prefix + " ";
- }
- int i;
- boolean first = true;
- for (i = N - 1; i >= mProcessList.mLruProcessActivityStart; i--) {
- final ProcessRecord r = mProcessList.mLruProcesses.get(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- if (first) {
- pw.print(innerPrefix);
- pw.println("Activities:");
- first = false;
- }
- dumpLruEntryLocked(pw, i, r, innerPrefix);
- }
- first = true;
- for (; i >= mProcessList.mLruProcessServiceStart; i--) {
- final ProcessRecord r = mProcessList.mLruProcesses.get(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- if (first) {
- pw.print(innerPrefix);
- pw.println("Services:");
- first = false;
- }
- dumpLruEntryLocked(pw, i, r, innerPrefix);
- }
- first = true;
- for (; i >= 0; i--) {
- final ProcessRecord r = mProcessList.mLruProcesses.get(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- if (first) {
- pw.print(innerPrefix);
- pw.println("Other:");
- first = false;
- }
- dumpLruEntryLocked(pw, i, r, innerPrefix);
- }
- return true;
- }
-
- // TODO: Move to ProcessList?
@GuardedBy("this")
- void dumpProcessesLocked(FileDescriptor fd, PrintWriter pw, String[] args,
- int opti, boolean dumpAll, String dumpPackage, int dumpAppId) {
- boolean needSep = false;
- int numPers = 0;
-
- pw.println("ACTIVITY MANAGER RUNNING PROCESSES (dumpsys activity processes)");
-
- if (dumpAll || dumpPackage != null) {
- final int NP = mProcessList.mProcessNames.getMap().size();
- for (int ip=0; ip<NP; ip++) {
- SparseArray<ProcessRecord> procs = mProcessList.mProcessNames.getMap().valueAt(ip);
- final int NA = procs.size();
- for (int ia=0; ia<NA; ia++) {
- ProcessRecord r = procs.valueAt(ia);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- if (!needSep) {
- pw.println(" All known processes:");
- needSep = true;
- }
- pw.print(r.isPersistent() ? " *PERS*" : " *APP*");
- pw.print(" UID "); pw.print(procs.keyAt(ia));
- pw.print(" "); pw.println(r);
- r.dump(pw, " ");
- if (r.isPersistent()) {
- numPers++;
- }
- }
- }
- }
-
- if (mProcessList.mIsolatedProcesses.size() > 0) {
+ boolean dumpActiveInstruments(PrintWriter pw, String dumpPackage, boolean needSep) {
+ final int size = mActiveInstrumentation.size();
+ if (size > 0) {
boolean printed = false;
- for (int i=0; i<mProcessList.mIsolatedProcesses.size(); i++) {
- ProcessRecord r = mProcessList.mIsolatedProcesses.valueAt(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- if (!printed) {
- if (needSep) {
- pw.println();
- }
- pw.println(" Isolated process list (sorted by uid):");
- printed = true;
- needSep = true;
- }
- pw.print(" Isolated #"); pw.print(i); pw.print(": ");
- pw.println(r);
- }
- }
-
- if (mActiveInstrumentation.size() > 0) {
- boolean printed = false;
- for (int i=0; i<mActiveInstrumentation.size(); i++) {
+ for (int i = 0; i < size; i++) {
ActiveInstrumentation ai = mActiveInstrumentation.get(i);
if (dumpPackage != null && !ai.mClass.getPackageName().equals(dumpPackage)
&& !ai.mTargetInfo.packageName.equals(dumpPackage)) {
@@ -9172,48 +8860,20 @@
ai.dump(pw, " ");
}
}
+ return needSep;
+ }
- if (dumpOomLocked(fd, pw, needSep, args, opti, dumpAll, dumpPackage, false)) {
- needSep = true;
- }
-
- needSep = dumpProcessesToGc(pw, needSep, dumpPackage);
-
- if (mProcessList.mActiveUids.size() > 0) {
- needSep |= mProcessList.mActiveUids.dump(pw, dumpPackage, dumpAppId,
- "UID states:", needSep);
- }
-
- if (dumpAll) {
- needSep |= mUidObserverController.dumpValidateUids(pw,
- dumpPackage, dumpAppId, "UID validation:", needSep);
- }
-
- if (needSep) {
- pw.println();
- }
- if (dumpLruLocked(pw, dumpPackage, " ")) {
- needSep = true;
- }
-
- if (mProcessList.getLruSizeLocked() > 0) {
- if (needSep) {
- pw.println();
- }
- mProcessList.dumpLruListHeaderLocked(pw);
- dumpProcessOomList(pw, this, mProcessList.mLruProcesses, " ", "Proc", "PERS", false,
- dumpPackage);
- needSep = true;
- }
-
+ @GuardedBy("this")
+ void dumpOtherProcessesInfoLocked(FileDescriptor fd, PrintWriter pw,
+ boolean dumpAll, String dumpPackage, int dumpAppId, int numPers, boolean needSep) {
if (dumpAll || dumpPackage != null) {
final SparseArray<ProcessRecord> pidToProcess = new SparseArray<>();
synchronized (mPidsSelfLocked) {
boolean printed = false;
- for (int i=0; i<mPidsSelfLocked.size(); i++) {
+ for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) {
ProcessRecord r = mPidsSelfLocked.valueAt(i);
pidToProcess.put(r.pid, r);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
continue;
}
if (!printed) {
@@ -9229,10 +8889,11 @@
synchronized (sActiveProcessInfoSelfLocked) {
boolean printed = false;
- for (int i = 0; i < sActiveProcessInfoSelfLocked.size(); i++) {
+ for (int i = 0, size = sActiveProcessInfoSelfLocked.size(); i < size; i++) {
ProcessInfo info = sActiveProcessInfoSelfLocked.valueAt(i);
ProcessRecord r = pidToProcess.get(sActiveProcessInfoSelfLocked.keyAt(i));
- if (r != null && dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
+ if (r != null && dumpPackage != null
+ && !r.getPkgList().containsKey(dumpPackage)) {
continue;
}
if (!printed) {
@@ -9261,11 +8922,11 @@
if (mImportantProcesses.size() > 0) {
synchronized (mPidsSelfLocked) {
boolean printed = false;
- for (int i = 0; i< mImportantProcesses.size(); i++) {
+ for (int i = 0, size = mImportantProcesses.size(); i < size; i++) {
ProcessRecord r = mPidsSelfLocked.get(
mImportantProcesses.valueAt(i).pid);
if (dumpPackage != null && (r == null
- || !r.pkgList.containsKey(dumpPackage))) {
+ || !r.getPkgList().containsKey(dumpPackage))) {
continue;
}
if (!printed) {
@@ -9307,7 +8968,7 @@
needSep = mAppErrors.dumpLocked(fd, pw, needSep, dumpPackage);
needSep = mAtmInternal.dumpForProcesses(fd, pw, dumpAll, dumpPackage, dumpAppId, needSep,
- mAppProfiler.getTestPssModeLocked(), mWakefulness);
+ mAppProfiler.getTestPssMode(), mWakefulness.get());
if (dumpAll && mProcessList.mPendingStarts.size() > 0) {
if (needSep) pw.println();
@@ -9321,14 +8982,14 @@
if (dumpAll) {
mUidObserverController.dump(pw, dumpPackage);
- pw.println(" mDeviceIdleWhitelist=" + Arrays.toString(mDeviceIdleWhitelist));
- pw.println(" mDeviceIdleExceptIdleWhitelist="
- + Arrays.toString(mDeviceIdleExceptIdleWhitelist));
- pw.println(" mDeviceIdleTempWhitelist=" + Arrays.toString(mDeviceIdleTempWhitelist));
- if (mPendingTempWhitelist.size() > 0) {
- pw.println(" mPendingTempWhitelist:");
- for (int i = 0; i < mPendingTempWhitelist.size(); i++) {
- PendingTempWhitelist ptw = mPendingTempWhitelist.valueAt(i);
+ pw.println(" mDeviceIdleAllowlist=" + Arrays.toString(mDeviceIdleAllowlist));
+ pw.println(" mDeviceIdleExceptIdleAllowlist="
+ + Arrays.toString(mDeviceIdleExceptIdleAllowlist));
+ pw.println(" mDeviceIdleTempAllowlist=" + Arrays.toString(mDeviceIdleTempAllowlist));
+ if (mPendingTempAllowlist.size() > 0) {
+ pw.println(" mPendingTempAllowlist:");
+ for (int i = 0, size = mPendingTempAllowlist.size(); i < size; i++) {
+ PendingTempAllowlist ptw = mPendingTempAllowlist.valueAt(i);
pw.print(" ");
UserHandle.formatUid(pw, ptw.targetUid);
pw.print(": ");
@@ -9353,7 +9014,9 @@
+ " mOrigWaitForDebugger=" + mOrigWaitForDebugger);
}
}
- needSep = mAppProfiler.dumpMemWatchProcessesLocked(pw, needSep);
+ synchronized (mAppProfiler.mProfilerLock) {
+ needSep = mAppProfiler.dumpMemWatchProcessesLPf(pw, needSep);
+ }
if (mTrackAllocationApp != null) {
if (dumpPackage == null || dumpPackage.equals(mTrackAllocationApp)) {
if (needSep) {
@@ -9409,45 +9072,15 @@
pw.println(" mForceBackgroundCheck=" + mForceBackgroundCheck);
}
- @GuardedBy("this")
- private void dumpUsersLocked(PrintWriter pw) {
+ private void dumpUsers(PrintWriter pw) {
pw.println("ACTIVITY MANAGER USERS (dumpsys activity users)");
mUserController.dump(pw);
}
@GuardedBy("this")
- void writeProcessesToProtoLocked(ProtoOutputStream proto, String dumpPackage) {
- int numPers = 0;
-
- final int NP = mProcessList.mProcessNames.getMap().size();
- for (int ip=0; ip<NP; ip++) {
- SparseArray<ProcessRecord> procs = mProcessList.mProcessNames.getMap().valueAt(ip);
- final int NA = procs.size();
- for (int ia = 0; ia<NA; ia++) {
- ProcessRecord r = procs.valueAt(ia);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.PROCS,
- mProcessList.mLruProcesses.indexOf(r)
- );
- if (r.isPersistent()) {
- numPers++;
- }
- }
- }
-
- for (int i=0; i<mProcessList.mIsolatedProcesses.size(); i++) {
- ProcessRecord r = mProcessList.mIsolatedProcesses.valueAt(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.ISOLATED_PROCS,
- mProcessList.mLruProcesses.indexOf(r)
- );
- }
-
- for (int i=0; i<mActiveInstrumentation.size(); i++) {
+ void writeOtherProcessesInfoToProtoLocked(ProtoOutputStream proto, String dumpPackage,
+ int dumpAppId, int numPers) {
+ for (int i = 0, size = mActiveInstrumentation.size(); i < size; i++) {
ActiveInstrumentation ai = mActiveInstrumentation.get(i);
if (dumpPackage != null && !ai.mClass.getPackageName().equals(dumpPackage)
&& !ai.mTargetInfo.packageName.equals(dumpPackage)) {
@@ -9457,32 +9090,14 @@
ActivityManagerServiceDumpProcessesProto.ACTIVE_INSTRUMENTATIONS);
}
- final int dumpAppId = getAppId(dumpPackage);
- mProcessList.mActiveUids.dumpProto(proto, dumpPackage, dumpAppId,
- ActivityManagerServiceDumpProcessesProto.ACTIVE_UIDS);
-
mUidObserverController.dumpValidateUidsProto(proto, dumpPackage, dumpAppId,
ActivityManagerServiceDumpProcessesProto.VALIDATE_UIDS);
- if (mProcessList.getLruSizeLocked() > 0) {
- long lruToken = proto.start(ActivityManagerServiceDumpProcessesProto.LRU_PROCS);
- int total = mProcessList.getLruSizeLocked();
- proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.SIZE, total);
- proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_ACT_AT,
- total - mProcessList.mLruProcessActivityStart);
- proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_SVC_AT,
- total - mProcessList.mLruProcessServiceStart);
- writeProcessOomListToProto(proto,
- ActivityManagerServiceDumpProcessesProto.LruProcesses.LIST, this,
- mProcessList.mLruProcesses,false, dumpPackage);
- proto.end(lruToken);
- }
-
if (dumpPackage != null) {
synchronized (mPidsSelfLocked) {
for (int i=0; i<mPidsSelfLocked.size(); i++) {
ProcessRecord r = mPidsSelfLocked.valueAt(i);
- if (!r.pkgList.containsKey(dumpPackage)) {
+ if (!r.getPkgList().containsKey(dumpPackage)) {
continue;
}
r.dumpDebug(proto,
@@ -9493,11 +9108,11 @@
if (mImportantProcesses.size() > 0) {
synchronized (mPidsSelfLocked) {
- for (int i=0; i<mImportantProcesses.size(); i++) {
+ for (int i = 0, size = mImportantProcesses.size(); i < size; i++) {
ImportanceToken it = mImportantProcesses.valueAt(i);
ProcessRecord r = mPidsSelfLocked.get(it.pid);
if (dumpPackage != null && (r == null
- || !r.pkgList.containsKey(dumpPackage))) {
+ || !r.getPkgList().containsKey(dumpPackage))) {
continue;
}
it.dumpDebug(proto,
@@ -9506,7 +9121,7 @@
}
}
- for (int i=0; i<mPersistentStartingProcesses.size(); i++) {
+ for (int i = 0, size = mPersistentStartingProcesses.size(); i < size; i++) {
ProcessRecord r = mPersistentStartingProcesses.get(i);
if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) {
continue;
@@ -9515,7 +9130,7 @@
ActivityManagerServiceDumpProcessesProto.PERSISTENT_STARTING_PROCS);
}
- for (int i = 0; i < mProcessList.mRemovedProcesses.size(); i++) {
+ for (int i = 0, size = mProcessList.mRemovedProcesses.size(); i < size; i++) {
ProcessRecord r = mProcessList.mRemovedProcesses.get(i);
if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) {
continue;
@@ -9523,7 +9138,7 @@
r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.REMOVED_PROCS);
}
- for (int i=0; i<mProcessesOnHold.size(); i++) {
+ for (int i = 0, size = mProcessesOnHold.size(); i < size; i++) {
ProcessRecord r = mProcessesOnHold.get(i);
if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) {
continue;
@@ -9531,12 +9146,15 @@
r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.ON_HOLD_PROCS);
}
- writeProcessesToGcToProto(proto, ActivityManagerServiceDumpProcessesProto.GC_PROCS,
- dumpPackage);
+ synchronized (mAppProfiler.mProfilerLock) {
+ mAppProfiler.writeProcessesToGcToProto(proto,
+ ActivityManagerServiceDumpProcessesProto.GC_PROCS,
+ dumpPackage);
+ }
mAppErrors.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.APP_ERRORS,
dumpPackage);
- mAtmInternal.writeProcessesToProto(proto, dumpPackage, mWakefulness,
- mAppProfiler.getTestPssModeLocked());
+ mAtmInternal.writeProcessesToProto(proto, dumpPackage, mWakefulness.get(),
+ mAppProfiler.getTestPssMode());
if (dumpPackage == null) {
mUserController.dumpDebug(proto,
@@ -9545,17 +9163,17 @@
mUidObserverController.dumpDebug(proto, dumpPackage);
- for (int v : mDeviceIdleWhitelist) {
+ for (int v : mDeviceIdleAllowlist) {
proto.write(ActivityManagerServiceDumpProcessesProto.DEVICE_IDLE_WHITELIST, v);
}
- for (int v : mDeviceIdleTempWhitelist) {
+ for (int v : mDeviceIdleTempAllowlist) {
proto.write(ActivityManagerServiceDumpProcessesProto.DEVICE_IDLE_TEMP_WHITELIST, v);
}
- if (mPendingTempWhitelist.size() > 0) {
- for (int i=0; i < mPendingTempWhitelist.size(); i++) {
- mPendingTempWhitelist.valueAt(i).dumpDebug(proto,
+ if (mPendingTempAllowlist.size() > 0) {
+ for (int i = 0, size = mPendingTempAllowlist.size(); i < size; i++) {
+ mPendingTempAllowlist.valueAt(i).dumpDebug(proto,
ActivityManagerServiceDumpProcessesProto.PENDING_TEMP_WHITELIST);
}
}
@@ -9573,7 +9191,9 @@
}
}
- mAppProfiler.writeMemWatchProcessToProtoLocked(proto);
+ synchronized (mAppProfiler.mProfilerLock) {
+ mAppProfiler.writeMemWatchProcessToProtoLPf(proto);
+ }
if (mTrackAllocationApp != null) {
if (dumpPackage == null || dumpPackage.equals(mTrackAllocationApp)) {
@@ -9608,113 +9228,6 @@
}
}
- void writeProcessesToGcToProto(ProtoOutputStream proto, long fieldId, String dumpPackage) {
- if (mProcessesToGc.size() > 0) {
- long now = SystemClock.uptimeMillis();
- for (int i=0; i<mProcessesToGc.size(); i++) {
- ProcessRecord r = mProcessesToGc.get(i);
- if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) {
- continue;
- }
- final long token = proto.start(fieldId);
- r.dumpDebug(proto, ProcessToGcProto.PROC);
- proto.write(ProcessToGcProto.REPORT_LOW_MEMORY, r.reportLowMemory);
- proto.write(ProcessToGcProto.NOW_UPTIME_MS, now);
- proto.write(ProcessToGcProto.LAST_GCED_MS, r.lastRequestedGc);
- proto.write(ProcessToGcProto.LAST_LOW_MEMORY_MS, r.lastLowMemory);
- proto.end(token);
- }
- }
- }
-
- boolean dumpProcessesToGc(PrintWriter pw, boolean needSep, String dumpPackage) {
- if (mProcessesToGc.size() > 0) {
- boolean printed = false;
- long now = SystemClock.uptimeMillis();
- for (int i=0; i<mProcessesToGc.size(); i++) {
- ProcessRecord proc = mProcessesToGc.get(i);
- if (dumpPackage != null && !dumpPackage.equals(proc.info.packageName)) {
- continue;
- }
- if (!printed) {
- if (needSep) pw.println();
- needSep = true;
- pw.println(" Processes that are waiting to GC:");
- printed = true;
- }
- pw.print(" Process "); pw.println(proc);
- pw.print(" lowMem="); pw.print(proc.reportLowMemory);
- pw.print(", last gced=");
- pw.print(now-proc.lastRequestedGc);
- pw.print(" ms ago, last lowMem=");
- pw.print(now-proc.lastLowMemory);
- pw.println(" ms ago");
-
- }
- }
- return needSep;
- }
-
- void printOomLevel(PrintWriter pw, String name, int adj) {
- pw.print(" ");
- if (adj >= 0) {
- pw.print(' ');
- if (adj < 10) pw.print(' ');
- } else {
- if (adj > -10) pw.print(' ');
- }
- pw.print(adj);
- pw.print(": ");
- pw.print(name);
- pw.print(" (");
- pw.print(stringifySize(mProcessList.getMemLevel(adj), 1024));
- pw.println(")");
- }
-
- boolean dumpOomLocked(FileDescriptor fd, PrintWriter pw, boolean needSep, String[] args,
- int opti, boolean dumpAll, String dumpPackage, boolean inclGc) {
- if (mProcessList.getLruSizeLocked() > 0) {
- if (needSep) pw.println();
- needSep = true;
- pw.println(" OOM levels:");
- printOomLevel(pw, "SYSTEM_ADJ", ProcessList.SYSTEM_ADJ);
- printOomLevel(pw, "PERSISTENT_PROC_ADJ", ProcessList.PERSISTENT_PROC_ADJ);
- printOomLevel(pw, "PERSISTENT_SERVICE_ADJ", ProcessList.PERSISTENT_SERVICE_ADJ);
- printOomLevel(pw, "FOREGROUND_APP_ADJ", ProcessList.FOREGROUND_APP_ADJ);
- printOomLevel(pw, "VISIBLE_APP_ADJ", ProcessList.VISIBLE_APP_ADJ);
- printOomLevel(pw, "PERCEPTIBLE_APP_ADJ", ProcessList.PERCEPTIBLE_APP_ADJ);
- printOomLevel(pw, "PERCEPTIBLE_LOW_APP_ADJ", ProcessList.PERCEPTIBLE_LOW_APP_ADJ);
- printOomLevel(pw, "BACKUP_APP_ADJ", ProcessList.BACKUP_APP_ADJ);
- printOomLevel(pw, "HEAVY_WEIGHT_APP_ADJ", ProcessList.HEAVY_WEIGHT_APP_ADJ);
- printOomLevel(pw, "SERVICE_ADJ", ProcessList.SERVICE_ADJ);
- printOomLevel(pw, "HOME_APP_ADJ", ProcessList.HOME_APP_ADJ);
- printOomLevel(pw, "PREVIOUS_APP_ADJ", ProcessList.PREVIOUS_APP_ADJ);
- printOomLevel(pw, "SERVICE_B_ADJ", ProcessList.SERVICE_B_ADJ);
- printOomLevel(pw, "CACHED_APP_MIN_ADJ", ProcessList.CACHED_APP_MIN_ADJ);
- printOomLevel(pw, "CACHED_APP_MAX_ADJ", ProcessList.CACHED_APP_MAX_ADJ);
-
- if (needSep) pw.println();
- pw.print(" Process OOM control ("); pw.print(mProcessList.getLruSizeLocked());
- pw.print(" total, non-act at ");
- pw.print(mProcessList.getLruSizeLocked()
- - mProcessList.mLruProcessActivityStart);
- pw.print(", non-svc at ");
- pw.print(mProcessList.getLruSizeLocked()
- - mProcessList.mLruProcessServiceStart);
- pw.println("):");
- dumpProcessOomList(pw, this, mProcessList.mLruProcesses, " ", "Proc", "PERS", true,
- dumpPackage);
- needSep = true;
- }
-
- dumpProcessesToGc(pw, needSep, dumpPackage);
-
- pw.println();
- mAtmInternal.dumpForOom(pw);
-
- return true;
- }
-
private boolean reportLmkKillAtOrBelow(PrintWriter pw, int oom_adj) {
Integer cnt = ProcessList.getLmkdKillCount(0, oom_adj);
if (cnt != null) {
@@ -10050,8 +9563,7 @@
}
}
- @GuardedBy("this")
- void dumpPermissionsLocked(FileDescriptor fd, PrintWriter pw, String[] args,
+ void dumpPermissions(FileDescriptor fd, PrintWriter pw, String[] args,
int opti, boolean dumpAll, String dumpPackage) {
pw.println("ACTIVITY MANAGER URI PERMISSIONS (dumpsys activity permissions)");
@@ -10080,270 +9592,6 @@
return numPers;
}
- private static final ArrayList<Pair<ProcessRecord, Integer>>
- sortProcessOomList(List<ProcessRecord> origList, String dumpPackage) {
- ArrayList<Pair<ProcessRecord, Integer>> list
- = new ArrayList<Pair<ProcessRecord, Integer>>(origList.size());
- for (int i=0; i<origList.size(); i++) {
- ProcessRecord r = origList.get(i);
- if (dumpPackage != null && !r.pkgList.containsKey(dumpPackage)) {
- continue;
- }
- list.add(new Pair<ProcessRecord, Integer>(origList.get(i), i));
- }
-
- Comparator<Pair<ProcessRecord, Integer>> comparator
- = new Comparator<Pair<ProcessRecord, Integer>>() {
- @Override
- public int compare(Pair<ProcessRecord, Integer> object1,
- Pair<ProcessRecord, Integer> object2) {
- if (object1.first.setAdj != object2.first.setAdj) {
- return object1.first.setAdj > object2.first.setAdj ? -1 : 1;
- }
- if (object1.first.setProcState != object2.first.setProcState) {
- return object1.first.setProcState > object2.first.setProcState ? -1 : 1;
- }
- if (object1.second.intValue() != object2.second.intValue()) {
- return object1.second.intValue() > object2.second.intValue() ? -1 : 1;
- }
- return 0;
- }
- };
-
- Collections.sort(list, comparator);
- return list;
- }
-
- private static final boolean writeProcessOomListToProto(ProtoOutputStream proto, long fieldId,
- ActivityManagerService service, List<ProcessRecord> origList,
- boolean inclDetails, String dumpPackage) {
- ArrayList<Pair<ProcessRecord, Integer>> list = sortProcessOomList(origList, dumpPackage);
- if (list.isEmpty()) return false;
-
- final long curUptime = SystemClock.uptimeMillis();
-
- for (int i = list.size() - 1; i >= 0; i--) {
- ProcessRecord r = list.get(i).first;
- long token = proto.start(fieldId);
- String oomAdj = ProcessList.makeOomAdjString(r.setAdj, true);
- proto.write(ProcessOomProto.PERSISTENT, r.isPersistent());
- proto.write(ProcessOomProto.NUM, (origList.size()-1)-list.get(i).second);
- proto.write(ProcessOomProto.OOM_ADJ, oomAdj);
- int schedGroup = ProcessOomProto.SCHED_GROUP_UNKNOWN;
- switch (r.setSchedGroup) {
- case ProcessList.SCHED_GROUP_BACKGROUND:
- schedGroup = ProcessOomProto.SCHED_GROUP_BACKGROUND;
- break;
- case ProcessList.SCHED_GROUP_DEFAULT:
- schedGroup = ProcessOomProto.SCHED_GROUP_DEFAULT;
- break;
- case ProcessList.SCHED_GROUP_TOP_APP:
- schedGroup = ProcessOomProto.SCHED_GROUP_TOP_APP;
- break;
- case ProcessList.SCHED_GROUP_TOP_APP_BOUND:
- schedGroup = ProcessOomProto.SCHED_GROUP_TOP_APP_BOUND;
- break;
- }
- if (schedGroup != ProcessOomProto.SCHED_GROUP_UNKNOWN) {
- proto.write(ProcessOomProto.SCHED_GROUP, schedGroup);
- }
- if (r.hasForegroundActivities()) {
- proto.write(ProcessOomProto.ACTIVITIES, true);
- } else if (r.hasForegroundServices()) {
- proto.write(ProcessOomProto.SERVICES, true);
- }
- proto.write(ProcessOomProto.STATE,
- ProcessList.makeProcStateProtoEnum(r.getCurProcState()));
- proto.write(ProcessOomProto.TRIM_MEMORY_LEVEL, r.trimMemoryLevel);
- r.dumpDebug(proto, ProcessOomProto.PROC);
- proto.write(ProcessOomProto.ADJ_TYPE, r.adjType);
- if (r.adjSource != null || r.adjTarget != null) {
- if (r.adjTarget instanceof ComponentName) {
- ComponentName cn = (ComponentName) r.adjTarget;
- cn.dumpDebug(proto, ProcessOomProto.ADJ_TARGET_COMPONENT_NAME);
- } else if (r.adjTarget != null) {
- proto.write(ProcessOomProto.ADJ_TARGET_OBJECT, r.adjTarget.toString());
- }
- if (r.adjSource instanceof ProcessRecord) {
- ProcessRecord p = (ProcessRecord) r.adjSource;
- p.dumpDebug(proto, ProcessOomProto.ADJ_SOURCE_PROC);
- } else if (r.adjSource != null) {
- proto.write(ProcessOomProto.ADJ_SOURCE_OBJECT, r.adjSource.toString());
- }
- }
- if (inclDetails) {
- long detailToken = proto.start(ProcessOomProto.DETAIL);
- proto.write(ProcessOomProto.Detail.MAX_ADJ, r.maxAdj);
- proto.write(ProcessOomProto.Detail.CUR_RAW_ADJ, r.getCurRawAdj());
- proto.write(ProcessOomProto.Detail.SET_RAW_ADJ, r.setRawAdj);
- proto.write(ProcessOomProto.Detail.CUR_ADJ, r.curAdj);
- proto.write(ProcessOomProto.Detail.SET_ADJ, r.setAdj);
- proto.write(ProcessOomProto.Detail.CURRENT_STATE,
- ProcessList.makeProcStateProtoEnum(r.getCurProcState()));
- proto.write(ProcessOomProto.Detail.SET_STATE,
- ProcessList.makeProcStateProtoEnum(r.setProcState));
- proto.write(ProcessOomProto.Detail.LAST_PSS, DebugUtils.sizeValueToString(
- r.lastPss*1024, new StringBuilder()));
- proto.write(ProcessOomProto.Detail.LAST_SWAP_PSS, DebugUtils.sizeValueToString(
- r.lastSwapPss*1024, new StringBuilder()));
- proto.write(ProcessOomProto.Detail.LAST_CACHED_PSS, DebugUtils.sizeValueToString(
- r.lastCachedPss*1024, new StringBuilder()));
- proto.write(ProcessOomProto.Detail.CACHED, r.isCached());
- proto.write(ProcessOomProto.Detail.EMPTY, r.empty);
- proto.write(ProcessOomProto.Detail.HAS_ABOVE_CLIENT, r.hasAboveClient);
-
- if (r.setProcState >= ActivityManager.PROCESS_STATE_SERVICE) {
- if (r.lastCpuTime != 0) {
- long uptimeSince = curUptime - service.mLastPowerCheckUptime;
- long timeUsed = r.curCpuTime - r.lastCpuTime;
- long cpuTimeToken = proto.start(ProcessOomProto.Detail.SERVICE_RUN_TIME);
- proto.write(ProcessOomProto.Detail.CpuRunTime.OVER_MS, uptimeSince);
- proto.write(ProcessOomProto.Detail.CpuRunTime.USED_MS, timeUsed);
- proto.write(ProcessOomProto.Detail.CpuRunTime.ULTILIZATION,
- (100.0*timeUsed)/uptimeSince);
- proto.end(cpuTimeToken);
- }
- }
- proto.end(detailToken);
- }
- proto.end(token);
- }
-
- return true;
- }
-
- private static final boolean dumpProcessOomList(PrintWriter pw,
- ActivityManagerService service, List<ProcessRecord> origList,
- String prefix, String normalLabel, String persistentLabel,
- boolean inclDetails, String dumpPackage) {
-
- ArrayList<Pair<ProcessRecord, Integer>> list = sortProcessOomList(origList, dumpPackage);
- if (list.isEmpty()) return false;
-
- final long curUptime = SystemClock.uptimeMillis();
- final long uptimeSince = curUptime - service.mLastPowerCheckUptime;
-
- for (int i=list.size()-1; i>=0; i--) {
- ProcessRecord r = list.get(i).first;
- String oomAdj = ProcessList.makeOomAdjString(r.setAdj, false);
- char schedGroup;
- switch (r.setSchedGroup) {
- case ProcessList.SCHED_GROUP_BACKGROUND:
- schedGroup = 'b';
- break;
- case ProcessList.SCHED_GROUP_DEFAULT:
- schedGroup = 'F';
- break;
- case ProcessList.SCHED_GROUP_TOP_APP:
- schedGroup = 'T';
- break;
- case ProcessList.SCHED_GROUP_RESTRICTED:
- schedGroup = 'R';
- break;
- case ProcessList.SCHED_GROUP_TOP_APP_BOUND:
- schedGroup = 'B';
- break;
- default:
- schedGroup = '?';
- break;
- }
- char foreground;
- if (r.hasForegroundActivities()) {
- foreground = 'A';
- } else if (r.hasForegroundServices()) {
- foreground = 'S';
- } else {
- foreground = ' ';
- }
- String procState = ProcessList.makeProcStateString(r.getCurProcState());
- pw.print(prefix);
- pw.print(r.isPersistent() ? persistentLabel : normalLabel);
- pw.print(" #");
- int num = (origList.size()-1)-list.get(i).second;
- if (num < 10) pw.print(' ');
- pw.print(num);
- pw.print(": ");
- pw.print(oomAdj);
- pw.print(' ');
- pw.print(schedGroup);
- pw.print('/');
- pw.print(foreground);
- pw.print('/');
- pw.print(procState);
- pw.print(' ');
- ActivityManager.printCapabilitiesSummary(pw, r.curCapability);
- pw.print(' ');
- pw.print(" t:");
- if (r.trimMemoryLevel < 10) pw.print(' ');
- pw.print(r.trimMemoryLevel);
- pw.print(' ');
- pw.print(r.toShortString());
- pw.print(" (");
- pw.print(r.adjType);
- pw.println(')');
- if (r.adjSource != null || r.adjTarget != null) {
- pw.print(prefix);
- pw.print(" ");
- if (r.adjTarget instanceof ComponentName) {
- pw.print(((ComponentName)r.adjTarget).flattenToShortString());
- } else if (r.adjTarget != null) {
- pw.print(r.adjTarget.toString());
- } else {
- pw.print("{null}");
- }
- pw.print("<=");
- if (r.adjSource instanceof ProcessRecord) {
- pw.print("Proc{");
- pw.print(((ProcessRecord)r.adjSource).toShortString());
- pw.println("}");
- } else if (r.adjSource != null) {
- pw.println(r.adjSource.toString());
- } else {
- pw.println("{null}");
- }
- }
- if (inclDetails) {
- pw.print(prefix);
- pw.print(" ");
- pw.print("oom: max="); pw.print(r.maxAdj);
- pw.print(" curRaw="); pw.print(r.getCurRawAdj());
- pw.print(" setRaw="); pw.print(r.setRawAdj);
- pw.print(" cur="); pw.print(r.curAdj);
- pw.print(" set="); pw.println(r.setAdj);
- pw.print(prefix);
- pw.print(" ");
- pw.print("state: cur="); pw.print(
- ProcessList.makeProcStateString(r.getCurProcState()));
- pw.print(" set="); pw.print(ProcessList.makeProcStateString(r.setProcState));
- pw.print(" lastPss="); DebugUtils.printSizeValue(pw, r.lastPss*1024);
- pw.print(" lastSwapPss="); DebugUtils.printSizeValue(pw, r.lastSwapPss*1024);
- pw.print(" lastCachedPss="); DebugUtils.printSizeValue(pw, r.lastCachedPss*1024);
- pw.println();
- pw.print(prefix);
- pw.print(" ");
- pw.print("cached="); pw.print(r.isCached());
- pw.print(" empty="); pw.print(r.empty);
- pw.print(" hasAboveClient="); pw.println(r.hasAboveClient);
-
- if (r.setProcState >= ActivityManager.PROCESS_STATE_SERVICE) {
- if (r.lastCpuTime != 0) {
- long timeUsed = r.curCpuTime - r.lastCpuTime;
- pw.print(prefix);
- pw.print(" ");
- pw.print("run cpu over ");
- TimeUtils.formatDuration(uptimeSince, pw);
- pw.print(" used ");
- TimeUtils.formatDuration(timeUsed, pw);
- pw.print(" (");
- pw.print((timeUsed*100)/uptimeSince);
- pw.println("%)");
- }
- }
- }
- }
- return true;
- }
-
ArrayList<ProcessRecord> collectProcesses(PrintWriter pw, int start, boolean allPkgs,
String[] args) {
synchronized (this) {
@@ -10637,12 +9885,12 @@
}
}
- private static final int KSM_SHARED = 0;
- private static final int KSM_SHARING = 1;
- private static final int KSM_UNSHARED = 2;
- private static final int KSM_VOLATILE = 3;
+ static final int KSM_SHARED = 0;
+ static final int KSM_SHARING = 1;
+ static final int KSM_UNSHARED = 2;
+ static final int KSM_VOLATILE = 3;
- private final long[] getKsmInfo() {
+ static final long[] getKsmInfo() {
long[] longOut = new long[4];
final int[] SINGLE_LONG_FORMAT = new int[] {
PROC_SPACE_TERM| PROC_OUT_LONG
@@ -10666,7 +9914,7 @@
return longOut;
}
- private static String stringifySize(long size, int order) {
+ static String stringifySize(long size, int order) {
Locale locale = Locale.US;
switch (order) {
case 1:
@@ -10682,7 +9930,7 @@
}
}
- private static String stringifyKBSize(long size) {
+ static String stringifyKBSize(long size) {
return stringifySize(size * 1024, 1024);
}
@@ -10978,12 +10226,9 @@
synchronized (this) {
if (r.thread != null && oomAdj == r.getSetAdjWithServices()) {
// Record this for posterity if the process has been stable.
- synchronized (mProcessStats.mLock) {
- r.baseProcessTracker.addPss(myTotalPss, myTotalUss, myTotalRss, true,
- reportType, endTime - startTime, r.pkgList.mPkgList);
- }
- for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);
+ r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,
+ reportType, endTime - startTime);
+ r.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
r.info.uid,
holder.state.getName(),
@@ -10991,7 +10236,7 @@
myTotalPss, myTotalUss, myTotalRss, reportType,
endTime-startTime,
holder.appVersion);
- }
+ });
}
}
@@ -11561,19 +10806,16 @@
synchronized (this) {
if (r.thread != null && oomAdj == r.getSetAdjWithServices()) {
// Record this for posterity if the process has been stable.
- synchronized (mProcessStats.mLock) {
- r.baseProcessTracker.addPss(myTotalPss, myTotalUss, myTotalRss, true,
- reportType, endTime - startTime, r.pkgList.mPkgList);
- }
- for (int ipkg = r.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = r.pkgList.valueAt(ipkg);
+ r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,
+ reportType, endTime - startTime);
+ r.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
r.info.uid,
holder.state.getName(),
holder.state.getPackage(),
myTotalPss, myTotalUss, myTotalRss, reportType, endTime-startTime,
holder.appVersion);
- }
+ });
}
}
@@ -11844,7 +11086,7 @@
proto.flush();
}
- private void appendBasicMemEntry(StringBuilder sb, int oomAdj, int procState, long pss,
+ static void appendBasicMemEntry(StringBuilder sb, int oomAdj, int procState, long pss,
long memtrack, String name) {
sb.append(" ");
sb.append(ProcessList.makeOomAdjString(oomAdj, false));
@@ -11861,7 +11103,7 @@
}
}
- private void appendMemInfo(StringBuilder sb, ProcessMemInfo mi) {
+ static void appendMemInfo(StringBuilder sb, ProcessMemInfo mi) {
appendBasicMemEntry(sb, mi.oomAdj, mi.procState, mi.pss, mi.memtrack, mi.name);
sb.append(" (pid ");
sb.append(mi.pid);
@@ -11875,283 +11117,6 @@
}
}
- void reportMemUsage(ArrayList<ProcessMemInfo> memInfos) {
- final SparseArray<ProcessMemInfo> infoMap = new SparseArray<>(memInfos.size());
- for (int i=0, N=memInfos.size(); i<N; i++) {
- ProcessMemInfo mi = memInfos.get(i);
- infoMap.put(mi.pid, mi);
- }
- updateCpuStatsNow();
- long[] memtrackTmp = new long[1];
- long[] swaptrackTmp = new long[2];
- // Get a list of Stats that have vsize > 0
- final List<ProcessCpuTracker.Stats> stats = mAppProfiler.getCpuStats(st -> st.vsize > 0);
- final int statsCount = stats.size();
- for (int i = 0; i < statsCount; i++) {
- ProcessCpuTracker.Stats st = stats.get(i);
- long pss = Debug.getPss(st.pid, swaptrackTmp, memtrackTmp);
- if (pss > 0) {
- if (infoMap.indexOfKey(st.pid) < 0) {
- ProcessMemInfo mi = new ProcessMemInfo(st.name, st.pid,
- ProcessList.NATIVE_ADJ, -1, "native", null);
- mi.pss = pss;
- mi.swapPss = swaptrackTmp[1];
- mi.memtrack = memtrackTmp[0];
- memInfos.add(mi);
- }
- }
- }
-
- long totalPss = 0;
- long totalSwapPss = 0;
- long totalMemtrack = 0;
- for (int i=0, N=memInfos.size(); i<N; i++) {
- ProcessMemInfo mi = memInfos.get(i);
- if (mi.pss == 0) {
- mi.pss = Debug.getPss(mi.pid, swaptrackTmp, memtrackTmp);
- mi.swapPss = swaptrackTmp[1];
- mi.memtrack = memtrackTmp[0];
- }
- totalPss += mi.pss;
- totalSwapPss += mi.swapPss;
- totalMemtrack += mi.memtrack;
- }
- Collections.sort(memInfos, new Comparator<ProcessMemInfo>() {
- @Override public int compare(ProcessMemInfo lhs, ProcessMemInfo rhs) {
- if (lhs.oomAdj != rhs.oomAdj) {
- return lhs.oomAdj < rhs.oomAdj ? -1 : 1;
- }
- if (lhs.pss != rhs.pss) {
- return lhs.pss < rhs.pss ? 1 : -1;
- }
- return 0;
- }
- });
-
- StringBuilder tag = new StringBuilder(128);
- StringBuilder stack = new StringBuilder(128);
- tag.append("Low on memory -- ");
- appendMemBucket(tag, totalPss, "total", false);
- appendMemBucket(stack, totalPss, "total", true);
-
- StringBuilder fullNativeBuilder = new StringBuilder(1024);
- StringBuilder shortNativeBuilder = new StringBuilder(1024);
- StringBuilder fullJavaBuilder = new StringBuilder(1024);
-
- boolean firstLine = true;
- int lastOomAdj = Integer.MIN_VALUE;
- long extraNativeRam = 0;
- long extraNativeMemtrack = 0;
- long cachedPss = 0;
- for (int i=0, N=memInfos.size(); i<N; i++) {
- ProcessMemInfo mi = memInfos.get(i);
-
- if (mi.oomAdj >= ProcessList.CACHED_APP_MIN_ADJ) {
- cachedPss += mi.pss;
- }
-
- if (mi.oomAdj != ProcessList.NATIVE_ADJ
- && (mi.oomAdj < ProcessList.SERVICE_ADJ
- || mi.oomAdj == ProcessList.HOME_APP_ADJ
- || mi.oomAdj == ProcessList.PREVIOUS_APP_ADJ)) {
- if (lastOomAdj != mi.oomAdj) {
- lastOomAdj = mi.oomAdj;
- if (mi.oomAdj <= ProcessList.FOREGROUND_APP_ADJ) {
- tag.append(" / ");
- }
- if (mi.oomAdj >= ProcessList.FOREGROUND_APP_ADJ) {
- if (firstLine) {
- stack.append(":");
- firstLine = false;
- }
- stack.append("\n\t at ");
- } else {
- stack.append("$");
- }
- } else {
- tag.append(" ");
- stack.append("$");
- }
- if (mi.oomAdj <= ProcessList.FOREGROUND_APP_ADJ) {
- appendMemBucket(tag, mi.pss, mi.name, false);
- }
- appendMemBucket(stack, mi.pss, mi.name, true);
- if (mi.oomAdj >= ProcessList.FOREGROUND_APP_ADJ
- && ((i+1) >= N || memInfos.get(i+1).oomAdj != lastOomAdj)) {
- stack.append("(");
- for (int k=0; k<DUMP_MEM_OOM_ADJ.length; k++) {
- if (DUMP_MEM_OOM_ADJ[k] == mi.oomAdj) {
- stack.append(DUMP_MEM_OOM_LABEL[k]);
- stack.append(":");
- stack.append(DUMP_MEM_OOM_ADJ[k]);
- }
- }
- stack.append(")");
- }
- }
-
- appendMemInfo(fullNativeBuilder, mi);
- if (mi.oomAdj == ProcessList.NATIVE_ADJ) {
- // The short form only has native processes that are >= 512K.
- if (mi.pss >= 512) {
- appendMemInfo(shortNativeBuilder, mi);
- } else {
- extraNativeRam += mi.pss;
- extraNativeMemtrack += mi.memtrack;
- }
- } else {
- // Short form has all other details, but if we have collected RAM
- // from smaller native processes let's dump a summary of that.
- if (extraNativeRam > 0) {
- appendBasicMemEntry(shortNativeBuilder, ProcessList.NATIVE_ADJ,
- -1, extraNativeRam, extraNativeMemtrack, "(Other native)");
- shortNativeBuilder.append('\n');
- extraNativeRam = 0;
- }
- appendMemInfo(fullJavaBuilder, mi);
- }
- }
-
- fullJavaBuilder.append(" ");
- ProcessList.appendRamKb(fullJavaBuilder, totalPss);
- fullJavaBuilder.append(": TOTAL");
- if (totalMemtrack > 0) {
- fullJavaBuilder.append(" (");
- fullJavaBuilder.append(stringifyKBSize(totalMemtrack));
- fullJavaBuilder.append(" memtrack)");
- } else {
- }
- fullJavaBuilder.append("\n");
-
- MemInfoReader memInfo = new MemInfoReader();
- memInfo.readMemInfo();
- final long[] infos = memInfo.getRawInfo();
-
- StringBuilder memInfoBuilder = new StringBuilder(1024);
- Debug.getMemInfo(infos);
- memInfoBuilder.append(" MemInfo: ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SLAB])).append(" slab, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SHMEM])).append(" shmem, ");
- memInfoBuilder.append(stringifyKBSize(
- infos[Debug.MEMINFO_VM_ALLOC_USED])).append(" vm alloc, ");
- memInfoBuilder.append(stringifyKBSize(
- infos[Debug.MEMINFO_PAGE_TABLES])).append(" page tables ");
- memInfoBuilder.append(stringifyKBSize(
- infos[Debug.MEMINFO_KERNEL_STACK])).append(" kernel stack\n");
- memInfoBuilder.append(" ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_BUFFERS])).append(" buffers, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_CACHED])).append(" cached, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_MAPPED])).append(" mapped, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_FREE])).append(" free\n");
- if (infos[Debug.MEMINFO_ZRAM_TOTAL] != 0) {
- memInfoBuilder.append(" ZRAM: ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_ZRAM_TOTAL]));
- memInfoBuilder.append(" RAM, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SWAP_TOTAL]));
- memInfoBuilder.append(" swap total, ");
- memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SWAP_FREE]));
- memInfoBuilder.append(" swap free\n");
- }
- final long[] ksm = getKsmInfo();
- if (ksm[KSM_SHARING] != 0 || ksm[KSM_SHARED] != 0 || ksm[KSM_UNSHARED] != 0
- || ksm[KSM_VOLATILE] != 0) {
- memInfoBuilder.append(" KSM: ");
- memInfoBuilder.append(stringifyKBSize(ksm[KSM_SHARING]));
- memInfoBuilder.append(" saved from shared ");
- memInfoBuilder.append(stringifyKBSize(ksm[KSM_SHARED]));
- memInfoBuilder.append("\n ");
- memInfoBuilder.append(stringifyKBSize(ksm[KSM_UNSHARED]));
- memInfoBuilder.append(" unshared; ");
- memInfoBuilder.append(stringifyKBSize(ksm[KSM_VOLATILE]));
- memInfoBuilder.append(" volatile\n");
- }
- memInfoBuilder.append(" Free RAM: ");
- memInfoBuilder.append(stringifyKBSize(cachedPss + memInfo.getCachedSizeKb()
- + memInfo.getFreeSizeKb()));
- memInfoBuilder.append("\n");
- long kernelUsed = memInfo.getKernelUsedSizeKb();
- final long ionHeap = Debug.getIonHeapsSizeKb();
- final long ionPool = Debug.getIonPoolsSizeKb();
- if (ionHeap >= 0 && ionPool >= 0) {
- final long ionMapped = Debug.getIonMappedSizeKb();
- final long ionUnmapped = ionHeap - ionMapped;
- memInfoBuilder.append(" ION: ");
- memInfoBuilder.append(stringifyKBSize(ionHeap + ionPool));
- memInfoBuilder.append("\n");
- // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being
- // set on ION VMAs, therefore consider the entire ION heap as used kernel memory
- kernelUsed += ionHeap;
- }
- final long gpuUsage = Debug.getGpuTotalUsageKb();
- if (gpuUsage >= 0) {
- memInfoBuilder.append(" GPU: ");
- memInfoBuilder.append(stringifyKBSize(gpuUsage));
- memInfoBuilder.append("\n");
- }
- memInfoBuilder.append(" Used RAM: ");
- memInfoBuilder.append(stringifyKBSize(
- totalPss - cachedPss + kernelUsed));
- memInfoBuilder.append("\n");
- memInfoBuilder.append(" Lost RAM: ");
- memInfoBuilder.append(stringifyKBSize(memInfo.getTotalSizeKb()
- - (totalPss - totalSwapPss) - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
- - kernelUsed - memInfo.getZramTotalSizeKb()));
- memInfoBuilder.append("\n");
- Slog.i(TAG, "Low on memory:");
- Slog.i(TAG, shortNativeBuilder.toString());
- Slog.i(TAG, fullJavaBuilder.toString());
- Slog.i(TAG, memInfoBuilder.toString());
-
- StringBuilder dropBuilder = new StringBuilder(1024);
- /*
- StringWriter oomSw = new StringWriter();
- PrintWriter oomPw = new FastPrintWriter(oomSw, false, 256);
- StringWriter catSw = new StringWriter();
- PrintWriter catPw = new FastPrintWriter(catSw, false, 256);
- String[] emptyArgs = new String[] { };
- dumpApplicationMemoryUsage(null, oomPw, " ", emptyArgs, true, catPw);
- oomPw.flush();
- String oomString = oomSw.toString();
- */
- dropBuilder.append("Low on memory:");
- dropBuilder.append(stack);
- dropBuilder.append('\n');
- dropBuilder.append(fullNativeBuilder);
- dropBuilder.append(fullJavaBuilder);
- dropBuilder.append('\n');
- dropBuilder.append(memInfoBuilder);
- dropBuilder.append('\n');
- /*
- dropBuilder.append(oomString);
- dropBuilder.append('\n');
- */
- StringWriter catSw = new StringWriter();
- synchronized (ActivityManagerService.this) {
- PrintWriter catPw = new FastPrintWriter(catSw, false, 256);
- String[] emptyArgs = new String[] { };
- catPw.println();
- dumpProcessesLocked(null, catPw, emptyArgs, 0, false, null, -1);
- catPw.println();
- mServices.newServiceDumperLocked(null, catPw, emptyArgs, 0,
- false, null).dumpLocked();
- catPw.println();
- mAtmInternal.dump(DUMP_ACTIVITIES_CMD, null, catPw, emptyArgs, 0, false, false, null);
- catPw.flush();
- }
- dropBuilder.append(catSw.toString());
- FrameworkStatsLog.write(FrameworkStatsLog.LOW_MEM_REPORTED);
- addErrorToDropBox("lowmem", null, "system_server", null,
- null, null, tag.toString(), dropBuilder.toString(), null, null);
- //Slog.i(TAG, "Sent to dropbox:");
- //Slog.i(TAG, dropBuilder.toString());
- synchronized (ActivityManagerService.this) {
- long now = SystemClock.uptimeMillis();
- if (mLastMemUsageReportTime < now) {
- mLastMemUsageReportTime = now;
- }
- }
- }
-
/**
* Searches array of arguments for the specified string
* @param args array of argument strings
@@ -12185,7 +11150,6 @@
ProcessList.remove(app.pid);
}
- mProcessesToGc.remove(app);
mAppProfiler.onCleanupApplicationRecordLocked(app);
// Dismiss any open dialogs.
@@ -12285,15 +11249,7 @@
});
}
- for (int i = mPendingProcessChanges.size() - 1; i >= 0; i--) {
- ProcessChangeItem item = mPendingProcessChanges.get(i);
- if (app.pid > 0 && item.pid == app.pid) {
- mPendingProcessChanges.remove(i);
- mAvailProcessChanges.add(item);
- }
- }
- mUiHandler.obtainMessage(DISPATCH_PROCESS_DIED_UI_MSG, app.pid, app.info.uid,
- null).sendToTarget();
+ mProcessList.scheduleDispatchProcessDiedLocked(app.pid, app.info.uid);
// If this is a precede instance of another process instance
allowRestart = true;
@@ -12626,7 +11582,7 @@
Slog.e(TAG, "serviceDoneExecuting: Invalid service token=" + token);
throw new IllegalArgumentException("Invalid service token");
}
- mServices.serviceDoneExecutingLocked((ServiceRecord)token, type, startId, res);
+ mServices.serviceDoneExecutingLocked((ServiceRecord) token, type, startId, res, false);
}
}
@@ -12938,9 +11894,9 @@
+ " (pid=" + Binder.getCallingPid()
+ ") when registering receiver " + receiver);
}
- if (callerApp.info.uid != SYSTEM_UID &&
- !callerApp.pkgList.containsKey(callerPackage) &&
- !"android".equals(callerPackage)) {
+ if (callerApp.info.uid != SYSTEM_UID
+ && !callerApp.getPkgList().containsKey(callerPackage)
+ && !"android".equals(callerPackage)) {
throw new SecurityException("Given caller package " + callerPackage
+ " is not running in process " + callerApp);
}
@@ -14509,8 +13465,11 @@
return;
}
final long origId = Binder.clearCallingIdentity();
- addInstrumentationResultsLocked(app, results);
- Binder.restoreCallingIdentity(origId);
+ try {
+ addInstrumentationResultsLocked(app, results);
+ } finally {
+ Binder.restoreCallingIdentity(origId);
+ }
}
}
@@ -14542,7 +13501,7 @@
mAppOpsService.setMode(AppOpsManager.OP_NO_ISOLATED_STORAGE, app.uid,
app.info.packageName, AppOpsManager.MODE_ERRORED);
mAppOpsService.setAppOpsServiceDelegate(null);
- getPermissionManagerInternalLocked().stopShellPermissionIdentityDelegation();
+ getPermissionManagerInternal().stopShellPermissionIdentityDelegation();
mHandler.obtainMessage(SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG,
instr.mUiAutomationConnection).sendToTarget();
}
@@ -14813,28 +13772,9 @@
}
/**
- * Ask a given process to GC right now.
- */
- final void performAppGcLocked(ProcessRecord app) {
- try {
- app.lastRequestedGc = SystemClock.uptimeMillis();
- if (app.thread != null) {
- if (app.reportLowMemory) {
- app.reportLowMemory = false;
- app.thread.scheduleLowMemory();
- } else {
- app.thread.processInBackground();
- }
- }
- } catch (Exception e) {
- // whatever.
- }
- }
-
- /**
* Returns true if things are idle enough to perform GCs.
*/
- private final boolean canGcNowLocked() {
+ final boolean canGcNowLocked() {
for (BroadcastQueue q : mBroadcastQueues) {
if (!q.mParallelBroadcasts.isEmpty() || !q.mDispatcher.isEmpty()) {
return false;
@@ -14843,107 +13783,6 @@
return mAtmInternal.canGcNow();
}
- /**
- * Perform GCs on all processes that are waiting for it, but only
- * if things are idle.
- */
- final void performAppGcsLocked() {
- final int N = mProcessesToGc.size();
- if (N <= 0) {
- return;
- }
- if (canGcNowLocked()) {
- while (mProcessesToGc.size() > 0) {
- ProcessRecord proc = mProcessesToGc.remove(0);
- if (proc.getCurRawAdj() > ProcessList.PERCEPTIBLE_APP_ADJ || proc.reportLowMemory) {
- if ((proc.lastRequestedGc+mConstants.GC_MIN_INTERVAL)
- <= SystemClock.uptimeMillis()) {
- // To avoid spamming the system, we will GC processes one
- // at a time, waiting a few seconds between each.
- performAppGcLocked(proc);
- scheduleAppGcsLocked();
- return;
- } else {
- // It hasn't been long enough since we last GCed this
- // process... put it in the list to wait for its time.
- addProcessToGcListLocked(proc);
- break;
- }
- }
- }
-
- scheduleAppGcsLocked();
- }
- }
-
- /**
- * If all looks good, perform GCs on all processes waiting for them.
- */
- final void performAppGcsIfAppropriateLocked() {
- if (canGcNowLocked()) {
- performAppGcsLocked();
- return;
- }
- // Still not idle, wait some more.
- scheduleAppGcsLocked();
- }
-
- /**
- * Schedule the execution of all pending app GCs.
- */
- final void scheduleAppGcsLocked() {
- mHandler.removeMessages(GC_BACKGROUND_PROCESSES_MSG);
-
- if (mProcessesToGc.size() > 0) {
- // Schedule a GC for the time to the next process.
- ProcessRecord proc = mProcessesToGc.get(0);
- Message msg = mHandler.obtainMessage(GC_BACKGROUND_PROCESSES_MSG);
-
- long when = proc.lastRequestedGc + mConstants.GC_MIN_INTERVAL;
- long now = SystemClock.uptimeMillis();
- if (when < (now+mConstants.GC_TIMEOUT)) {
- when = now + mConstants.GC_TIMEOUT;
- }
- mHandler.sendMessageAtTime(msg, when);
- }
- }
-
- /**
- * Add a process to the array of processes waiting to be GCed. Keeps the
- * list in sorted order by the last GC time. The process can't already be
- * on the list.
- */
- final void addProcessToGcListLocked(ProcessRecord proc) {
- boolean added = false;
- for (int i=mProcessesToGc.size()-1; i>=0; i--) {
- if (mProcessesToGc.get(i).lastRequestedGc <
- proc.lastRequestedGc) {
- added = true;
- mProcessesToGc.add(i+1, proc);
- break;
- }
- }
- if (!added) {
- mProcessesToGc.add(0, proc);
- }
- }
-
- /**
- * Set up to ask a process to GC itself. This will either do it
- * immediately, or put it on the list of processes to gc the next
- * time things are idle.
- */
- final void scheduleAppGcLocked(ProcessRecord app) {
- long now = SystemClock.uptimeMillis();
- if ((app.lastRequestedGc+mConstants.GC_MIN_INTERVAL) > now) {
- return;
- }
- if (!mProcessesToGc.contains(app)) {
- addProcessToGcListLocked(app);
- scheduleAppGcsLocked();
- }
- }
-
private void checkExcessivePowerUsage() {
updateCpuStatsNow();
@@ -14972,22 +13811,25 @@
} else {
cpuLimit = mConstants.POWER_CHECK_MAX_CPU_4;
}
- if (app.lastCpuTime > 0) {
- final long cputimeUsed = app.curCpuTime - app.lastCpuTime;
- if (checkExcessivePowerUsageLocked(uptimeSince, doCpuKills, cputimeUsed,
- app.processName, app.toShortString(), cpuLimit, app)) {
- app.kill("excessive cpu " + cputimeUsed + " during " + uptimeSince
- + " dur=" + checkDur + " limit=" + cpuLimit,
- ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE,
- ApplicationExitInfo.SUBREASON_EXCESSIVE_CPU,
- true);
- synchronized (mProcessStats.mLock) {
- app.baseProcessTracker.reportExcessiveCpu(app.pkgList.mPkgList);
+ synchronized (mAppProfiler.mProfilerLock) {
+ final ProcessProfileRecord profile = app.mProfile;
+ final long curCpuTime = profile.mCurCpuTime.get();
+ final long lastCpuTime = profile.mLastCpuTime.get();
+ if (lastCpuTime > 0) {
+ final long cputimeUsed = curCpuTime - lastCpuTime;
+ if (checkExcessivePowerUsageLocked(uptimeSince, doCpuKills, cputimeUsed,
+ app.processName, app.toShortString(), cpuLimit, app)) {
+ app.kill("excessive cpu " + cputimeUsed + " during " + uptimeSince
+ + " dur=" + checkDur + " limit=" + cpuLimit,
+ ApplicationExitInfo.REASON_EXCESSIVE_RESOURCE_USAGE,
+ ApplicationExitInfo.SUBREASON_EXCESSIVE_CPU,
+ true);
+ profile.reportExcessiveCpu();
}
}
+ profile.mLastCpuTime.set(curCpuTime);
}
- app.lastCpuTime = app.curCpuTime;
// Also check the phantom processes if there is any
final long chkDur = checkDur;
@@ -15036,15 +13878,14 @@
if (((cputimeUsed * 100) / uptimeSince) >= cpuLimit) {
mBatteryStatsService.reportExcessiveCpu(app.info.uid, app.processName,
uptimeSince, cputimeUsed);
- for (int ipkg = app.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = app.pkgList.valueAt(ipkg);
+ app.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(
FrameworkStatsLog.EXCESSIVE_CPU_USAGE_REPORTED,
app.info.uid,
processName,
holder.state.getPackage(),
holder.appVersion);
- }
+ });
return true;
}
}
@@ -15056,7 +13897,7 @@
if (packages == null || packages.length != 1) { // Ephemeral apps cannot share uid
return false;
}
- return getPackageManagerInternalLocked().isPackageEphemeral(
+ return getPackageManagerInternal().isPackageEphemeral(
UserHandle.getUserId(uid), packages[0]);
}
@@ -15106,12 +13947,9 @@
final void setProcessTrackerStateLocked(ProcessRecord proc, int memFactor, long now) {
synchronized (mProcessStats.mLock) {
- if (proc.thread != null && proc.baseProcessTracker != null) {
- final int procState = proc.getReportedProcState();
- if (procState != PROCESS_STATE_NONEXISTENT) {
- proc.baseProcessTracker.setState(
- procState, memFactor, now, proc.pkgList.mPkgList);
- }
+ if (proc.thread != null) {
+ proc.mProfile.setProcessTrackerState(
+ proc.getReportedProcState(), memFactor, now);
}
}
}
@@ -15148,7 +13986,8 @@
}
proc.setReportedForegroundServiceTypes(fgServiceTypes);
- ProcessChangeItem item = enqueueProcessChangeItemLocked(proc.pid, proc.info.uid);
+ ProcessChangeItem item = mProcessList.enqueueProcessChangeItemLocked(
+ proc.pid, proc.info.uid);
item.changes |= ProcessChangeItem.CHANGE_FOREGROUND_SERVICES;
item.foregroundServiceTypes = fgServiceTypes;
}
@@ -15159,7 +13998,7 @@
// TODO(b/111541062): This method is only used for updating OOM adjustments. We need to update
// the logic there and in mBatteryStatsService to make them aware of multiple resumed activities
- ProcessRecord getTopAppLocked() {
+ ProcessRecord getTopApp() {
final WindowProcessController wpc = mAtmInternal != null ? mAtmInternal.getTopApp() : null;
final ProcessRecord r = wpc != null ? (ProcessRecord) wpc.mOwner : null;
String pkg;
@@ -15172,25 +14011,27 @@
uid = -1;
}
// Has the UID or resumed package name changed?
- if (uid != mCurResumedUid || (pkg != mCurResumedPackage
- && (pkg == null || !pkg.equals(mCurResumedPackage)))) {
+ synchronized (mCurResumedAppLock) {
+ if (uid != mCurResumedUid || (pkg != mCurResumedPackage
+ && (pkg == null || !pkg.equals(mCurResumedPackage)))) {
- final long identity = Binder.clearCallingIdentity();
- try {
- if (mCurResumedPackage != null) {
- mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_TOP_FINISH,
- mCurResumedPackage, mCurResumedUid);
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ if (mCurResumedPackage != null) {
+ mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_TOP_FINISH,
+ mCurResumedPackage, mCurResumedUid);
+ }
+ mCurResumedPackage = pkg;
+ mCurResumedUid = uid;
+ if (mCurResumedPackage != null) {
+ mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_TOP_START,
+ mCurResumedPackage, mCurResumedUid);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
}
- mCurResumedPackage = pkg;
- mCurResumedUid = uid;
- if (mCurResumedPackage != null) {
- mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_TOP_START,
- mCurResumedPackage, mCurResumedUid);
- }
- } finally {
- Binder.restoreCallingIdentity(identity);
+
}
-
}
return r;
}
@@ -15279,47 +14120,49 @@
userId = mUserController.handleIncomingUser(callingPid, Binder.getCallingUid(),
userId, true, ALLOW_FULL_ONLY, "makePackageIdle", null);
final long callingId = Binder.clearCallingIdentity();
- synchronized(this) {
+ try {
+ IPackageManager pm = AppGlobals.getPackageManager();
+ int pkgUid = -1;
try {
- IPackageManager pm = AppGlobals.getPackageManager();
- int pkgUid = -1;
- try {
- pkgUid = pm.getPackageUid(packageName, MATCH_UNINSTALLED_PACKAGES
- | MATCH_DEBUG_TRIAGED_MISSING, UserHandle.USER_SYSTEM);
- } catch (RemoteException e) {
- }
- if (pkgUid == -1) {
- throw new IllegalArgumentException("Unknown package name " + packageName);
- }
+ pkgUid = pm.getPackageUid(packageName, MATCH_UNINSTALLED_PACKAGES
+ | MATCH_DEBUG_TRIAGED_MISSING, UserHandle.USER_SYSTEM);
+ } catch (RemoteException e) {
+ }
+ if (pkgUid == -1) {
+ throw new IllegalArgumentException("Unknown package name " + packageName);
+ }
- if (mLocalPowerManager != null) {
- mLocalPowerManager.startUidChanges();
- }
- final int appId = UserHandle.getAppId(pkgUid);
- final int N = mProcessList.mActiveUids.size();
- for (int i = N - 1; i >= 0; i--) {
- final UidRecord uidRec = mProcessList.mActiveUids.valueAt(i);
- final long bgTime = uidRec.lastBackgroundTime;
- if (bgTime > 0 && !uidRec.idle) {
- if (UserHandle.getAppId(uidRec.uid) == appId) {
- if (userId == UserHandle.USER_ALL ||
- userId == UserHandle.getUserId(uidRec.uid)) {
- EventLogTags.writeAmUidIdle(uidRec.uid);
- uidRec.idle = true;
- uidRec.setIdle = true;
- Slog.w(TAG, "Idling uid " + UserHandle.formatUid(uidRec.uid)
- + " from package " + packageName + " user " + userId);
- doStopUidLocked(uidRec.uid, uidRec);
+ synchronized (this) {
+ try {
+ if (mLocalPowerManager != null) {
+ mLocalPowerManager.startUidChanges();
+ }
+ final int appId = UserHandle.getAppId(pkgUid);
+ for (int i = mProcessList.mActiveUids.size() - 1; i >= 0; i--) {
+ final UidRecord uidRec = mProcessList.mActiveUids.valueAt(i);
+ final long bgTime = uidRec.lastBackgroundTime;
+ if (bgTime > 0 && !uidRec.idle) {
+ if (UserHandle.getAppId(uidRec.uid) == appId) {
+ if (userId == UserHandle.USER_ALL
+ || userId == UserHandle.getUserId(uidRec.uid)) {
+ EventLogTags.writeAmUidIdle(uidRec.uid);
+ uidRec.idle = true;
+ uidRec.setIdle = true;
+ Slog.w(TAG, "Idling uid " + UserHandle.formatUid(uidRec.uid)
+ + " from package " + packageName + " user " + userId);
+ doStopUidLocked(uidRec.uid, uidRec);
+ }
}
}
}
+ } finally {
+ if (mLocalPowerManager != null) {
+ mLocalPowerManager.finishUidChanges();
+ }
}
- } finally {
- if (mLocalPowerManager != null) {
- mLocalPowerManager.finishUidChanges();
- }
- Binder.restoreCallingIdentity(callingId);
}
+ } finally {
+ Binder.restoreCallingIdentity(callingId);
}
}
@@ -15373,24 +14216,24 @@
}
/**
- * Whitelists {@code targetUid} to temporarily bypass Power Save mode.
+ * Allowlists {@code targetUid} to temporarily bypass Power Save mode.
*/
@GuardedBy("this")
- void tempWhitelistForPendingIntentLocked(int callerPid, int callerUid, int targetUid,
+ void tempAllowlistForPendingIntentLocked(int callerPid, int callerUid, int targetUid,
long duration, int type, String tag) {
if (DEBUG_WHITELISTS) {
- Slog.d(TAG, "tempWhitelistForPendingIntentLocked(" + callerPid + ", " + callerUid + ", "
+ Slog.d(TAG, "tempAllowlistForPendingIntentLocked(" + callerPid + ", " + callerUid + ", "
+ targetUid + ", " + duration + ", " + type + ")");
}
synchronized (mPidsSelfLocked) {
final ProcessRecord pr = mPidsSelfLocked.get(callerPid);
if (pr == null) {
- Slog.w(TAG, "tempWhitelistForPendingIntentLocked() no ProcessRecord for pid "
+ Slog.w(TAG, "tempAllowlistForPendingIntentLocked() no ProcessRecord for pid "
+ callerPid);
return;
}
- if (!pr.whitelistManager) {
+ if (!pr.mAllowlistManager) {
if (checkPermission(CHANGE_DEVICE_IDLE_TEMP_WHITELIST, callerPid, callerUid)
!= PackageManager.PERMISSION_GRANTED
&& checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callerPid, callerUid)
@@ -15398,7 +14241,7 @@
&& checkPermission(START_FOREGROUND_SERVICES_FROM_BACKGROUND, callerPid,
callerUid) != PackageManager.PERMISSION_GRANTED) {
if (DEBUG_WHITELISTS) {
- Slog.d(TAG, "tempWhitelistForPendingIntentLocked() for target " + targetUid
+ Slog.d(TAG, "tempAllowlistForPendingIntentLocked() for target " + targetUid
+ ": pid " + callerPid + " is not allowed");
}
return;
@@ -15406,35 +14249,35 @@
}
}
- tempWhitelistUidLocked(targetUid, duration, tag, type);
+ tempAllowlistUidLocked(targetUid, duration, tag, type);
}
/**
- * Whitelists {@code targetUid} to temporarily bypass Power Save mode.
+ * Allowlists {@code targetUid} to temporarily bypass Power Save mode.
*/
@GuardedBy("this")
- void tempWhitelistUidLocked(int targetUid, long duration, String tag, int type) {
- mPendingTempWhitelist.put(targetUid,
- new PendingTempWhitelist(targetUid, duration, tag, type));
- setUidTempWhitelistStateLocked(targetUid, true);
- mUiHandler.obtainMessage(PUSH_TEMP_WHITELIST_UI_MSG).sendToTarget();
+ void tempAllowlistUidLocked(int targetUid, long duration, String tag, int type) {
+ mPendingTempAllowlist.put(targetUid,
+ new PendingTempAllowlist(targetUid, duration, tag, type));
+ setUidTempAllowlistStateLocked(targetUid, true);
+ mUiHandler.obtainMessage(PUSH_TEMP_ALLOWLIST_UI_MSG).sendToTarget();
if (type == TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED) {
mFgsStartTempAllowList.add(targetUid, duration);
}
}
- void pushTempWhitelist() {
+ void pushTempAllowlist() {
final int N;
- final PendingTempWhitelist[] list;
+ final PendingTempAllowlist[] list;
// First copy out the pending changes... we need to leave them in the map for now,
// in case someone needs to check what is coming up while we don't have the lock held.
synchronized(this) {
- N = mPendingTempWhitelist.size();
- list = new PendingTempWhitelist[N];
+ N = mPendingTempAllowlist.size();
+ list = new PendingTempAllowlist[N];
for (int i = 0; i < N; i++) {
- list[i] = mPendingTempWhitelist.valueAt(i);
+ list[i] = mPendingTempAllowlist.valueAt(i);
}
}
@@ -15443,7 +14286,7 @@
// device idle policy anyway at this phase.
if (mLocalDeviceIdleController != null) {
for (int i = 0; i < N; i++) {
- PendingTempWhitelist ptw = list[i];
+ PendingTempAllowlist ptw = list[i];
mLocalDeviceIdleController.addPowerSaveTempWhitelistAppDirect(ptw.targetUid,
ptw.duration, ptw.type, true, ptw.tag);
}
@@ -15452,23 +14295,23 @@
// And now we can safely remove them from the map.
synchronized(this) {
for (int i = 0; i < N; i++) {
- PendingTempWhitelist ptw = list[i];
- int index = mPendingTempWhitelist.indexOfKey(ptw.targetUid);
- if (index >= 0 && mPendingTempWhitelist.valueAt(index) == ptw) {
- mPendingTempWhitelist.removeAt(index);
+ PendingTempAllowlist ptw = list[i];
+ int index = mPendingTempAllowlist.indexOfKey(ptw.targetUid);
+ if (index >= 0 && mPendingTempAllowlist.valueAt(index) == ptw) {
+ mPendingTempAllowlist.removeAt(index);
}
}
}
}
@GuardedBy("this")
- final void setAppIdTempWhitelistStateLocked(int uid, boolean onWhitelist) {
- mOomAdjuster.setAppIdTempWhitelistStateLocked(uid, onWhitelist);
+ final void setAppIdTempAllowlistStateLocked(int uid, boolean onAllowlist) {
+ mOomAdjuster.setAppIdTempAllowlistStateLocked(uid, onAllowlist);
}
@GuardedBy("this")
- final void setUidTempWhitelistStateLocked(int uid, boolean onWhitelist) {
- mOomAdjuster.setUidTempWhitelistStateLocked(uid, onWhitelist);
+ final void setUidTempAllowlistStateLocked(int uid, boolean onAllowlist) {
+ mOomAdjuster.setUidTempAllowlistStateLocked(uid, onAllowlist);
}
private void trimApplications(boolean forceFullOomAdj, String oomAdjReason) {
@@ -15530,13 +14373,13 @@
throw new SecurityException("Only SIGNAL_USR1 is allowed");
}
- synchronized (this) {
- if (checkCallingPermission(android.Manifest.permission.SIGNAL_PERSISTENT_PROCESSES)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
- + android.Manifest.permission.SIGNAL_PERSISTENT_PROCESSES);
- }
+ if (checkCallingPermission(android.Manifest.permission.SIGNAL_PERSISTENT_PROCESSES)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires permission "
+ + android.Manifest.permission.SIGNAL_PERSISTENT_PROCESSES);
+ }
+ synchronized (this) {
for (int i = mProcessList.mLruProcesses.size() - 1 ; i >= 0 ; i--) {
ProcessRecord r = mProcessList.mLruProcesses.get(i);
if (r.thread != null && r.isPersistent()) {
@@ -15548,20 +14391,20 @@
public boolean profileControl(String process, int userId, boolean start,
ProfilerInfo profilerInfo, int profileType) throws RemoteException {
+ // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
+ // its own permission.
+ if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires permission "
+ + android.Manifest.permission.SET_ACTIVITY_WATCHER);
+ }
+
+ if (start && (profilerInfo == null || profilerInfo.profileFd == null)) {
+ throw new IllegalArgumentException("null profile info or fd");
+ }
+
+ ProcessRecord proc = null;
synchronized (this) {
- // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
- // its own permission.
- if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
- + android.Manifest.permission.SET_ACTIVITY_WATCHER);
- }
-
- if (start && (profilerInfo == null || profilerInfo.profileFd == null)) {
- throw new IllegalArgumentException("null profile info or fd");
- }
-
- ProcessRecord proc = null;
if (process != null) {
proc = findProcessLocked(process, userId, "profileControl");
}
@@ -15569,8 +14412,9 @@
if (start && (proc == null || proc.thread == null)) {
throw new IllegalArgumentException("Unknown process: " + process);
}
-
- return mAppProfiler.profileControlLocked(proc, start, profilerInfo, profileType);
+ }
+ synchronized (mAppProfiler.mProfilerLock) {
+ return mAppProfiler.profileControlLPf(proc, start, profilerInfo, profileType);
}
}
@@ -15612,19 +14456,19 @@
boolean runGc, String path, ParcelFileDescriptor fd, RemoteCallback finishCallback) {
try {
+ // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
+ // its own permission (same as profileControl).
+ if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires permission "
+ + android.Manifest.permission.SET_ACTIVITY_WATCHER);
+ }
+
+ if (fd == null) {
+ throw new IllegalArgumentException("null fd");
+ }
+
synchronized (this) {
- // note: hijacking SET_ACTIVITY_WATCHER, but should be changed to
- // its own permission (same as profileControl).
- if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
- + android.Manifest.permission.SET_ACTIVITY_WATCHER);
- }
-
- if (fd == null) {
- throw new IllegalArgumentException("null fd");
- }
-
ProcessRecord proc = findProcessLocked(process, userId, "dumpHeap");
if (proc == null || proc.thread == null) {
throw new IllegalArgumentException("Unknown process: " + process);
@@ -15683,7 +14527,7 @@
}
processName = proc.processName;
uid = proc.uid;
- if (reportPackage != null && !proc.pkgList.containsKey(reportPackage)) {
+ if (reportPackage != null && !proc.getPkgList().containsKey(reportPackage)) {
throw new SecurityException("Package " + reportPackage + " is not running in "
+ proc);
}
@@ -15871,16 +14715,16 @@
}
public boolean startBinderTracking() throws RemoteException {
+ // TODO: hijacking SET_ACTIVITY_WATCHER, but should be changed to its own
+ // permission (same as profileControl).
+ if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires permission "
+ + android.Manifest.permission.SET_ACTIVITY_WATCHER);
+ }
+
synchronized (this) {
mBinderTransactionTrackingEnabled = true;
- // TODO: hijacking SET_ACTIVITY_WATCHER, but should be changed to its own
- // permission (same as profileControl).
- if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
- + android.Manifest.permission.SET_ACTIVITY_WATCHER);
- }
-
for (int i = 0; i < mProcessList.mLruProcesses.size(); i++) {
ProcessRecord process = mProcessList.mLruProcesses.get(i);
if (!processSanityChecksLocked(process)) {
@@ -15898,19 +14742,19 @@
public boolean stopBinderTrackingAndDump(ParcelFileDescriptor fd) throws RemoteException {
try {
- synchronized (this) {
- mBinderTransactionTrackingEnabled = false;
- // TODO: hijacking SET_ACTIVITY_WATCHER, but should be changed to its own
- // permission (same as profileControl).
- if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
- != PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires permission "
- + android.Manifest.permission.SET_ACTIVITY_WATCHER);
- }
+ // TODO: hijacking SET_ACTIVITY_WATCHER, but should be changed to its own
+ // permission (same as profileControl).
+ if (checkCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires permission "
+ + android.Manifest.permission.SET_ACTIVITY_WATCHER);
+ }
+ synchronized (this) {
if (fd == null) {
throw new IllegalArgumentException("null fd");
}
+ mBinderTransactionTrackingEnabled = false;
PrintWriter pw = new FastPrintWriter(new FileOutputStream(fd.getFileDescriptor()));
pw.println("Binder transaction traces for all processes.\n");
@@ -16059,8 +14903,8 @@
@Override
public void setDeviceIdleWhitelist(int[] allAppids, int[] exceptIdleAppids) {
synchronized (ActivityManagerService.this) {
- mDeviceIdleWhitelist = allAppids;
- mDeviceIdleExceptIdleWhitelist = exceptIdleAppids;
+ mDeviceIdleAllowlist = allAppids;
+ mDeviceIdleExceptIdleAllowlist = exceptIdleAppids;
}
}
@@ -16068,13 +14912,13 @@
public void updateDeviceIdleTempWhitelist(int[] appids, int changingUid, boolean adding,
long durationMs, @BroadcastOptions.TempAllowListType int type) {
synchronized (ActivityManagerService.this) {
- mDeviceIdleTempWhitelist = appids;
+ mDeviceIdleTempAllowlist = appids;
if (adding) {
if (type == TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED) {
mFgsStartTempAllowList.add(changingUid, durationMs);
}
}
- setAppIdTempWhitelistStateLocked(changingUid, adding);
+ setAppIdTempAllowlistStateLocked(changingUid, adding);
}
}
@@ -16301,26 +15145,20 @@
@Override
public void updateCpuStats() {
- synchronized (ActivityManagerService.this) {
- ActivityManagerService.this.updateCpuStatsLocked();
- }
+ ActivityManagerService.this.updateCpuStats();
}
@Override
public void updateBatteryStats(ComponentName activity, int uid, int userId,
boolean resumed) {
- synchronized (ActivityManagerService.this) {
- ActivityManagerService.this.updateBatteryStats(activity, uid, userId, resumed);
- }
+ ActivityManagerService.this.updateBatteryStats(activity, uid, userId, resumed);
}
@Override
public void updateActivityUsageStats(ComponentName activity, int userId, int event,
IBinder appToken, ComponentName taskRoot) {
- synchronized (ActivityManagerService.this) {
- ActivityManagerService.this.updateActivityUsageStats(activity, userId, event,
- appToken, taskRoot);
- }
+ ActivityManagerService.this.updateActivityUsageStats(activity, userId, event,
+ appToken, taskRoot);
}
@Override
@@ -16397,16 +15235,14 @@
@Override
public void scheduleAppGcs() {
- synchronized (ActivityManagerService.this) {
- ActivityManagerService.this.scheduleAppGcsLocked();
+ synchronized (mAppProfiler.mProfilerLock) {
+ mAppProfiler.scheduleAppGcsLPf();
}
}
@Override
public int getTaskIdForActivity(IBinder token, boolean onlyRoot) {
- synchronized (ActivityManagerService.this) {
- return ActivityManagerService.this.getTaskForActivity(token, onlyRoot);
- }
+ return ActivityManagerService.this.getTaskForActivity(token, onlyRoot);
}
@Override
@@ -16446,7 +15282,7 @@
public void tempWhitelistForPendingIntent(int callerPid, int callerUid, int targetUid,
long duration, int type, String tag) {
synchronized (ActivityManagerService.this) {
- ActivityManagerService.this.tempWhitelistForPendingIntentLocked(
+ ActivityManagerService.this.tempAllowlistForPendingIntentLocked(
callerPid, callerUid, targetUid, duration, type, tag);
}
}
@@ -16527,7 +15363,8 @@
(ActivityServiceConnectionsHolder) connectionHolder;
synchronized (ActivityManagerService.this) {
holder.forEachConnection(cr -> mServices.removeConnectionLocked(
- (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */));
+ (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,
+ false /* enqueueOomAdj */));
}
}
@@ -16872,14 +15709,11 @@
throw new SecurityException("Requires permission " + FILTER_EVENTS);
}
ProcessRecord proc;
- long timeoutMillis;
- synchronized (this) {
- synchronized (mPidsSelfLocked) {
- proc = mPidsSelfLocked.get(pid);
- }
- timeoutMillis = proc != null ? proc.getInputDispatchingTimeoutMillis() :
- DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
+ synchronized (mPidsSelfLocked) {
+ proc = mPidsSelfLocked.get(pid);
}
+ final long timeoutMillis = proc != null ? proc.getInputDispatchingTimeoutMillis() :
+ DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
if (inputDispatchingTimedOut(proc, null, null, null, null, aboveSystem, reason)) {
return 0;
@@ -17093,10 +15927,7 @@
* resources and overlaid values are available immediately.
*/
public void updateSystemUiContext() {
- PackageManagerInternal packageManagerInternal;
- synchronized (this) {
- packageManagerInternal = getPackageManagerInternalLocked();
- }
+ final PackageManagerInternal packageManagerInternal = getPackageManagerInternal();
ApplicationInfo ai = packageManagerInternal.getApplicationInfo("android",
GET_SHARED_LIBRARY_FILES, Binder.getCallingUid(), UserHandle.USER_SYSTEM);
@@ -17279,10 +16110,8 @@
* like persisting database etc.
*/
public void prepareForPossibleShutdown() {
- synchronized (this) {
- if (mUsageStatsService != null) {
- mUsageStatsService.prepareForPossibleShutdown();
- }
+ if (mUsageStatsService != null) {
+ mUsageStatsService.prepareForPossibleShutdown();
}
}
@@ -17371,7 +16200,7 @@
final String packageName = instr.mTargetInfo.packageName;
final List<String> permissionNames = permissions != null ?
Arrays.asList(permissions) : null;
- getPermissionManagerInternalLocked().startShellPermissionIdentityDelegation(
+ getPermissionManagerInternal().startShellPermissionIdentityDelegation(
delegateUid, packageName, permissionNames);
return;
}
@@ -17386,7 +16215,7 @@
}
synchronized (ActivityManagerService.this) {
mAppOpsService.setAppOpsServiceDelegate(null);
- getPermissionManagerInternalLocked().stopShellPermissionIdentityDelegation();
+ getPermissionManagerInternal().stopShellPermissionIdentityDelegation();
}
}
@@ -17525,7 +16354,7 @@
public void setActivityLocusContext(ComponentName activity, LocusId locusId, IBinder appToken) {
final int callingUid = Binder.getCallingUid();
final int userId = UserHandle.getCallingUserId();
- if (getPackageManagerInternalLocked().getPackageUid(activity.getPackageName(),
+ if (getPackageManagerInternal().getPackageUid(activity.getPackageName(),
/*flags=*/ 0, userId) != callingUid) {
throw new SecurityException("Calling uid " + callingUid + " cannot set locusId"
+ "for package " + activity.getPackageName());
@@ -17555,9 +16384,7 @@
@Override
public void resetAppErrors() {
enforceCallingPermission(Manifest.permission.RESET_APP_ERRORS, "resetAppErrors");
- synchronized (this) {
- mAppErrors.resetStateLocked();
- }
+ mAppErrors.resetState();
}
@Override
diff --git a/services/core/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java
index d76e2d7..779d378 100644
--- a/services/core/java/com/android/server/am/AppErrorDialog.java
+++ b/services/core/java/com/android/server/am/AppErrorDialog.java
@@ -71,8 +71,8 @@
BidiFormatter bidi = BidiFormatter.getInstance();
CharSequence name;
- if ((mProc.pkgList.size() == 1) &&
- (name = context.getPackageManager().getApplicationLabel(mProc.info)) != null) {
+ if ((mProc.getPkgList().size() == 1)
+ && (name = context.getPackageManager().getApplicationLabel(mProc.info)) != null) {
setTitle(res.getString(
data.repeating ? com.android.internal.R.string.aerr_application_repeated
: com.android.internal.R.string.aerr_application,
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 35f4689..7be54c2 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -52,6 +52,7 @@
import android.util.TimeUtils;
import android.util.proto.ProtoOutputStream;
+import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.ProcessMap;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
@@ -74,27 +75,32 @@
private final Context mContext;
private final PackageWatchdog mPackageWatchdog;
+ @GuardedBy("mBadProcessLock")
private ArraySet<String> mAppsNotReportingCrashes;
/**
* The last time that various processes have crashed since they were last explicitly started.
*/
+ @GuardedBy("mBadProcessLock")
private final ProcessMap<Long> mProcessCrashTimes = new ProcessMap<>();
/**
* The last time that various processes have crashed (not reset even when explicitly started).
*/
+ @GuardedBy("mBadProcessLock")
private final ProcessMap<Long> mProcessCrashTimesPersistent = new ProcessMap<>();
/**
* The last time that various processes have crashed and shown an error dialog.
*/
+ @GuardedBy("mBadProcessLock")
private final ProcessMap<Long> mProcessCrashShowDialogTimes = new ProcessMap<>();
/**
* A pairing between how many times various processes have crashed since a given time.
* Entry and exit conditions for this map are similar to mProcessCrashTimes.
*/
+ @GuardedBy("mBadProcessLock")
private final ProcessMap<Pair<Long, Integer>> mProcessCrashCounts = new ProcessMap<>();
/**
@@ -116,6 +122,16 @@
* lock operations from the simple lookup cases.
*/
private volatile ProcessMap<BadProcessInfo> mBadProcesses = new ProcessMap<>();
+
+ /**
+ * Dedicated lock for {@link #mAppsNotReportingCrashes}, {@link #mProcessCrashTimes},
+ * {@link #mProcessCrashTimesPersistent}, {@link #mProcessCrashShowDialogTimes},
+ * {@link #mProcessCrashCounts} and {@link #mBadProcesses}.
+ *
+ * <p>The naming convention of the function with this lock should be "-LBp"</b>
+ *
+ * @See mBadProcesses
+ */
private final Object mBadProcessLock = new Object();
AppErrors(Context context, ActivityManagerService service, PackageWatchdog watchdog) {
@@ -126,147 +142,152 @@
}
/** Resets the current state but leaves the constructor-provided fields unchanged. */
- public void resetStateLocked() {
+ public void resetState() {
Slog.i(TAG, "Resetting AppErrors");
- mAppsNotReportingCrashes.clear();
- mProcessCrashTimes.clear();
- mProcessCrashTimesPersistent.clear();
- mProcessCrashShowDialogTimes.clear();
- mProcessCrashCounts.clear();
synchronized (mBadProcessLock) {
+ mAppsNotReportingCrashes.clear();
+ mProcessCrashTimes.clear();
+ mProcessCrashTimesPersistent.clear();
+ mProcessCrashShowDialogTimes.clear();
+ mProcessCrashCounts.clear();
mBadProcesses = new ProcessMap<>();
}
}
void dumpDebug(ProtoOutputStream proto, long fieldId, String dumpPackage) {
- final ProcessMap<BadProcessInfo> badProcesses = mBadProcesses;
- if (mProcessCrashTimes.getMap().isEmpty() && badProcesses.getMap().isEmpty()) {
- return;
- }
-
- final long token = proto.start(fieldId);
- final long now = SystemClock.uptimeMillis();
- proto.write(AppErrorsProto.NOW_UPTIME_MS, now);
-
- if (!mProcessCrashTimes.getMap().isEmpty()) {
- final ArrayMap<String, SparseArray<Long>> pmap = mProcessCrashTimes.getMap();
- final int procCount = pmap.size();
- for (int ip = 0; ip < procCount; ip++) {
- final long ctoken = proto.start(AppErrorsProto.PROCESS_CRASH_TIMES);
- final String pname = pmap.keyAt(ip);
- final SparseArray<Long> uids = pmap.valueAt(ip);
- final int uidCount = uids.size();
-
- proto.write(AppErrorsProto.ProcessCrashTime.PROCESS_NAME, pname);
- for (int i = 0; i < uidCount; i++) {
- final int puid = uids.keyAt(i);
- final ProcessRecord r = mService.getProcessNames().get(pname, puid);
- if (dumpPackage != null
- && (r == null || !r.pkgList.containsKey(dumpPackage))) {
- continue;
- }
- final long etoken = proto.start(AppErrorsProto.ProcessCrashTime.ENTRIES);
- proto.write(AppErrorsProto.ProcessCrashTime.Entry.UID, puid);
- proto.write(AppErrorsProto.ProcessCrashTime.Entry.LAST_CRASHED_AT_MS,
- uids.valueAt(i));
- proto.end(etoken);
- }
- proto.end(ctoken);
+ synchronized (mBadProcessLock) {
+ final ProcessMap<BadProcessInfo> badProcesses = mBadProcesses;
+ if (mProcessCrashTimes.getMap().isEmpty() && badProcesses.getMap().isEmpty()) {
+ return;
}
- }
+ final long token = proto.start(fieldId);
+ final long now = SystemClock.uptimeMillis();
+ proto.write(AppErrorsProto.NOW_UPTIME_MS, now);
- if (!badProcesses.getMap().isEmpty()) {
- final ArrayMap<String, SparseArray<BadProcessInfo>> pmap = badProcesses.getMap();
- final int processCount = pmap.size();
- for (int ip = 0; ip < processCount; ip++) {
- final long btoken = proto.start(AppErrorsProto.BAD_PROCESSES);
- final String pname = pmap.keyAt(ip);
- final SparseArray<BadProcessInfo> uids = pmap.valueAt(ip);
- final int uidCount = uids.size();
+ if (!mProcessCrashTimes.getMap().isEmpty()) {
+ final ArrayMap<String, SparseArray<Long>> pmap = mProcessCrashTimes.getMap();
+ final int procCount = pmap.size();
+ for (int ip = 0; ip < procCount; ip++) {
+ final long ctoken = proto.start(AppErrorsProto.PROCESS_CRASH_TIMES);
+ final String pname = pmap.keyAt(ip);
+ final SparseArray<Long> uids = pmap.valueAt(ip);
+ final int uidCount = uids.size();
- proto.write(AppErrorsProto.BadProcess.PROCESS_NAME, pname);
- for (int i = 0; i < uidCount; i++) {
- final int puid = uids.keyAt(i);
- final ProcessRecord r = mService.getProcessNames().get(pname, puid);
- if (dumpPackage != null && (r == null
- || !r.pkgList.containsKey(dumpPackage))) {
- continue;
+ proto.write(AppErrorsProto.ProcessCrashTime.PROCESS_NAME, pname);
+ for (int i = 0; i < uidCount; i++) {
+ final int puid = uids.keyAt(i);
+ final ProcessRecord r = mService.getProcessNames().get(pname, puid);
+ if (dumpPackage != null
+ && (r == null || !r.getPkgList().containsKey(dumpPackage))) {
+ continue;
+ }
+ final long etoken = proto.start(AppErrorsProto.ProcessCrashTime.ENTRIES);
+ proto.write(AppErrorsProto.ProcessCrashTime.Entry.UID, puid);
+ proto.write(AppErrorsProto.ProcessCrashTime.Entry.LAST_CRASHED_AT_MS,
+ uids.valueAt(i));
+ proto.end(etoken);
}
- final BadProcessInfo info = uids.valueAt(i);
- final long etoken = proto.start(AppErrorsProto.BadProcess.ENTRIES);
- proto.write(AppErrorsProto.BadProcess.Entry.UID, puid);
- proto.write(AppErrorsProto.BadProcess.Entry.CRASHED_AT_MS, info.time);
- proto.write(AppErrorsProto.BadProcess.Entry.SHORT_MSG, info.shortMsg);
- proto.write(AppErrorsProto.BadProcess.Entry.LONG_MSG, info.longMsg);
- proto.write(AppErrorsProto.BadProcess.Entry.STACK, info.stack);
- proto.end(etoken);
+ proto.end(ctoken);
}
- proto.end(btoken);
- }
- }
- proto.end(token);
+ }
+
+ if (!badProcesses.getMap().isEmpty()) {
+ final ArrayMap<String, SparseArray<BadProcessInfo>> pmap = badProcesses.getMap();
+ final int processCount = pmap.size();
+ for (int ip = 0; ip < processCount; ip++) {
+ final long btoken = proto.start(AppErrorsProto.BAD_PROCESSES);
+ final String pname = pmap.keyAt(ip);
+ final SparseArray<BadProcessInfo> uids = pmap.valueAt(ip);
+ final int uidCount = uids.size();
+
+ proto.write(AppErrorsProto.BadProcess.PROCESS_NAME, pname);
+ for (int i = 0; i < uidCount; i++) {
+ final int puid = uids.keyAt(i);
+ final ProcessRecord r = mService.getProcessNames().get(pname, puid);
+ if (dumpPackage != null && (r == null
+ || !r.getPkgList().containsKey(dumpPackage))) {
+ continue;
+ }
+ final BadProcessInfo info = uids.valueAt(i);
+ final long etoken = proto.start(AppErrorsProto.BadProcess.ENTRIES);
+ proto.write(AppErrorsProto.BadProcess.Entry.UID, puid);
+ proto.write(AppErrorsProto.BadProcess.Entry.CRASHED_AT_MS, info.time);
+ proto.write(AppErrorsProto.BadProcess.Entry.SHORT_MSG, info.shortMsg);
+ proto.write(AppErrorsProto.BadProcess.Entry.LONG_MSG, info.longMsg);
+ proto.write(AppErrorsProto.BadProcess.Entry.STACK, info.stack);
+ proto.end(etoken);
+ }
+ proto.end(btoken);
+ }
+ }
+
+ proto.end(token);
+ }
}
boolean dumpLocked(FileDescriptor fd, PrintWriter pw, boolean needSep, String dumpPackage) {
final long now = SystemClock.uptimeMillis();
- if (!mProcessCrashTimes.getMap().isEmpty()) {
- boolean printed = false;
- final ArrayMap<String, SparseArray<Long>> pmap = mProcessCrashTimes.getMap();
- final int processCount = pmap.size();
- for (int ip = 0; ip < processCount; ip++) {
- final String pname = pmap.keyAt(ip);
- final SparseArray<Long> uids = pmap.valueAt(ip);
- final int uidCount = uids.size();
- for (int i = 0; i < uidCount; i++) {
- final int puid = uids.keyAt(i);
- final ProcessRecord r = mService.getProcessNames().get(pname, puid);
- if (dumpPackage != null && (r == null
- || !r.pkgList.containsKey(dumpPackage))) {
- continue;
+ synchronized (mBadProcessLock) {
+ if (!mProcessCrashTimes.getMap().isEmpty()) {
+ boolean printed = false;
+ final ArrayMap<String, SparseArray<Long>> pmap = mProcessCrashTimes.getMap();
+ final int processCount = pmap.size();
+ for (int ip = 0; ip < processCount; ip++) {
+ final String pname = pmap.keyAt(ip);
+ final SparseArray<Long> uids = pmap.valueAt(ip);
+ final int uidCount = uids.size();
+ for (int i = 0; i < uidCount; i++) {
+ final int puid = uids.keyAt(i);
+ final ProcessRecord r = mService.getProcessNames().get(pname, puid);
+ if (dumpPackage != null && (r == null
+ || !r.getPkgList().containsKey(dumpPackage))) {
+ continue;
+ }
+ if (!printed) {
+ if (needSep) pw.println();
+ needSep = true;
+ pw.println(" Time since processes crashed:");
+ printed = true;
+ }
+ pw.print(" Process "); pw.print(pname);
+ pw.print(" uid "); pw.print(puid);
+ pw.print(": last crashed ");
+ TimeUtils.formatDuration(now - uids.valueAt(i), pw);
+ pw.println(" ago");
}
- if (!printed) {
- if (needSep) pw.println();
- needSep = true;
- pw.println(" Time since processes crashed:");
- printed = true;
- }
- pw.print(" Process "); pw.print(pname);
- pw.print(" uid "); pw.print(puid);
- pw.print(": last crashed ");
- TimeUtils.formatDuration(now-uids.valueAt(i), pw);
- pw.println(" ago");
}
}
- }
- if (!mProcessCrashCounts.getMap().isEmpty()) {
- boolean printed = false;
- final ArrayMap<String, SparseArray<Pair<Long, Integer>>> pmap =
- mProcessCrashCounts.getMap();
- final int processCount = pmap.size();
- for (int ip = 0; ip < processCount; ip++) {
- final String pname = pmap.keyAt(ip);
- final SparseArray<Pair<Long, Integer>> uids = pmap.valueAt(ip);
- final int uidCount = uids.size();
- for (int i = 0; i < uidCount; i++) {
- final int puid = uids.keyAt(i);
- final ProcessRecord r = mService.getProcessNames().get(pname, puid);
- if (dumpPackage != null && (r == null || !r.pkgList.containsKey(dumpPackage))) {
- continue;
+ if (!mProcessCrashCounts.getMap().isEmpty()) {
+ boolean printed = false;
+ final ArrayMap<String, SparseArray<Pair<Long, Integer>>> pmap =
+ mProcessCrashCounts.getMap();
+ final int processCount = pmap.size();
+ for (int ip = 0; ip < processCount; ip++) {
+ final String pname = pmap.keyAt(ip);
+ final SparseArray<Pair<Long, Integer>> uids = pmap.valueAt(ip);
+ final int uidCount = uids.size();
+ for (int i = 0; i < uidCount; i++) {
+ final int puid = uids.keyAt(i);
+ final ProcessRecord r = mService.getProcessNames().get(pname, puid);
+ if (dumpPackage != null
+ && (r == null || !r.getPkgList().containsKey(dumpPackage))) {
+ continue;
+ }
+ if (!printed) {
+ if (needSep) pw.println();
+ needSep = true;
+ pw.println(" First time processes crashed and counts:");
+ printed = true;
+ }
+ pw.print(" Process "); pw.print(pname);
+ pw.print(" uid "); pw.print(puid);
+ pw.print(": first crashed ");
+ TimeUtils.formatDuration(now - uids.valueAt(i).first, pw);
+ pw.print(" ago; crashes since then: "); pw.println(uids.valueAt(i).second);
}
- if (!printed) {
- if (needSep) pw.println();
- needSep = true;
- pw.println(" First time processes crashed and counts:");
- printed = true;
- }
- pw.print(" Process "); pw.print(pname);
- pw.print(" uid "); pw.print(puid);
- pw.print(": first crashed ");
- TimeUtils.formatDuration(now - uids.valueAt(i).first, pw);
- pw.print(" ago; crashes since then: "); pw.println(uids.valueAt(i).second);
}
}
}
@@ -284,7 +305,7 @@
final int puid = uids.keyAt(i);
final ProcessRecord r = mService.getProcessNames().get(pname, puid);
if (dumpPackage != null && (r == null
- || !r.pkgList.containsKey(dumpPackage))) {
+ || !r.getPkgList().containsKey(dumpPackage))) {
continue;
}
if (!printed) {
@@ -349,33 +370,38 @@
}
}
- void resetProcessCrashTimeLocked(final String processName, final int uid) {
- mProcessCrashTimes.remove(processName, uid);
- mProcessCrashCounts.remove(processName, uid);
+ void resetProcessCrashTime(final String processName, final int uid) {
+ synchronized (mBadProcessLock) {
+ mProcessCrashTimes.remove(processName, uid);
+ mProcessCrashCounts.remove(processName, uid);
+ }
}
- void resetProcessCrashTimeLocked(boolean resetEntireUser, int appId, int userId) {
- final ArrayMap<String, SparseArray<Long>> pTimeMap = mProcessCrashTimes.getMap();
- for (int ip = pTimeMap.size() - 1; ip >= 0; ip--) {
- SparseArray<Long> ba = pTimeMap.valueAt(ip);
- resetProcessCrashMapLocked(ba, resetEntireUser, appId, userId);
- if (ba.size() == 0) {
- pTimeMap.removeAt(ip);
+ void resetProcessCrashTime(boolean resetEntireUser, int appId, int userId) {
+ synchronized (mBadProcessLock) {
+ final ArrayMap<String, SparseArray<Long>> pTimeMap = mProcessCrashTimes.getMap();
+ for (int ip = pTimeMap.size() - 1; ip >= 0; ip--) {
+ SparseArray<Long> ba = pTimeMap.valueAt(ip);
+ resetProcessCrashMapLBp(ba, resetEntireUser, appId, userId);
+ if (ba.size() == 0) {
+ pTimeMap.removeAt(ip);
+ }
}
- }
- final ArrayMap<String, SparseArray<Pair<Long, Integer>>> pCountMap =
- mProcessCrashCounts.getMap();
- for (int ip = pCountMap.size() - 1; ip >= 0; ip--) {
- SparseArray<Pair<Long, Integer>> ba = pCountMap.valueAt(ip);
- resetProcessCrashMapLocked(ba, resetEntireUser, appId, userId);
- if (ba.size() == 0) {
- pCountMap.removeAt(ip);
+ final ArrayMap<String, SparseArray<Pair<Long, Integer>>> pCountMap =
+ mProcessCrashCounts.getMap();
+ for (int ip = pCountMap.size() - 1; ip >= 0; ip--) {
+ SparseArray<Pair<Long, Integer>> ba = pCountMap.valueAt(ip);
+ resetProcessCrashMapLBp(ba, resetEntireUser, appId, userId);
+ if (ba.size() == 0) {
+ pCountMap.removeAt(ip);
+ }
}
}
}
- private void resetProcessCrashMapLocked(SparseArray<?> ba, boolean resetEntireUser,
+ @GuardedBy("mBadProcessLock")
+ private void resetProcessCrashMapLBp(SparseArray<?> ba, boolean resetEntireUser,
int appId, int userId) {
for (int i = ba.size() - 1; i >= 0; i--) {
boolean remove = false;
@@ -399,12 +425,14 @@
}
}
- void loadAppsNotReportingCrashesFromConfigLocked(String appsNotReportingCrashesConfig) {
+ void loadAppsNotReportingCrashesFromConfig(String appsNotReportingCrashesConfig) {
if (appsNotReportingCrashesConfig != null) {
final String[] split = appsNotReportingCrashesConfig.split(",");
if (split.length > 0) {
- mAppsNotReportingCrashes = new ArraySet<>();
- Collections.addAll(mAppsNotReportingCrashes, split);
+ synchronized (mBadProcessLock) {
+ mAppsNotReportingCrashes = new ArraySet<>();
+ Collections.addAll(mAppsNotReportingCrashes, split);
+ }
}
}
}
@@ -465,7 +493,7 @@
proc = p;
break;
}
- if (p.pkgList.containsKey(packageName)
+ if (p.getPkgList().containsKey(packageName)
&& (userId < 0 || p.userId == userId)) {
proc = p;
}
@@ -516,7 +544,7 @@
}
}
- void crashApplicationInner(ProcessRecord r, ApplicationErrorReport.CrashInfo crashInfo,
+ private void crashApplicationInner(ProcessRecord r, ApplicationErrorReport.CrashInfo crashInfo,
int callingPid, int callingUid) {
long timeMillis = System.currentTimeMillis();
String shortMsg = crashInfo.exceptionClassName;
@@ -599,44 +627,50 @@
if (res == AppErrorDialog.TIMEOUT || res == AppErrorDialog.CANCEL) {
res = AppErrorDialog.FORCE_QUIT;
}
- synchronized (mService) {
- if (res == AppErrorDialog.MUTE) {
- stopReportingCrashesLocked(r);
+ if (res == AppErrorDialog.MUTE) {
+ synchronized (mBadProcessLock) {
+ stopReportingCrashesLBp(r);
}
- if (res == AppErrorDialog.RESTART) {
+ }
+ if (res == AppErrorDialog.RESTART) {
+ synchronized (mService) {
mService.mProcessList.removeProcessLocked(r, false, true,
ApplicationExitInfo.REASON_CRASH, "crash");
- if (taskId != INVALID_TASK_ID) {
- try {
- mService.startActivityFromRecents(taskId,
- ActivityOptions.makeBasic().toBundle());
- } catch (IllegalArgumentException e) {
- // Hmm...that didn't work. Task should either be in recents or associated
- // with a stack.
- Slog.e(TAG, "Could not restart taskId=" + taskId, e);
- }
+ }
+ if (taskId != INVALID_TASK_ID) {
+ try {
+ mService.startActivityFromRecents(taskId,
+ ActivityOptions.makeBasic().toBundle());
+ } catch (IllegalArgumentException e) {
+ // Hmm...that didn't work. Task should either be in recents or associated
+ // with a stack.
+ Slog.e(TAG, "Could not restart taskId=" + taskId, e);
}
}
- if (res == AppErrorDialog.FORCE_QUIT) {
- final long orig = Binder.clearCallingIdentity();
- try {
- // Kill it with fire!
- mService.mAtmInternal.onHandleAppCrash(r.getWindowProcessController());
- if (!r.isPersistent()) {
+ }
+ if (res == AppErrorDialog.FORCE_QUIT) {
+ final long orig = Binder.clearCallingIdentity();
+ try {
+ // Kill it with fire!
+ mService.mAtmInternal.onHandleAppCrash(r.getWindowProcessController());
+ if (!r.isPersistent()) {
+ synchronized (mService) {
mService.mProcessList.removeProcessLocked(r, false, false,
ApplicationExitInfo.REASON_CRASH, "crash");
- mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
}
- } finally {
- Binder.restoreCallingIdentity(orig);
+ mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
}
+ } finally {
+ Binder.restoreCallingIdentity(orig);
}
- if (res == AppErrorDialog.APP_INFO) {
- appErrorIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- appErrorIntent.setData(Uri.parse("package:" + r.info.packageName));
- appErrorIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- }
- if (res == AppErrorDialog.FORCE_QUIT_AND_REPORT) {
+ }
+ if (res == AppErrorDialog.APP_INFO) {
+ appErrorIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+ appErrorIntent.setData(Uri.parse("package:" + r.info.packageName));
+ appErrorIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ }
+ if (res == AppErrorDialog.FORCE_QUIT_AND_REPORT) {
+ synchronized (mService) {
appErrorIntent = createAppErrorIntentLocked(r, timeMillis, crashInfo);
}
}
@@ -769,7 +803,7 @@
return report;
}
- boolean handleAppCrashLocked(ProcessRecord app, String reason,
+ private boolean handleAppCrashLocked(ProcessRecord app, String reason,
String shortMsg, String longMsg, String stackTrace, AppErrorDialog.Data data) {
final long now = SystemClock.uptimeMillis();
final boolean showBackground = Settings.Secure.getIntForUser(mContext.getContentResolver(),
@@ -783,109 +817,116 @@
Long crashTimePersistent;
boolean tryAgain = false;
- if (!app.isolated) {
- crashTime = mProcessCrashTimes.get(app.processName, app.uid);
- crashTimePersistent = mProcessCrashTimesPersistent.get(app.processName, app.uid);
- } else {
- crashTime = crashTimePersistent = null;
- }
-
- // Bump up the crash count of any services currently running in the proc.
- for (int i = app.numberOfRunningServices() - 1; i >= 0; i--) {
- // Any services running in the application need to be placed
- // back in the pending list.
- ServiceRecord sr = app.getRunningServiceAt(i);
- // If the service was restarted a while ago, then reset crash count, else increment it.
- if (now > sr.restartTime + ActivityManagerConstants.MIN_CRASH_INTERVAL) {
- sr.crashCount = 1;
+ synchronized (mBadProcessLock) {
+ if (!app.isolated) {
+ crashTime = mProcessCrashTimes.get(app.processName, app.uid);
+ crashTimePersistent = mProcessCrashTimesPersistent.get(app.processName, app.uid);
} else {
- sr.crashCount++;
+ crashTime = crashTimePersistent = null;
}
- // Allow restarting for started or bound foreground services that are crashing.
- // This includes wallpapers.
- if (sr.crashCount < mService.mConstants.BOUND_SERVICE_MAX_CRASH_RETRY
- && (sr.isForeground || procIsBoundForeground)) {
- tryAgain = true;
- }
- }
- final boolean quickCrash = crashTime != null
- && now < crashTime + ActivityManagerConstants.MIN_CRASH_INTERVAL;
- if (quickCrash || isProcOverCrashLimit(app, now)) {
- // The process either crashed again very quickly or has been crashing periodically in
- // the last few hours. If it was a bound foreground service, let's try to restart again
- // in a while, otherwise the process loses!
- Slog.w(TAG, "Process " + app.processName + " has crashed too many times, killing!"
- + " Reason: " + (quickCrash ? "crashed quickly" : "over process crash limit"));
- EventLog.writeEvent(EventLogTags.AM_PROCESS_CRASHED_TOO_MUCH,
- app.userId, app.processName, app.uid);
- mService.mAtmInternal.onHandleAppCrash(app.getWindowProcessController());
- if (!app.isPersistent()) {
- // We don't want to start this process again until the user
- // explicitly does so... but for persistent process, we really
- // need to keep it running. If a persistent process is actually
- // repeatedly crashing, then badness for everyone.
- EventLog.writeEvent(EventLogTags.AM_PROC_BAD, app.userId, app.uid,
- app.processName);
- if (!app.isolated) {
- // XXX We don't have a way to mark isolated processes
- // as bad, since they don't have a persistent identity.
- markBadProcess(app.processName, app.uid,
- new BadProcessInfo(now, shortMsg, longMsg, stackTrace));
- mProcessCrashTimes.remove(app.processName, app.uid);
- mProcessCrashCounts.remove(app.processName, app.uid);
+ // Bump up the crash count of any services currently running in the proc.
+ for (int i = app.numberOfRunningServices() - 1; i >= 0; i--) {
+ // Any services running in the application need to be placed
+ // back in the pending list.
+ ServiceRecord sr = app.getRunningServiceAt(i);
+ // If the service was restarted a while ago, then reset crash count,
+ // else increment it.
+ if (now > sr.restartTime + ActivityManagerConstants.MIN_CRASH_INTERVAL) {
+ sr.crashCount = 1;
+ } else {
+ sr.crashCount++;
}
- app.bad = true;
- app.removed = true;
- // Don't let services in this process be restarted and potentially
- // annoy the user repeatedly. Unless it is persistent, since those
- // processes run critical code.
- mService.mProcessList.removeProcessLocked(app, false, tryAgain,
- ApplicationExitInfo.REASON_CRASH, "crash");
+ // Allow restarting for started or bound foreground services that are crashing.
+ // This includes wallpapers.
+ if (sr.crashCount < mService.mConstants.BOUND_SERVICE_MAX_CRASH_RETRY
+ && (sr.isForeground || procIsBoundForeground)) {
+ tryAgain = true;
+ }
+ }
+
+ final boolean quickCrash = crashTime != null
+ && now < crashTime + ActivityManagerConstants.MIN_CRASH_INTERVAL;
+ if (quickCrash || isProcOverCrashLimitLBp(app, now)) {
+ // The process either crashed again very quickly or has been crashing periodically
+ // in the last few hours. If it was a bound foreground service, let's try to
+ // restart again in a while, otherwise the process loses!
+ Slog.w(TAG, "Process " + app.processName + " has crashed too many times, killing!"
+ + " Reason: "
+ + (quickCrash ? "crashed quickly" : "over process crash limit"));
+ EventLog.writeEvent(EventLogTags.AM_PROCESS_CRASHED_TOO_MUCH,
+ app.userId, app.processName, app.uid);
+ mService.mAtmInternal.onHandleAppCrash(app.getWindowProcessController());
+ if (!app.isPersistent()) {
+ // We don't want to start this process again until the user
+ // explicitly does so... but for persistent process, we really
+ // need to keep it running. If a persistent process is actually
+ // repeatedly crashing, then badness for everyone.
+ EventLog.writeEvent(EventLogTags.AM_PROC_BAD, app.userId, app.uid,
+ app.processName);
+ if (!app.isolated) {
+ // XXX We don't have a way to mark isolated processes
+ // as bad, since they don't have a persistent identity.
+ markBadProcess(app.processName, app.uid,
+ new BadProcessInfo(now, shortMsg, longMsg, stackTrace));
+ mProcessCrashTimes.remove(app.processName, app.uid);
+ mProcessCrashCounts.remove(app.processName, app.uid);
+ }
+ app.bad = true;
+ app.removed = true;
+ // Don't let services in this process be restarted and potentially
+ // annoy the user repeatedly. Unless it is persistent, since those
+ // processes run critical code.
+ mService.mProcessList.removeProcessLocked(app, false, tryAgain,
+ ApplicationExitInfo.REASON_CRASH, "crash");
+ mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
+ if (!showBackground) {
+ return false;
+ }
+ }
mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
- if (!showBackground) {
- return false;
+ } else {
+ final int affectedTaskId = mService.mAtmInternal.finishTopCrashedActivities(
+ app.getWindowProcessController(), reason);
+ if (data != null) {
+ data.taskId = affectedTaskId;
+ }
+ if (data != null && crashTimePersistent != null
+ && now < crashTimePersistent
+ + ActivityManagerConstants.MIN_CRASH_INTERVAL) {
+ data.repeating = true;
}
}
- mService.mAtmInternal.resumeTopActivities(false /* scheduleIdle */);
- } else {
- final int affectedTaskId = mService.mAtmInternal.finishTopCrashedActivities(
- app.getWindowProcessController(), reason);
- if (data != null) {
- data.taskId = affectedTaskId;
+
+ if (data != null && tryAgain) {
+ data.isRestartableForService = true;
}
- if (data != null && crashTimePersistent != null
- && now < crashTimePersistent + ActivityManagerConstants.MIN_CRASH_INTERVAL) {
- data.repeating = true;
+
+ // If the crashing process is what we consider to be the "home process" and it has been
+ // replaced by a third-party app, clear the package preferred activities from packages
+ // with a home activity running in the process to prevent a repeatedly crashing app
+ // from blocking the user to manually clear the list.
+ final WindowProcessController proc = app.getWindowProcessController();
+ if (proc.isHomeProcess() && proc.hasActivities()
+ && (app.info.flags & FLAG_SYSTEM) == 0) {
+ proc.clearPackagePreferredForHomeActivities();
}
- }
- if (data != null && tryAgain) {
- data.isRestartableForService = true;
- }
-
- // If the crashing process is what we consider to be the "home process" and it has been
- // replaced by a third-party app, clear the package preferred activities from packages
- // with a home activity running in the process to prevent a repeatedly crashing app
- // from blocking the user to manually clear the list.
- final WindowProcessController proc = app.getWindowProcessController();
- if (proc.isHomeProcess() && proc.hasActivities() && (app.info.flags & FLAG_SYSTEM) == 0) {
- proc.clearPackagePreferredForHomeActivities();
- }
-
- if (!app.isolated) {
- // XXX Can't keep track of crash times for isolated processes,
- // because they don't have a persistent identity.
- mProcessCrashTimes.put(app.processName, app.uid, now);
- mProcessCrashTimesPersistent.put(app.processName, app.uid, now);
- updateProcessCrashCount(app.processName, app.uid, now);
+ if (!app.isolated) {
+ // XXX Can't keep track of crash times for isolated processes,
+ // because they don't have a persistent identity.
+ mProcessCrashTimes.put(app.processName, app.uid, now);
+ mProcessCrashTimesPersistent.put(app.processName, app.uid, now);
+ updateProcessCrashCountLBp(app.processName, app.uid, now);
+ }
}
if (app.crashHandler != null) mService.mHandler.post(app.crashHandler);
return true;
}
- private void updateProcessCrashCount(String processName, int uid, long now) {
+ @GuardedBy("mBadProcessLock")
+ private void updateProcessCrashCountLBp(String processName, int uid, long now) {
Pair<Long, Integer> count = mProcessCrashCounts.get(processName, uid);
if (count == null || (count.first + PROCESS_CRASH_COUNT_RESET_INTERVAL) < now) {
count = new Pair<>(now, 1);
@@ -895,7 +936,8 @@
mProcessCrashCounts.put(processName, uid, count);
}
- private boolean isProcOverCrashLimit(ProcessRecord app, long now) {
+ @GuardedBy("mBadProcessLock")
+ private boolean isProcOverCrashLimitLBp(ProcessRecord app, long now) {
final Pair<Long, Integer> crashCount = mProcessCrashCounts.get(app.processName, app.uid);
return !app.isolated && crashCount != null
&& now < (crashCount.first + PROCESS_CRASH_COUNT_RESET_INTERVAL)
@@ -938,41 +980,44 @@
return;
}
Long crashShowErrorTime = null;
- if (!proc.isolated) {
- crashShowErrorTime = mProcessCrashShowDialogTimes.get(proc.processName,
- proc.uid);
- }
- final boolean showFirstCrash = Settings.Global.getInt(
- mContext.getContentResolver(),
- Settings.Global.SHOW_FIRST_CRASH_DIALOG, 0) != 0;
- final boolean showFirstCrashDevOption = Settings.Secure.getIntForUser(
- mContext.getContentResolver(),
- Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
- 0,
- mService.mUserController.getCurrentUserId()) != 0;
- final boolean crashSilenced = mAppsNotReportingCrashes != null &&
- mAppsNotReportingCrashes.contains(proc.info.packageName);
- final long now = SystemClock.uptimeMillis();
- final boolean shouldThottle = crashShowErrorTime != null
- && now < crashShowErrorTime + ActivityManagerConstants.MIN_CRASH_INTERVAL;
- if ((mService.mAtmInternal.canShowErrorDialogs() || showBackground)
- && !crashSilenced && !shouldThottle
- && (showFirstCrash || showFirstCrashDevOption || data.repeating)) {
- proc.getDialogController().showCrashDialogs(data);
+ synchronized (mBadProcessLock) {
if (!proc.isolated) {
- mProcessCrashShowDialogTimes.put(proc.processName, proc.uid, now);
+ crashShowErrorTime = mProcessCrashShowDialogTimes.get(proc.processName,
+ proc.uid);
}
- } else {
- // The device is asleep, so just pretend that the user
- // saw a crash dialog and hit "force quit".
- if (res != null) {
- res.set(AppErrorDialog.CANT_SHOW);
+ final boolean showFirstCrash = Settings.Global.getInt(
+ mContext.getContentResolver(),
+ Settings.Global.SHOW_FIRST_CRASH_DIALOG, 0) != 0;
+ final boolean showFirstCrashDevOption = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(),
+ Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
+ 0,
+ mService.mUserController.getCurrentUserId()) != 0;
+ final boolean crashSilenced = mAppsNotReportingCrashes != null
+ && mAppsNotReportingCrashes.contains(proc.info.packageName);
+ final long now = SystemClock.uptimeMillis();
+ final boolean shouldThottle = crashShowErrorTime != null
+ && now < crashShowErrorTime + ActivityManagerConstants.MIN_CRASH_INTERVAL;
+ if ((mService.mAtmInternal.canShowErrorDialogs() || showBackground)
+ && !crashSilenced && !shouldThottle
+ && (showFirstCrash || showFirstCrashDevOption || data.repeating)) {
+ proc.getDialogController().showCrashDialogs(data);
+ if (!proc.isolated) {
+ mProcessCrashShowDialogTimes.put(proc.processName, proc.uid, now);
+ }
+ } else {
+ // The device is asleep, so just pretend that the user
+ // saw a crash dialog and hit "force quit".
+ if (res != null) {
+ res.set(AppErrorDialog.CANT_SHOW);
+ }
}
}
}
}
- private void stopReportingCrashesLocked(ProcessRecord proc) {
+ @GuardedBy("mBadProcessLock")
+ private void stopReportingCrashesLBp(ProcessRecord proc) {
if (mAppsNotReportingCrashes == null) {
mAppsNotReportingCrashes = new ArraySet<>();
}
diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java
index 20cad18..48aa8be 100644
--- a/services/core/java/com/android/server/am/AppExitInfoTracker.java
+++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java
@@ -79,6 +79,7 @@
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
@@ -159,8 +160,7 @@
* persistent storage.
*/
@VisibleForTesting
- @GuardedBy("mLock")
- boolean mAppExitInfoLoaded = false;
+ AtomicBoolean mAppExitInfoLoaded = new AtomicBoolean();
/**
* Temporary list being used to filter/sort intermediate results in {@link #getExitInfo}.
@@ -273,51 +273,45 @@
return;
}
- synchronized (mLock) {
- if (!mAppExitInfoLoaded) {
- return;
- }
- mKillHandler.obtainMessage(KillHandler.MSG_PROC_DIED, obtainRawRecordLocked(app))
- .sendToTarget();
+ if (!mAppExitInfoLoaded.get()) {
+ return;
}
+ mKillHandler.obtainMessage(KillHandler.MSG_PROC_DIED, obtainRawRecord(app))
+ .sendToTarget();
}
void scheduleNoteAppKill(final ProcessRecord app, final @Reason int reason,
final @SubReason int subReason, final String msg) {
- synchronized (mLock) {
- if (!mAppExitInfoLoaded) {
- return;
- }
- if (app == null || app.info == null) {
- return;
- }
-
- ApplicationExitInfo raw = obtainRawRecordLocked(app);
- raw.setReason(reason);
- raw.setSubReason(subReason);
- raw.setDescription(msg);
- mKillHandler.obtainMessage(KillHandler.MSG_APP_KILL, raw).sendToTarget();
+ if (!mAppExitInfoLoaded.get()) {
+ return;
}
+ if (app == null || app.info == null) {
+ return;
+ }
+
+ ApplicationExitInfo raw = obtainRawRecord(app);
+ raw.setReason(reason);
+ raw.setSubReason(subReason);
+ raw.setDescription(msg);
+ mKillHandler.obtainMessage(KillHandler.MSG_APP_KILL, raw).sendToTarget();
}
void scheduleNoteAppKill(final int pid, final int uid, final @Reason int reason,
final @SubReason int subReason, final String msg) {
- synchronized (mLock) {
- if (!mAppExitInfoLoaded) {
- return;
+ if (!mAppExitInfoLoaded.get()) {
+ return;
+ }
+ ProcessRecord app;
+ synchronized (mService.mPidsSelfLocked) {
+ app = mService.mPidsSelfLocked.get(pid);
+ }
+ if (app == null) {
+ if (DEBUG_PROCESSES) {
+ Slog.w(TAG, "Skipping saving the kill reason for pid " + pid
+ + "(uid=" + uid + ") since its process record is not found");
}
- ProcessRecord app;
- synchronized (mService.mPidsSelfLocked) {
- app = mService.mPidsSelfLocked.get(pid);
- }
- if (app == null) {
- if (DEBUG_PROCESSES) {
- Slog.w(TAG, "Skipping saving the kill reason for pid " + pid
- + "(uid=" + uid + ") since its process record is not found");
- }
- } else {
- scheduleNoteAppKill(app, reason, subReason, msg);
- }
+ } else {
+ scheduleNoteAppKill(app, reason, subReason, msg);
}
}
@@ -414,7 +408,7 @@
@GuardedBy("mLock")
private ApplicationExitInfo addExitInfoLocked(ApplicationExitInfo raw) {
- if (!mAppExitInfoLoaded) {
+ if (!mAppExitInfoLoaded.get()) {
Slog.w(TAG, "Skipping saving the exit info due to ongoing loading from storage");
return null;
}
@@ -627,9 +621,7 @@
@VisibleForTesting
void loadExistingProcessExitInfo() {
if (!mProcExitInfoFile.canRead()) {
- synchronized (mLock) {
- mAppExitInfoLoaded = true;
- }
+ mAppExitInfoLoaded.set(true);
return;
}
@@ -665,7 +657,7 @@
}
synchronized (mLock) {
pruneAnrTracesIfNecessaryLocked();
- mAppExitInfoLoaded = true;
+ mAppExitInfoLoaded.set(true);
}
}
@@ -834,7 +826,7 @@
container.addExitInfoLocked(info);
}
- @GuardedBy("mLocked")
+ @GuardedBy("mLock")
private void forEachPackageLocked(
BiFunction<String, SparseArray<AppExitInfoContainer>, Integer> callback) {
if (callback != null) {
@@ -859,7 +851,7 @@
}
}
- @GuardedBy("mLocked")
+ @GuardedBy("mLock")
private void removePackageLocked(String packageName, int uid, boolean removeUid, int userId) {
if (removeUid) {
mActiveAppStateSummary.remove(uid);
@@ -896,7 +888,7 @@
}
}
- @GuardedBy("mLocked")
+ @GuardedBy("mLock")
private void removeByUserIdLocked(final int userId) {
if (userId == UserHandle.USER_ALL) {
mData.getMap().clear();
@@ -922,35 +914,36 @@
}
@VisibleForTesting
- @GuardedBy("mLock")
- ApplicationExitInfo obtainRawRecordLocked(ProcessRecord app) {
+ ApplicationExitInfo obtainRawRecord(ProcessRecord app) {
ApplicationExitInfo info = mRawRecordsPool.acquire();
if (info == null) {
info = new ApplicationExitInfo();
}
- final int definingUid = app.hostingRecord != null ? app.hostingRecord.getDefiningUid() : 0;
- info.setPid(app.pid);
- info.setRealUid(app.uid);
- info.setPackageUid(app.info.uid);
- info.setDefiningUid(definingUid > 0 ? definingUid : app.info.uid);
- info.setProcessName(app.processName);
- info.setConnectionGroup(app.connectionGroup);
- info.setPackageName(app.info.packageName);
- info.setPackageList(app.getPackageList());
- info.setReason(ApplicationExitInfo.REASON_UNKNOWN);
- info.setStatus(0);
- info.setImportance(procStateToImportance(app.setProcState));
- info.setPss(app.lastPss);
- info.setRss(app.mLastRss);
- info.setTimestamp(System.currentTimeMillis());
+ synchronized (mService) {
+ final int definingUid = app.hostingRecord != null
+ ? app.hostingRecord.getDefiningUid() : 0;
+ info.setPid(app.pid);
+ info.setRealUid(app.uid);
+ info.setPackageUid(app.info.uid);
+ info.setDefiningUid(definingUid > 0 ? definingUid : app.info.uid);
+ info.setProcessName(app.processName);
+ info.setConnectionGroup(app.connectionGroup);
+ info.setPackageName(app.info.packageName);
+ info.setPackageList(app.getPackageList());
+ info.setReason(ApplicationExitInfo.REASON_UNKNOWN);
+ info.setStatus(0);
+ info.setImportance(procStateToImportance(app.setProcState));
+ info.setPss(app.mProfile.getLastPss());
+ info.setRss(app.mProfile.getLastRss());
+ info.setTimestamp(System.currentTimeMillis());
+ }
return info;
}
@VisibleForTesting
- @GuardedBy("mLock")
- void recycleRawRecordLocked(ApplicationExitInfo info) {
+ void recycleRawRecord(ApplicationExitInfo info) {
info.setProcessName(null);
info.setDescription(null);
info.setPackageList(null);
@@ -1549,16 +1542,16 @@
ApplicationExitInfo raw = (ApplicationExitInfo) msg.obj;
synchronized (mLock) {
handleNoteProcessDiedLocked(raw);
- recycleRawRecordLocked(raw);
}
+ recycleRawRecord(raw);
}
break;
case MSG_APP_KILL: {
ApplicationExitInfo raw = (ApplicationExitInfo) msg.obj;
synchronized (mLock) {
handleNoteAppKillLocked(raw);
- recycleRawRecordLocked(raw);
}
+ recycleRawRecord(raw);
}
break;
default:
diff --git a/services/core/java/com/android/server/am/AppNotRespondingDialog.java b/services/core/java/com/android/server/am/AppNotRespondingDialog.java
index dac5325..96e6f6e 100644
--- a/services/core/java/com/android/server/am/AppNotRespondingDialog.java
+++ b/services/core/java/com/android/server/am/AppNotRespondingDialog.java
@@ -63,8 +63,8 @@
? data.aInfo.loadLabel(context.getPackageManager())
: null;
CharSequence name2 = null;
- if ((mProc.pkgList.size() == 1) &&
- (name2=context.getPackageManager().getApplicationLabel(mProc.info)) != null) {
+ if ((mProc.getPkgList().size() == 1)
+ && (name2 = context.getPackageManager().getApplicationLabel(mProc.info)) != null) {
if (name1 != null) {
resid = com.android.internal.R.string.anr_activity_application;
} else {
diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java
index cace260..3df058c 100644
--- a/services/core/java/com/android/server/am/AppProfiler.java
+++ b/services/core/java/com/android/server/am/AppProfiler.java
@@ -29,8 +29,22 @@
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PSS;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
+import static com.android.server.am.ActivityManagerService.DUMP_MEM_OOM_ADJ;
+import static com.android.server.am.ActivityManagerService.DUMP_MEM_OOM_LABEL;
+import static com.android.server.am.ActivityManagerService.GC_BACKGROUND_PROCESSES_MSG;
+import static com.android.server.am.ActivityManagerService.KSM_SHARED;
+import static com.android.server.am.ActivityManagerService.KSM_SHARING;
+import static com.android.server.am.ActivityManagerService.KSM_UNSHARED;
+import static com.android.server.am.ActivityManagerService.KSM_VOLATILE;
+import static com.android.server.am.ActivityManagerService.REPORT_MEM_USAGE_MSG;
+import static com.android.server.am.ActivityManagerService.appendBasicMemEntry;
+import static com.android.server.am.ActivityManagerService.appendMemBucket;
+import static com.android.server.am.ActivityManagerService.appendMemInfo;
+import static com.android.server.am.ActivityManagerService.getKsmInfo;
+import static com.android.server.am.ActivityManagerService.stringifyKBSize;
import static com.android.server.am.LowMemDetector.ADJ_MEM_FACTOR_NOTHING;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;
+import static com.android.server.wm.ActivityTaskManagerService.DUMP_ACTIVITIES_CMD;
import android.annotation.BroadcastBehavior;
import android.annotation.NonNull;
@@ -75,16 +89,19 @@
import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.ProcessCpuTracker;
import com.android.internal.util.DumpUtils;
+import com.android.internal.util.FastPrintWriter;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.MemInfoReader;
import com.android.server.am.LowMemDetector.MemFactor;
-import com.android.server.am.ProcessList.ProcStateMemTracker;
import com.android.server.utils.PriorityDump;
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -162,8 +179,8 @@
/**
* Processes we want to collect PSS data from.
*/
- @GuardedBy("mService")
- private final ArrayList<ProcessRecord> mPendingPssProcesses = new ArrayList<ProcessRecord>();
+ @GuardedBy("mProfilerLock")
+ private final ArrayList<ProcessProfileRecord> mPendingPssProfiles = new ArrayList<>();
/**
* Depth of overlapping activity-start PSS deferral notes
@@ -173,14 +190,14 @@
/**
* Last time we requested PSS data of all processes.
*/
- @GuardedBy("mService")
+ @GuardedBy("mProfilerLock")
private long mLastFullPssTime = SystemClock.uptimeMillis();
/**
* If set, the next time we collect PSS data we should do a full collection
* with data from native processes and the kernel.
*/
- @GuardedBy("mService")
+ @GuardedBy("mProfilerLock")
private boolean mFullPssPending = false;
/**
@@ -188,8 +205,7 @@
* much more rapidly to try to collect better data when the tests are rapidly
* running through apps.
*/
- @GuardedBy("mService")
- private boolean mTestPssMode = false;
+ private volatile boolean mTestPssMode = false;
@GuardedBy("mService")
private final LowMemDetector mLowMemDetector;
@@ -233,21 +249,53 @@
private long mLowRamStartTime = 0;
/**
+ * Last time we report a memory usage.
+ */
+ @GuardedBy("mService")
+ private long mLastMemUsageReportTime = 0;
+
+ /**
+ * List of processes that should gc as soon as things are idle.
+ */
+ @GuardedBy("mProfilerLock")
+ private final ArrayList<ProcessRecord> mProcessesToGc = new ArrayList<>();
+
+ /**
* Stores a map of process name -> agent string. When a process is started and mAgentAppMap
* is not null, this map is checked and the mapped agent installed during bind-time. Note:
* A non-null agent in mProfileInfo overrides this.
*/
+ @GuardedBy("mProfilerLock")
private @Nullable Map<String, String> mAppAgentMap = null;
+ @GuardedBy("mProfilerLock")
private int mProfileType = 0;
+
+ @GuardedBy("mProfilerLock")
+ private final ProfileData mProfileData = new ProfileData();
+
+ @GuardedBy("mProfilerLock")
private final ProcessMap<Pair<Long, String>> mMemWatchProcesses = new ProcessMap<>();
+
+ @GuardedBy("mProfilerLock")
private String mMemWatchDumpProcName;
+
+ @GuardedBy("mProfilerLock")
private Uri mMemWatchDumpUri;
+
+ @GuardedBy("mProfilerLock")
private int mMemWatchDumpPid;
+
+ @GuardedBy("mProfilerLock")
private int mMemWatchDumpUid;
+
+ @GuardedBy("mProfilerLock")
private boolean mMemWatchIsUserInitiated;
+ @GuardedBy("mService")
boolean mHasHomeProcess;
+
+ @GuardedBy("mService")
boolean mHasPreviousProcess;
/**
@@ -263,8 +311,7 @@
private final AtomicBoolean mProcessCpuMutexFree = new AtomicBoolean(true);
private final CountDownLatch mProcessCpuInitLatch = new CountDownLatch(1);
- private long mLastWriteTime = 0;
- private final ProfileData mProfileData = new ProfileData();
+ private volatile long mLastWriteTime = 0;
/**
* Runtime CPU use collection thread. This object's lock is used to
@@ -276,6 +323,15 @@
private final Handler mBgHandler;
/**
+ * The lock to guard some of the profiling data here and {@link ProcessProfileRecord}.
+ *
+ * <p>
+ * The function suffix with this lock would be "-LPf" (Locked with Profiler lock).
+ * </p>
+ */
+ final Object mProfilerLock = new Object();
+
+ /**
* Observe DeviceConfig changes to the PSS calculation interval
*/
private final DeviceConfig.OnPropertiesChangedListener mPssDelayConfigListener =
@@ -359,7 +415,7 @@
private void collectPssInBackground() {
long start = SystemClock.uptimeMillis();
MemInfoReader memInfo = null;
- synchronized (mService) {
+ synchronized (mProfilerLock) {
if (mFullPssPending) {
mFullPssPending = false;
memInfo = new MemInfoReader();
@@ -404,65 +460,67 @@
int num = 0;
long[] tmp = new long[3];
do {
- ProcessRecord proc;
+ ProcessProfileRecord profile;
int procState;
int statType;
int pid = -1;
long lastPssTime;
- synchronized (mService) {
- if (mPendingPssProcesses.size() <= 0) {
+ synchronized (mProfilerLock) {
+ if (mPendingPssProfiles.size() <= 0) {
if (mTestPssMode || DEBUG_PSS) {
Slog.d(TAG_PSS,
"Collected pss of " + num + " processes in "
+ (SystemClock.uptimeMillis() - start) + "ms");
}
- mPendingPssProcesses.clear();
+ mPendingPssProfiles.clear();
return;
}
- proc = mPendingPssProcesses.remove(0);
- procState = proc.pssProcState;
- statType = proc.pssStatType;
- lastPssTime = proc.lastPssTime;
+ profile = mPendingPssProfiles.remove(0);
+ procState = profile.getPssProcState();
+ statType = profile.getPssStatType();
+ lastPssTime = profile.getLastPssTime();
long now = SystemClock.uptimeMillis();
- if (proc.thread != null && procState == proc.setProcState
+ if (profile.getThread() != null && procState == profile.getSetProcState()
&& (lastPssTime + ProcessList.PSS_SAFE_TIME_FROM_STATE_CHANGE) < now) {
- pid = proc.pid;
+ pid = profile.getPid();
} else {
- abortNextPssTime(proc.procStateMemTracker);
+ profile.abortNextPssTime();
if (DEBUG_PSS) {
Slog.d(TAG_PSS, "Skipped pss collection of " + pid
+ ": still need "
+ (lastPssTime + ProcessList.PSS_SAFE_TIME_FROM_STATE_CHANGE - now)
+ "ms until safe");
}
- proc = null;
+ profile = null;
pid = 0;
}
}
- if (proc != null) {
+ if (profile != null) {
long startTime = SystemClock.currentThreadTimeMillis();
// skip background PSS calculation of apps that are capturing
// camera imagery
- final boolean usingCamera = mService.isCameraActiveForUid(proc.uid);
+ final boolean usingCamera = mService.isCameraActiveForUid(profile.mApp.uid);
long pss = usingCamera ? 0 : Debug.getPss(pid, tmp, null);
long endTime = SystemClock.currentThreadTimeMillis();
- synchronized (mService) {
- if (pss != 0 && proc.thread != null && proc.setProcState == procState
- && proc.pid == pid && proc.lastPssTime == lastPssTime) {
+ synchronized (mProfilerLock) {
+ if (pss != 0 && profile.getThread() != null
+ && profile.getSetProcState() == procState
+ && profile.getPid() == pid && profile.getLastPssTime() == lastPssTime) {
num++;
- commitNextPssTime(proc.procStateMemTracker);
- recordPssSampleLocked(proc, procState, pss, tmp[0], tmp[1], tmp[2],
+ profile.commitNextPssTime();
+ recordPssSampleLPf(profile, procState, pss, tmp[0], tmp[1], tmp[2],
statType, endTime - startTime, SystemClock.uptimeMillis());
} else {
- abortNextPssTime(proc.procStateMemTracker);
+ profile.abortNextPssTime();
if (DEBUG_PSS) {
Slog.d(TAG_PSS, "Skipped pss collection of " + pid
- + ": " + (proc.thread == null ? "NO_THREAD " : "")
+ + ": " + (profile.getThread() == null ? "NO_THREAD " : "")
+ (usingCamera ? "CAMERA " : "")
- + (proc.pid != pid ? "PID_CHANGED " : "")
+ + (profile.getPid() != pid ? "PID_CHANGED " : "")
+ " initState=" + procState + " curState="
- + proc.setProcState + " "
- + (proc.lastPssTime != lastPssTime ? "TIME_CHANGED" : ""));
+ + profile.getSetProcState() + " "
+ + (profile.getLastPssTime() != lastPssTime
+ ? "TIME_CHANGED" : ""));
}
}
}
@@ -470,73 +528,61 @@
} while (true);
}
- private static void commitNextPssTime(ProcStateMemTracker tracker) {
- if (tracker.mPendingMemState >= 0) {
- tracker.mHighestMem[tracker.mPendingMemState] = tracker.mPendingHighestMemState;
- tracker.mScalingFactor[tracker.mPendingMemState] = tracker.mPendingScalingFactor;
- tracker.mTotalHighestMem = tracker.mPendingHighestMemState;
- tracker.mPendingMemState = -1;
- }
- }
-
- private static void abortNextPssTime(ProcStateMemTracker tracker) {
- tracker.mPendingMemState = -1;
- }
-
- @GuardedBy("mService")
- void updateNextPssTimeLocked(int procState, ProcessRecord app, long now, boolean forceUpdate) {
+ @GuardedBy("mProfilerLock")
+ void updateNextPssTimeLPf(int procState, ProcessProfileRecord profile, long now,
+ boolean forceUpdate) {
if (!forceUpdate) {
- if (now <= app.nextPssTime
- && now <= Math.max(app.lastPssTime + ProcessList.PSS_MAX_INTERVAL,
- app.lastStateTime + ProcessList.minTimeFromStateChange(mTestPssMode))) {
+ if (now <= profile.getNextPssTime() && now <= Math.max(profile.getLastPssTime()
+ + ProcessList.PSS_MAX_INTERVAL, profile.getLastStateTime()
+ + ProcessList.minTimeFromStateChange(mTestPssMode))) {
// update is not due, ignore it.
return;
}
- if (!requestPssLocked(app, app.setProcState)) {
+ if (!requestPssLPf(profile, procState)) {
return;
}
}
- app.nextPssTime = ProcessList.computeNextPssTime(procState, app.procStateMemTracker,
- mTestPssMode, mService.mAtmInternal.isSleeping(), now);
+ profile.setNextPssTime(profile.computeNextPssTime(procState,
+ mTestPssMode, mService.mAtmInternal.isSleeping(), now));
}
/**
* Record new PSS sample for a process.
*/
- @GuardedBy("mService")
- private void recordPssSampleLocked(ProcessRecord proc, int procState, long pss, long uss,
+ @GuardedBy("mProfilerLock")
+ private void recordPssSampleLPf(ProcessProfileRecord profile, int procState, long pss, long uss,
long swapPss, long rss, int statType, long pssDuration, long now) {
- EventLogTags.writeAmPss(proc.pid, proc.uid, proc.processName, pss * 1024, uss * 1024,
+ final ProcessRecord proc = profile.mApp;
+ EventLogTags.writeAmPss(
+ profile.getPid(), proc.uid, proc.processName, pss * 1024, uss * 1024,
swapPss * 1024, rss * 1024, statType, procState, pssDuration);
- proc.lastPssTime = now;
- synchronized (mService.mProcessStats.mLock) {
- proc.baseProcessTracker.addPss(
- pss, uss, rss, true, statType, pssDuration, proc.pkgList.mPkgList);
- }
- for (int ipkg = proc.pkgList.mPkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
+ profile.setLastPssTime(now);
+ profile.addPss(pss, uss, rss, true, statType, pssDuration);
+ proc.getPkgList().forEachPackageProcessStats(holder -> {
FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,
proc.info.uid,
holder.state.getName(),
holder.state.getPackage(),
- pss, uss, rss, statType, pssDuration,
+ pss, uss, rss,
+ statType, pssDuration,
holder.appVersion);
- }
+ });
if (DEBUG_PSS) {
Slog.d(TAG_PSS,
- "pss of " + proc.toShortString() + ": " + pss + " lastPss=" + proc.lastPss
+ "pss of " + proc.toShortString() + ": " + pss
+ + " lastPss=" + profile.getLastPss()
+ " state=" + ProcessList.makeProcStateString(procState));
}
- if (proc.initialIdlePss == 0) {
- proc.initialIdlePss = pss;
+ if (profile.getInitialIdlePss() == 0) {
+ profile.setInitialIdlePss(pss);
}
- proc.lastPss = pss;
- proc.lastSwapPss = swapPss;
+ profile.setLastPss(pss);
+ profile.setLastSwapPss(swapPss);
if (procState >= ActivityManager.PROCESS_STATE_HOME) {
- proc.lastCachedPss = pss;
- proc.lastCachedSwapPss = swapPss;
+ profile.setLastCachedPss(pss);
+ profile.setLastCachedSwapPss(swapPss);
}
- proc.mLastRss = rss;
+ profile.setLastRss(rss);
final SparseArray<Pair<Long, String>> watchUids =
mMemWatchProcesses.getMap().get(proc.processName);
@@ -551,7 +597,8 @@
}
}
if (check != null) {
- if ((pss * 1024) >= check && proc.thread != null && mMemWatchDumpProcName == null) {
+ if ((pss * 1024) >= check && profile.getThread() != null
+ && mMemWatchDumpProcName == null) {
boolean isDebuggable = Build.IS_DEBUGGABLE;
if (!isDebuggable) {
if ((proc.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
@@ -560,7 +607,7 @@
}
if (isDebuggable) {
Slog.w(TAG, "Process " + proc + " exceeded pss limit " + check + "; reporting");
- startHeapDumpLocked(proc, false);
+ startHeapDumpLPf(profile, false);
} else {
Slog.w(TAG, "Process " + proc + " exceeded pss limit " + check
+ ", but debugging not enabled");
@@ -570,12 +617,13 @@
}
private final class RecordPssRunnable implements Runnable {
- private final ProcessRecord mProc;
+ private final ProcessProfileRecord mProfile;
private final Uri mDumpUri;
private final ContentResolver mContentResolver;
- RecordPssRunnable(ProcessRecord proc, Uri dumpUri, ContentResolver contentResolver) {
- mProc = proc;
+ RecordPssRunnable(ProcessProfileRecord profile, Uri dumpUri,
+ ContentResolver contentResolver) {
+ mProfile = profile;
mDumpUri = dumpUri;
mContentResolver = contentResolver;
}
@@ -583,12 +631,12 @@
@Override
public void run() {
try (ParcelFileDescriptor fd = mContentResolver.openFileDescriptor(mDumpUri, "rw")) {
- IApplicationThread thread = mProc.thread;
+ IApplicationThread thread = mProfile.getThread();
if (thread != null) {
try {
if (DEBUG_PSS) {
Slog.d(TAG_PSS, "Requesting dump heap from "
- + mProc + " to " + mDumpUri.getPath());
+ + mProfile.mApp + " to " + mDumpUri.getPath());
}
thread.dumpHeap(/* managed= */ true,
/* mallocInfo= */ false, /* runGc= */ false,
@@ -601,16 +649,17 @@
Slog.e(TAG, "Failed to dump heap", e);
// Need to clear the heap dump variables, otherwise no further heap dumps will be
// attempted.
- abortHeapDump(mProc.processName);
+ abortHeapDump(mProfile.mApp.processName);
}
}
}
- @GuardedBy("mService")
- void startHeapDumpLocked(ProcessRecord proc, boolean isUserInitiated) {
+ @GuardedBy("mProfilerLock")
+ void startHeapDumpLPf(ProcessProfileRecord profile, boolean isUserInitiated) {
+ final ProcessRecord proc = profile.mApp;
mMemWatchDumpProcName = proc.processName;
mMemWatchDumpUri = makeHeapDumpUri(proc.processName);
- mMemWatchDumpPid = proc.pid;
+ mMemWatchDumpPid = profile.getPid();
mMemWatchDumpUid = proc.uid;
mMemWatchIsUserInitiated = isUserInitiated;
Context ctx;
@@ -621,11 +670,11 @@
throw new RuntimeException("android package not found.");
}
BackgroundThread.getHandler().post(
- new RecordPssRunnable(proc, mMemWatchDumpUri, ctx.getContentResolver()));
+ new RecordPssRunnable(profile, mMemWatchDumpUri, ctx.getContentResolver()));
}
void dumpHeapFinished(String path, int callerPid) {
- synchronized (mService) {
+ synchronized (mProfilerLock) {
if (callerPid != mMemWatchDumpPid) {
Slog.w(TAG, "dumpHeapFinished: Calling pid " + Binder.getCallingPid()
+ " does not match last pid " + mMemWatchDumpPid);
@@ -651,7 +700,7 @@
final long memLimit;
final String reportPackage;
final boolean isUserInitiated;
- synchronized (mService) {
+ synchronized (mProfilerLock) {
uid = mMemWatchDumpUid;
procName = mMemWatchDumpProcName;
Pair<Long, String> val = mMemWatchProcesses.get(procName, uid);
@@ -695,7 +744,7 @@
void setDumpHeapDebugLimit(String processName, int uid, long maxMemSize,
String reportPackage) {
- synchronized (mService) {
+ synchronized (mProfilerLock) {
if (maxMemSize > 0) {
mMemWatchProcesses.put(processName, uid, new Pair(maxMemSize, reportPackage));
} else {
@@ -717,7 +766,7 @@
void handleAbortDumpHeap(String procName) {
if (procName != null) {
- synchronized (mService) {
+ synchronized (mProfilerLock) {
if (procName.equals(mMemWatchDumpProcName)) {
mMemWatchDumpProcName = null;
mMemWatchDumpUri = null;
@@ -736,24 +785,24 @@
/**
* Schedule PSS collection of a process.
*/
- @GuardedBy("mService")
- private boolean requestPssLocked(ProcessRecord proc, int procState) {
- if (mPendingPssProcesses.contains(proc)) {
+ @GuardedBy("mProfilerLock")
+ private boolean requestPssLPf(ProcessProfileRecord profile, int procState) {
+ if (mPendingPssProfiles.contains(profile)) {
return false;
}
- if (mPendingPssProcesses.size() == 0) {
+ if (mPendingPssProfiles.size() == 0) {
final long deferral = (mPssDeferralTime > 0 && mActivityStartingNesting.get() > 0)
? mPssDeferralTime : 0;
if (DEBUG_PSS && deferral > 0) {
- Slog.d(TAG_PSS, "requestPssLocked() deferring PSS request by "
+ Slog.d(TAG_PSS, "requestPssLPf() deferring PSS request by "
+ deferral + " ms");
}
mBgHandler.sendEmptyMessageDelayed(BgHandler.COLLECT_PSS_BG_MSG, deferral);
}
- if (DEBUG_PSS) Slog.d(TAG_PSS, "Requesting pss of: " + proc);
- proc.pssProcState = procState;
- proc.pssStatType = ProcessStats.ADD_PSS_INTERNAL_SINGLE;
- mPendingPssProcesses.add(proc);
+ if (DEBUG_PSS) Slog.d(TAG_PSS, "Requesting pss of: " + profile.mApp);
+ profile.setPssProcState(procState);
+ profile.setPssStatType(ProcessStats.ADD_PSS_INTERNAL_SINGLE);
+ mPendingPssProfiles.add(profile);
return true;
}
@@ -761,9 +810,9 @@
* Re-defer a posted PSS collection pass, if one exists. Assumes deferral is
* currently active policy when called.
*/
- @GuardedBy("mService")
- private void deferPssIfNeededLocked() {
- if (mPendingPssProcesses.size() > 0) {
+ @GuardedBy("mProfilerLock")
+ private void deferPssIfNeededLPf() {
+ if (mPendingPssProfiles.size() > 0) {
mBgHandler.removeMessages(BgHandler.COLLECT_PSS_BG_MSG);
mBgHandler.sendEmptyMessageDelayed(BgHandler.COLLECT_PSS_BG_MSG, mPssDeferralTime);
}
@@ -774,7 +823,9 @@
if (DEBUG_PSS) {
Slog.d(TAG_PSS, "Deferring PSS collection for activity start");
}
- deferPssIfNeededLocked();
+ synchronized (mProfilerLock) {
+ deferPssIfNeededLPf();
+ }
mActivityStartingNesting.getAndIncrement();
mBgHandler.sendEmptyMessageDelayed(BgHandler.STOP_DEFERRING_PSS_MSG, mPssDeferralTime);
}
@@ -803,40 +854,45 @@
*/
@GuardedBy("mService")
void requestPssAllProcsLocked(long now, boolean always, boolean memLowered) {
- if (!always) {
- if (now < (mLastFullPssTime
- + (memLowered ? mService.mConstants.FULL_PSS_LOWERED_INTERVAL
- : mService.mConstants.FULL_PSS_MIN_INTERVAL))) {
- return;
+ synchronized (mProfilerLock) {
+ if (!always) {
+ if (now < (mLastFullPssTime
+ + (memLowered ? mService.mConstants.FULL_PSS_LOWERED_INTERVAL
+ : mService.mConstants.FULL_PSS_MIN_INTERVAL))) {
+ return;
+ }
}
- }
- if (DEBUG_PSS) {
- Slog.d(TAG_PSS, "Requesting pss of all procs! memLowered=" + memLowered);
- }
- mLastFullPssTime = now;
- mFullPssPending = true;
- for (int i = mPendingPssProcesses.size() - 1; i >= 0; i--) {
- abortNextPssTime(mPendingPssProcesses.get(i).procStateMemTracker);
- }
- mPendingPssProcesses.ensureCapacity(mService.mProcessList.getLruSizeLocked());
- mPendingPssProcesses.clear();
- for (int i = mService.mProcessList.getLruSizeLocked() - 1; i >= 0; i--) {
- ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
- if (app.thread == null || app.getCurProcState() == PROCESS_STATE_NONEXISTENT) {
- continue;
+ if (DEBUG_PSS) {
+ Slog.d(TAG_PSS, "Requesting pss of all procs! memLowered=" + memLowered);
}
- if (memLowered || (always && now
- > app.lastStateTime + ProcessList.PSS_SAFE_TIME_FROM_STATE_CHANGE)
- || now > (app.lastStateTime + ProcessList.PSS_ALL_INTERVAL)) {
- app.pssProcState = app.setProcState;
- app.pssStatType = always ? ProcessStats.ADD_PSS_INTERNAL_ALL_POLL
- : ProcessStats.ADD_PSS_INTERNAL_ALL_MEM;
- updateNextPssTimeLocked(app.getCurProcState(), app, now, true);
- mPendingPssProcesses.add(app);
+ mLastFullPssTime = now;
+ mFullPssPending = true;
+ for (int i = mPendingPssProfiles.size() - 1; i >= 0; i--) {
+ mPendingPssProfiles.get(i).abortNextPssTime();
}
- }
- if (!mBgHandler.hasMessages(BgHandler.COLLECT_PSS_BG_MSG)) {
- mBgHandler.sendEmptyMessage(BgHandler.COLLECT_PSS_BG_MSG);
+ mPendingPssProfiles.ensureCapacity(mService.mProcessList.getLruSizeLocked());
+ mPendingPssProfiles.clear();
+ for (int i = mService.mProcessList.getLruSizeLocked() - 1; i >= 0; i--) {
+ ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
+ final ProcessProfileRecord profile = app.mProfile;
+ if (profile.getThread() == null
+ || profile.getSetProcState() == PROCESS_STATE_NONEXISTENT) {
+ return;
+ }
+ final long lastStateTime = profile.getLastStateTime();
+ if (memLowered || (always
+ && now > lastStateTime + ProcessList.PSS_SAFE_TIME_FROM_STATE_CHANGE)
+ || now > (lastStateTime + ProcessList.PSS_ALL_INTERVAL)) {
+ profile.setPssProcState(profile.getSetProcState());
+ profile.setPssStatType(always ? ProcessStats.ADD_PSS_INTERNAL_ALL_POLL
+ : ProcessStats.ADD_PSS_INTERNAL_ALL_MEM);
+ updateNextPssTimeLPf(profile.getSetProcState(), profile, now, true);
+ mPendingPssProfiles.add(profile);
+ }
+ }
+ if (!mBgHandler.hasMessages(BgHandler.COLLECT_PSS_BG_MSG)) {
+ mBgHandler.sendEmptyMessage(BgHandler.COLLECT_PSS_BG_MSG);
+ }
}
}
@@ -851,8 +907,7 @@
}
}
- @GuardedBy("mService")
- boolean getTestPssModeLocked() {
+ boolean getTestPssMode() {
return mTestPssMode;
}
@@ -969,14 +1024,16 @@
if (factor < minFactor) factor = minFactor;
int curLevel = ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
for (int i = 0; i < numOfLru; i++) {
- ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
+ final ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
+ final ProcessProfileRecord profile = app.mProfile;
+ final int trimMemoryLevel = profile.getTrimMemoryLevel();
if (allChanged || app.procStateChanged) {
mService.setProcessTrackerStateLocked(app, trackerMemFactor, now);
app.procStateChanged = false;
}
if (app.getCurProcState() >= ActivityManager.PROCESS_STATE_HOME
&& !app.killedByAm) {
- if (app.trimMemoryLevel < curLevel && app.thread != null) {
+ if (trimMemoryLevel < curLevel && app.thread != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ,
@@ -987,7 +1044,7 @@
} catch (RemoteException e) {
}
}
- app.trimMemoryLevel = curLevel;
+ profile.setTrimMemoryLevel(curLevel);
step++;
if (step >= factor) {
step = 0;
@@ -1002,7 +1059,7 @@
}
} else if (app.getCurProcState() == ActivityManager.PROCESS_STATE_HEAVY_WEIGHT
&& !app.killedByAm) {
- if (app.trimMemoryLevel < ComponentCallbacks2.TRIM_MEMORY_BACKGROUND
+ if (trimMemoryLevel < ComponentCallbacks2.TRIM_MEMORY_BACKGROUND
&& app.thread != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
@@ -1015,15 +1072,15 @@
} catch (RemoteException e) {
}
}
- app.trimMemoryLevel = ComponentCallbacks2.TRIM_MEMORY_BACKGROUND;
+ profile.setTrimMemoryLevel(ComponentCallbacks2.TRIM_MEMORY_BACKGROUND);
} else {
if ((app.getCurProcState() >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND
- || app.systemNoUi) && app.hasPendingUiClean()) {
+ || app.systemNoUi) && profile.hasPendingUiClean()) {
// If this application is now in the background and it
// had done UI, then give it the special trim level to
// have it free UI resources.
final int level = ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN;
- if (app.trimMemoryLevel < level && app.thread != null) {
+ if (trimMemoryLevel < level && app.thread != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ, "Trimming memory of bg-ui "
@@ -1033,9 +1090,9 @@
} catch (RemoteException e) {
}
}
- app.setPendingUiClean(false);
+ profile.setPendingUiClean(false);
}
- if (app.trimMemoryLevel < fgTrimLevel && app.thread != null) {
+ if (trimMemoryLevel < fgTrimLevel && app.thread != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
Slog.v(TAG_OOM_ADJ, "Trimming memory of fg " + app.processName
@@ -1045,7 +1102,7 @@
} catch (RemoteException e) {
}
}
- app.trimMemoryLevel = fgTrimLevel;
+ profile.setTrimMemoryLevel(fgTrimLevel);
}
}
} else {
@@ -1054,14 +1111,15 @@
mLowRamStartTime = 0;
}
for (int i = 0; i < numOfLru; i++) {
- ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
+ final ProcessRecord app = mService.mProcessList.mLruProcesses.get(i);
+ final ProcessProfileRecord profile = app.mProfile;
if (allChanged || app.procStateChanged) {
mService.setProcessTrackerStateLocked(app, trackerMemFactor, now);
app.procStateChanged = false;
}
if ((app.getCurProcState() >= ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND
- || app.systemNoUi) && app.hasPendingUiClean()) {
- if (app.trimMemoryLevel < ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN
+ || app.systemNoUi) && profile.hasPendingUiClean()) {
+ if (profile.getTrimMemoryLevel() < ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN
&& app.thread != null) {
try {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ) {
@@ -1074,9 +1132,9 @@
} catch (RemoteException e) {
}
}
- app.setPendingUiClean(false);
+ profile.setPendingUiClean(false);
}
- app.trimMemoryLevel = 0;
+ profile.setTrimMemoryLevel(0);
}
}
return allChanged;
@@ -1087,25 +1145,459 @@
return mLowRamTimeSinceLastIdle + (mLowRamStartTime > 0 ? (now - mLowRamStartTime) : 0);
}
+ /**
+ * Ask a given process to GC right now.
+ */
+ @GuardedBy("mProfilerLock")
+ private void performAppGcLPf(ProcessRecord app) {
+ try {
+ final ProcessProfileRecord profile = app.mProfile;
+ profile.setLastRequestedGc(SystemClock.uptimeMillis());
+ IApplicationThread thread = profile.getThread();
+ if (thread != null) {
+ if (profile.getReportLowMemory()) {
+ profile.setReportLowMemory(false);
+ thread.scheduleLowMemory();
+ } else {
+ thread.processInBackground();
+ }
+ }
+ } catch (Exception e) {
+ // whatever.
+ }
+ }
+
+ /**
+ * Perform GCs on all processes that are waiting for it, but only
+ * if things are idle.
+ */
+ @GuardedBy("mProfilerLock")
+ private void performAppGcsLPf() {
+ if (mProcessesToGc.size() <= 0) {
+ return;
+ }
+ while (mProcessesToGc.size() > 0) {
+ final ProcessRecord proc = mProcessesToGc.remove(0);
+ final ProcessProfileRecord profile = proc.mProfile;
+ if (profile.getCurRawAdj() > ProcessList.PERCEPTIBLE_APP_ADJ
+ || profile.getReportLowMemory()) {
+ if ((profile.getLastRequestedGc() + mService.mConstants.GC_MIN_INTERVAL)
+ <= SystemClock.uptimeMillis()) {
+ // To avoid spamming the system, we will GC processes one
+ // at a time, waiting a few seconds between each.
+ performAppGcLPf(proc);
+ scheduleAppGcsLPf();
+ return;
+ } else {
+ // It hasn't been long enough since we last GCed this
+ // process... put it in the list to wait for its time.
+ addProcessToGcListLPf(proc);
+ break;
+ }
+ }
+ }
+
+ scheduleAppGcsLPf();
+ }
+
+ /**
+ * If all looks good, perform GCs on all processes waiting for them.
+ */
@GuardedBy("mService")
- private void stopProfilerLocked(ProcessRecord proc, int profileType) {
+ final void performAppGcsIfAppropriateLocked() {
+ synchronized (mProfilerLock) {
+ if (mService.canGcNowLocked()) {
+ performAppGcsLPf();
+ return;
+ }
+ // Still not idle, wait some more.
+ scheduleAppGcsLPf();
+ }
+ }
+
+ /**
+ * Schedule the execution of all pending app GCs.
+ */
+ @GuardedBy("mProfilerLock")
+ final void scheduleAppGcsLPf() {
+ mService.mHandler.removeMessages(GC_BACKGROUND_PROCESSES_MSG);
+
+ if (mProcessesToGc.size() > 0) {
+ // Schedule a GC for the time to the next process.
+ ProcessRecord proc = mProcessesToGc.get(0);
+ Message msg = mService.mHandler.obtainMessage(GC_BACKGROUND_PROCESSES_MSG);
+
+ long when = proc.mProfile.getLastRequestedGc() + mService.mConstants.GC_MIN_INTERVAL;
+ long now = SystemClock.uptimeMillis();
+ if (when < (now + mService.mConstants.GC_TIMEOUT)) {
+ when = now + mService.mConstants.GC_TIMEOUT;
+ }
+ mService.mHandler.sendMessageAtTime(msg, when);
+ }
+ }
+
+ /**
+ * Add a process to the array of processes waiting to be GCed. Keeps the
+ * list in sorted order by the last GC time. The process can't already be
+ * on the list.
+ */
+ @GuardedBy("mProfilerLock")
+ private void addProcessToGcListLPf(ProcessRecord proc) {
+ boolean added = false;
+ for (int i = mProcessesToGc.size() - 1; i >= 0; i--) {
+ if (mProcessesToGc.get(i).mProfile.getLastRequestedGc()
+ < proc.mProfile.getLastRequestedGc()) {
+ added = true;
+ mProcessesToGc.add(i + 1, proc);
+ break;
+ }
+ }
+ if (!added) {
+ mProcessesToGc.add(0, proc);
+ }
+ }
+
+ @GuardedBy("mService")
+ final void doLowMemReportIfNeededLocked(ProcessRecord dyingProc) {
+ // If there are no longer any background processes running,
+ // and the app that died was not running instrumentation,
+ // then tell everyone we are now low on memory.
+ if (!mService.mProcessList.haveBackgroundProcessLocked()) {
+ boolean doReport = Build.IS_DEBUGGABLE;
+ final long now = SystemClock.uptimeMillis();
+ if (doReport) {
+ if (now < (mLastMemUsageReportTime + 5 * 60 * 1000)) {
+ doReport = false;
+ } else {
+ mLastMemUsageReportTime = now;
+ }
+ }
+ final int lruSize = mService.mProcessList.getLruSizeLocked();
+ final ArrayList<ProcessMemInfo> memInfos = doReport
+ ? new ArrayList<ProcessMemInfo>(lruSize) : null;
+ EventLogTags.writeAmLowMemory(lruSize);
+ for (int i = lruSize - 1; i >= 0; i--) {
+ ProcessRecord rec = mService.mProcessList.mLruProcesses.get(i);
+ if (rec == dyingProc || rec.thread == null) {
+ return;
+ }
+ if (memInfos != null) {
+ memInfos.add(new ProcessMemInfo(rec.processName, rec.pid,
+ rec.setAdj, rec.setProcState,
+ rec.adjType, rec.makeAdjReason()));
+ }
+ final ProcessProfileRecord profile = rec.mProfile;
+ if ((profile.getLastLowMemory() + mService.mConstants.GC_MIN_INTERVAL) <= now) {
+ // The low memory report is overriding any current
+ // state for a GC request. Make sure to do
+ // heavy/important/visible/foreground processes first.
+ synchronized (mProfilerLock) {
+ if (rec.setAdj <= ProcessList.HEAVY_WEIGHT_APP_ADJ) {
+ profile.setLastRequestedGc(0);
+ } else {
+ profile.setLastRequestedGc(profile.getLastLowMemory());
+ }
+ profile.setReportLowMemory(true);
+ profile.setLastLowMemory(now);
+ mProcessesToGc.remove(rec);
+ addProcessToGcListLPf(rec);
+ }
+ }
+ }
+ if (doReport) {
+ Message msg = mService.mHandler.obtainMessage(REPORT_MEM_USAGE_MSG, memInfos);
+ mService.mHandler.sendMessage(msg);
+ }
+ }
+ synchronized (mProfilerLock) {
+ scheduleAppGcsLPf();
+ }
+ }
+
+ void reportMemUsage(ArrayList<ProcessMemInfo> memInfos) {
+ final SparseArray<ProcessMemInfo> infoMap = new SparseArray<>(memInfos.size());
+ for (int i = 0, size = memInfos.size(); i < size; i++) {
+ ProcessMemInfo mi = memInfos.get(i);
+ infoMap.put(mi.pid, mi);
+ }
+ updateCpuStatsNow();
+ long[] memtrackTmp = new long[1];
+ long[] swaptrackTmp = new long[2];
+ // Get a list of Stats that have vsize > 0
+ final List<ProcessCpuTracker.Stats> stats = getCpuStats(st -> st.vsize > 0);
+ final int statsCount = stats.size();
+ for (int i = 0; i < statsCount; i++) {
+ ProcessCpuTracker.Stats st = stats.get(i);
+ long pss = Debug.getPss(st.pid, swaptrackTmp, memtrackTmp);
+ if (pss > 0) {
+ if (infoMap.indexOfKey(st.pid) < 0) {
+ ProcessMemInfo mi = new ProcessMemInfo(st.name, st.pid,
+ ProcessList.NATIVE_ADJ, -1, "native", null);
+ mi.pss = pss;
+ mi.swapPss = swaptrackTmp[1];
+ mi.memtrack = memtrackTmp[0];
+ memInfos.add(mi);
+ }
+ }
+ }
+
+ long totalPss = 0;
+ long totalSwapPss = 0;
+ long totalMemtrack = 0;
+ for (int i = 0, size = memInfos.size(); i < size; i++) {
+ ProcessMemInfo mi = memInfos.get(i);
+ if (mi.pss == 0) {
+ mi.pss = Debug.getPss(mi.pid, swaptrackTmp, memtrackTmp);
+ mi.swapPss = swaptrackTmp[1];
+ mi.memtrack = memtrackTmp[0];
+ }
+ totalPss += mi.pss;
+ totalSwapPss += mi.swapPss;
+ totalMemtrack += mi.memtrack;
+ }
+ Collections.sort(memInfos, new Comparator<ProcessMemInfo>() {
+ @Override public int compare(ProcessMemInfo lhs, ProcessMemInfo rhs) {
+ if (lhs.oomAdj != rhs.oomAdj) {
+ return lhs.oomAdj < rhs.oomAdj ? -1 : 1;
+ }
+ if (lhs.pss != rhs.pss) {
+ return lhs.pss < rhs.pss ? 1 : -1;
+ }
+ return 0;
+ }
+ });
+
+ StringBuilder tag = new StringBuilder(128);
+ StringBuilder stack = new StringBuilder(128);
+ tag.append("Low on memory -- ");
+ appendMemBucket(tag, totalPss, "total", false);
+ appendMemBucket(stack, totalPss, "total", true);
+
+ StringBuilder fullNativeBuilder = new StringBuilder(1024);
+ StringBuilder shortNativeBuilder = new StringBuilder(1024);
+ StringBuilder fullJavaBuilder = new StringBuilder(1024);
+
+ boolean firstLine = true;
+ int lastOomAdj = Integer.MIN_VALUE;
+ long extraNativeRam = 0;
+ long extraNativeMemtrack = 0;
+ long cachedPss = 0;
+ for (int i = 0, size = memInfos.size(); i < size; i++) {
+ ProcessMemInfo mi = memInfos.get(i);
+
+ if (mi.oomAdj >= ProcessList.CACHED_APP_MIN_ADJ) {
+ cachedPss += mi.pss;
+ }
+
+ if (mi.oomAdj != ProcessList.NATIVE_ADJ
+ && (mi.oomAdj < ProcessList.SERVICE_ADJ
+ || mi.oomAdj == ProcessList.HOME_APP_ADJ
+ || mi.oomAdj == ProcessList.PREVIOUS_APP_ADJ)) {
+ if (lastOomAdj != mi.oomAdj) {
+ lastOomAdj = mi.oomAdj;
+ if (mi.oomAdj <= ProcessList.FOREGROUND_APP_ADJ) {
+ tag.append(" / ");
+ }
+ if (mi.oomAdj >= ProcessList.FOREGROUND_APP_ADJ) {
+ if (firstLine) {
+ stack.append(":");
+ firstLine = false;
+ }
+ stack.append("\n\t at ");
+ } else {
+ stack.append("$");
+ }
+ } else {
+ tag.append(" ");
+ stack.append("$");
+ }
+ if (mi.oomAdj <= ProcessList.FOREGROUND_APP_ADJ) {
+ appendMemBucket(tag, mi.pss, mi.name, false);
+ }
+ appendMemBucket(stack, mi.pss, mi.name, true);
+ if (mi.oomAdj >= ProcessList.FOREGROUND_APP_ADJ
+ && ((i + 1) >= size || memInfos.get(i + 1).oomAdj != lastOomAdj)) {
+ stack.append("(");
+ for (int k = 0; k < DUMP_MEM_OOM_ADJ.length; k++) {
+ if (DUMP_MEM_OOM_ADJ[k] == mi.oomAdj) {
+ stack.append(DUMP_MEM_OOM_LABEL[k]);
+ stack.append(":");
+ stack.append(DUMP_MEM_OOM_ADJ[k]);
+ }
+ }
+ stack.append(")");
+ }
+ }
+
+ appendMemInfo(fullNativeBuilder, mi);
+ if (mi.oomAdj == ProcessList.NATIVE_ADJ) {
+ // The short form only has native processes that are >= 512K.
+ if (mi.pss >= 512) {
+ appendMemInfo(shortNativeBuilder, mi);
+ } else {
+ extraNativeRam += mi.pss;
+ extraNativeMemtrack += mi.memtrack;
+ }
+ } else {
+ // Short form has all other details, but if we have collected RAM
+ // from smaller native processes let's dump a summary of that.
+ if (extraNativeRam > 0) {
+ appendBasicMemEntry(shortNativeBuilder, ProcessList.NATIVE_ADJ,
+ -1, extraNativeRam, extraNativeMemtrack, "(Other native)");
+ shortNativeBuilder.append('\n');
+ extraNativeRam = 0;
+ }
+ appendMemInfo(fullJavaBuilder, mi);
+ }
+ }
+
+ fullJavaBuilder.append(" ");
+ ProcessList.appendRamKb(fullJavaBuilder, totalPss);
+ fullJavaBuilder.append(": TOTAL");
+ if (totalMemtrack > 0) {
+ fullJavaBuilder.append(" (");
+ fullJavaBuilder.append(stringifyKBSize(totalMemtrack));
+ fullJavaBuilder.append(" memtrack)");
+ }
+ fullJavaBuilder.append("\n");
+
+ MemInfoReader memInfo = new MemInfoReader();
+ memInfo.readMemInfo();
+ final long[] infos = memInfo.getRawInfo();
+
+ StringBuilder memInfoBuilder = new StringBuilder(1024);
+ Debug.getMemInfo(infos);
+ memInfoBuilder.append(" MemInfo: ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SLAB])).append(" slab, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SHMEM])).append(" shmem, ");
+ memInfoBuilder.append(stringifyKBSize(
+ infos[Debug.MEMINFO_VM_ALLOC_USED])).append(" vm alloc, ");
+ memInfoBuilder.append(stringifyKBSize(
+ infos[Debug.MEMINFO_PAGE_TABLES])).append(" page tables ");
+ memInfoBuilder.append(stringifyKBSize(
+ infos[Debug.MEMINFO_KERNEL_STACK])).append(" kernel stack\n");
+ memInfoBuilder.append(" ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_BUFFERS])).append(" buffers, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_CACHED])).append(" cached, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_MAPPED])).append(" mapped, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_FREE])).append(" free\n");
+ if (infos[Debug.MEMINFO_ZRAM_TOTAL] != 0) {
+ memInfoBuilder.append(" ZRAM: ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_ZRAM_TOTAL]));
+ memInfoBuilder.append(" RAM, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SWAP_TOTAL]));
+ memInfoBuilder.append(" swap total, ");
+ memInfoBuilder.append(stringifyKBSize(infos[Debug.MEMINFO_SWAP_FREE]));
+ memInfoBuilder.append(" swap free\n");
+ }
+ final long[] ksm = getKsmInfo();
+ if (ksm[KSM_SHARING] != 0 || ksm[KSM_SHARED] != 0 || ksm[KSM_UNSHARED] != 0
+ || ksm[KSM_VOLATILE] != 0) {
+ memInfoBuilder.append(" KSM: ");
+ memInfoBuilder.append(stringifyKBSize(ksm[KSM_SHARING]));
+ memInfoBuilder.append(" saved from shared ");
+ memInfoBuilder.append(stringifyKBSize(ksm[KSM_SHARED]));
+ memInfoBuilder.append("\n ");
+ memInfoBuilder.append(stringifyKBSize(ksm[KSM_UNSHARED]));
+ memInfoBuilder.append(" unshared; ");
+ memInfoBuilder.append(stringifyKBSize(ksm[KSM_VOLATILE]));
+ memInfoBuilder.append(" volatile\n");
+ }
+ memInfoBuilder.append(" Free RAM: ");
+ memInfoBuilder.append(stringifyKBSize(cachedPss + memInfo.getCachedSizeKb()
+ + memInfo.getFreeSizeKb()));
+ memInfoBuilder.append("\n");
+ long kernelUsed = memInfo.getKernelUsedSizeKb();
+ final long ionHeap = Debug.getIonHeapsSizeKb();
+ final long ionPool = Debug.getIonPoolsSizeKb();
+ if (ionHeap >= 0 && ionPool >= 0) {
+ final long ionMapped = Debug.getIonMappedSizeKb();
+ final long ionUnmapped = ionHeap - ionMapped;
+ memInfoBuilder.append(" ION: ");
+ memInfoBuilder.append(stringifyKBSize(ionHeap + ionPool));
+ memInfoBuilder.append("\n");
+ // Note: mapped ION memory is not accounted in PSS due to VM_PFNMAP flag being
+ // set on ION VMAs, therefore consider the entire ION heap as used kernel memory
+ kernelUsed += ionHeap;
+ }
+ final long gpuUsage = Debug.getGpuTotalUsageKb();
+ if (gpuUsage >= 0) {
+ memInfoBuilder.append(" GPU: ");
+ memInfoBuilder.append(stringifyKBSize(gpuUsage));
+ memInfoBuilder.append("\n");
+ }
+ memInfoBuilder.append(" Used RAM: ");
+ memInfoBuilder.append(stringifyKBSize(
+ totalPss - cachedPss + kernelUsed));
+ memInfoBuilder.append("\n");
+ memInfoBuilder.append(" Lost RAM: ");
+ memInfoBuilder.append(stringifyKBSize(memInfo.getTotalSizeKb()
+ - (totalPss - totalSwapPss) - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()
+ - kernelUsed - memInfo.getZramTotalSizeKb()));
+ memInfoBuilder.append("\n");
+ Slog.i(TAG, "Low on memory:");
+ Slog.i(TAG, shortNativeBuilder.toString());
+ Slog.i(TAG, fullJavaBuilder.toString());
+ Slog.i(TAG, memInfoBuilder.toString());
+
+ StringBuilder dropBuilder = new StringBuilder(1024);
+ dropBuilder.append("Low on memory:");
+ dropBuilder.append(stack);
+ dropBuilder.append('\n');
+ dropBuilder.append(fullNativeBuilder);
+ dropBuilder.append(fullJavaBuilder);
+ dropBuilder.append('\n');
+ dropBuilder.append(memInfoBuilder);
+ dropBuilder.append('\n');
+ StringWriter catSw = new StringWriter();
+ synchronized (mService) {
+ PrintWriter catPw = new FastPrintWriter(catSw, false, 256);
+ String[] emptyArgs = new String[] { };
+ catPw.println();
+ mService.mProcessList.dumpProcessesLocked(null, catPw, emptyArgs, 0, false, null, -1);
+ catPw.println();
+ mService.mServices.newServiceDumperLocked(null, catPw, emptyArgs, 0,
+ false, null).dumpLocked();
+ catPw.println();
+ mService.mAtmInternal.dump(
+ DUMP_ACTIVITIES_CMD, null, catPw, emptyArgs, 0, false, false, null);
+ catPw.flush();
+ }
+ dropBuilder.append(catSw.toString());
+ FrameworkStatsLog.write(FrameworkStatsLog.LOW_MEM_REPORTED);
+ mService.addErrorToDropBox("lowmem", null, "system_server", null,
+ null, null, tag.toString(), dropBuilder.toString(), null, null);
+ synchronized (mService) {
+ long now = SystemClock.uptimeMillis();
+ if (mLastMemUsageReportTime < now) {
+ mLastMemUsageReportTime = now;
+ }
+ }
+ }
+
+ @GuardedBy("mService")
+ private void stopProfilerLPf(ProcessRecord proc, int profileType) {
if (proc == null || proc == mProfileData.getProfileProc()) {
proc = mProfileData.getProfileProc();
profileType = mProfileType;
- clearProfilerLocked();
+ clearProfilerLPf();
}
if (proc == null) {
return;
}
+ final IApplicationThread thread = proc.mProfile.getThread();
+ if (thread == null) {
+ return;
+ }
try {
- proc.thread.profilerControl(false, null, profileType);
+ thread.profilerControl(false, null, profileType);
} catch (RemoteException e) {
throw new IllegalStateException("Process disappeared");
}
}
- @GuardedBy("mService")
- void clearProfilerLocked() {
+ @GuardedBy("mProfilerLock")
+ void clearProfilerLPf() {
if (mProfileData.getProfilerInfo() != null
&& mProfileData.getProfilerInfo().profileFd != null) {
try {
@@ -1118,22 +1610,22 @@
mProfileData.setProfilerInfo(null);
}
- @GuardedBy("mService")
- void clearProfilerLocked(ProcessRecord app) {
+ @GuardedBy("mProfilerLock")
+ void clearProfilerLPf(ProcessRecord app) {
if (mProfileData.getProfileProc() == null
|| mProfileData.getProfilerInfo() == null
|| mProfileData.getProfileProc() != app) {
return;
}
- clearProfilerLocked();
+ clearProfilerLPf();
}
- @GuardedBy("mService")
- boolean profileControlLocked(ProcessRecord proc, boolean start,
+ @GuardedBy("mProfilerLock")
+ boolean profileControlLPf(ProcessRecord proc, boolean start,
ProfilerInfo profilerInfo, int profileType) {
try {
if (start) {
- stopProfilerLocked(null, 0);
+ stopProfilerLPf(null, 0);
mService.setProfileApp(proc.info, proc.processName, profilerInfo);
mProfileData.setProfileProc(proc);
mProfileType = profileType;
@@ -1144,7 +1636,7 @@
fd = null;
}
profilerInfo.profileFd = fd;
- proc.thread.profilerControl(start, profilerInfo, profileType);
+ proc.mProfile.getThread().profilerControl(start, profilerInfo, profileType);
fd = null;
try {
mProfileData.getProfilerInfo().profileFd.close();
@@ -1160,7 +1652,7 @@
profilerInfo = null;
}
} else {
- stopProfilerLocked(proc, profileType);
+ stopProfilerLPf(proc, profileType);
if (profilerInfo != null && profilerInfo.profileFd != null) {
try {
profilerInfo.profileFd.close();
@@ -1182,8 +1674,8 @@
}
}
- @GuardedBy("mService")
- void setProfileAppLocked(String processName, ProfilerInfo profilerInfo) {
+ @GuardedBy("mProfilerLock")
+ void setProfileAppLPf(String processName, ProfilerInfo profilerInfo) {
mProfileData.setProfileApp(processName);
if (mProfileData.getProfilerInfo() != null) {
@@ -1198,13 +1690,13 @@
mProfileType = 0;
}
- @GuardedBy("mService")
- void setProfileProcLocked(ProcessRecord proc) {
+ @GuardedBy("mProfilerLock")
+ void setProfileProcLPf(ProcessRecord proc) {
mProfileData.setProfileProc(proc);
}
- @GuardedBy("mService")
- void setAgentAppLocked(@NonNull String packageName, @Nullable String agent) {
+ @GuardedBy("mProfilerLock")
+ void setAgentAppLPf(@NonNull String packageName, @Nullable String agent) {
if (agent == null) {
if (mAppAgentMap != null) {
mAppAgentMap.remove(packageName);
@@ -1226,8 +1718,7 @@
}
}
- @GuardedBy("mService")
- void updateCpuStatsLocked() {
+ void updateCpuStats() {
final long now = SystemClock.uptimeMillis();
if (mLastCpuTime.get() >= now - MONITOR_CPU_MIN_TIME) {
return;
@@ -1301,17 +1792,18 @@
totalUTime += st.rel_utime;
totalSTime += st.rel_stime;
if (pr != null) {
- BatteryStatsImpl.Uid.Proc ps = pr.curProcBatteryStats;
+ final ProcessProfileRecord profile = pr.mProfile;
+ BatteryStatsImpl.Uid.Proc ps = profile.getCurProcBatteryStats();
if (ps == null || !ps.isActive()) {
- pr.curProcBatteryStats = ps = bstats.getProcessStatsLocked(
+ profile.setCurProcBatteryStats(
+ ps = bstats.getProcessStatsLocked(
pr.info.uid, pr.processName,
- elapsedRealtime, uptime);
+ elapsedRealtime, uptime));
}
ps.addCpuTimeLocked(st.rel_utime, st.rel_stime);
- pr.curCpuTime += st.rel_utime + st.rel_stime;
- if (pr.lastCpuTime == 0) {
- pr.lastCpuTime = pr.curCpuTime;
- }
+ final long curCpuTime = profile.mCurCpuTime.addAndGet(
+ st.rel_utime + st.rel_stime);
+ profile.mLastCpuTime.compareAndSet(0, curCpuTime);
} else {
BatteryStatsImpl.Uid.Proc ps = st.batteryStats;
if (ps == null || !ps.isActive()) {
@@ -1483,44 +1975,46 @@
ProfilerInfo profilerInfo = null;
String preBindAgent = null;
final String processName = app.processName;
- if (mProfileData.getProfileApp() != null
- && mProfileData.getProfileApp().equals(processName)) {
- mProfileData.setProfileProc(app);
- if (mProfileData.getProfilerInfo() != null) {
- // Send a profiler info object to the app if either a file is given, or
- // an agent should be loaded at bind-time.
- boolean needsInfo = mProfileData.getProfilerInfo().profileFile != null
- || mProfileData.getProfilerInfo().attachAgentDuringBind;
- profilerInfo = needsInfo
- ? new ProfilerInfo(mProfileData.getProfilerInfo()) : null;
- if (mProfileData.getProfilerInfo().agent != null) {
- preBindAgent = mProfileData.getProfilerInfo().agent;
+ synchronized (mProfilerLock) {
+ if (mProfileData.getProfileApp() != null
+ && mProfileData.getProfileApp().equals(processName)) {
+ mProfileData.setProfileProc(app);
+ if (mProfileData.getProfilerInfo() != null) {
+ // Send a profiler info object to the app if either a file is given, or
+ // an agent should be loaded at bind-time.
+ boolean needsInfo = mProfileData.getProfilerInfo().profileFile != null
+ || mProfileData.getProfilerInfo().attachAgentDuringBind;
+ profilerInfo = needsInfo
+ ? new ProfilerInfo(mProfileData.getProfilerInfo()) : null;
+ if (mProfileData.getProfilerInfo().agent != null) {
+ preBindAgent = mProfileData.getProfilerInfo().agent;
+ }
+ }
+ } else if (instr != null && instr.mProfileFile != null) {
+ profilerInfo = new ProfilerInfo(instr.mProfileFile, null, 0, false, false,
+ null, false);
+ }
+ if (mAppAgentMap != null && mAppAgentMap.containsKey(processName)) {
+ // We need to do a debuggable check here. See setAgentApp for why the check is
+ // postponed to here.
+ if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
+ String agent = mAppAgentMap.get(processName);
+ // Do not overwrite already requested agent.
+ if (profilerInfo == null) {
+ profilerInfo = new ProfilerInfo(null, null, 0, false, false,
+ mAppAgentMap.get(processName), true);
+ } else if (profilerInfo.agent == null) {
+ profilerInfo = profilerInfo.setAgent(mAppAgentMap.get(processName), true);
+ }
}
}
- } else if (instr != null && instr.mProfileFile != null) {
- profilerInfo = new ProfilerInfo(instr.mProfileFile, null, 0, false, false,
- null, false);
- }
- if (mAppAgentMap != null && mAppAgentMap.containsKey(processName)) {
- // We need to do a debuggable check here. See setAgentApp for why the check is
- // postponed to here.
- if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
- String agent = mAppAgentMap.get(processName);
- // Do not overwrite already requested agent.
- if (profilerInfo == null) {
- profilerInfo = new ProfilerInfo(null, null, 0, false, false,
- mAppAgentMap.get(processName), true);
- } else if (profilerInfo.agent == null) {
- profilerInfo = profilerInfo.setAgent(mAppAgentMap.get(processName), true);
- }
- }
- }
- if (profilerInfo != null && profilerInfo.profileFd != null) {
- profilerInfo.profileFd = profilerInfo.profileFd.dup();
- if (TextUtils.equals(mProfileData.getProfileApp(), processName)
- && mProfileData.getProfilerInfo() != null) {
- clearProfilerLocked();
+ if (profilerInfo != null && profilerInfo.profileFd != null) {
+ profilerInfo.profileFd = profilerInfo.profileFd.dup();
+ if (TextUtils.equals(mProfileData.getProfileApp(), processName)
+ && mProfileData.getProfilerInfo() != null) {
+ clearProfilerLPf();
+ }
}
}
@@ -1566,19 +2060,25 @@
@GuardedBy("mService")
void onCleanupApplicationRecordLocked(ProcessRecord app) {
- mPendingPssProcesses.remove(app);
- abortNextPssTime(app.procStateMemTracker);
- }
-
- @GuardedBy("mService")
- void onAppDiedLocked(ProcessRecord app) {
- if (mProfileData.getProfileProc() == app) {
- clearProfilerLocked();
+ synchronized (mProfilerLock) {
+ final ProcessProfileRecord profile = app.mProfile;
+ mProcessesToGc.remove(app);
+ mPendingPssProfiles.remove(profile);
+ profile.abortNextPssTime();
}
}
@GuardedBy("mService")
- boolean dumpMemWatchProcessesLocked(PrintWriter pw, boolean needSep) {
+ void onAppDiedLocked(ProcessRecord app) {
+ synchronized (mProfilerLock) {
+ if (mProfileData.getProfileProc() == app) {
+ clearProfilerLPf();
+ }
+ }
+ }
+
+ @GuardedBy("mProfilerLock")
+ boolean dumpMemWatchProcessesLPf(PrintWriter pw, boolean needSep) {
if (mMemWatchProcesses.getMap().size() > 0) {
pw.println(" Mem watch processes:");
final ArrayMap<String, SparseArray<Pair<Long, String>>> procs =
@@ -1669,8 +2169,8 @@
+ " mLastNumProcesses=" + mLastNumProcesses);
}
- @GuardedBy("mService")
- void writeMemWatchProcessToProtoLocked(ProtoOutputStream proto) {
+ @GuardedBy("mProfilerLock")
+ void writeMemWatchProcessToProtoLPf(ProtoOutputStream proto) {
if (mMemWatchProcesses.getMap().size() > 0) {
final long token = proto.start(
ActivityManagerServiceDumpProcessesProto.MEM_WATCH_PROCESSES);
@@ -1753,4 +2253,55 @@
report.append(mProcessCpuTracker.printCurrentState(time));
}
}
+
+ @GuardedBy("mProfilerLock")
+ void writeProcessesToGcToProto(ProtoOutputStream proto, long fieldId, String dumpPackage) {
+ if (mProcessesToGc.size() > 0) {
+ long now = SystemClock.uptimeMillis();
+ for (int i = 0, size = mProcessesToGc.size(); i < size; i++) {
+ ProcessRecord r = mProcessesToGc.get(i);
+ if (dumpPackage != null && !dumpPackage.equals(r.info.packageName)) {
+ continue;
+ }
+ final long token = proto.start(fieldId);
+ final ProcessProfileRecord profile = r.mProfile;
+ r.dumpDebug(proto, ProcessToGcProto.PROC);
+ proto.write(ProcessToGcProto.REPORT_LOW_MEMORY, profile.getReportLowMemory());
+ proto.write(ProcessToGcProto.NOW_UPTIME_MS, now);
+ proto.write(ProcessToGcProto.LAST_GCED_MS, profile.getLastRequestedGc());
+ proto.write(ProcessToGcProto.LAST_LOW_MEMORY_MS, profile.getLastLowMemory());
+ proto.end(token);
+ }
+ }
+ }
+
+ @GuardedBy("mProfilerLock")
+ boolean dumpProcessesToGc(PrintWriter pw, boolean needSep, String dumpPackage) {
+ if (mProcessesToGc.size() > 0) {
+ boolean printed = false;
+ long now = SystemClock.uptimeMillis();
+ for (int i = 0, size = mProcessesToGc.size(); i < size; i++) {
+ ProcessRecord proc = mProcessesToGc.get(i);
+ if (dumpPackage != null && !dumpPackage.equals(proc.info.packageName)) {
+ continue;
+ }
+ if (!printed) {
+ if (needSep) pw.println();
+ needSep = true;
+ pw.println(" Processes that are waiting to GC:");
+ printed = true;
+ }
+ pw.print(" Process "); pw.println(proc);
+ final ProcessProfileRecord profile = proc.mProfile;
+ pw.print(" lowMem="); pw.print(profile.getReportLowMemory());
+ pw.print(", last gced=");
+ pw.print(now - profile.getLastRequestedGc());
+ pw.print(" ms ago, last lowMem=");
+ pw.print(now - profile.getLastLowMemory());
+ pw.println(" ms ago");
+
+ }
+ }
+ return needSep;
+ }
}
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index d2ee69e..4de1218 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -849,7 +849,7 @@
private boolean requestStartTargetPermissionsReviewIfNeededLocked(
BroadcastRecord receiverRecord, String receivingPackageName,
final int receivingUserId) {
- if (!mService.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ if (!mService.getPackageManagerInternal().isPermissionsReviewRequired(
receivingPackageName, receivingUserId)) {
return true;
}
@@ -922,7 +922,7 @@
Slog.v(TAG, "Broadcast temp whitelist uid=" + uid + " duration=" + duration
+ " type=" + type + " : " + b.toString());
}
- mService.tempWhitelistUidLocked(uid, duration, b.toString(), type);
+ mService.tempAllowlistUidLocked(uid, duration, b.toString(), type);
}
/**
@@ -969,7 +969,7 @@
+ mParallelBroadcasts.size() + " parallel broadcasts; "
+ mDispatcher.describeStateLocked());
- mService.updateCpuStatsLocked();
+ mService.updateCpuStats();
if (fromMsg) {
mBroadcastsScheduled = false;
@@ -1050,7 +1050,9 @@
if (r == null) {
// No more broadcasts are deliverable right now, so all done!
mDispatcher.scheduleDeferralCheckLocked(false);
- mService.scheduleAppGcsLocked();
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ mService.mAppProfiler.scheduleAppGcsLPf();
+ }
if (looped && !skipOomAdj) {
// If we had finished the last ordered broadcast, then
// make sure all processes have correct oom and sched
diff --git a/services/core/java/com/android/server/am/CacheOomRanker.java b/services/core/java/com/android/server/am/CacheOomRanker.java
index 26cfd62..45ce4c5 100644
--- a/services/core/java/com/android/server/am/CacheOomRanker.java
+++ b/services/core/java/com/android/server/am/CacheOomRanker.java
@@ -60,6 +60,9 @@
private final Object mPhenotypeFlagLock = new Object();
+ private final ActivityManagerService mService;
+ private final Object mProfilerLock;
+
@GuardedBy("mPhenotypeFlagLock")
private boolean mUseOomReRanking = DEFAULT_USE_OOM_RE_RANKING;
// Weight to apply to the LRU ordering.
@@ -101,6 +104,11 @@
}
};
+ CacheOomRanker(final ActivityManagerService service) {
+ mService = service;
+ mProfilerLock = service.mAppProfiler.mProfilerLock;
+ }
+
/** Load settings from device config and register a listener for changes. */
public void init(Executor executor) {
DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -223,7 +231,9 @@
addToScore(scoredProcessRecords, lruWeight);
}
if (rssWeight > 0.0f) {
- Arrays.sort(scoredProcessRecords, LAST_RSS_COMPARATOR);
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ Arrays.sort(scoredProcessRecords, LAST_RSS_COMPARATOR);
+ }
addToScore(scoredProcessRecords, rssWeight);
}
if (usesWeight > 0.0f) {
@@ -297,7 +307,7 @@
@Override
public int compare(RankedProcessRecord o1, RankedProcessRecord o2) {
// High RSS first to match least recently used.
- return Long.compare(o2.proc.mLastRss, o1.proc.mLastRss);
+ return Long.compare(o2.proc.mProfile.getLastRss(), o1.proc.mProfile.getLastRss());
}
}
diff --git a/services/core/java/com/android/server/am/ConnectionRecord.java b/services/core/java/com/android/server/am/ConnectionRecord.java
index 6d9d3fb..e6cd509 100644
--- a/services/core/java/com/android/server/am/ConnectionRecord.java
+++ b/services/core/java/com/android/server/am/ConnectionRecord.java
@@ -128,7 +128,7 @@
&& association == null && binding.service.app != null
&& (binding.service.appInfo.uid != clientUid
|| !binding.service.processName.equals(clientProcessName))) {
- ProcessStats.ProcessStateHolder holder = binding.service.app.pkgList.get(
+ ProcessStats.ProcessStateHolder holder = binding.service.app.getPkgList().get(
binding.service.instanceName.getPackageName());
if (holder == null) {
Slog.wtf(TAG_AM, "No package in referenced service "
diff --git a/services/core/java/com/android/server/am/ContentProviderConnection.java b/services/core/java/com/android/server/am/ContentProviderConnection.java
index be49ce4..efee432 100644
--- a/services/core/java/com/android/server/am/ContentProviderConnection.java
+++ b/services/core/java/com/android/server/am/ContentProviderConnection.java
@@ -16,6 +16,9 @@
package com.android.server.am;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROVIDER;
+import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
+
import android.os.Binder;
import android.os.SystemClock;
import android.util.Slog;
@@ -25,9 +28,6 @@
import com.android.internal.app.procstats.AssociationState;
import com.android.internal.app.procstats.ProcessStats;
-import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROVIDER;
-import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
-
/**
* Represents a link between a content provider and client.
*/
@@ -71,7 +71,7 @@
&& association == null && provider.proc != null
&& (provider.appInfo.uid != client.uid
|| !provider.info.processName.equals(client.processName))) {
- ProcessStats.ProcessStateHolder holder = provider.proc.pkgList.get(
+ ProcessStats.ProcessStateHolder holder = provider.proc.getPkgList().get(
provider.name.getPackageName());
if (holder == null) {
Slog.wtf(TAG_AM, "No package in referenced provider "
diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index 89ed423..478c512 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -1214,9 +1214,8 @@
final ProcessRecord app = apps.valueAt(iApp);
if (app.userId != userId || app.thread == null || app.unlocked) continue;
- for (int iPkg = 0, numPkgs = app.pkgList.size(); iPkg < numPkgs; iPkg++) {
+ app.getPkgList().forEachPackage(pkgName -> {
try {
- final String pkgName = app.pkgList.keyAt(iPkg);
final PackageInfo pkgInfo = AppGlobals.getPackageManager()
.getPackageInfo(pkgName, matchFlags, userId);
if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) {
@@ -1243,7 +1242,7 @@
}
} catch (RemoteException ignored) {
}
- }
+ });
}
}
}
@@ -1430,13 +1429,14 @@
return mService.validateAssociationAllowedLocked(cpi.packageName,
cpi.applicationInfo.uid, null, callingUid) ? null : "<null>";
}
- for (int i = callingApp.pkgList.size() - 1; i >= 0; i--) {
- if (!mService.validateAssociationAllowedLocked(callingApp.pkgList.keyAt(i),
+ final String r = callingApp.getPkgList().forEachPackage(pkgName -> {
+ if (!mService.validateAssociationAllowedLocked(pkgName,
callingApp.uid, cpi.packageName, cpi.applicationInfo.uid)) {
return cpi.packageName;
}
- }
- return null;
+ return null;
+ });
+ return r;
}
ProviderInfo getProviderInfoLocked(String authority, @UserIdInt int userId, int pmFlags) {
@@ -1531,7 +1531,7 @@
private boolean requestTargetProviderPermissionsReviewIfNeededLocked(ProviderInfo cpi,
ProcessRecord r, final int userId, Context context) {
- if (!mService.getPackageManagerInternalLocked().isPermissionsReviewRequired(
+ if (!mService.getPackageManagerInternal().isPermissionsReviewRequired(
cpi.packageName, userId)) {
return true;
}
diff --git a/services/core/java/com/android/server/am/ContentProviderRecord.java b/services/core/java/com/android/server/am/ContentProviderRecord.java
index fb8b5d4..59a1939 100644
--- a/services/core/java/com/android/server/am/ContentProviderRecord.java
+++ b/services/core/java/com/android/server/am/ContentProviderRecord.java
@@ -343,7 +343,7 @@
&& mAssociation == null && provider.proc != null
&& (provider.appInfo.uid != mOwningUid
|| !provider.info.processName.equals(mOwningProcessName))) {
- ProcessStats.ProcessStateHolder holder = provider.proc.pkgList.get(
+ ProcessStats.ProcessStateHolder holder = provider.proc.getPkgList().get(
provider.name.getPackageName());
if (holder == null) {
Slog.wtf(TAG_AM, "No package in referenced provider "
diff --git a/services/core/java/com/android/server/am/FgsStartTempAllowList.java b/services/core/java/com/android/server/am/FgsStartTempAllowList.java
index 3aca4cf..4d8749c 100644
--- a/services/core/java/com/android/server/am/FgsStartTempAllowList.java
+++ b/services/core/java/com/android/server/am/FgsStartTempAllowList.java
@@ -70,4 +70,8 @@
return true;
}
}
+
+ void remove(int uid) {
+ mTempAllowListFgs.delete(uid);
+ }
}
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index de79315..5e146e1 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -65,10 +65,10 @@
import static com.android.server.am.ActivityManagerService.TAG_BACKUP;
import static com.android.server.am.ActivityManagerService.TAG_LRU;
import static com.android.server.am.ActivityManagerService.TAG_OOM_ADJ;
-import static com.android.server.am.ActivityManagerService.TAG_PROCESS_OBSERVERS;
import static com.android.server.am.ActivityManagerService.TAG_UID_OBSERVERS;
import static com.android.server.am.ActivityManagerService.TOP_APP_PRIORITY_BOOST;
import static com.android.server.am.AppProfiler.TAG_PSS;
+import static com.android.server.am.ProcessList.TAG_PROCESS_OBSERVERS;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;
import android.app.ActivityManager;
@@ -131,7 +131,7 @@
static final String OOM_ADJ_REASON_GET_PROVIDER = OOM_ADJ_REASON_METHOD + "_getProvider";
static final String OOM_ADJ_REASON_REMOVE_PROVIDER = OOM_ADJ_REASON_METHOD + "_removeProvider";
static final String OOM_ADJ_REASON_UI_VISIBILITY = OOM_ADJ_REASON_METHOD + "_uiVisibility";
- static final String OOM_ADJ_REASON_WHITELIST = OOM_ADJ_REASON_METHOD + "_whitelistChange";
+ static final String OOM_ADJ_REASON_ALLOWLIST = OOM_ADJ_REASON_METHOD + "_allowlistChange";
static final String OOM_ADJ_REASON_PROCESS_BEGIN = OOM_ADJ_REASON_METHOD + "_processBegin";
static final String OOM_ADJ_REASON_PROCESS_END = OOM_ADJ_REASON_METHOD + "_processEnd";
@@ -337,7 +337,7 @@
mLocalPowerManager = LocalServices.getService(PowerManagerInternal.class);
mConstants = mService.mConstants;
mCachedAppOptimizer = new CachedAppOptimizer(mService);
- mCacheOomRanker = new CacheOomRanker();
+ mCacheOomRanker = new CacheOomRanker(service);
mProcessGroupHandler = new Handler(adjusterThread.getLooper(), msg -> {
final int pid = msg.arg1;
@@ -394,7 +394,7 @@
final ProcessRecord app = processes.get(i);
boolean includeWarmPkg = false;
for (int j = warmServices.size() - 1; j >= 0; j--) {
- if (app.pkgList.containsKey(warmServices.valueAt(j).getPackageName())) {
+ if (app.getPkgList().containsKey(warmServices.valueAt(j).getPackageName())) {
includeWarmPkg = true;
break;
}
@@ -422,7 +422,7 @@
if (oomAdjAll && mConstants.OOMADJ_UPDATE_QUICK) {
return updateOomAdjLocked(app, oomAdjReason);
}
- final ProcessRecord TOP_APP = mService.getTopAppLocked();
+ final ProcessRecord topApp = mService.getTopApp();
final boolean wasCached = app.isCached();
mAdjSeq++;
@@ -435,7 +435,7 @@
? app.getCurRawAdj() : ProcessList.UNKNOWN_ADJ;
// Check if this process is in the pending list too, remove from pending list if so.
mPendingProcessSet.remove(app);
- boolean success = updateOomAdjLocked(app, cachedAdj, TOP_APP, false,
+ boolean success = updateOomAdjLocked(app, cachedAdj, topApp, false,
SystemClock.uptimeMillis());
if (oomAdjAll
&& (wasCached != app.isCached() || app.getCurRawAdj() == ProcessList.UNKNOWN_ADJ)) {
@@ -488,7 +488,7 @@
if (uidRec.getCurProcState() != PROCESS_STATE_NONEXISTENT
&& (uidRec.setProcState != uidRec.getCurProcState()
|| uidRec.setCapability != uidRec.curCapability
- || uidRec.setWhitelist != uidRec.curWhitelist)) {
+ || uidRec.mSetAllowlist != uidRec.mCurAllowlist)) {
ActiveUids uids = mTmpUidRecords;
uids.clear();
uids.put(uidRec.uid, uidRec);
@@ -505,7 +505,7 @@
*/
@GuardedBy("mService")
void updateOomAdjLocked(String oomAdjReason) {
- final ProcessRecord topApp = mService.getTopAppLocked();
+ final ProcessRecord topApp = mService.getTopApp();
// Clear any pending ones because we are doing a full update now.
mPendingProcessSet.clear();
mService.mAppProfiler.mHasPreviousProcess = mService.mAppProfiler.mHasHomeProcess = false;
@@ -527,7 +527,7 @@
return true;
}
- final ProcessRecord topApp = mService.getTopAppLocked();
+ final ProcessRecord topApp = mService.getTopApp();
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReason);
mService.mOomAdjProfiler.oomAdjStarted();
@@ -676,7 +676,7 @@
if (mPendingProcessSet.isEmpty()) {
return;
}
- final ProcessRecord topApp = mService.getTopAppLocked();
+ final ProcessRecord topApp = mService.getTopApp();
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReason);
mService.mOomAdjProfiler.oomAdjStarted();
@@ -1112,19 +1112,19 @@
if (uidRec.getCurProcState() != PROCESS_STATE_NONEXISTENT
&& (uidRec.setProcState != uidRec.getCurProcState()
|| uidRec.setCapability != uidRec.curCapability
- || uidRec.setWhitelist != uidRec.curWhitelist)) {
+ || uidRec.mSetAllowlist != uidRec.mCurAllowlist)) {
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS, "Changes in " + uidRec
+ ": proc state from " + uidRec.setProcState + " to "
+ uidRec.getCurProcState() + ", capability from "
+ uidRec.setCapability + " to " + uidRec.curCapability
- + ", whitelist from " + uidRec.setWhitelist
- + " to " + uidRec.curWhitelist);
+ + ", allowlist from " + uidRec.mSetAllowlist
+ + " to " + uidRec.mCurAllowlist);
if (ActivityManager.isProcStateBackground(uidRec.getCurProcState())
- && !uidRec.curWhitelist) {
+ && !uidRec.mCurAllowlist) {
// UID is now in the background (and not on the temp allowlist). Was it
// previously in the foreground (or on the temp allowlist)?
if (!ActivityManager.isProcStateBackground(uidRec.setProcState)
- || uidRec.setWhitelist) {
+ || uidRec.mSetAllowlist) {
uidRec.lastBackgroundTime = nowElapsed;
if (!mService.mHandler.hasMessages(IDLE_UIDS_MSG)) {
// Note: the background settle time is in elapsed realtime, while
@@ -1156,7 +1156,7 @@
}
uidRec.setProcState = uidRec.getCurProcState();
uidRec.setCapability = uidRec.curCapability;
- uidRec.setWhitelist = uidRec.curWhitelist;
+ uidRec.mSetAllowlist = uidRec.mCurAllowlist;
uidRec.setIdle = uidRec.idle;
mService.mAtmInternal.onUidProcStateChanged(uidRec.uid, uidRec.setProcState);
mService.enqueueUidChangeLocked(uidRec, -1, uidChange);
@@ -1353,7 +1353,7 @@
// The max adjustment doesn't allow this app to be anything
// below foreground, so it is not worth doing work for it.
if (DEBUG_OOM_ADJ_REASON || logUid == appUid) {
- mService.reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making fixed: " + app);
+ reportOomAdjMessageLocked(TAG_OOM_ADJ, "Making fixed: " + app);
}
app.adjType = "fixed";
app.adjSeq = mAdjSeq;
@@ -1379,7 +1379,7 @@
app.systemNoUi = false;
}
if (!app.systemNoUi) {
- if (mService.mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE) {
+ if (mService.mWakefulness.get() == PowerManagerInternal.WAKEFULNESS_AWAKE) {
// screen on, promote UI
app.setCurProcState(ActivityManager.PROCESS_STATE_PERSISTENT_UI);
app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_TOP_APP);
@@ -1912,7 +1912,7 @@
clientProcState = PROCESS_STATE_BOUND_FOREGROUND_SERVICE;
app.bumpAllowStartFgsState(
PROCESS_STATE_BOUND_FOREGROUND_SERVICE);
- } else if (mService.mWakefulness
+ } else if (mService.mWakefulness.get()
== PowerManagerInternal.WAKEFULNESS_AWAKE
&& (cr.flags & Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE)
!= 0) {
@@ -2197,7 +2197,8 @@
// is large we want to force it down since we would prefer to
// keep launcher over it.
if (!mService.mAppProfiler.isLastMemoryLevelNormal()
- && app.lastPss >= mProcessList.getCachedRestoreThresholdKb()) {
+ && app.mProfile.getLastPss()
+ >= mProcessList.getCachedRestoreThresholdKb()) {
app.serviceHighRam = true;
app.serviceb = true;
//Slog.i(TAG, "ADJ " + app + " high ram!");
@@ -2228,7 +2229,7 @@
// Put bound foreground services in a special sched group for additional
// restrictions on screen off
if (procState >= PROCESS_STATE_BOUND_FOREGROUND_SERVICE
- && mService.mWakefulness != PowerManagerInternal.WAKEFULNESS_AWAKE) {
+ && mService.mWakefulness.get() != PowerManagerInternal.WAKEFULNESS_AWAKE) {
if (schedGroup > ProcessList.SCHED_GROUP_RESTRICTED) {
schedGroup = ProcessList.SCHED_GROUP_RESTRICTED;
}
@@ -2324,11 +2325,13 @@
}
/** Inform the oomadj observer of changes to oomadj. Used by tests. */
- @GuardedBy("mService")
void reportOomAdjMessageLocked(String tag, String msg) {
Slog.d(tag, msg);
- if (mService.mCurOomAdjObserver != null) {
- mService.mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg).sendToTarget();
+ synchronized (mService.mOomAdjObserverLock) {
+ if (mService.mCurOomAdjObserver != null) {
+ mService.mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg)
+ .sendToTarget();
+ }
}
}
@@ -2361,7 +2364,7 @@
&& app.curAdj <= ProcessList.CACHED_APP_MAX_ADJ) {
mCachedAppOptimizer.compactAppFull(app);
}
- } else if (mService.mWakefulness != PowerManagerInternal.WAKEFULNESS_AWAKE
+ } else if (mService.mWakefulness.get() != PowerManagerInternal.WAKEFULNESS_AWAKE
&& app.setAdj < ProcessList.FOREGROUND_APP_ADJ
// Because these can fire independent of oom_adj/procstate changes, we need
// to throttle the actual dispatch of these requests in addition to the
@@ -2369,7 +2372,7 @@
// and in CachedAppOptimizer.
&& mCachedAppOptimizer.shouldCompactPersistent(app, now)) {
mCachedAppOptimizer.compactAppPersistent(app);
- } else if (mService.mWakefulness != PowerManagerInternal.WAKEFULNESS_AWAKE
+ } else if (mService.mWakefulness.get() != PowerManagerInternal.WAKEFULNESS_AWAKE
&& app.getCurProcState()
== ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE
&& mCachedAppOptimizer.shouldCompactBFGS(app, now)) {
@@ -2511,18 +2514,22 @@
}
}
}
+ boolean forceUpdatePssTime = false;
if (app.setProcState == PROCESS_STATE_NONEXISTENT
|| ProcessList.procStatesDifferForMem(app.getCurProcState(), app.setProcState)) {
app.lastStateTime = now;
- mService.mAppProfiler.updateNextPssTimeLocked(app.getCurProcState(), app, now, true);
+ forceUpdatePssTime = true;
if (DEBUG_PSS) {
Slog.d(TAG_PSS, "Process state change from "
+ ProcessList.makeProcStateString(app.setProcState) + " to "
+ ProcessList.makeProcStateString(app.getCurProcState()) + " next pss in "
- + (app.nextPssTime - now) + ": " + app);
+ + (app.mProfile.getNextPssTime() - now) + ": " + app);
}
- } else {
- mService.mAppProfiler.updateNextPssTimeLocked(app.getCurProcState(), app, now, false);
+ }
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ app.mProfile.updateProcState(app);
+ mService.mAppProfiler.updateNextPssTimeLPf(
+ app.getCurProcState(), app.mProfile, now, forceUpdatePssTime);
}
if (app.setProcState != app.getCurProcState()) {
if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.uid) {
@@ -2538,7 +2545,7 @@
// arbitrary amounts of battery power. Note its current CPU time to later know to
// kill it if it is not behaving well.
app.setWhenUnimportant(now);
- app.lastCpuTime = 0;
+ app.mProfile.mLastCpuTime.set(0);
}
// Inform UsageStats of important process state change
// Must be called before updating setProcState
@@ -2576,7 +2583,7 @@
if (DEBUG_PROCESS_OBSERVERS) Slog.i(TAG_PROCESS_OBSERVERS,
"Changes in " + app + ": " + changes);
ActivityManagerService.ProcessChangeItem item =
- mService.enqueueProcessChangeItemLocked(app.pid, app.info.uid);
+ mProcessList.enqueueProcessChangeItemLocked(app.pid, app.info.uid);
item.changes |= changes;
item.foregroundActivities = app.repForegroundActivities;
item.capability = app.setCapability;
@@ -2730,27 +2737,27 @@
}
@GuardedBy("mService")
- final void setAppIdTempWhitelistStateLocked(int uid, boolean onWhitelist) {
+ void setAppIdTempAllowlistStateLocked(int uid, boolean onAllowlist) {
boolean changed = false;
for (int i = mActiveUids.size() - 1; i >= 0; i--) {
final UidRecord uidRec = mActiveUids.valueAt(i);
- if (uidRec.uid == uid && uidRec.curWhitelist != onWhitelist) {
- uidRec.curWhitelist = onWhitelist;
+ if (uidRec.uid == uid && uidRec.mCurAllowlist != onAllowlist) {
+ uidRec.mCurAllowlist = onAllowlist;
changed = true;
}
}
if (changed) {
- updateOomAdjLocked(OOM_ADJ_REASON_WHITELIST);
+ updateOomAdjLocked(OOM_ADJ_REASON_ALLOWLIST);
}
}
@GuardedBy("mService")
- final void setUidTempWhitelistStateLocked(int uid, boolean onWhitelist) {
+ void setUidTempAllowlistStateLocked(int uid, boolean onAllowlist) {
boolean changed = false;
final UidRecord uidRec = mActiveUids.get(uid);
- if (uidRec != null && uidRec.curWhitelist != onWhitelist) {
- uidRec.curWhitelist = onWhitelist;
- updateOomAdjLocked(OOM_ADJ_REASON_WHITELIST);
+ if (uidRec != null && uidRec.mCurAllowlist != onAllowlist) {
+ uidRec.mCurAllowlist = onAllowlist;
+ updateOomAdjLocked(OOM_ADJ_REASON_ALLOWLIST);
}
}
diff --git a/services/core/java/com/android/server/am/PackageList.java b/services/core/java/com/android/server/am/PackageList.java
new file mode 100644
index 0000000..978bcb7
--- /dev/null
+++ b/services/core/java/com/android/server/am/PackageList.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.am;
+
+import android.content.pm.VersionedPackage;
+import android.util.ArrayMap;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.app.procstats.ProcessStats;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * List of packages running in the process, self locked.
+ */
+final class PackageList {
+ private final ProcessRecord mProcess;
+
+ private final ArrayMap<String, ProcessStats.ProcessStateHolder> mPkgList = new ArrayMap<>();
+
+ PackageList(final ProcessRecord app) {
+ mProcess = app;
+ }
+
+ ProcessStats.ProcessStateHolder put(String key, ProcessStats.ProcessStateHolder value) {
+ synchronized (this) {
+ mProcess.getWindowProcessController().addPackage(key);
+ return mPkgList.put(key, value);
+ }
+ }
+
+ void clear() {
+ synchronized (this) {
+ mPkgList.clear();
+ mProcess.getWindowProcessController().clearPackageList();
+ }
+ }
+
+ int size() {
+ synchronized (this) {
+ return mPkgList.size();
+ }
+ }
+
+ boolean containsKey(Object key) {
+ synchronized (this) {
+ return mPkgList.containsKey(key);
+ }
+ }
+
+ ProcessStats.ProcessStateHolder get(String pkgName) {
+ synchronized (this) {
+ return mPkgList.get(pkgName);
+ }
+ }
+
+ void forEachPackage(Consumer<String> callback) {
+ synchronized (this) {
+ for (int i = 0, size = mPkgList.size(); i < size; i++) {
+ callback.accept(mPkgList.keyAt(i));
+ }
+ }
+ }
+
+ void forEachPackage(BiConsumer<String, ProcessStats.ProcessStateHolder> callback) {
+ synchronized (this) {
+ for (int i = 0, size = mPkgList.size(); i < size; i++) {
+ callback.accept(mPkgList.keyAt(i), mPkgList.valueAt(i));
+ }
+ }
+ }
+
+ <R> R forEachPackage(Function<String, R> callback) {
+ synchronized (this) {
+ for (int i = 0, size = mPkgList.size(); i < size; i++) {
+ R r = callback.apply(mPkgList.keyAt(i));
+ if (r != null) {
+ return r;
+ }
+ }
+ }
+ return null;
+ }
+
+ void forEachPackageProcessStats(Consumer<ProcessStats.ProcessStateHolder> callback) {
+ synchronized (this) {
+ for (int i = 0, size = mPkgList.size(); i < size; i++) {
+ callback.accept(mPkgList.valueAt(i));
+ }
+ }
+ }
+
+ @GuardedBy("this")
+ ArrayMap<String, ProcessStats.ProcessStateHolder> getPackageListLocked() {
+ return mPkgList;
+ }
+
+ String[] getPackageList() {
+ synchronized (this) {
+ int size = mPkgList.size();
+ if (size == 0) {
+ return null;
+ }
+ final String[] list = new String[size];
+ for (int i = 0; i < size; i++) {
+ list[i] = mPkgList.keyAt(i);
+ }
+ return list;
+ }
+ }
+
+ List<VersionedPackage> getPackageListWithVersionCode() {
+ synchronized (this) {
+ int size = mPkgList.size();
+ if (size == 0) {
+ return null;
+ }
+ List<VersionedPackage> list = new ArrayList<>();
+ for (int i = 0; i < size; i++) {
+ list.add(new VersionedPackage(mPkgList.keyAt(i), mPkgList.valueAt(i).appVersion));
+ }
+ return list;
+ }
+ }
+
+ void dump(PrintWriter pw, String prefix) {
+ synchronized (this) {
+ pw.print(prefix); pw.print("packageList={");
+ for (int i = 0, size = mPkgList.size(); i < size; i++) {
+ if (i > 0) pw.print(", ");
+ pw.print(mPkgList.keyAt(i));
+ }
+ pw.println("}");
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/am/PendingTempAllowlists.java b/services/core/java/com/android/server/am/PendingTempAllowlists.java
new file mode 100644
index 0000000..75935c4
--- /dev/null
+++ b/services/core/java/com/android/server/am/PendingTempAllowlists.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.am;
+
+import android.util.SparseArray;
+
+/** Allowlists of uids to temporarily bypass Power Save mode. */
+final class PendingTempAllowlists {
+
+ private ActivityManagerService mService;
+
+ private final SparseArray<ActivityManagerService.PendingTempAllowlist> mPendingTempAllowlist =
+ new SparseArray<>();
+
+ PendingTempAllowlists(ActivityManagerService service) {
+ mService = service;
+ }
+
+ void put(int uid, ActivityManagerService.PendingTempAllowlist value) {
+ mPendingTempAllowlist.put(uid, value);
+ mService.mAtmInternal.onUidAddedToPendingTempAllowlist(uid, value.tag);
+ }
+
+ void removeAt(int index) {
+ final int uid = mPendingTempAllowlist.keyAt(index);
+ mPendingTempAllowlist.removeAt(index);
+ mService.mAtmInternal.onUidRemovedFromPendingTempAllowlist(uid);
+ }
+
+ ActivityManagerService.PendingTempAllowlist get(int uid) {
+ return mPendingTempAllowlist.get(uid);
+ }
+
+ int size() {
+ return mPendingTempAllowlist.size();
+ }
+
+ ActivityManagerService.PendingTempAllowlist valueAt(int index) {
+ return mPendingTempAllowlist.valueAt(index);
+ }
+
+ int indexOfKey(int key) {
+ return mPendingTempAllowlist.indexOfKey(key);
+ }
+}
diff --git a/services/core/java/com/android/server/am/PendingTempWhitelists.java b/services/core/java/com/android/server/am/PendingTempWhitelists.java
deleted file mode 100644
index 50d58f0..0000000
--- a/services/core/java/com/android/server/am/PendingTempWhitelists.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2018 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.am;
-
-import android.util.SparseArray;
-
-/** Whitelists of uids to temporarily bypass Power Save mode. */
-final class PendingTempWhitelists {
-
- private ActivityManagerService mService;
-
- private final SparseArray<ActivityManagerService.PendingTempWhitelist> mPendingTempWhitelist =
- new SparseArray<>();
-
- PendingTempWhitelists(ActivityManagerService service) {
- mService = service;
- }
-
- void put(int uid, ActivityManagerService.PendingTempWhitelist value) {
- mPendingTempWhitelist.put(uid, value);
- mService.mAtmInternal.onUidAddedToPendingTempAllowlist(uid, value.tag);
- }
-
- void removeAt(int index) {
- final int uid = mPendingTempWhitelist.keyAt(index);
- mPendingTempWhitelist.removeAt(index);
- mService.mAtmInternal.onUidRemovedFromPendingTempAllowlist(uid);
- }
-
- ActivityManagerService.PendingTempWhitelist get(int uid) {
- return mPendingTempWhitelist.get(uid);
- }
-
- int size() {
- return mPendingTempWhitelist.size();
- }
-
- ActivityManagerService.PendingTempWhitelist valueAt(int index) {
- return mPendingTempWhitelist.valueAt(index);
- }
-
- int indexOfKey(int key) {
- return mPendingTempWhitelist.indexOfKey(key);
- }
-}
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 2273779..a768532 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -34,10 +34,14 @@
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LRU;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_NETWORK;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESSES;
+import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBSERVERS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PSS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_UID_OBSERVERS;
+import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_PROCESS_OBSERVERS;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;
import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
+import static com.android.server.am.ActivityManagerService.DISPATCH_PROCESSES_CHANGED_UI_MSG;
+import static com.android.server.am.ActivityManagerService.DISPATCH_PROCESS_DIED_UI_MSG;
import static com.android.server.am.ActivityManagerService.KILL_APP_ZYGOTE_DELAY_MS;
import static com.android.server.am.ActivityManagerService.KILL_APP_ZYGOTE_MSG;
import static com.android.server.am.ActivityManagerService.PERSISTENT_MASK;
@@ -59,6 +63,7 @@
import android.app.ApplicationExitInfo.Reason;
import android.app.ApplicationExitInfo.SubReason;
import android.app.IApplicationThread;
+import android.app.IProcessObserver;
import android.app.IUidObserver;
import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
@@ -86,6 +91,7 @@
import android.os.Message;
import android.os.PowerManager;
import android.os.Process;
+import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.StrictMode;
import android.os.SystemClock;
@@ -97,18 +103,20 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
+import android.util.DebugUtils;
import android.util.EventLog;
import android.util.LongSparseArray;
import android.util.Pair;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
+import android.util.TimeUtils;
+import android.util.proto.ProtoOutputStream;
import android.view.Display;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.ProcessMap;
-import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.os.Zygote;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.FrameworkStatsLog;
@@ -117,6 +125,7 @@
import com.android.server.ServiceThread;
import com.android.server.SystemConfig;
import com.android.server.Watchdog;
+import com.android.server.am.ActivityManagerService.ProcessChangeItem;
import com.android.server.compat.PlatformCompat;
import com.android.server.pm.dex.DexManager;
import com.android.server.pm.parsing.pkg.AndroidPackage;
@@ -134,6 +143,8 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -145,6 +156,8 @@
public final class ProcessList {
static final String TAG = TAG_WITH_CLASS_NAME ? "ProcessList" : TAG_AM;
+ static final String TAG_PROCESS_OBSERVERS = TAG + POSTFIX_PROCESS_OBSERVERS;
+
// A system property to control if app data isolation is enabled.
static final String ANDROID_APP_DATA_ISOLATION_ENABLED_PROPERTY =
"persist.zygote.app_data_isolation";
@@ -416,7 +429,7 @@
private boolean mVoldAppDataIsolationEnabled = false;
- private ArrayList<String> mAppDataIsolationWhitelistedApps;
+ private ArrayList<String> mAppDataIsolationAllowlistedApps;
/**
* Temporary to avoid allocations. Protected by main lock.
@@ -643,6 +656,25 @@
*/
final ArrayList<ProcessRecord> mRemovedProcesses = new ArrayList<ProcessRecord>();
+ // Self locked with the inner lock within the RemoteCallbackList
+ private final RemoteCallbackList<IProcessObserver> mProcessObservers =
+ new RemoteCallbackList<>();
+
+ // No lock is needed as it's accessed from single thread only
+ private ProcessChangeItem[] mActiveProcessChanges = new ProcessChangeItem[5];
+
+ @GuardedBy("mProcessChangeLock")
+ private final ArrayList<ProcessChangeItem> mPendingProcessChanges = new ArrayList<>();
+
+ @GuardedBy("mProcessChangeLock")
+ final ArrayList<ProcessChangeItem> mAvailProcessChanges = new ArrayList<>();
+
+ /**
+ * A dedicated lock for dispatching the process changes as it occurs frequently
+ */
+ private final Object mProcessChangeLock = new Object();
+
+
/**
* All of the applications we currently have running organized by name.
* The keys are strings of the application package name (as
@@ -723,7 +755,7 @@
SystemProperties.getBoolean(ANDROID_APP_DATA_ISOLATION_ENABLED_PROPERTY, true);
mVoldAppDataIsolationEnabled = SystemProperties.getBoolean(
ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY, false);
- mAppDataIsolationWhitelistedApps = new ArrayList<>(
+ mAppDataIsolationAllowlistedApps = new ArrayList<>(
SystemConfig.getInstance().getAppDataIsolationWhitelistedApps());
if (sKillHandler == null) {
@@ -1523,47 +1555,34 @@
ProcessRecord proc = mProcessNames.get(processName, uid);
if (false && proc != null && !keepIfLarge
&& proc.setProcState >= ActivityManager.PROCESS_STATE_CACHED_EMPTY
- && proc.lastCachedPss >= 4000) {
+ && proc.mProfile.getLastCachedPss() >= 4000) {
// Turn this condition on to cause killing to happen regularly, for testing.
- synchronized (mService.mProcessStats.mLock) {
- if (proc.baseProcessTracker != null) {
- proc.baseProcessTracker.reportCachedKill(
- proc.pkgList.mPkgList, proc.lastCachedPss);
- for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
- FrameworkStatsLog.write(FrameworkStatsLog.CACHED_KILL_REPORTED,
- proc.info.uid,
- holder.state.getName(),
- holder.state.getPackage(),
- proc.lastCachedPss, holder.appVersion);
- }
- }
+ final long lastCachedPss;
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ proc.mProfile.reportCachedKill();
+ lastCachedPss = proc.mProfile.getLastCachedPss();
}
- proc.kill(Long.toString(proc.lastCachedPss) + "k from cached",
+ proc.kill(Long.toString(lastCachedPss) + "k from cached",
ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_LARGE_CACHED,
true);
} else if (proc != null && !keepIfLarge
&& !mService.mAppProfiler.isLastMemoryLevelNormal()
&& proc.setProcState >= ActivityManager.PROCESS_STATE_CACHED_EMPTY) {
- if (DEBUG_PSS) Slog.d(TAG_PSS, "May not keep " + proc + ": pss=" + proc
- .lastCachedPss);
- if (proc.lastCachedPss >= getCachedRestoreThresholdKb()) {
- synchronized (mService.mProcessStats.mLock) {
- if (proc.baseProcessTracker != null) {
- proc.baseProcessTracker.reportCachedKill(proc.pkgList.mPkgList,
- proc.lastCachedPss);
- for (int ipkg = proc.pkgList.size() - 1; ipkg >= 0; ipkg--) {
- ProcessStats.ProcessStateHolder holder = proc.pkgList.valueAt(ipkg);
- FrameworkStatsLog.write(FrameworkStatsLog.CACHED_KILL_REPORTED,
- proc.info.uid,
- holder.state.getName(),
- holder.state.getPackage(),
- proc.lastCachedPss, holder.appVersion);
- }
- }
+ final long lastCachedPss;
+ boolean doKilling = false;
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ lastCachedPss = proc.mProfile.getLastCachedPss();
+ if (lastCachedPss >= getCachedRestoreThresholdKb()) {
+ proc.mProfile.reportCachedKill();
+ doKilling = true;
}
- proc.kill(Long.toString(proc.lastCachedPss) + "k from cached",
+ }
+ if (DEBUG_PSS) {
+ Slog.d(TAG_PSS, "May not keep " + proc + ": pss=" + lastCachedPss);
+ }
+ if (doKilling) {
+ proc.kill(Long.toString(lastCachedPss) + "k from cached",
ApplicationExitInfo.REASON_OTHER,
ApplicationExitInfo.SUBREASON_LARGE_CACHED,
true);
@@ -1770,7 +1789,7 @@
mService.mProcessesOnHold.remove(app);
checkSlow(startTime, "startProcess: starting to update cpu stats");
- mService.updateCpuStatsLocked();
+ mService.updateCpuStats();
checkSlow(startTime, "startProcess: done updating cpu stats");
try {
@@ -1873,10 +1892,16 @@
mService.mNativeDebuggingApp = null;
}
- if (app.info.isEmbeddedDexUsed()
- || (app.info.isPrivilegedApp()
- && DexManager.isPackageSelectedToRunOob(app.pkgList.mPkgList.keySet()))) {
+ if (app.info.isEmbeddedDexUsed()) {
runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES;
+ } else if (app.info.isPrivilegedApp()) {
+ final PackageList pkgList = app.getPkgList();
+ synchronized (pkgList) {
+ if (DexManager.isPackageSelectedToRunOob(
+ pkgList.getPackageListLocked().keySet())) {
+ runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES;
+ }
+ }
}
if (!disableHiddenApiChecks && !mService.mHiddenApiBlacklist.isDisabled()) {
@@ -2240,7 +2265,7 @@
}
Map<String, Pair<String, Long>> pkgDataInfoMap;
- Map<String, Pair<String, Long>> whitelistedAppDataInfoMap;
+ Map<String, Pair<String, Long>> allowlistedAppDataInfoMap;
boolean bindMountAppStorageDirs = false;
boolean bindMountAppsData = mAppDataIsolationEnabled
&& (UserHandle.isApp(app.uid) || UserHandle.isIsolated(app.uid))
@@ -2248,7 +2273,7 @@
// Get all packages belongs to the same shared uid. sharedPackages is empty array
// if it doesn't have shared uid.
- final PackageManagerInternal pmInt = mService.getPackageManagerInternalLocked();
+ final PackageManagerInternal pmInt = mService.getPackageManagerInternal();
final String[] sharedPackages = pmInt.getSharedUserPackagesForPackage(
app.info.packageName, app.userId);
final String[] targetPackagesList = sharedPackages.length == 0
@@ -2261,16 +2286,16 @@
bindMountAppsData = false;
}
- // Remove all packages in pkgDataInfoMap from mAppDataIsolationWhitelistedApps, so
+ // Remove all packages in pkgDataInfoMap from mAppDataIsolationAllowlistedApps, so
// it won't be mounted twice.
- final Set<String> whitelistedApps = new ArraySet<>(mAppDataIsolationWhitelistedApps);
+ final Set<String> allowlistedApps = new ArraySet<>(mAppDataIsolationAllowlistedApps);
for (String pkg : targetPackagesList) {
- whitelistedApps.remove(pkg);
+ allowlistedApps.remove(pkg);
}
- whitelistedAppDataInfoMap = getPackageAppDataInfoMap(pmInt,
- whitelistedApps.toArray(new String[0]), uid);
- if (whitelistedAppDataInfoMap == null) {
+ allowlistedAppDataInfoMap = getPackageAppDataInfoMap(pmInt,
+ allowlistedApps.toArray(new String[0]), uid);
+ if (allowlistedAppDataInfoMap == null) {
// TODO(b/152760674): Handle inode == 0 case properly, now we just give it a
// tmp free pass.
bindMountAppsData = false;
@@ -2295,7 +2320,7 @@
// since it has no access to them anyway.
if (app.isolated) {
pkgDataInfoMap = null;
- whitelistedAppDataInfoMap = null;
+ allowlistedAppDataInfoMap = null;
}
final Process.ProcessStartResult startResult;
@@ -2314,7 +2339,7 @@
app.info.targetSdkVersion, seInfo, requiredAbi, instructionSet,
app.info.dataDir, null, app.info.packageName,
/*zygotePolicyFlags=*/ ZYGOTE_POLICY_FLAG_EMPTY, isTopApp,
- app.mDisabledCompatChanges, pkgDataInfoMap, whitelistedAppDataInfoMap,
+ app.mDisabledCompatChanges, pkgDataInfoMap, allowlistedAppDataInfoMap,
false, false,
new String[]{PROC_START_SEQ_IDENT + app.startSeq});
} else {
@@ -2323,7 +2348,7 @@
app.info.targetSdkVersion, seInfo, requiredAbi, instructionSet,
app.info.dataDir, invokeWith, app.info.packageName, zygotePolicyFlags,
isTopApp, app.mDisabledCompatChanges, pkgDataInfoMap,
- whitelistedAppDataInfoMap, bindMountAppsData, bindMountAppStorageDirs,
+ allowlistedAppDataInfoMap, bindMountAppsData, bindMountAppStorageDirs,
new String[]{PROC_START_SEQ_IDENT + app.startSeq});
}
checkSlow(startTime, "startProcess: returned from zygote!");
@@ -2373,7 +2398,7 @@
// if it had been bad.
if (DEBUG_PROCESSES) Slog.v(TAG, "Clearing bad process: " + info.uid
+ "/" + processName);
- mService.mAppErrors.resetProcessCrashTimeLocked(processName, info.uid);
+ mService.mAppErrors.resetProcessCrashTime(processName, info.uid);
if (mService.mAppErrors.isBadProcess(processName, info.uid)) {
EventLog.writeEvent(EventLogTags.AM_PROC_GOOD,
UserHandle.getUserId(info.uid), info.uid,
@@ -2421,7 +2446,7 @@
if (!app.killed
|| mService.mAppProfiler.isLastMemoryLevelNormal()
|| app.setProcState < ActivityManager.PROCESS_STATE_CACHED_EMPTY
- || app.lastCachedPss < getCachedRestoreThresholdKb()) {
+ || app.mProfile.getLastCachedPss() < getCachedRestoreThresholdKb()) {
// Throw a wtf if it's not killed, or killed but not because the system was in
// memory pressure + the app was in "cch-empty" and used large amount of memory
Slog.wtf(TAG_PROCESSES, app.toString() + " is attached to a previous process");
@@ -2736,7 +2761,7 @@
if (userId != UserHandle.USER_ALL && app.userId != userId) {
continue;
}
- if (!app.pkgList.containsKey(packageName) && !isDep) {
+ if (!app.getPkgList().containsKey(packageName) && !isDep) {
continue;
}
}
@@ -2797,7 +2822,7 @@
mService.mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid);
if (app.isolated) {
mService.mBatteryStatsService.removeIsolatedUid(app.uid, app.info.uid);
- mService.getPackageManagerInternalLocked().removeIsolatedUid(app.uid);
+ mService.getPackageManagerInternal().removeIsolatedUid(app.uid);
}
}
boolean willRestart = false;
@@ -2847,10 +2872,10 @@
// This is the first appearance of the uid, report it now!
if (DEBUG_UID_OBSERVERS) Slog.i(TAG_UID_OBSERVERS,
"Creating new process uid: " + uidRec);
- if (Arrays.binarySearch(mService.mDeviceIdleTempWhitelist,
+ if (Arrays.binarySearch(mService.mDeviceIdleTempAllowlist,
UserHandle.getAppId(proc.uid)) >= 0
- || mService.mPendingTempWhitelist.indexOfKey(proc.uid) >= 0) {
- uidRec.setWhitelist = uidRec.curWhitelist = true;
+ || mService.mPendingTempAllowlist.indexOfKey(proc.uid) >= 0) {
+ uidRec.mSetAllowlist = uidRec.mCurAllowlist = true;
}
uidRec.updateHasInternetPermission();
mActiveUids.put(proc.uid, uidRec);
@@ -2904,7 +2929,7 @@
uid = isolatedUid;
}
mAppExitInfoTracker.mIsolatedUidRecords.addIsolatedUid(uid, info.uid);
- mService.getPackageManagerInternalLocked().addIsolatedUid(uid, info.uid);
+ mService.getPackageManagerInternal().addIsolatedUid(uid, info.uid);
// Register the isolated UID with this application so BatteryStats knows to
// attribute resource usage to the application.
@@ -2964,6 +2989,7 @@
UidRecord.CHANGE_GONE);
EventLogTags.writeAmUidStopped(uid);
mActiveUids.remove(uid);
+ mService.mFgsStartTempAllowList.remove(record.info.uid);
mService.noteUidProcessState(uid, ActivityManager.PROCESS_STATE_NONEXISTENT,
ActivityManager.PROCESS_CAPABILITY_NONE);
}
@@ -3582,14 +3608,14 @@
if (app.hasActivities()) {
outInfo.flags |= ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES;
}
- outInfo.lastTrimLevel = app.trimMemoryLevel;
+ outInfo.lastTrimLevel = app.mProfile.getTrimMemoryLevel();
int adj = app.curAdj;
int procState = app.getCurProcState();
outInfo.importance = procStateToImportance(procState, adj, outInfo,
clientTargetSdk);
outInfo.importanceReasonCode = app.adjTypeCode;
outInfo.processState = app.getCurProcState();
- outInfo.isFocused = (app == mService.getTopAppLocked());
+ outInfo.isFocused = (app == mService.getTopApp());
outInfo.lastActivityTime = app.lastActivityTime;
}
@@ -3653,6 +3679,729 @@
pw.println("):");
}
+ void dumpLruEntryLocked(PrintWriter pw, int index, ProcessRecord proc, String prefix) {
+ pw.print(prefix);
+ pw.print('#');
+ if (index < 10) {
+ pw.print(' ');
+ }
+ pw.print(index);
+ pw.print(": ");
+ pw.print(makeOomAdjString(proc.setAdj, false));
+ pw.print(' ');
+ pw.print(makeProcStateString(proc.getCurProcState()));
+ pw.print(' ');
+ ActivityManager.printCapabilitiesSummary(pw, proc.curCapability);
+ pw.print(' ');
+ pw.print(proc.toShortString());
+ if (proc.hasActivitiesOrRecentTasks() || proc.hasClientActivities()
+ || proc.treatLikeActivity) {
+ pw.print(" act:");
+ boolean printed = false;
+ if (proc.hasActivities()) {
+ pw.print("activities");
+ printed = true;
+ }
+ if (proc.hasRecentTasks()) {
+ if (printed) {
+ pw.print("|");
+ }
+ pw.print("recents");
+ printed = true;
+ }
+ if (proc.hasClientActivities()) {
+ if (printed) {
+ pw.print("|");
+ }
+ pw.print("client");
+ printed = true;
+ }
+ if (proc.treatLikeActivity) {
+ if (printed) {
+ pw.print("|");
+ }
+ pw.print("treated");
+ }
+ }
+ pw.println();
+ }
+
+ boolean dumpLruLocked(PrintWriter pw, String dumpPackage, String prefix) {
+ final int lruSize = mLruProcesses.size();
+ final String innerPrefix;
+ if (prefix == null) {
+ pw.println("ACTIVITY MANAGER LRU PROCESSES (dumpsys activity lru)");
+ innerPrefix = " ";
+ } else {
+ boolean haveAny = false;
+ for (int i = lruSize - 1; i >= 0; i--) {
+ final ProcessRecord r = mLruProcesses.get(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ haveAny = true;
+ break;
+ }
+ if (!haveAny) {
+ return false;
+ }
+ pw.print(prefix);
+ pw.println("Raw LRU list (dumpsys activity lru):");
+ innerPrefix = prefix + " ";
+ }
+ int i;
+ boolean first = true;
+ for (i = lruSize - 1; i >= mLruProcessActivityStart; i--) {
+ final ProcessRecord r = mLruProcesses.get(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ if (first) {
+ pw.print(innerPrefix);
+ pw.println("Activities:");
+ first = false;
+ }
+ dumpLruEntryLocked(pw, i, r, innerPrefix);
+ }
+ first = true;
+ for (; i >= mLruProcessServiceStart; i--) {
+ final ProcessRecord r = mLruProcesses.get(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ if (first) {
+ pw.print(innerPrefix);
+ pw.println("Services:");
+ first = false;
+ }
+ dumpLruEntryLocked(pw, i, r, innerPrefix);
+ }
+ first = true;
+ for (; i >= 0; i--) {
+ final ProcessRecord r = mLruProcesses.get(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ if (first) {
+ pw.print(innerPrefix);
+ pw.println("Other:");
+ first = false;
+ }
+ dumpLruEntryLocked(pw, i, r, innerPrefix);
+ }
+ return true;
+ }
+
+ @GuardedBy("mService")
+ void dumpProcessesLocked(FileDescriptor fd, PrintWriter pw, String[] args,
+ int opti, boolean dumpAll, String dumpPackage, int dumpAppId) {
+ boolean needSep = false;
+ int numPers = 0;
+
+ pw.println("ACTIVITY MANAGER RUNNING PROCESSES (dumpsys activity processes)");
+
+ if (dumpAll || dumpPackage != null) {
+ final int numOfNames = mProcessNames.getMap().size();
+ for (int ip = 0; ip < numOfNames; ip++) {
+ SparseArray<ProcessRecord> procs = mProcessNames.getMap().valueAt(ip);
+ for (int ia = 0, size = procs.size(); ia < size; ia++) {
+ ProcessRecord r = procs.valueAt(ia);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ if (!needSep) {
+ pw.println(" All known processes:");
+ needSep = true;
+ }
+ pw.print(r.isPersistent() ? " *PERS*" : " *APP*");
+ pw.print(" UID "); pw.print(procs.keyAt(ia));
+ pw.print(" "); pw.println(r);
+ r.dump(pw, " ");
+ if (r.isPersistent()) {
+ numPers++;
+ }
+ }
+ }
+ }
+
+ if (mIsolatedProcesses.size() > 0) {
+ boolean printed = false;
+ for (int i = 0, size = mIsolatedProcesses.size(); i < size; i++) {
+ ProcessRecord r = mIsolatedProcesses.valueAt(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ if (!printed) {
+ if (needSep) {
+ pw.println();
+ }
+ pw.println(" Isolated process list (sorted by uid):");
+ printed = true;
+ needSep = true;
+ }
+ pw.print(" Isolated #"); pw.print(i); pw.print(": ");
+ pw.println(r);
+ }
+ }
+
+ needSep = mService.dumpActiveInstruments(pw, dumpPackage, needSep);
+
+ if (dumpOomLocked(fd, pw, needSep, args, opti, dumpAll, dumpPackage, false)) {
+ needSep = true;
+ }
+
+ if (mActiveUids.size() > 0) {
+ needSep |= mActiveUids.dump(pw, dumpPackage, dumpAppId,
+ "UID states:", needSep);
+ }
+
+ if (dumpAll) {
+ needSep |= mService.mUidObserverController.dumpValidateUids(pw,
+ dumpPackage, dumpAppId, "UID validation:", needSep);
+ }
+
+ if (needSep) {
+ pw.println();
+ }
+ if (dumpLruLocked(pw, dumpPackage, " ")) {
+ needSep = true;
+ }
+
+ if (getLruSizeLocked() > 0) {
+ if (needSep) {
+ pw.println();
+ }
+ dumpLruListHeaderLocked(pw);
+ dumpProcessOomList(pw, mService, mLruProcesses, " ", "Proc", "PERS", false,
+ dumpPackage);
+ needSep = true;
+ }
+
+ mService.dumpOtherProcessesInfoLocked(fd, pw, dumpAll, dumpPackage, dumpAppId, numPers,
+ needSep);
+ }
+
+ @GuardedBy("this")
+ void writeProcessesToProtoLocked(ProtoOutputStream proto, String dumpPackage) {
+ int numPers = 0;
+
+ final int numOfNames = mProcessNames.getMap().size();
+ for (int ip = 0; ip < numOfNames; ip++) {
+ SparseArray<ProcessRecord> procs = mProcessNames.getMap().valueAt(ip);
+ for (int ia = 0, size = procs.size(); ia < size; ia++) {
+ ProcessRecord r = procs.valueAt(ia);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.PROCS,
+ mLruProcesses.indexOf(r)
+ );
+ if (r.isPersistent()) {
+ numPers++;
+ }
+ }
+ }
+
+ for (int i = 0, size = mIsolatedProcesses.size(); i < size; i++) {
+ ProcessRecord r = mIsolatedProcesses.valueAt(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ r.dumpDebug(proto, ActivityManagerServiceDumpProcessesProto.ISOLATED_PROCS,
+ mLruProcesses.indexOf(r)
+ );
+ }
+
+ final int dumpAppId = mService.getAppId(dumpPackage);
+ mActiveUids.dumpProto(proto, dumpPackage, dumpAppId,
+ ActivityManagerServiceDumpProcessesProto.ACTIVE_UIDS);
+
+ if (getLruSizeLocked() > 0) {
+ long lruToken = proto.start(ActivityManagerServiceDumpProcessesProto.LRU_PROCS);
+ int total = getLruSizeLocked();
+ proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.SIZE, total);
+ proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_ACT_AT,
+ total - mLruProcessActivityStart);
+ proto.write(ActivityManagerServiceDumpProcessesProto.LruProcesses.NON_SVC_AT,
+ total - mLruProcessServiceStart);
+ writeProcessOomListToProto(proto,
+ ActivityManagerServiceDumpProcessesProto.LruProcesses.LIST, mService,
+ mLruProcesses, false, dumpPackage);
+ proto.end(lruToken);
+ }
+
+ mService.writeOtherProcessesInfoToProtoLocked(proto, dumpPackage, dumpAppId, numPers);
+ }
+
+ private static ArrayList<Pair<ProcessRecord, Integer>> sortProcessOomList(
+ List<ProcessRecord> origList, String dumpPackage) {
+ ArrayList<Pair<ProcessRecord, Integer>> list =
+ new ArrayList<Pair<ProcessRecord, Integer>>(origList.size());
+ for (int i = 0, size = origList.size(); i < size; i++) {
+ ProcessRecord r = origList.get(i);
+ if (dumpPackage != null && !r.getPkgList().containsKey(dumpPackage)) {
+ continue;
+ }
+ list.add(new Pair<ProcessRecord, Integer>(origList.get(i), i));
+ }
+
+ Comparator<Pair<ProcessRecord, Integer>> comparator =
+ new Comparator<Pair<ProcessRecord, Integer>>() {
+ @Override
+ public int compare(Pair<ProcessRecord, Integer> object1,
+ Pair<ProcessRecord, Integer> object2) {
+ if (object1.first.setAdj != object2.first.setAdj) {
+ return object1.first.setAdj > object2.first.setAdj ? -1 : 1;
+ }
+ if (object1.first.setProcState != object2.first.setProcState) {
+ return object1.first.setProcState > object2.first.setProcState ? -1 : 1;
+ }
+ if (object1.second.intValue() != object2.second.intValue()) {
+ return object1.second.intValue() > object2.second.intValue() ? -1 : 1;
+ }
+ return 0;
+ }
+ };
+
+ Collections.sort(list, comparator);
+ return list;
+ }
+
+ private static boolean writeProcessOomListToProto(ProtoOutputStream proto, long fieldId,
+ ActivityManagerService service, List<ProcessRecord> origList,
+ boolean inclDetails, String dumpPackage) {
+ ArrayList<Pair<ProcessRecord, Integer>> list = sortProcessOomList(origList, dumpPackage);
+ if (list.isEmpty()) return false;
+
+ final long curUptime = SystemClock.uptimeMillis();
+
+ for (int i = list.size() - 1; i >= 0; i--) {
+ ProcessRecord r = list.get(i).first;
+ long token = proto.start(fieldId);
+ String oomAdj = makeOomAdjString(r.setAdj, true);
+ proto.write(ProcessOomProto.PERSISTENT, r.isPersistent());
+ proto.write(ProcessOomProto.NUM, (origList.size() - 1) - list.get(i).second);
+ proto.write(ProcessOomProto.OOM_ADJ, oomAdj);
+ int schedGroup = ProcessOomProto.SCHED_GROUP_UNKNOWN;
+ switch (r.setSchedGroup) {
+ case SCHED_GROUP_BACKGROUND:
+ schedGroup = ProcessOomProto.SCHED_GROUP_BACKGROUND;
+ break;
+ case SCHED_GROUP_DEFAULT:
+ schedGroup = ProcessOomProto.SCHED_GROUP_DEFAULT;
+ break;
+ case SCHED_GROUP_TOP_APP:
+ schedGroup = ProcessOomProto.SCHED_GROUP_TOP_APP;
+ break;
+ case SCHED_GROUP_TOP_APP_BOUND:
+ schedGroup = ProcessOomProto.SCHED_GROUP_TOP_APP_BOUND;
+ break;
+ }
+ if (schedGroup != ProcessOomProto.SCHED_GROUP_UNKNOWN) {
+ proto.write(ProcessOomProto.SCHED_GROUP, schedGroup);
+ }
+ if (r.hasForegroundActivities()) {
+ proto.write(ProcessOomProto.ACTIVITIES, true);
+ } else if (r.hasForegroundServices()) {
+ proto.write(ProcessOomProto.SERVICES, true);
+ }
+ proto.write(ProcessOomProto.STATE,
+ makeProcStateProtoEnum(r.getCurProcState()));
+ proto.write(ProcessOomProto.TRIM_MEMORY_LEVEL, r.mProfile.getTrimMemoryLevel());
+ r.dumpDebug(proto, ProcessOomProto.PROC);
+ proto.write(ProcessOomProto.ADJ_TYPE, r.adjType);
+ if (r.adjSource != null || r.adjTarget != null) {
+ if (r.adjTarget instanceof ComponentName) {
+ ComponentName cn = (ComponentName) r.adjTarget;
+ cn.dumpDebug(proto, ProcessOomProto.ADJ_TARGET_COMPONENT_NAME);
+ } else if (r.adjTarget != null) {
+ proto.write(ProcessOomProto.ADJ_TARGET_OBJECT, r.adjTarget.toString());
+ }
+ if (r.adjSource instanceof ProcessRecord) {
+ ProcessRecord p = (ProcessRecord) r.adjSource;
+ p.dumpDebug(proto, ProcessOomProto.ADJ_SOURCE_PROC);
+ } else if (r.adjSource != null) {
+ proto.write(ProcessOomProto.ADJ_SOURCE_OBJECT, r.adjSource.toString());
+ }
+ }
+ if (inclDetails) {
+ long detailToken = proto.start(ProcessOomProto.DETAIL);
+ proto.write(ProcessOomProto.Detail.MAX_ADJ, r.maxAdj);
+ proto.write(ProcessOomProto.Detail.CUR_RAW_ADJ, r.getCurRawAdj());
+ proto.write(ProcessOomProto.Detail.SET_RAW_ADJ, r.setRawAdj);
+ proto.write(ProcessOomProto.Detail.CUR_ADJ, r.curAdj);
+ proto.write(ProcessOomProto.Detail.SET_ADJ, r.setAdj);
+ proto.write(ProcessOomProto.Detail.CURRENT_STATE,
+ makeProcStateProtoEnum(r.getCurProcState()));
+ proto.write(ProcessOomProto.Detail.SET_STATE,
+ makeProcStateProtoEnum(r.setProcState));
+ proto.write(ProcessOomProto.Detail.LAST_PSS, DebugUtils.sizeValueToString(
+ r.mProfile.getLastPss() * 1024, new StringBuilder()));
+ proto.write(ProcessOomProto.Detail.LAST_SWAP_PSS, DebugUtils.sizeValueToString(
+ r.mProfile.getLastSwapPss() * 1024, new StringBuilder()));
+ proto.write(ProcessOomProto.Detail.LAST_CACHED_PSS, DebugUtils.sizeValueToString(
+ r.mProfile.getLastCachedPss() * 1024, new StringBuilder()));
+ proto.write(ProcessOomProto.Detail.CACHED, r.isCached());
+ proto.write(ProcessOomProto.Detail.EMPTY, r.empty);
+ proto.write(ProcessOomProto.Detail.HAS_ABOVE_CLIENT, r.hasAboveClient);
+
+ if (r.setProcState >= ActivityManager.PROCESS_STATE_SERVICE) {
+ long lastCpuTime = r.mProfile.mLastCpuTime.get();
+ if (lastCpuTime != 0) {
+ long uptimeSince = curUptime - service.mLastPowerCheckUptime;
+ long timeUsed = r.mProfile.mCurCpuTime.get() - lastCpuTime;
+ long cpuTimeToken = proto.start(ProcessOomProto.Detail.SERVICE_RUN_TIME);
+ proto.write(ProcessOomProto.Detail.CpuRunTime.OVER_MS, uptimeSince);
+ proto.write(ProcessOomProto.Detail.CpuRunTime.USED_MS, timeUsed);
+ proto.write(ProcessOomProto.Detail.CpuRunTime.ULTILIZATION,
+ (100.0 * timeUsed) / uptimeSince);
+ proto.end(cpuTimeToken);
+ }
+ }
+ proto.end(detailToken);
+ }
+ proto.end(token);
+ }
+
+ return true;
+ }
+
+ private static boolean dumpProcessOomList(PrintWriter pw,
+ ActivityManagerService service, List<ProcessRecord> origList,
+ String prefix, String normalLabel, String persistentLabel,
+ boolean inclDetails, String dumpPackage) {
+
+ ArrayList<Pair<ProcessRecord, Integer>> list = sortProcessOomList(origList, dumpPackage);
+ if (list.isEmpty()) return false;
+
+ final long curUptime = SystemClock.uptimeMillis();
+ final long uptimeSince = curUptime - service.mLastPowerCheckUptime;
+
+ for (int i = list.size() - 1; i >= 0; i--) {
+ ProcessRecord r = list.get(i).first;
+ String oomAdj = makeOomAdjString(r.setAdj, false);
+ char schedGroup;
+ switch (r.setSchedGroup) {
+ case SCHED_GROUP_BACKGROUND:
+ schedGroup = 'b';
+ break;
+ case SCHED_GROUP_DEFAULT:
+ schedGroup = 'F';
+ break;
+ case SCHED_GROUP_TOP_APP:
+ schedGroup = 'T';
+ break;
+ case SCHED_GROUP_RESTRICTED:
+ schedGroup = 'R';
+ break;
+ case SCHED_GROUP_TOP_APP_BOUND:
+ schedGroup = 'B';
+ break;
+ default:
+ schedGroup = '?';
+ break;
+ }
+ char foreground;
+ if (r.hasForegroundActivities()) {
+ foreground = 'A';
+ } else if (r.hasForegroundServices()) {
+ foreground = 'S';
+ } else {
+ foreground = ' ';
+ }
+ String procState = makeProcStateString(r.getCurProcState());
+ pw.print(prefix);
+ pw.print(r.isPersistent() ? persistentLabel : normalLabel);
+ pw.print(" #");
+ int num = (origList.size() - 1) - list.get(i).second;
+ if (num < 10) pw.print(' ');
+ pw.print(num);
+ pw.print(": ");
+ pw.print(oomAdj);
+ pw.print(' ');
+ pw.print(schedGroup);
+ pw.print('/');
+ pw.print(foreground);
+ pw.print('/');
+ pw.print(procState);
+ pw.print(' ');
+ ActivityManager.printCapabilitiesSummary(pw, r.curCapability);
+ pw.print(' ');
+ pw.print(" t:");
+ if (r.mProfile.getTrimMemoryLevel() < 10) pw.print(' ');
+ pw.print(r.mProfile.getTrimMemoryLevel());
+ pw.print(' ');
+ pw.print(r.toShortString());
+ pw.print(" (");
+ pw.print(r.adjType);
+ pw.println(')');
+ if (r.adjSource != null || r.adjTarget != null) {
+ pw.print(prefix);
+ pw.print(" ");
+ if (r.adjTarget instanceof ComponentName) {
+ pw.print(((ComponentName) r.adjTarget).flattenToShortString());
+ } else if (r.adjTarget != null) {
+ pw.print(r.adjTarget.toString());
+ } else {
+ pw.print("{null}");
+ }
+ pw.print("<=");
+ if (r.adjSource instanceof ProcessRecord) {
+ pw.print("Proc{");
+ pw.print(((ProcessRecord) r.adjSource).toShortString());
+ pw.println("}");
+ } else if (r.adjSource != null) {
+ pw.println(r.adjSource.toString());
+ } else {
+ pw.println("{null}");
+ }
+ }
+ if (inclDetails) {
+ pw.print(prefix);
+ pw.print(" ");
+ pw.print("oom: max="); pw.print(r.maxAdj);
+ pw.print(" curRaw="); pw.print(r.getCurRawAdj());
+ pw.print(" setRaw="); pw.print(r.setRawAdj);
+ pw.print(" cur="); pw.print(r.curAdj);
+ pw.print(" set="); pw.println(r.setAdj);
+ pw.print(prefix);
+ pw.print(" ");
+ pw.print("state: cur="); pw.print(
+ makeProcStateString(r.getCurProcState()));
+ pw.print(" set="); pw.print(makeProcStateString(r.setProcState));
+ pw.print(" lastPss=");
+ DebugUtils.printSizeValue(pw, r.mProfile.getLastPss() * 1024);
+ pw.print(" lastSwapPss=");
+ DebugUtils.printSizeValue(pw, r.mProfile.getLastSwapPss() * 1024);
+ pw.print(" lastCachedPss=");
+ DebugUtils.printSizeValue(pw, r.mProfile.getLastCachedPss() * 1024);
+ pw.println();
+ pw.print(prefix);
+ pw.print(" ");
+ pw.print("cached="); pw.print(r.isCached());
+ pw.print(" empty="); pw.print(r.empty);
+ pw.print(" hasAboveClient="); pw.println(r.hasAboveClient);
+
+ if (r.setProcState >= ActivityManager.PROCESS_STATE_SERVICE) {
+ long lastCpuTime = r.mProfile.mLastCpuTime.get();
+ if (lastCpuTime != 0) {
+ long timeUsed = r.mProfile.mCurCpuTime.get() - lastCpuTime;
+ pw.print(prefix);
+ pw.print(" ");
+ pw.print("run cpu over ");
+ TimeUtils.formatDuration(uptimeSince, pw);
+ pw.print(" used ");
+ TimeUtils.formatDuration(timeUsed, pw);
+ pw.print(" (");
+ pw.print((timeUsed * 100) / uptimeSince);
+ pw.println("%)");
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ private void printOomLevel(PrintWriter pw, String name, int adj) {
+ pw.print(" ");
+ if (adj >= 0) {
+ pw.print(' ');
+ if (adj < 10) pw.print(' ');
+ } else {
+ if (adj > -10) pw.print(' ');
+ }
+ pw.print(adj);
+ pw.print(": ");
+ pw.print(name);
+ pw.print(" (");
+ pw.print(ActivityManagerService.stringifySize(getMemLevel(adj), 1024));
+ pw.println(")");
+ }
+
+ boolean dumpOomLocked(FileDescriptor fd, PrintWriter pw, boolean needSep, String[] args,
+ int opti, boolean dumpAll, String dumpPackage, boolean inclGc) {
+ if (getLruSizeLocked() > 0) {
+ if (needSep) pw.println();
+ needSep = true;
+ pw.println(" OOM levels:");
+ printOomLevel(pw, "SYSTEM_ADJ", SYSTEM_ADJ);
+ printOomLevel(pw, "PERSISTENT_PROC_ADJ", PERSISTENT_PROC_ADJ);
+ printOomLevel(pw, "PERSISTENT_SERVICE_ADJ", PERSISTENT_SERVICE_ADJ);
+ printOomLevel(pw, "FOREGROUND_APP_ADJ", FOREGROUND_APP_ADJ);
+ printOomLevel(pw, "VISIBLE_APP_ADJ", VISIBLE_APP_ADJ);
+ printOomLevel(pw, "PERCEPTIBLE_APP_ADJ", PERCEPTIBLE_APP_ADJ);
+ printOomLevel(pw, "PERCEPTIBLE_LOW_APP_ADJ", PERCEPTIBLE_LOW_APP_ADJ);
+ printOomLevel(pw, "BACKUP_APP_ADJ", BACKUP_APP_ADJ);
+ printOomLevel(pw, "HEAVY_WEIGHT_APP_ADJ", HEAVY_WEIGHT_APP_ADJ);
+ printOomLevel(pw, "SERVICE_ADJ", SERVICE_ADJ);
+ printOomLevel(pw, "HOME_APP_ADJ", HOME_APP_ADJ);
+ printOomLevel(pw, "PREVIOUS_APP_ADJ", PREVIOUS_APP_ADJ);
+ printOomLevel(pw, "SERVICE_B_ADJ", SERVICE_B_ADJ);
+ printOomLevel(pw, "CACHED_APP_MIN_ADJ", CACHED_APP_MIN_ADJ);
+ printOomLevel(pw, "CACHED_APP_MAX_ADJ", CACHED_APP_MAX_ADJ);
+
+ if (needSep) pw.println();
+ pw.print(" Process OOM control ("); pw.print(getLruSizeLocked());
+ pw.print(" total, non-act at ");
+ pw.print(getLruSizeLocked() - mLruProcessActivityStart);
+ pw.print(", non-svc at ");
+ pw.print(getLruSizeLocked() - mLruProcessServiceStart);
+ pw.println("):");
+ dumpProcessOomList(pw, mService, mLruProcesses, " ", "Proc", "PERS", true,
+ dumpPackage);
+ needSep = true;
+ }
+
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ mService.mAppProfiler.dumpProcessesToGc(pw, needSep, dumpPackage);
+ }
+
+ pw.println();
+ mService.mAtmInternal.dumpForOom(pw);
+
+ return true;
+ }
+
+ void registerProcessObserver(IProcessObserver observer) {
+ mProcessObservers.register(observer);
+ }
+
+ void unregisterProcessObserver(IProcessObserver observer) {
+ mProcessObservers.unregister(observer);
+ }
+
+ void dispatchProcessesChanged() {
+ int numOfChanges;
+ synchronized (mProcessChangeLock) {
+ numOfChanges = mPendingProcessChanges.size();
+ if (mActiveProcessChanges.length < numOfChanges) {
+ mActiveProcessChanges = new ProcessChangeItem[numOfChanges];
+ }
+ mPendingProcessChanges.toArray(mActiveProcessChanges);
+ mPendingProcessChanges.clear();
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS,
+ "*** Delivering " + numOfChanges + " process changes");
+ }
+ }
+
+ int i = mProcessObservers.beginBroadcast();
+ while (i > 0) {
+ i--;
+ final IProcessObserver observer = mProcessObservers.getBroadcastItem(i);
+ if (observer != null) {
+ try {
+ for (int j = 0; j < numOfChanges; j++) {
+ ProcessChangeItem item = mActiveProcessChanges[j];
+ if ((item.changes & ProcessChangeItem.CHANGE_ACTIVITIES) != 0) {
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS,
+ "ACTIVITIES CHANGED pid=" + item.pid + " uid="
+ + item.uid + ": " + item.foregroundActivities);
+ }
+ observer.onForegroundActivitiesChanged(item.pid, item.uid,
+ item.foregroundActivities);
+ }
+ if ((item.changes & ProcessChangeItem.CHANGE_FOREGROUND_SERVICES) != 0) {
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS,
+ "FOREGROUND SERVICES CHANGED pid=" + item.pid + " uid="
+ + item.uid + ": " + item.foregroundServiceTypes);
+ }
+ observer.onForegroundServicesChanged(item.pid, item.uid,
+ item.foregroundServiceTypes);
+ }
+ }
+ } catch (RemoteException e) {
+ }
+ }
+ }
+ mProcessObservers.finishBroadcast();
+
+ synchronized (mProcessChangeLock) {
+ for (int j = 0; j < numOfChanges; j++) {
+ mAvailProcessChanges.add(mActiveProcessChanges[j]);
+ }
+ }
+ }
+
+ @GuardedBy("mService")
+ ProcessChangeItem enqueueProcessChangeItemLocked(int pid, int uid) {
+ synchronized (mProcessChangeLock) {
+ int i = mPendingProcessChanges.size() - 1;
+ ActivityManagerService.ProcessChangeItem item = null;
+ while (i >= 0) {
+ item = mPendingProcessChanges.get(i);
+ if (item.pid == pid) {
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS, "Re-using existing item: " + item);
+ }
+ break;
+ }
+ i--;
+ }
+
+ if (i < 0) {
+ // No existing item in pending changes; need a new one.
+ final int num = mAvailProcessChanges.size();
+ if (num > 0) {
+ item = mAvailProcessChanges.remove(num - 1);
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS, "Retrieving available item: " + item);
+ }
+ } else {
+ item = new ActivityManagerService.ProcessChangeItem();
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS, "Allocating new item: " + item);
+ }
+ }
+ item.changes = 0;
+ item.pid = pid;
+ item.uid = uid;
+ if (mPendingProcessChanges.size() == 0) {
+ if (DEBUG_PROCESS_OBSERVERS) {
+ Slog.i(TAG_PROCESS_OBSERVERS, "*** Enqueueing dispatch processes changed!");
+ }
+ mService.mUiHandler.obtainMessage(DISPATCH_PROCESSES_CHANGED_UI_MSG)
+ .sendToTarget();
+ }
+ mPendingProcessChanges.add(item);
+ }
+
+ return item;
+ }
+ }
+
+ @GuardedBy("mService")
+ void scheduleDispatchProcessDiedLocked(int pid, int uid) {
+ synchronized (mProcessChangeLock) {
+ for (int i = mPendingProcessChanges.size() - 1; i >= 0; i--) {
+ ProcessChangeItem item = mPendingProcessChanges.get(i);
+ if (pid > 0 && item.pid == pid) {
+ mPendingProcessChanges.remove(i);
+ mAvailProcessChanges.add(item);
+ }
+ }
+ mService.mUiHandler.obtainMessage(DISPATCH_PROCESS_DIED_UI_MSG, pid, uid,
+ null).sendToTarget();
+ }
+ }
+
+ void dispatchProcessDied(int pid, int uid) {
+ int i = mProcessObservers.beginBroadcast();
+ while (i > 0) {
+ i--;
+ final IProcessObserver observer = mProcessObservers.getBroadcastItem(i);
+ if (observer != null) {
+ try {
+ observer.onProcessDied(pid, uid);
+ } catch (RemoteException e) {
+ }
+ }
+ }
+ mProcessObservers.finishBroadcast();
+ }
+
@GuardedBy("mService")
ArrayList<ProcessRecord> collectProcessesLocked(int start, boolean allPkgs, String[] args) {
ArrayList<ProcessRecord> procs;
@@ -3668,8 +4417,8 @@
ProcessRecord proc = mLruProcesses.get(i);
if (proc.pid > 0 && proc.pid == pid) {
procs.add(proc);
- } else if (allPkgs && proc.pkgList != null
- && proc.pkgList.containsKey(args[start])) {
+ } else if (allPkgs && proc.getPkgList() != null
+ && proc.getPkgList().containsKey(args[start])) {
procs.add(proc);
} else if (proc.processName.equals(args[start])) {
procs.add(proc);
@@ -3697,27 +4446,23 @@
continue;
}
- final int packageCount = app.pkgList.size();
- for (int j = 0; j < packageCount; j++) {
- final String packageName = app.pkgList.keyAt(j);
- if (!updateFrameworkRes && !packagesToUpdate.contains(packageName)) {
- continue;
- }
- try {
- final ApplicationInfo ai = AppGlobals.getPackageManager()
- .getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);
- if (ai == null) {
- continue;
+ app.getPkgList().forEachPackage(packageName -> {
+ if (updateFrameworkRes && packagesToUpdate.contains(packageName)) {
+ try {
+ final ApplicationInfo ai = AppGlobals.getPackageManager()
+ .getApplicationInfo(packageName, STOCK_PM_FLAGS, app.userId);
+ if (ai != null) {
+ app.thread.scheduleApplicationInfoChanged(ai);
+ if (ai.packageName.equals(app.info.packageName)) {
+ app.info = ai;
+ }
+ }
+ } catch (RemoteException e) {
+ Slog.w(TAG, String.format("Failed to update %s ApplicationInfo for %s",
+ packageName, app));
}
- app.thread.scheduleApplicationInfoChanged(ai);
- if (ai.packageName.equals(app.info.packageName)) {
- app.info = ai;
- }
- } catch (RemoteException e) {
- Slog.w(TAG, String.format("Failed to update %s ApplicationInfo for %s",
- packageName, app));
}
- }
+ });
}
}
@@ -4103,7 +4848,7 @@
boolean diff = mIdle != idle;
mIdle = idle;
if (diff && idle) {
- synchronized (this) {
+ synchronized (mService) {
if (mWorkItems.size() > 0) {
mHandler.sendEmptyMessage(H.MSG_DEVICE_IDLE);
}
@@ -4176,13 +4921,14 @@
return true;
}
- final int pkgSize = app.pkgList.size();
- for (int ip = 0; ip < pkgSize; ip++) {
- if (mService.mConstants.IMPERCEPTIBLE_KILL_EXEMPT_PACKAGES.contains(
- app.pkgList.keyAt(ip))) {
+ if (app.getPkgList().forEachPackage(pkgName -> {
+ if (mService.mConstants.IMPERCEPTIBLE_KILL_EXEMPT_PACKAGES.contains(pkgName)) {
// One of the packages in this process is exempted
- return true;
+ return Boolean.TRUE;
}
+ return null;
+ }) != null) {
+ return true;
}
if (mService.mConstants.IMPERCEPTIBLE_KILL_EXEMPT_PROC_STATES.contains(
diff --git a/services/core/java/com/android/server/am/ProcessProfileRecord.java b/services/core/java/com/android/server/am/ProcessProfileRecord.java
new file mode 100644
index 0000000..cf309f4
--- /dev/null
+++ b/services/core/java/com/android/server/am/ProcessProfileRecord.java
@@ -0,0 +1,651 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.am;
+
+import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
+import static android.app.ActivityManager.processStateAmToProto;
+
+import android.app.IApplicationThread;
+import android.content.pm.ApplicationInfo;
+import android.os.Debug;
+import android.os.SystemClock;
+import android.util.DebugUtils;
+import android.util.TimeUtils;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.app.procstats.ProcessState;
+import com.android.internal.app.procstats.ProcessStats;
+import com.android.internal.os.BatteryStatsImpl;
+import com.android.internal.util.FrameworkStatsLog;
+import com.android.server.am.ProcessList.ProcStateMemTracker;
+
+import java.io.PrintWriter;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Profiling info of the process, such as PSS, cpu, etc.
+ */
+final class ProcessProfileRecord {
+ final ProcessRecord mApp;
+
+ private final ActivityManagerService mService;
+
+ final Object mProfilerLock;
+
+ @GuardedBy("mProfilerLock")
+ private final ProcessList.ProcStateMemTracker mProcStateMemTracker =
+ new ProcessList.ProcStateMemTracker();
+
+ /**
+ * Stats of pss, cpu, etc.
+ */
+ @GuardedBy("mService.mProcessStats.mLock")
+ private ProcessState mBaseProcessTracker;
+
+ /**
+ * Last time we retrieved PSS data.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastPssTime;
+
+ /**
+ * Next time we want to request PSS data.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mNextPssTime;
+
+ /**
+ * Initial memory pss of process for idle maintenance.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mInitialIdlePss;
+
+ /**
+ * Last computed memory pss.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastPss;
+
+ /**
+ * Last computed SwapPss.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastSwapPss;
+
+ /**
+ * Last computed pss when in cached state.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastCachedPss;
+
+ /**
+ * Last computed SwapPss when in cached state.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastCachedSwapPss;
+
+ /**
+ * Last computed memory rss.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastRss;
+
+ /**
+ * Cache of last retrieve memory info, to throttle how frequently apps can request it.
+ */
+ @GuardedBy("mProfilerLock")
+ private Debug.MemoryInfo mLastMemInfo;
+
+ /**
+ * Cache of last retrieve memory uptime, to throttle how frequently apps can request it.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastMemInfoTime;
+
+ /**
+ * Currently requesting pss for.
+ */
+ @GuardedBy("mProfilerLock")
+ private int mPssProcState = PROCESS_STATE_NONEXISTENT;
+
+ /**
+ * The type of stat collection that we are currently requesting.
+ */
+ @GuardedBy("mProfilerLock")
+ private int mPssStatType;
+
+ /**
+ * How long proc has run CPU at last check.
+ */
+ final AtomicLong mLastCpuTime = new AtomicLong(0);
+
+ /**
+ * How long proc has run CPU most recently.
+ */
+ final AtomicLong mCurCpuTime = new AtomicLong(0);
+
+ /**
+ * Last selected memory trimming level.
+ */
+ @GuardedBy("mService")
+ private int mTrimMemoryLevel;
+
+ /**
+ * Want to clean up resources from showing UI?
+ */
+ @GuardedBy("mService")
+ private boolean mPendingUiClean;
+
+ /**
+ * Pointer to the battery stats of this process.
+ */
+ private BatteryStatsImpl.Uid.Proc mCurProcBatteryStats;
+
+ /**
+ * When we last asked the app to do a gc.
+ */
+ @GuardedBy("mProfilerLock")
+ private long mLastRequestedGc;
+
+ /**
+ * When we last told the app that memory is low.
+ */
+ @GuardedBy("mService")
+ private long mLastLowMemory;
+
+ /**
+ * Set to true when waiting to report low mem.
+ */
+ @GuardedBy("mProfilerLock")
+ private boolean mReportLowMemory;
+
+ // ========================================================================
+ // Local copies of some process info, to avoid holding global AMS lock
+ @GuardedBy("mProfilerLock")
+ private int mPid;
+
+ @GuardedBy("mProfilerLock")
+ private IApplicationThread mThread;
+
+ @GuardedBy("mProfilerLock")
+ private int mSetProcState;
+
+ @GuardedBy("mProfilerLock")
+ private int mSetAdj;
+
+ @GuardedBy("mProfilerLock")
+ private int mCurRawAdj;
+
+ @GuardedBy("mProfilerLock")
+ private long mLastStateTime;
+
+ ProcessProfileRecord(final ProcessRecord app) {
+ mApp = app;
+ mService = app.mService;
+ mProfilerLock = mService.mAppProfiler.mProfilerLock;
+ }
+
+ void init(long now) {
+ mLastPssTime = mNextPssTime = now;
+ }
+
+ @GuardedBy("mService.mProcessStats.mLock")
+ ProcessState getBaseProcessTracker() {
+ return mBaseProcessTracker;
+ }
+
+ @GuardedBy("mService.mProcessStats.mLock")
+ void setBaseProcessTracker(ProcessState baseProcessTracker) {
+ mBaseProcessTracker = baseProcessTracker;
+ }
+
+ void onProcessActive(IApplicationThread thread, ProcessStatsService tracker) {
+ if (mThread == null) {
+ synchronized (mProfilerLock) {
+ synchronized (tracker.mLock) {
+ final ProcessState origBase = getBaseProcessTracker();
+ final PackageList pkgList = mApp.getPkgList();
+ if (origBase != null) {
+ synchronized (pkgList) {
+ origBase.setState(ProcessStats.STATE_NOTHING,
+ tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
+ pkgList.getPackageListLocked());
+ pkgList.forEachPackage((pkgName, holder) ->
+ FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
+ mApp.uid, mApp.processName, pkgName,
+ processStateAmToProto(ProcessStats.STATE_NOTHING),
+ holder.appVersion)
+ );
+ }
+ origBase.makeInactive();
+ }
+ final ApplicationInfo info = mApp.info;
+ final ProcessState baseProcessTracker = tracker.getProcessStateLocked(
+ info.packageName, info.uid, info.longVersionCode, mApp.processName);
+ setBaseProcessTracker(baseProcessTracker);
+ baseProcessTracker.makeActive();
+ pkgList.forEachPackage((pkgName, holder) -> {
+ if (holder.state != null && holder.state != origBase) {
+ holder.state.makeInactive();
+ }
+ tracker.updateProcessStateHolderLocked(holder, pkgName, mApp.info.uid,
+ mApp.info.longVersionCode, mApp.processName);
+ if (holder.state != baseProcessTracker) {
+ holder.state.makeActive();
+ }
+ });
+ mThread = thread;
+ }
+ }
+ } else {
+ synchronized (mProfilerLock) {
+ mThread = thread;
+ }
+ }
+ }
+
+ void onProcessInactive(ProcessStatsService tracker) {
+ synchronized (mProfilerLock) {
+ synchronized (tracker.mLock) {
+ final ProcessState origBase = getBaseProcessTracker();
+ if (origBase != null) {
+ final PackageList pkgList = mApp.getPkgList();
+ synchronized (pkgList) {
+ origBase.setState(ProcessStats.STATE_NOTHING,
+ tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
+ pkgList.getPackageListLocked());
+ pkgList.forEachPackage((pkgName, holder) ->
+ FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
+ mApp.uid, mApp.processName, pkgName,
+ processStateAmToProto(ProcessStats.STATE_NOTHING),
+ holder.appVersion)
+ );
+ }
+ origBase.makeInactive();
+ setBaseProcessTracker(null);
+ pkgList.forEachPackageProcessStats(holder -> {
+ if (holder.state != null && holder.state != origBase) {
+ holder.state.makeInactive();
+ }
+ holder.pkg = null;
+ holder.state = null;
+ });
+ }
+ mThread = null;
+ }
+ }
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastPssTime() {
+ return mLastPssTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastPssTime(long lastPssTime) {
+ mLastPssTime = lastPssTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getNextPssTime() {
+ return mNextPssTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setNextPssTime(long nextPssTime) {
+ mNextPssTime = nextPssTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getInitialIdlePss() {
+ return mInitialIdlePss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setInitialIdlePss(long initialIdlePss) {
+ mInitialIdlePss = initialIdlePss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastPss() {
+ return mLastPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastPss(long lastPss) {
+ mLastPss = lastPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastCachedPss() {
+ return mLastCachedPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastCachedPss(long lastCachedPss) {
+ mLastCachedPss = lastCachedPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastSwapPss() {
+ return mLastSwapPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastSwapPss(long lastSwapPss) {
+ mLastSwapPss = lastSwapPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastCachedSwapPss() {
+ return mLastCachedSwapPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastCachedSwapPss(long lastCachedSwapPss) {
+ mLastCachedSwapPss = lastCachedSwapPss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastRss() {
+ return mLastRss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastRss(long lastRss) {
+ mLastRss = lastRss;
+ }
+
+ @GuardedBy("mProfilerLock")
+ Debug.MemoryInfo getLastMemInfo() {
+ return mLastMemInfo;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastMemInfo(Debug.MemoryInfo lastMemInfo) {
+ mLastMemInfo = lastMemInfo;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastMemInfoTime() {
+ return mLastMemInfoTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastMemInfoTime(long lastMemInfoTime) {
+ mLastMemInfoTime = lastMemInfoTime;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getPssProcState() {
+ return mPssProcState;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setPssProcState(int pssProcState) {
+ mPssProcState = pssProcState;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getPssStatType() {
+ return mPssStatType;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setPssStatType(int pssStatType) {
+ mPssStatType = pssStatType;
+ }
+
+ @GuardedBy("mService")
+ int getTrimMemoryLevel() {
+ return mTrimMemoryLevel;
+ }
+
+ @GuardedBy("mService")
+ void setTrimMemoryLevel(int trimMemoryLevel) {
+ mTrimMemoryLevel = trimMemoryLevel;
+ }
+
+ @GuardedBy("mService")
+ boolean hasPendingUiClean() {
+ return mPendingUiClean;
+ }
+
+ @GuardedBy("mService")
+ void setPendingUiClean(boolean pendingUiClean) {
+ mPendingUiClean = pendingUiClean;
+ mApp.getWindowProcessController().setPendingUiClean(pendingUiClean);
+ }
+
+ BatteryStatsImpl.Uid.Proc getCurProcBatteryStats() {
+ return mCurProcBatteryStats;
+ }
+
+ void setCurProcBatteryStats(BatteryStatsImpl.Uid.Proc curProcBatteryStats) {
+ mCurProcBatteryStats = curProcBatteryStats;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastRequestedGc() {
+ return mLastRequestedGc;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setLastRequestedGc(long lastRequestedGc) {
+ mLastRequestedGc = lastRequestedGc;
+ }
+
+ @GuardedBy("mService")
+ long getLastLowMemory() {
+ return mLastLowMemory;
+ }
+
+ @GuardedBy("mService")
+ void setLastLowMemory(long lastLowMemory) {
+ mLastLowMemory = lastLowMemory;
+ }
+
+ @GuardedBy("mProfilerLock")
+ boolean getReportLowMemory() {
+ return mReportLowMemory;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setReportLowMemory(boolean reportLowMemory) {
+ mReportLowMemory = reportLowMemory;
+ }
+
+ void addPss(long pss, long uss, long rss, boolean always, int type, long duration) {
+ synchronized (mService.mProcessStats.mLock) {
+ final ProcessState tracker = mBaseProcessTracker;
+ if (tracker != null) {
+ final PackageList pkgList = mApp.getPkgList();
+ synchronized (pkgList) {
+ tracker.addPss(pss, uss, rss, always, type, duration,
+ pkgList.getPackageListLocked());
+ }
+ }
+ }
+ }
+
+ void reportExcessiveCpu() {
+ synchronized (mService.mProcessStats.mLock) {
+ final ProcessState tracker = mBaseProcessTracker;
+ if (tracker != null) {
+ final PackageList pkgList = mApp.getPkgList();
+ synchronized (pkgList) {
+ tracker.reportExcessiveCpu(pkgList.getPackageListLocked());
+ }
+ }
+ }
+ }
+
+ void reportCachedKill() {
+ synchronized (mService.mProcessStats.mLock) {
+ final ProcessState tracker = mBaseProcessTracker;
+ if (tracker != null) {
+ final PackageList pkgList = mApp.getPkgList();
+ synchronized (pkgList) {
+ tracker.reportCachedKill(pkgList.getPackageListLocked(), mLastCachedPss);
+ pkgList.forEachPackageProcessStats(holder ->
+ FrameworkStatsLog.write(FrameworkStatsLog.CACHED_KILL_REPORTED,
+ mApp.info.uid,
+ holder.state.getName(),
+ holder.state.getPackage(),
+ mLastCachedPss,
+ holder.appVersion)
+ );
+ }
+ }
+ }
+ }
+
+ void setProcessTrackerState(int procState, int memFactor, long now) {
+ synchronized (mService.mProcessStats.mLock) {
+ final ProcessState tracker = mBaseProcessTracker;
+ if (tracker != null) {
+ if (procState != PROCESS_STATE_NONEXISTENT) {
+ final PackageList pkgList = mApp.getPkgList();
+ synchronized (pkgList) {
+ tracker.setState(procState, memFactor, now,
+ pkgList.getPackageListLocked());
+ }
+ }
+ }
+ }
+ }
+
+ @GuardedBy("mProfilerLock")
+ void commitNextPssTime() {
+ commitNextPssTime(mProcStateMemTracker);
+ }
+
+ @GuardedBy("mProfilerLock")
+ void abortNextPssTime() {
+ abortNextPssTime(mProcStateMemTracker);
+ }
+
+ @GuardedBy("mProfilerLock")
+ long computeNextPssTime(int procState, boolean test, boolean sleeping, long now) {
+ return ProcessList.computeNextPssTime(procState, mProcStateMemTracker, test, sleeping, now);
+ }
+
+ private static void commitNextPssTime(ProcStateMemTracker tracker) {
+ if (tracker.mPendingMemState >= 0) {
+ tracker.mHighestMem[tracker.mPendingMemState] = tracker.mPendingHighestMemState;
+ tracker.mScalingFactor[tracker.mPendingMemState] = tracker.mPendingScalingFactor;
+ tracker.mTotalHighestMem = tracker.mPendingHighestMemState;
+ tracker.mPendingMemState = -1;
+ }
+ }
+
+ private static void abortNextPssTime(ProcStateMemTracker tracker) {
+ tracker.mPendingMemState = -1;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getPid() {
+ return mPid;
+ }
+
+ @GuardedBy("mProfilerLock")
+ void setPid(int pid) {
+ mPid = pid;
+ }
+
+ @GuardedBy("mProfilerLock")
+ IApplicationThread getThread() {
+ return mThread;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getSetProcState() {
+ return mSetProcState;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getSetAdj() {
+ return mSetAdj;
+ }
+
+ @GuardedBy("mProfilerLock")
+ int getCurRawAdj() {
+ return mCurRawAdj;
+ }
+
+ @GuardedBy("mProfilerLock")
+ long getLastStateTime() {
+ return mLastStateTime;
+ }
+
+ @GuardedBy({"mService", "mProfilerLock"})
+ void updateProcState(ProcessRecord app) {
+ mSetProcState = app.getCurProcState();
+ mSetAdj = app.curAdj;
+ mCurRawAdj = app.getCurRawAdj();
+ mLastStateTime = app.lastStateTime;
+ }
+
+ @GuardedBy("mService")
+ void dumpPss(PrintWriter pw, String prefix, long nowUptime) {
+ synchronized (mProfilerLock) {
+ pw.print(" lastPssTime=");
+ TimeUtils.formatDuration(mLastPssTime, nowUptime, pw);
+ pw.print(" pssProcState=");
+ pw.print(mPssProcState);
+ pw.print(" pssStatType=");
+ pw.print(mPssStatType);
+ pw.print(" nextPssTime=");
+ TimeUtils.formatDuration(mNextPssTime, nowUptime, pw);
+ pw.println();
+ pw.print(prefix);
+ pw.print("lastPss=");
+ DebugUtils.printSizeValue(pw, mLastPss * 1024);
+ pw.print(" lastSwapPss=");
+ DebugUtils.printSizeValue(pw, mLastSwapPss * 1024);
+ pw.print(" lastCachedPss=");
+ DebugUtils.printSizeValue(pw, mLastCachedPss * 1024);
+ pw.print(" lastCachedSwapPss=");
+ DebugUtils.printSizeValue(pw, mLastCachedSwapPss * 1024);
+ pw.print(" lastRss=");
+ DebugUtils.printSizeValue(pw, mLastRss * 1024);
+ pw.print(" trimMemoryLevel=");
+ pw.println(mTrimMemoryLevel);
+ pw.println();
+ pw.print(prefix); pw.print("procStateMemTracker: ");
+ mProcStateMemTracker.dumpLine(pw);
+ pw.print(prefix);
+ pw.print("lastRequestedGc=");
+ TimeUtils.formatDuration(mLastRequestedGc, nowUptime, pw);
+ pw.print(" lastLowMemory=");
+ TimeUtils.formatDuration(mLastLowMemory, nowUptime, pw);
+ pw.print(" reportLowMemory=");
+ pw.println(mReportLowMemory);
+ }
+ }
+
+ void dumpCputime(PrintWriter pw, String prefix) {
+ final long lastCpuTime = mLastCpuTime.get();
+ pw.print(prefix);
+ pw.print("lastCpuTime=");
+ pw.print(lastCpuTime);
+ if (lastCpuTime > 0) {
+ pw.print(" timeUsed=");
+ TimeUtils.formatDuration(mCurCpuTime.get() - lastCpuTime, pw);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 63195d3..f7e87ef 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -52,7 +52,6 @@
import android.content.pm.VersionedPackage;
import android.content.res.CompatibilityInfo;
import android.os.Binder;
-import android.os.Debug;
import android.os.IBinder;
import android.os.Message;
import android.os.Process;
@@ -74,7 +73,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.procstats.ProcessState;
import com.android.internal.app.procstats.ProcessStats;
-import com.android.internal.os.BatteryStatsImpl;
import com.android.internal.os.ProcessCpuTracker;
import com.android.internal.os.Zygote;
import com.android.internal.util.FrameworkStatsLog;
@@ -96,9 +94,9 @@
* is currently running.
*/
class ProcessRecord implements WindowProcessListener {
- private static final String TAG = TAG_WITH_CLASS_NAME ? "ProcessRecord" : TAG_AM;
+ static final String TAG = TAG_WITH_CLASS_NAME ? "ProcessRecord" : TAG_AM;
- private final ActivityManagerService mService; // where we came from
+ final ActivityManagerService mService; // where we came from
volatile ApplicationInfo info; // all about the first app in the process
final ProcessInfo processInfo; // if non-null, process-specific manifest info
final boolean isolated; // true if this is a special isolated process
@@ -106,51 +104,17 @@
final int uid; // uid of process; may be different from 'info' if isolated
final int userId; // user of process.
final String processName; // name of the process
- // List of packages running in the process
- final PackageList pkgList = new PackageList();
- final class PackageList {
- final ArrayMap<String, ProcessStats.ProcessStateHolder> mPkgList = new ArrayMap<>();
- ProcessStats.ProcessStateHolder put(String key, ProcessStats.ProcessStateHolder value) {
- mWindowProcessController.addPackage(key);
- return mPkgList.put(key, value);
- }
+ /**
+ * List of packages running in the process
+ */
+ private final PackageList mPkgList = new PackageList(this);
- void clear() {
- mPkgList.clear();
- mWindowProcessController.clearPackageList();
- }
-
- int size() {
- return mPkgList.size();
- }
-
- String keyAt(int index) {
- return mPkgList.keyAt(index);
- }
-
- public ProcessStats.ProcessStateHolder valueAt(int index) {
- return mPkgList.valueAt(index);
- }
-
- ProcessStats.ProcessStateHolder get(String pkgName) {
- return mPkgList.get(pkgName);
- }
-
- boolean containsKey(Object key) {
- return mPkgList.containsKey(key);
- }
- }
-
- final ProcessList.ProcStateMemTracker procStateMemTracker
- = new ProcessList.ProcStateMemTracker();
UidRecord uidRecord; // overall state of process's uid.
ArraySet<String> pkgDeps; // additional packages we have a dependency on
IApplicationThread thread; // the actual proc... may be null only if
// 'persistent' is true (in which case we
// are in the process of launching the app)
- ProcessState baseProcessTracker;
- BatteryStatsImpl.Uid.Proc curProcBatteryStats;
int pid; // The process of this application; 0 if none
String procStatFile; // path to /proc/<pid>/stat
int[] gids; // The gids this process was launched with
@@ -158,14 +122,7 @@
String instructionSet; // The instruction set this process was launched with
boolean starting; // True if the process is being started
long lastActivityTime; // For managing the LRU list
- long lastPssTime; // Last time we retrieved PSS data
- long nextPssTime; // Next time we want to request PSS data
long lastStateTime; // Last time setProcState changed
- long initialIdlePss; // Initial memory pss of process for idle maintenance.
- long lastPss; // Last computed memory pss.
- long lastSwapPss; // Last computed SwapPss.
- long lastCachedPss; // Last computed pss when in cached state.
- long lastCachedSwapPss; // Last computed SwapPss when in cached state.
int maxAdj; // Maximum OOM adjustment for this process
private int mCurRawAdj; // Current OOM unlimited adjustment for this process
int setRawAdj; // Last set OOM unlimited adjustment for this process
@@ -184,13 +141,10 @@
boolean shouldNotFreeze; // True if a process has a WPRI binding from an unfrozen process
private int mCurSchedGroup; // Currently desired scheduling class
int setSchedGroup; // Last set to background scheduling class
- int trimMemoryLevel; // Last selected memory trimming level
private int mCurProcState = PROCESS_STATE_NONEXISTENT; // Currently computed process state
private int mRepProcState = PROCESS_STATE_NONEXISTENT; // Last reported process state
private int mCurRawProcState = PROCESS_STATE_NONEXISTENT; // Temp state during computation
int setProcState = PROCESS_STATE_NONEXISTENT; // Last set process state in process tracker
- int pssProcState = PROCESS_STATE_NONEXISTENT; // Currently requesting pss for
- int pssStatType; // The type of stat collection that we are currently requesting
int savedPriority; // Previous priority value if we're switching to non-SCHED_OTHER
int renderThreadTid; // TID for RenderThread
ServiceRecord connectionService; // Service that applied current connectionGroup/Importance
@@ -226,7 +180,6 @@
// performance, as well as oom adj score will be set to
// ProcessList#VISIBLE_APP_ADJ at minimum to reduce the chance
// of the process getting killed.
- private boolean mPendingUiClean; // Want to clean up resources from showing UI?
boolean hasAboveClient; // Bound using BIND_ABOVE_CLIENT, so want to be lower
boolean treatLikeActivity; // Bound using BIND_TREAT_LIKE_ACTIVITY
boolean bad; // True if disabled in the bad process list
@@ -250,13 +203,8 @@
private boolean mUsingWrapper; // Set to true when process was launched with a wrapper attached
final ArraySet<BroadcastRecord> curReceivers = new ArraySet<BroadcastRecord>();// receivers currently running in the app
private long mWhenUnimportant; // When (uptime) the process last became unimportant
- long lastCpuTime; // How long proc has run CPU at last check
- long curCpuTime; // How long proc has run CPU most recently
- long lastRequestedGc; // When we last asked the app to do a gc
- long lastLowMemory; // When we last told the app that memory is low
long lastProviderTime; // The last time someone else was using a provider in this process.
long lastTopTime; // The last time the process was in the TOP state or greater.
- boolean reportLowMemory; // Set to true when waiting to report low mem
boolean empty; // Is this an empty background process?
private boolean mCached; // Is this a cached process?
String adjType; // Debugging: primary thing impacting oom_adj.
@@ -267,11 +215,6 @@
Runnable crashHandler; // Optional local handler to be invoked in the process crash.
boolean bindMountPending; // True if Android/obb and Android/data need to be bind mount .
- // Cache of last retrieve memory info and uptime, to throttle how frequently
- // apps can requyest it.
- Debug.MemoryInfo lastMemInfo;
- long lastMemInfoTime;
-
// Controller for error dialogs
private final ErrorDialogController mDialogController = new ErrorDialogController();
// Controller for driving the process state on the window manager side.
@@ -323,8 +266,8 @@
// Process is currently hosting a backup agent for backup or restore
public boolean inFullBackup;
- // App is allowed to manage whitelists such as temporary Power Save mode whitelist.
- boolean whitelistManager;
+ // App is allowed to manage allowlists such as temporary Power Save mode allowlist.
+ boolean mAllowlistManager;
// Params used in starting this process.
HostingRecord hostingRecord;
@@ -335,8 +278,6 @@
// set of disabled compat changes for the process (all others are enabled)
long[] mDisabledCompatChanges;
- long mLastRss; // Last computed memory rss.
-
// The precede instance of the process, which would exist when the previous process is killed
// but not fully dead yet; in this case, the new instance of the process should be held until
// this precede instance is fully dead.
@@ -389,6 +330,11 @@
// another process through service binding.
boolean mAllowStartFgs;
+ /**
+ * Profiling info of the process, such as PSS, cpu, etc.
+ */
+ final ProcessProfileRecord mProfile;
+
void setStartParams(int startUid, HostingRecord hostingRecord, String seInfo,
long startTime) {
this.startUid = startUid;
@@ -439,11 +385,7 @@
pw.print(prefix); pw.print("dir="); pw.print(info.sourceDir);
pw.print(" publicDir="); pw.print(info.publicSourceDir);
pw.print(" data="); pw.println(info.dataDir);
- pw.print(prefix); pw.print("packageList={");
- for (int i=0; i<pkgList.size(); i++) {
- if (i > 0) pw.print(", ");
- pw.print(pkgList.keyAt(i));
- }
+ mPkgList.dump(pw, prefix);
pw.println("}");
if (pkgDeps != null) {
pw.print(prefix); pw.print("packageDependencies={");
@@ -462,21 +404,7 @@
pw.println(starting);
pw.print(prefix); pw.print("lastActivityTime=");
TimeUtils.formatDuration(lastActivityTime, nowUptime, pw);
- pw.print(" lastPssTime=");
- TimeUtils.formatDuration(lastPssTime, nowUptime, pw);
- pw.print(" pssStatType="); pw.print(pssStatType);
- pw.print(" nextPssTime=");
- TimeUtils.formatDuration(nextPssTime, nowUptime, pw);
pw.println();
- pw.print(prefix); pw.print("lastPss="); DebugUtils.printSizeValue(pw, lastPss * 1024);
- pw.print(" lastSwapPss="); DebugUtils.printSizeValue(pw, lastSwapPss * 1024);
- pw.print(" lastCachedPss="); DebugUtils.printSizeValue(pw, lastCachedPss * 1024);
- pw.print(" lastCachedSwapPss="); DebugUtils.printSizeValue(pw,
- lastCachedSwapPss * 1024);
- pw.print(" lastRss="); DebugUtils.printSizeValue(pw, mLastRss * 1024);
- pw.println();
- pw.print(prefix); pw.print("procStateMemTracker: ");
- procStateMemTracker.dumpLine(pw);
pw.print(prefix); pw.print("adjSeq="); pw.print(adjSeq);
pw.print(" lruSeq="); pw.println(lruSeq);
pw.print(prefix); pw.print("oom adj: max="); pw.print(maxAdj);
@@ -489,10 +417,8 @@
pw.print(prefix); pw.print("mCurSchedGroup="); pw.print(mCurSchedGroup);
pw.print(" setSchedGroup="); pw.print(setSchedGroup);
pw.print(" systemNoUi="); pw.print(systemNoUi);
- pw.print(" trimMemoryLevel="); pw.println(trimMemoryLevel);
pw.print(prefix); pw.print("curProcState="); pw.print(getCurProcState());
pw.print(" mRepProcState="); pw.print(mRepProcState);
- pw.print(" pssProcState="); pw.print(pssProcState);
pw.print(" setProcState="); pw.print(setProcState);
pw.print(" lastStateTime=");
TimeUtils.formatDuration(lastStateTime, nowUptime, pw);
@@ -507,11 +433,11 @@
if (mAllowStartFgs) {
pw.print(prefix); pw.print("allowStartFgs="); pw.println(mAllowStartFgs);
}
- if (hasShownUi || mPendingUiClean || hasAboveClient || treatLikeActivity) {
+ if (hasShownUi || mProfile.hasPendingUiClean() || hasAboveClient || treatLikeActivity) {
pw.print(prefix); pw.print("hasShownUi="); pw.print(hasShownUi);
- pw.print(" pendingUiClean="); pw.print(mPendingUiClean);
- pw.print(" hasAboveClient="); pw.print(hasAboveClient);
- pw.print(" treatLikeActivity="); pw.println(treatLikeActivity);
+ pw.print(" pendingUiClean="); pw.print(mProfile.hasPendingUiClean());
+ pw.print(" hasAboveClient="); pw.print(hasAboveClient);
+ pw.print(" treatLikeActivity="); pw.println(treatLikeActivity);
}
pw.print(prefix); pw.print("cached="); pw.print(mCached);
pw.print(" empty="); pw.println(empty);
@@ -521,7 +447,7 @@
}
if (notCachedSinceIdle) {
pw.print(prefix); pw.print("notCachedSinceIdle="); pw.print(notCachedSinceIdle);
- pw.print(" initialIdlePss="); pw.println(initialIdlePss);
+ pw.print(" initialIdlePss="); pw.println(mProfile.getInitialIdlePss());
}
if (connectionService != null || connectionGroup != 0) {
pw.print(prefix); pw.print("connectionGroup="); pw.print(connectionGroup);
@@ -579,20 +505,12 @@
pw.print(prefix); pw.print("mountMode="); pw.println(
DebugUtils.valueToString(Zygote.class, "MOUNT_EXTERNAL_", mountMode));
if (setProcState > ActivityManager.PROCESS_STATE_SERVICE) {
- pw.print(prefix); pw.print("lastCpuTime="); pw.print(lastCpuTime);
- if (lastCpuTime > 0) {
- pw.print(" timeUsed=");
- TimeUtils.formatDuration(curCpuTime - lastCpuTime, pw);
- }
- pw.print(" whenUnimportant=");
- TimeUtils.formatDuration(mWhenUnimportant - nowUptime, pw);
- pw.println();
+ mProfile.dumpCputime(pw, prefix);
+ pw.print(" whenUnimportant=");
+ TimeUtils.formatDuration(mWhenUnimportant - nowUptime, pw);
+ pw.println();
}
- pw.print(prefix); pw.print("lastRequestedGc=");
- TimeUtils.formatDuration(lastRequestedGc, nowUptime, pw);
- pw.print(" lastLowMemory=");
- TimeUtils.formatDuration(lastLowMemory, nowUptime, pw);
- pw.print(" reportLowMemory="); pw.println(reportLowMemory);
+ mProfile.dumpPss(pw, prefix, nowUptime);
if (killed || killedByAm || waitingToKill != null) {
pw.print(prefix); pw.print("killed="); pw.print(killed);
pw.print(" killedByAm="); pw.print(killedByAm);
@@ -614,8 +532,8 @@
}
pw.println();
}
- if (whitelistManager) {
- pw.print(prefix); pw.print("whitelistManager="); pw.println(whitelistManager);
+ if (mAllowlistManager) {
+ pw.print(prefix); pw.print("allowlistManager="); pw.println(mAllowlistManager);
}
if (isolatedEntryPoint != null || isolatedEntryPointArgs != null) {
pw.print(prefix); pw.print("isolatedEntryPoint="); pw.println(isolatedEntryPoint);
@@ -699,53 +617,33 @@
curAdj = setAdj = verifiedAdj = ProcessList.INVALID_ADJ;
mPersistent = false;
removed = false;
- freezeUnfreezeTime = lastStateTime = lastPssTime = nextPssTime = SystemClock.uptimeMillis();
+ mProfile = new ProcessProfileRecord(this);
+ final long now = SystemClock.uptimeMillis();
+ freezeUnfreezeTime = lastStateTime = now;
+ mProfile.init(now);
mWindowProcessController = new WindowProcessController(
mService.mActivityTaskManager, info, processName, uid, userId, this, this);
- pkgList.put(_info.packageName, new ProcessStats.ProcessStateHolder(_info.longVersionCode));
+ mPkgList.put(_info.packageName, new ProcessStats.ProcessStateHolder(_info.longVersionCode));
setAllowStartFgsByPermission();
}
+ PackageList getPkgList() {
+ return mPkgList;
+ }
+
public void setPid(int _pid) {
pid = _pid;
mWindowProcessController.setPid(pid);
procStatFile = null;
shortStringName = null;
stringName = null;
+ synchronized (mProfile.mProfilerLock) {
+ mProfile.setPid(pid);
+ }
}
public void makeActive(IApplicationThread _thread, ProcessStatsService tracker) {
- if (thread == null) {
- synchronized (tracker.mLock) {
- final ProcessState origBase = baseProcessTracker;
- if (origBase != null) {
- origBase.setState(ProcessStats.STATE_NOTHING,
- tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
- pkgList.mPkgList);
- for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) {
- FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
- uid, processName, pkgList.keyAt(ipkg),
- ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING),
- pkgList.valueAt(ipkg).appVersion);
- }
- origBase.makeInactive();
- }
- baseProcessTracker = tracker.getProcessStateLocked(info.packageName, info.uid,
- info.longVersionCode, processName);
- baseProcessTracker.makeActive();
- for (int i = 0, ipkg = pkgList.size(); i < ipkg; i++) {
- ProcessStats.ProcessStateHolder holder = pkgList.valueAt(i);
- if (holder.state != null && holder.state != origBase) {
- holder.state.makeInactive();
- }
- tracker.updateProcessStateHolderLocked(holder, pkgList.keyAt(i), info.uid,
- info.longVersionCode, processName);
- if (holder.state != baseProcessTracker) {
- holder.state.makeActive();
- }
- }
- }
- }
+ mProfile.onProcessActive(thread, tracker);
thread = _thread;
mWindowProcessController.setThread(thread);
}
@@ -753,32 +651,7 @@
public void makeInactive(ProcessStatsService tracker) {
thread = null;
mWindowProcessController.setThread(null);
- synchronized (tracker.mLock) {
- final ProcessState origBase = baseProcessTracker;
- if (origBase != null) {
- if (origBase != null) {
- origBase.setState(ProcessStats.STATE_NOTHING,
- tracker.getMemFactorLocked(), SystemClock.uptimeMillis(),
- pkgList.mPkgList);
- for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) {
- FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
- uid, processName, pkgList.keyAt(ipkg),
- ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING),
- pkgList.valueAt(ipkg).appVersion);
- }
- origBase.makeInactive();
- }
- baseProcessTracker = null;
- for (int i = 0, ipkg = pkgList.size(); i < ipkg; i++) {
- ProcessStats.ProcessStateHolder holder = pkgList.valueAt(i);
- if (holder.state != null && holder.state != origBase) {
- holder.state.makeInactive();
- }
- holder.pkg = null;
- holder.state = null;
- }
- }
- }
+ mProfile.onProcessInactive(tracker);
}
/**
@@ -1080,22 +953,25 @@
* Return true if package has been added false if not
*/
public boolean addPackage(String pkg, long versionCode, ProcessStatsService tracker) {
- if (!pkgList.containsKey(pkg)) {
- synchronized (tracker.mLock) {
- ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder(
- versionCode);
- if (baseProcessTracker != null) {
- tracker.updateProcessStateHolderLocked(holder, pkg, info.uid, versionCode,
- processName);
- pkgList.put(pkg, holder);
- if (holder.state != baseProcessTracker) {
- holder.state.makeActive();
+ synchronized (tracker.mLock) {
+ synchronized (mPkgList) {
+ if (!mPkgList.containsKey(pkg)) {
+ ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder(
+ versionCode);
+ final ProcessState baseProcessTracker = mProfile.getBaseProcessTracker();
+ if (baseProcessTracker != null) {
+ tracker.updateProcessStateHolderLocked(holder, pkg, info.uid, versionCode,
+ processName);
+ mPkgList.put(pkg, holder);
+ if (holder.state != baseProcessTracker) {
+ holder.state.makeActive();
+ }
+ } else {
+ mPkgList.put(pkg, holder);
}
- } else {
- pkgList.put(pkg, holder);
+ return true;
}
}
- return true;
}
return false;
}
@@ -1114,12 +990,12 @@
mRepProcState = newState;
setCurProcState(newState);
setCurRawProcState(newState);
- for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) {
- FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
- uid, processName, pkgList.keyAt(ipkg),
+ getPkgList().forEachPackage((pkgName, holder) ->
+ FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
+ uid, processName, pkgName,
ActivityManager.processStateAmToProto(mRepProcState),
- pkgList.valueAt(ipkg).appVersion);
- }
+ holder.appVersion)
+ );
}
}
@@ -1127,66 +1003,51 @@
* Delete all packages from list except the package indicated in info
*/
public void resetPackageList(ProcessStatsService tracker) {
- final int N = pkgList.size();
synchronized (tracker.mLock) {
- if (baseProcessTracker != null) {
- long now = SystemClock.uptimeMillis();
- baseProcessTracker.setState(ProcessStats.STATE_NOTHING,
- tracker.getMemFactorLocked(), now, pkgList.mPkgList);
- for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) {
- FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
- uid, processName, pkgList.keyAt(ipkg),
- ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING),
- pkgList.valueAt(ipkg).appVersion);
- }
- if (N != 1) {
- for (int i = 0; i < N; i++) {
- ProcessStats.ProcessStateHolder holder = pkgList.valueAt(i);
- if (holder.state != null && holder.state != baseProcessTracker) {
- holder.state.makeInactive();
+ final ProcessState baseProcessTracker = mProfile.getBaseProcessTracker();
+ synchronized (mPkgList) {
+ final int numOfPkgs = mPkgList.size();
+ if (baseProcessTracker != null) {
+ long now = SystemClock.uptimeMillis();
+ baseProcessTracker.setState(ProcessStats.STATE_NOTHING,
+ tracker.getMemFactorLocked(), now, mPkgList.getPackageListLocked());
+ mPkgList.forEachPackage((pkgName, holder) ->
+ FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
+ uid, processName, pkgName,
+ ActivityManager.processStateAmToProto(ProcessStats.STATE_NOTHING),
+ holder.appVersion)
+ );
+ if (numOfPkgs != 1) {
+ mPkgList.forEachPackageProcessStats(holder -> {
+ if (holder.state != null && holder.state != baseProcessTracker) {
+ holder.state.makeInactive();
+ }
+ });
+ mPkgList.clear();
+ ProcessStats.ProcessStateHolder holder =
+ new ProcessStats.ProcessStateHolder(info.longVersionCode);
+ tracker.updateProcessStateHolderLocked(holder, info.packageName, info.uid,
+ info.longVersionCode, processName);
+ mPkgList.put(info.packageName, holder);
+ if (holder.state != baseProcessTracker) {
+ holder.state.makeActive();
}
-
}
- pkgList.clear();
- ProcessStats.ProcessStateHolder holder = new ProcessStats.ProcessStateHolder(
- info.longVersionCode);
- tracker.updateProcessStateHolderLocked(holder, info.packageName, info.uid,
- info.longVersionCode, processName);
- pkgList.put(info.packageName, holder);
- if (holder.state != baseProcessTracker) {
- holder.state.makeActive();
- }
+ } else if (numOfPkgs != 1) {
+ mPkgList.clear();
+ mPkgList.put(info.packageName,
+ new ProcessStats.ProcessStateHolder(info.longVersionCode));
}
- } else if (N != 1) {
- pkgList.clear();
- pkgList.put(info.packageName,
- new ProcessStats.ProcessStateHolder(info.longVersionCode));
}
}
}
- public String[] getPackageList() {
- int size = pkgList.size();
- if (size == 0) {
- return null;
- }
- String list[] = new String[size];
- for (int i=0; i<pkgList.size(); i++) {
- list[i] = pkgList.keyAt(i);
- }
- return list;
+ String[] getPackageList() {
+ return mPkgList.getPackageList();
}
- public List<VersionedPackage> getPackageListWithVersionCode() {
- int size = pkgList.size();
- if (size == 0) {
- return null;
- }
- List<VersionedPackage> list = new ArrayList<>();
- for (int i = 0; i < pkgList.size(); i++) {
- list.add(new VersionedPackage(pkgList.keyAt(i), pkgList.valueAt(i).appVersion));
- }
- return list;
+ List<VersionedPackage> getPackageListWithVersionCode() {
+ return mPkgList.getPackageListWithVersionCode();
}
WindowProcessController getWindowProcessController() {
@@ -1221,12 +1082,12 @@
void setReportedProcState(int repProcState) {
mRepProcState = repProcState;
- for (int ipkg = pkgList.size() - 1; ipkg >= 0; ipkg--) {
- FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
- uid, processName, pkgList.keyAt(ipkg),
+ getPkgList().forEachPackage((pkgName, holder) ->
+ FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_STATE_CHANGED,
+ uid, processName, pkgName,
ActivityManager.processStateAmToProto(mRepProcState),
- pkgList.valueAt(ipkg).appVersion);
- }
+ holder.appVersion)
+ );
mWindowProcessController.setReportedProcState(repProcState);
}
@@ -1469,8 +1330,8 @@
@Override
public void clearProfilerIfNeeded() {
- synchronized (mService) {
- mService.mAppProfiler.clearProfilerLocked();
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ mService.mAppProfiler.clearProfilerLPf();
}
}
@@ -1484,15 +1345,10 @@
@Override
public void setPendingUiClean(boolean pendingUiClean) {
synchronized (mService) {
- mPendingUiClean = pendingUiClean;
- mWindowProcessController.setPendingUiClean(pendingUiClean);
+ mProfile.setPendingUiClean(pendingUiClean);
}
}
- boolean hasPendingUiClean() {
- return mPendingUiClean;
- }
-
@Override
public void setPendingUiCleanAndForceProcessStateUpTo(int newState) {
synchronized (mService) {
@@ -1541,7 +1397,9 @@
synchronized (mService) {
waitingToKill = null;
if (setProfileProc) {
- mService.mAppProfiler.setProfileProcLocked(this);
+ synchronized (mService.mAppProfiler.mProfilerLock) {
+ mService.mAppProfiler.setProfileProcLPf(this);
+ }
}
if (packageName != null) {
addPackage(packageName, versionCode, mService.mProcessStats);
@@ -1698,7 +1556,7 @@
// Check if package is still being loaded
boolean isPackageLoading = false;
final PackageManagerInternal packageManagerInternal =
- mService.getPackageManagerInternalLocked();
+ mService.getPackageManagerInternal();
if (aInfo != null && aInfo.packageName != null) {
IncrementalStatesInfo incrementalStatesInfo =
packageManagerInternal.getIncrementalStatesInfo(
@@ -2104,7 +1962,7 @@
if (!mAllowStartFgs) {
// uid is on DeviceIdleController's user/system allowlist
// or AMS's FgsStartTempAllowList.
- mAllowStartFgs = mService.isWhitelistedForFgsStartLocked(info.uid);
+ mAllowStartFgs = mService.isAllowlistedForFgsStartLocked(info.uid);
}
}
diff --git a/services/core/java/com/android/server/am/StrictModeViolationDialog.java b/services/core/java/com/android/server/am/StrictModeViolationDialog.java
index 783f150..22e7faa 100644
--- a/services/core/java/com/android/server/am/StrictModeViolationDialog.java
+++ b/services/core/java/com/android/server/am/StrictModeViolationDialog.java
@@ -49,8 +49,8 @@
mProc = app;
mResult = result;
CharSequence name;
- if ((app.pkgList.size() == 1) &&
- (name=context.getPackageManager().getApplicationLabel(app.info)) != null) {
+ if ((app.getPkgList().size() == 1)
+ && (name = context.getPackageManager().getApplicationLabel(app.info)) != null) {
setMessage(res.getString(
com.android.internal.R.string.smv_application,
name.toString(), app.info.processName));
diff --git a/services/core/java/com/android/server/am/UidRecord.java b/services/core/java/com/android/server/am/UidRecord.java
index f1945ed..36d22bf 100644
--- a/services/core/java/com/android/server/am/UidRecord.java
+++ b/services/core/java/com/android/server/am/UidRecord.java
@@ -41,8 +41,8 @@
long lastBackgroundTime;
boolean ephemeral;
boolean foregroundServices;
- boolean curWhitelist;
- boolean setWhitelist;
+ boolean mCurAllowlist;
+ boolean mSetAllowlist;
boolean idle;
boolean setIdle;
int numProcs;
@@ -157,7 +157,7 @@
proto.write(UidRecordProto.CURRENT, ProcessList.makeProcStateProtoEnum(mCurProcState));
proto.write(UidRecordProto.EPHEMERAL, ephemeral);
proto.write(UidRecordProto.FG_SERVICES, foregroundServices);
- proto.write(UidRecordProto.WHILELIST, curWhitelist);
+ proto.write(UidRecordProto.WHILELIST, mCurAllowlist);
ProtoUtils.toDuration(proto, UidRecordProto.LAST_BACKGROUND_TIME,
lastBackgroundTime, SystemClock.elapsedRealtime());
proto.write(UidRecordProto.IDLE, idle);
@@ -191,8 +191,8 @@
if (foregroundServices) {
sb.append(" fgServices");
}
- if (curWhitelist) {
- sb.append(" whitelist");
+ if (mCurAllowlist) {
+ sb.append(" allowlist");
}
if (lastBackgroundTime > 0) {
sb.append(" bg:");
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 3bbc837..6dd78e7 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -118,6 +118,7 @@
import java.util.Objects;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
/**
* Helper class for {@link ActivityManagerService} responsible for multi-user functionality.
@@ -1458,7 +1459,7 @@
t.traceBegin("updateConfigurationAndProfileIds");
if (foreground) {
// Make sure the old user is no longer considering the display to be on.
- mInjector.reportGlobalUsageEventLocked(UsageEvents.Event.SCREEN_NON_INTERACTIVE);
+ mInjector.reportGlobalUsageEvent(UsageEvents.Event.SCREEN_NON_INTERACTIVE);
boolean userSwitchUiEnabled;
synchronized (mLock) {
mCurrentUserId = userId;
@@ -3045,7 +3046,7 @@
d.show();
}
- void reportGlobalUsageEventLocked(int event) {
+ void reportGlobalUsageEvent(int event) {
mService.reportGlobalUsageEvent(event);
}
diff --git a/services/core/java/com/android/server/apphibernation/AppHibernationService.java b/services/core/java/com/android/server/apphibernation/AppHibernationService.java
index 508bb01..fded85c 100644
--- a/services/core/java/com/android/server/apphibernation/AppHibernationService.java
+++ b/services/core/java/com/android/server/apphibernation/AppHibernationService.java
@@ -20,6 +20,7 @@
import static android.content.Intent.ACTION_PACKAGE_REMOVED;
import static android.content.Intent.ACTION_USER_ADDED;
import static android.content.Intent.ACTION_USER_REMOVED;
+import static android.content.Intent.EXTRA_REMOVED_FOR_ALL_USERS;
import static android.content.Intent.EXTRA_REPLACING;
import static android.content.pm.PackageManager.MATCH_ALL;
import static android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION;
@@ -46,6 +47,7 @@
import android.os.UserManager;
import android.provider.DeviceConfig;
import android.util.ArrayMap;
+import android.util.ArraySet;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
@@ -55,6 +57,7 @@
import java.io.FileDescriptor;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* System service that manages app hibernation state, a state apps can enter that means they are
@@ -74,6 +77,8 @@
private final UserManager mUserManager;
@GuardedBy("mLock")
private final SparseArray<Map<String, UserPackageState>> mUserStates = new SparseArray<>();
+ @GuardedBy("mLock")
+ private final Set<String> mGloballyHibernatedPackages = new ArraySet<>();
/**
* Initializes the system service.
@@ -138,7 +143,7 @@
* @param userId the user to check
* @return true if package is hibernating for the user
*/
- public boolean isHibernating(String packageName, int userId) {
+ boolean isHibernatingForUser(String packageName, int userId) {
userId = handleIncomingUser(userId, "isHibernating");
synchronized (mLock) {
final Map<String, UserPackageState> packageStates = mUserStates.get(userId);
@@ -151,7 +156,19 @@
String.format("Package %s is not installed for user %s",
packageName, userId));
}
- return pkgState != null ? pkgState.hibernated : null;
+ return pkgState.hibernated;
+ }
+ }
+
+ /**
+ * Whether a package is hibernated globally. This only occurs when a package is hibernating for
+ * all users and allows us to make optimizations at the package or APK level.
+ *
+ * @param packageName package to check
+ */
+ boolean isHibernatingGlobally(String packageName) {
+ synchronized (mLock) {
+ return mGloballyHibernatedPackages.contains(packageName);
}
}
@@ -162,7 +179,7 @@
* @param userId user
* @param isHibernating new hibernation state
*/
- public void setHibernating(String packageName, int userId, boolean isHibernating) {
+ void setHibernatingForUser(String packageName, int userId, boolean isHibernating) {
userId = handleIncomingUser(userId, "setHibernating");
synchronized (mLock) {
if (!mUserStates.contains(userId)) {
@@ -180,32 +197,99 @@
return;
}
-
- final long caller = Binder.clearCallingIdentity();
- try {
- if (isHibernating) {
- Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "hibernatePackage");
- mIActivityManager.forceStopPackage(packageName, userId);
- mIPackageManager.deleteApplicationCacheFilesAsUser(packageName, userId,
- null /* observer */);
- } else {
- Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackage");
- mIPackageManager.setPackageStoppedState(packageName, false, userId);
- }
- pkgState.hibernated = isHibernating;
- } catch (RemoteException e) {
- throw new IllegalStateException(
- "Failed to hibernate due to manager not being available", e);
- } finally {
- Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
- Binder.restoreCallingIdentity(caller);
+ if (isHibernating) {
+ hibernatePackageForUserL(packageName, userId, pkgState);
+ } else {
+ unhibernatePackageForUserL(packageName, userId, pkgState);
}
-
- // TODO: Support package level hibernation when package is hibernating for all users
}
}
/**
+ * Set whether the package should be hibernated globally at a package level, allowing the
+ * the system to make optimizations at the package or APK level.
+ *
+ * @param packageName package to hibernate globally
+ * @param isHibernating new hibernation state
+ */
+ void setHibernatingGlobally(String packageName, boolean isHibernating) {
+ if (isHibernating != mGloballyHibernatedPackages.contains(packageName)) {
+ synchronized (mLock) {
+ if (isHibernating) {
+ hibernatePackageGloballyL(packageName);
+ } else {
+ unhibernatePackageGloballyL(packageName);
+ }
+ }
+ }
+ }
+
+ /**
+ * Put an app into hibernation for a given user, allowing user-level optimizations to occur.
+ * The caller should hold {@link #mLock}
+ *
+ * @param pkgState package hibernation state
+ */
+ private void hibernatePackageForUserL(@NonNull String packageName, int userId,
+ @NonNull UserPackageState pkgState) {
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "hibernatePackage");
+ final long caller = Binder.clearCallingIdentity();
+ try {
+ mIActivityManager.forceStopPackage(packageName, userId);
+ mIPackageManager.deleteApplicationCacheFilesAsUser(packageName, userId,
+ null /* observer */);
+ pkgState.hibernated = true;
+ } catch (RemoteException e) {
+ throw new IllegalStateException(
+ "Failed to hibernate due to manager not being available", e);
+ } finally {
+ Binder.restoreCallingIdentity(caller);
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+ }
+ }
+
+ /**
+ * Remove a package from hibernation for a given user. The caller should hold {@link #mLock}.
+ *
+ * @param pkgState package hibernation state
+ */
+ private void unhibernatePackageForUserL(@NonNull String packageName, int userId,
+ UserPackageState pkgState) {
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackage");
+ final long caller = Binder.clearCallingIdentity();
+ try {
+ mIPackageManager.setPackageStoppedState(packageName, false, userId);
+ pkgState.hibernated = false;
+ } catch (RemoteException e) {
+ throw new IllegalStateException(
+ "Failed to unhibernate due to manager not being available", e);
+ } finally {
+ Binder.restoreCallingIdentity(caller);
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+ }
+ }
+
+ /**
+ * Put a package into global hibernation, optimizing its storage at a package / APK level.
+ * The caller should hold {@link #mLock}.
+ */
+ private void hibernatePackageGloballyL(@NonNull String packageName) {
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "hibernatePackageGlobally");
+ // TODO(175830194): Delete vdex/odex when DexManager API is built out
+ mGloballyHibernatedPackages.add(packageName);
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+ }
+
+ /**
+ * Unhibernate a package from global hibernation. The caller should hold {@link #mLock}.
+ */
+ private void unhibernatePackageGloballyL(@NonNull String packageName) {
+ Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackageGlobally");
+ mGloballyHibernatedPackages.remove(packageName);
+ Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+ }
+
+ /**
* Populates {@link #mUserStates} with the users installed packages. The caller should hold
* {@link #mLock}.
*
@@ -220,8 +304,8 @@
throw new IllegalStateException("Package manager not available.", e);
}
- for (PackageInfo pkg : packageList) {
- packages.put(pkg.packageName, new UserPackageState());
+ for (int i = 0, size = packageList.size(); i < size; i++) {
+ packages.put(packageList.get(i).packageName, new UserPackageState());
}
mUserStates.put(userId, packages);
}
@@ -250,6 +334,12 @@
}
}
+ private void onPackageRemovedForAllUsers(@NonNull String packageName) {
+ synchronized (mLock) {
+ mGloballyHibernatedPackages.remove(packageName);
+ }
+ }
+
/**
* Private helper method to get the real user id and enforce permission checks.
*
@@ -277,13 +367,23 @@
}
@Override
- public boolean isHibernating(String packageName, int userId) {
- return mService.isHibernating(packageName, userId);
+ public boolean isHibernatingForUser(String packageName, int userId) {
+ return mService.isHibernatingForUser(packageName, userId);
}
@Override
- public void setHibernating(String packageName, int userId, boolean isHibernating) {
- mService.setHibernating(packageName, userId, isHibernating);
+ public void setHibernatingForUser(String packageName, int userId, boolean isHibernating) {
+ mService.setHibernatingForUser(packageName, userId, isHibernating);
+ }
+
+ @Override
+ public void setHibernatingGlobally(String packageName, boolean isHibernating) {
+ mService.setHibernatingGlobally(packageName, isHibernating);
+ }
+
+ @Override
+ public boolean isHibernatingGlobally(String packageName) {
+ return mService.isHibernatingGlobally(packageName);
}
@Override
@@ -322,6 +422,9 @@
onPackageAdded(packageName, userId);
} else if (ACTION_PACKAGE_REMOVED.equals(action)) {
onPackageRemoved(packageName, userId);
+ if (intent.getBooleanExtra(EXTRA_REMOVED_FOR_ALL_USERS, false)) {
+ onPackageRemovedForAllUsers(packageName);
+ }
}
}
}
diff --git a/services/core/java/com/android/server/apphibernation/AppHibernationShellCommand.java b/services/core/java/com/android/server/apphibernation/AppHibernationShellCommand.java
index 869885e..7d6eea2 100644
--- a/services/core/java/com/android/server/apphibernation/AppHibernationShellCommand.java
+++ b/services/core/java/com/android/server/apphibernation/AppHibernationShellCommand.java
@@ -18,7 +18,6 @@
import android.os.ShellCommand;
import android.os.UserHandle;
-import android.text.TextUtils;
import java.io.PrintWriter;
@@ -27,6 +26,7 @@
*/
final class AppHibernationShellCommand extends ShellCommand {
private static final String USER_OPT = "--user";
+ private static final String GLOBAL_OPT = "--global";
private static final int SUCCESS = 0;
private static final int ERROR = -1;
private final AppHibernationService mService;
@@ -51,7 +51,21 @@
}
private int runSetState() {
- int userId = parseUserOption();
+ String opt;
+ boolean setsGlobal = false;
+ int userId = UserHandle.USER_CURRENT;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case USER_OPT:
+ userId = UserHandle.parseUserArg(getNextArgRequired());
+ break;
+ case GLOBAL_OPT:
+ setsGlobal = true;
+ break;
+ default:
+ getErrPrintWriter().println("Error: Unknown option: " + opt);
+ }
+ }
String pkg = getNextArgRequired();
if (pkg == null) {
@@ -66,32 +80,43 @@
}
boolean newState = Boolean.parseBoolean(newStateRaw);
- mService.setHibernating(pkg, userId, newState);
+ if (setsGlobal) {
+ mService.setHibernatingGlobally(pkg, newState);
+ } else {
+ mService.setHibernatingForUser(pkg, userId, newState);
+ }
return SUCCESS;
}
private int runGetState() {
- int userId = parseUserOption();
+ String opt;
+ boolean requestsGlobal = false;
+ int userId = UserHandle.USER_CURRENT;
+ while ((opt = getNextOption()) != null) {
+ switch (opt) {
+ case USER_OPT:
+ userId = UserHandle.parseUserArg(getNextArgRequired());
+ break;
+ case GLOBAL_OPT:
+ requestsGlobal = true;
+ break;
+ default:
+ getErrPrintWriter().println("Error: Unknown option: " + opt);
+ }
+ }
String pkg = getNextArgRequired();
if (pkg == null) {
getErrPrintWriter().println("Error: No package specified");
return ERROR;
}
- boolean isHibernating = mService.isHibernating(pkg, userId);
+ boolean isHibernating = requestsGlobal
+ ? mService.isHibernatingGlobally(pkg) : mService.isHibernatingForUser(pkg, userId);
final PrintWriter pw = getOutPrintWriter();
pw.println(isHibernating);
return SUCCESS;
}
- private int parseUserOption() {
- String option = getNextOption();
- if (TextUtils.equals(option, USER_OPT)) {
- return UserHandle.parseUserArg(getNextArgRequired());
- }
- return UserHandle.USER_CURRENT;
- }
-
@Override
public void onHelp() {
final PrintWriter pw = getOutPrintWriter();
@@ -99,11 +124,13 @@
pw.println(" help");
pw.println(" Print this help text.");
pw.println("");
- pw.println(" set-state [--user USER_ID] PACKAGE true|false");
- pw.println(" Sets the hibernation state of the package to value specified");
+ pw.println(" set-state [--user USER_ID] [--global] PACKAGE true|false");
+ pw.println(" Sets the hibernation state of the package to value specified. Optionally");
+ pw.println(" may specify a user id or set global hibernation state.");
pw.println("");
- pw.println(" get-state [--user USER_ID] PACKAGE");
- pw.println(" Gets the hibernation state of the package");
+ pw.println(" get-state [--user USER_ID] [--global] PACKAGE");
+ pw.println(" Gets the hibernation state of the package. Optionally may specify a user");
+ pw.println(" id or request global hibernation state.");
pw.println("");
}
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
index 271537a..c5237ab 100644
--- a/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
+++ b/services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java
@@ -635,10 +635,15 @@
proto.write(BiometricSchedulerProto.CURRENT_OPERATION, mCurrentOperation != null
? mCurrentOperation.mClientMonitor.getProtoEnum() : BiometricsProto.CM_NONE);
proto.write(BiometricSchedulerProto.TOTAL_OPERATIONS, mTotalOperationsHandled);
- Slog.d(getTag(), "Total operations: " + mTotalOperationsHandled);
- for (int i = 0; i < mRecentOperations.size(); i++) {
- Slog.d(getTag(), "Operation: " + mRecentOperations.get(i));
- proto.write(BiometricSchedulerProto.RECENT_OPERATIONS, mRecentOperations.get(i));
+
+ if (!mRecentOperations.isEmpty()) {
+ for (int i = 0; i < mRecentOperations.size(); i++) {
+ proto.write(BiometricSchedulerProto.RECENT_OPERATIONS, mRecentOperations.get(i));
+ }
+ } else {
+ // TODO:(b/178828362) Unsure why protobuf has a problem decoding when an empty list
+ // is returned. So, let's just add a no-op for this case.
+ proto.write(BiometricSchedulerProto.RECENT_OPERATIONS, BiometricsProto.CM_NONE);
}
proto.flush();
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 8ce6746..b455a3f 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -70,7 +70,7 @@
import android.net.RouteInfo;
import android.net.UidRange;
import android.net.UidRangeParcel;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
import android.net.VpnManager;
import android.net.VpnService;
import android.net.ipsec.ike.ChildSessionCallback;
@@ -426,6 +426,7 @@
mNetworkCapabilities = new NetworkCapabilities();
mNetworkCapabilities.addTransportType(NetworkCapabilities.TRANSPORT_VPN);
mNetworkCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
+ mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);
loadAlwaysOnPackage(keyStore);
}
@@ -1819,12 +1820,12 @@
* This method should not be called if underlying interfaces field is needed, because it doesn't
* have enough data to fill VpnInfo.underlyingIfaces field.
*/
- public synchronized VpnInfo getVpnInfo() {
+ public synchronized UnderlyingNetworkInfo getUnderlyingNetworkInfo() {
if (!isRunningLocked()) {
return null;
}
- return new VpnInfo(mOwnerUID, mInterface, null);
+ return new UnderlyingNetworkInfo(mOwnerUID, mInterface, new ArrayList<>());
}
public synchronized boolean appliesToUid(int uid) {
diff --git a/services/core/java/com/android/server/graphics/GameManagerService.java b/services/core/java/com/android/server/graphics/GameManagerService.java
new file mode 100644
index 0000000..876f02f
--- /dev/null
+++ b/services/core/java/com/android/server/graphics/GameManagerService.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.graphics;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.graphics.GameManager;
+import android.graphics.GameManager.GameMode;
+import android.graphics.IGameManagerService;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+import android.util.ArrayMap;
+import android.util.Slog;
+
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.ServiceThread;
+import com.android.server.SystemService;
+
+/**
+ * Service to manage game related features.
+ *
+ * <p>Game service is a core service that monitors, coordinates game related features,
+ * as well as collect metrics.</p>
+ *
+ * @hide
+ */
+public final class GameManagerService extends IGameManagerService.Stub {
+ public static final String TAG = "GameManagerService";
+
+ private static final boolean DEBUG = false;
+
+ static final int WRITE_SETTINGS = 1;
+ static final int REMOVE_SETTINGS = 2;
+ static final int WRITE_SETTINGS_DELAY = 10 * 1000; // 10 seconds
+
+ private final Context mContext;
+ private final Object mLock = new Object();
+ private final Handler mHandler;
+ @GuardedBy("mLock")
+ private final ArrayMap<Integer, Settings> mSettings = new ArrayMap<>();
+
+ public GameManagerService(Context context) {
+ this(context, createServiceThread().getLooper());
+ }
+
+ GameManagerService(Context context, Looper looper) {
+ mContext = context;
+ mHandler = new SettingsHandler(looper);
+ }
+
+ class SettingsHandler extends Handler {
+
+ SettingsHandler(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ doHandleMessage(msg);
+ }
+
+ void doHandleMessage(Message msg) {
+ switch (msg.what) {
+ case WRITE_SETTINGS: {
+ final int userId = (int) msg.obj;
+ Process.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT);
+ synchronized (mLock) {
+ removeMessages(WRITE_SETTINGS, msg.obj);
+ if (mSettings.containsKey(userId)) {
+ Settings userSettings = mSettings.get(userId);
+ userSettings.writePersistentDataLocked();
+ }
+ }
+ Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
+ break;
+ }
+ case REMOVE_SETTINGS: {
+ final int userId = (int) msg.obj;
+ synchronized (mLock) {
+ // Since the user was removed, ignore previous write message
+ // and do write here.
+ removeMessages(WRITE_SETTINGS, msg.obj);
+ removeMessages(REMOVE_SETTINGS, msg.obj);
+ if (mSettings.containsKey(userId)) {
+ final Settings userSettings = mSettings.get(userId);
+ mSettings.remove(userId);
+ userSettings.writePersistentDataLocked();
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * SystemService lifecycle for GameService.
+ * @hide
+ */
+ public static class Lifecycle extends SystemService {
+ private GameManagerService mService;
+
+ public Lifecycle(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void onStart() {
+ mService = new GameManagerService(getContext());
+ publishBinderService(Context.GAME_SERVICE, mService);
+ }
+
+ @Override
+ public void onBootPhase(int phase) {
+ if (phase == PHASE_BOOT_COMPLETED) {
+ mService.onBootCompleted();
+ }
+ }
+
+ @Override
+ public void onUserStarting(@NonNull TargetUser user) {
+ mService.onUserStarting(user.getUserIdentifier());
+ }
+
+ @Override
+ public void onUserStopping(@NonNull TargetUser user) {
+ mService.onUserStopping(user.getUserIdentifier());
+ }
+ }
+
+ //TODO(b/178111358) Add proper permission check and multi-user handling
+ @Override
+ public @GameMode int getGameMode(String packageName, int userId) {
+ synchronized (mLock) {
+ if (!mSettings.containsKey(userId)) {
+ return GameManager.GAME_MODE_UNSUPPORTED;
+ }
+ Settings userSettings = mSettings.get(userId);
+ return userSettings.getGameModeLocked(packageName);
+ }
+ }
+
+ //TODO(b/178111358) Add proper permission check and multi-user handling
+ @Override
+ public void setGameMode(String packageName, @GameMode int gameMode, int userId) {
+ synchronized (mLock) {
+ if (!mSettings.containsKey(userId)) {
+ return;
+ }
+ Settings userSettings = mSettings.get(userId);
+ userSettings.setGameModeLocked(packageName, gameMode);
+ final Message msg = mHandler.obtainMessage(WRITE_SETTINGS);
+ msg.obj = userId;
+ if (!mHandler.hasEqualMessages(WRITE_SETTINGS, userId)) {
+ mHandler.sendMessageDelayed(msg, WRITE_SETTINGS_DELAY);
+ }
+ }
+ }
+
+ /**
+ * Notified when boot is completed.
+ */
+ @VisibleForTesting
+ void onBootCompleted() {
+ Slog.d(TAG, "onBootCompleted");
+ }
+
+ void onUserStarting(int userId) {
+ synchronized (mLock) {
+ if (mSettings.containsKey(userId)) {
+ return;
+ }
+
+ Settings userSettings = new Settings(Environment.getDataSystemDeDirectory(userId));
+ mSettings.put(userId, userSettings);
+ userSettings.readPersistentDataLocked();
+ }
+ }
+
+ void onUserStopping(int userId) {
+ synchronized (mLock) {
+ if (!mSettings.containsKey(userId)) {
+ return;
+ }
+ final Message msg = mHandler.obtainMessage(REMOVE_SETTINGS);
+ msg.obj = userId;
+ mHandler.sendMessage(msg);
+ }
+ }
+
+ private static ServiceThread createServiceThread() {
+ ServiceThread handlerThread = new ServiceThread(TAG,
+ Process.THREAD_PRIORITY_BACKGROUND, true /*allowIo*/);
+ handlerThread.start();
+ return handlerThread;
+ }
+}
diff --git a/services/core/java/com/android/server/graphics/Settings.java b/services/core/java/com/android/server/graphics/Settings.java
new file mode 100644
index 0000000..bbd84d0
--- /dev/null
+++ b/services/core/java/com/android/server/graphics/Settings.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.graphics;
+
+import android.graphics.GameManager;
+import android.os.FileUtils;
+import android.util.ArrayMap;
+import android.util.AtomicFile;
+import android.util.Slog;
+import android.util.TypedXmlPullParser;
+import android.util.TypedXmlSerializer;
+import android.util.Xml;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.XmlUtils;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Persists all GameService related settings.
+ * @hide
+ */
+public class Settings {
+
+ // The XML file follows the below format:
+ // <?xml>
+ // <packages>
+ // <package></package>
+ // ...
+ // </packages>
+ private static final String GAME_SERVICE_FILE_NAME = "game-manager-service.xml";
+
+ private static final String TAG_PACKAGE = "package";
+ private static final String TAG_PACKAGES = "packages";
+ private static final String ATTR_NAME = "name";
+ private static final String ATTR_GAME_MODE = "gameMode";
+
+ private final File mSystemDir;
+ @VisibleForTesting
+ final AtomicFile mSettingsFile;
+
+ // PackageName -> GameMode
+ private final ArrayMap<String, Integer> mGameModes = new ArrayMap<>();
+
+ Settings(File dataDir) {
+ mSystemDir = new File(dataDir, "system");
+ mSystemDir.mkdirs();
+ FileUtils.setPermissions(mSystemDir.toString(),
+ FileUtils.S_IRWXU | FileUtils.S_IRWXG
+ | FileUtils.S_IROTH | FileUtils.S_IXOTH,
+ -1, -1);
+ mSettingsFile = new AtomicFile(new File(mSystemDir, GAME_SERVICE_FILE_NAME));
+ }
+
+ /**
+ * Return the game mode of a given package.
+ * This operation must be synced with an external lock.
+ */
+ int getGameModeLocked(String packageName) {
+ if (mGameModes.containsKey(packageName)) {
+ return mGameModes.get(packageName);
+ }
+ return GameManager.GAME_MODE_UNSUPPORTED;
+ }
+
+ /**
+ * Set the game mode of a given package.
+ * This operation must be synced with an external lock.
+ */
+ void setGameModeLocked(String packageName, int gameMode) {
+ mGameModes.put(packageName, gameMode);
+ }
+
+ /**
+ * Write all current game service settings into disk.
+ * This operation must be synced with an external lock.
+ */
+ void writePersistentDataLocked() {
+ FileOutputStream fstr = null;
+ try {
+ fstr = mSettingsFile.startWrite();
+
+ final TypedXmlSerializer serializer = Xml.resolveSerializer(fstr);
+ serializer.startDocument(null, true);
+ serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
+
+ serializer.startTag(null, TAG_PACKAGES);
+ for (Map.Entry<String, Integer> entry : mGameModes.entrySet()) {
+ serializer.startTag(null, TAG_PACKAGE);
+ serializer.attribute(null, ATTR_NAME, entry.getKey());
+ serializer.attributeInt(null, ATTR_GAME_MODE, entry.getValue());
+ serializer.endTag(null, TAG_PACKAGE);
+ }
+ serializer.endTag(null, TAG_PACKAGES);
+
+ serializer.endDocument();
+
+ mSettingsFile.finishWrite(fstr);
+
+ FileUtils.setPermissions(mSettingsFile.toString(),
+ FileUtils.S_IRUSR | FileUtils.S_IWUSR
+ | FileUtils.S_IRGRP | FileUtils.S_IWGRP,
+ -1, -1);
+ return;
+ } catch (java.io.IOException e) {
+ mSettingsFile.failWrite(fstr);
+ Slog.wtf(GameManagerService.TAG, "Unable to write game manager service settings, "
+ + "current changes will be lost at reboot", e);
+ }
+ }
+
+ /**
+ * Read game service settings from the disk.
+ * This operation must be synced with an external lock.
+ */
+ boolean readPersistentDataLocked() {
+ mGameModes.clear();
+
+ try {
+ final FileInputStream str = mSettingsFile.openRead();
+
+ final TypedXmlPullParser parser = Xml.resolvePullParser(str);
+ int type;
+ while ((type = parser.next()) != XmlPullParser.START_TAG
+ && type != XmlPullParser.END_DOCUMENT) {
+ }
+ if (type != XmlPullParser.START_TAG) {
+ Slog.wtf(GameManagerService.TAG,
+ "No start tag found in package manager settings");
+ return false;
+ }
+
+ int outerDepth = parser.getDepth();
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
+ if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
+ continue;
+ }
+
+ String tagName = parser.getName();
+ if (tagName.equals(TAG_PACKAGE)) {
+ readPackage(parser);
+ } else {
+ Slog.w(GameManagerService.TAG, "Unknown element: " + parser.getName());
+ XmlUtils.skipCurrentTag(parser);
+ }
+ }
+ } catch (XmlPullParserException | java.io.IOException e) {
+ Slog.wtf(GameManagerService.TAG, "Error reading package manager settings", e);
+ return false;
+ }
+
+ return true;
+ }
+
+ private void readPackage(TypedXmlPullParser parser) throws XmlPullParserException,
+ IOException {
+ String name = null;
+ int gameMode = GameManager.GAME_MODE_UNSUPPORTED;
+ try {
+ name = parser.getAttributeValue(null, ATTR_NAME);
+ gameMode = parser.getAttributeInt(null, ATTR_GAME_MODE);
+ } catch (XmlPullParserException e) {
+ Slog.wtf(GameManagerService.TAG, "Error reading game mode", e);
+ }
+ if (name != null) {
+ mGameModes.put(name, gameMode);
+ } else {
+ XmlUtils.skipCurrentTag(parser);
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
index 5f7d938..7461405 100644
--- a/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
+++ b/services/core/java/com/android/server/graphics/fonts/FontManagerService.java
@@ -16,6 +16,7 @@
package com.android.server.graphics.fonts;
+import android.Manifest;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
@@ -24,6 +25,7 @@
import android.graphics.fonts.FontFileUtil;
import android.graphics.fonts.FontManager;
import android.graphics.fonts.SystemFonts;
+import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.SharedMemory;
@@ -37,6 +39,7 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.graphics.fonts.IFontManager;
import com.android.internal.util.DumpUtils;
+import com.android.internal.util.Preconditions;
import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.security.FileIntegrityService;
@@ -53,6 +56,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
/** A service for managing system fonts. */
// TODO(b/173619554): Add API to update fonts.
@@ -66,10 +70,27 @@
return getSystemFontConfig();
}
+ @Override
+ public int updateFont(ParcelFileDescriptor fd, byte[] signature, int baseVersion)
+ throws RemoteException {
+ Objects.requireNonNull(fd);
+ Objects.requireNonNull(signature);
+ Preconditions.checkArgumentNonnegative(baseVersion);
+ getContext().enforceCallingPermission(Manifest.permission.UPDATE_FONTS,
+ "UPDATE_FONTS permission required.");
+ try {
+ installFontFile(fd.getFileDescriptor(), signature, baseVersion);
+ return FontManager.RESULT_SUCCESS;
+ } catch (SystemFontException e) {
+ Slog.e(TAG, "Failed to update font file", e);
+ return e.getErrorCode();
+ }
+ }
+
/* package */ static class SystemFontException extends AndroidException {
private final int mErrorCode;
- SystemFontException(@FontManager.ErrorCode int errorCode, String msg, Throwable cause) {
+ SystemFontException(@FontManager.ResultCode int errorCode, String msg, Throwable cause) {
super(msg, cause);
mErrorCode = errorCode;
}
@@ -79,7 +100,8 @@
mErrorCode = errorCode;
}
- @FontManager.ErrorCode int getErrorCode() {
+ @FontManager.ResultCode
+ int getErrorCode() {
return mErrorCode;
}
}
@@ -197,14 +219,21 @@
}
}
- /* package */ void installFontFile(FileDescriptor fd, byte[] pkcs7Signature)
+ /* package */ void installFontFile(FileDescriptor fd, byte[] pkcs7Signature, int baseVersion)
throws SystemFontException {
if (mUpdatableFontDir == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FONT_UPDATER_DISABLED,
+ FontManager.RESULT_ERROR_FONT_UPDATER_DISABLED,
"The font updater is disabled.");
}
synchronized (FontManagerService.this) {
+ // baseVersion == -1 only happens from shell command. This is filtered and treated as
+ // error from SystemApi call.
+ if (baseVersion != -1 && mUpdatableFontDir.getConfigVersion() != baseVersion) {
+ throw new SystemFontException(
+ FontManager.RESULT_ERROR_VERSION_MISMATCH,
+ "The base config version is older than current.");
+ }
mUpdatableFontDir.installFontFile(fd, pkcs7Signature);
// Create updated font map in the next getSerializedSystemFontMap() call.
mSerializedFontMap = null;
@@ -214,7 +243,7 @@
/* package */ void clearUpdates() throws SystemFontException {
if (mUpdatableFontDir == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FONT_UPDATER_DISABLED,
+ FontManager.RESULT_ERROR_FONT_UPDATER_DISABLED,
"The font updater is disabled.");
}
mUpdatableFontDir.clearUpdates();
diff --git a/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java b/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java
index 5a01a97..d2111e7 100644
--- a/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java
+++ b/services/core/java/com/android/server/graphics/fonts/FontManagerShellCommand.java
@@ -304,27 +304,27 @@
String fontPath = shell.getNextArg();
if (fontPath == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_SHELL_ARGUMENT,
+ FontManager.RESULT_ERROR_INVALID_SHELL_ARGUMENT,
"Font file path argument is required.");
}
String signaturePath = shell.getNextArg();
if (signaturePath == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_SHELL_ARGUMENT,
+ FontManager.RESULT_ERROR_INVALID_SHELL_ARGUMENT,
"Signature file argument is required.");
}
ParcelFileDescriptor fontFd = shell.openFileForSystem(fontPath, "r");
if (fontFd == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_OPEN_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_OPEN_FONT_FILE,
"Failed to open font file");
}
ParcelFileDescriptor sigFd = shell.openFileForSystem(signaturePath, "r");
if (sigFd == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_OPEN_SIGNATURE_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_OPEN_SIGNATURE_FILE,
"Failed to open signature file");
}
@@ -333,24 +333,24 @@
int len = sigFis.available();
if (len > MAX_SIGNATURE_FILE_SIZE_BYTES) {
throw new SystemFontException(
- FontManager.ERROR_CODE_SIGNATURE_TOO_LARGE,
+ FontManager.RESULT_ERROR_SIGNATURE_TOO_LARGE,
"Signature file is too large");
}
byte[] signature = new byte[len];
if (sigFis.read(signature, 0, len) != len) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_SIGNATURE_FILE,
+ FontManager.RESULT_ERROR_INVALID_SIGNATURE_FILE,
"Invalid read length");
}
- mService.installFontFile(fontFis.getFD(), signature);
+ mService.installFontFile(fontFis.getFD(), signature, -1);
} catch (IOException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_SIGNATURE_FILE,
+ FontManager.RESULT_ERROR_INVALID_SIGNATURE_FILE,
"Failed to read signature file.", e);
}
} catch (IOException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_FONT_FILE,
+ FontManager.RESULT_ERROR_INVALID_FONT_FILE,
"Failed to read font files.", e);
}
@@ -370,7 +370,7 @@
FontConfig config = mService.getSystemFontConfig();
writer.println("Current Version: " + config.getConfigVersion());
- LocalDateTime dt = LocalDateTime.ofEpochSecond(config.getLastModifiedDate(), 0,
+ LocalDateTime dt = LocalDateTime.ofEpochSecond(config.getLastModifiedTimeMillis(), 0,
ZoneOffset.UTC);
writer.println("Last Modified Date: " + dt.format(DateTimeFormatter.ISO_DATE_TIME));
diff --git a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
index 720105d..b0bc65b 100644
--- a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
+++ b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
@@ -130,13 +130,7 @@
UpdatableFontDir(File filesDir, List<File> preinstalledFontDirs, FontFileParser parser,
FsverityUtil fsverityUtil) {
- mFilesDir = filesDir;
- mPreinstalledFontDirs = preinstalledFontDirs;
- mParser = parser;
- mFsverityUtil = fsverityUtil;
- mConfigFile = new File(CONFIG_XML_FILE);
- mTmpConfigFile = new File(CONFIG_XML_FILE + ".tmp");
- loadFontFileMap();
+ this(filesDir, preinstalledFontDirs, parser, fsverityUtil, new File(CONFIG_XML_FILE));
}
// For unit testing
@@ -199,7 +193,7 @@
PersistentSystemFontConfig.writeToXml(fos, mConfig);
} catch (Exception e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE,
+ FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG,
"Failed to write config XML.", e);
}
mConfigVersion++;
@@ -222,7 +216,7 @@
File newDir = getRandomDir(mFilesDir);
if (!newDir.mkdir()) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
"Failed to create font directory.");
}
try {
@@ -230,7 +224,7 @@
Os.chmod(newDir.getAbsolutePath(), 0711);
} catch (ErrnoException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
"Failed to change mode to 711", e);
}
boolean success = false;
@@ -240,7 +234,7 @@
FileUtils.copy(fd, out.getFD());
} catch (IOException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
"Failed to write font file to storage.", e);
}
try {
@@ -250,7 +244,7 @@
pkcs7Signature);
} catch (IOException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_VERIFICATION_FAILURE,
+ FontManager.RESULT_ERROR_VERIFICATION_FAILURE,
"Failed to setup fs-verity.", e);
}
String postScriptName;
@@ -258,18 +252,18 @@
postScriptName = mParser.getPostScriptName(tempNewFontFile);
} catch (IOException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_FONT_FILE,
+ FontManager.RESULT_ERROR_INVALID_FONT_FILE,
"Failed to read PostScript name from font file", e);
}
if (postScriptName == null) {
throw new SystemFontException(
- FontManager.ERROR_CODE_MISSING_POST_SCRIPT_NAME,
+ FontManager.RESULT_ERROR_INVALID_FONT_NAME,
"Failed to read PostScript name from font file");
}
File newFontFile = new File(newDir, postScriptName + ALLOWED_EXTENSION);
if (!mFsverityUtil.rename(tempNewFontFile, newFontFile)) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
"Failed to move verified font file.");
}
try {
@@ -277,7 +271,7 @@
Os.chmod(newFontFile.getAbsolutePath(), 0644);
} catch (ErrnoException e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE,
+ FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE,
"Failed to change mode to 711", e);
}
FontFileInfo fontFileInfo = validateFontFile(newFontFile);
@@ -291,7 +285,7 @@
PersistentSystemFontConfig.writeToXml(fos, copied);
} catch (Exception e) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE,
+ FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG,
"Failed to write config XML.", e);
}
@@ -299,7 +293,7 @@
HashMap<String, FontFileInfo> backup = new HashMap<>(mFontFileInfoMap);
if (!addFileToMapIfNewerLocked(fontFileInfo, false)) {
throw new SystemFontException(
- FontManager.ERROR_CODE_DOWNGRADING,
+ FontManager.RESULT_ERROR_DOWNGRADING,
"Downgrading font file is forbidden.");
}
@@ -308,7 +302,7 @@
mFontFileInfoMap.clear();
mFontFileInfoMap.putAll(backup);
throw new SystemFontException(
- FontManager.ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE,
+ FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG,
"Failed to stage the config file.");
}
@@ -400,18 +394,18 @@
private FontFileInfo validateFontFile(File file) throws SystemFontException {
if (!mFsverityUtil.hasFsverity(file.getAbsolutePath())) {
throw new SystemFontException(
- FontManager.ERROR_CODE_VERIFICATION_FAILURE,
+ FontManager.RESULT_ERROR_VERIFICATION_FAILURE,
"Font validation failed. Fs-verity is not enabled: " + file);
}
if (!validateFontFileName(file)) {
throw new SystemFontException(
- FontManager.ERROR_CODE_FONT_NAME_MISMATCH,
+ FontManager.RESULT_ERROR_INVALID_FONT_NAME,
"Font validation failed. Could not validate font file name: " + file);
}
long revision = getFontRevision(file);
if (revision == -1) {
throw new SystemFontException(
- FontManager.ERROR_CODE_INVALID_FONT_FILE,
+ FontManager.RESULT_ERROR_INVALID_FONT_FILE,
"Font validation failed. Could not read font revision: " + file);
}
return new FontFileInfo(file, revision);
@@ -472,4 +466,10 @@
);
}
}
+
+ /* package */ int getConfigVersion() {
+ synchronized (UpdatableFontDir.this) {
+ return mConfigVersion;
+ }
+ }
}
diff --git a/services/core/java/com/android/server/location/contexthub/OWNERS b/services/core/java/com/android/server/location/contexthub/OWNERS
index d4393d6..90c2330 100644
--- a/services/core/java/com/android/server/location/contexthub/OWNERS
+++ b/services/core/java/com/android/server/location/contexthub/OWNERS
@@ -1,2 +1,3 @@
arthuri@google.com
bduddie@google.com
+stange@google.com
diff --git a/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java b/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
index 8399f54..a1e18bd 100644
--- a/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
+++ b/services/core/java/com/android/server/locksettings/ResumeOnRebootServiceProvider.java
@@ -106,6 +106,8 @@
private final Context mContext;
private final ComponentName mComponentName;
private IResumeOnRebootService mBinder;
+ @Nullable
+ ServiceConnection mServiceConnection;
private ResumeOnRebootServiceConnection(Context context,
@NonNull ComponentName componentName) {
@@ -115,17 +117,9 @@
/** Unbind from the service */
public void unbindService() {
- mContext.unbindService(new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- mBinder = null;
-
- }
- });
+ if (mServiceConnection != null) {
+ mContext.unbindService(mServiceConnection);
+ }
}
/** Bind to the service */
@@ -134,17 +128,19 @@
CountDownLatch connectionLatch = new CountDownLatch(1);
Intent intent = new Intent();
intent.setComponent(mComponentName);
- final boolean success = mContext.bindServiceAsUser(intent, new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- mBinder = IResumeOnRebootService.Stub.asInterface(service);
- connectionLatch.countDown();
- }
+ mServiceConnection = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ mBinder = IResumeOnRebootService.Stub.asInterface(service);
+ connectionLatch.countDown();
+ }
- @Override
- public void onServiceDisconnected(ComponentName name) {
- }
- },
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ mBinder = null;
+ }
+ };
+ final boolean success = mContext.bindServiceAsUser(intent, mServiceConnection,
Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,
BackgroundThread.getHandler(), UserHandle.SYSTEM);
diff --git a/services/core/java/com/android/server/net/NetworkStatsFactory.java b/services/core/java/com/android/server/net/NetworkStatsFactory.java
index 4faa790..d042b88 100644
--- a/services/core/java/com/android/server/net/NetworkStatsFactory.java
+++ b/services/core/java/com/android/server/net/NetworkStatsFactory.java
@@ -27,7 +27,7 @@
import android.annotation.Nullable;
import android.net.INetd;
import android.net.NetworkStats;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
import android.net.util.NetdService;
import android.os.RemoteException;
import android.os.StrictMode;
@@ -81,7 +81,7 @@
private final Object mPersistentDataLock = new Object();
/** Set containing info about active VPNs and their underlying networks. */
- private volatile VpnInfo[] mVpnInfos = new VpnInfo[0];
+ private volatile UnderlyingNetworkInfo[] mUnderlyingNetworkInfos = new UnderlyingNetworkInfo[0];
// A persistent snapshot of cumulative stats since device start
@GuardedBy("mPersistentDataLock")
@@ -116,8 +116,8 @@
*
* @param vpnArray The snapshot of the currently-running VPNs.
*/
- public void updateVpnInfos(VpnInfo[] vpnArray) {
- mVpnInfos = vpnArray.clone();
+ public void updateUnderlyingNetworkInfos(UnderlyingNetworkInfo[] vpnArray) {
+ mUnderlyingNetworkInfos = vpnArray.clone();
}
/**
@@ -319,7 +319,7 @@
// code that will acquire other locks within the system server. See b/134244752.
synchronized (mPersistentDataLock) {
// Take a reference. If this gets swapped out, we still have the old reference.
- final VpnInfo[] vpnArray = mVpnInfos;
+ final UnderlyingNetworkInfo[] vpnArray = mUnderlyingNetworkInfos;
// Take a defensive copy. mPersistSnapshot is mutated in some cases below
final NetworkStats prev = mPersistSnapshot.clone();
@@ -369,8 +369,8 @@
}
@GuardedBy("mPersistentDataLock")
- private NetworkStats adjustForTunAnd464Xlat(
- NetworkStats uidDetailStats, NetworkStats previousStats, VpnInfo[] vpnArray) {
+ private NetworkStats adjustForTunAnd464Xlat(NetworkStats uidDetailStats,
+ NetworkStats previousStats, UnderlyingNetworkInfo[] vpnArray) {
// Calculate delta from last snapshot
final NetworkStats delta = uidDetailStats.subtract(previousStats);
@@ -381,8 +381,9 @@
delta.apply464xlatAdjustments(mStackedIfaces);
// Migrate data usage over a VPN to the TUN network.
- for (VpnInfo info : vpnArray) {
- delta.migrateTun(info.ownerUid, info.vpnIface, info.underlyingIfaces);
+ for (UnderlyingNetworkInfo info : vpnArray) {
+ delta.migrateTun(info.ownerUid, info.iface,
+ info.underlyingIfaces.toArray(new String[0]));
// Filter out debug entries as that may lead to over counting.
delta.filterDebugEntries();
}
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 4be7b48..0ab35a9 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -104,8 +104,8 @@
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
import android.net.TrafficStats;
+import android.net.UnderlyingNetworkInfo;
import android.net.Uri;
-import android.net.VpnInfo;
import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.netstats.provider.NetworkStatsProvider;
@@ -973,7 +973,7 @@
Network[] defaultNetworks,
NetworkState[] networkStates,
String activeIface,
- VpnInfo[] vpnInfos) {
+ UnderlyingNetworkInfo[] underlyingNetworkInfos) {
checkNetworkStackPermission(mContext);
final long token = Binder.clearCallingIdentity();
@@ -986,7 +986,7 @@
// Update the VPN underlying interfaces only after the poll is made and tun data has been
// migrated. Otherwise the migration would use the new interfaces instead of the ones that
// were current when the polled data was transferred.
- mStatsFactory.updateVpnInfos(vpnInfos);
+ mStatsFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
}
@Override
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 4eaac2e4..7c42569 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -3299,17 +3299,28 @@
}
}
+ private void linkFile(String relativePath, String fromBase, String toBase) throws IOException {
+ try {
+ // Try
+ if (mIncrementalFileStorages != null && mIncrementalFileStorages.makeLink(relativePath,
+ fromBase, toBase)) {
+ return;
+ }
+ mPm.mInstaller.linkFile(relativePath, fromBase, toBase);
+ } catch (InstallerException | IOException e) {
+ throw new IOException("failed linkOrCreateDir(" + relativePath + ", "
+ + fromBase + ", " + toBase + ")", e);
+ }
+ }
+
private void linkFiles(List<File> fromFiles, File toDir, File fromDir)
throws IOException {
for (File fromFile : fromFiles) {
final String relativePath = getRelativePath(fromFile, fromDir);
- try {
- mPm.mInstaller.linkFile(relativePath, fromDir.getAbsolutePath(),
- toDir.getAbsolutePath());
- } catch (InstallerException e) {
- throw new IOException("failed linkOrCreateDir(" + relativePath + ", "
- + fromDir + ", " + toDir + ")", e);
- }
+ final String fromBase = fromDir.getAbsolutePath();
+ final String toBase = toDir.getAbsolutePath();
+
+ linkFile(relativePath, fromBase, toBase);
}
Slog.d(TAG, "Linked " + fromFiles.size() + " files into " + toDir);
@@ -3577,12 +3588,6 @@
// Retrying commit.
if (mIncrementalFileStorages != null) {
- try {
- mIncrementalFileStorages.startLoading();
- } catch (IOException e) {
- throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, e.getMessage(),
- e.getCause());
- }
return false;
}
@@ -3757,9 +3762,15 @@
};
try {
+ final PackageInfo pkgInfo = mPm.getPackageInfo(this.params.appPackageName, 0,
+ userId);
+ final File inheritedDir =
+ (pkgInfo != null && pkgInfo.applicationInfo != null) ? new File(
+ pkgInfo.applicationInfo.getCodePath()).getParentFile() : null;
+
mIncrementalFileStorages = IncrementalFileStorages.initialize(mContext, stageDir,
- params, statusListener, healthCheckParams, healthListener, addedFiles,
- perUidReadTimeouts);
+ inheritedDir, params, statusListener, healthCheckParams, healthListener,
+ addedFiles, perUidReadTimeouts);
return false;
} catch (IOException e) {
throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE, e.getMessage(),
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d2fc5b4..f772f63 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18163,13 +18163,15 @@
return false;
}
- String codePath = codeFile.getAbsolutePath();
- if (mIncrementalManager != null && isIncrementalPath(codePath)) {
- mIncrementalManager.onPackageRemoved(codePath);
- }
+ final boolean isIncremental = (mIncrementalManager != null && isIncrementalPath(
+ codeFile.getAbsolutePath()));
removeCodePathLI(codeFile);
+ if (isIncremental) {
+ mIncrementalManager.onPackageRemoved(codeFile);
+ }
+
return true;
}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 0aaa1a1..ece101d 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4192,12 +4192,14 @@
mInsetsStateController.getImeSourceProvider().checkShowImePostLayout();
mLastHasContent = mTmpApplySurfaceChangesTransactionState.displayHasContent;
- mWmService.mDisplayManagerInternal.setDisplayProperties(mDisplayId,
- mLastHasContent,
- mTmpApplySurfaceChangesTransactionState.preferredRefreshRate,
- mTmpApplySurfaceChangesTransactionState.preferredModeId,
- mTmpApplySurfaceChangesTransactionState.preferMinimalPostProcessing,
- true /* inTraversal, must call performTraversalInTrans... below */);
+ if (!mWmService.mDisplayFrozen) {
+ mWmService.mDisplayManagerInternal.setDisplayProperties(mDisplayId,
+ mLastHasContent,
+ mTmpApplySurfaceChangesTransactionState.preferredRefreshRate,
+ mTmpApplySurfaceChangesTransactionState.preferredModeId,
+ mTmpApplySurfaceChangesTransactionState.preferMinimalPostProcessing,
+ true /* inTraversal, must call performTraversalInTrans... below */);
+ }
final boolean wallpaperVisible = mWallpaperController.isWallpaperVisible();
if (wallpaperVisible != mLastWallpaperVisible) {
diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp
index d224428..b2efc71 100644
--- a/services/incremental/BinderIncrementalService.cpp
+++ b/services/incremental/BinderIncrementalService.cpp
@@ -118,18 +118,10 @@
binder::Status BinderIncrementalService::createStorage(
const ::std::string& path, const ::android::content::pm::DataLoaderParamsParcel& params,
- int32_t createMode,
- const ::android::sp<::android::content::pm::IDataLoaderStatusListener>& statusListener,
- const ::android::os::incremental::StorageHealthCheckParams& healthCheckParams,
- const ::android::sp<::android::os::incremental::IStorageHealthListener>& healthListener,
- const ::std::vector<::android::os::incremental::PerUidReadTimeouts>& perUidReadTimeouts,
- int32_t* _aidl_return) {
- *_aidl_return =
- mImpl.createStorage(path, const_cast<content::pm::DataLoaderParamsParcel&&>(params),
- android::incremental::IncrementalService::CreateOptions(createMode),
- statusListener,
- const_cast<StorageHealthCheckParams&&>(healthCheckParams),
- healthListener, perUidReadTimeouts);
+ int32_t createMode, int32_t* _aidl_return) {
+ *_aidl_return = mImpl.createStorage(path, params,
+ android::incremental::IncrementalService::CreateOptions(
+ createMode));
return ok();
}
@@ -144,6 +136,21 @@
return ok();
}
+binder::Status BinderIncrementalService::startLoading(
+ int32_t storageId, const ::android::content::pm::DataLoaderParamsParcel& params,
+ const ::android::sp<::android::content::pm::IDataLoaderStatusListener>& statusListener,
+ const ::android::os::incremental::StorageHealthCheckParams& healthCheckParams,
+ const ::android::sp<IStorageHealthListener>& healthListener,
+ const ::std::vector<::android::os::incremental::PerUidReadTimeouts>& perUidReadTimeouts,
+ bool* _aidl_return) {
+ *_aidl_return =
+ mImpl.startLoading(storageId, const_cast<content::pm::DataLoaderParamsParcel&&>(params),
+ statusListener,
+ const_cast<StorageHealthCheckParams&&>(healthCheckParams),
+ healthListener, perUidReadTimeouts);
+ return ok();
+}
+
binder::Status BinderIncrementalService::makeBindMount(int32_t storageId,
const std::string& sourcePath,
const std::string& targetFullPath,
@@ -253,9 +260,16 @@
return ok();
}
+binder::Status BinderIncrementalService::isFullyLoaded(int32_t storageId, int32_t* _aidl_return) {
+ *_aidl_return = mImpl.getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/true)
+ .blocksRemainingOrError();
+ return ok();
+}
+
binder::Status BinderIncrementalService::getLoadingProgress(int32_t storageId,
float* _aidl_return) {
- *_aidl_return = mImpl.getLoadingProgress(storageId).getProgress();
+ *_aidl_return =
+ mImpl.getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/false).getProgress();
return ok();
}
@@ -291,11 +305,6 @@
return ok();
}
-binder::Status BinderIncrementalService::startLoading(int32_t storageId, bool* _aidl_return) {
- *_aidl_return = mImpl.startLoading(storageId);
- return ok();
-}
-
binder::Status BinderIncrementalService::configureNativeBinaries(
int32_t storageId, const std::string& apkFullPath, const std::string& libDirRelativePath,
const std::string& abi, bool extractNativeLibs, bool* _aidl_return) {
diff --git a/services/incremental/BinderIncrementalService.h b/services/incremental/BinderIncrementalService.h
index 9a4537a..740c542 100644
--- a/services/incremental/BinderIncrementalService.h
+++ b/services/incremental/BinderIncrementalService.h
@@ -39,16 +39,18 @@
void onInvalidStorage(int mountId);
binder::Status openStorage(const std::string& path, int32_t* _aidl_return) final;
- binder::Status createStorage(
- const ::std::string& path, const ::android::content::pm::DataLoaderParamsParcel& params,
- int32_t createMode,
+ binder::Status createStorage(const ::std::string& path,
+ const ::android::content::pm::DataLoaderParamsParcel& params,
+ int32_t createMode, int32_t* _aidl_return) final;
+ binder::Status createLinkedStorage(const std::string& path, int32_t otherStorageId,
+ int32_t createMode, int32_t* _aidl_return) final;
+ binder::Status startLoading(
+ int32_t storageId, const ::android::content::pm::DataLoaderParamsParcel& params,
const ::android::sp<::android::content::pm::IDataLoaderStatusListener>& statusListener,
const ::android::os::incremental::StorageHealthCheckParams& healthCheckParams,
const ::android::sp<IStorageHealthListener>& healthListener,
const ::std::vector<::android::os::incremental::PerUidReadTimeouts>& perUidReadTimeouts,
- int32_t* _aidl_return) final;
- binder::Status createLinkedStorage(const std::string& path, int32_t otherStorageId,
- int32_t createMode, int32_t* _aidl_return) final;
+ bool* _aidl_return) final;
binder::Status makeBindMount(int32_t storageId, const std::string& sourcePath,
const std::string& targetFullPath, int32_t bindType,
int32_t* _aidl_return) final;
@@ -71,12 +73,12 @@
binder::Status unlink(int32_t storageId, const std::string& path, int32_t* _aidl_return) final;
binder::Status isFileFullyLoaded(int32_t storageId, const std::string& path,
int32_t* _aidl_return) final;
+ binder::Status isFullyLoaded(int32_t storageId, int32_t* _aidl_return) final;
binder::Status getLoadingProgress(int32_t storageId, float* _aidl_return) final;
binder::Status getMetadataByPath(int32_t storageId, const std::string& path,
std::vector<uint8_t>* _aidl_return) final;
binder::Status getMetadataById(int32_t storageId, const std::vector<uint8_t>& id,
std::vector<uint8_t>* _aidl_return) final;
- binder::Status startLoading(int32_t storageId, bool* _aidl_return) final;
binder::Status deleteStorage(int32_t storageId) final;
binder::Status disallowReadLogs(int32_t storageId) final;
binder::Status configureNativeBinaries(int32_t storageId, const std::string& apkFullPath,
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index c9c5489..132f973 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -356,7 +356,9 @@
dprintf(fd, " storages (%d): {\n", int(mnt.storages.size()));
for (auto&& [storageId, storage] : mnt.storages) {
dprintf(fd, " [%d] -> [%s] (%d %% loaded) \n", storageId, storage.name.c_str(),
- (int)(getLoadingProgressFromPath(mnt, storage.name.c_str()).getProgress() *
+ (int)(getLoadingProgressFromPath(mnt, storage.name.c_str(),
+ /*stopOnFirstIncomplete=*/false)
+ .getProgress() *
100));
}
dprintf(fd, " }\n");
@@ -427,10 +429,8 @@
}
StorageId IncrementalService::createStorage(
- std::string_view mountPoint, content::pm::DataLoaderParamsParcel&& dataLoaderParams,
- CreateOptions options, const DataLoaderStatusListener& statusListener,
- StorageHealthCheckParams&& healthCheckParams, const StorageHealthListener& healthListener,
- const std::vector<PerUidReadTimeouts>& perUidReadTimeouts) {
+ std::string_view mountPoint, const content::pm::DataLoaderParamsParcel& dataLoaderParams,
+ CreateOptions options) {
LOG(INFO) << "createStorage: " << mountPoint << " | " << int(options);
if (!path::isAbsolute(mountPoint)) {
LOG(ERROR) << "path is not absolute: " << mountPoint;
@@ -538,13 +538,10 @@
metadata::Mount m;
m.mutable_storage()->set_id(ifs->mountId);
m.mutable_loader()->set_type((int)dataLoaderParams.type);
- m.mutable_loader()->set_allocated_package_name(&dataLoaderParams.packageName);
- m.mutable_loader()->set_allocated_class_name(&dataLoaderParams.className);
- m.mutable_loader()->set_allocated_arguments(&dataLoaderParams.arguments);
+ m.mutable_loader()->set_package_name(dataLoaderParams.packageName);
+ m.mutable_loader()->set_class_name(dataLoaderParams.className);
+ m.mutable_loader()->set_arguments(dataLoaderParams.arguments);
const auto metadata = m.SerializeAsString();
- m.mutable_loader()->release_arguments();
- m.mutable_loader()->release_class_name();
- m.mutable_loader()->release_package_name();
if (auto err =
mIncFs->makeFile(ifs->control,
path::join(ifs->root, constants().mount,
@@ -568,26 +565,9 @@
// Done here as well, all data structures are in good state.
secondCleanupOnFailure.release();
- // DataLoader.
- auto dataLoaderStub = prepareDataLoader(*ifs, std::move(dataLoaderParams), &statusListener,
- std::move(healthCheckParams), &healthListener);
- CHECK(dataLoaderStub);
-
mountIt->second = std::move(ifs);
l.unlock();
- // Per Uid timeouts.
- if (!perUidReadTimeouts.empty()) {
- setUidReadTimeouts(mountId, perUidReadTimeouts);
- }
-
- if (mSystemReady.load(std::memory_order_relaxed) && !dataLoaderStub->requestCreate()) {
- // failed to create data loader
- LOG(ERROR) << "initializeDataLoader() failed";
- deleteStorage(dataLoaderStub->id());
- return kInvalidStorageId;
- }
-
LOG(INFO) << "created storage " << mountId;
return mountId;
}
@@ -634,6 +614,37 @@
return storageId;
}
+bool IncrementalService::startLoading(StorageId storage,
+ content::pm::DataLoaderParamsParcel&& dataLoaderParams,
+ const DataLoaderStatusListener& statusListener,
+ StorageHealthCheckParams&& healthCheckParams,
+ const StorageHealthListener& healthListener,
+ const std::vector<PerUidReadTimeouts>& perUidReadTimeouts) {
+ // Per Uid timeouts.
+ if (!perUidReadTimeouts.empty()) {
+ setUidReadTimeouts(storage, perUidReadTimeouts);
+ }
+
+ // Re-initialize DataLoader.
+ std::unique_lock l(mLock);
+ const auto ifs = getIfsLocked(storage);
+ if (!ifs) {
+ return false;
+ }
+ if (ifs->dataLoaderStub) {
+ ifs->dataLoaderStub->cleanupResources();
+ ifs->dataLoaderStub = {};
+ }
+ l.unlock();
+
+ // DataLoader.
+ auto dataLoaderStub = prepareDataLoader(*ifs, std::move(dataLoaderParams), &statusListener,
+ std::move(healthCheckParams), &healthListener);
+ CHECK(dataLoaderStub);
+
+ return dataLoaderStub->requestStart();
+}
+
IncrementalService::BindPathMap::const_iterator IncrementalService::findStorageLocked(
std::string_view path) const {
return findParentPath(mBindsByPath, path);
@@ -960,7 +971,12 @@
LOG(ERROR) << "Invalid paths in link(): " << normOldPath << " | " << normNewPath;
return -EINVAL;
}
- return mIncFs->link(ifsSrc->control, normOldPath, normNewPath);
+ if (auto err = mIncFs->link(ifsSrc->control, normOldPath, normNewPath); err < 0) {
+ PLOG(ERROR) << "Failed to link " << oldPath << "[" << normOldPath << "]"
+ << " to " << newPath << "[" << normNewPath << "]";
+ return err;
+ }
+ return 0;
}
int IncrementalService::unlink(StorageId storage, std::string_view path) {
@@ -1065,23 +1081,6 @@
return mIncFs->getMetadata(ifs->control, node);
}
-bool IncrementalService::startLoading(StorageId storage) const {
- DataLoaderStubPtr dataLoaderStub;
- {
- std::unique_lock l(mLock);
- const auto& ifs = getIfsLocked(storage);
- if (!ifs) {
- return false;
- }
- dataLoaderStub = ifs->dataLoaderStub;
- if (!dataLoaderStub) {
- return false;
- }
- }
- dataLoaderStub->requestStart();
- return true;
-}
-
void IncrementalService::setUidReadTimeouts(
StorageId storage, const std::vector<PerUidReadTimeouts>& perUidReadTimeouts) {
using microseconds = std::chrono::microseconds;
@@ -1092,11 +1091,15 @@
maxPendingTimeUs = std::max(maxPendingTimeUs, microseconds(timeouts.maxPendingTimeUs));
}
if (maxPendingTimeUs < Constants::minPerUidTimeout) {
+ LOG(ERROR) << "Skip setting timeouts: maxPendingTime < Constants::minPerUidTimeout"
+ << duration_cast<milliseconds>(maxPendingTimeUs).count() << "ms < "
+ << Constants::minPerUidTimeout.count() << "ms";
return;
}
const auto ifs = getIfs(storage);
if (!ifs) {
+ LOG(ERROR) << "Setting read timeouts failed: invalid storage id: " << storage;
return;
}
@@ -1126,7 +1129,7 @@
}
// Still loading?
- const auto progress = getLoadingProgress(storage);
+ const auto progress = getLoadingProgress(storage, /*stopOnFirstIncomplete=*/true);
if (progress.isError()) {
// Something is wrong, abort.
return clearUidReadTimeouts(storage);
@@ -1840,7 +1843,7 @@
}
IncrementalService::LoadingProgress IncrementalService::getLoadingProgress(
- StorageId storage) const {
+ StorageId storage, bool stopOnFirstIncomplete) const {
std::unique_lock l(mLock);
const auto ifs = getIfsLocked(storage);
if (!ifs) {
@@ -1853,11 +1856,11 @@
return {-EINVAL, -EINVAL};
}
l.unlock();
- return getLoadingProgressFromPath(*ifs, storageInfo->second.name);
+ return getLoadingProgressFromPath(*ifs, storageInfo->second.name, stopOnFirstIncomplete);
}
IncrementalService::LoadingProgress IncrementalService::getLoadingProgressFromPath(
- const IncFsMount& ifs, std::string_view storagePath) const {
+ const IncFsMount& ifs, std::string_view storagePath, bool stopOnFirstIncomplete) const {
ssize_t totalBlocks = 0, filledBlocks = 0;
const auto filePaths = mFs->listFilesRecursive(storagePath);
for (const auto& filePath : filePaths) {
@@ -1870,6 +1873,9 @@
}
totalBlocks += totalBlocksCount;
filledBlocks += filledBlocksCount;
+ if (stopOnFirstIncomplete && filledBlocks < totalBlocks) {
+ break;
+ }
}
return {filledBlocks, totalBlocks};
@@ -1877,7 +1883,7 @@
bool IncrementalService::updateLoadingProgress(
StorageId storage, const StorageLoadingProgressListener& progressListener) {
- const auto progress = getLoadingProgress(storage);
+ const auto progress = getLoadingProgress(storage, /*stopOnFirstIncomplete=*/false);
if (progress.isError()) {
// Failed to get progress from incfs, abort.
return false;
diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h
index 3066121..5d53bac 100644
--- a/services/incremental/IncrementalService.h
+++ b/services/incremental/IncrementalService.h
@@ -113,6 +113,10 @@
bool started() const { return totalBlocks > 0; }
bool fullyLoaded() const { return !isError() && (totalBlocks == filledBlocks); }
+ int blocksRemainingOrError() const {
+ return totalBlocks <= 0 ? totalBlocks : totalBlocks - filledBlocks;
+ }
+
float getProgress() const {
return totalBlocks < 0
? totalBlocks
@@ -130,15 +134,18 @@
void onSystemReady();
StorageId createStorage(std::string_view mountPoint,
- content::pm::DataLoaderParamsParcel&& dataLoaderParams,
- CreateOptions options, const DataLoaderStatusListener& statusListener,
- StorageHealthCheckParams&& healthCheckParams,
- const StorageHealthListener& healthListener,
- const std::vector<PerUidReadTimeouts>& perUidReadTimeouts);
+ const content::pm::DataLoaderParamsParcel& dataLoaderParams,
+ CreateOptions options);
StorageId createLinkedStorage(std::string_view mountPoint, StorageId linkedStorage,
CreateOptions options = CreateOptions::Default);
StorageId openStorage(std::string_view path);
+ bool startLoading(StorageId storage, content::pm::DataLoaderParamsParcel&& dataLoaderParams,
+ const DataLoaderStatusListener& statusListener,
+ StorageHealthCheckParams&& healthCheckParams,
+ const StorageHealthListener& healthListener,
+ const std::vector<PerUidReadTimeouts>& perUidReadTimeouts);
+
int bind(StorageId storage, std::string_view source, std::string_view target, BindKind kind);
int unbind(StorageId storage, std::string_view target);
void deleteStorage(StorageId storage);
@@ -156,7 +163,9 @@
int unlink(StorageId storage, std::string_view path);
int isFileFullyLoaded(StorageId storage, std::string_view filePath) const;
- LoadingProgress getLoadingProgress(StorageId storage) const;
+
+ LoadingProgress getLoadingProgress(StorageId storage, bool stopOnFirstIncomplete) const;
+
bool registerLoadingProgressListener(StorageId storage,
const StorageLoadingProgressListener& progressListener);
bool unregisterLoadingProgressListener(StorageId storage);
@@ -167,8 +176,6 @@
RawMetadata getMetadata(StorageId storage, std::string_view path) const;
RawMetadata getMetadata(StorageId storage, FileId node) const;
- bool startLoading(StorageId storage) const;
-
bool configureNativeBinaries(StorageId storage, std::string_view apkFullPath,
std::string_view libDirRelativePath, std::string_view abi,
bool extractNativeLibs);
@@ -388,7 +395,8 @@
binder::Status applyStorageParams(IncFsMount& ifs, bool enableReadLogs);
int isFileFullyLoadedFromPath(const IncFsMount& ifs, std::string_view filePath) const;
- LoadingProgress getLoadingProgressFromPath(const IncFsMount& ifs, std::string_view path) const;
+ LoadingProgress getLoadingProgressFromPath(const IncFsMount& ifs, std::string_view path,
+ bool stopOnFirstIncomplete) const;
int setFileContent(const IfsMountPtr& ifs, const incfs::FileId& fileId,
std::string_view debugFilePath, std::span<const uint8_t> data) const;
diff --git a/services/incremental/ServiceWrappers.cpp b/services/incremental/ServiceWrappers.cpp
index dfa6083..3573177 100644
--- a/services/incremental/ServiceWrappers.cpp
+++ b/services/incremental/ServiceWrappers.cpp
@@ -220,6 +220,11 @@
timeout.minPendingTimeUs = perUidTimeout.minPendingTimeUs;
timeout.maxPendingTimeUs = perUidTimeout.maxPendingTimeUs;
}
+
+ LOG(ERROR) << "Set read timeouts: " << timeouts.size() << " ["
+ << (timeouts.empty() ? -1 : timeouts.front().uid) << "@"
+ << (timeouts.empty() ? -1 : timeouts.front().minTimeUs / 1000) << "ms]";
+
return incfs::setUidReadTimeouts(control, timeouts);
}
};
diff --git a/services/incremental/test/IncrementalServiceTest.cpp b/services/incremental/test/IncrementalServiceTest.cpp
index f0deba7..8713f9d 100644
--- a/services/incremental/test/IncrementalServiceTest.cpp
+++ b/services/incremental/test/IncrementalServiceTest.cpp
@@ -678,9 +678,9 @@
mVold->mountIncFsFails();
EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_LT(storageId, 0);
}
@@ -689,9 +689,9 @@
EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(0);
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_LT(storageId, 0);
}
@@ -702,9 +702,9 @@
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(0);
EXPECT_CALL(*mVold, unmountIncFs(_));
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_LT(storageId, 0);
}
@@ -716,9 +716,9 @@
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(0);
EXPECT_CALL(*mVold, unmountIncFs(_));
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_LT(storageId, 0);
}
@@ -734,24 +734,24 @@
EXPECT_CALL(*mDataLoader, destroy(_)).Times(0);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
- ASSERT_LT(storageId, 0);
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
+ ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, {}, {});
}
TEST_F(IncrementalServiceTest, testDeleteStorageSuccess) {
- EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(1);
- EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(1);
- EXPECT_CALL(*mDataLoader, start(_)).Times(0);
+ EXPECT_CALL(*mDataLoader, start(_)).Times(1);
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, {}, {});
mIncrementalService->deleteStorage(storageId);
}
@@ -759,14 +759,15 @@
EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(2);
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(2);
- EXPECT_CALL(*mDataLoader, start(_)).Times(0);
+ EXPECT_CALL(*mDataLoader, start(_)).Times(2);
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, {}, {});
// Simulated crash/other connection breakage.
mDataLoaderManager->setDataLoaderStatusDestroyed();
}
@@ -780,12 +781,13 @@
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
mDataLoaderManager->setDataLoaderStatusCreated();
- ASSERT_TRUE(mIncrementalService->startLoading(storageId));
mDataLoaderManager->setDataLoaderStatusStarted();
}
@@ -793,16 +795,17 @@
mDataLoader->initializeCreateOkNoStatus();
EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(1);
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
- EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(2);
+ EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(1);
EXPECT_CALL(*mDataLoader, start(_)).Times(1);
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
- ASSERT_TRUE(mIncrementalService->startLoading(storageId));
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
mDataLoaderManager->setDataLoaderStatusCreated();
}
@@ -815,10 +818,12 @@
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
mDataLoaderManager->setDataLoaderStatusUnavailable();
}
@@ -836,10 +841,12 @@
EXPECT_CALL(*mLooper, addFd(MockIncFs::kPendingReadsFd, _, _, _, _)).Times(1);
EXPECT_CALL(*mLooper, removeFd(MockIncFs::kPendingReadsFd)).Times(1);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
mDataLoaderManager->setDataLoaderStatusUnavailable();
ASSERT_NE(nullptr, mLooper->mCallback);
ASSERT_NE(nullptr, mLooper->mCallbackData);
@@ -890,10 +897,12 @@
kFirstTimestampUs - std::chrono::duration_cast<MCS>(unhealthyTimeout).count();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, std::move(params), listener, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {},
+ std::move(params), listener, {});
// Healthy state, registered for pending reads.
ASSERT_NE(nullptr, mLooper->mCallback);
@@ -985,10 +994,12 @@
// Not expecting callback removal.
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_GE(mDataLoader->setStorageParams(true), 0);
}
@@ -1006,10 +1017,12 @@
// Not expecting callback removal.
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_GE(mDataLoader->setStorageParams(true), 0);
// Now disable.
mIncrementalService->disallowReadLogs(storageId);
@@ -1032,10 +1045,12 @@
// After callback is called, disable read logs and remove callback.
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(1);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_GE(mDataLoader->setStorageParams(true), 0);
ASSERT_NE(nullptr, mAppOpsManager->mStoredCallback.get());
mAppOpsManager->mStoredCallback->opChanged(0, {});
@@ -1051,10 +1066,12 @@
EXPECT_CALL(*mAppOpsManager, startWatchingMode(_, _, _)).Times(0);
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_LT(mDataLoader->setStorageParams(true), 0);
}
@@ -1068,10 +1085,12 @@
EXPECT_CALL(*mAppOpsManager, startWatchingMode(_, _, _)).Times(0);
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_LT(mDataLoader->setStorageParams(true), 0);
}
@@ -1087,18 +1106,20 @@
EXPECT_CALL(*mAppOpsManager, startWatchingMode(_, _, _)).Times(0);
EXPECT_CALL(*mAppOpsManager, stopWatchingMode(_)).Times(0);
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ ASSERT_TRUE(mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {},
+ {}, {}));
ASSERT_LT(mDataLoader->setStorageParams(true), 0);
}
TEST_F(IncrementalServiceTest, testMakeDirectory) {
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
std::string dir_path("test");
// Expecting incfs to call makeDir on a path like:
@@ -1115,9 +1136,9 @@
TEST_F(IncrementalServiceTest, testMakeDirectories) {
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
auto first = "first"sv;
auto second = "second"sv;
auto third = "third"sv;
@@ -1138,9 +1159,9 @@
mFs->hasNoFile();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_EQ(-1, mIncrementalService->isFileFullyLoaded(storageId, "base.apk"));
}
@@ -1149,9 +1170,9 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(1);
ASSERT_EQ(-1, mIncrementalService->isFileFullyLoaded(storageId, "base.apk"));
}
@@ -1161,9 +1182,9 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(1);
ASSERT_EQ(0, mIncrementalService->isFileFullyLoaded(storageId, "base.apk"));
}
@@ -1173,9 +1194,9 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(1);
ASSERT_EQ(0, mIncrementalService->isFileFullyLoaded(storageId, "base.apk"));
}
@@ -1185,10 +1206,12 @@
mFs->hasNoFile();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
- ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId).getProgress());
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
+ ASSERT_EQ(1,
+ mIncrementalService->getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/false)
+ .getProgress());
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressFailsWithFailedRanges) {
@@ -1196,11 +1219,13 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(1);
- ASSERT_EQ(-1, mIncrementalService->getLoadingProgress(storageId).getProgress());
+ ASSERT_EQ(-1,
+ mIncrementalService->getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/false)
+ .getProgress());
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccessWithEmptyRanges) {
@@ -1208,11 +1233,13 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(3);
- ASSERT_EQ(1, mIncrementalService->getLoadingProgress(storageId).getProgress());
+ ASSERT_EQ(1,
+ mIncrementalService->getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/false)
+ .getProgress());
}
TEST_F(IncrementalServiceTest, testGetLoadingProgressSuccess) {
@@ -1220,11 +1247,13 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
EXPECT_CALL(*mIncFs, countFilledBlocks(_, _)).Times(3);
- ASSERT_EQ(0.5, mIncrementalService->getLoadingProgress(storageId).getProgress());
+ ASSERT_EQ(0.5,
+ mIncrementalService->getLoadingProgress(storageId, /*stopOnFirstIncomplete=*/false)
+ .getProgress());
}
TEST_F(IncrementalServiceTest, testRegisterLoadingProgressListenerSuccess) {
@@ -1232,9 +1261,9 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
sp<NiceMock<MockStorageLoadingProgressListener>> listener{
new NiceMock<MockStorageLoadingProgressListener>};
NiceMock<MockStorageLoadingProgressListener>* listenerMock = listener.get();
@@ -1257,9 +1286,9 @@
mFs->hasFiles();
TemporaryDir tempDir;
- int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew,
- {}, {}, {}, {});
+ int storageId =
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
sp<NiceMock<MockStorageLoadingProgressListener>> listener{
new NiceMock<MockStorageLoadingProgressListener>};
NiceMock<MockStorageLoadingProgressListener>* listenerMock = listener.get();
@@ -1275,10 +1304,12 @@
TemporaryDir tempDir;
int storageId =
- mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew, {},
- StorageHealthCheckParams{}, listener, {});
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, listener,
+ {});
+
StorageHealthCheckParams newParams;
newParams.blockedTimeoutMs = 10000;
newParams.unhealthyTimeoutMs = 20000;
@@ -1378,19 +1409,19 @@
EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _)).Times(1);
EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(1);
- EXPECT_CALL(*mDataLoader, start(_)).Times(0);
+ EXPECT_CALL(*mDataLoader, start(_)).Times(1);
EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
EXPECT_CALL(*mIncFs, setUidReadTimeouts(_, _)).Times(0);
EXPECT_CALL(*mTimedQueue, addJob(_, _, _)).Times(0);
EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
TemporaryDir tempDir;
int storageId =
- mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew, {}, {},
- {},
- createPerUidTimeouts(
- {{0, 1, 2, 3}, {1, 2, 3, 4}, {2, 3, 4, 5}}));
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, {},
+ createPerUidTimeouts(
+ {{0, 1, 2, 3}, {1, 2, 3, 4}, {2, 3, 4, 5}}));
}
TEST_F(IncrementalServiceTest, testPerUidTimeoutsSuccess) {
@@ -1410,13 +1441,12 @@
TemporaryDir tempDir;
int storageId =
- mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel),
- IncrementalService::CreateOptions::CreateNew, {}, {},
- {},
- createPerUidTimeouts({{0, 1, 2, 3},
- {1, 2, 3, 4},
- {2, 3, 4, 100000000}}));
+ mIncrementalService->createStorage(tempDir.path, mDataLoaderParcel,
+ IncrementalService::CreateOptions::CreateNew);
ASSERT_GE(storageId, 0);
+ mIncrementalService->startLoading(storageId, std::move(mDataLoaderParcel), {}, {}, {},
+ createPerUidTimeouts(
+ {{0, 1, 2, 3}, {1, 2, 3, 4}, {2, 3, 4, 100000000}}));
{
// Timed callback present -> 0 progress.
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index d28c3cc..544eedf 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -360,6 +360,8 @@
private static final String IP_CONNECTIVITY_METRICS_CLASS =
"com.android.server.connectivity.IpConnectivityMetrics";
private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService";
+ private static final String GAME_MANAGER_SERVICE_CLASS =
+ "com.android.server.graphics.GameManagerService$Lifecycle";
private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -2514,6 +2516,10 @@
}
t.traceEnd();
+ t.traceBegin("GameManagerService");
+ mSystemServiceManager.startService(GAME_MANAGER_SERVICE_CLASS);
+ t.traceEnd();
+
t.traceBegin("StartBootPhaseDeviceSpecificServicesReady");
mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY);
t.traceEnd();
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java b/services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java
index 17f326f..a18632b 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java
@@ -118,8 +118,12 @@
@After
public void tearDown() {
LocalServices.removeServiceForTest(PackageManagerInternal.class);
- mMockitoSession.finishMocking();
- mHandlerThread.quit();
+ if (mMockitoSession != null) {
+ mMockitoSession.finishMocking();
+ }
+ if (mHandlerThread != null) {
+ mHandlerThread.quit();
+ }
}
@Test
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
index e9a50b3..9441ecf 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
@@ -164,24 +164,24 @@
}
private void updateExitInfo(ProcessRecord app) {
- ApplicationExitInfo raw = mAppExitInfoTracker.obtainRawRecordLocked(app);
+ ApplicationExitInfo raw = mAppExitInfoTracker.obtainRawRecord(app);
mAppExitInfoTracker.handleNoteProcessDiedLocked(raw);
- mAppExitInfoTracker.recycleRawRecordLocked(raw);
+ mAppExitInfoTracker.recycleRawRecord(raw);
}
private void noteAppKill(ProcessRecord app, int reason, int subReason, String msg) {
- ApplicationExitInfo raw = mAppExitInfoTracker.obtainRawRecordLocked(app);
+ ApplicationExitInfo raw = mAppExitInfoTracker.obtainRawRecord(app);
raw.setReason(reason);
raw.setSubReason(subReason);
raw.setDescription(msg);
mAppExitInfoTracker.handleNoteAppKillLocked(raw);
- mAppExitInfoTracker.recycleRawRecordLocked(raw);
+ mAppExitInfoTracker.recycleRawRecord(raw);
}
@Test
public void testApplicationExitInfo() throws Exception {
mAppExitInfoTracker.clearProcessExitInfo(true);
- mAppExitInfoTracker.mAppExitInfoLoaded = true;
+ mAppExitInfoTracker.mAppExitInfoLoaded.set(true);
mAppExitInfoTracker.mProcExitStoreDir = new File(mContext.getFilesDir(),
AppExitInfoTracker.APP_EXIT_STORE_DIR);
assertTrue(FileUtils.createDir(mAppExitInfoTracker.mProcExitStoreDir));
@@ -1001,9 +1001,9 @@
}
app.connectionGroup = connectionGroup;
app.setProcState = procState;
- app.lastMemInfo = spy(new Debug.MemoryInfo());
- app.lastPss = pss;
- app.mLastRss = rss;
+ app.mProfile.setLastMemInfo(spy(new Debug.MemoryInfo()));
+ app.mProfile.setLastPss(pss);
+ app.mProfile.setLastRss(rss);
return app;
}
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/CacheOomRankerTest.java b/services/tests/mockingservicestests/src/com/android/server/am/CacheOomRankerTest.java
index 3710396..c82db73 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/CacheOomRankerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/CacheOomRankerTest.java
@@ -84,7 +84,7 @@
private int mNextPackageName = 1;
private TestExecutor mExecutor = new TestExecutor();
- private CacheOomRanker mCacheOomRanker = new CacheOomRanker();
+ private CacheOomRanker mCacheOomRanker;
@Before
public void setUp() {
@@ -107,6 +107,7 @@
LocalServices.removeServiceForTest(PackageManagerInternal.class);
LocalServices.addService(PackageManagerInternal.class, mPackageManagerInt);
+ mCacheOomRanker = new CacheOomRanker(mAms);
mCacheOomRanker.init(mExecutor);
}
@@ -383,7 +384,7 @@
app.setProcState = PROCESS_STATE_BOUND_FOREGROUND_SERVICE;
app.setAdj = setAdj;
app.lastActivityTime = lastActivityTime;
- app.mLastRss = lastRss;
+ app.mProfile.setLastRss(lastRss);
app.setCached(false);
for (int i = 0; i < returnedToCacheCount; ++i) {
app.setCached(false);
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
index 8011ec2..7daf357 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java
@@ -103,6 +103,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Test class for {@link OomAdjuster}.
@@ -159,8 +160,9 @@
sContext.getMainThreadHandler());
setFieldValue(ActivityManagerService.class, sService, "mContext",
sContext);
- ProcessList pr = new ProcessList();
- pr.init(sService, new ActiveUids(sService, false), null);
+ ProcessList pr = spy(new ProcessList());
+ pr.mService = sService;
+ AppProfiler profiler = mock(AppProfiler.class);
setFieldValue(ActivityManagerService.class, sService, "mProcessList",
pr);
setFieldValue(ActivityManagerService.class, sService, "mHandler",
@@ -173,13 +175,14 @@
mock(OomAdjProfiler.class));
setFieldValue(ActivityManagerService.class, sService, "mUserController",
mock(UserController.class));
- setFieldValue(ActivityManagerService.class, sService, "mAppProfiler",
- mock(AppProfiler.class));
- doReturn(new ActivityManagerService.ProcessChangeItem()).when(sService)
+ setFieldValue(ActivityManagerService.class, sService, "mAppProfiler", profiler);
+ setFieldValue(AppProfiler.class, profiler, "mProfilerLock", new Object());
+ doReturn(new ActivityManagerService.ProcessChangeItem()).when(pr)
.enqueueProcessChangeItemLocked(anyInt(), anyInt());
sService.mOomAdjuster = new OomAdjuster(sService, sService.mProcessList,
mock(ActiveUids.class));
sService.mOomAdjuster.mAdjSeq = 10000;
+ sService.mWakefulness = new AtomicInteger(PowerManagerInternal.WAKEFULNESS_AWAKE);
}
@AfterClass
@@ -206,9 +209,9 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.maxAdj = PERSISTENT_PROC_ADJ;
app.setHasTopUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_ASLEEP;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_ASLEEP);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERSISTENT_PROC_ADJ,
SCHED_GROUP_RESTRICTED);
@@ -221,7 +224,7 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.maxAdj = PERSISTENT_PROC_ADJ;
app.setHasTopUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_PERSISTENT_UI, PERSISTENT_PROC_ADJ,
@@ -234,10 +237,10 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.maxAdj = PERSISTENT_PROC_ADJ;
- doReturn(app).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(app).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_PERSISTENT_UI, PERSISTENT_PROC_ADJ,
SCHED_GROUP_TOP_APP);
@@ -249,10 +252,10 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(app).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(app).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_TOP, FOREGROUND_APP_ADJ, SCHED_GROUP_TOP_APP);
}
@@ -264,7 +267,7 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(PROCESS_STATE_TOP_SLEEPING).when(sService.mAtmInternal).getTopProcessState();
app.runningRemoteAnimation = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
@@ -277,7 +280,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(mock(ActiveInstrumentation.class)).when(app).getActiveInstrumentation();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doCallRealMethod().when(app).getActiveInstrumentation();
@@ -292,7 +295,7 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(true).when(sService).isReceivingBroadcastLocked(any(ProcessRecord.class),
any(ArraySet.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doReturn(false).when(sService).isReceivingBroadcastLocked(any(ProcessRecord.class),
any(ArraySet.class));
@@ -306,7 +309,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.executingServices.add(mock(ServiceRecord.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_SERVICE, FOREGROUND_APP_ADJ, SCHED_GROUP_BACKGROUND);
@@ -318,12 +321,12 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(PROCESS_STATE_TOP_SLEEPING).when(sService.mAtmInternal).getTopProcessState();
- doReturn(app).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_ASLEEP;
+ doReturn(app).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_ASLEEP);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
assertProcStates(app, PROCESS_STATE_TOP_SLEEPING, FOREGROUND_APP_ADJ,
SCHED_GROUP_BACKGROUND);
@@ -335,8 +338,8 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.setCurRawAdj(CACHED_APP_MIN_ADJ);
- doReturn(null).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(null).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, CACHED_APP_MIN_ADJ,
@@ -363,7 +366,7 @@
return 0;
})).when(wpc).computeOomAdjFromActivities(
any(WindowProcessController.ComputeOomAdjCallback.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doCallRealMethod().when(app).getWindowProcessController();
@@ -379,7 +382,7 @@
WindowProcessController wpc = app.getWindowProcessController();
doReturn(true).when(wpc).hasRecentTasks();
app.lastTopTime = SystemClock.uptimeMillis();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doCallRealMethod().when(wpc).hasRecentTasks();
@@ -392,7 +395,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.setHasForegroundServices(true, ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -405,7 +408,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -418,7 +421,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.setHasOverlayUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_IMPORTANT_FOREGROUND, PERCEPTIBLE_APP_ADJ,
@@ -432,7 +435,7 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.setHasForegroundServices(true, 0);
app.lastTopTime = SystemClock.uptimeMillis();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE,
@@ -445,7 +448,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.forcingToImportant = new Object();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_TRANSIENT_BACKGROUND, PERCEPTIBLE_APP_ADJ,
@@ -460,7 +463,7 @@
doReturn(mock(WindowProcessController.class)).when(app).getWindowProcessController();
WindowProcessController wpc = app.getWindowProcessController();
doReturn(true).when(wpc).isHeavyWeightProcess();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doReturn(false).when(wpc).isHeavyWeightProcess();
@@ -476,7 +479,7 @@
doReturn(mock(WindowProcessController.class)).when(app).getWindowProcessController();
WindowProcessController wpc = app.getWindowProcessController();
doReturn(true).when(wpc).isHomeProcess();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_HOME, HOME_APP_ADJ, SCHED_GROUP_BACKGROUND);
@@ -491,7 +494,7 @@
WindowProcessController wpc = app.getWindowProcessController();
doReturn(true).when(wpc).isPreviousProcess();
doReturn(true).when(wpc).hasActivities();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,
@@ -506,7 +509,7 @@
BackupRecord backupTarget = new BackupRecord(null, 0, 0, 0);
backupTarget.app = app;
doReturn(backupTarget).when(sService.mBackupTargets).get(anyInt());
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doReturn(null).when(sService.mBackupTargets).get(anyInt());
@@ -520,7 +523,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
doReturn(true).when(app).hasClientActivities();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_CACHED_ACTIVITY_CLIENT, app.setProcState);
@@ -532,7 +535,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
app.treatLikeActivity = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_CACHED_ACTIVITY, app.setProcState);
@@ -549,7 +552,7 @@
s.startRequested = true;
s.lastActivity = SystemClock.uptimeMillis();
app.startService(s);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_SERVICE, SERVICE_B_ADJ, SCHED_GROUP_BACKGROUND);
@@ -561,7 +564,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));
app.maxAdj = PERCEPTIBLE_LOW_APP_ADJ;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, PERCEPTIBLE_LOW_APP_ADJ,
@@ -575,8 +578,8 @@
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));
app.setCached(false);
app.setCurRawAdj(SERVICE_ADJ);
- doReturn(null).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(null).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, OomAdjuster.OOM_ADJ_REASON_NONE);
assertTrue(ProcessList.CACHED_APP_MIN_ADJ <= app.setAdj);
@@ -593,7 +596,7 @@
s.startRequested = true;
s.lastActivity = SystemClock.uptimeMillis();
app.startService(s);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_SERVICE, SERVICE_ADJ, SCHED_GROUP_BACKGROUND);
@@ -609,11 +612,11 @@
ServiceRecord s = bindService(app, client, null, Context.BIND_WAIVE_PRIORITY,
mock(IBinder.class));
s.startRequested = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(client).when(sService).getTopAppLocked();
+ doReturn(client).when(sService).getTopApp();
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_SERVICE, UNKNOWN_ADJ, SCHED_GROUP_BACKGROUND);
}
@@ -627,7 +630,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_WAIVE_PRIORITY
| Context.BIND_TREAT_LIKE_ACTIVITY, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_CACHED_ACTIVITY, app.setProcState);
@@ -647,7 +650,7 @@
setFieldValue(ConnectionRecord.class, cr, "activity",
mock(ActivityServiceConnectionsHolder.class));
doReturn(true).when(cr.activity).isActivityVisible();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(FOREGROUND_APP_ADJ, app.setAdj);
@@ -660,7 +663,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));
bindService(app, app, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, UNKNOWN_ADJ, SCHED_GROUP_BACKGROUND);
@@ -675,7 +678,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
client.treatLikeActivity = true;
bindService(app, client, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_CACHED_EMPTY, app.setProcState);
@@ -695,10 +698,10 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_ALLOW_OOM_MANAGEMENT, mock(IBinder.class));
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(client).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(client).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertEquals(PREVIOUS_APP_ADJ, app.setAdj);
}
@@ -713,7 +716,7 @@
bindService(app, client, null, Context.BIND_FOREGROUND_SERVICE, mock(IBinder.class));
client.maxAdj = PERSISTENT_PROC_ADJ;
client.setHasTopUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, VISIBLE_APP_ADJ,
@@ -729,7 +732,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_IMPORTANT, mock(IBinder.class));
client.executingServices.add(mock(ServiceRecord.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(FOREGROUND_APP_ADJ, app.setAdj);
@@ -744,10 +747,10 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, 0, mock(IBinder.class));
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(client).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(client).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_BOUND_TOP, VISIBLE_APP_ADJ, SCHED_GROUP_DEFAULT);
}
@@ -761,7 +764,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_FOREGROUND_SERVICE, mock(IBinder.class));
client.maxAdj = PERSISTENT_PROC_ADJ;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_BOUND_FOREGROUND_SERVICE, app.setProcState);
@@ -776,7 +779,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_NOT_FOREGROUND, mock(IBinder.class));
client.maxAdj = PERSISTENT_PROC_ADJ;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_TRANSIENT_BACKGROUND, app.setProcState);
@@ -791,7 +794,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, 0, mock(IBinder.class));
client.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_FOREGROUND_SERVICE, app.setProcState);
@@ -808,7 +811,7 @@
BackupRecord backupTarget = new BackupRecord(null, 0, 0, 0);
backupTarget.app = client;
doReturn(backupTarget).when(sService.mBackupTargets).get(anyInt());
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
doReturn(null).when(sService.mBackupTargets).get(anyInt());
@@ -829,7 +832,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_NOT_PERCEPTIBLE, mock(IBinder.class));
client.runningRemoteAnimation = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PERCEPTIBLE_LOW_APP_ADJ, app.setAdj);
@@ -844,7 +847,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_NOT_VISIBLE, mock(IBinder.class));
client.runningRemoteAnimation = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PERCEPTIBLE_APP_ADJ, app.setAdj);
@@ -859,7 +862,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, 0, mock(IBinder.class));
client.setHasOverlayUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PERCEPTIBLE_APP_ADJ, app.setAdj);
@@ -874,7 +877,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, 0, mock(IBinder.class));
client.runningRemoteAnimation = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(VISIBLE_APP_ADJ, app.setAdj);
@@ -889,7 +892,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindService(app, client, null, Context.BIND_IMPORTANT_BACKGROUND, mock(IBinder.class));
client.setHasOverlayUi(true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_IMPORTANT_BACKGROUND, app.setProcState);
@@ -915,7 +918,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindProvider(app, client, null, null, false);
client.treatLikeActivity = true;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_CACHED_EMPTY, UNKNOWN_ADJ, SCHED_GROUP_BACKGROUND);
@@ -930,10 +933,10 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindProvider(app, client, null, null, false);
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(client).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(client).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_BOUND_TOP, FOREGROUND_APP_ADJ, SCHED_GROUP_DEFAULT);
}
@@ -947,7 +950,7 @@
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
client.setHasForegroundServices(true, 0);
bindProvider(app, client, null, null, false);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -962,7 +965,7 @@
ProcessRecord client = spy(makeDefaultProcessRecord(MOCKAPP2_PID, MOCKAPP2_UID,
MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
bindProvider(app, client, null, null, true);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_IMPORTANT_FOREGROUND, FOREGROUND_APP_ADJ,
@@ -975,7 +978,7 @@
ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));
app.lastProviderTime = SystemClock.uptimeMillis();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,
@@ -994,10 +997,10 @@
MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
bindService(client, client2, null, 0, mock(IBinder.class));
doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
- doReturn(client2).when(sService).getTopAppLocked();
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ doReturn(client2).when(sService).getTopApp();
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
- doReturn(null).when(sService).getTopAppLocked();
+ doReturn(null).when(sService).getTopApp();
assertProcStates(app, PROCESS_STATE_BOUND_TOP, VISIBLE_APP_ADJ,
SCHED_GROUP_DEFAULT);
@@ -1015,7 +1018,7 @@
MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
bindService(app, client2, null, 0, mock(IBinder.class));
client2.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1034,7 +1037,7 @@
MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
bindService(client, client2, null, 0, mock(IBinder.class));
client2.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1059,7 +1062,7 @@
lru.add(app);
lru.add(client);
lru.add(client2);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, true, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1070,7 +1073,7 @@
SCHED_GROUP_DEFAULT);
client2.setHasForegroundServices(false, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(client2, true, OomAdjuster.OOM_ADJ_REASON_NONE);
assertEquals(PROCESS_STATE_CACHED_EMPTY, client2.setProcState);
@@ -1096,7 +1099,7 @@
lru.add(app);
lru.add(client);
lru.add(client2);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, true, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1124,7 +1127,7 @@
MOCKAPP4_PROCESSNAME, MOCKAPP4_PACKAGENAME, false));
client3.forcingToImportant = new Object();
bindService(app, client3, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1150,7 +1153,7 @@
MOCKAPP4_PROCESSNAME, MOCKAPP4_PACKAGENAME, false));
client3.forcingToImportant = new Object();
bindService(app, client3, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_TRANSIENT_BACKGROUND, PERCEPTIBLE_APP_ADJ,
@@ -1178,7 +1181,7 @@
MOCKAPP5_PROCESSNAME, MOCKAPP5_PACKAGENAME, false));
client4.forcingToImportant = new Object();
bindService(app, client4, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_TRANSIENT_BACKGROUND, PERCEPTIBLE_APP_ADJ,
@@ -1208,7 +1211,7 @@
MOCKAPP5_PROCESSNAME, MOCKAPP5_PACKAGENAME, false));
client4.setHasForegroundServices(true, 0);
bindService(app, client4, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1234,7 +1237,7 @@
MOCKAPP4_PROCESSNAME, MOCKAPP4_PACKAGENAME, false));
client3.forcingToImportant = new Object();
bindService(app, client3, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1253,7 +1256,7 @@
MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
bindProvider(client, client2, null, null, false);
client2.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1273,7 +1276,7 @@
bindProvider(client, client2, null, null, false);
client2.setHasForegroundServices(true, 0);
bindService(client2, app, null, 0, mock(IBinder.class));
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1292,7 +1295,7 @@
MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
bindProvider(client, client2, null, null, false);
client2.setHasForegroundServices(true, 0);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1312,7 +1315,7 @@
bindProvider(client, client2, null, null, false);
client2.setHasForegroundServices(true, 0);
bindProvider(client2, app, null, null, false);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, PROCESS_STATE_BOUND_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
@@ -1332,7 +1335,7 @@
lru.clear();
lru.add(app);
lru.add(app2);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1356,7 +1359,7 @@
lru.clear();
lru.add(app);
lru.add(app2);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1384,7 +1387,7 @@
lru.add(app);
lru.add(app2);
lru.add(app3);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1435,7 +1438,7 @@
lru.add(app3);
lru.add(app4);
lru.add(app5);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1481,7 +1484,7 @@
lru.add(app3);
lru.add(app2);
lru.add(app);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1527,7 +1530,7 @@
lru.add(app2);
lru.add(app);
lru.add(app5);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1573,7 +1576,7 @@
lru.add(app3);
lru.add(app4);
lru.add(app5);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1618,7 +1621,7 @@
lru.add(app3);
lru.add(app2);
lru.add(app);
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.mNumServiceProcs = 3;
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
lru.clear();
@@ -1678,7 +1681,7 @@
app2.startService(s2);
app2.hasShownUi = false;
- sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
+ sService.mWakefulness.set(PowerManagerInternal.WAKEFULNESS_AWAKE);
sService.mOomAdjuster.updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_NONE);
assertProcStates(app, true, PROCESS_STATE_SERVICE, cachedAdj1, "cch-started-ui-services");
@@ -1773,11 +1776,12 @@
ai.longVersionCode = versionCode;
ai.targetSdkVersion = targetSdkVersion;
ProcessRecord app = new ProcessRecord(service, ai, processName, uid);
+ final ProcessProfileRecord profile = app.mProfile;
app.thread = mock(IApplicationThread.class);
app.lastActivityTime = lastActivityTime;
- app.lastPssTime = lastPssTime;
- app.nextPssTime = nextPssTime;
- app.lastPss = lastPss;
+ profile.setLastPssTime(lastPssTime);
+ profile.setNextPssTime(nextPssTime);
+ profile.setLastPss(lastPss);
app.maxAdj = maxAdj;
app.setRawAdj = setRawAdj;
app.curAdj = curAdj;
diff --git a/services/tests/mockingservicestests/src/com/android/server/usage/UsageStatsServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/usage/UsageStatsServiceTest.java
index c9fcd02..c5e1ed1 100644
--- a/services/tests/mockingservicestests/src/com/android/server/usage/UsageStatsServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/usage/UsageStatsServiceTest.java
@@ -37,6 +37,7 @@
import com.android.server.LocalServices;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -82,6 +83,13 @@
mService.onStart();
}
+ @After
+ public void tearDown() {
+ if (mMockingSession != null) {
+ mMockingSession.finishMocking();
+ }
+ }
+
@Test
public void testUsageEventListener() throws Exception {
TestUsageEventListener listener = new TestUsageEventListener();
diff --git a/services/tests/servicestests/src/com/android/server/am/OomAdjusterTests.java b/services/tests/servicestests/src/com/android/server/am/OomAdjusterTests.java
index 4f58c87..7355b80 100644
--- a/services/tests/servicestests/src/com/android/server/am/OomAdjusterTests.java
+++ b/services/tests/servicestests/src/com/android/server/am/OomAdjusterTests.java
@@ -40,6 +40,9 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
/**
* Test class for {@link OomAdjuster}.
*
@@ -76,6 +79,9 @@
sService.mConstants = new ActivityManagerConstants(sContext, sService,
sContext.getMainThreadHandler());
+ final AppProfiler profiler = mock(AppProfiler.class);
+ setFieldValue(AppProfiler.class, profiler, "mProfilerLock", new Object());
+ setFieldValue(ActivityManagerService.class, sService, "mAppProfiler", profiler);
sService.mOomAdjuster = new OomAdjuster(sService, sService.mProcessList, null);
LocalServices.addService(UsageStatsManagerInternal.class,
mock(UsageStatsManagerInternal.class));
@@ -83,6 +89,18 @@
});
}
+ private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) {
+ try {
+ Field field = clazz.getDeclaredField(fieldName);
+ field.setAccessible(true);
+ Field mfield = Field.class.getDeclaredField("accessFlags");
+ mfield.setAccessible(true);
+ mfield.setInt(field, mfield.getInt(field) & ~(Modifier.FINAL | Modifier.PRIVATE));
+ field.set(obj, val);
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ }
+ }
+
@AfterClass
public static void tearDownOnce() {
LocalServices.removeServiceForTest(PackageManagerInternal.class);
diff --git a/services/tests/servicestests/src/com/android/server/am/ProcessRecordTests.java b/services/tests/servicestests/src/com/android/server/am/ProcessRecordTests.java
index ded14b8..263efa6 100644
--- a/services/tests/servicestests/src/com/android/server/am/ProcessRecordTests.java
+++ b/services/tests/servicestests/src/com/android/server/am/ProcessRecordTests.java
@@ -42,6 +42,8 @@
import org.junit.BeforeClass;
import org.junit.Test;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.util.Collections;
/**
@@ -67,6 +69,11 @@
sService.mActivityTaskManager = new ActivityTaskManagerService(sContext);
sService.mActivityTaskManager.initialize(null, null, sContext.getMainLooper());
sService.mAtmInternal = sService.mActivityTaskManager.getAtmInternal();
+ final AppProfiler profiler = mock(AppProfiler.class);
+ setFieldValue(AppProfiler.class, profiler, "mProfilerLock", new Object());
+ setFieldValue(ActivityManagerService.class, sService, "mAppProfiler", profiler);
+ final ProcessList processList = new ProcessList();
+ setFieldValue(ActivityManagerService.class, sService, "mProcessList", processList);
});
// Avoid NPE when initializing {@link ProcessRecord#mWindowProcessController}.
@@ -76,6 +83,18 @@
doReturn(sysUiName).when(packageManagerInternal).getSystemUiServiceComponent();
}
+ private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) {
+ try {
+ Field field = clazz.getDeclaredField(fieldName);
+ field.setAccessible(true);
+ Field mfield = Field.class.getDeclaredField("accessFlags");
+ mfield.setAccessible(true);
+ mfield.setInt(field, mfield.getInt(field) & ~(Modifier.FINAL | Modifier.PRIVATE));
+ field.set(obj, val);
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ }
+ }
+
@AfterClass
public static void tearDownOnce() {
LocalServices.removeServiceForTest(PackageManagerInternal.class);
diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
index 784718b..9ffb5017 100644
--- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
@@ -770,7 +770,7 @@
}
@Override
- void reportGlobalUsageEventLocked(int event) {
+ void reportGlobalUsageEvent(int event) {
}
@Override
diff --git a/services/tests/servicestests/src/com/android/server/apphibernation/AppHibernationServiceTest.java b/services/tests/servicestests/src/com/android/server/apphibernation/AppHibernationServiceTest.java
index d0370b6..45bca68 100644
--- a/services/tests/servicestests/src/com/android/server/apphibernation/AppHibernationServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/apphibernation/AppHibernationServiceTest.java
@@ -64,6 +64,8 @@
private static final int USER_ID_1 = 1;
private static final int USER_ID_2 = 2;
+ private final List<UserInfo> mUserInfos = new ArrayList<>();
+
private AppHibernationService mAppHibernationService;
private BroadcastReceiver mBroadcastReceiver;
@Mock
@@ -88,47 +90,42 @@
verify(mContext, times(2)).registerReceiver(mReceiverCaptor.capture(), any());
mBroadcastReceiver = mReceiverCaptor.getValue();
- List<UserInfo> userList = new ArrayList<>();
- userList.add(new UserInfo(USER_ID_1, "user 1", 0 /* flags */));
- doReturn(userList).when(mUserManager).getUsers();
-
- List<PackageInfo> userPackages = new ArrayList<>();
- userPackages.add(makePackageInfo(PACKAGE_NAME_1));
-
- doReturn(new ParceledListSlice<>(userPackages)).when(mIPackageManager)
- .getInstalledPackages(anyInt(), eq(USER_ID_1));
+ doReturn(mUserInfos).when(mUserManager).getUsers();
doAnswer(returnsArgAt(2)).when(mIActivityManager).handleIncomingUser(anyInt(), anyInt(),
anyInt(), anyBoolean(), anyBoolean(), any(), any());
+ addUser(USER_ID_1);
mAppHibernationService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);
}
@Test
- public void testSetHibernating_packageIsHibernating() {
+ public void testSetHibernatingForUser_packageIsHibernating() throws RemoteException {
// WHEN we hibernate a package for a user
- mAppHibernationService.setHibernating(PACKAGE_NAME_1, USER_ID_1, true);
+ mAppHibernationService.setHibernatingForUser(PACKAGE_NAME_1, USER_ID_1, true);
// THEN the package is marked hibernating for the user
- assertTrue(mAppHibernationService.isHibernating(PACKAGE_NAME_1, USER_ID_1));
+ assertTrue(mAppHibernationService.isHibernatingForUser(PACKAGE_NAME_1, USER_ID_1));
}
@Test
- public void testSetHibernating_newPackageAdded_packageIsHibernating() {
+ public void testSetHibernatingForUser_newPackageAdded_packageIsHibernating()
+ throws RemoteException {
// WHEN a new package is added and it is hibernated
Intent intent = new Intent(Intent.ACTION_PACKAGE_ADDED,
Uri.fromParts(PACKAGE_SCHEME, PACKAGE_NAME_2, null /* fragment */));
intent.putExtra(Intent.EXTRA_USER_HANDLE, USER_ID_1);
mBroadcastReceiver.onReceive(mContext, intent);
- mAppHibernationService.setHibernating(PACKAGE_NAME_2, USER_ID_1, true);
+ mAppHibernationService.setHibernatingForUser(PACKAGE_NAME_2, USER_ID_1, true);
// THEN the new package is hibernated
- assertTrue(mAppHibernationService.isHibernating(PACKAGE_NAME_2, USER_ID_1));
+ assertTrue(mAppHibernationService.isHibernatingForUser(PACKAGE_NAME_2, USER_ID_1));
}
@Test
- public void testSetHibernating_newUserAdded_packageIsHibernating() throws RemoteException {
+ public void testSetHibernatingForUser_newUserAdded_packageIsHibernating()
+ throws RemoteException {
// WHEN a new user is added and a package from the user is hibernated
List<PackageInfo> userPackages = new ArrayList<>();
userPackages.add(makePackageInfo(PACKAGE_NAME_1));
@@ -138,16 +135,17 @@
intent.putExtra(Intent.EXTRA_USER_HANDLE, USER_ID_2);
mBroadcastReceiver.onReceive(mContext, intent);
- mAppHibernationService.setHibernating(PACKAGE_NAME_1, USER_ID_2, true);
+ mAppHibernationService.setHibernatingForUser(PACKAGE_NAME_1, USER_ID_2, true);
// THEN the new user's package is hibernated
- assertTrue(mAppHibernationService.isHibernating(PACKAGE_NAME_1, USER_ID_2));
+ assertTrue(mAppHibernationService.isHibernatingForUser(PACKAGE_NAME_1, USER_ID_2));
}
@Test
- public void testIsHibernating_packageReplaced_stillReturnsHibernating() {
+ public void testIsHibernatingForUser_packageReplaced_stillReturnsHibernating()
+ throws RemoteException {
// GIVEN a package is currently hibernated
- mAppHibernationService.setHibernating(PACKAGE_NAME_1, USER_ID_1, true);
+ mAppHibernationService.setHibernatingForUser(PACKAGE_NAME_1, USER_ID_1, true);
// WHEN the package is removed but marked as replacing
Intent intent = new Intent(Intent.ACTION_PACKAGE_REMOVED,
@@ -157,7 +155,38 @@
mBroadcastReceiver.onReceive(mContext, intent);
// THEN the package is still hibernating
- assertTrue(mAppHibernationService.isHibernating(PACKAGE_NAME_1, USER_ID_1));
+ assertTrue(mAppHibernationService.isHibernatingForUser(PACKAGE_NAME_1, USER_ID_1));
+ }
+
+ @Test
+ public void testSetHibernatingGlobally_packageIsHibernatingGlobally() throws RemoteException {
+ // WHEN we hibernate a package
+ mAppHibernationService.setHibernatingGlobally(PACKAGE_NAME_1, true);
+
+ // THEN the package is marked hibernating for the user
+ assertTrue(mAppHibernationService.isHibernatingGlobally(PACKAGE_NAME_1));
+ }
+
+ /**
+ * Add a mock user with one package. Must be called before
+ * {@link AppHibernationService#onBootPhase(int)} to work properly.
+ */
+ private void addUser(int userId) throws RemoteException {
+ addUser(userId, new String[]{PACKAGE_NAME_1});
+ }
+
+ /**
+ * Add a mock user with the packages specified. Must be called before
+ * {@link AppHibernationService#onBootPhase(int)} to work properly
+ */
+ private void addUser(int userId, String[] packageNames) throws RemoteException {
+ mUserInfos.add(new UserInfo(userId, "user_" + userId, 0 /* flags */));
+ List<PackageInfo> userPackages = new ArrayList<>();
+ for (String pkgName : packageNames) {
+ userPackages.add(makePackageInfo(pkgName));
+ }
+ doReturn(new ParceledListSlice<>(userPackages)).when(mIPackageManager)
+ .getInstalledPackages(anyInt(), eq(userId));
}
private static PackageInfo makePackageInfo(String packageName) {
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
index 57b0d01..2d45726 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java
@@ -196,7 +196,8 @@
BiometricSchedulerProto bsp = getDump(true /* clearSchedulerBuffer */);
assertEquals(BiometricsProto.CM_NONE, bsp.currentOperation);
assertEquals(0, bsp.totalOperations);
- assertEquals(0, bsp.recentOperations.length);
+ // TODO:(b/178828362) See bug and/or commit message :/
+ // assertEquals(0, bsp.recentOperations.length);
// Pretend the scheduler is busy enrolling, and check the proto dump again.
final TestClientMonitor2 client = new TestClientMonitor2(mContext, mToken,
@@ -207,7 +208,11 @@
assertEquals(BiometricsProto.CM_ENROLL, bsp.currentOperation);
// No operations have completed yet
assertEquals(0, bsp.totalOperations);
- assertEquals(0, bsp.recentOperations.length);
+
+ // TODO:(b/178828362) See bug and/or commit message :/
+ assertEquals(1, bsp.recentOperations.length);
+ assertEquals(BiometricsProto.CM_NONE, bsp.recentOperations[0]);
+
// Finish this operation, so the next scheduled one can start
client.getCallback().onClientFinished(client, true);
}
@@ -223,7 +228,8 @@
assertEquals(BiometricsProto.CM_ENROLL, bsp.currentOperation);
// No operations have completed yet
assertEquals(0, bsp.totalOperations);
- assertEquals(0, bsp.recentOperations.length);
+ // TODO:(b/178828362) See bug and/or commit message :/
+ // assertEquals(0, bsp.recentOperations.length);
// Finish this operation, so the next scheduled one can start
client.getCallback().onClientFinished(client, true);
@@ -265,7 +271,10 @@
// RecentOperations queue is cleared (by the previous dump)
bsp = getDump(true /* clearSchedulerBuffer */);
- assertEquals(0, bsp.recentOperations.length);
+
+ // TODO:(b/178828362) See bug and/or commit message :/
+ assertEquals(1, bsp.recentOperations.length);
+ assertEquals(BiometricsProto.CM_NONE, bsp.recentOperations[0]);
}
@Test
diff --git a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java b/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java
new file mode 100644
index 0000000..6fc6b9e
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceSettingsTests.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.graphics;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import android.content.Context;
+import android.util.AtomicFile;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class GameManagerServiceSettingsTests {
+
+ private static final String TAG = "GameServiceSettingsTests";
+ private static final String PACKAGE_NAME_1 = "com.android.app1";
+ private static final String PACKAGE_NAME_2 = "com.android.app2";
+ private static final String PACKAGE_NAME_3 = "com.android.app3";
+
+ private void writeFile(File file, byte[] data) {
+ file.mkdirs();
+ try {
+ AtomicFile aFile = new AtomicFile(file);
+ FileOutputStream fos = aFile.startWrite();
+ fos.write(data);
+ aFile.finishWrite(fos);
+ } catch (IOException ioe) {
+ Log.e(TAG, "Cannot write file " + file.getPath());
+ }
+ }
+
+ private void writeGameServiceXml() {
+ writeFile(new File(InstrumentationRegistry.getContext().getFilesDir(),
+ "system/game-manager-service.xml"),
+ ("<?xml version='1.0' encoding='utf-8' standalone='yes' ?>"
+ + "<packages>\n"
+ + " <package name=\"com.android.app1\" gameMode=\"1\">\n"
+ + " </package>\n"
+ + " <package name=\"com.android.app2\" gameMode=\"2\">\n"
+ + " </package>\n"
+ + " <package name=\"com.android.app3\" gameMode=\"3\">\n"
+ + " </package>\n"
+ + "</packages>\n").getBytes());
+ }
+
+ private void deleteSystemFolder() {
+ File systemFolder = new File(InstrumentationRegistry.getContext().getFilesDir(), "system");
+ deleteFolder(systemFolder);
+ }
+
+ private static void deleteFolder(File folder) {
+ File[] files = folder.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ deleteFolder(file);
+ }
+ }
+ folder.delete();
+ }
+
+ private void writeOldFiles() {
+ deleteSystemFolder();
+ writeGameServiceXml();
+ }
+
+ private void verifyGameServiceSettingsData(Settings settings) {
+ assertThat(settings.getGameModeLocked(PACKAGE_NAME_1), is(1));
+ assertThat(settings.getGameModeLocked(PACKAGE_NAME_2), is(2));
+ assertThat(settings.getGameModeLocked(PACKAGE_NAME_3), is(3));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ deleteFolder(InstrumentationRegistry.getTargetContext().getFilesDir());
+ }
+
+ /** read in data and verify */
+ @Test
+ public void testReadGameServiceSettings() {
+ /* write out files and read */
+ writeOldFiles();
+ final Context context = InstrumentationRegistry.getContext();
+ Settings settings = new Settings(context.getFilesDir());
+ assertThat(settings.readPersistentDataLocked(), is(true));
+ verifyGameServiceSettingsData(settings);
+ }
+
+ /** read in data, write it out, and read it back in. Verify same. */
+ @Test
+ public void testWriteGameServiceSettings() {
+ // write out files and read
+ writeOldFiles();
+ final Context context = InstrumentationRegistry.getContext();
+ Settings settings = new Settings(context.getFilesDir());
+ assertThat(settings.readPersistentDataLocked(), is(true));
+
+ // write out, read back in and verify the same
+ settings.writePersistentDataLocked();
+ assertThat(settings.readPersistentDataLocked(), is(true));
+ verifyGameServiceSettingsData(settings);
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java b/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java
new file mode 100644
index 0000000..22df645
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/graphics/GameManagerServiceTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.graphics;
+
+import static org.junit.Assert.assertEquals;
+
+import android.graphics.GameManager;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class GameManagerServiceTests {
+
+ private static final String TAG = "GameServiceTests";
+ private static final String PACKAGE_NAME_0 = "com.android.app0";
+ private static final String PACKAGE_NAME_1 = "com.android.app1";
+ private static final int USER_ID_1 = 1001;
+ private static final int USER_ID_2 = 1002;
+
+ /**
+ * By default game mode is not supported.
+ */
+ @Test
+ public void testGameModeDefaultValue() {
+ GameManagerService gameManagerService =
+ new GameManagerService(InstrumentationRegistry.getContext());
+ gameManagerService.onUserStarting(USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_UNSUPPORTED,
+ gameManagerService.getGameMode(PACKAGE_NAME_0, USER_ID_1));
+ }
+
+ /**
+ * Test the default behaviour for a nonexistent user.
+ */
+ @Test
+ public void testDefaultValueForNonexistentUser() {
+ GameManagerService gameManagerService =
+ new GameManagerService(InstrumentationRegistry.getContext());
+ gameManagerService.onUserStarting(USER_ID_1);
+
+ gameManagerService.setGameMode(PACKAGE_NAME_1, GameManager.GAME_MODE_STANDARD, USER_ID_2);
+ assertEquals(GameManager.GAME_MODE_UNSUPPORTED,
+ gameManagerService.getGameMode(PACKAGE_NAME_1, USER_ID_2));
+ }
+
+ /**
+ * Test getter and setter of game modes.
+ */
+ @Test
+ public void testGameMode() {
+ GameManagerService gameManagerService =
+ new GameManagerService(InstrumentationRegistry.getContext());
+ gameManagerService.onUserStarting(USER_ID_1);
+
+ assertEquals(GameManager.GAME_MODE_UNSUPPORTED,
+ gameManagerService.getGameMode(PACKAGE_NAME_1, USER_ID_1));
+ gameManagerService.setGameMode(PACKAGE_NAME_1, GameManager.GAME_MODE_STANDARD, USER_ID_1);
+ assertEquals(GameManager.GAME_MODE_STANDARD,
+ gameManagerService.getGameMode(PACKAGE_NAME_1, USER_ID_1));
+ gameManagerService.setGameMode(PACKAGE_NAME_1, GameManager.GAME_MODE_PERFORMANCE,
+ USER_ID_1);
+ assertEquals(GameManager.GAME_MODE_PERFORMANCE,
+ gameManagerService.getGameMode(PACKAGE_NAME_1, USER_ID_1));
+ }
+}
diff --git a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java
index f437d1f..d067790 100644
--- a/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java
+++ b/services/tests/servicestests/src/com/android/server/graphics/fonts/UpdatableFontDirTest.java
@@ -147,7 +147,7 @@
UpdatableFontDir dirForPreparation = new UpdatableFontDir(
mUpdatableFontFilesDir, mPreinstalledFontDirs, parser, fakeFsverityUtil,
mConfigFile);
- assertThat(dirForPreparation.getSystemFontConfig().getLastModifiedDate())
+ assertThat(dirForPreparation.getSystemFontConfig().getLastModifiedTimeMillis())
.isEqualTo(expectedModifiedDate);
installFontFile(dirForPreparation, "foo,1", GOOD_SIGNATURE);
installFontFile(dirForPreparation, "bar,2", GOOD_SIGNATURE);
@@ -156,7 +156,7 @@
// Four font dirs are created.
assertThat(mUpdatableFontFilesDir.list()).hasLength(4);
//
- assertThat(dirForPreparation.getSystemFontConfig().getLastModifiedDate())
+ assertThat(dirForPreparation.getSystemFontConfig().getLastModifiedTimeMillis())
.isNotEqualTo(expectedModifiedDate);
UpdatableFontDir dir = new UpdatableFontDir(
@@ -319,7 +319,7 @@
installFontFile(dir, "test,1", GOOD_SIGNATURE);
fail("Expect IllegalArgumentException");
} catch (FontManagerService.SystemFontException e) {
- assertThat(e.getErrorCode()).isEqualTo(FontManager.ERROR_CODE_DOWNGRADING);
+ assertThat(e.getErrorCode()).isEqualTo(FontManager.RESULT_ERROR_DOWNGRADING);
}
assertThat(dir.getFontFileMap()).containsKey("test.ttf");
assertWithMessage("Font should not be downgraded to an older revision")
@@ -355,7 +355,7 @@
fail("Expect SystemFontException");
} catch (FontManagerService.SystemFontException e) {
assertThat(e.getErrorCode())
- .isEqualTo(FontManager.ERROR_CODE_VERIFICATION_FAILURE);
+ .isEqualTo(FontManager.RESULT_ERROR_VERIFICATION_FAILURE);
}
assertThat(dir.getFontFileMap()).isEmpty();
}
@@ -373,7 +373,7 @@
installFontFile(dir, "test,1", GOOD_SIGNATURE);
fail("Expect IllegalArgumentException");
} catch (FontManagerService.SystemFontException e) {
- assertThat(e.getErrorCode()).isEqualTo(FontManager.ERROR_CODE_DOWNGRADING);
+ assertThat(e.getErrorCode()).isEqualTo(FontManager.RESULT_ERROR_DOWNGRADING);
}
assertThat(dir.getFontFileMap()).isEmpty();
}
@@ -403,9 +403,9 @@
installFontFile(dir, "test,2", GOOD_SIGNATURE);
} catch (FontManagerService.SystemFontException e) {
assertThat(e.getErrorCode())
- .isEqualTo(FontManager.ERROR_CODE_FAILED_TO_CREATE_CONFIG_FILE);
+ .isEqualTo(FontManager.RESULT_ERROR_FAILED_UPDATE_CONFIG);
}
- assertThat(dir.getSystemFontConfig().getLastModifiedDate())
+ assertThat(dir.getSystemFontConfig().getLastModifiedTimeMillis())
.isEqualTo(expectedModifiedDate);
assertThat(dir.getFontFileMap()).isEmpty();
} finally {
@@ -435,7 +435,7 @@
fail("Expect SystemFontException");
} catch (FontManagerService.SystemFontException e) {
assertThat(e.getErrorCode())
- .isEqualTo(FontManager.ERROR_CODE_MISSING_POST_SCRIPT_NAME);
+ .isEqualTo(FontManager.RESULT_ERROR_INVALID_FONT_NAME);
}
assertThat(dir.getFontFileMap()).isEmpty();
}
@@ -462,7 +462,7 @@
fail("Expect SystemFontException");
} catch (FontManagerService.SystemFontException e) {
assertThat(e.getErrorCode())
- .isEqualTo(FontManager.ERROR_CODE_INVALID_FONT_FILE);
+ .isEqualTo(FontManager.RESULT_ERROR_INVALID_FONT_FILE);
}
assertThat(dir.getFontFileMap()).isEmpty();
}
@@ -497,7 +497,7 @@
fail("Expect SystemFontException");
} catch (FontManagerService.SystemFontException e) {
assertThat(e.getErrorCode())
- .isEqualTo(FontManager.ERROR_CODE_FAILED_TO_WRITE_FONT_FILE);
+ .isEqualTo(FontManager.RESULT_ERROR_FAILED_TO_WRITE_FONT_FILE);
}
assertThat(dir.getFontFileMap()).isEmpty();
}
diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
index a4f5249..339249b 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java
@@ -1026,6 +1026,8 @@
writeLocked(fos, stats, version, packagesTokenData);
file.finishWrite(fos);
fos = null;
+ } catch (Exception e) {
+ // Do nothing. Exception has already been handled.
} finally {
// When fos is null (successful write), this will no-op
file.failWrite(fos);
@@ -1033,7 +1035,7 @@
}
private static void writeLocked(OutputStream out, IntervalStats stats, int version,
- PackagesTokenData packagesTokenData) throws RuntimeException {
+ PackagesTokenData packagesTokenData) throws Exception {
switch (version) {
case 1:
case 2:
@@ -1045,6 +1047,7 @@
UsageStatsProto.write(out, stats);
} catch (Exception e) {
Slog.e(TAG, "Unable to write interval stats to proto.", e);
+ throw e;
}
break;
case 5:
@@ -1053,6 +1056,7 @@
UsageStatsProtoV2.write(out, stats);
} catch (Exception e) {
Slog.e(TAG, "Unable to write interval stats to proto.", e);
+ throw e;
}
break;
default:
diff --git a/telephony/java/android/telephony/ims/ImsUtListener.java b/telephony/java/android/telephony/ims/ImsUtListener.java
index baa0576..754814f 100644
--- a/telephony/java/android/telephony/ims/ImsUtListener.java
+++ b/telephony/java/android/telephony/ims/ImsUtListener.java
@@ -178,4 +178,11 @@
public ImsUtListener(IImsUtListener serviceInterface) {
mServiceInterface = serviceInterface;
}
+
+ /**
+ * @hide
+ */
+ public IImsUtListener getListenerInterface() {
+ return mServiceInterface;
+ }
}
diff --git a/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java b/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java
index 06c35ea..2e35d27 100644
--- a/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java
@@ -23,6 +23,8 @@
import com.android.ims.internal.IImsEcbm;
import com.android.ims.internal.IImsEcbmListener;
+import java.util.Objects;
+
/**
* Base implementation of ImsEcbm, which implements stub versions of the methods
* in the IImsEcbm AIDL. Override the methods that your implementation of ImsEcbm supports.
@@ -36,11 +38,27 @@
public class ImsEcbmImplBase {
private static final String TAG = "ImsEcbmImplBase";
+ private final Object mLock = new Object();
private IImsEcbmListener mListener;
- private IImsEcbm mImsEcbm = new IImsEcbm.Stub() {
+ private final IImsEcbm mImsEcbm = new IImsEcbm.Stub() {
@Override
public void setListener(IImsEcbmListener listener) {
- mListener = listener;
+ synchronized (mLock) {
+ if (mImsEcbm != null && listener != null && Objects.equals(
+ mImsEcbm.asBinder(), listener.asBinder())) {
+ return;
+ }
+ if (listener == null) {
+ mListener = null;
+ } else if (listener != null && mListener == null) {
+ mListener = listener;
+ } else {
+ // Fail fast here instead of silently overwriting the listener to another
+ // listener due to another connection connecting.
+ throw new IllegalStateException("ImsEcbmImplBase: Listener already set by "
+ + "another connection.");
+ }
+ }
}
@Override
@@ -69,9 +87,13 @@
*/
public final void enteredEcbm() {
Log.d(TAG, "Entered ECBM.");
- if (mListener != null) {
+ IImsEcbmListener listener;
+ synchronized (mLock) {
+ listener = mListener;
+ }
+ if (listener != null) {
try {
- mListener.enteredECBM();
+ listener.enteredECBM();
} catch (RemoteException e) {
throw new RuntimeException(e);
}
@@ -85,9 +107,13 @@
*/
public final void exitedEcbm() {
Log.d(TAG, "Exited ECBM.");
- if (mListener != null) {
+ IImsEcbmListener listener;
+ synchronized (mLock) {
+ listener = mListener;
+ }
+ if (listener != null) {
try {
- mListener.exitedECBM();
+ listener.exitedECBM();
} catch (RemoteException e) {
throw new RuntimeException(e);
}
diff --git a/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java b/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java
index d002903..555a47e 100644
--- a/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java
@@ -25,6 +25,7 @@
import com.android.ims.internal.IImsMultiEndpoint;
import java.util.List;
+import java.util.Objects;
/**
* Base implementation of ImsMultiEndpoint, which implements stub versions of the methods
@@ -41,10 +42,28 @@
private static final String TAG = "MultiEndpointImplBase";
private IImsExternalCallStateListener mListener;
- private IImsMultiEndpoint mImsMultiEndpoint = new IImsMultiEndpoint.Stub() {
+ private final Object mLock = new Object();
+ private final IImsMultiEndpoint mImsMultiEndpoint = new IImsMultiEndpoint.Stub() {
+
@Override
public void setListener(IImsExternalCallStateListener listener) throws RemoteException {
- mListener = listener;
+ synchronized (mLock) {
+ if (mListener != null && listener != null && Objects.equals(
+ mListener.asBinder(), listener.asBinder())) {
+ return;
+ }
+
+ if (listener == null) {
+ mListener = null;
+ } else if (listener != null && mListener == null) {
+ mListener = listener;
+ } else {
+ // Fail fast here instead of silently overwriting the listener to another
+ // listener due to another connection connecting.
+ throw new IllegalStateException("ImsMultiEndpointImplBase: Listener already"
+ + " set by another connection.");
+ }
+ }
}
@Override
@@ -65,9 +84,13 @@
*/
public final void onImsExternalCallStateUpdate(List<ImsExternalCallState> externalCallDialogs) {
Log.d(TAG, "ims external call state update triggered.");
- if (mListener != null) {
+ IImsExternalCallStateListener listener;
+ synchronized (mLock) {
+ listener = mListener;
+ }
+ if (listener != null) {
try {
- mListener.onImsExternalCallStateUpdate(externalCallDialogs);
+ listener.onImsExternalCallStateUpdate(externalCallDialogs);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
diff --git a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
index f5219d5..eef4fca 100644
--- a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
@@ -29,6 +29,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.Objects;
/**
* Base implementation of IMS UT interface, which implements stubs. Override these methods to
@@ -116,7 +117,10 @@
*/
public static final int INVALID_RESULT = -1;
- private IImsUt.Stub mServiceImpl = new IImsUt.Stub() {
+ private final IImsUt.Stub mServiceImpl = new IImsUt.Stub() {
+ private final Object mLock = new Object();
+ private ImsUtListener mUtListener;
+
@Override
public void close() throws RemoteException {
ImsUtImplBase.this.close();
@@ -202,7 +206,26 @@
@Override
public void setListener(IImsUtListener listener) throws RemoteException {
- ImsUtImplBase.this.setListener(new ImsUtListener(listener));
+ synchronized (mLock) {
+ if (mUtListener != null && listener != null && Objects.equals(
+ mUtListener.getListenerInterface().asBinder(), listener.asBinder())) {
+ return;
+ }
+
+ if (listener == null) {
+ mUtListener = null;
+ } else if (listener != null && mUtListener == null) {
+ mUtListener = new ImsUtListener(listener);
+ } else {
+ // This is a limitation of the current API surface, there can only be one
+ // listener connected. Fail fast instead of silently overwriting the other
+ // listener.
+ throw new IllegalStateException("ImsUtImplBase#setListener: listener already "
+ + "set by another connected interface!");
+ }
+ }
+
+ ImsUtImplBase.this.setListener(mUtListener);
}
@Override
diff --git a/tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt b/tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt
new file mode 100644
index 0000000..87cfb34
--- /dev/null
+++ b/tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net
+
+import android.os.Build
+import androidx.test.filters.SmallTest
+import com.android.testutils.DevSdkIgnoreRule
+import com.android.testutils.DevSdkIgnoreRunner
+import com.android.testutils.assertParcelSane
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+private const val TEST_OWNER_UID = 123
+private const val TEST_IFACE = "test_tun0"
+private val TEST_IFACE_LIST = listOf("wlan0", "rmnet_data0", "eth0")
+
+@SmallTest
+@RunWith(DevSdkIgnoreRunner::class)
+@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
+class UnderlyingNetworkInfoTest {
+ @Test
+ fun testParcelUnparcel() {
+ val testInfo = UnderlyingNetworkInfo(TEST_OWNER_UID, TEST_IFACE, TEST_IFACE_LIST)
+ assertEquals(TEST_OWNER_UID, testInfo.ownerUid)
+ assertEquals(TEST_IFACE, testInfo.iface)
+ assertEquals(TEST_IFACE_LIST, testInfo.underlyingIfaces)
+ assertParcelSane(testInfo, 3)
+
+ val emptyInfo = UnderlyingNetworkInfo(0, String(), listOf())
+ assertEquals(0, emptyInfo.ownerUid)
+ assertEquals(String(), emptyInfo.iface)
+ assertEquals(listOf(), emptyInfo.underlyingIfaces)
+ assertParcelSane(emptyInfo, 3)
+ }
+}
\ No newline at end of file
diff --git a/tests/net/java/android/net/ConnectivityManagerTest.java b/tests/net/java/android/net/ConnectivityManagerTest.java
index f2dd27e..c2fddf3 100644
--- a/tests/net/java/android/net/ConnectivityManagerTest.java
+++ b/tests/net/java/android/net/ConnectivityManagerTest.java
@@ -32,6 +32,7 @@
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST;
import static android.net.NetworkRequest.Type.REQUEST;
import static android.net.NetworkRequest.Type.TRACK_DEFAULT;
@@ -368,6 +369,12 @@
eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE),
eq(testPkgName), eq(null));
reset(mService);
+
+ manager.requestBackgroundNetwork(request, null, callback);
+ verify(mService).requestNetwork(eq(request.networkCapabilities),
+ eq(BACKGROUND_REQUEST.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE),
+ eq(testPkgName), eq(null));
+ reset(mService);
}
static Message makeMessage(NetworkRequest req, int messageType) {
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 137543a..14229c5 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -201,8 +201,8 @@
import android.net.SocketKeepalive;
import android.net.UidRange;
import android.net.UidRangeParcel;
+import android.net.UnderlyingNetworkInfo;
import android.net.Uri;
-import android.net.VpnInfo;
import android.net.VpnManager;
import android.net.metrics.IpConnectivityLog;
import android.net.shared.NetworkMonitorUtils;
@@ -1076,7 +1076,7 @@
private boolean mAgentRegistered = false;
private int mVpnType = VpnManager.TYPE_VPN_SERVICE;
- private VpnInfo mVpnInfo;
+ private UnderlyingNetworkInfo mUnderlyingNetworkInfo;
// These ConditionVariables allow tests to wait for LegacyVpnRunner to be stopped/started.
// TODO: this scheme is ad-hoc and error-prone because it does not fail if, for example, the
@@ -1250,14 +1250,15 @@
}
@Override
- public synchronized VpnInfo getVpnInfo() {
- if (mVpnInfo != null) return mVpnInfo;
+ public synchronized UnderlyingNetworkInfo getUnderlyingNetworkInfo() {
+ if (mUnderlyingNetworkInfo != null) return mUnderlyingNetworkInfo;
- return super.getVpnInfo();
+ return super.getUnderlyingNetworkInfo();
}
- private synchronized void setVpnInfo(VpnInfo vpnInfo) {
- mVpnInfo = vpnInfo;
+ private synchronized void setUnderlyingNetworkInfo(
+ UnderlyingNetworkInfo underlyingNetworkInfo) {
+ mUnderlyingNetworkInfo = underlyingNetworkInfo;
}
}
@@ -3693,10 +3694,13 @@
@Test
public void testBackgroundNetworks() throws Exception {
- // Create a background request. We can't do this ourselves because ConnectivityService
- // doesn't have an API for it. So just turn on mobile data always on.
- setAlwaysOnNetworks(true);
+ // Create a cellular background request.
grantUsingBackgroundNetworksPermissionForUid(Binder.getCallingUid());
+ final TestNetworkCallback cellBgCallback = new TestNetworkCallback();
+ mCm.requestBackgroundNetwork(new NetworkRequest.Builder()
+ .addTransportType(TRANSPORT_CELLULAR).build(), null, cellBgCallback);
+
+ // Make callbacks for monitoring.
final NetworkRequest request = new NetworkRequest.Builder().build();
final NetworkRequest fgRequest = new NetworkRequest.Builder()
.addCapability(NET_CAPABILITY_FOREGROUND).build();
@@ -3765,6 +3769,7 @@
mCm.unregisterNetworkCallback(callback);
mCm.unregisterNetworkCallback(fgCallback);
+ mCm.unregisterNetworkCallback(cellBgCallback);
}
@Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing.
@@ -5195,20 +5200,22 @@
private void expectForceUpdateIfaces(Network[] networks, String defaultIface,
Integer vpnUid, String vpnIfname, String[] underlyingIfaces) throws Exception {
ArgumentCaptor<Network[]> networksCaptor = ArgumentCaptor.forClass(Network[].class);
- ArgumentCaptor<VpnInfo[]> vpnInfosCaptor = ArgumentCaptor.forClass(VpnInfo[].class);
+ ArgumentCaptor<UnderlyingNetworkInfo[]> vpnInfosCaptor = ArgumentCaptor.forClass(
+ UnderlyingNetworkInfo[].class);
verify(mStatsService, atLeastOnce()).forceUpdateIfaces(networksCaptor.capture(),
any(NetworkState[].class), eq(defaultIface), vpnInfosCaptor.capture());
assertSameElementsNoDuplicates(networksCaptor.getValue(), networks);
- VpnInfo[] infos = vpnInfosCaptor.getValue();
+ UnderlyingNetworkInfo[] infos = vpnInfosCaptor.getValue();
if (vpnUid != null) {
assertEquals("Should have exactly one VPN:", 1, infos.length);
- VpnInfo info = infos[0];
+ UnderlyingNetworkInfo info = infos[0];
assertEquals("Unexpected VPN owner:", (int) vpnUid, info.ownerUid);
- assertEquals("Unexpected VPN interface:", vpnIfname, info.vpnIface);
- assertSameElementsNoDuplicates(underlyingIfaces, info.underlyingIfaces);
+ assertEquals("Unexpected VPN interface:", vpnIfname, info.iface);
+ assertSameElementsNoDuplicates(underlyingIfaces,
+ info.underlyingIfaces.toArray(new String[0]));
} else {
assertEquals(0, infos.length);
return;
@@ -5269,7 +5276,7 @@
waitForIdle();
verify(mStatsService, never())
.forceUpdateIfaces(eq(onlyCell), any(NetworkState[].class), eq(MOBILE_IFNAME),
- eq(new VpnInfo[0]));
+ eq(new UnderlyingNetworkInfo[0]));
reset(mStatsService);
// Roaming change should update ifaces
@@ -5352,8 +5359,8 @@
// network for the VPN...
verify(mStatsService, never()).forceUpdateIfaces(any(Network[].class),
any(NetworkState[].class), any() /* anyString() doesn't match null */,
- argThat(infos -> infos[0].underlyingIfaces.length == 1
- && WIFI_IFNAME.equals(infos[0].underlyingIfaces[0])));
+ argThat(infos -> infos[0].underlyingIfaces.size() == 1
+ && WIFI_IFNAME.equals(infos[0].underlyingIfaces.get(0))));
verifyNoMoreInteractions(mStatsService);
reset(mStatsService);
@@ -5366,8 +5373,8 @@
waitForIdle();
verify(mStatsService).forceUpdateIfaces(any(Network[].class),
any(NetworkState[].class), any() /* anyString() doesn't match null */,
- argThat(vpnInfos -> vpnInfos[0].underlyingIfaces.length == 1
- && WIFI_IFNAME.equals(vpnInfos[0].underlyingIfaces[0])));
+ argThat(vpnInfos -> vpnInfos[0].underlyingIfaces.size() == 1
+ && WIFI_IFNAME.equals(vpnInfos[0].underlyingIfaces.get(0))));
mEthernetNetworkAgent.disconnect();
waitForIdle();
reset(mStatsService);
@@ -8347,8 +8354,9 @@
assertVpnUidRangesUpdated(true, vpnRange, vpnOwnerUid);
mMockVpn.setVpnType(vpnType);
- final VpnInfo vpnInfo = new VpnInfo(vpnOwnerUid, null, null);
- mMockVpn.setVpnInfo(vpnInfo);
+ final UnderlyingNetworkInfo underlyingNetworkInfo =
+ new UnderlyingNetworkInfo(vpnOwnerUid, VPN_IFNAME, new ArrayList<String>());
+ mMockVpn.setUnderlyingNetworkInfo(underlyingNetworkInfo);
}
private void setupConnectionOwnerUidAsVpnApp(int vpnOwnerUid, @VpnManager.VpnType int vpnType)
diff --git a/tests/net/java/com/android/server/net/NetworkStatsBaseTest.java b/tests/net/java/com/android/server/net/NetworkStatsBaseTest.java
index 1b33930e..a058a46 100644
--- a/tests/net/java/com/android/server/net/NetworkStatsBaseTest.java
+++ b/tests/net/java/com/android/server/net/NetworkStatsBaseTest.java
@@ -33,7 +33,9 @@
import static org.junit.Assert.assertEquals;
import android.net.NetworkStats;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
+
+import java.util.Arrays;
/** Superclass with utilities for NetworkStats(Service|Factory)Test */
abstract class NetworkStatsBaseTest {
@@ -107,11 +109,11 @@
assertEquals("unexpected operations", operations, entry.operations);
}
- static VpnInfo createVpnInfo(String[] underlyingIfaces) {
+ static UnderlyingNetworkInfo createVpnInfo(String[] underlyingIfaces) {
return createVpnInfo(TUN_IFACE, underlyingIfaces);
}
- static VpnInfo createVpnInfo(String vpnIface, String[] underlyingIfaces) {
- return new VpnInfo(UID_VPN, vpnIface, underlyingIfaces);
+ static UnderlyingNetworkInfo createVpnInfo(String vpnIface, String[] underlyingIfaces) {
+ return new UnderlyingNetworkInfo(UID_VPN, vpnIface, Arrays.asList(underlyingIfaces));
}
}
diff --git a/tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java b/tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java
index 76647a6..f3ae9b0 100644
--- a/tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java
+++ b/tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java
@@ -36,7 +36,7 @@
import android.content.res.Resources;
import android.net.NetworkStats;
import android.net.TrafficStats;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
@@ -79,7 +79,7 @@
// related to networkStatsFactory is compiled to a minimal native library and loaded here.
System.loadLibrary("networkstatsfactorytestjni");
mFactory = new NetworkStatsFactory(mTestProc, false);
- mFactory.updateVpnInfos(new VpnInfo[0]);
+ mFactory.updateUnderlyingNetworkInfos(new UnderlyingNetworkInfo[0]);
}
@After
@@ -105,8 +105,9 @@
@Test
public void testVpnRewriteTrafficThroughItself() throws Exception {
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -134,8 +135,9 @@
@Test
public void testVpnWithClat() throws Exception {
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {CLAT_PREFIX + TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos = new UnderlyingNetworkInfo[] {
+ createVpnInfo(new String[] {CLAT_PREFIX + TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
mFactory.noteStackedIface(CLAT_PREFIX + TEST_IFACE, TEST_IFACE);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
@@ -167,8 +169,9 @@
@Test
public void testVpnWithOneUnderlyingIface() throws Exception {
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -191,8 +194,9 @@
@Test
public void testVpnWithOneUnderlyingIfaceAndOwnTraffic() throws Exception {
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -219,8 +223,9 @@
@Test
public void testVpnWithOneUnderlyingIface_withCompression() throws Exception {
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -242,8 +247,9 @@
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
// Additionally, VPN is duplicating traffic across both WiFi and Cell.
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -267,10 +273,10 @@
public void testConcurrentVpns() throws Exception {
// Assume two VPNs are connected on two different network interfaces. VPN1 is using
// TEST_IFACE and VPN2 is using TEST_IFACE2.
- final VpnInfo[] vpnInfos = new VpnInfo[] {
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos = new UnderlyingNetworkInfo[] {
createVpnInfo(TUN_IFACE, new String[] {TEST_IFACE}),
createVpnInfo(TUN_IFACE2, new String[] {TEST_IFACE2})};
- mFactory.updateVpnInfos(vpnInfos);
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -308,8 +314,9 @@
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
// Additionally, VPN is arbitrarily splitting traffic across WiFi and Cell.
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
@@ -335,8 +342,9 @@
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
// Additionally, VPN is arbitrarily splitting compressed traffic across WiFi and Cell.
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface:
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
@@ -357,8 +365,9 @@
public void testVpnWithIncorrectUnderlyingIface() throws Exception {
// WiFi and Cell networks are connected and VPN is using Cell (which has TEST_IFACE2),
// but has declared only WiFi (TEST_IFACE) in its underlying network set.
- VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
- mFactory.updateVpnInfos(vpnInfos);
+ final UnderlyingNetworkInfo[] underlyingNetworkInfos =
+ new UnderlyingNetworkInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
+ mFactory.updateUnderlyingNetworkInfos(underlyingNetworkInfos);
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
// overhead per packet):
diff --git a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
index b4e37de..dde78aa 100644
--- a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
+++ b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
@@ -86,7 +86,7 @@
import android.net.NetworkStats;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
-import android.net.VpnInfo;
+import android.net.UnderlyingNetworkInfo;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.os.ConditionVariable;
import android.os.Handler;
@@ -286,7 +286,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -328,7 +329,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -401,7 +403,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// modify some number on wifi, and trigger poll event
incrementCurrentTime(2 * HOUR_IN_MILLIS);
@@ -441,7 +444,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some traffic on first network
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -475,7 +479,8 @@
.insertEntry(TEST_IFACE, UID_RED, SET_DEFAULT, 0xF00D, 512L, 4L, 512L, 4L, 0L)
.insertEntry(TEST_IFACE, UID_BLUE, SET_DEFAULT, TAG_NONE, 512L, 4L, 0L, 0L, 0L));
- mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
forcePollAndWaitForIdle();
@@ -514,7 +519,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some traffic
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -581,7 +587,7 @@
setMobileRatTypeAndWaitForIdle(TelephonyManager.NETWORK_TYPE_UMTS);
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
- new VpnInfo[0]);
+ new UnderlyingNetworkInfo[0]);
// Create some traffic.
incrementCurrentTime(MINUTE_IN_MILLIS);
@@ -655,7 +661,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some traffic for two apps
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -713,7 +720,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
NetworkStats.Entry entry1 = new NetworkStats.Entry(
TEST_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 50L, 5L, 50L, 5L, 0L);
@@ -756,7 +764,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
NetworkStats.Entry uidStats = new NetworkStats.Entry(
TEST_IFACE, UID_BLUE, SET_DEFAULT, 0xF00D, 1024L, 8L, 512L, 4L, 0L);
@@ -810,7 +819,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some initial traffic
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -867,7 +877,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some initial traffic
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -906,7 +917,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// Create some traffic
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -943,7 +955,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// create some tethering traffic
incrementCurrentTime(HOUR_IN_MILLIS);
@@ -999,7 +1012,8 @@
expectNetworkStatsSummary(buildEmptyStats());
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// verify service has empty history for wifi
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
@@ -1104,7 +1118,8 @@
mService.registerNetworkStatsProvider("TEST", provider);
assertNotNull(cb);
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// Verifies that one requestStatsUpdate will be called during iface update.
provider.expectOnRequestStatsUpdate(0 /* unused */);
@@ -1155,7 +1170,8 @@
expectDefaultSettings();
NetworkState[] states =
new NetworkState[]{buildWifiState(true /* isMetered */, TEST_IFACE)};
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// Register custom provider and retrieve callback.
final TestableNetworkStatsProviderBinder provider =
@@ -1204,7 +1220,7 @@
// 3G network comes online.
setMobileRatTypeAndWaitForIdle(TelephonyManager.NETWORK_TYPE_UMTS);
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states),
- new VpnInfo[0]);
+ new UnderlyingNetworkInfo[0]);
// Create some traffic.
incrementCurrentTime(MINUTE_IN_MILLIS);
@@ -1274,7 +1290,8 @@
NetworkState[] states = new NetworkState[]{
buildWifiState(true /*isMetered*/, TEST_IFACE2), buildMobile3gState(IMSI_1)};
expectNetworkStatsUidDetail(buildEmptyStats());
- mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
+ mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states),
+ new UnderlyingNetworkInfo[0]);
// Create some traffic on mobile network.
incrementCurrentTime(HOUR_IN_MILLIS);
diff --git a/tests/vcn/java/android/net/vcn/VcnManagerTest.java b/tests/vcn/java/android/net/vcn/VcnManagerTest.java
index 9c6b719..f9db408 100644
--- a/tests/vcn/java/android/net/vcn/VcnManagerTest.java
+++ b/tests/vcn/java/android/net/vcn/VcnManagerTest.java
@@ -18,14 +18,19 @@
import static androidx.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.net.vcn.VcnManager.VcnUnderlyingNetworkPolicyListener;
import org.junit.Before;
@@ -103,4 +108,28 @@
public void testRemoveVcnUnderlyingNetworkPolicyListenerNullListener() {
mVcnManager.removeVcnUnderlyingNetworkPolicyListener(null);
}
+
+ @Test
+ public void testGetUnderlyingNetworkPolicy() throws Exception {
+ NetworkCapabilities nc = new NetworkCapabilities();
+ LinkProperties lp = new LinkProperties();
+ when(mMockVcnManagementService.getUnderlyingNetworkPolicy(eq(nc), eq(lp)))
+ .thenReturn(new VcnUnderlyingNetworkPolicy(false /* isTearDownRequested */, nc));
+
+ VcnUnderlyingNetworkPolicy policy = mVcnManager.getUnderlyingNetworkPolicy(nc, lp);
+
+ assertFalse(policy.isTeardownRequested());
+ assertEquals(nc, policy.getMergedNetworkCapabilities());
+ verify(mMockVcnManagementService).getUnderlyingNetworkPolicy(eq(nc), eq(lp));
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testGetUnderlyingNetworkPolicyNullNetworkCapabilities() throws Exception {
+ mVcnManager.getUnderlyingNetworkPolicy(null, new LinkProperties());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testGetUnderlyingNetworkPolicyNullLinkProperties() throws Exception {
+ mVcnManager.getUnderlyingNetworkPolicy(new NetworkCapabilities(), null);
+ }
}
diff --git a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
index f0cdde3..e26bf19 100644
--- a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
+++ b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
@@ -21,6 +21,8 @@
import static com.android.server.vcn.VcnTestUtils.setupSystemService;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -41,9 +43,12 @@
import android.app.AppOpsManager;
import android.content.Context;
import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;
import android.net.vcn.VcnConfig;
import android.net.vcn.VcnConfigTest;
+import android.net.vcn.VcnUnderlyingNetworkPolicy;
import android.os.IBinder;
import android.os.ParcelUuid;
import android.os.PersistableBundle;
@@ -63,6 +68,7 @@
import com.android.server.vcn.VcnNetworkProvider;
import com.android.server.vcn.util.PersistableBundleUtils;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -192,6 +198,14 @@
mTestLooper.dispatchAll();
}
+ @Before
+ public void setUp() {
+ doNothing()
+ .when(mMockContext)
+ .enforceCallingOrSelfPermission(
+ eq(android.Manifest.permission.NETWORK_FACTORY), any());
+ }
+
private void setupMockedCarrierPrivilege(boolean isPrivileged) {
doReturn(Collections.singletonList(TEST_SUBSCRIPTION_INFO))
.when(mSubMgr)
@@ -455,10 +469,6 @@
@Test
public void testAddVcnUnderlyingNetworkPolicyListener() throws Exception {
- doNothing()
- .when(mMockContext)
- .enforceCallingPermission(eq(android.Manifest.permission.NETWORK_FACTORY), any());
-
mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);
verify(mMockIBinder).linkToDeath(any(), anyInt());
@@ -468,17 +478,14 @@
public void testAddVcnUnderlyingNetworkPolicyListenerInvalidPermission() {
doThrow(new SecurityException())
.when(mMockContext)
- .enforceCallingPermission(eq(android.Manifest.permission.NETWORK_FACTORY), any());
+ .enforceCallingOrSelfPermission(
+ eq(android.Manifest.permission.NETWORK_FACTORY), any());
mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);
}
@Test
public void testRemoveVcnUnderlyingNetworkPolicyListener() {
- // verify listener added
- doNothing()
- .when(mMockContext)
- .enforceCallingPermission(eq(android.Manifest.permission.NETWORK_FACTORY), any());
mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);
mVcnMgmtSvc.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);
@@ -488,4 +495,24 @@
public void testRemoveVcnUnderlyingNetworkPolicyListenerNeverRegistered() {
mVcnMgmtSvc.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener);
}
+
+ @Test
+ public void testGetUnderlyingNetworkPolicy() throws Exception {
+ VcnUnderlyingNetworkPolicy policy =
+ mVcnMgmtSvc.getUnderlyingNetworkPolicy(
+ new NetworkCapabilities(), new LinkProperties());
+
+ assertFalse(policy.isTeardownRequested());
+ assertNotNull(policy.getMergedNetworkCapabilities());
+ }
+
+ @Test(expected = SecurityException.class)
+ public void testGetUnderlyingNetworkPolicyInvalidPermission() {
+ doThrow(new SecurityException())
+ .when(mMockContext)
+ .enforceCallingOrSelfPermission(
+ eq(android.Manifest.permission.NETWORK_FACTORY), any());
+
+ mVcnMgmtSvc.getUnderlyingNetworkPolicy(new NetworkCapabilities(), new LinkProperties());
+ }
}