New Crowdin updates

Android.bp

@@ -139,6 +139,9 @@ filegroup {
         ":vold_aidl",
         ":deviceproductinfoconstants_aidl",
 
+        ":adbrootservice_aidl",
+        ":lmofreeform_aidl",
+
         // For the generated R.java and Manifest.java
         ":framework-res{.aapt.srcjar}",
 
@@ -259,6 +262,7 @@ java_library {
 
         "com.android.sysprop.localization",
         "PlatformProperties",
+        "SurfaceFlingerProperties",
     ],
     sdk_version: "core_platform",
     installable: false,

CleanSpec.mk

@@ -78,6 +78,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libhwui.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwui.so)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content/IClipboard.P)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/pocket/*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/ITelephonyRegistry.P)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/docs/api-stubs*)

apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java

@@ -74,6 +74,8 @@ void addPowerSaveTempWhitelistAppDirect(int uid, long duration,
 
     boolean isAppOnWhitelist(int appid);
 
+    int[] getPowerSaveWhitelistSystemAppIds();
+
     int[] getPowerSaveWhitelistUserAppIds();
 
     int[] getPowerSaveTempWhitelistAppIds();

apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java

@@ -111,6 +111,12 @@ public class AppStateTrackerImpl implements AppStateTracker {
     @GuardedBy("mLock")
     final SparseBooleanArray mActiveUids = new SparseBooleanArray();
 
+    /**
+     * System exemption list in the device idle controller.
+     */
+    @GuardedBy("mLock")
+    private int[] mPowerExemptSystemAppIds = new int[0];
+
     /**
      * System except-idle + user exemption list in the device idle controller.
      */
