Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit eb370815 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r12' into staging/lineage-19.0_merge-android-12.0.0_r12 

Android 12.0.0 release 12

* tag 'android-12.0.0_r12': (259 commits)
  [DO NOT MERGE] Improve brightness handling during screen off timeout.
  Fixed NPE in FingerprintAuthClient
  Make sure udfps bouncer always shows when requested
  RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus
  ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout
  Separate refresh rate restrictions for different High Brightness Modes
  Limit refresh rates if skin temperature is high
  Restrict Rescue Party factory reset packages
  RESTRICT AUTOMERGE: More improve IME transition during task switch
  Handle duplicate DOWN event
  Account for last animated-to-sleep state when calculating nav visibility
  NotificationShade should animate away on MODE_UNLOCK_COLLAPSING
  Show UDFPS icon on AOD even if fp auth isn't running
  Revealing the light reveal scrim only during keyguard exit animation
  Delay the transition to AOD1 if udfps is activated
  Always show "Swipe up to open" on tapping empty space on LS
  Remove ZigZagClassifer from lock-icon longpress falsing algo
  Update dwell ripple parameters
  Fix flicker when device is unlocked from AOD.
  Increase the UDFPS touch area
  ...

Change-Id: I24e62d25185845cca9f8ddc9a2cf182001bb253c
parents 221e1793 ea8a98f0

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

+4 −0
Original line number Diff line number Diff line
@@ -3941,6 +3941,10 @@ public class DeviceIdleController extends SystemService 
        if (idleUntil) {

            mAlarmManager.setIdleUntil(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                    mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);

        } else if (mState == STATE_LOCATING) {

            // Use setExact so we don't keep the GPS active for too long.

            mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                    mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);

        } else {

            if (mConstants.USE_WINDOW_ALARMS) {

                mAlarmManager.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,

core/java/android/accounts/Account.java

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.util.Log; 


import com.android.internal.annotations.GuardedBy;



import java.util.Objects;

import java.util.Set;



/**
@@ -86,6 +87,12 @@ public class Account implements Parcelable { 
        if (TextUtils.isEmpty(type)) {

            throw new IllegalArgumentException("the type must not be empty: " + type);

        }

        if (name.length() > 200) {

            throw new IllegalArgumentException("account name is longer than 200 characters");

        }

        if (type.length() > 200) {

            throw new IllegalArgumentException("account type is longer than 200 characters");

        }

        this.name = name;

        this.type = type;

        this.accessId = accessId;

core/java/android/app/ActivityThread.java

+6 −9
Original line number Diff line number Diff line
@@ -464,11 +464,7 @@ public final class ActivityThread extends ClientTransactionHandler 


        @Override

        public int hashCode() {

            return hashCode(authority, userId);

        }



        public static int hashCode(final String auth, final int userIdent) {

            return ((auth != null) ? auth.hashCode() : 0) ^ userIdent;

            return ((authority != null) ? authority.hashCode() : 0) ^ userId;

        }

    }
@@ -490,7 +486,7 @@ public final class ActivityThread extends ClientTransactionHandler 
    // Note we never removes items from this map but that's okay because there are only so many

    // users and so many authorities.

    @GuardedBy("mGetProviderKeys")

    final SparseArray<ProviderKey> mGetProviderKeys = new SparseArray<>();

    final ArrayMap<ProviderKey, ProviderKey> mGetProviderKeys = new ArrayMap<>();



    final ArrayMap<Activity, ArrayList<OnActivityPausedListener>> mOnPauseListeners

        = new ArrayMap<Activity, ArrayList<OnActivityPausedListener>>();
@@ -4911,7 +4907,8 @@ public final class ActivityThread extends ClientTransactionHandler 
                Slog.w(TAG, "Activity top position already set to onTop=" + onTop);

                return;

            }

            throw new IllegalStateException("Activity top position already set to onTop=" + onTop);

            // TODO(b/197484331): Remove this short-term workaround while fixing the binder failure.

            Slog.e(TAG, "Activity top position already set to onTop=" + onTop);

        }



        r.isTopResumedActivity = onTop;
@@ -7015,11 +7012,11 @@ public final class ActivityThread extends ClientTransactionHandler 
    }



    private ProviderKey getGetProviderKey(String auth, int userId) {

        final int key = ProviderKey.hashCode(auth, userId);

        final ProviderKey key = new ProviderKey(auth, userId);

        synchronized (mGetProviderKeys) {

            ProviderKey lock = mGetProviderKeys.get(key);

            if (lock == null) {

                lock = new ProviderKey(auth, userId);

                lock = key;

                mGetProviderKeys.put(key, lock);

            }

            return lock;

core/java/android/bluetooth/BluetoothDevice.java

+4 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,10 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
            if (alias == null) {

                return getName();

            }

            return alias;

            return alias

                    .replace('\t', ' ')

                    .replace('\n', ' ')

                    .replace('\r', ' ');

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

core/java/android/hardware/display/DisplayManager.java

+17 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,23 @@ public final class DisplayManager { 
         */

        String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =

                "fixed_refresh_rate_high_ambient_brightness_thresholds";



        /**

         * Key for refresh rate when the device is in high brightness mode for sunlight visility.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_defaultRefreshRateInHbmSunlight

         */

        String KEY_REFRESH_RATE_IN_HBM_SUNLIGHT = "refresh_rate_in_hbm_sunlight";



        /**

         * Key for refresh rate when the device is in high brightness mode for HDR.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_defaultRefreshRateInHbmHdr

         */

        String KEY_REFRESH_RATE_IN_HBM_HDR = "refresh_rate_in_hbm_hdr";



        /**

         * Key for default peak refresh rate

         *