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

Commit a2ff611f authored by Alan Viverette's avatar Alan Viverette
Browse files

resolved conflicts for merge of dca272b8 to lmp-dev 

Change-Id: Ifbd10ace66f7488f225bfae6e26bab60ab56e651
parents 583a9bd0 dca272b8

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,9 @@ 
    <!-- Package name for default network scorer app; overridden by product overlays. -->

    <string name="config_defaultNetworkScorerPackageName"></string>



    <!-- default device has recents property -->

    <bool name="config_hasRecents">true</bool>



    <!-- Defines the default set of global actions. Actions may still be disabled or hidden based

         on the current state of the device.

         Each item must be one of the following strings:

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ 
  <java-symbol type="bool" name="config_enableMultiUserUI"/>

  <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>

  <java-symbol type="bool" name="config_windowIsRound" />

  <java-symbol type="bool" name="config_hasRecents" />



  <java-symbol type="integer" name="config_bluetooth_max_advertisers" />

  <java-symbol type="integer" name="config_bluetooth_max_scan_filters" />

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

+6 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
     */

    private boolean mUserIsMonkey;













    /** Flag whether the device has a recents UI */













    final boolean mHasRecents;



























    final ServiceThread mHandlerThread;















    final MainHandler mHandler;
























@@ -2205,6 +2208,9 @@ public final class ActivityManagerService extends ActivityManagerNative













        mConfigurationSeq = mConfiguration.seq = 1;















        mProcessCpuTracker.init();



























        mHasRecents = mContext.getResources().getBoolean(













                com.android.internal.R.bool.config_hasRecents);



























        mCompatModePackages = new CompatModePackages(this, systemDir, mHandler);















        mIntentFirewall = new IntentFirewall(new IntentFirewallInterface(), mHandler);















        mStackSupervisor = new ActivityStackSupervisor(this);

































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



+1
−1






























Original line number
Diff line number
Diff line








@@ -825,7 +825,7 @@ final class ActivityStack {













        prev.task.touchActiveTime();















        clearLaunchTime(prev);















        final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();













        if (next == null || next.noDisplay || next.task != prev.task) {













        if (mService.mHasRecents && (next == null || next.noDisplay || next.task != prev.task)) {















            prev.updateThumbnail(screenshotActivities(prev), null);















        }















        stopFullyDrawnTraceIfNeeded();