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

Commit d1e37e09 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Improve javadoc on REQUEST_COMPANION_RUN_IN_BACKGROUND." into sc-dev... 

Merge "Improve javadoc on REQUEST_COMPANION_RUN_IN_BACKGROUND." into sc-dev am: a7aa1caa am: 8db523a0 am: c24d1357

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

Change-Id: I8f7e9964a6e1ce67f1f892fb4829ccd4f54fe5f7
parents eae758d8 c24d1357

core/res/AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -2890,7 +2890,13 @@ 
    <permission android:name="android.permission.SET_DISPLAY_OFFSET"

        android:protectionLevel="signature|privileged" />



    <!-- Allows a companion app to run in the background.

    <!-- Allows a companion app to run in the background. This permission implies

         {@link android.Manifest.permission#REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND},

         and allows to start a foreground service from the background.

         If an app does not have to run in the background, but only needs to start a foreground

         service from the background, consider using

         {@link android.Manifest.permission#REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND},

         which is less powerful.

         <p>Protection level: normal

    -->

    <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"
@@ -2900,6 +2906,7 @@ 


    <!-- Allows a companion app to start a foreground service from the background.

         {@see android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}

         <p>Protection level: normal

         -->

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

        android:protectionLevel="normal"/>