PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9341f5d8: am f66beeae: Follow along with startActivityPendingIntent() change.

Browse Source 
Merge commit '9341f5d81cffd972281e25b414ecaeb716ab16a8'

* commit '9341f5d81cffd972281e25b414ecaeb716ab16a8':
  Follow along with startActivityPendingIntent() change.
This commit is contained in:
Dianne Hackborn
2009-09-17 18:13:10 -07:00
committed by Android Git Automerger
parent c419908de7 9341f5d81c
commit 87f23e728e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/RunningServices.java
View File

@@ -28,6 +28,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageItemInfo;
@@ -789,11 +790,11 @@ public class RunningServices extends ListActivity
si.mRunningService.service);
if (pi != null) {
try {
this.startActivity(pi, null,
this.startIntentSender(pi.getIntentSender(), null,
Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
} catch (PendingIntent.CanceledException e) {
Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET, 0);
} catch (IntentSender.SendIntentException e) {
Log.w(TAG, e);
} catch (IllegalArgumentException e) {
Log.w(TAG, e);