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

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

am 2480bc12: Merge "Fix issue #7232952: Settings crash on tapping on... 

am 2480bc12: Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev

* commit '2480bc12':
  Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
parents c8ce6750 2480bc12

services/java/com/android/server/ServiceWatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class ServiceWatcher implements ServiceConnection { 
        }

        if (D) Log.d(mTag, "binding " + packageName + " (version " + version + ")");

        mContext.bindService(intent, this, Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND

                | Context.BIND_ALLOW_OOM_MANAGEMENT);

                | Context.BIND_ALLOW_OOM_MANAGEMENT | Context.BIND_NOT_VISIBLE);

    }



    private boolean isSignatureMatch(Signature[] signatures) {

services/java/com/android/server/am/ActivityManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -11514,8 +11514,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
         * Prevent non-system code (defined here to be non-persistent

         * processes) from sending protected broadcasts.

         */

        if (callingUid == Process.SYSTEM_UID || callingUid == Process.PHONE_UID

            || callingUid == Process.SHELL_UID || callingUid == Process.BLUETOOTH_UID ||

        int callingAppId = UserHandle.getAppId(callingUid);

        if (callingAppId == Process.SYSTEM_UID || callingAppId == Process.PHONE_UID

            || callingAppId == Process.SHELL_UID || callingAppId == Process.BLUETOOTH_UID ||

            callingUid == 0) {

            // Always okay.

        } else if (callerApp == null || !callerApp.persistent) {