diff options
| -rw-r--r-- | configpanel/AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java (renamed from configpanel/src/org/lineageos/settings/device/Startup.java) | 59 | ||||
| -rw-r--r-- | configpanel/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.java | 2 | ||||
| -rw-r--r-- | pocketmode/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | pocketmode/src/org/lineageos/pocketmode/BootCompletedReceiver.java (renamed from pocketmode/src/org/lineageos/pocketmode/Startup.java) | 11 |
5 files changed, 42 insertions, 46 deletions
diff --git a/configpanel/AndroidManifest.xml b/configpanel/AndroidManifest.xml index 4ee1dad..2ed9338 100644 --- a/configpanel/AndroidManifest.xml +++ b/configpanel/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2016 The CyanogenMod Project - Copyright (C) 2017-2018 The LineageOS Project + Copyright (C) 2017-2019 The LineageOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ <protected-broadcast android:name="org.lineageos.settings.device.CUST_UPDATE" /> - <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-sdk android:minSdkVersion="27" /> @@ -56,9 +56,10 @@ </intent-filter> </activity> - <receiver android:name=".Startup" > + <receiver android:name=".BootCompletedReceiver" > <intent-filter> - <action android:name="lineageos.intent.action.INITIALIZE_LINEAGE_HARDWARE" /> + <action android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </receiver> </application> diff --git a/configpanel/src/org/lineageos/settings/device/Startup.java b/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java index 2f3f8fd..90546b4 100644 --- a/configpanel/src/org/lineageos/settings/device/Startup.java +++ b/configpanel/src/org/lineageos/settings/device/BootCompletedReceiver.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 The CyanogenMod Project - * (C) 2017-2018 The LineageOS Project + * (C) 2017-2019 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,44 +28,41 @@ import android.util.Log; import org.lineageos.internal.util.FileUtils; -public class Startup extends BroadcastReceiver { +public class BootCompletedReceiver extends BroadcastReceiver { - private static final String TAG = Startup.class.getSimpleName(); + private static final String TAG = BootCompletedReceiver.class.getSimpleName(); @Override public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (lineageos.content.Intent.ACTION_INITIALIZE_LINEAGE_HARDWARE.equals(action)) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - // Disable button settings if needed - if (!hasButtonProcs()) { - disableComponent(context, ButtonSettingsActivity.class.getName()); - } else { - enableComponent(context, ButtonSettingsActivity.class.getName()); + // Disable button settings if needed + if (!hasButtonProcs()) { + disableComponent(context, ButtonSettingsActivity.class.getName()); + } else { + enableComponent(context, ButtonSettingsActivity.class.getName()); - // Restore nodes to saved preference values - for (String pref : Constants.sButtonPrefKeys) { - String node, value; - if (Constants.sStringNodePreferenceMap.containsKey(pref)) { - node = Constants.sStringNodePreferenceMap.get(pref); - value = Utils.getPreferenceString(context, pref); - } else { - node = Constants.sBooleanNodePreferenceMap.get(pref); - value = Utils.isPreferenceEnabled(context, pref) ? "1" : "0"; - } - if (!FileUtils.writeLine(node, value)) { - Log.w(TAG, "Write to node " + node + - " failed while restoring saved preference values"); - } + // Restore nodes to saved preference values + for (String pref : Constants.sButtonPrefKeys) { + String node, value; + if (Constants.sStringNodePreferenceMap.containsKey(pref)) { + node = Constants.sStringNodePreferenceMap.get(pref); + value = Utils.getPreferenceString(context, pref); + } else { + node = Constants.sBooleanNodePreferenceMap.get(pref); + value = Utils.isPreferenceEnabled(context, pref) ? "1" : "0"; + } + if (!FileUtils.writeLine(node, value)) { + Log.w(TAG, "Write to node " + node + + " failed while restoring saved preference values"); } - - // Send initial broadcasts - final boolean shouldEnablePocketMode = - prefs.getBoolean(Constants.FP_WAKEUP_KEY, false) && - prefs.getBoolean(Constants.FP_POCKETMODE_KEY, false); - Utils.broadcastCustIntent(context, shouldEnablePocketMode); } + + // Send initial broadcasts + final boolean shouldEnablePocketMode = + prefs.getBoolean(Constants.FP_WAKEUP_KEY, false) && + prefs.getBoolean(Constants.FP_POCKETMODE_KEY, false); + Utils.broadcastCustIntent(context, shouldEnablePocketMode); } } diff --git a/configpanel/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.java b/configpanel/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.java index adff870..ebb9557 100644 --- a/configpanel/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.java +++ b/configpanel/src/org/lineageos/settings/device/ConfigPanelSearchIndexablesProvider.java @@ -60,7 +60,7 @@ public class ConfigPanelSearchIndexablesProvider extends SearchIndexablesProvide @Override public Cursor queryXmlResources(String[] projection) { MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS); - if (Startup.hasButtonProcs() /* show button panel */) { + if (BootCompletedReceiver.hasButtonProcs() /* show button panel */) { cursor.addRow(generateResourceRef(INDEXABLE_RES[SEARCH_IDX_BUTTON_PANEL])); } return cursor; diff --git a/pocketmode/AndroidManifest.xml b/pocketmode/AndroidManifest.xml index fe9e42f..90150ef 100644 --- a/pocketmode/AndroidManifest.xml +++ b/pocketmode/AndroidManifest.xml @@ -21,7 +21,7 @@ android:versionName="1.2" android:sharedUserId="android.uid.system"> - <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-sdk android:minSdkVersion="27" /> @@ -32,9 +32,10 @@ android:defaultToDeviceProtectedStorage="true" android:directBootAware="true"> - <receiver android:name=".Startup" > + <receiver android:name=".BootCompletedReceiver" > <intent-filter android:priority="99" > - <action android:name="lineageos.intent.action.INITIALIZE_LINEAGE_HARDWARE" /> + <action android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </receiver> diff --git a/pocketmode/src/org/lineageos/pocketmode/Startup.java b/pocketmode/src/org/lineageos/pocketmode/BootCompletedReceiver.java index 39b3371..97b481f 100644 --- a/pocketmode/src/org/lineageos/pocketmode/Startup.java +++ b/pocketmode/src/org/lineageos/pocketmode/BootCompletedReceiver.java @@ -23,17 +23,14 @@ import android.content.Intent; import android.os.UserHandle; import android.util.Log; -public class Startup extends BroadcastReceiver { +public class BootCompletedReceiver extends BroadcastReceiver { private static final String TAG = "ZukPocketMode"; @Override public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (lineageos.content.Intent.ACTION_INITIALIZE_LINEAGE_HARDWARE.equals(action)) { - Log.d(TAG, "Starting"); - context.startServiceAsUser(new Intent(context, PocketModeService.class), - UserHandle.CURRENT); - } + Log.d(TAG, "Starting"); + context.startServiceAsUser(new Intent(context, PocketModeService.class), + UserHandle.CURRENT); } } |