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

Commit e6634981 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 9c7489f8 to master 

Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
parents 2351e69a 9c7489f8

api/current.xml

+0 −11
Original line number Diff line number Diff line
@@ -22935,17 +22935,6 @@ 
 visibility="public"

>

</field>

<field name="IMPORTANCE_HEAVY_WEIGHT"

 type="int"

 transient="false"

 volatile="false"

 value="170"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="IMPORTANCE_PERCEPTIBLE"

 type="int"

 transient="false"

core/java/android/app/ActivityManager.java

+5 −3
Original line number Diff line number Diff line
@@ -797,10 +797,12 @@ public class ActivityManager { 
        public static final int IMPORTANCE_PERCEPTIBLE = 130;

        

        /**

         * Constant for {@link #importance}: this process is running a

         * heavy-weight application and thus should not be killed.

         * Constant for {@link #importance}: this process is running an

         * application that can not save its state, and thus can't be killed

         * while in the background.

         * @hide

         */

        public static final int IMPORTANCE_HEAVY_WEIGHT = 170;

        public static final int IMPORTANCE_CANT_SAVE_STATE = 170;

        

        /**

         * Constant for {@link #importance}: this process is contains services

core/java/android/os/Build.java

+1 −9
Original line number Diff line number Diff line
@@ -188,15 +188,7 @@ public class Build { 
        public static final int FROYO = 8;

        

        /**

         * Next version of Android.

         * 

         * <p>Applications targeting this or a later release will get these

         * new changes in behavior:</p>

         * <ul>

         * <li> The status bar is now dark.  Targeting this version allows

         * the platform to perform performing compatibility on status bar

         * graphics to ensure they look okay on a dark background.

         * </ul>

         * Newest version of Android, version 2.3.

         */

        public static final int GINGERBREAD = 9;

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

+1 −1
Original line number Diff line number Diff line
@@ -7152,7 +7152,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    } else if (adj >= SECONDARY_SERVER_ADJ) {

                        currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE;

                    } else if (adj >= HEAVY_WEIGHT_APP_ADJ) {

                        currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_HEAVY_WEIGHT;

                        currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE;

                    } else if (adj >= PERCEPTIBLE_APP_ADJ) {

                        currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE;

                    } else if (adj >= VISIBLE_APP_ADJ) {