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

Commit 8c98e68c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11623990 from cb80e56a to 24Q3-release 

Change-Id: I18311715acc932b56478e23f8065a6da790425dd
parents 71dd46e5 cb80e56a

core/api/system-current.txt

+12 −12
Original line number Diff line number Diff line
@@ -13483,12 +13483,12 @@ package android.service.voice { 
    method public static int getMaxBundleSize();

    method public static int getMaxHotwordPhraseId();

    method public static int getMaxScore();

    method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") public static int getMaxSpeakerId();

    method public static int getMaxSpeakerId();

    method @Nullable public android.media.MediaSyncEvent getMediaSyncEvent();

    method public int getPersonalizedScore();

    method public int getProximity();

    method public int getScore();

    method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") public int getSpeakerId();

    method public int getSpeakerId();

    method public boolean isHotwordDetectionPersonalized();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field public static final int AUDIO_CHANNEL_UNSET = -1; // 0xffffffff
@@ -13522,7 +13522,7 @@ package android.service.voice { 
    method @NonNull public android.service.voice.HotwordDetectedResult.Builder setMediaSyncEvent(@NonNull android.media.MediaSyncEvent);

    method @NonNull public android.service.voice.HotwordDetectedResult.Builder setPersonalizedScore(int);

    method @NonNull public android.service.voice.HotwordDetectedResult.Builder setScore(int);

    method @FlaggedApi("android.service.voice.flags.allow_speaker_id_egress") @NonNull public android.service.voice.HotwordDetectedResult.Builder setSpeakerId(int);

    method @NonNull public android.service.voice.HotwordDetectedResult.Builder setSpeakerId(int);

  }















  public abstract class HotwordDetectionService extends android.app.Service implements android.service.voice.SandboxedDetectionInitializer {










@@ -13621,7 +13621,7 @@ package android.service.voice {













    field public static final int ERROR_CODE_UNKNOWN = 0; // 0x0















  }



























  @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final class VisualQueryAttentionResult implements android.os.Parcelable {













  public final class VisualQueryAttentionResult implements android.os.Parcelable {















    method public int describeContents();















    method @IntRange(from=1, to=100) public int getEngagementLevel();















    method public int getInteractionIntention();









@@ -13638,7 +13638,7 @@ package android.service.voice {













    method @NonNull public android.service.voice.VisualQueryAttentionResult.Builder setInteractionIntention(int);















  }



























  @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public final class VisualQueryDetectedResult implements android.os.Parcelable {













  public final class VisualQueryDetectedResult implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public byte[] getAccessibilityDetectionData();















    method public static int getMaxSpeakerId();









@@ -13660,16 +13660,16 @@ package android.service.voice {













    ctor public VisualQueryDetectionService();















    method public final void finishQuery() throws java.lang.IllegalStateException;















    method public final void gainedAttention();













    method @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final void gainedAttention(@NonNull android.service.voice.VisualQueryAttentionResult);













    method public final void gainedAttention(@NonNull android.service.voice.VisualQueryAttentionResult);















    method public final void lostAttention();













    method @FlaggedApi("android.service.voice.flags.allow_various_attention_types") public final void lostAttention(int);













    method public final void lostAttention(int);















    method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);















    method public void onStartDetection();















    method public void onStopDetection();















    method public void onUpdateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, long, @Nullable java.util.function.IntConsumer);















    method public final void rejectQuery() throws java.lang.IllegalStateException;















    method public final void streamQuery(@NonNull String) throws java.lang.IllegalStateException;













    method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public final void streamQuery(@NonNull android.service.voice.VisualQueryDetectedResult);













    method public final void streamQuery(@NonNull android.service.voice.VisualQueryDetectedResult);















    field public static final String SERVICE_INTERFACE = "android.service.voice.VisualQueryDetectionService";















  }























@@ -13689,10 +13689,10 @@ package android.service.voice {













  }





























  public class VisualQueryDetector {













    method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public void clearAccessibilityDetectionEnabledListener();













    method public void clearAccessibilityDetectionEnabledListener();















    method public void destroy();













    method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public boolean isAccessibilityDetectionEnabled();













    method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public void setAccessibilityDetectionEnabledListener(@NonNull java.util.function.Consumer<java.lang.Boolean>);













    method public boolean isAccessibilityDetectionEnabled();













    method public void setAccessibilityDetectionEnabledListener(@NonNull java.util.function.Consumer<java.lang.Boolean>);















    method @RequiresPermission(allOf={android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO}) public boolean startRecognition();















    method @RequiresPermission(allOf={android.Manifest.permission.CAMERA, android.Manifest.permission.RECORD_AUDIO}) public boolean stopRecognition();















    method public void updateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory);









@@ -13701,7 +13701,7 @@ package android.service.voice {













  public static interface VisualQueryDetector.Callback {















    method public void onFailure(@NonNull android.service.voice.VisualQueryDetectionServiceFailure);















    method public void onQueryDetected(@NonNull String);













    method @FlaggedApi("android.service.voice.flags.allow_complex_results_egress_from_vqds") public default void onQueryDetected(@NonNull android.service.voice.VisualQueryDetectedResult);













    method public default void onQueryDetected(@NonNull android.service.voice.VisualQueryDetectedResult);















    method public void onQueryFinished();















    method public void onQueryRejected();















    method public void onUnknownFailure(@NonNull String);

























core/java/android/app/ActivityThread.java



+10
−11






























Original line number
Diff line number
Diff line








@@ -607,9 +607,9 @@ public final class ActivityThread extends ClientTransactionHandler













        Configuration createdConfig;















        Configuration overrideConfig;















        @NonNull













        private ActivityWindowInfo mActivityWindowInfo;













        @Nullable













        private ActivityWindowInfo mLastReportedActivityWindowInfo;













        private final ActivityWindowInfo mActivityWindowInfo = new ActivityWindowInfo();













        @NonNull













        private final ActivityWindowInfo mLastReportedActivityWindowInfo = new ActivityWindowInfo();































        // Used for consolidating configs before sending on to Activity.















        private final Configuration tmpConfig = new Configuration();










@@ -700,7 +700,7 @@ public final class ActivityThread extends ClientTransactionHandler













            mSceneTransitionInfo = sceneTransitionInfo;















            mLaunchedFromBubble = launchedFromBubble;















            mTaskFragmentToken = taskFragmentToken;













            mActivityWindowInfo = activityWindowInfo;













            mActivityWindowInfo.set(activityWindowInfo);















            init();















        }

























@@ -720,7 +720,7 @@ public final class ActivityThread extends ClientTransactionHandler













                        throw new IllegalStateException(















                                "Received config update for non-existing activity");















                    }













                    if (activityWindowInfoFlag() && activityWindowInfo == null) {













                    if (activityWindowInfo == null) {















                        Log.w(TAG, "Received empty ActivityWindowInfo update for r=" + activity);















                        activityWindowInfo = mActivityWindowInfo;















                    }










@@ -6063,7 +6063,7 @@ public final class ActivityThread extends ClientTransactionHandler













            target.createdConfig = config.getGlobalConfiguration();















            target.overrideConfig = config.getOverrideConfiguration();















            target.pendingConfigChanges |= configChanges;













            target.mActivityWindowInfo = activityWindowInfo;













            target.mActivityWindowInfo.set(activityWindowInfo);















        }































        return scheduleRelaunch ? target : null;










@@ -6257,7 +6257,7 @@ public final class ActivityThread extends ClientTransactionHandler













        }















        r.startsNotResumed = startsNotResumed;















        r.overrideConfig = overrideConfig;













        r.mActivityWindowInfo = activityWindowInfo;













        r.mActivityWindowInfo.set(activityWindowInfo);































        handleLaunchActivity(r, pendingActions, mLastReportedDeviceId, customIntent);















    }










@@ -6759,7 +6759,7 @@ public final class ActivityThread extends ClientTransactionHandler





























        // Perform updates.















        r.overrideConfig = overrideConfig;













        r.mActivityWindowInfo = activityWindowInfo;













        r.mActivityWindowInfo.set(activityWindowInfo);































        final ViewRootImpl viewRoot = r.activity.mDecor != null















            ? r.activity.mDecor.getViewRootImpl() : null;










@@ -6792,11 +6792,10 @@ public final class ActivityThread extends ClientTransactionHandler













        if (!activityWindowInfoFlag()) {















            return;















        }













        if (r.mActivityWindowInfo == null













                || r.mActivityWindowInfo.equals(r.mLastReportedActivityWindowInfo)) {













        if (r.mActivityWindowInfo.equals(r.mLastReportedActivityWindowInfo)) {















            return;















        }













        r.mLastReportedActivityWindowInfo = r.mActivityWindowInfo;













        r.mLastReportedActivityWindowInfo.set(r.mActivityWindowInfo);















        ClientTransactionListenerController.getInstance().onActivityWindowInfoChanged(r.token,















                r.mActivityWindowInfo);















    }

































core/java/android/app/Notification.java



+19
−4






























Original line number
Diff line number
Diff line








@@ -24,6 +24,7 @@ import static android.app.admin.DevicePolicyResources.UNDEFINED;













import static android.graphics.drawable.Icon.TYPE_URI;















import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP;















import static android.app.Flags.evenlyDividedCallStyleActionLayout;













import static android.app.Flags.updateRankingTime;





























import static java.util.Objects.requireNonNull;
























@@ -339,8 +340,9 @@ public class Notification implements Parcelable



























    /**















     * The creation time of the notification













     * @hide















     */













    private long creationTime;













    public long creationTime;





























    /**















     * The resource id of a drawable to use as the icon in the status bar.










@@ -2578,7 +2580,11 @@ public class Notification implements Parcelable













    public Notification()















    {















        this.when = System.currentTimeMillis();













        if (updateRankingTime()) {













            creationTime = when;













        } else {















            this.creationTime = System.currentTimeMillis();













        }















        this.priority = PRIORITY_DEFAULT;















    }























@@ -2589,6 +2595,9 @@ public class Notification implements Parcelable













    public Notification(Context context, int icon, CharSequence tickerText, long when,















            CharSequence contentTitle, CharSequence contentText, Intent contentIntent)















    {













        if (updateRankingTime()) {













            creationTime = when;













        }















        new Builder(context)















                .setWhen(when)















                .setSmallIcon(icon)










@@ -2618,8 +2627,12 @@ public class Notification implements Parcelable













        this.icon = icon;















        this.tickerText = tickerText;















        this.when = when;













        if (updateRankingTime()) {













            creationTime = when;













        } else {















            this.creationTime = System.currentTimeMillis();















        }













    }





























    /**















     * Unflatten the notification from a parcel.










@@ -6843,7 +6856,9 @@ public class Notification implements Parcelable













                }















            }



























            if (!updateRankingTime()) {















                mN.creationTime = System.currentTimeMillis();













            }





























            // lazy stuff from mContext; see comment in Builder(Context, Notification)















            Notification.addFieldsFromContext(mContext, mN);

































core/java/android/app/notification.aconfig



+10
−0






























Original line number
Diff line number
Diff line








@@ -72,3 +72,13 @@ flag {













    purpose: PURPOSE_BUGFIX















  }















}



























flag {













  name: "update_ranking_time"













  namespace: "systemui"













  description: "Updates notification sorting criteria to highlight new content while maintaining stability"













  bug: "326016985"













  metadata {













    purpose: PURPOSE_BUGFIX













  }













}










 No newline at end of file
























core/java/android/app/servertransaction/ClientTransactionListenerController.java



+1
−1






























Original line number
Diff line number
Diff line








@@ -122,7 +122,7 @@ public class ClientTransactionListenerController {













        }















        for (Object activityWindowInfoChangedListener : activityWindowInfoChangedListeners) {















            ((BiConsumer<IBinder, ActivityWindowInfo>) activityWindowInfoChangedListener)













                    .accept(activityToken, activityWindowInfo);













                    .accept(activityToken, new ActivityWindowInfo(activityWindowInfo));















        }















    }