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

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

Snap for 10951558 from 705e7fa0 to 24Q1-release 

Change-Id: I14c9795f7d64ec862e9c925df4d56c1a2aa1ab43
parents 6d9a2ca7 705e7fa0

core/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,7 @@ package android { 
    field public static final String REMOVE_DRM_CERTIFICATES = "android.permission.REMOVE_DRM_CERTIFICATES";

    field public static final String REMOVE_DRM_CERTIFICATES = "android.permission.REMOVE_DRM_CERTIFICATES";

    field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";

    field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";

    field public static final String RENOUNCE_PERMISSIONS = "android.permission.RENOUNCE_PERMISSIONS";

    field public static final String RENOUNCE_PERMISSIONS = "android.permission.RENOUNCE_PERMISSIONS";

    field public static final String REPORT_USAGE_STATS = "android.permission.REPORT_USAGE_STATS";

    field @FlaggedApi("backstage_power.report_usage_stats_permission") public static final String REPORT_USAGE_STATS = "android.permission.REPORT_USAGE_STATS";

    field @Deprecated public static final String REQUEST_NETWORK_SCORES = "android.permission.REQUEST_NETWORK_SCORES";

    field @Deprecated public static final String REQUEST_NETWORK_SCORES = "android.permission.REQUEST_NETWORK_SCORES";

    field public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE";

    field public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE";

    field public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD";

    field public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD";

core/java/android/app/usage/flags.aconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -7,3 +7,9 @@ flag { 
    bug: "296061232"

    bug: "296061232"

}

}





flag {

    name: "report_usage_stats_permission"

    namespace: "backstage_power"

    description: "Feature flag for the new REPORT_USAGE_STATS permission."

    bug: "296056771"

}

core/res/AndroidManifest.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -6122,7 +6122,9 @@ 
        android:protectionLevel="signature|privileged|development|appop|retailDemo" />

        android:protectionLevel="signature|privileged|development|appop|retailDemo" />

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />





    <!-- @SystemApi @hide Allows trusted system components to report events to UsageStatsManager -->

    <!-- @SystemApi @hide

         @FlaggedApi("backstage_power.report_usage_stats_permission")

         Allows trusted system components to report events to UsageStatsManager -->

    <permission android:name="android.permission.REPORT_USAGE_STATS"

    <permission android:name="android.permission.REPORT_USAGE_STATS"

                android:protectionLevel="signature|module" />

                android:protectionLevel="signature|module" />

packages/SystemUI/communal/layout/tests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ android_test { 
        "mockito-target-extended-minus-junit4",

        "mockito-target-extended-minus-junit4",

        "platform-test-annotations",

        "platform-test-annotations",

        "testables",

        "testables",

        "truth-prebuilt",

        "truth",

    ],

    ],

    libs: [

    libs: [

        "android.test.mock",

        "android.test.mock",

packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt

+9 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,10 @@ class ShadeExpansionStateManager @Inject constructor() : ShadeStateEvents { 
        listener.onShadeExpansionFullyChanged(qsExpanded)

        listener.onShadeExpansionFullyChanged(qsExpanded)

    }

    }





    fun removeFullExpansionListener(listener: ShadeFullExpansionListener) {

        fullExpansionListeners.remove(listener)

    }



    fun addQsExpansionListener(listener: ShadeQsExpansionListener) {

    fun addQsExpansionListener(listener: ShadeQsExpansionListener) {

        qsExpansionListeners.add(listener)

        qsExpansionListeners.add(listener)

        listener.onQsExpansionChanged(qsExpanded)

        listener.onQsExpansionChanged(qsExpanded)
@@ -95,6 +99,11 @@ class ShadeExpansionStateManager @Inject constructor() : ShadeStateEvents { 
        stateListeners.add(listener)

        stateListeners.add(listener)

    }

    }





    /** Removes a state listener. */

    fun removeStateListener(listener: ShadeStateListener) {

        stateListeners.remove(listener)

    }



    override fun addShadeStateEventsListener(listener: ShadeStateEventsListener) {

    override fun addShadeStateEventsListener(listener: ShadeStateEventsListener) {

        shadeStateEventsListeners.addIfAbsent(listener)

        shadeStateEventsListeners.addIfAbsent(listener)

    }

    }