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

Commit 3c9ec305 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am:... 

Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev am: 7e10e630 am: ed90fcae
am: 25726968

* commit '25726968':
  QS API: Handle return value from bindServiceAsUser

Change-Id: I46d9c6959280998c27e6d5928ed852c80931c90a
parents 4af162a0 25726968

packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -81,6 +81,8 @@ public class TileLifecycleManager extends BroadcastReceiver implements 
    private IQSService mService;

    private IQSService mService;

    private boolean mUnbindImmediate;

    private boolean mUnbindImmediate;

    private TileChangeListener mChangeListener;

    private TileChangeListener mChangeListener;

    // Return value from bindServiceAsUser, determines whether safe to call unbind.

    private boolean mIsBound;





    public TileLifecycleManager(Handler handler, Context context, Intent intent, UserHandle user) {

    public TileLifecycleManager(Handler handler, Context context, Intent intent, UserHandle user) {

        mContext = context;

        mContext = context;
@@ -132,7 +134,7 @@ public class TileLifecycleManager extends BroadcastReceiver implements 
            }

            }

            if (DEBUG) Log.d(TAG, "Binding service " + mIntent + " " + mUser);

            if (DEBUG) Log.d(TAG, "Binding service " + mIntent + " " + mUser);

            mBindTryCount++;

            mBindTryCount++;

            mContext.bindServiceAsUser(mIntent, this,

            mIsBound = mContext.bindServiceAsUser(mIntent, this,

                    Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,

                    Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,

                    mUser);

                    mUser);

        } else {

        } else {
@@ -140,7 +142,10 @@ public class TileLifecycleManager extends BroadcastReceiver implements 
            // Give it another chance next time it needs to be bound, out of kindness.

            // Give it another chance next time it needs to be bound, out of kindness.

            mBindTryCount = 0;

            mBindTryCount = 0;

            mWrapper = null;

            mWrapper = null;

            if (mIsBound) {

                mContext.unbindService(this);

                mContext.unbindService(this);

                mIsBound = false;

            }

        }

        }

    }

    }