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

Commit 343a5cb3 authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Add android:featureFlag attribute to VIBRATE_VENDOR_EFFECTS permission" into main

parents 651a51fb b13beced

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ android_app { 
        "com.android.window.flags.window-aconfig",

        "android.permission.flags-aconfig",

        "android.os.flags-aconfig",

        "android.os.vibrator.flags-aconfig",

        "android.media.tv.flags-aconfig",

    ],

}

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -2617,7 +2617,8 @@ 
         @hide

    -->

    <permission android:name="android.permission.VIBRATE_VENDOR_EFFECTS"

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="signature|privileged"

        android:featureFlag="android.os.vibrator.vendor_vibration_effects" />



    <!-- @SystemApi Allows access to the vibrator state.

         <p>Protection level: signature