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

Merge "Check DreamActivity callback type to prevent class cast exception" into tm-qpr-dev am: 8daaa631f2 am: 5984ded063

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21938299

Change-Id: Ib664fa64eba67791cb08a1ea47f6423b5ca4d1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2023-03-10 15:03:10 +00:00
committed by Automerger Merge Worker
parent ad1bc9aa46 5984ded063
commit 32a7e9a2ea
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/service/dreams/DreamActivity.java
View File

@@ -58,11 +58,13 @@ public class DreamActivity extends Activity {
setTitle(title);
}
final Bundle extras = getIntent().getExtras();
mCallback = (DreamService.DreamActivityCallbacks) extras.getBinder(EXTRA_CALLBACK);
if (mCallback != null) {
final Object callback = getIntent().getExtras().getBinder(EXTRA_CALLBACK);
if (callback instanceof DreamService.DreamActivityCallbacks) {
mCallback = (DreamService.DreamActivityCallbacks) callback;
mCallback.onActivityCreated(this);
} else {
mCallback = null;
finishAndRemoveTask();
}
}