diff options
| author | Nick Chalko <nchalko@google.com> | 2021-04-29 10:53:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-29 10:53:13 +0000 |
| commit | b9bc86f55a9e36665878655b9a6fb41864055d5d (patch) | |
| tree | 8de2f6178be14daa22dd4c32652c26c4ab69be32 /src/com/android | |
| parent | 7fa9c010654a5003dfdd2c8a0f76c7c98ccbb700 (diff) | |
| parent | 64dc4694c1048ad840d4df6d2edba5075340ea71 (diff) | |
| download | TV-b9bc86f55a9e36665878655b9a6fb41864055d5d.tar.gz | |
Check for null calling Activity in SetupPassthroughActivity am: 928bbba890 am: b3566f2832 am: 64dc4694c1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1689120
Change-Id: I98a16c640b608e144e767ce444dd1fc94361b34c
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/tv/SetupPassthroughActivity.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/tv/SetupPassthroughActivity.java b/src/com/android/tv/SetupPassthroughActivity.java index 25049f1d..e7f89108 100644 --- a/src/com/android/tv/SetupPassthroughActivity.java +++ b/src/com/android/tv/SetupPassthroughActivity.java @@ -118,13 +118,12 @@ public class SetupPassthroughActivity extends Activity { setupIntent.putExtras(extras); try { ComponentName callingActivity = getCallingActivity(); - if (callingActivity != null - && !callingActivity.getPackageName().equals(CommonConstants.BASE_PACKAGE)) { - Log.w( - TAG, - "Calling activity " - + callingActivity.getPackageName() - + " is not trusted. Not forwarding intent."); + if (callingActivity == null + || !callingActivity.getPackageName().equals(CommonConstants.BASE_PACKAGE)) { + String name = + callingActivity == null ? "null" : callingActivity.getPackageName(); + Log.w(TAG, + "Calling activity " + name + " is not trusted. Not forwarding intent."); finish(); return; } |