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

Commit e0c314a2 authored by sandeepbandaru's avatar sandeepbandaru Committed by Sandeep Bandaru
Browse files

Make ODI service config strings system api 

This is required to allow services.jar in mainline module to access the resource strings using the identifier.

Bug: 372658837
Flag: android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module
Change-Id: Ibfc5c39e865877df6a650385fb665a7882731853
parent f22a6ea2

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -520,6 +520,9 @@ package android { 
    field public static final int config_defaultCallScreening = 17039398; // 0x1040026

    field public static final int config_defaultDialer = 17039395; // 0x1040023

    field public static final int config_defaultNotes = 17039429; // 0x1040045

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceIntelligenceDeviceConfigNamespace;

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceIntelligenceService;

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence_module") public static final int config_defaultOnDeviceSandboxedInferenceService;

    field @FlaggedApi("android.permission.flags.cross_user_role_platform_api_enabled") public static final int config_defaultReservedForTestingProfileGroupExclusivity;

    field @FlaggedApi("android.permission.flags.retail_demo_role_enabled") public static final int config_defaultRetailDemo = 17039432; // 0x1040048

    field public static final int config_defaultSms = 17039396; // 0x1040024

core/res/res/values/public-staging.xml

+13 −0
Original line number Diff line number Diff line
@@ -157,6 +157,19 @@ 
    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED)

         @hide @SystemApi -->

    <public name="config_systemVendorIntelligence" />



    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

     @hide @SystemApi -->

    <public name="config_defaultOnDeviceIntelligenceService"></public>



    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

     @hide @SystemApi -->

    <public name="config_defaultOnDeviceSandboxedInferenceService"></public>



    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

     @hide @SystemApi -->

    <public name="config_defaultOnDeviceIntelligenceDeviceConfigNamespace"></public>



  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01b30000">

packages/NeuralNetworks/service/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java

+6 −23
Original line number Diff line number Diff line
@@ -760,13 +760,8 @@ public class OnDeviceIntelligenceManagerService extends SystemService { 
            if (mTemporaryConfigNamespace != null) {

                return mTemporaryConfigNamespace;

            }

            return mContext.getResources()

                    .getString(

                            mContext.getResources()

                                    .getIdentifier(

                                            "config_defaultOnDeviceIntelligenceDeviceConfigNamespace",

                                            "string",

                                            "android"));

            return mContext.getResources().getString(

                    android.R.string.config_defaultOnDeviceIntelligenceDeviceConfigNamespace);

        }

    }
@@ -948,22 +943,10 @@ public class OnDeviceIntelligenceManagerService extends SystemService { 
                return mTemporaryServiceNames;

            }

        }

        return new String[]{

                mContext.getResources()

                        .getString(

                        mContext.getResources()

                                .getIdentifier(

                                        "config_defaultOnDeviceIntelligenceService",

                                        "string",

                                        "android")),

                mContext.getResources()

                        .getString(

                        mContext.getResources()

                                .getIdentifier(

                                        "config_defaultOnDeviceSandboxedInferenceService",

                                        "string",

                                        "android"))

        };

        return new String[]{mContext.getResources().getString(

                android.R.string.config_defaultOnDeviceIntelligenceService),

                mContext.getResources().getString(

                        android.R.string.config_defaultOnDeviceSandboxedInferenceService)};

    }



    protected String[] getBroadcastKeys() throws Resources.NotFoundException {