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

Commit 9375261e authored by Sandeep Bandaru's avatar Sandeep Bandaru Committed by Android (Google) Code Review
Browse files

Merge "Adding permissions and flag changes required... 

Merge "Adding permissions and flag changes required OnDeviceIntelligenceManager SystemApi" into main
parents 36a3df8f 2369b694

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ aconfig_declarations_group { 
        "aconfig_mediacodec_flags_java_lib",

        "android.adaptiveauth.flags-aconfig-java",

        "android.app.flags-aconfig-java",

        "android.app.ondeviceintelligence-aconfig-java",

        "android.app.smartspace.flags-aconfig-java",

        "android.app.usage.flags-aconfig-java",

        "android.app.wearable.flags-aconfig-java",
@@ -545,6 +546,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OnDeviceIntelligence

aconfig_declarations {

    name: "android.app.ondeviceintelligence-aconfig",

    package: "android.app.ondeviceintelligence.flags",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}



java_aconfig_library {

    name: "android.app.ondeviceintelligence-aconfig-java",

    aconfig_declarations: "android.app.ondeviceintelligence-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ package android { 
    field public static final String BIND_MUSIC_RECOGNITION_SERVICE = "android.permission.BIND_MUSIC_RECOGNITION_SERVICE";

    field public static final String BIND_NETWORK_RECOMMENDATION_SERVICE = "android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE";

    field public static final String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_INTELLIGENCE_SERVICE = "android.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_TRUSTED_SERVICE = "android.permission.BIND_ON_DEVICE_TRUSTED_SERVICE";

    field public static final String BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE = "android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE";

    field public static final String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";

    field public static final String BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE = "android.permission.BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE";
@@ -403,6 +405,7 @@ package android { 
    field public static final String USER_ACTIVITY = "android.permission.USER_ACTIVITY";

    field @FlaggedApi("android.hardware.biometrics.face_background_authentication") public static final String USE_BACKGROUND_FACE_AUTHENTICATION = "android.permission.USE_BACKGROUND_FACE_AUTHENTICATION";

    field public static final String USE_COLORIZED_NOTIFICATIONS = "android.permission.USE_COLORIZED_NOTIFICATIONS";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String USE_ON_DEVICE_INTELLIGENCE = "android.permission.USE_ON_DEVICE_INTELLIGENCE";

    field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";

    field public static final String UWB_PRIVILEGED = "android.permission.UWB_PRIVILEGED";

    field public static final String WHITELIST_AUTO_REVOKE_PERMISSIONS = "android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS";

core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.app.ondeviceintelligence.flags"



flag {

    name: "enable_on_device_intelligence"

    namespace: "ondeviceintelligence"

    description: "Make methods on OnDeviceIntelligenceManager available for local inference."

    bug: "304755128"

}

core/res/AndroidManifest.xml

+27 −0
Original line number Diff line number Diff line
@@ -7937,6 +7937,33 @@ 
    <permission android:name="android.permission.MANAGE_WEARABLE_SENSING_SERVICE"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an app to use the on-device intelligence service.

             <p>Protection level: signature|privileged

             @hide

         @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence")

        -->

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

        android:protectionLevel="signature|privileged" />





    <!-- @SystemApi Allows an app to bind the on-device intelligence service.

             <p>Protection level: signature|privileged

             @hide

         @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence")

        -->

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

        android:protectionLevel="signature|privileged" />





    <!-- @SystemApi Allows an app to bind the on-device trusted service.

             <p>Protection level: signature|privileged

             @hide

         @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence")

        -->

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

        android:protectionLevel="signature"/>





    <!-- Allows applications to use the user-initiated jobs API. For more details

         see {@link android.app.job.JobInfo.Builder#setUserInitiated}.

         <p>Protection level: normal