From 6aa149a1aac77c32d0949ff20ff3a934651ed14f Mon Sep 17 00:00:00 2001
From: Kyle Cai <kylecai@google.com>
Date: Tue, 7 Jul 2020 07:19:23 -0700
Subject: Removing required line for privapp whitelist.

Bug: 159410756
Test: manual
Change-Id: I0c7f63c78998b6db0cebb11104c641f8aeb244bc
---
 Android.bp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index da9b552..3bccf46 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,4 @@ android_app {
 
     resource_dirs: [
     ],
-
-    required: ["privapp_whitelist_com.android.apppredictionservice"],
 }
-- 
cgit v1.2.3


From ee2d2f15cb5458756c4a882c5a2cd9a77b8b1034 Mon Sep 17 00:00:00 2001
From: Kyle Cai <kylecai@google.com>
Date: Mon, 10 Aug 2020 16:45:45 -0700
Subject: Adding new QUERY_ALL_PACKAGES permission in AndroidManifest.xml to
 allow querying of other apps by AppPredictionService.

Bug: 163420027
Test: Tested manually on blueline device.
Change-Id: I1984e6ee5fe6d491feefb761f9b27318a3bb1c51
---
 AndroidManifest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c85ddb6..058f991 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.apppredictionservice">
 
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
     <application>
         <service
             android:name=".PredictionService"
@@ -28,4 +30,5 @@
         </service>
 
     </application>
+
 </manifest>
-- 
cgit v1.2.3


From dfa61fa7345a727a57a98fb20c2751b5925042b1 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 12 Feb 2021 14:21:24 -0800
Subject: [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/OnDeviceAppPrediction

Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I4385153ad2a453fd9fd37b85f03980ecfaa19851
---
 Android.bp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Android.bp b/Android.bp
index 3bccf46..8cc7c32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_defaults {
     name: "apppredictionservice_defaults",
 
-- 
cgit v1.2.3