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

Commit 479ab3b5 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 

* commit '61052dec7d76a6ab0a39d2471cea8d9205062a0e':
  Keep existing API behavior that regressed.
parents 3acb4942 129ffeb3

core/java/android/widget/RemoteViews.java

+5 −1
Original line number Diff line number Diff line
@@ -1807,7 +1807,7 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    public String getPackage() {

        return mApplication.packageName;

        return (mApplication != null) ? mApplication.packageName : null;

    }



    /**
@@ -2663,6 +2663,10 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    private static ApplicationInfo getApplicationInfo(String packageName, int userId) {

        if (packageName == null) {

            return null;

        }



        // Get the application for the passed in package and user.

        Application application = ActivityThread.currentApplication();

        if (application == null) {