diff --git a/api/current.txt b/api/current.txt index 0b6af293f6670..9269d979104f7 100755 --- a/api/current.txt +++ b/api/current.txt @@ -17,6 +17,7 @@ package android { field public static final java.lang.String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY"; field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE"; field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER"; + field public static final java.lang.String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION"; field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL"; field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS"; field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS"; @@ -168,6 +169,7 @@ package android { public static final class Manifest.permission_group { ctor public Manifest.permission_group(); + field public static final java.lang.String ACTIVITY_RECOGNITION = "android.permission-group.ACTIVITY_RECOGNITION"; field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR"; field public static final java.lang.String CALL_LOG = "android.permission-group.CALL_LOG"; field public static final java.lang.String CAMERA = "android.permission-group.CAMERA"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index d2c00f2a9547b..e5044aa7704c9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1150,6 +1150,28 @@ android:description="@string/permdesc_recordAudio" android:protectionLevel="dangerous|instant"/> + + + + + + + + + + + diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 6bf893d94ce51..fa4406185218f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -734,6 +734,14 @@ Allow <b>%1$s</b> to record audio? + + Activity recognition + + recognize activity + + Allow + <b>%1$s</b> to recognize your physical activity? + Camera @@ -1151,6 +1159,11 @@ Allows the app to send commands to the SIM. This is very dangerous. + + recognize physical activity + + This app can recognize your physical activity. + take pictures and videos