Commit: c4329b1e96e3f5dfe9b3bb9e2c2a64d6e238216f - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revisión: c4329b1e96e3f5dfe9b3bb9e2c2a64d6e238216f (tree)
• Tiempo: 2020-02-21 13:36:01
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Use DownloadManager to get native bridge libraries

Cambiar Resumen

• modified: AndroidManifest.xml
• add: src/com/android/settings/DownloadCompleteReceiver.java
• modified: src/com/android/settings/system/AndroidX86DashboardFragment.java

Diferencia incremental

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3228,6 +3228,12 @@
                 android:value="true" />
         </activity>
 
+        <receiver android:name=".DownloadCompleteReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name=".Settings$AccountDashboardActivity"
             android:label="@string/account_dashboard_title"

--- /dev/null
+++ b/src/com/android/settings/DownloadCompleteReceiver.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 The Android-x86 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 com.android.settings;
+
+import android.app.DownloadManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import static com.android.settings.system.AndroidX86DashboardFragment.onDownloadComplete;
+
+public final class DownloadCompleteReceiver extends BroadcastReceiver {
+    private static final String TAG = "Dl-Receiver";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) {
+            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+            onDownloadComplete(dm);
+        }
+    }
+}

--- a/src/com/android/settings/system/AndroidX86DashboardFragment.java
+++ b/src/com/android/settings/system/AndroidX86DashboardFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android-x86 Open Source Project
+ * Copyright (C) 2018-2020 The Android-x86 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.
@@ -16,34 +16,50 @@
 
 package com.android.settings.system;
 
+import android.app.DownloadManager;
+import android.app.DownloadManager.Query;
+import android.app.DownloadManager.Request;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.SystemProperties;
 import android.support.v7.preference.Preference;
 import android.support.v14.preference.SwitchPreference;
