Merge "Use "all_downloads" instead of "my_downloads"." (62bd91ab) · Commits · e / os / android_frameworks_base

core/java/android/app/DownloadManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1089,7 +1089,7 @@ public class DownloadManager {
		if (cursor.moveToFirst()) {
		int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));
		if (DownloadManager.STATUS_SUCCESSFUL == status) {
		return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);
		return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
		}
		}
		} finally {
		@@ -1425,7 +1425,7 @@ public class DownloadManager {
		* @hide
		*/
		public Uri getDownloadUri(long id) {
		return ContentUris.withAppendedId(mBaseUri, id);
		return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
		}

		/**
		@@ -1519,7 +1519,7 @@ public class DownloadManager {

		// return content URI for cache download
		long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));
		return ContentUris.withAppendedId(mBaseUri, downloadId).toString();
		return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();
		}

		private long getReason(int status) {

+12 −9

Original line number	Diff line number	Diff line
		@@ -3935,16 +3935,19 @@ public final class ActivityManagerService extends ActivityManagerNative
		app.killed = false;
		app.killedByAm = false;
		checkTime(startTime, "startProcess: starting to update pids map");
		synchronized (mPidsSelfLocked) {
		ProcessRecord oldApp;
		synchronized (mPidsSelfLocked) {
		oldApp = mPidsSelfLocked.get(startResult.pid);
		}
		// If there is already an app occupying that pid that hasn't been cleaned up
		if ((oldApp = mPidsSelfLocked.get(startResult.pid)) != null && !app.isolated) {
		if (oldApp != null && !app.isolated) {
		// Clean up anything relating to this pid first
		Slog.w(TAG, "Reusing pid " + startResult.pid
		+ " while app is still mapped to it");
		cleanUpApplicationRecordLocked(oldApp, false, false, -1,
		true /replacingPid/);
		}
		synchronized (mPidsSelfLocked) {
		this.mPidsSelfLocked.put(startResult.pid, app);
		if (isActivityProcess) {
		Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);