diff options
| author | Paul Hobbs <phobbs@google.com> | 2021-06-29 19:54:32 +0000 |
|---|---|---|
| committer | Paul Hobbs <phobbs@google.com> | 2021-06-29 20:06:45 +0000 |
| commit | cb5a80ea57b51fcde117dea253c546dbba9f27f1 (patch) | |
| tree | d4a59b5ac880a4f7e9d5c61dc742a621cf850a26 /core/java/android/app/Notification.java | |
| parent | 214bf65c95684662cf35284b381b8595baefaee1 (diff) | |
Revert^2 "Deprecate Context#createApplicationContext"
Bug: 192242649
5a41b45a85286200f029b6ac06d004cb32c88dd0
Change-Id: Idcebd68e0079e7e87de04ae25069b3a9ff72093c
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 6454d2027f58..506dfe09f3fa 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -6344,10 +6344,11 @@ public class Notification implements Parcelable ApplicationInfo applicationInfo = n.extras.getParcelable( EXTRA_BUILDER_APPLICATION_INFO); Context builderContext; - if (applicationInfo != null) { + if (applicationInfo != null && applicationInfo.packageName != null) { try { - builderContext = context.createApplicationContext(applicationInfo, - Context.CONTEXT_RESTRICTED); + builderContext = context.createPackageContextAsUser(applicationInfo.packageName, + Context.CONTEXT_RESTRICTED, + UserHandle.getUserHandleForUid(applicationInfo.uid)); } catch (NameNotFoundException e) { Log.e(TAG, "ApplicationInfo " + applicationInfo + " not found"); builderContext = context; // try with our context |