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

Commit 5439a6ea authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Pin compiled code of HOME app" into pi-dev 

am: 0e5e46f8

Change-Id: I205971bc6c8309fc4ad40b4a4677703adecf4a75
parents 7604760e 0e5e46f8

core/java/android/app/ActivityManagerInternal.java

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.IBinder;
@@ -407,4 +408,9 @@ public abstract class ActivityManagerInternal { 
     * has {@code permission}.

     */

    public abstract void enforceCallerIsRecentsOrHasPermission(String permission, String func);



    /**

     * @return The intent used to launch the home activity.

     */

    public abstract Intent getHomeIntent();

}

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3175,6 +3175,9 @@ 
    <!-- True if camera app should be pinned via Pinner Service -->

    <bool name="config_pinnerCameraApp">false</bool>



    <!-- True if home app should be pinned via Pinner Service -->

    <bool name="config_pinnerHomeApp">false</bool>



    <!-- Number of days preloaded file cache should be preserved on a device before it can be

         deleted -->

    <integer name="config_keepPreloadsMinDays">7</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2898,6 +2898,7 @@ 
  <!-- Pinner Service -->

  <java-symbol type="array" name="config_defaultPinnerServiceFiles" />

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

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



  <java-symbol type="string" name="config_doubleTouchGestureEnableFile" />

services/core/java/com/android/server/PinnerService.java

+353 −105

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −0
Original line number Diff line number Diff line
@@ -26697,6 +26697,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
        public void enforceCallerIsRecentsOrHasPermission(String permission, String func) {

            ActivityManagerService.this.enforceCallerIsRecentsOrHasPermission(permission, func);

        }













        @Override













        public Intent getHomeIntent() {













            synchronized (ActivityManagerService.this) {













                return ActivityManagerService.this.getHomeIntent();













            }













        }















    }





























    /**