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

Commit e8a403d5 authored by Tao Bao's avatar Tao Bao
Browse files

Add support for update-on-boot feature. 

Add a separate system service RecoverySystemService to handle recovery
related requests (calling uncrypt to de-encrypt the OTA package on the
/data partition, setting up bootloader control block (aka BCB) and etc).

We used to trigger uncrypt in ShutdownThread before rebooting into
recovery. Now we expose new SystemApi (RecoverySystem.processPackage())
to allow the caller (e.g. GmsCore) to call that upfront before
initiating a reboot. This will reduce the reboot time and get rid of the
progress bar ("processing update package"). However, we need to reserve
the functionality in ShutdownThread to optionally call uncrypt if
finding that's still needed.

In order to support the update-on-boot feature, we also add new
SystemApis scheduleUpdateOnBoot() and cancelScheduledUpdate() into
android.os.RecoverySystem. They allow the caller (e.g. GmsCore) to
schedule / cancel an update by setting up the BCB, which will be read by
the bootloader and the recovery image. With the new SystemApis, an
update package can be processed (uncrypt'd) in the background and
scheduled to be installed at the next boot.

Bug: 26830925
Change-Id: Ic606fcf5b31c54ce54f0ab12c1768fef0fa64560
parent ea168d22

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IPermissionController.aidl \

	core/java/android/os/IProcessInfoService.aidl \

	core/java/android/os/IPowerManager.aidl \

	core/java/android/os/IRecoverySystem.aidl \

	core/java/android/os/IRecoverySystemProgressListener.aidl \

	core/java/android/os/IRemoteCallback.aidl \

	core/java/android/os/ISchedulingPolicyService.aidl \

	core/java/android/os/IUpdateLock.aidl \

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -31405,9 +31405,14 @@ package android.os { 
  }















  public class RecoverySystem {













    method public static void cancelScheduledUpdate(android.content.Context) throws java.io.IOException;















    method public static void installPackage(android.content.Context, java.io.File) throws java.io.IOException;













    method public static void installPackage(android.content.Context, java.io.File, boolean) throws java.io.IOException;













    method public static void processPackage(android.content.Context, java.io.File, android.os.RecoverySystem.ProgressListener, android.os.Handler) throws java.io.IOException;













    method public static void processPackage(android.content.Context, java.io.File, android.os.RecoverySystem.ProgressListener) throws java.io.IOException;















    method public static void rebootWipeCache(android.content.Context) throws java.io.IOException;















    method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;













    method public static void scheduleUpdateOnBoot(android.content.Context, java.io.File) throws java.io.IOException;















    method public static void verifyPackage(java.io.File, android.os.RecoverySystem.ProgressListener, java.io.File) throws java.security.GeneralSecurityException, java.io.IOException;















  }







































core/java/android/app/SystemServiceRegistry.java



+14
−0




























Original line number
Diff line number
Diff line








@@ -90,9 +90,11 @@ import android.os.DropBoxManager;













import android.os.HardwarePropertiesManager;















import android.os.IBinder;















import android.os.IPowerManager;













import android.os.IRecoverySystem;















import android.os.IUserManager;















import android.os.PowerManager;















import android.os.Process;













import android.os.RecoverySystem;















import android.os.ServiceManager;















import android.os.SystemVibrator;















import android.os.UserHandle;










@@ -379,6 +381,18 @@ final class SystemServiceRegistry {













                        service, ctx.mMainThread.getHandler());















            }});





























        registerService(Context.RECOVERY_SERVICE, RecoverySystem.class,













                new CachedServiceFetcher<RecoverySystem>() {













            @Override













            public RecoverySystem createService(ContextImpl ctx) {













                IBinder b = ServiceManager.getService(Context.RECOVERY_SERVICE);













                IRecoverySystem service = IRecoverySystem.Stub.asInterface(b);













                if (service == null) {













                    Log.wtf(TAG, "Failed to get recovery service.");













                }













                return new RecoverySystem(service);













            }});





























        registerService(Context.SEARCH_SERVICE, SearchManager.class,















                new CachedServiceFetcher<SearchManager>() {















            @Override

































core/java/android/content/Context.java



+10
−0




























Original line number
Diff line number
Diff line








@@ -2861,6 +2861,16 @@ public abstract class Context {













     */















    public static final String POWER_SERVICE = "power";





























    /**













     * Use with {@link #getSystemService} to retrieve a













     * {@link android.os.RecoverySystem} for accessing the recovery system













     * service.













     *













     * @see #getSystemService













     * @hide













     */













    public static final String RECOVERY_SERVICE = "recovery";





























    /**















     * Use with {@link #getSystemService} to retrieve a















     * {@link android.view.WindowManager} for accessing the system's window

































core/java/android/os/IRecoverySystem.aidl
0 → 100644



+28
−0




























Original line number
Diff line number
Diff line













/* //device/java/android/android/os/IRecoverySystem.aidl













**













** Copyright 2016, The Android Open Source Project













**













** Licensed under the Apache License, Version 2.0 (the "License");













** you may not use this file except in compliance with the License.













** You may obtain a copy of the License at













**













**     http://www.apache.org/licenses/LICENSE-2.0













**













** Unless required by applicable law or agreed to in writing, software













** distributed under the License is distributed on an "AS IS" BASIS,













** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













** See the License for the specific language governing permissions and













** limitations under the License.













*/



























package android.os;



























import android.os.IRecoverySystemProgressListener;



























/** @hide */



























interface IRecoverySystem {













    boolean uncrypt(in String packageFile, IRecoverySystemProgressListener listener);













    boolean setupBcb(in String command);













    boolean clearBcb();













}