len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Looks like Android 2.3 is more strict when enforcing permissions. Explicitly declare allowed intents under the Service tag in AndroidManifest.xml.

Browse source 
Remove useless rockbox intent class.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29552 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Antoine Cellerier 2011-03-09 18:04:05 +00:00
parent c9190dc188
commit 64cf0dd765
2 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
android/AndroidManifest.xml
View file

@ -19,7 +19,12 @@
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name=".RockboxService"/> <service android:name=".RockboxService">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</service>
<receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver" <receiver android:name=".Helper.MediaButtonReceiver$MediaReceiver"
android:enabled="true" android:enabled="true"

44
android/src/org/rockbox/widgets/RockboxWidgetProvider.java
View file

@ -117,8 +117,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enablePrev) if (state.enablePrev)
{ {
views.setOnClickPendingIntent(R.id.prev, views.setOnClickPendingIntent(R.id.prev,
RockboxMediaIntent.newPendingIntent(context, newPendingIntent(context,
KeyEvent.KEYCODE_MEDIA_PREVIOUS)); KeyEvent.KEYCODE_MEDIA_PREVIOUS));
} }
else else
views.setViewVisibility(R.id.prev, View.GONE); views.setViewVisibility(R.id.prev, View.GONE);
@ -127,8 +127,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enablePlayPause) if (state.enablePlayPause)
{ {
views.setOnClickPendingIntent(R.id.playPause, views.setOnClickPendingIntent(R.id.playPause,
RockboxMediaIntent.newPendingIntent(context, newPendingIntent(context,
KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
} }
else else
views.setViewVisibility(R.id.playPause, View.GONE); views.setViewVisibility(R.id.playPause, View.GONE);
@ -137,8 +137,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enableNext) if (state.enableNext)
{ {
views.setOnClickPendingIntent(R.id.next, views.setOnClickPendingIntent(R.id.next,
RockboxMediaIntent.newPendingIntent(context, newPendingIntent(context,
KeyEvent.KEYCODE_MEDIA_NEXT)); KeyEvent.KEYCODE_MEDIA_NEXT));
} }
else else
views.setViewVisibility(R.id.next, View.GONE); views.setViewVisibility(R.id.next, View.GONE);
@ -147,8 +147,8 @@ public class RockboxWidgetProvider extends AppWidgetProvider
if (state.enableStop) if (state.enableStop)
{ {
views.setOnClickPendingIntent(R.id.stop, views.setOnClickPendingIntent(R.id.stop,
RockboxMediaIntent.newPendingIntent(context, newPendingIntent(context,
KeyEvent.KEYCODE_MEDIA_STOP)); KeyEvent.KEYCODE_MEDIA_STOP));
} }
else else
views.setViewVisibility(R.id.stop, View.GONE); views.setViewVisibility(R.id.stop, View.GONE);
@ -190,24 +190,18 @@ public class RockboxWidgetProvider extends AppWidgetProvider
appWidgetManager.updateAppWidget(appWidgetId, views); appWidgetManager.updateAppWidget(appWidgetId, views);
} }
private static class RockboxMediaIntent extends Intent public static PendingIntent newPendingIntent(Context context, int keycode)
{ {
private RockboxMediaIntent(Context c, int keycode) /* Use keycode as request to code to prevent successive
{ * PendingIntents from overwritting one another.
super(ACTION_MEDIA_BUTTON, Uri.EMPTY, c, RockboxService.class); * This seems hackish but at least it works.
putExtra(EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, * see: http://code.google.com/p/android/issues/detail?id=863
keycode)); */
} Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, Uri.EMPTY,
context, RockboxService.class);
public static PendingIntent newPendingIntent(Context c, int keycode) intent.putExtra(Intent.EXTRA_KEY_EVENT,
{ new KeyEvent(KeyEvent.ACTION_UP, keycode));
/* Use keycode as request to code to prevent successive return PendingIntent.getService(context, keycode, intent, 0);
* 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);
}
} }
} }