summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorDave Hawkey <dhawkey@google.com>2015-06-29 17:41:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-29 17:41:14 +0000
commitcb5f619770df68e6cd323c85602bb64c4acea8cc (patch)
tree60ecb5a0a173022524d5810e930f0d4064697b21 /src/com/android/launcher3/Launcher.java
parent7162944c155778c64d6179a83c23cf9a5653a14b (diff)
parent79f25bedd2ed13613323b085b46b9b42aee21696 (diff)
downloadandroid_packages_apps_Trebuchet-cb5f619770df68e6cd323c85602bb64c4acea8cc.tar.gz
android_packages_apps_Trebuchet-cb5f619770df68e6cd323c85602bb64c4acea8cc.tar.bz2
android_packages_apps_Trebuchet-cb5f619770df68e6cd323c85602bb64c4acea8cc.zip
am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte
* commit '79f25bedd2ed13613323b085b46b9b42aee21696': Add LauncherCallbacks for requesting permissions on MNC
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java9
1 files changed, 9 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();