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

Commit 56453ede authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow wallpapers and IMEs to get location if needed" into qt-dev

parents 242f2c93 c45a9903

core/java/com/android/internal/app/procstats/ProcessState.java

+1 −1
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ public final class ProcessState { 
        STATE_PERSISTENT,               // ActivityManager.PROCESS_STATE_PERSISTENT_UI

        STATE_TOP,                      // ActivityManager.PROCESS_STATE_TOP

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE_LOCATION

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_BOUND_TOP

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE

        STATE_IMPORTANT_FOREGROUND,     // ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND

        STATE_IMPORTANT_BACKGROUND,     // ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND

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

+5 −4
Original line number Diff line number Diff line
@@ -1262,15 +1262,16 @@ public final class OomAdjuster { 
                                // processes).  These should not bring the current process

                                // into the top state, since they are not on top.  Instead

                                // give them the best bound state after that.

                                final int bestState = cr.hasFlag(Context.BIND_INCLUDE_CAPABILITIES)

                                        ? PROCESS_STATE_FOREGROUND_SERVICE_LOCATION

                                        : PROCESS_STATE_BOUND_FOREGROUND_SERVICE;

                                if ((cr.flags & Context.BIND_FOREGROUND_SERVICE) != 0) {

                                    clientProcState =

                                            PROCESS_STATE_BOUND_FOREGROUND_SERVICE;

                                    clientProcState = bestState;

                                } else if (mService.mWakefulness

                                        == PowerManagerInternal.WAKEFULNESS_AWAKE

                                        && (cr.flags & Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE)

                                                != 0) {

                                    clientProcState =

                                            PROCESS_STATE_BOUND_FOREGROUND_SERVICE;

                                    clientProcState = bestState;

                                } else {

                                    clientProcState =

                                            PROCESS_STATE_IMPORTANT_FOREGROUND;

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            Context.BIND_AUTO_CREATE

            | Context.BIND_TREAT_LIKE_ACTIVITY

            | Context.BIND_FOREGROUND_SERVICE

            | Context.BIND_INCLUDE_CAPABILITIES

            | Context.BIND_SHOWING_UI

            | Context.BIND_SCHEDULE_LIKE_TOP_APP;

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -2629,7 +2629,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    0, null, new UserHandle(serviceUserId)));

            if (!mContext.bindServiceAsUser(intent, newConn,

                    Context.BIND_AUTO_CREATE | Context.BIND_SHOWING_UI

                            | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,

                            | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                            | Context.BIND_INCLUDE_CAPABILITIES,

                    new UserHandle(serviceUserId))) {

                String msg = "Unable to bind service: "

                        + componentName;

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java

+3 −4
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; 
import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ActivityTaskManager;



import com.android.internal.app.IVoiceActionCheckCallback;

import com.android.server.wm.ActivityTaskManagerInternal;

import android.app.IActivityManager;

import android.app.IActivityTaskManager;

import android.content.BroadcastReceiver;
@@ -51,15 +48,16 @@ import android.util.PrintWriterPrinter; 
import android.util.Slog;

import android.view.IWindowManager;



import com.android.internal.app.IVoiceActionCheckCallback;

import com.android.internal.app.IVoiceInteractionSessionShowCallback;

import com.android.internal.app.IVoiceInteractor;

import com.android.server.LocalServices;

import com.android.server.wm.ActivityTaskManagerInternal;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;



class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConnection.Callback {

    final static String TAG = "VoiceInteractionServiceManager";
@@ -358,6 +356,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 
        intent.setComponent(mComponent);

        mBound = mContext.bindServiceAsUser(intent, mConnection,

                Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE

                | Context.BIND_INCLUDE_CAPABILITIES

                | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS, new UserHandle(mUser));

        if (!mBound) {

            Slog.w(TAG, "Failed binding to voice interaction service " + mComponent);