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

Commit b95799a7 authored by Jeff Hamilton's avatar Jeff Hamilton Committed by Android (Google) Code Review
Browse files

Merge "Remove unused doRebind argument." into main

parents 9789ec82 85789262

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -5159,7 +5159,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                try {

                    if (doRebind) {

                        ActivityManager.getService().unbindFinished(

                                data.token, data.intent, doRebind);

                                data.token, data.intent);

                    } else {

                        ActivityManager.getService().serviceDoneExecuting(

                                data.token, SERVICE_DONE_EXECUTING_UNBIND, 0, 0, data.intent);

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ interface IActivityManager { 
    oneway void removeContentProvider(in IBinder connection, boolean stable);

    @UnsupportedAppUsage

    void setRequestedOrientation(in IBinder token, int requestedOrientation);

    void unbindFinished(in IBinder token, in Intent service, boolean doRebind);

    void unbindFinished(in IBinder token, in Intent service);

    @UnsupportedAppUsage

    void setProcessImportant(in IBinder token, int pid, boolean isForeground, String reason);

    void setServiceForeground(in ComponentName className, in IBinder token,

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -4604,7 +4604,7 @@ public final class ActiveServices { 
        return true;

    }



    void unbindFinishedLocked(ServiceRecord r, Intent intent, boolean doRebind) {

    void unbindFinishedLocked(ServiceRecord r, Intent intent) {

        final long origId = mAm.mInjector.clearCallingIdentity();

        try {

            if (r != null) {

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

+2 −2
Original line number Diff line number Diff line
@@ -13977,14 +13977,14 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }

    }













    public void unbindFinished(IBinder token, Intent intent, boolean doRebind) {













    public void unbindFinished(IBinder token, Intent intent) {















        // Refuse possible leaked file descriptors















        if (intent != null && intent.hasFileDescriptors() == true) {















            throw new IllegalArgumentException("File descriptors passed in Intent");















        }





























        synchronized(this) {













            mServices.unbindFinishedLocked((ServiceRecord)token, intent, doRebind);













            mServices.unbindFinishedLocked((ServiceRecord)token, intent);















        }















    }