summaryrefslogtreecommitdiffstats
path: root/android/src/org
diff options
context:
space:
mode:
authorAntoine Cellerier <dionoea@videolan.org>2011-03-09 18:04:05 +0000
committerAntoine Cellerier <dionoea@videolan.org>2011-03-09 18:04:05 +0000
commit64cf0dd765dc11058a02024032784a9f2eb494b5 (patch)
tree436e067a43af43a1444763b9fde915213a6051e6 /android/src/org
parentc9190dc188edb3dbea89e7ef1be7bc0dd33eba19 (diff)
downloadrockbox-64cf0dd765dc11058a02024032784a9f2eb494b5.tar.gz
rockbox-64cf0dd765dc11058a02024032784a9f2eb494b5.tar.bz2
rockbox-64cf0dd765dc11058a02024032784a9f2eb494b5.zip
Looks like Android 2.3 is more strict when enforcing permissions. Explicitly declare allowed intents under the Service tag in AndroidManifest.xml.
Remove useless rockbox intent class. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29552 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/src/org')
-rw-r--r--android/src/org/rockbox/widgets/RockboxWidgetProvider.java44
1 files changed, 19 insertions, 25 deletions
diff --git a/android/src/org/rockbox/widgets/RockboxWidgetProvider.java b/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
index c6f3baf76c..4a012c7124 100644
--- a/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
+++ b/android/src/org/rockbox/widgets/RockboxWidgetProvider.java
@@ -117,8 +117,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enablePrev)
{
views.setOnClickPendingIntent(R.id.prev,
- RockboxMediaIntent.newPendingIntent(context,
- KeyEvent.KEYCODE_MEDIA_PREVIOUS));
+ newPendingIntent(context,
+ KeyEvent.KEYCODE_MEDIA_PREVIOUS));
}
else
views.setViewVisibility(R.id.prev, View.GONE);
@@ -127,8 +127,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enablePlayPause)
{
views.setOnClickPendingIntent(R.id.playPause,
- RockboxMediaIntent.newPendingIntent(context,
- KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
+ newPendingIntent(context,
+ KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
}
else
views.setViewVisibility(R.id.playPause, View.GONE);
@@ -137,8 +137,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enableNext)
{
views.setOnClickPendingIntent(R.id.next,
- RockboxMediaIntent.newPendingIntent(context,
- KeyEvent.KEYCODE_MEDIA_NEXT));
+ newPendingIntent(context,
+ KeyEvent.KEYCODE_MEDIA_NEXT));
}
else
views.setViewVisibility(R.id.next, View.GONE);
@@ -147,8 +147,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enableStop)
{
views.setOnClickPendingIntent(R.id.stop,
- RockboxMediaIntent.newPendingIntent(context,
- KeyEvent.KEYCODE_MEDIA_STOP));
+ newPendingIntent(context,
+ KeyEvent.KEYCODE_MEDIA_STOP));
}
else
views.setViewVisibility(R.id.stop, View.GONE);
@@ -190,24 +190,18 @@ public class RockboxWidgetProvider extends AppWidgetProvider
appWidgetManager.updateAppWidget(appWidgetId, views);
}
- private static class RockboxMediaIntent extends Intent
+ public static PendingIntent newPendingIntent(Context context, int keycode)
{
- private RockboxMediaIntent(Context c, int keycode)
- {
- super(ACTION_MEDIA_BUTTON, Uri.EMPTY, c, RockboxService.class);
- putExtra(EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP,
- keycode));
- }
-
- public static PendingIntent newPendingIntent(Context c, int keycode)
- {
- /* Use keycode as request to code to prevent successive
- * PendingIntents from overwritting one another.
- * This seems hackish but at least it works.
- * see: http://code.google.com/p/android/issues/detail?id=863
- */
- return PendingIntent.getService(c, keycode, new RockboxMediaIntent(c, keycode), 0);
- }
+ /* Use keycode as request to code to prevent successive
+ * PendingIntents from overwritting one another.
+ * This seems hackish but at least it works.
+ * see: http://code.google.com/p/android/issues/detail?id=863
+ */
+ Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, Uri.EMPTY,
+ context, RockboxService.class);
+ intent.putExtra(Intent.EXTRA_KEY_EVENT,
+ new KeyEvent(KeyEvent.ACTION_UP, keycode));
+ return PendingIntent.getService(context, keycode, intent, 0);
}
}