Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc708d8b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

* commit 'c309ca46':
  Fix issue #8582003: Evernote Camera Capture Failure
parents 4febbf35 c309ca46

core/java/android/app/ActivityThread.java

+6 −0
Original line number Diff line number Diff line
@@ -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;

packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeApp.java

+1 −1
Original line number Diff line number Diff line
@@ -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