drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #8582003: Evernote Camera Capture Failure" into jb-mr2-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-04-12 00:58:24 +00:00
committed by Android (Google) Code Review
parent bd286426fa b57a50bd16
commit c309ca4622
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ActivityThread.java
View File

@ -1593,6 +1593,12 @@ public final class ActivityThread {
} }
public static String currentPackageName() { 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(); ActivityThread am = currentActivityThread();
return (am != null && am.mBoundApplication != null) return (am != null && am.mBoundApplication != null)
? am.mBoundApplication.processName : null; ? am.mBoundApplication.processName : null;

2
packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java
View File

@ -86,7 +86,7 @@ public class FakeApp extends Application {
@Override @Override
public void onCreate() { public void onCreate() {
String processName = ActivityThread.currentPackageName(); String processName = ActivityThread.currentProcessName();
Slog.i("FakeOEMFeatures", "Creating app in process: " + processName); Slog.i("FakeOEMFeatures", "Creating app in process: " + processName);
if (!getApplicationInfo().packageName.equals(processName)) { if (!getApplicationInfo().packageName.equals(processName)) {
// If we are not in the main process of the app, then don't do // If we are not in the main process of the app, then don't do