commit cb5f619770df68e6cd323c85602bb64c4acea8cc
author Dave Hawkey <dhawkey@google.com> Mon Jun 29 17:41:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 17:41:14 2015 +0000
tree 60ecb5a0a173022524d5810e930f0d4064697b21
parent 7162944c155778c64d6179a83c23cf9a5653a14b
parent 79f25bedd2ed13613323b085b46b9b42aee21696

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

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

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 98aae8f..0a20fa4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -871,6 +871,15 @@
         }
     }
 
+    /** @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();

src/com/android/launcher3/LauncherCallbacks.java

diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index 49d6d68..6618cca 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -40,6 +40,8 @@
     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);

src/com/android/launcher3/testing/LauncherExtension.java

diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java
index b7a0729..34492e4 100644
--- a/src/com/android/launcher3/testing/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -91,6 +91,11 @@
         }
 
         @Override
+        public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                int[] grantResults) {
+        }
+
+        @Override
         public void onWindowFocusChanged(boolean hasFocus) {
         }