Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null checks to UserSwitchingDialog.

Browse Source 
Bug: 279819448
Test: atest FrameworksServicesTests:UserControllerTest
Test: atest UserLifecycleTests
Change-Id: Ie1e5c3ee78153316b7b0b2090fa685f4a8163a4c
This commit is contained in:
Yasin Kilicdere
2023-04-27 20:39:14 +01:00
parent 45d3fa60f2
commit be88eb449d
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/am/UserSwitchingDialog.java
View File

@@ -266,12 +266,11 @@ class UserSwitchingDialog extends Dialog {
}
private void startProgressAnimation(Runnable onAnimationEnd) {
if (mDisableAnimations) {
final AnimatedVectorDrawable avd = getSpinnerAVD();
if (mDisableAnimations || avd == null) {
onAnimationEnd.run();
return;
}
final ImageView progressCircular = findViewById(R.id.progress_circular);
final AnimatedVectorDrawable avd = (AnimatedVectorDrawable) progressCircular.getDrawable();
avd.registerAnimationCallback(new Animatable2.AnimationCallback() {
@Override
public void onAnimationEnd(Drawable drawable) {
@@ -281,7 +280,23 @@ class UserSwitchingDialog extends Dialog {
avd.start();
}
private AnimatedVectorDrawable getSpinnerAVD() {
final ImageView view = findViewById(R.id.progress_circular);
if (view != null) {
final Drawable drawable = view.getDrawable();
if (drawable instanceof AnimatedVectorDrawable) {
return (AnimatedVectorDrawable) drawable;
}
}
return null;
}
private void startDialogAnimation(Animation animation, Runnable onAnimationEnd) {
final View view = findViewById(R.id.content);
if (mDisableAnimations || view == null) {
onAnimationEnd.run();
return;
}
animation.setDuration(DIALOG_SHOW_HIDE_ANIMATION_DURATION_MS);
animation.setAnimationListener(new Animation.AnimationListener() {
@Override
@@ -299,7 +314,7 @@ class UserSwitchingDialog extends Dialog {
}
});
findViewById(R.id.content).startAnimation(animation);
view.startAnimation(animation);
}
private void asyncTraceBegin(String subTag, int subCookie) {