am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move events." into mnc-dev (21a30889) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+24 −15

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,7 @@ import android.graphics.Rect;
	import android.graphics.drawable.BitmapDrawable;		import android.graphics.drawable.BitmapDrawable;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.net.Uri;		import android.net.Uri;
			import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
	@@ -1561,13 +1562,7 @@ final class ApplicationPackageManager extends PackageManager {
	public @Nullable VolumeInfo getPrimaryStorageCurrentVolume() {		public @Nullable VolumeInfo getPrimaryStorageCurrentVolume() {
	final StorageManager storage = mContext.getSystemService(StorageManager.class);		final StorageManager storage = mContext.getSystemService(StorageManager.class);
	final String volumeUuid = storage.getPrimaryStorageUuid();		final String volumeUuid = storage.getPrimaryStorageUuid();
	if (Objects.equals(StorageManager.UUID_PRIVATE_INTERNAL, volumeUuid)) {		return storage.findVolumeByQualifiedUuid(volumeUuid);
	return storage.findVolumeById(VolumeInfo.ID_PRIVATE_INTERNAL);
	} else if (Objects.equals(StorageManager.UUID_PRIMARY_PHYSICAL, volumeUuid)) {
	return storage.getPrimaryPhysicalVolume();
	} else {
	return storage.findVolumeByUuid(volumeUuid);
	}
	}		}

	@Override		@Override
	@@ -2055,7 +2050,8 @@ final class ApplicationPackageManager extends PackageManager {
	/** {@hide} */		/** {@hide} */
	private static class MoveCallbackDelegate extends IPackageMoveObserver.Stub implements		private static class MoveCallbackDelegate extends IPackageMoveObserver.Stub implements
	Handler.Callback {		Handler.Callback {
	private static final int MSG_STATUS_CHANGED = 1;		private static final int MSG_CREATED = 1;
			private static final int MSG_STATUS_CHANGED = 2;

	final MoveCallback mCallback;		final MoveCallback mCallback;
	final Handler mHandler;		final Handler mHandler;
	@@ -2068,23 +2064,36 @@ final class ApplicationPackageManager extends PackageManager {
	@Override		@Override
	public boolean handleMessage(Message msg) {		public boolean handleMessage(Message msg) {
	switch (msg.what) {		switch (msg.what) {
	case MSG_STATUS_CHANGED:		case MSG_CREATED: {
			final SomeArgs args = (SomeArgs) msg.obj;
			mCallback.onCreated(args.argi1, (Bundle) args.arg2);
			args.recycle();
			return true;
			}
			case MSG_STATUS_CHANGED: {
	final SomeArgs args = (SomeArgs) msg.obj;		final SomeArgs args = (SomeArgs) msg.obj;
	mCallback.onStatusChanged(args.argi1, (String) args.arg2, args.argi3,		mCallback.onStatusChanged(args.argi1, args.argi2, (long) args.arg3);
	(long) args.arg4);
	args.recycle();		args.recycle();
	return true;		return true;
	}		}
			}
	return false;		return false;
	}		}

	@Override		@Override
	public void onStatusChanged(int moveId, String moveTitle, int status, long estMillis) {		public void onCreated(int moveId, Bundle extras) {
			final SomeArgs args = SomeArgs.obtain();
			args.argi1 = moveId;
			args.arg2 = extras;
			mHandler.obtainMessage(MSG_CREATED, args).sendToTarget();
			}

			@Override
			public void onStatusChanged(int moveId, int status, long estMillis) {
	final SomeArgs args = SomeArgs.obtain();		final SomeArgs args = SomeArgs.obtain();
	args.argi1 = moveId;		args.argi1 = moveId;
	args.arg2 = moveTitle;		args.argi2 = status;
	args.argi3 = status;		args.arg3 = estMillis;
	args.arg4 = estMillis;
	mHandler.obtainMessage(MSG_STATUS_CHANGED, args).sendToTarget();		mHandler.obtainMessage(MSG_STATUS_CHANGED, args).sendToTarget();
	}		}
	}		}

core/java/android/content/pm/IPackageMoveObserver.aidl

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,13 @@

	package android.content.pm;		package android.content.pm;

			import android.os.Bundle;

	/**		/**
	* Callback for moving package resources from the Package Manager.		* Callback for moving package resources from the Package Manager.
	* @hide		* @hide
	*/		*/
	oneway interface IPackageMoveObserver {		oneway interface IPackageMoveObserver {
	void onStatusChanged(int moveId, String moveTitle, int status, long estMillis);		void onCreated(int moveId, in Bundle extras);
			void onStatusChanged(int moveId, int status, long estMillis);
	}		}

core/java/android/content/pm/PackageManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4212,8 +4212,8 @@ public abstract class PackageManager {

	/** {@hide} */		/** {@hide} */
	public static abstract class MoveCallback {		public static abstract class MoveCallback {
	public abstract void onStatusChanged(int moveId, String moveTitle, int status,		public void onCreated(int moveId, Bundle extras) {}
	long estMillis);		public abstract void onStatusChanged(int moveId, int status, long estMillis);
	}		}

	/** {@hide} */		/** {@hide} */

core/java/android/os/Environment.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -758,7 +758,6 @@ public class Environment {
	* @hide		* @hide
	*/		*/
	public static File maybeTranslateEmulatedPathToInternal(File path) {		public static File maybeTranslateEmulatedPathToInternal(File path) {
	// TODO: bring back this optimization		return StorageManager.maybeTranslateEmulatedPathToInternal(path);
	return path;
	}		}
	}		}

core/java/android/os/FileUtils.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -390,7 +390,7 @@ public class FileUtils {
	* attacks.		* attacks.
	*/		*/
	public static boolean contains(File dir, File file) {		public static boolean contains(File dir, File file) {
	if (file == null) return false;		if (dir == null \|\| file == null) return false;

	String dirPath = dir.getAbsolutePath();		String dirPath = dir.getAbsolutePath();
	String filePath = file.getAbsolutePath();		String filePath = file.getAbsolutePath();