Merge "Catch exception when parsing faulty AVD" into sc-v2-dev (81f5da9e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.graphics.drawable.Animatable;
		import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.os.Trace;
		import android.util.Log;
		import android.util.PathParser;
		import android.window.SplashScreenView;

		@@ -50,6 +51,8 @@ import com.android.internal.R;
		*/
		public class SplashscreenIconDrawableFactory {

		private static final String TAG = "SplashscreenIconDrawableFactory";

		/**
		* @return An array containing the foreground drawable at index 0 and if needed a background
		* drawable at index 1.
		@@ -282,7 +285,12 @@ public class SplashscreenIconDrawableFactory {
		if (startListener != null) {
		startListener.run();
		}
		try {
		mAnimatableIcon.start();
		} catch (Exception ex) {
		Log.e(TAG, "Error while running the splash screen animated icon", ex);
		animation.cancel();
		}
		}

		@Override