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

Commit 9397c27d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unused code from... 

Merge "Remove unused code from services/core/java/com/android/server/integrity/parser" into main am: cc108c6b am: 782c1e4b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324774



Change-Id: I8d5c6335154230094ea66a49a4170e893e9bf1a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2b1ca98 782c1e4b

services/core/java/com/android/server/integrity/parser/RuleIndexRange.java

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

 * Copyright (C) 2020 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 com.android.server.integrity.parser;



import android.annotation.Nullable;



/**

 * A wrapper class to represent an indexing range.

 */

public class RuleIndexRange {

    private int mStartIndex;

    private int mEndIndex;



    /** Constructor with start and end indexes. */

    public RuleIndexRange(int startIndex, int endIndex) {

        this.mStartIndex = startIndex;

        this.mEndIndex = endIndex;

    }



    /** Returns the startIndex. */

    public int getStartIndex() {

        return mStartIndex;

    }



    /** Returns the end index. */

    public int getEndIndex() {

        return mEndIndex;

    }



    @Override

    public boolean equals(@Nullable Object object) {

        return mStartIndex == ((RuleIndexRange) object).getStartIndex()

                && mEndIndex == ((RuleIndexRange) object).getEndIndex();

    }



    @Override

    public String toString() {

        return String.format("Range{%d, %d}", mStartIndex, mEndIndex);

    }

}

services/core/java/com/android/server/integrity/parser/RuleParseException.java

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

 * Copyright (C) 2019 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 com.android.server.integrity.parser;



import android.annotation.NonNull;



/**

 * Thrown when rule parsing fails.

 */

public class RuleParseException extends Exception {

    public RuleParseException(@NonNull String message) {

        super(message);

    }



    public RuleParseException(@NonNull String message, @NonNull Throwable cause) {

        super(message, cause);

    }

}

services/core/java/com/android/server/integrity/parser/RuleParser.java

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

 * Copyright (C) 2019 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 com.android.server.integrity.parser;



import android.content.integrity.Rule;



import java.util.List;



/** A helper class to parse rules into the {@link Rule} model. */

public interface RuleParser {



    /** Parse rules from bytes. */

    List<Rule> parse(byte[] ruleBytes) throws RuleParseException;



    /** Parse rules from an input stream. */

    List<Rule> parse(RandomAccessObject randomAccessObject, List<RuleIndexRange> ruleIndexRanges)

            throws RuleParseException;

}