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

Commit f6d8380e authored by Hui Yu's avatar Hui Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "BindServiceFlags" 

* changes:
  WindowManager changes after bindService flags extended to 64 bits.
  AppWidget changes after bindService flags extended to 64 bits.
  DevicePolicy changes after bindService flags extended to 64 bits.
  Extend bindService flags from 32 bits to 64 bits.
parents 255718d8 10bba97b

core/api/current.txt

+13 −2
Original line number Diff line number Diff line
@@ -7731,7 +7731,8 @@ package android.app.admin { 
    method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_LOCK_TASK, conditional=true) public void addPersistentPreferredActivity(@Nullable android.content.ComponentName, android.content.IntentFilter, @NonNull android.content.ComponentName);

    method public void addUserRestriction(@NonNull android.content.ComponentName, String);

    method public void addUserRestrictionGlobally(@NonNull String);

    method public boolean bindDeviceAdminServiceAsUser(@NonNull android.content.ComponentName, android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);

    method public boolean bindDeviceAdminServiceAsUser(@NonNull android.content.ComponentName, @NonNull android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);

    method public boolean bindDeviceAdminServiceAsUser(@NonNull android.content.ComponentName, @NonNull android.content.Intent, @NonNull android.content.ServiceConnection, @NonNull android.content.Context.BindServiceFlags, @NonNull android.os.UserHandle);

    method public boolean canAdminGrantSensorsPermissions();

    method public boolean canUsbDataSignalingBeDisabled();

    method public void clearApplicationUserData(@NonNull android.content.ComponentName, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener);
@@ -10160,9 +10161,13 @@ package android.content { 
  public abstract class Context {

    ctor public Context();

    method public boolean bindIsolatedService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);

    method public abstract boolean bindService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int);

    method public boolean bindIsolatedService(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.Context.BindServiceFlags, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);

    method public abstract boolean bindService(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int);

    method public boolean bindService(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, @NonNull android.content.Context.BindServiceFlags);

    method public boolean bindService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);

    method public boolean bindService(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.Context.BindServiceFlags, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);

    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL", android.Manifest.permission.INTERACT_ACROSS_PROFILES}, conditional=true) public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL", android.Manifest.permission.INTERACT_ACROSS_PROFILES}, conditional=true) public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, @NonNull android.content.Context.BindServiceFlags, @NonNull android.os.UserHandle);

    method @CheckResult(suggest="#enforceCallingOrSelfPermission(String,String)") public abstract int checkCallingOrSelfPermission(@NonNull String);

    method @CheckResult(suggest="#enforceCallingOrSelfUriPermission(Uri,int,String)") public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int);

    method @NonNull public int[] checkCallingOrSelfUriPermissions(@NonNull java.util.List<android.net.Uri>, int);
