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

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

Merge "Update flag for getLatestInferenceInfo to 25q4 specific" into main

parents 325f9225 81bc786e

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.app.ondeviceintelligence;



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

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

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



import android.Manifest;

import android.annotation.CallbackExecutor;
@@ -533,7 +533,7 @@ public final class OnDeviceIntelligenceManager { 
     * @return InferenceInfo events since the passed in startTimeEpochMillis.

     */

    @RequiresPermission(Manifest.permission.DUMP)

    @FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

    @FlaggedApi(FLAG_ON_DEVICE_INTELLIGENCE_25Q4)

    public @NonNull List<InferenceInfo> getLatestInferenceInfo(@CurrentTimeMillisLong long startTimeEpochMillis) {

        try {

            return mService.getLatestInferenceInfo(startTimeEpochMillis);

packages/NeuralNetworks/framework/platform/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.app.ondeviceintelligence;



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

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

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



import android.Manifest;

import android.annotation.CallbackExecutor;
@@ -505,7 +505,7 @@ public final class OnDeviceIntelligenceManager { 
     * @return InferenceInfo events since the passed in startTimeEpochMillis.

     */

    @RequiresPermission(Manifest.permission.DUMP)

    @FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)

    @FlaggedApi(FLAG_ON_DEVICE_INTELLIGENCE_25Q4)

    public @NonNull List<InferenceInfo> getLatestInferenceInfo(@CurrentTimeMillisLong long startTimeEpochMillis) {

        try {

            return mService.getLatestInferenceInfo(startTimeEpochMillis);