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

Commit 7cdac0a4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3891315, 3891335, 3891336] into pi-release 

Change-Id: I4197763e5cf1175ba09b479d6c5a3689e3a2e155
parents 503a98a2 ee52dae3

config/hiddenapi-light-greylist.txt

+1 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,7 @@ Landroid/media/AudioAttributes;->mFlags:I 
Landroid/media/AudioAttributes;->mFormattedTags:Ljava/lang/String;

Landroid/media/AudioAttributes;->mSource:I

Landroid/media/AudioAttributes;->mUsage:I

Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder;

Landroid/media/AudioDevicePortConfig;-><init>(Landroid/media/AudioDevicePort;IIILandroid/media/AudioGainConfig;)V

Landroid/media/AudioDevicePort;-><init>(Landroid/media/AudioHandle;Ljava/lang/String;[I[I[I[I[Landroid/media/AudioGain;ILjava/lang/String;)V

Landroid/media/AudioFormat;-><init>(IIII)V

packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java

+1 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class TunerServiceImpl extends TunerService { 


    private static final String TUNER_VERSION = "sysui_tuner_version";



    private static final int CURRENT_TUNER_VERSION = 3;

    private static final int CURRENT_TUNER_VERSION = 2;



    private final Observer mObserver = new Observer();

    // Map of Uris we listen on to their settings keys.
@@ -119,10 +119,6 @@ public class TunerServiceImpl extends TunerService { 
        if (oldVersion < 2) {

            setTunerEnabled(mContext, false);

        }

        if (oldVersion < 3) {

            // Delay this so that we can wait for everything to be registered first.

            new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed(() -> clearAll(), 5000);

        }

        setValue(TUNER_VERSION, newVersion);

    }