Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Revert "Keep a light version of the SBN around"
Put notification demotion behind flag
Change-Id: I2272f89db80f663d788071f7e3b1b84a55136729
diff --git a/Android.bp b/Android.bp
index 7aaa17d..8bb1d2a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@
],
manifest: "AndroidManifest.xml",
+
+ plugins: ["java_api_finder"],
}
android_app {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c3f6a65..6707e78 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
package="android.ext.services"
- android:versionCode="290000000"
+ android:versionCode="299900000"
android:versionName="2019-09"
coreApp="true">
diff --git a/res/drawable/ic_action_open.xml b/res/drawable/ic_action_open.xml
new file mode 100644
index 0000000..59cca42
--- /dev/null
+++ b/res/drawable/ic_action_open.xml
@@ -0,0 +1,26 @@
+<!--
+Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ >
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
+</vector>
diff --git a/res/drawable/ic_menu_copy_material.xml b/res/drawable/ic_menu_copy_material.xml
new file mode 100644
index 0000000..e352003
--- /dev/null
+++ b/res/drawable/ic_menu_copy_material.xml
@@ -0,0 +1,26 @@
+<!--
+Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:autoMirrored="true"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M16,1L4,1C2.9,1 2,1.9 2,3l0,14l2,0L4,3l12,0L16,1zM19,5L8,5C6.9,5 6,5.9 6,7l0,14c0,1.1 0.9,2 2,2l11,0c1.1,0 2,-0.9 2,-2L21,7C21,5.9 20.1,5 19,5zM19,21L8,21L8,7l11,0L19,21z"
+ android:fillColor="@android:color/white"/>
+</vector>
diff --git a/src/android/ext/services/notification/SmartActionsHelper.java b/src/android/ext/services/notification/SmartActionsHelper.java
index 93c522e..1da473c 100644
--- a/src/android/ext/services/notification/SmartActionsHelper.java
+++ b/src/android/ext/services/notification/SmartActionsHelper.java
@@ -179,9 +179,8 @@
Intent intent = new Intent(mContext, CopyCodeActivity.class);
intent.putExtra(Intent.EXTRA_TEXT, code);
- RemoteAction remoteAction = new RemoteAction(Icon.createWithResource(
- mContext.getResources(),
- com.android.internal.R.drawable.ic_menu_copy_material),
+ RemoteAction remoteAction = new RemoteAction(
+ Icon.createWithResource(mContext, R.drawable.ic_menu_copy_material),
code,
contentDescription,
PendingIntent.getActivity(
@@ -366,7 +365,7 @@
RemoteAction remoteAction, String actionType, float score) {
Icon icon = remoteAction.shouldShowIcon()
? remoteAction.getIcon()
- : Icon.createWithResource(mContext, com.android.internal.R.drawable.ic_action_open);
+ : Icon.createWithResource(mContext, R.drawable.ic_action_open);
Bundle extras = new Bundle();
extras.putString(KEY_ACTION_TYPE, actionType);
extras.putFloat(KEY_ACTION_SCORE, score);