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

Commit acb30f8e authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix typos in various code places" into udc-dev am: 4e49e2f7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21534753



Change-Id: Iaa11fb16dae3bfb500c217543512900f683c4c6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 138b994c 4e49e2f7

core/java/android/content/pm/ServiceInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -361,7 +361,7 @@ public class ServiceInfo extends ComponentInfo 
    /**

    /**

     * Constant corresponding to {@code systemExempted} in

     * Constant corresponding to {@code systemExempted} in

     * the {@link android.R.attr#foregroundServiceType} attribute.

     * the {@link android.R.attr#foregroundServiceType} attribute.

     * The system exmpted foreground service use cases.

     * The system exempted foreground service use cases.

     *

     *

     * <p class="note">Note, apps are allowed to use this type only in the following cases:

     * <p class="note">Note, apps are allowed to use this type only in the following cases:

     * <ul>

     * <ul>

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1714,7 +1714,7 @@ 
            this type.

            this type.

        -->

        -->

        <flag name="remoteMessaging" value="0x200" />

        <flag name="remoteMessaging" value="0x200" />

        <!-- The system exmpted foreground service use cases.

        <!-- The system exempted foreground service use cases.

            <p>Requires the app to hold the permission

            <p>Requires the app to hold the permission

            {@link android.Manifest.permission#FOREGROUND_SERVICE_SYSTEM_EXEMPTED} in order to use

            {@link android.Manifest.permission#FOREGROUND_SERVICE_SYSTEM_EXEMPTED} in order to use

            this type. Apps are allowed to use this type only in the use cases listed in

            this type. Apps are allowed to use this type only in the use cases listed in

services/core/java/com/android/server/am/AppBatteryTracker.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1388,7 +1388,7 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
        final int mDefaultBgCurrentDrainPowerComponent;

        final int mDefaultBgCurrentDrainPowerComponent;





        /**

        /**

         * Default value to {@link #mBgCurrentDrainExmptedTypes}.

         * Default value to {@link #mBgCurrentDrainExemptedTypes}.

         **/

         **/

        final int mDefaultBgCurrentDrainExemptedTypes;

        final int mDefaultBgCurrentDrainExemptedTypes;