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

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

Snap for 12406339 from 8eecb1a1 to 24Q4-release 

Change-Id: I4c0a687887bafddeeb0d8bb3b82e0c40e97cb819
parents 1627a8d1 8eecb1a1

PERFORMANCE_OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ shayba@google.com 
jdduke@google.com

shombert@google.com

kevinjeon@google.com

yforta@google.com

core/java/android/app/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ per-file GameState* = file:/GAME_MANAGER_OWNERS 
per-file IGameManager* = file:/GAME_MANAGER_OWNERS

per-file IGameMode* = file:/GAME_MANAGER_OWNERS

per-file BackgroundStartPrivileges.java = file:/BAL_OWNERS

per-file activity_manager.aconfig = file:/ACTIVITY_MANAGER_OWNERS



# ActivityThread

per-file ActivityThread.java = file:/services/core/java/com/android/server/am/OWNERS

core/java/android/permission/flags.aconfig

+9 −8
Original line number Diff line number Diff line
@@ -250,14 +250,6 @@ flag { 
    bug: "349942654"

}



flag {

    name: "replace_body_sensors_permission_enabled"

    is_exported: true

    namespace: "android_health_services"

    description: "This flag is used to enable replacing permission BODY_SENSORS(and BODY_SENSORS_BACKGROUND) with granular health permission READ_HEART_RATE(and READ_HEALTH_DATA_IN_BACKGROUND)"

    bug: "364638912"

}



flag {

    name: "appop_access_tracking_logging_enabled"

    is_fixed_read_only: true
@@ -265,3 +257,12 @@ flag { 
    description: "Enables logging of the AppOp access tracking"

    bug: "365584286"

}



flag {

    name: "replace_body_sensor_permission_enabled"

    is_fixed_read_only: true

    is_exported: true

    namespace: "android_health_services"

    description: "This fixed read-only flag is used to enable replacing permission BODY_SENSORS (and BODY_SENSORS_BACKGROUND) with granular health permission READ_HEART_RATE (and READ_HEALTH_DATA_IN_BACKGROUND)"

    bug: "364638912"

}

core/java/android/view/ViewRootImpl.java

+2 −7
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ import static android.window.flags.DesktopModeFlags.ENABLE_CAPTION_COMPAT_INSET_ 
import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE;

import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;

import static com.android.window.flags.Flags.enableBufferTransformHintFromDisplay;

import static com.android.window.flags.Flags.insetsControlChangedItem;

import static com.android.window.flags.Flags.insetsControlSeq;

import static com.android.window.flags.Flags.setScPropertiesInClient;

import static com.android.window.flags.Flags.systemUiImmersiveConfirmationDialog;
@@ -11519,12 +11518,8 @@ public final class ViewRootImpl implements ViewParent, 
        public void insetsControlChanged(InsetsState insetsState,

                InsetsSourceControl.Array activeControls) {

            final boolean isFromInsetsControlChangeItem;

            if (insetsControlChangedItem()) {

            isFromInsetsControlChangeItem = mIsFromTransactionItem;

            mIsFromTransactionItem = false;

            } else {

                isFromInsetsControlChangeItem = false;

            }

            final ViewRootImpl viewAncestor = mViewAncestor.get();

            if (viewAncestor == null) {

                if (isFromInsetsControlChangeItem) {

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ flag { 
    bug: "293658614"

}



flag {

    namespace: "windowing_sdk"

    name: "insets_control_changed_item"

    description: "Pass insetsControlChanged through ClientTransaction to fix the racing"

    bug: "339380439"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "insets_control_seq"