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

Commit 9da28810 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Clear calling identity before binding instant app resolver" into oc-dev am: 247b9c4a 

am: d7ad0b7a

Change-Id: I441505c7ae946b868f450a4766547981e4cfe765
parents 95fc19f1 d7ad0b7a

services/core/java/com/android/server/pm/EphemeralResolverConnection.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.ServiceConnection;

import android.content.ServiceConnection;

import android.content.pm.InstantAppResolveInfo;

import android.content.pm.InstantAppResolveInfo;

import android.os.Binder;

import android.os.Build;

import android.os.Build;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;
@@ -140,7 +141,12 @@ final class EphemeralResolverConnection implements DeathRecipient { 
            if (mRemoteInstance != null) {

            if (mRemoteInstance != null) {

                return mRemoteInstance;

                return mRemoteInstance;

            }

            }

            long binderToken = Binder.clearCallingIdentity();

            try {

                bindLocked(token);

                bindLocked(token);

            } finally {

                Binder.restoreCallingIdentity(binderToken);

            }

            return mRemoteInstance;

            return mRemoteInstance;

        }

        }

    }

    }