From 2836f984d0f1db54ade2ec5c2a418a4ea9ce3409 Mon Sep 17 00:00:00 2001
From: kholoud mohamed <kholoudm@google.com>
Date: Mon, 15 Feb 2021 17:33:55 +0000
Subject: [PATCH] Expose setBindAppWidgetPermission as a testAPI

This is needed to replace usage of the adb shell
command 'appwidget grantbind' in some cts tests with
TestAPIs.

Bug: 180328483
Test: N/A
Change-Id: Ie74149c2045e19261c77da2ffa757a803cc61d95
---
 core/api/test-current.txt                         | 8 ++++++++
 core/java/android/appwidget/AppWidgetManager.java | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index e39b2b8566619..03193551e8a24 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -577,6 +577,14 @@ package android.app.usage {
 
 }
 
+package android.appwidget {
+
+  public class AppWidgetManager {
+    method public void setBindAppWidgetPermission(@NonNull String, int, boolean);
+  }
+
+}
+
 package android.bluetooth {
 
   public final class BluetoothClass implements android.os.Parcelable {
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 37093a10b2f0c..d77dd6b74e7f7 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -23,6 +23,8 @@ import android.annotation.RequiresFeature;
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemService;
+import android.annotation.TestApi;
+import android.annotation.UserIdInt;
 import android.app.IServiceConnection;
 import android.app.PendingIntent;
 import android.compat.annotation.UnsupportedAppUsage;
@@ -1089,7 +1091,9 @@ public class AppWidgetManager {
      *
      * @hide
      */
-    public void setBindAppWidgetPermission(String packageName, int userId, boolean permission) {
+    @TestApi
+    public void setBindAppWidgetPermission(
+            @NonNull String packageName, @UserIdInt int userId, boolean permission) {
         if (mService == null) {
             return;
         }