From b57a50bd16ce25db441da5c1b63d48721bb90687 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 11 Apr 2013 17:29:32 -0700 Subject: Fix issue #8582003: Evernote Camera Capture Failure ActivityThread.currentPackageName() was actually returning the process name. Change this to return the package name, and fix the one spot using it I could find that was actually wanting the process name. Change-Id: I323b9c5987106b5a090968e545281fc0ba55b6b8 --- core/java/android/app/ActivityThread.java | 6 ++++++ .../FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index e6ce963a8d1c..d4056c98beec 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1593,6 +1593,12 @@ public final class ActivityThread { } public static String currentPackageName() { + ActivityThread am = currentActivityThread(); + return (am != null && am.mBoundApplication != null) + ? am.mBoundApplication.appInfo.packageName : null; + } + + public static String currentProcessName() { ActivityThread am = currentActivityThread(); return (am != null && am.mBoundApplication != null) ? am.mBoundApplication.processName : null; diff --git a/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java b/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java index f11b4994cb00..36ce7cee5f30 100644 --- a/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java +++ b/packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java @@ -86,7 +86,7 @@ public class FakeApp extends Application { @Override public void onCreate() { - String processName = ActivityThread.currentPackageName(); + String processName = ActivityThread.currentProcessName(); Slog.i("FakeOEMFeatures", "Creating app in process: " + processName); if (!getApplicationInfo().packageName.equals(processName)) { // If we are not in the main process of the app, then don't do -- cgit v1.2.3-59-g8ed1b