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

Commit 94058265 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Gerrit Code Review
Browse files

Revert "Utils required for CrashRecovery module" 

This reverts commit 0f91c2b9.

Reason for revert: Need to move back files to original place.

Change-Id: Icb7ab9956f2b662dd918a6be3941e830f1e05002
parent 0f91c2b9

packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java

+3 −3
Original line number Diff line number Diff line
@@ -38,15 +38,15 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.BackgroundThread;

import android.util.LongArrayQueue;

import android.util.Slog;

import android.util.Xml;

import android.utils.BackgroundThread;

import android.utils.LongArrayQueue;

import android.utils.XmlUtils;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.XmlUtils;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

packages/CrashRecovery/services/java/com/android/server/RescueParty.java

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.VersionedPackage;

import android.os.Build;

import android.os.Environment;

import android.os.FileUtils;

import android.os.PowerManager;

import android.os.RecoverySystem;

import android.os.SystemClock;
@@ -41,11 +42,10 @@ import android.text.TextUtils; 
import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;

import android.utils.ArrayUtils;

import android.utils.FileUtils;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.server.PackageWatchdog.FailureReasons;

import com.android.server.PackageWatchdog.PackageHealthObserver;

import com.android.server.PackageWatchdog.PackageHealthObserverImpact;

packages/CrashRecovery/services/java/com/android/utils/BackgroundThread.java→packages/CrashRecovery/services/java/com/android/util/BackgroundThread.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.utils;

package android.util;



import android.annotation.NonNull;

import android.os.Handler;

packages/CrashRecovery/services/java/com/android/utils/HandlerExecutor.java→packages/CrashRecovery/services/java/com/android/util/HandlerExecutor.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.utils;

package android.util;



import android.annotation.NonNull;

import android.os.Handler;

packages/CrashRecovery/services/java/com/android/utils/ArrayUtils.java

deleted100644 → 0
+0 −115
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.utils;



import android.annotation.NonNull;

import android.annotation.Nullable;



import java.io.File;

import java.util.List;

import java.util.Objects;



/**

 * Copied over from frameworks/base/core/java/com/android/internal/util/ArrayUtils.java

 *

 * @hide

 */

public class ArrayUtils {

    private ArrayUtils() { /* cannot be instantiated */ }

    public static final File[] EMPTY_FILE = new File[0];





    /**

     * Return first index of {@code value} in {@code array}, or {@code -1} if

     * not found.

     */

    public static <T> int indexOf(@Nullable T[] array, T value) {

        if (array == null) return -1;

        for (int i = 0; i < array.length; i++) {

            if (Objects.equals(array[i], value)) return i;

        }

        return -1;

    }



    /** @hide */

    public static @NonNull File[] defeatNullable(@Nullable File[] val) {

        return (val != null) ? val : EMPTY_FILE;

    }



    /**

     * Checks if given array is null or has zero elements.

     */

    public static boolean isEmpty(@Nullable int[] array) {

        return array == null || array.length == 0;

    }



    /**

     * True if the byte array is null or has length 0.

     */

    public static boolean isEmpty(@Nullable byte[] array) {

        return array == null || array.length == 0;

    }



    /**

     * Converts from List of bytes to byte array

     * @param list

     * @return byte[]

     */

    public static byte[] toPrimitive(List<byte[]> list) {

        if (list.size() == 0) {

            return new byte[0];

        }

        int byteLen = list.get(0).length;

        byte[] array = new byte[list.size() * byteLen];

        for (int i = 0; i < list.size(); i++) {

            for (int j = 0; j < list.get(i).length; j++) {

                array[i * byteLen + j] = list.get(i)[j];

            }

        }

        return array;

    }



    /**

     * Adds value to given array if not already present, providing set-like

     * behavior.

     */

    public static @NonNull int[] appendInt(@Nullable int[] cur, int val) {

        return appendInt(cur, val, false);

    }



    /**

     * Adds value to given array.

     */

    public static @NonNull int[] appendInt(@Nullable int[] cur, int val,

            boolean allowDuplicates) {

        if (cur == null) {

            return new int[] { val };

        }

        final int n = cur.length;

        if (!allowDuplicates) {

            for (int i = 0; i < n; i++) {

                if (cur[i] == val) {

                    return cur;

                }

            }

        }

        int[] ret = new int[n + 1];

        System.arraycopy(cur, 0, ret, 0, n);

        ret[n] = val;

        return ret;

    }

}