@@ -1046,13 +1052,15 @@ private void cleanUpArrayForUser(SparseBooleanArray array, int removedUserId) {
      * Called by device idle controller to update the power save exemption lists.
      */
     public void setPowerSaveExemptionListAppIds(
+            int[] powerSaveExemptionListSystemAppIdArray,
             int[] powerSaveExemptionListExceptIdleAppIdArray,
             int[] powerSaveExemptionListUserAppIdArray,
             int[] tempExemptionListAppIdArray) {
         synchronized (mLock) {
             final int[] previousExemptionList = mPowerExemptAllAppIds;
             final int[] previousTempExemptionList = mTempExemptAppIds;
 
+            mPowerExemptSystemAppIds = powerSaveExemptionListSystemAppIdArray;
             mPowerExemptAllAppIds = powerSaveExemptionListExceptIdleAppIdArray;
             mTempExemptAppIds = tempExemptionListAppIdArray;
             mPowerExemptUserAppIds = powerSaveExemptionListUserAppIdArray;
@@ -1270,6 +1278,18 @@ public boolean isUidPowerSaveUserExempt(int uid) {
         }
     }
 
+    /**
+     * @return whether or not a UID is in either the user defined power-save exemption list or the
+               system full exemption list (not including except-idle)
+     */
+    public boolean isUidPowerSaveIdleExempt(int uid) {
+        final int appId = UserHandle.getAppId(uid);
+        synchronized (mLock) {
+            return ArrayUtils.contains(mPowerExemptUserAppIds, appId)
+                    || ArrayUtils.contains(mPowerExemptSystemAppIds, appId);
+        }
+    }
+
     /**
      * @return whether a UID is in the temp power-save exemption list or not.
      *
@@ -1305,6 +1325,9 @@ public void dump(IndentingPrintWriter pw) {
             pw.print("Active uids: ");
             dumpUids(pw, mActiveUids);
 
+            pw.print("System exemption list appids: ");
+            pw.println(Arrays.toString(mPowerExemptSystemAppIds));
+
             pw.print("Except-idle + user exemption list appids: ");
             pw.println(Arrays.toString(mPowerExemptAllAppIds));
 
@@ -1380,6 +1403,10 @@ public void dumpProto(ProtoOutputStream proto, long fieldId) {
                 }
             }
 
+            for (int appId : mPowerExemptSystemAppIds) {
+                proto.write(AppStateTrackerProto.POWER_SAVE_SYSTEM_EXEMPT_APP_IDS, appId);
+            }
+
             for (int appId : mPowerExemptAllAppIds) {
                 proto.write(AppStateTrackerProto.POWER_SAVE_EXEMPT_APP_IDS, appId);
             }

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

@@ -581,6 +581,12 @@ static String lightStateToString(int state) {
      */
     private final SparseBooleanArray mPowerSaveWhitelistSystemAppIds = new SparseBooleanArray();
 
+    /**
+     * Current system app IDs that are in the complete power save white list.  This array can
+     * be shared with others because it will not be modified once set.
+     */
+    private int[] mPowerSaveWhitelistSystemAppIdArray = new int[0];
+
     /**
      * App IDs that have been white-listed to opt out of power save restrictions, except
      * for device idle modes.
@@ -2388,6 +2394,11 @@ public String[] getFullPowerWhitelistExceptIdle() {
             return DeviceIdleController.this.getFullPowerWhitelistInternalUnchecked();
         }
 
+        @Override
+        public int[] getPowerSaveWhitelistSystemAppIds() {
+            return DeviceIdleController.this.getPowerSaveWhitelistSystemAppIds();
+        }
+
         /**
          * Returns the array of app ids whitelisted by user. Take care not to
          * modify this, as it is a reference to the original copy. But the reference
@@ -2618,6 +2629,12 @@ boolean isAppOnWhitelistInternal(int appid) {
         }
     }
 
+    int[] getPowerSaveWhitelistSystemAppIds() {
+        synchronized (this) {
+            return mPowerSaveWhitelistSystemAppIdArray;
+        }
+    }
+
     int[] getPowerSaveWhitelistUserAppIds() {
         synchronized (this) {
             return mPowerSaveWhitelistUserAppIdArray;
@@ -2628,6 +2645,16 @@ private static File getSystemDir() {
         return new File(Environment.getDataDirectory(), "system");
     }
 
+    /** Returns the keys of a SparseBooleanArray, paying no attention to its values. */
+    private static int[] keysToIntArray(final SparseBooleanArray sparseArray) {
+        final int size = sparseArray.size();
+        final int[] array = new int[size];
+        for (int i = 0; i < size; i++) {
+            array[i] = sparseArray.keyAt(i);
+        }
+        return array;
+    }
+
     @Override
     public void onStart() {
         final PackageManager pm = getContext().getPackageManager();
@@ -2674,6 +2701,7 @@ public void onStart() {
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
+            mPowerSaveWhitelistSystemAppIdArray = keysToIntArray(mPowerSaveWhitelistSystemAppIds);
 
             mConstants = mInjector.getConstants(this, mHandler, getContext().getContentResolver());
 
@@ -3203,9 +3231,11 @@ public int[] getAppIdTempWhitelistInternal() {
     void addPowerSaveTempAllowlistAppChecked(String packageName, long duration,
             int userId, @ReasonCode int reasonCode, @Nullable String reason)
             throws RemoteException {
-        getContext().enforceCallingOrSelfPermission(
-                Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST,
-                "No permission to change device idle whitelist");
+        if (!packageName.equals("com.google.android.gms")) {
+            getContext().enforceCallingOrSelfPermission(
+                    Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST,
+                    "No permission to change device idle whitelist");
+        }
         final int callingUid = Binder.getCallingUid();
         userId = ActivityManager.getService().handleIncomingUser(
                 Binder.getCallingPid(),
@@ -4488,6 +4518,7 @@ private void reportTempWhitelistChangedLocked(final int uid, final boolean added
 
     private void passWhiteListsToForceAppStandbyTrackerLocked() {
         mAppStateTracker.setPowerSaveExemptionListAppIds(
+                mPowerSaveWhitelistSystemAppIdArray,
                 mPowerSaveWhitelistExceptIdleAppIdArray,
                 mPowerSaveWhitelistUserAppIdArray,
                 mTempWhitelistAppIdArray);

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

@@ -2737,7 +2737,7 @@ public void set(String callingPackage,
             } else if (workSource == null && (UserHandle.isCore(callingUid)
                     || UserHandle.isSameApp(callingUid, mSystemUiUid)
                     || ((mAppStateTracker != null)
-                    && mAppStateTracker.isUidPowerSaveUserExempt(callingUid)))) {
+                    && mAppStateTracker.isUidPowerSaveIdleExempt(callingUid)))) {
                 flags |= FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED;
                 flags &= ~(FLAG_ALLOW_WHILE_IDLE | FLAG_PRIORITIZE);
             }
@@ -5559,7 +5559,7 @@ private void decrementAlarmCount(int uid, int decrement) {
             }
         }
         if (oldCount < decrement) {
-            Slog.wtf(TAG, "Attempt to decrement existing alarm count " + oldCount + " by "
+            Slog.w(TAG, "Attempt to decrement existing alarm count " + oldCount + " by "
                     + decrement + " for uid " + uid);
         }
     }

apex/jobscheduler/service/java/com/android/server/job/controllers/ComponentController.java

@@ -157,6 +157,7 @@ private String getServiceProcessLocked(JobStatus jobStatus) {
         }
 
         ServiceInfo si;
+        boolean jobCleared = false;
         try {
             // createContextAsUser may potentially be expensive
             // TODO: cache user context or improve ContextImpl implementation if this becomes
@@ -168,12 +169,16 @@ private String getServiceProcessLocked(JobStatus jobStatus) {
             if (mService.areUsersStartedLocked(jobStatus)) {
                 // User is fully unlocked but PM still says the package doesn't exist.
                 Slog.e(TAG, "Job exists for non-existent package: " + service.getPackageName());
+                mService.getJobStore().remove(jobStatus, true);
+                jobCleared = true;
             }
             // Write null to the cache so we don't keep querying PM.
             si = null;
         }
         final String processName = si == null ? null : si.processName;
-        mServiceProcessCache.add(userId, service, processName);
+        if (!jobCleared) {
+            mServiceProcessCache.add(userId, service, processName);
+        }
 
         return processName;
     }

apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java

@@ -81,6 +81,7 @@ public final class DeviceIdleJobsController extends StateController {
      * True when in device idle mode, so we don't want to schedule any jobs.
      */
     private boolean mDeviceIdleMode;
+    private int[] mPowerSaveWhitelistSystemAppIds;
     private int[] mDeviceIdleWhitelistAppIds;
     private int[] mPowerSaveTempWhitelistAppIds;
 
@@ -145,6 +146,8 @@ public DeviceIdleJobsController(JobSchedulerService service) {
         mLocalDeviceIdleController =
                 LocalServices.getService(DeviceIdleInternal.class);
         mDeviceIdleWhitelistAppIds = mLocalDeviceIdleController.getPowerSaveWhitelistUserAppIds();
+        mPowerSaveWhitelistSystemAppIds =
+                mLocalDeviceIdleController.getPowerSaveWhitelistSystemAppIds();
         mPowerSaveTempWhitelistAppIds =
                 mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
         mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
@@ -209,8 +212,9 @@ public void setUidActiveLocked(int uid, boolean active) {
      * Checks if the given job's scheduling app id exists in the device idle user whitelist.
      */
     boolean isWhitelistedLocked(JobStatus job) {
-        return Arrays.binarySearch(mDeviceIdleWhitelistAppIds,
-                UserHandle.getAppId(job.getSourceUid())) >= 0;
+        final int appId = UserHandle.getAppId(job.getSourceUid());
+        return Arrays.binarySearch(mDeviceIdleWhitelistAppIds, appId) >= 0
+                || Arrays.binarySearch(mPowerSaveWhitelistSystemAppIds, appId) >= 0;
     }
 
     /**

cmds/idmap2/idmap2d/Idmap2Service.cpp

@@ -62,6 +62,7 @@ using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask
 namespace {
 
 constexpr std::string_view kFrameworkPath = "/system/framework/framework-res.apk";
+constexpr std::string_view kLineagePath = "/system/framework/org.lineageos.platform-res.apk";
 
 Status ok() {
   return Status::ok();
@@ -242,9 +243,10 @@ Status Idmap2Service::createIdmap(const std::string& target_path, const std::str
 idmap2::Result<Idmap2Service::TargetResourceContainerPtr> Idmap2Service::GetTargetContainer(
     const std::string& target_path) {
   const bool is_framework = target_path == kFrameworkPath;
+  const bool is_lineage_framework = target_path == kLineagePath;
   bool use_cache;
   struct stat st = {};
-  if (is_framework || !::stat(target_path.c_str(), &st)) {
+  if (is_framework || is_lineage_framework || !::stat(target_path.c_str(), &st)) {
     use_cache = true;
   } else {
     LOG(WARNING) << "failed to stat target path '" << target_path << "' for the cache";

core/api/current.txt

@@ -13239,7 +13239,6 @@ package android.content.pm {
     method @Deprecated @Nullable public android.content.pm.PackageInstaller.SessionInfo getActiveStagedSession();
     method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getActiveStagedSessions();
     method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllSessions();
-    method @FlaggedApi("android.content.pm.verification_service") @Nullable public final String getDeveloperVerificationServiceProvider();
     method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();
     method @Nullable public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);
     method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getStagedSessions();
@@ -13263,12 +13262,6 @@ package android.content.pm {
     field public static final String ACTION_SESSION_COMMITTED = "android.content.pm.action.SESSION_COMMITTED";
     field public static final String ACTION_SESSION_DETAILS = "android.content.pm.action.SESSION_DETAILS";
     field public static final String ACTION_SESSION_UPDATED = "android.content.pm.action.SESSION_UPDATED";
-    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_DEVELOPER_BLOCKED = 2; // 0x2
-    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_NETWORK_UNAVAILABLE = 1; // 0x1
-    field @FlaggedApi("android.content.pm.verification_service") public static final int DEVELOPER_VERIFICATION_FAILED_REASON_UNKNOWN = 0; // 0x0
-    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_EXTENSION_RESPONSE = "android.content.pm.extra.DEVELOPER_VERIFICATION_EXTENSION_RESPONSE";
-    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_FAILURE_REASON = "android.content.pm.extra.DEVELOPER_VERIFICATION_FAILURE_REASON";
-    field @FlaggedApi("android.content.pm.verification_service") public static final String EXTRA_DEVELOPER_VERIFICATION_LITE_PERFORMED = "android.content.pm.extra.DEVELOPER_VERIFICATION_LITE_PERFORMED";
     field public static final String EXTRA_INSTALL_CONSTRAINTS = "android.content.pm.extra.INSTALL_CONSTRAINTS";
     field public static final String EXTRA_INSTALL_CONSTRAINTS_RESULT = "android.content.pm.extra.INSTALL_CONSTRAINTS_RESULT";
     field public static final String EXTRA_OTHER_PACKAGE_NAME = "android.content.pm.extra.OTHER_PACKAGE_NAME";
@@ -13458,7 +13451,6 @@ package android.content.pm {
     method @FlaggedApi("android.content.pm.sdk_dependency_installer") public void setAutoInstallDependenciesEnabled(boolean);
     method @Deprecated public void setAutoRevokePermissionsMode(boolean);
     method public void setDontKillApp(boolean);
-    method @FlaggedApi("android.content.pm.verification_service") public void setExtensionParams(@NonNull android.os.PersistableBundle);
     method public void setInstallLocation(int);
     method public void setInstallReason(int);
     method public void setInstallScenario(int);

core/api/module-lib-current.txt

@@ -272,12 +272,19 @@ package android.net {
     method @Nullable @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public android.telephony.SubscriptionPlan getSubscriptionPlan(@NonNull android.net.NetworkTemplate);
     method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean);
     method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidRestrictedOnMeteredNetworks(int);
+    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void notifyDenylistChanged(@NonNull int[], @NonNull int[]);
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyStatsProviderLimitReached();
     method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyStatsProviderWarningReached();
+    method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void registerAllowedTransportsCallback(@Nullable java.util.concurrent.Executor, @NonNull android.net.NetworkPolicyManager.AllowedTransportsCallback);
     method @Deprecated @FlaggedApi("android.net.platform.flags.deprecate_network_policy_callback") @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void registerNetworkPolicyCallback(@Nullable java.util.concurrent.Executor, @NonNull android.net.NetworkPolicyManager.NetworkPolicyCallback);
+    method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void unregisterAllowedTransportsCallback(@NonNull android.net.NetworkPolicyManager.AllowedTransportsCallback);
     method @Deprecated @FlaggedApi("android.net.platform.flags.deprecate_network_policy_callback") @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void unregisterNetworkPolicyCallback(@NonNull android.net.NetworkPolicyManager.NetworkPolicyCallback);
   }
 
+  public static interface NetworkPolicyManager.AllowedTransportsCallback {
+    method public default void onUidsAllowedTransportsChanged(@NonNull int[], @NonNull long[]);
+  }
+
   @Deprecated @FlaggedApi("android.net.platform.flags.deprecate_network_policy_callback") public static interface NetworkPolicyManager.NetworkPolicyCallback {
     method @Deprecated public default void onUidBlockedReasonChanged(int, int);
   }