commit 3a43ed61cba0dd45cf085f41c1632cfbc82a8adc
author Dave Hawkey <dhawkey@google.com> Fri Jun 26 10:27:47 2015 -0600
committer Dave Hawkey <dhawkey@google.com> Fri Jun 26 10:27:47 2015 -0600
tree 38de2aec6ea3a818d45f8f62aec149be315d71f7
parent 21a4ccc6275a6a3328fc4951f6942b43b0a7726b

Add LauncherCallbacks for requesting permissions on MNC

Change-Id: Ia8f704590e03e16db04c2f7acee1e79ce7334749

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 48f3901..734c728 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -883,6 +883,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 d8128d6..3c402a8 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -37,6 +37,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/LauncherExtension.java

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