am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte

* commit '79f25bedd2ed13613323b085b46b9b42aee21696':
  Add LauncherCallbacks for requesting permissions on MNC

3 files changed, 16 insertions, 0 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 98aae8f1a..0a20fa48d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -871,6 +871,15 @@ public class Launcher extends Activity
         }
     }
 
+    /** @Override for MNC */
+    protected void onRequestPermissionsResult(int requestCode, String[] permissions,
+            int[] grantResults) {
+        if (mLauncherCallbacks != null) {
+            mLauncherCallbacks.onRequestPermissionsResult(requestCode, permissions,
+                    grantResults);
+        }
+    }
+
     private PendingAddArguments preparePendingAddArgs(int requestCode, Intent data, int
             appWidgetId, ItemInfo info) {
         PendingAddArguments args = new PendingAddArguments();
diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index 49d6d68e5..6618cca78 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -40,6 +40,8 @@ public interface LauncherCallbacks {
     public void onPostCreate(Bundle savedInstanceState);
     public void onNewIntent(Intent intent);
     public void onActivityResult(int requestCode, int resultCode, Intent data);
+    public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            int[] grantResults);
     public void onWindowFocusChanged(boolean hasFocus);
     public boolean onPrepareOptionsMenu(Menu menu);
     public void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args);
diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java
index b7a0729bd..34492e4ca 100644
--- a/src/com/android/launcher3/testing/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -91,6 +91,11 @@ public class LauncherExtension extends Launcher {
         }
 
         @Override
+        public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                int[] grantResults) {
+        }
+
+        @Override
         public void onWindowFocusChanged(boolean hasFocus) {
         }