diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/applications/InstalledAppDetails.java | 11 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/Memory.java | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 8b5ff0b..fcdf899 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settings.applications.ApplicationsState.AppEntry; import android.app.Activity; @@ -907,10 +908,12 @@ public class InstalledAppDetails extends Fragment mActivitiesButton.setEnabled(false); } else if(v == mClearDataButton) { if (mAppEntry.info.manageSpaceActivityName != null) { - Intent intent = new Intent(Intent.ACTION_DEFAULT); - intent.setClassName(mAppEntry.info.packageName, - mAppEntry.info.manageSpaceActivityName); - startActivityForResult(intent, -1); + if (!Utils.isMonkeyRunning()) { + Intent intent = new Intent(Intent.ACTION_DEFAULT); + intent.setClassName(mAppEntry.info.packageName, + mAppEntry.info.manageSpaceActivityName); + startActivityForResult(intent, -1); + } } else { showDialogInner(DLG_CLEAR_DATA, 0); } diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java index d0eef62..b9ea432 100644 --- a/src/com/android/settings/deviceinfo/Memory.java +++ b/src/com/android/settings/deviceinfo/Memory.java @@ -48,6 +48,7 @@ import android.widget.Toast; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.Utils; public class Memory extends SettingsPreferenceFragment { private static final String TAG = "MemorySettings"; @@ -237,7 +238,10 @@ public class Memory extends SettingsPreferenceFragment { StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i]; Intent intent = svpc.intentForClick(preference); if (intent != null) { - startActivity(intent); + // Don't go across app boundary if monkey is running + if (!Utils.isMonkeyRunning()) { + startActivity(intent); + } return true; } |