@@ -10322,6 +10327,7 @@ package android.content { 
    field public static final int BIND_AUTO_CREATE = 1; // 0x1

    field public static final int BIND_DEBUG_UNBIND = 2; // 0x2

    field public static final int BIND_EXTERNAL_SERVICE = -2147483648; // 0x80000000

    field public static final long BIND_EXTERNAL_SERVICE_LONG = -9223372036854775808L; // 0x8000000000000000L

    field public static final int BIND_IMPORTANT = 64; // 0x40

    field public static final int BIND_INCLUDE_CAPABILITIES = 4096; // 0x1000

    field public static final int BIND_NOT_FOREGROUND = 4; // 0x4
@@ -10426,6 +10432,11 @@ package android.content { 
    field @UiContext public static final String WINDOW_SERVICE = "window";

  }













  public static final class Context.BindServiceFlags {













    method public long getValue();













    method @NonNull public static android.content.Context.BindServiceFlags of(long);













  }



























  public final class ContextParams {















    method @Nullable public String getAttributionTag();















    method @Nullable public android.content.AttributionSource getNextAttributionSource();

























core/java/android/app/ContextImpl.java



+55
−8




























Original line number
Diff line number
Diff line








@@ -1983,14 +1983,30 @@ class ContextImpl extends Context {













    @Override















    public boolean bindService(Intent service, ServiceConnection conn, int flags) {















        warnIfCallingFromSystemProcess();













        return bindServiceCommon(service, conn, flags, null, mMainThread.getHandler(), null,













                getUser());













        return bindServiceCommon(service, conn, Integer.toUnsignedLong(flags), null,













                mMainThread.getHandler(), null, getUser());













    }



























    @Override













    public boolean bindService(Intent service, ServiceConnection conn,













            @NonNull BindServiceFlags flags) {













        warnIfCallingFromSystemProcess();













        return bindServiceCommon(service, conn, flags.getValue(), null, mMainThread.getHandler(),













                null, getUser());















    }































    @Override















    public boolean bindService(















            Intent service, int flags, Executor executor, ServiceConnection conn) {













        return bindServiceCommon(service, conn, flags, null, null, executor, getUser());













        return bindServiceCommon(service, conn, Integer.toUnsignedLong(flags), null, null, executor,













                getUser());













    }



























    @Override













    public boolean bindService(Intent service, @NonNull BindServiceFlags flags, Executor executor,













            ServiceConnection conn) {













        return bindServiceCommon(service, conn, flags.getValue(), null, null, executor,













                getUser());















    }































    @Override









@@ -2000,13 +2016,33 @@ class ContextImpl extends Context {













        if (instanceName == null) {















            throw new NullPointerException("null instanceName");















        }













        return bindServiceCommon(service, conn, flags, instanceName, null, executor, getUser());













        return bindServiceCommon(service, conn, Integer.toUnsignedLong(flags), instanceName, null, executor,













                getUser());













    }



























    @Override













    public boolean bindIsolatedService(Intent service, @NonNull BindServiceFlags flags,













            String instanceName, Executor executor, ServiceConnection conn) {













        warnIfCallingFromSystemProcess();













        if (instanceName == null) {













            throw new NullPointerException("null instanceName");













        }













        return bindServiceCommon(service, conn, flags.getValue(), instanceName, null, executor,













                getUser());















    }































    @Override















    public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags,















            UserHandle user) {













        return bindServiceCommon(service, conn, flags, null, mMainThread.getHandler(), null, user);













        return bindServiceCommon(service, conn, Integer.toUnsignedLong(flags), null,













                mMainThread.getHandler(), null, user);













    }



























    @Override













    public boolean bindServiceAsUser(Intent service, ServiceConnection conn,













            @NonNull BindServiceFlags flags, UserHandle user) {













        return bindServiceCommon(service, conn, flags.getValue(), null,













                mMainThread.getHandler(), null, user);















    }































    /** @hide */









@@ -2016,13 +2052,24 @@ class ContextImpl extends Context {













        if (handler == null) {















            throw new IllegalArgumentException("handler must not be null.");















        }













        return bindServiceCommon(service, conn, flags, null, handler, null, user);













        return bindServiceCommon(service, conn, Integer.toUnsignedLong(flags), null, handler,













                null, user);













    }



























    @Override













    public boolean bindServiceAsUser(Intent service, ServiceConnection conn,













            @NonNull BindServiceFlags flags, Handler handler, UserHandle user) {













        if (handler == null) {













            throw new IllegalArgumentException("handler must not be null.");













        }













        return bindServiceCommon(service, conn, flags.getValue(), null, handler,













                null, user);















    }































    /** @hide */















    @Override















    public IServiceConnection getServiceDispatcher(ServiceConnection conn, Handler handler,













            int flags) {













            long flags) {















        return mPackageInfo.getServiceDispatcher(conn, getOuterContext(), handler, flags);















    }

























@@ -2045,7 +2092,7 @@ class ContextImpl extends Context {













        return mMainThread.getHandler();















    }





























    private boolean bindServiceCommon(Intent service, ServiceConnection conn, int flags,













    private boolean bindServiceCommon(Intent service, ServiceConnection conn, long flags,















            String instanceName, Handler handler, Executor executor, UserHandle user) {















        // Keep this in sync with DevicePolicyManager.bindDeviceAdminServiceAsUser and















        // ActivityManagerLocal.bindSdkSandboxService

































core/java/android/app/IActivityManager.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -172,10 +172,10 @@ interface IActivityManager {













    // Currently keeping old bindService because it is on the greylist















    @UnsupportedAppUsage















    int bindService(in IApplicationThread caller, in IBinder token, in Intent service,













            in String resolvedType, in IServiceConnection connection, int flags,













            in String resolvedType, in IServiceConnection connection, long flags,















            in String callingPackage, int userId);















    int bindServiceInstance(in IApplicationThread caller, in IBinder token, in Intent service,













            in String resolvedType, in IServiceConnection connection, int flags,













            in String resolvedType, in IServiceConnection connection, long flags,















            in String instanceName, in String callingPackage, int userId);















    void updateServiceGroup(in IServiceConnection connection, int group, int importance);















    @UnsupportedAppUsage

































core/java/android/app/LoadedApk.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -1898,17 +1898,17 @@ public final class LoadedApk {





























    @UnsupportedAppUsage















    public final IServiceConnection getServiceDispatcher(ServiceConnection c,













            Context context, Handler handler, int flags) {













            Context context, Handler handler, long flags) {















        return getServiceDispatcherCommon(c, context, handler, null, flags);















    }































    public final IServiceConnection getServiceDispatcher(ServiceConnection c,













            Context context, Executor executor, int flags) {













            Context context, Executor executor, long flags) {















        return getServiceDispatcherCommon(c, context, null, executor, flags);















    }































    private IServiceConnection getServiceDispatcherCommon(ServiceConnection c,













            Context context, Handler handler, Executor executor, int flags) {













            Context context, Handler handler, Executor executor, long flags) {















        synchronized (mServices) {















            LoadedApk.ServiceDispatcher sd = null;















            ArrayMap<ServiceConnection, LoadedApk.ServiceDispatcher> map = mServices.get(context);










@@ -2008,7 +2008,7 @@ public final class LoadedApk {













        private final Handler mActivityThread;















        private final Executor mActivityExecutor;















        private final ServiceConnectionLeaked mLocation;













        private final int mFlags;













        private final long mFlags;































        private RuntimeException mUnbindLocation;


























@@ -2041,7 +2041,7 @@ public final class LoadedApk {





























        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)















        ServiceDispatcher(ServiceConnection conn,













                Context context, Handler activityThread, int flags) {













                Context context, Handler activityThread, long flags) {















            mIServiceConnection = new InnerConnection(this);















            mConnection = conn;















            mContext = context;









@@ -2053,7 +2053,7 @@ public final class LoadedApk {













        }































        ServiceDispatcher(ServiceConnection conn,













                Context context, Executor activityExecutor, int flags) {













                Context context, Executor activityExecutor, long flags) {















            mIServiceConnection = new InnerConnection(this);















            mConnection = conn;















            mContext = context;










@@ -2109,7 +2109,7 @@ public final class LoadedApk {













            return mIServiceConnection;















        }





























        int getFlags() {













        long getFlags() {















            return mFlags;















        }

















































core/java/android/app/admin/DevicePolicyManager.java



+27
−5




























Original line number
Diff line number
Diff line








@@ -14522,18 +14522,40 @@ public class DevicePolicyManager {













     * @see Context#bindService(Intent, ServiceConnection, int)















     * @see #getBindDeviceAdminTargetUsers(ComponentName)















     */













    public boolean bindDeviceAdminServiceAsUser(













            @NonNull ComponentName admin,  Intent serviceIntent, @NonNull ServiceConnection conn,













            @Context.BindServiceFlags int flags, @NonNull UserHandle targetUser) {













    public boolean bindDeviceAdminServiceAsUser(@NonNull ComponentName admin,













            @NonNull Intent serviceIntent, @NonNull ServiceConnection conn,













            @Context.BindServiceFlagsBits int flags, @NonNull UserHandle targetUser) {















        throwIfParentInstance("bindDeviceAdminServiceAsUser");















        // Keep this in sync with ContextImpl.bindServiceCommon.















        try {















            final IServiceConnection sd = mContext.getServiceDispatcher(













                    conn, mContext.getMainThreadHandler(), flags);













                    conn, mContext.getMainThreadHandler(), Integer.toUnsignedLong(flags));















            serviceIntent.prepareToLeaveProcess(mContext);















            return mService.bindDeviceAdminServiceAsUser(admin,















                    mContext.getIApplicationThread(), mContext.getActivityToken(), serviceIntent,













                    sd, flags, targetUser.getIdentifier());













                    sd, Integer.toUnsignedLong(flags), targetUser.getIdentifier());













        } catch (RemoteException re) {













            throw re.rethrowFromSystemServer();













        }













    }

























    /**













     * See {@link #bindDeviceAdminServiceAsUser(ComponentName, Intent, ServiceConnection, int,













     *       UserHandle)}.













     * Call {@link Context.BindServiceFlags#of(long)} to obtain a BindServiceFlags object.













     */













    public boolean bindDeviceAdminServiceAsUser(@NonNull ComponentName admin,













            @NonNull Intent serviceIntent, @NonNull ServiceConnection conn,













            @NonNull Context.BindServiceFlags flags, @NonNull UserHandle targetUser) {













        throwIfParentInstance("bindDeviceAdminServiceAsUser");













        // Keep this in sync with ContextImpl.bindServiceCommon.













        try {













            final IServiceConnection sd = mContext.getServiceDispatcher(













                    conn, mContext.getMainThreadHandler(), flags.getValue());













            serviceIntent.prepareToLeaveProcess(mContext);













            return mService.bindDeviceAdminServiceAsUser(admin,













                    mContext.getIApplicationThread(), mContext.getActivityToken(), serviceIntent,













                    sd, flags.getValue(), targetUser.getIdentifier());















        } catch (RemoteException re) {















            throw re.rethrowFromSystemServer();















        }