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

Commit 2ee5728a authored by Lais Andrade's avatar Lais Andrade
Browse files

Remove android.os.vibrator.cancel_by_appops 

Flag cleanup after bug fix fully released.

Fix: 409608069
Test: VibratorManagerServiceTest
Flag: EXEMPT flag removal
Change-Id: I3a8c32ad81de0a07ea676ab7f2e9058f8adbc6ab
parent 51025ce0

core/java/android/os/vibrator/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -8,17 +8,6 @@ flag { 
    bug: "305961689"

}



flag {

    namespace: "haptics"

    name: "cancel_by_appops"

    description: "Cancels ongoing vibrations when the appops mode changes to disallow them"

    bug: "230745615"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "haptics"

    name: "vibration_xml_apis"

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

+1 −3
Original line number Diff line number Diff line
@@ -287,9 +287,7 @@ public class VibratorManagerService extends IVibratorManagerService.Stub { 
        mBatteryStatsService = injector.getBatteryStatsService();



        mAppOps = mContext.getSystemService(AppOpsManager.class);

        if (Flags.cancelByAppops()) {

        mAppOps.startWatchingMode(AppOpsManager.OP_VIBRATE, null, mAppOpsChangeListener);

        }



        PowerManager pm = context.getSystemService(PowerManager.class);

        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "*vibrator*");

services/tests/vibrator/src/com/android/server/vibrator/VibratorManagerServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -809,7 +809,6 @@ public class VibratorManagerServiceTest { 
    }



    @Test

    @EnableFlags(android.os.vibrator.Flags.FLAG_CANCEL_BY_APPOPS)

    public void vibrate_thenDeniedAppOps_getsCancelled() throws Throwable {

        mockVibrators(1);

        VibratorManagerService service = createSystemReadyService();