Import Russian translations

Android.bp

@@ -140,6 +140,8 @@ filegroup {
         ":vold_aidl",
         ":deviceproductinfoconstants_aidl",
 
+        ":adbrootservice_aidl",
+
         // For the generated R.java and Manifest.java
         ":framework-res{.aapt.srcjar}",
 
@@ -264,6 +266,11 @@ java_library {
         "com.android.sysprop.init",
         "com.android.sysprop.localization",
         "PlatformProperties",
+        "SurfaceFlingerProperties",
+        "vendor.lineage.touch-V1.0-java",
+        "vendor.lineage.livedisplay-V2.0-java",
+        "vendor.lineage.livedisplay-V2.1-java",
+        "vendor.lineage.health-V1-java",
     ],
     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.
      */
@@ -1041,13 +1047,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;
@@ -1265,6 +1273,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.
      *
@@ -1300,6 +1320,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));
 
@@ -1375,6 +1398,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

@@ -580,6 +580,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.
@@ -2382,6 +2388,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
@@ -2607,6 +2618,12 @@ boolean isAppOnWhitelistInternal(int appid) {
         }
     }
 
+    int[] getPowerSaveWhitelistSystemAppIds() {
+        synchronized (this) {
+            return mPowerSaveWhitelistSystemAppIdArray;
+        }
+    }
+
     int[] getPowerSaveWhitelistUserAppIds() {
         synchronized (this) {
             return mPowerSaveWhitelistUserAppIdArray;
@@ -2617,6 +2634,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();
@@ -2653,6 +2680,7 @@ public void onStart() {
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
+            mPowerSaveWhitelistSystemAppIdArray = keysToIntArray(mPowerSaveWhitelistSystemAppIds);
 
             mConstants = mInjector.getConstants(this, mHandler, getContext().getContentResolver());
 
@@ -4454,6 +4482,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

@@ -2756,7 +2756,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);
             }
@@ -5566,7 +5566,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/DeviceIdleJobsController.java

@@ -75,6 +75,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;
 
@@ -134,6 +135,8 @@ public DeviceIdleJobsController(JobSchedulerService service) {
         mLocalDeviceIdleController =
                 LocalServices.getService(DeviceIdleInternal.class);
         mDeviceIdleWhitelistAppIds = mLocalDeviceIdleController.getPowerSaveWhitelistUserAppIds();
+        mPowerSaveWhitelistSystemAppIds =
+                mLocalDeviceIdleController.getPowerSaveWhitelistSystemAppIds();
         mPowerSaveTempWhitelistAppIds =
                 mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
         mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
@@ -197,8 +200,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/bootanimation/Android.bp

@@ -18,6 +18,8 @@ cc_defaults {
         "-Werror",
         "-Wunused",
         "-Wunreachable-code",
+
+	"-O3",
     ],
 
     shared_libs: [

cmds/bootanimation/BootAnimation.cpp

@@ -568,7 +568,19 @@ status_t BootAnimation::readyToRun() {
 
     mMaxWidth = android::base::GetIntProperty("ro.surface_flinger.max_graphics_width", 0);
     mMaxHeight = android::base::GetIntProperty("ro.surface_flinger.max_graphics_height", 0);
-    ui::Size resolution = displayMode.resolution;
+
+    // check for overridden ui resolution
+    ui::Size resolution;
+    char *endptr;
+    std::string size_override = android::base::GetProperty("ro.config.size_override", "");
+
+    resolution.width = strtoimax(size_override.c_str(), &endptr, 10);
+    if (endptr[0] == ',')
+        resolution.height = strtoimax(endptr+1, NULL, 10);
+
+    if (resolution.width <= 0 || resolution.height <= 0)
+        resolution = displayMode.resolution;
+
     resolution = limitSurfaceSize(resolution.width, resolution.height);
     // create the native surface
     sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"),
@@ -588,6 +600,11 @@ status_t BootAnimation::readyToRun() {
         t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);
     }
 
+    // Scale forced resolution to physical resolution
+    Rect forcedRes(0, 0, resolution.width, resolution.height);
+    Rect physRes(0, 0, displayMode.resolution.width, displayMode.resolution.height);
+    t.setDisplayProjection(mDisplayToken, ui::ROTATION_0, forcedRes, physRes);
+
     t.setLayer(control, 0x40000000)
         .apply();
 

core/api/current.txt

@@ -2348,6 +2348,10 @@ package android {
     field public static final int zoom_plate = 17301655; // 0x1080097
   }
 
+  public static final class R.font {
+    ctor public R.font();
+  }
+
   public static final class R.fraction {
     ctor public R.fraction();
   }
@@ -61371,6 +61375,13 @@ package android.widget {
     method public android.view.View makeView();
   }
 
+  public class WallpaperView extends android.widget.ImageView {
+    ctor public WallpaperView(@Nullable android.content.Context, @Nullable android.util.AttributeSet, int);
+    ctor public WallpaperView(@Nullable android.content.Context, @Nullable android.util.AttributeSet);
+    ctor public WallpaperView(@Nullable android.content.Context);
+    method public void onSizeChanged(int, int, int, int);
+  }
+
   public interface WrapperListAdapter extends android.widget.ListAdapter {
     method public android.widget.ListAdapter getWrappedAdapter();
   }

core/api/lint-baseline.txt

@@ -1153,6 +1153,10 @@ UnflaggedApi: android.R.dimen#system_corner_radius_xlarge:
     New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xlarge
 UnflaggedApi: android.R.dimen#system_corner_radius_xsmall:
     New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xsmall
+UnflaggedApi: android.R.font:
+    New API must be flagged with @FlaggedApi: class android.R.font
+UnflaggedApi: android.R.font#font():
+    New API must be flagged with @FlaggedApi: constructor android.R.font()
 UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR:
     New API must be flagged with @FlaggedApi: field android.accessibilityservice.AccessibilityService.OVERLAY_RESULT_INTERNAL_ERROR
 UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID:
@@ -1598,3 +1602,13 @@ UnflaggedApi: android.view.inputmethod.InlineSuggestionsRequest.Builder#setClien
     New API must be flagged with @FlaggedApi: method android.view.inputmethod.InlineSuggestionsRequest.Builder.setClientSupported(boolean)
 UnflaggedApi: android.view.inputmethod.InlineSuggestionsRequest.Builder#setServiceSupported(boolean):
     New API must be flagged with @FlaggedApi: method android.view.inputmethod.InlineSuggestionsRequest.Builder.setServiceSupported(boolean)
+UnflaggedApi: android.widget.WallpaperView:
+    New API must be flagged with @FlaggedApi: class android.widget.WallpaperView
+UnflaggedApi: android.widget.WallpaperView#WallpaperView(android.content.Context):
+    New API must be flagged with @FlaggedApi: constructor android.widget.WallpaperView(android.content.Context)
+UnflaggedApi: android.widget.WallpaperView#WallpaperView(android.content.Context, android.util.AttributeSet):
+    New API must be flagged with @FlaggedApi: constructor android.widget.WallpaperView(android.content.Context,android.util.AttributeSet)
+UnflaggedApi: android.widget.WallpaperView#WallpaperView(android.content.Context, android.util.AttributeSet, int):
+    New API must be flagged with @FlaggedApi: constructor android.widget.WallpaperView(android.content.Context,android.util.AttributeSet,int)
+UnflaggedApi: android.widget.WallpaperView#onSizeChanged(int, int, int, int):
+    New API must be flagged with @FlaggedApi: method android.widget.WallpaperView.onSizeChanged(int,int,int,int)