summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-07-18 20:30:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-18 18:24:25 +0000
commitcc83d8dbfe2d99d95d9cf651c9559093d3c89c1e (patch)
treeafa28432a95712f8734311d09f3989088fdbd446 /src/com
parente8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc (diff)
parentdf3ac430b137f194f51b3c8ad814fa96223a9a7f (diff)
downloadandroid_packages_apps_Trebuchet-cc83d8dbfe2d99d95d9cf651c9559093d3c89c1e.tar.gz
android_packages_apps_Trebuchet-cc83d8dbfe2d99d95d9cf651c9559093d3c89c1e.tar.bz2
android_packages_apps_Trebuchet-cc83d8dbfe2d99d95d9cf651c9559093d3c89c1e.zip
Merge "Specify permission.RECEIVE_LAUNCH_BROADCASTS in String resource" into ub-now-master
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/Stats.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Stats.java b/src/com/android/launcher3/Stats.java
index 882fb04a3..f3977e456 100644
--- a/src/com/android/launcher3/Stats.java
+++ b/src/com/android/launcher3/Stats.java
@@ -32,7 +32,6 @@ public class Stats {
private static final boolean LOCAL_LAUNCH_LOG = true;
public static final String ACTION_LAUNCH = "com.android.launcher3.action.LAUNCH";
- public static final String PERM_LAUNCH = "com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS";
public static final String EXTRA_INTENT = "intent";
public static final String EXTRA_CONTAINER = "container";
public static final String EXTRA_SCREEN = "screen";
@@ -53,6 +52,8 @@ public class Stats {
private final Launcher mLauncher;
+ private final String mLaunchBroadcastPermission;
+
DataOutputStream mLog;
ArrayList<String> mIntents;
@@ -61,6 +62,9 @@ public class Stats {
public Stats(Launcher launcher) {
mLauncher = launcher;
+ mLaunchBroadcastPermission =
+ launcher.getResources().getString(R.string.receive_launch_broadcasts_permission);
+
loadStats();
if (LOCAL_LAUNCH_LOG) {
@@ -87,7 +91,7 @@ public class Stats {
}
},
new IntentFilter(ACTION_LAUNCH),
- PERM_LAUNCH,
+ mLaunchBroadcastPermission,
null
);
}
@@ -120,7 +124,7 @@ public class Stats {
.putExtra(EXTRA_CELLX, shortcut.cellX)
.putExtra(EXTRA_CELLY, shortcut.cellY);
}
- mLauncher.sendBroadcast(broadcastIntent, PERM_LAUNCH);
+ mLauncher.sendBroadcast(broadcastIntent, mLaunchBroadcastPermission);
incrementLaunch(flat);