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

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

Snap for 11992154 from 15fddab1 to 24Q4-release 

Change-Id: Ie62725b5750bf0cde38012b49c1d9b5853f196f9
parents 26adb9f0 15fddab1

core/java/android/app/AppCompatCallbacks.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDel 


    private void reportChange(long changeId, int state, boolean isLoggable) {

        int uid = Process.myUid();

        mChangeReporter.reportChange(uid, changeId, state, isLoggable);

        mChangeReporter.reportChange(uid, changeId, state, false, isLoggable);

    }



}

core/java/android/app/AutomaticZenRule.java

+17 −0
Original line number Diff line number Diff line
@@ -396,6 +396,23 @@ public final class AutomaticZenRule implements Parcelable { 
        mDeviceEffects = deviceEffects;

    }



    /**

     * Sets the component name of the

     * {@link android.service.notification.ConditionProviderService} that manages this rule

     * (but note that {@link android.service.notification.ConditionProviderService} is

     * deprecated in favor of using {@link NotificationManager#setAutomaticZenRuleState} to

     * notify the system about the state of your rule).

     *

     * <p>This is exclusive with {@link #setConfigurationActivity}; rules where a configuration

     * activity is set will not use the component set here to determine whether the rule

     * should be active.

     *

     * @hide

     */

    public void setOwner(@Nullable ComponentName owner) {

        this.owner = owner;

    }



    /**

     * Sets the configuration activity - an activity that handles

     * {@link NotificationManager#ACTION_AUTOMATIC_ZEN_RULE} that shows the user more information

core/java/android/content/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ per-file ComponentCallbacksController = file:/services/core/java/com/android/ser 
per-file ComponentCallbacksController = charlesccchen@google.com

per-file AttributionSource* = file:/core/java/android/permission/OWNERS

per-file Broadcast* = file:/BROADCASTS_OWNERS

per-file ComponentCallbacks*.java = file:/PERFORMANCE_OWNERS
 
 No newline at end of file

core/java/android/content/pm/dex/OWNERS

+2 −3
Original line number Diff line number Diff line 
# Bug component: 86431



toddke@android.com

toddke@google.com

patb@google.com

calin@google.com

ngeoffray@google.com

jiakaiz@google.com

mast@google.com

core/java/android/hardware/OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ michaelwr@google.com 
sumir@google.com



# Camera

per-file *Camera*=cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,yinchiayeh@google.com,zhijunhe@google.com,jchowdhary@google.com

per-file *Camera*=cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,zhijunhe@google.com,jchowdhary@google.com



# Sensor Privacy

per-file *SensorPrivacy* = file:platform/frameworks/native:/libs/sensorprivacy/OWNERS