From 1c29d8226bb30ada2398021737ba414de95fc27d Mon Sep 17 00:00:00 2001 From: xSylla Date: Sat, 25 Sep 2021 18:50:10 +0200 Subject: [PATCH] monet: Commonize parts/utils Signed-off-by: xSylla --- device.mk | 4 - parts/Android.bp | 18 -- parts/AndroidManifest.xml | 44 ----- .../devicesettings/BootCompletedReceiver.java | 34 ---- .../devicesettings/utils/FileUtils.java | 165 ------------------ 5 files changed, 265 deletions(-) delete mode 100644 parts/Android.bp delete mode 100644 parts/AndroidManifest.xml delete mode 100644 parts/src/org/lineageos/devicesettings/BootCompletedReceiver.java delete mode 100644 parts/src/org/lineageos/devicesettings/utils/FileUtils.java diff --git a/device.mk b/device.mk index e83735f..11deb54 100644 --- a/device.mk +++ b/device.mk @@ -17,10 +17,6 @@ DEVICE_PACKAGE_OVERLAYS += \ PRODUCT_AAPT_CONFIG := normal PRODUCT_AAPT_PREF_CONFIG := xhdpi -# Device parts -PRODUCT_PACKAGES += \ - DeviceParts - # Boot animation TARGET_SCREEN_HEIGHT := 2400 TARGET_SCREEN_WIDTH := 1080 diff --git a/parts/Android.bp b/parts/Android.bp deleted file mode 100644 index 5b05f23..0000000 --- a/parts/Android.bp +++ /dev/null @@ -1,18 +0,0 @@ -// -// Copyright (C) 2017-2021 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -android_app { - name: "DeviceParts", - - srcs: ["src/**/*.java"], - certificate: "platform", - platform_apis: true, - privileged: true, - - static_libs: [ - "org.lineageos.settings.resources", - ], -} diff --git a/parts/AndroidManifest.xml b/parts/AndroidManifest.xml deleted file mode 100644 index abb6a72..0000000 --- a/parts/AndroidManifest.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/parts/src/org/lineageos/devicesettings/BootCompletedReceiver.java b/parts/src/org/lineageos/devicesettings/BootCompletedReceiver.java deleted file mode 100644 index fdb5cc8..0000000 --- a/parts/src/org/lineageos/devicesettings/BootCompletedReceiver.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod Project - * 2017-2020 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. - * 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 org.lineageos.devicesettings; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -public class BootCompletedReceiver extends BroadcastReceiver { - - private static final boolean DEBUG = false; - private static final String TAG = "DeviceParts"; - - @Override - public void onReceive(final Context context, Intent intent) { - if (DEBUG) Log.d(TAG, "Received boot completed intent"); - } -} diff --git a/parts/src/org/lineageos/devicesettings/utils/FileUtils.java b/parts/src/org/lineageos/devicesettings/utils/FileUtils.java deleted file mode 100644 index e5249f5..0000000 --- a/parts/src/org/lineageos/devicesettings/utils/FileUtils.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod 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 org.lineageos.devicesettings.utils; - -import android.util.Log; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; - -public final class FileUtils { - private static final String TAG = "FileUtils"; - - private FileUtils() { - // This class is not supposed to be instantiated - } - - /** - * Reads the first line of text from the given file. - * Reference {@link BufferedReader#readLine()} for clarification on what a - * line is - * - * @return the read line contents, or null on failure - */ - public static String readOneLine(String fileName) { - String line = null; - BufferedReader reader = null; - - try { - reader = new BufferedReader(new FileReader(fileName), 512); - line = reader.readLine(); - } catch (FileNotFoundException e) { - Log.w(TAG, "No such file " + fileName + " for reading", e); - } catch (IOException e) { - Log.e(TAG, "Could not read from file " + fileName, e); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - // Ignored, not much we can do anyway - } - } - - return line; - } - - /** - * Writes the given value into the given file - * - * @return true on success, false on failure - */ - public static boolean writeLine(String fileName, String value) { - BufferedWriter writer = null; - - try { - writer = new BufferedWriter(new FileWriter(fileName)); - writer.write(value); - } catch (FileNotFoundException e) { - Log.w(TAG, "No such file " + fileName + " for writing", e); - return false; - } catch (IOException e) { - Log.e(TAG, "Could not write to file " + fileName, e); - return false; - } finally { - try { - if (writer != null) { - writer.close(); - } - } catch (IOException e) { - // Ignored, not much we can do anyway - } - } - - return true; - } - - /** - * Checks whether the given file exists - * - * @return true if exists, false if not - */ - public static boolean fileExists(String fileName) { - final File file = new File(fileName); - return file.exists(); - } - - /** - * Checks whether the given file is readable - * - * @return true if readable, false if not - */ - public static boolean isFileReadable(String fileName) { - final File file = new File(fileName); - return file.exists() && file.canRead(); - } - - /** - * Checks whether the given file is writable - * - * @return true if writable, false if not - */ - public static boolean isFileWritable(String fileName) { - final File file = new File(fileName); - return file.exists() && file.canWrite(); - } - - /** - * Deletes an existing file - * - * @return true if the delete was successful, false if not - */ - public static boolean delete(String fileName) { - final File file = new File(fileName); - boolean ok = false; - try { - ok = file.delete(); - } catch (SecurityException e) { - Log.w(TAG, "SecurityException trying to delete " + fileName, e); - } - return ok; - } - - /** - * Renames an existing file - * - * @return true if the rename was successful, false if not - */ - public static boolean rename(String srcPath, String dstPath) { - final File srcFile = new File(srcPath); - final File dstFile = new File(dstPath); - boolean ok = false; - try { - ok = srcFile.renameTo(dstFile); - } catch (SecurityException e) { - Log.w(TAG, - "SecurityException trying to rename " + srcPath + " to " + dstPath, - e); - } catch (NullPointerException e) { - Log.e(TAG, - "NullPointerException trying to rename " + srcPath + " to " + - dstPath, - e); - } - return ok; - } -} \ No newline at end of file