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

Commit 85789262 authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

Remove unused doRebind argument. 

Bug: 381848013
Test: N/A, no functional changes
Change-Id: Ic0060eab1624503cf11ad9d83f2b3a244de213f7
Flag: EXEMPT can't flag AIDL changes, no functional changes outside AIDL
parent 97ee8ce0

core/java/android/app/ActivityThread.java

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

                try {

                    if (doRebind) {

                    if (doRebind) {

                        ActivityManager.getService().unbindFinished(

                        ActivityManager.getService().unbindFinished(

                                data.token, data.intent, doRebind);

                                data.token, data.intent);

                    } else {

                    } else {

                        ActivityManager.getService().serviceDoneExecuting(

                        ActivityManager.getService().serviceDoneExecuting(

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

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

core/java/android/app/IActivityManager.aidl

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

    oneway void removeContentProvider(in IBinder connection, boolean stable);

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    void setRequestedOrientation(in IBinder token, int requestedOrientation);

    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

    @UnsupportedAppUsage

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

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

    void setServiceForeground(in ComponentName className, in IBinder token,

    void setServiceForeground(in ComponentName className, in IBinder token,

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

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

        return true;

    }

    }





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

    void unbindFinishedLocked(ServiceRecord r, Intent intent) {

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

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

        try {

        try {

            if (r != null) {

            if (r != null) {

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

+2 −2
Original line number Original line 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







        // Refuse possible leaked file descriptors











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







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











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







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











        }







        }



























        synchronized(this) {







        synchronized(this) {











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







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











        }







        }











    }







    }