Handle permission revocation

This commit is contained in:
Christopher Eby 2012-02-16 02:39:34 -06:00
parent ec9fac546f
commit 915f3eebb5

View File

@ -406,9 +406,13 @@ public final class PlaybackService extends Service
PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE); PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicLock"); mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicLock");
try {
mCallListener = new InCallListener(); mCallListener = new InCallListener();
TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); TelephonyManager telephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
telephonyManager.listen(mCallListener, PhoneStateListener.LISTEN_CALL_STATE); telephonyManager.listen(mCallListener, PhoneStateListener.LISTEN_CALL_STATE);
} catch (SecurityException e) {
// don't have READ_PHONE_STATE
}
mReceiver = new Receiver(); mReceiver = new Receiver();
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
@ -694,8 +698,12 @@ public final class PlaybackService extends Service
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
CompatFroyo.requestAudioFocus(mAudioManager); CompatFroyo.requestAudioFocus(mAudioManager);
} }
try {
if (mWakeLock != null) if (mWakeLock != null)
mWakeLock.acquire(); mWakeLock.acquire();
} catch (SecurityException e) {
// Don't have WAKE_LOCK permission
}
} else { } else {
if (mMediaPlayerInitialized) if (mMediaPlayerInitialized)
mMediaPlayer.pause(); mMediaPlayer.pause();