+import android.util.Log;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import dalvik.system.VMRuntime;
+import java.io.File;
 
 public class AndroidX86DashboardFragment extends SettingsPreferenceFragment {
 
+    private DownloadManager mDownloadManager;
     private SwitchPreference mNativeBridgePreference;
     private SwitchPreference mHwInfoPreference;
     private SwitchPreference mAppsUsagePreference;
 
+    private static final String TAG = "Dl-NB";
     private static final String KEY_TOGGLE_NB = "toggle_nb";
     private static final String PROPERTY_NATIVEBRIDGE = "persist.sys.nativebridge";
     private static final String KEY_TOGGLE_HW_INFO = "toggle_hw_info";
     private static final String PROPERTY_HW_INFO = "persist.sys.hw_statistics";
     private static final String KEY_TOGGLE_APPS_USAGE = "toggle_apps_usage";
     private static final String PROPERTY_APPS_USAGE = "persist.sys.apps_statistics";
+    private static final String NB_LIBRARIES = "Native bridge libraries ";
+    private static long sDownloadId = -1;
+    private static int sDownloadStatus = -1;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mDownloadManager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
         addPreferencesFromResource(R.xml.android_x86_options);
         mNativeBridgePreference = (SwitchPreference) findPreference(KEY_TOGGLE_NB);
-        mNativeBridgePreference.setChecked(SystemProperties.getBoolean(PROPERTY_NATIVEBRIDGE, false));
+        checkNativeBridgeStatus();
         mHwInfoPreference = (SwitchPreference) findPreference(KEY_TOGGLE_HW_INFO);
         mHwInfoPreference.setChecked(SystemProperties.getBoolean(PROPERTY_HW_INFO, true));
         mAppsUsagePreference = (SwitchPreference) findPreference(KEY_TOGGLE_APPS_USAGE);
@@ -53,7 +69,7 @@ public class AndroidX86DashboardFragment extends SettingsPreferenceFragment {
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mNativeBridgePreference) {
-            SystemProperties.set(PROPERTY_NATIVEBRIDGE, mNativeBridgePreference.isChecked() ? "1" : "0");
+            setNativeBridge(mNativeBridgePreference.isChecked());
         } else if (preference == mHwInfoPreference) {
             SystemProperties.set(PROPERTY_HW_INFO, Boolean.toString(mHwInfoPreference.isChecked()));
         } else if (preference == mAppsUsagePreference) {
@@ -66,4 +82,104 @@ public class AndroidX86DashboardFragment extends SettingsPreferenceFragment {
     public int getMetricsCategory() {
         return MetricsEvent.APPLICATION;
     }
+
+    private boolean isNativeBridgeAvailable() {
+        File file = new File("/system/lib/libhoudini.so");
+        return file.length() > 0;
+    }
+
+    private void checkNativeBridgeStatus() {
+        boolean nb = SystemProperties.getBoolean(PROPERTY_NATIVEBRIDGE, false);
+        if (!isNativeBridgeAvailable()) {
+            queryDownloading(mDownloadManager);
+            if (sDownloadStatus == DownloadManager.STATUS_RUNNING) {
+                nb = true;
+            } else if (nb) {
+                downloadNativeBridge();
+            }
+        }
+        mNativeBridgePreference.setChecked(nb);
+    }
+
+    private void setNativeBridge(boolean enabled) {
+        Log.d(TAG, "setNativeBridge: " + enabled);
+        if (isNativeBridgeAvailable()) {
+            setNativeBridgeProperty(enabled);
+        } else if (enabled) {
+            downloadNativeBridge();
+        } else if (sDownloadId != -1) {
+            mDownloadManager.remove(sDownloadId);
+            sDownloadId = -1;
+        }
+    }
+
+    private void downloadNativeBridge() {
+        String url, file;
+        if (VMRuntime.getRuntime().is64Bit()) {
+            url = "https://t.cn/EJrmYMH";
+            file = "houdini9_y.sfs";
+        } else {
+            url = "https://t.cn/EJrmzZv";
+            file = "houdini9_x.sfs";
+        }
+
+        File path = Environment.getExternalStoragePublicDirectory("arm");
+        path.mkdirs();
+        File nb = new File(path, file);
+        if (nb.exists()) {
+            if (sDownloadId != -1) {
+                switch (sDownloadStatus) {
+                    case DownloadManager.STATUS_SUCCESSFUL:
+                        setNativeBridgeProperty(true); // fall through
+                    case DownloadManager.STATUS_RUNNING:
+                        return;
+                    default:
+                        break;
+                }
+            }
+            nb.delete();
+        }
+        mDownloadManager.remove(sDownloadId);
+
+        Request request = new Request(Uri.parse(url)).
+                              setDestinationUri(Uri.fromFile(nb)).
+                              setTitle(NB_LIBRARIES + file.substring(7, 10));
+
+        sDownloadId = mDownloadManager.enqueue(request);
+        Log.i(TAG, "downloading " + url);
+    }
+
+    private static void queryDownloading(DownloadManager dm) {
+        Query query = new Query().setFilterByString(NB_LIBRARIES);
+        Cursor c = null;
+        try {
+            c = dm.query(query);
+            if (c.moveToFirst()) {
+                sDownloadId = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_ID));
+                sDownloadStatus = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
+                Log.i(TAG, "id: " + sDownloadId + " status: " + sDownloadStatus);
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "Exception: " + e);
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+    }
+
+    private static void setNativeBridgeProperty(boolean enabled) {
+        SystemProperties.set(PROPERTY_NATIVEBRIDGE, enabled ? "1" : "0");
+    }
+
+    public static void onDownloadComplete(DownloadManager dm) {
+        queryDownloading(dm);
+        boolean success = sDownloadStatus == DownloadManager.STATUS_SUCCESSFUL;
+        if (success) {
+            Log.i(TAG, "download success, native bridge enabled");
+        } else {
+            Log.w(TAG, "download failed: " + sDownloadStatus);
+        }
+        setNativeBridgeProperty(success);
+    }
 }