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

Commit 56e50bde authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up @FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE)" into main

parents 2a6a9e1d 660095ae

core/api/system-current.txt

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

    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_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 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 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_SANDBOXED_INFERENCE_SERVICE = "android.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE";

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

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

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

    field @FlaggedApi("android.location.flags.population_density_provider") public static final String BIND_POPULATION_DENSITY_PROVIDER_SERVICE = "android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE";

    field @FlaggedApi("android.location.flags.population_density_provider") public static final String BIND_POPULATION_DENSITY_PROVIDER_SERVICE = "android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE";

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

    field public static final String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";
@@ -445,7 +445,7 @@ package android { 
    field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS";

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

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

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

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

    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_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 USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";

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

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

    field @FlaggedApi("android.os.vibrator.vendor_vibration_effects") public static final String VIBRATE_VENDOR_EFFECTS = "android.permission.VIBRATE_VENDOR_EFFECTS";

    field @FlaggedApi("android.os.vibrator.vendor_vibration_effects") public static final String VIBRATE_VENDOR_EFFECTS = "android.permission.VIBRATE_VENDOR_EFFECTS";
@@ -3983,7 +3983,7 @@ package android.content { 
    field public static final String NETD_SERVICE = "netd";

    field public static final String NETD_SERVICE = "netd";

    field @Deprecated public static final String NETWORK_SCORE_SERVICE = "network_score";

    field @Deprecated public static final String NETWORK_SCORE_SERVICE = "network_score";

    field public static final String OEM_LOCK_SERVICE = "oem_lock";

    field public static final String OEM_LOCK_SERVICE = "oem_lock";

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

    field public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";

    field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";

    field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";

    field public static final String PERMISSION_SERVICE = "permission";

    field public static final String PERMISSION_SERVICE = "permission";

    field @FlaggedApi("com.android.ranging.flags.ranging_stack_enabled") public static final String RANGING_SERVICE = "ranging";

    field @FlaggedApi("com.android.ranging.flags.ranging_stack_enabled") public static final String RANGING_SERVICE = "ranging";

core/java/android/content/Context.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -6824,7 +6824,6 @@ public abstract class Context { 
     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE)

    public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";

    public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";





    /**

    /**

core/res/AndroidManifest.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -8887,7 +8887,6 @@ 
    <!-- @SystemApi Allows an app to use the on-device intelligence service.

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

             <p>Protection level: signature|privileged

             <p>Protection level: signature|privileged

             @hide

             @hide

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

        -->

        -->

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

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

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="signature|privileged" />
@@ -8896,7 +8895,6 @@ 
    <!-- @SystemApi Allows an app to bind the on-device intelligence service.

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

             <p>Protection level: signature|privileged

             <p>Protection level: signature|privileged

             @hide

             @hide

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

        -->

        -->

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

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

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="signature|privileged" />
@@ -8905,7 +8903,6 @@ 
    <!-- @SystemApi Allows an app to bind the on-device sandboxed service.

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

             <p>Protection level: signature|privileged

             <p>Protection level: signature|privileged

             @hide

             @hide

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

        -->

        -->

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

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

        android:protectionLevel="signature"/>

        android:protectionLevel="signature"/>

lint-baseline.xml

+0 −44
Original line number Original line Diff line number Diff line
@@ -9296,50 +9296,6 @@ 
            column="32"/>

            column="32"/>

    </issue>

    </issue>

















    <issue














        id="FlaggedApi"














        message="Class `OnDeviceIntelligenceManager` is a flagged API and should be inside an `if (Flags.enableOnDeviceIntelligence())` check (or annotate the surrounding method `?` with `@FlaggedApi(Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE) to transfer requirement to caller`)"














        errorLine1="        registerService(Context.ON_DEVICE_INTELLIGENCE_SERVICE, OnDeviceIntelligenceManager.class,"














        errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">














        <location














            file="frameworks/base/core/java/android/app/SystemServiceRegistry.java"














            line="1638"














            column="65"/>














    </issue>



























    <issue














        id="FlaggedApi"














        message="Field `ON_DEVICE_INTELLIGENCE_SERVICE` is a flagged API and should be inside an `if (Flags.enableOnDeviceIntelligence())` check (or annotate the surrounding method `?` with `@FlaggedApi(Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE) to transfer requirement to caller`)"














        errorLine1="        registerService(Context.ON_DEVICE_INTELLIGENCE_SERVICE, OnDeviceIntelligenceManager.class,"














        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">














        <location














            file="frameworks/base/core/java/android/app/SystemServiceRegistry.java"














            line="1638"














            column="33"/>














    </issue>



























    <issue














        id="FlaggedApi"














        message="Field `ON_DEVICE_INTELLIGENCE_SERVICE` is a flagged API and should be inside an `if (Flags.enableOnDeviceIntelligence())` check (or annotate the surrounding method `createService` with `@FlaggedApi(Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE) to transfer requirement to caller`)"














        errorLine1="                                Context.ON_DEVICE_INTELLIGENCE_SERVICE);"














        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">














        <location














            file="frameworks/base/core/java/android/app/SystemServiceRegistry.java"














            line="1644"














            column="41"/>














    </issue>



























    <issue














        id="FlaggedApi"














        message="Method `OnDeviceIntelligenceManager()` is a flagged API and should be inside an `if (Flags.enableOnDeviceIntelligence())` check (or annotate the surrounding method `createService` with `@FlaggedApi(Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE) to transfer requirement to caller`)"














        errorLine1="                        return new OnDeviceIntelligenceManager(ctx.getOuterContext(), manager);"














        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">














        <location














            file="frameworks/base/core/java/android/app/SystemServiceRegistry.java"














            line="1647"














            column="32"/>














    </issue>



























    <issue







    <issue











        id="FlaggedApi"







        id="FlaggedApi"











        message="Class `E2eeContactKeysManager` is a flagged API and should be inside an `if (Flags.userKeys())` check (or annotate the surrounding method `?` with `@FlaggedApi(Flags.FLAG_USER_KEYS) to transfer requirement to caller`)"







        message="Class `E2eeContactKeysManager` is a flagged API and should be inside an `if (Flags.userKeys())` check (or annotate the surrounding method `?` with `@FlaggedApi(Flags.FLAG_USER_KEYS) to transfer requirement to caller`)"

























packages/NeuralNetworks/framework/module/java/android/app/ondeviceintelligence/DownloadCallback.java



+0
−4




























Original line number
Original line
Diff line number
Diff line








@@ -16,9 +16,6 @@





























package android.app.ondeviceintelligence;







package android.app.ondeviceintelligence;































import static android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE;





























import android.annotation.FlaggedApi;














import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;











import android.annotation.SystemApi;







import android.annotation.SystemApi;









@@ -35,7 +32,6 @@ import java.lang.annotation.RetentionPolicy;









 * @hide







 * @hide











 */







 */











@SystemApi







@SystemApi











@FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE)














public interface DownloadCallback {







public interface DownloadCallback {











    int DOWNLOAD_FAILURE_STATUS_UNKNOWN = 0;







    int DOWNLOAD_FAILURE_STATUS_UNKNOWN = 0;