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

Commit 9c0144ed authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "VibrationSettings: Use the default UidObserver implementation." into udc-dev am: a023835f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22366511



Change-Id: I7b26515ce8838007b7209861f18a4386849c1fc5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55fe1413 a023835f

services/art-profile

+2 −2
Original line number Diff line number Diff line
@@ -10370,8 +10370,8 @@ HPLcom/android/server/vibrator/Vibration$DebugInfo;-><init>(Lcom/android/server/ 
HPLcom/android/server/vibrator/Vibration;-><init>(Landroid/os/IBinder;Lcom/android/server/vibrator/Vibration$CallerInfo;)V

HPLcom/android/server/vibrator/VibrationEffectAdapters;->apply(Landroid/os/VibrationEffect;Ljava/util/List;Ljava/lang/Object;)Landroid/os/VibrationEffect;+]Ljava/util/List;Ljava/util/Arrays$ArrayList;]Lcom/android/server/vibrator/VibrationEffectAdapters$SegmentsAdapter;Lcom/android/server/vibrator/StepToRampAdapter;,Lcom/android/server/vibrator/RampDownAdapter;,Lcom/android/server/vibrator/RampToStepAdapter;,Lcom/android/server/vibrator/ClippingAmplitudeAndFrequencyAdapter;]Landroid/os/VibrationEffect$Composed;Landroid/os/VibrationEffect$Composed;

HPLcom/android/server/vibrator/VibrationScaler;->scale(Landroid/os/VibrationEffect;I)Landroid/os/VibrationEffect;

HPLcom/android/server/vibrator/VibrationSettings$UidObserver;->isUidForeground(I)Z

HSPLcom/android/server/vibrator/VibrationSettings$UidObserver;->onUidStateChanged(IIJI)V+]Landroid/util/SparseArray;Landroid/util/SparseArray;

HPLcom/android/server/vibrator/VibrationSettings$MyUidObserver;->isUidForeground(I)Z

HSPLcom/android/server/vibrator/VibrationSettings$MyUidObserver;->onUidStateChanged(IIJI)V+]Landroid/util/SparseArray;Landroid/util/SparseArray;

HPLcom/android/server/vibrator/VibrationSettings;->getCurrentIntensity(I)I

HPLcom/android/server/vibrator/VibrationSettings;->shouldIgnoreVibration(Lcom/android/server/vibrator/Vibration$CallerInfo;)Lcom/android/server/vibrator/Vibration$Status;

HPLcom/android/server/vibrator/VibrationStats$StatsInfo;-><init>(IIILcom/android/server/vibrator/Vibration$Status;Lcom/android/server/vibrator/VibrationStats;J)V

services/core/java/com/android/server/vibrator/VibrationSettings.java

+4 −20
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import static android.os.VibrationAttributes.USAGE_UNKNOWN; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.IUidObserver;

import android.app.UidObserver;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -157,7 +157,7 @@ final class VibrationSettings { 
    @VisibleForTesting

    final SettingsContentObserver mSettingObserver;

    @VisibleForTesting

    final UidObserver mUidObserver;

    final MyUidObserver mUidObserver;

    @VisibleForTesting

    final SettingsBroadcastReceiver mSettingChangeReceiver;

    final VirtualDeviceListener mVirtualDeviceListener;
@@ -195,7 +195,7 @@ final class VibrationSettings { 
        mContext = context;

        mVibrationConfig = config;

        mSettingObserver = new SettingsContentObserver(handler);

        mUidObserver = new UidObserver();

        mUidObserver = new MyUidObserver();

        mSettingChangeReceiver = new SettingsBroadcastReceiver();

        mVirtualDeviceListener = new VirtualDeviceListener();
@@ -726,7 +726,7 @@ final class VibrationSettings { 


    /** Implementation of {@link ContentObserver} to be registered to a setting {@link Uri}. */

    @VisibleForTesting

    final class UidObserver extends IUidObserver.Stub {

    final class MyUidObserver extends UidObserver {

        private final SparseArray<Integer> mProcStatesCache = new SparseArray<>();



        public boolean isUidForeground(int uid) {
@@ -739,26 +739,10 @@ final class VibrationSettings { 
            mProcStatesCache.delete(uid);

        }



        @Override

        public void onUidActive(int uid) {

        }



        @Override

        public void onUidIdle(int uid, boolean disabled) {

        }



        @Override

        public void onUidStateChanged(int uid, int procState, long procStateSeq, int capability) {

            mProcStatesCache.put(uid, procState);

        }



        @Override

        public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override

        public void onUidProcAdjChanged(int uid) {

        }

    }



    /**