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

Commit 905b78e4 authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Publish update info via SystemUpdateManager 

When 16K OTA is applied, this info would need to be published
to a SystemUpdateManager so that we don't clobber the updates with
other pending updates. Similarly, Fetch the pending update info from
SystemUpdateManager before applying update.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 302391134
Bug: 295035851
Change-Id: I4998122942d7f2defd69bc34474230c8aea3c25a
parent 9be05afc

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />

    <uses-permission android:name="android.permission.RESTART_WIFI_SUBSYSTEM" />

    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />

    <uses-permission android:name="android.permission.RECOVERY"/>

    <uses-permission android:name="android.permission.USE_BIOMETRIC" />

    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />

    <uses-permission android:name="android.permission.USER_ACTIVITY" />

src/com/android/settings/development/Enable16kPagesPreferenceController.java

+30 −0
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 
package com.android.settings.development;



import android.content.Context;

import android.os.Bundle;

import android.os.Handler;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.os.PowerManager;

import android.os.SystemProperties;

import android.os.SystemUpdateManager;

import android.os.UpdateEngine;

import android.os.UpdateEngineStable;

import android.os.UpdateEngineStableCallback;
@@ -82,6 +85,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 
    private static final String PAYLOAD_BINARY_FILE_NAME = "payload.bin";

    private static final String PAYLOAD_PROPERTIES_FILE_NAME = "payload_properties.txt";

    private static final int OFFSET_TO_FILE_NAME = 30;

    public static final String EXPERIMENTAL_UPDATE_TITLE = "Android 16K Kernel Experimental Update";



    private @Nullable DevelopmentSettingsDashboardFragment mFragment = null;

    private boolean mEnable16k;
@@ -172,6 +176,14 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 
    public void on16kPagesDialogDismissed() {}



    private void installUpdate() {

        SystemUpdateManager manager = mContext.getSystemService(SystemUpdateManager.class);

        Bundle data = manager.retrieveSystemUpdateInfo();

        int status = data.getInt(SystemUpdateManager.KEY_STATUS);

        if (status != SystemUpdateManager.STATUS_UNKNOWN

                && status != SystemUpdateManager.STATUS_IDLE) {

            throw new RuntimeException("System has pending update!");

        }



        String updateFilePath = mEnable16k ? OTA_16K_PATH : OTA_4K_PATH;

        try {

            File updateFile = new File(updateFilePath);
@@ -295,11 +307,20 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 


            if (errorCode == UpdateEngine.ErrorCodeConstants.SUCCESS) {

                Log.i(TAG, "applyPayload successful");



                // Save changed preference

                Settings.Global.putInt(

                        mContext.getContentResolver(),

                        Settings.Global.ENABLE_16K_PAGES,

                        mEnable16k ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE);



                // Publish system update info

                SystemUpdateManager manager =

                        (SystemUpdateManager)

                                mContext.getSystemService(Context.SYSTEM_UPDATE_SERVICE);

                manager.updateSystemUpdateInfo(getUpdateInfo());



                // Restart device to complete update

                PowerManager pm = mContext.getSystemService(PowerManager.class);

                pm.reboot(REBOOT_REASON);

            } else {
@@ -323,4 +344,13 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen 
        builder.setCancelable(false);

        return builder.create();

    }



    private PersistableBundle getUpdateInfo() {

        PersistableBundle infoBundle = new PersistableBundle();

        infoBundle.putInt(

                SystemUpdateManager.KEY_STATUS, SystemUpdateManager.STATUS_WAITING_REBOOT);

        infoBundle.putBoolean(SystemUpdateManager.KEY_IS_SECURITY_UPDATE, false);

        infoBundle.putString(SystemUpdateManager.KEY_TITLE, EXPERIMENTAL_UPDATE_TITLE);

        return infoBundle;

    }

}