diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 22 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | non-updatable-api/current.txt | 2 |
4 files changed, 38 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 049ce215b0dd..5d87ab192b58 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21,6 +21,7 @@ package android { field public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION"; field public static final String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL"; field public static final String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS"; + field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA"; field public static final String BATTERY_STATS = "android.permission.BATTERY_STATS"; field public static final String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; @@ -129,6 +130,7 @@ package android { field public static final String RECEIVE_SMS = "android.permission.RECEIVE_SMS"; field public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; + field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO"; field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS"; field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"; field public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 34543f13c166..5074df470410 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1244,8 +1244,19 @@ android:permissionGroup="android.permission-group.UNDEFINED" android:label="@string/permlab_recordAudio" android:description="@string/permdesc_recordAudio" + android:backgroundPermission="android.permission.RECORD_BACKGROUND_AUDIO" android:protectionLevel="dangerous|instant" /> + <!-- Allows an application to record audio while in the background. + <p>Protection level: dangerous + --> + <permission android:name="android.permission.RECORD_BACKGROUND_AUDIO" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_recordBackgroundAudio" + android:description="@string/permdesc_recordBackgroundAudio" + android:permissionFlags="hardRestricted" + android:protectionLevel="dangerous" /> + <!-- ====================================================================== --> <!-- Permissions for activity recognition --> <!-- ====================================================================== --> @@ -1313,8 +1324,19 @@ android:permissionGroup="android.permission-group.UNDEFINED" android:label="@string/permlab_camera" android:description="@string/permdesc_camera" + android:backgroundPermission="android.permission.BACKGROUND_CAMERA" android:protectionLevel="dangerous|instant" /> + <!-- Required to be able to access the camera device in the background. + <p>Protection level: dangerous + --> + <permission android:name="android.permission.BACKGROUND_CAMERA" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_backgroundCamera" + android:description="@string/permdesc_backgroundCamera" + android:permissionFlags="hardRestricted" + android:protectionLevel="dangerous" /> + <!-- @SystemApi Required in addition to android.permission.CAMERA to be able to access system only camera devices. <p>Protection level: system|signature diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 25a9bbd8b445..fc489b1bbe9b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1166,7 +1166,12 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_recordAudio">record audio</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_recordAudio">This app can record audio using the microphone at any time.</string> + <string name="permdesc_recordAudio">This app can record audio using the microphone while the app is in use.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] --> + <string name="permlab_recordBackgroundAudio">record audio in the background</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] --> + <string name="permdesc_recordBackgroundAudio">This app can record audio using the microphone at any time.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_sim_communication">send commands to the SIM</string> @@ -1181,7 +1186,12 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_camera">take pictures and videos</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_camera">This app can take pictures and record videos using the camera at any time.</string> + <string name="permdesc_camera">This app can take pictures and record videos using the camera while the app is in use.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] --> + <string name="permlab_backgroundCamera">take pictures and videos in the background</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] --> + <string name="permdesc_backgroundCamera">This app can take pictures and record videos using the camera at any time.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] --> <string name="permlab_systemCamera">Allow an application or service access to system cameras to take pictures and videos</string> diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 739895e6be1a..6a9dc2df612c 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -21,6 +21,7 @@ package android { field public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION"; field public static final String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL"; field public static final String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS"; + field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA"; field public static final String BATTERY_STATS = "android.permission.BATTERY_STATS"; field public static final String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; @@ -129,6 +130,7 @@ package android { field public static final String RECEIVE_SMS = "android.permission.RECEIVE_SMS"; field public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; + field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO"; field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS"; field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"; field public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"; |