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

Commit 820feebe authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Remove Test Api annotation from ProtoInputStream" into qt-dev am: 9f7dba61 

am: 372ea6b2

Change-Id: Ia0fd9f2023c191c45cb4d17f9d2b69684ec49c90
parents e8b7492a 372ea6b2

api/test-current.txt

+0 −25
Original line number Diff line number Diff line
@@ -2882,31 +2882,6 @@ package android.util.proto { 
    method public void writeRawZigZag64(long);

  }



  public final class ProtoInputStream extends android.util.proto.ProtoStream {

    ctor public ProtoInputStream(java.io.InputStream, int);

    ctor public ProtoInputStream(java.io.InputStream);

    ctor public ProtoInputStream(byte[]);

    method public int decodeZigZag32(int);

    method public long decodeZigZag64(long);

    method public String dumpDebugData();

    method public void end(long);

    method public int getFieldNumber();

    method public int getOffset();

    method public int getWireType();

    method public boolean isNextField(long) throws java.io.IOException;

    method public int nextField() throws java.io.IOException;

    method public boolean readBoolean(long) throws java.io.IOException;

    method public byte[] readBytes(long) throws java.io.IOException;

    method public double readDouble(long) throws java.io.IOException;

    method public float readFloat(long) throws java.io.IOException;

    method public int readInt(long) throws java.io.IOException;

    method public long readLong(long) throws java.io.IOException;

    method public String readString(long) throws java.io.IOException;

    method public void skip() throws java.io.IOException;

    method public long start(long) throws java.io.IOException;

    field public static final int NO_MORE_FIELDS = -1; // 0xffffffff

  }



  public final class ProtoOutputStream extends android.util.proto.ProtoStream {

    ctor public ProtoOutputStream();

    ctor public ProtoOutputStream(int);

core/java/android/util/proto/ProtoInputStream.java

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.util.proto;



import android.annotation.TestApi;



import java.io.IOException;

import java.io.InputStream;

import java.nio.charset.StandardCharsets;
@@ -64,7 +62,6 @@ import java.util.ArrayList; 
 *

 * @hide

 */

@TestApi

public final class ProtoInputStream extends ProtoStream {



    public static final int NO_MORE_FIELDS = -1;

core/java/android/util/proto/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "ProtoInputStreamTests"

    }

  ]

}
 
 No newline at end of file

tests/ProtoInputStreamTests/Android.mk

0 → 100644
+34 −0
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.



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_PACKAGE_NAME := ProtoInputStreamTests

LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_MODULE_TAGS := tests optional

LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-proto-files-under, src)

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx.test.rules \

    frameworks-base-testutils \

    mockito-target-minus-junit4



include $(BUILD_PACKAGE)
 
 No newline at end of file

tests/ProtoInputStreamTests/AndroidManifest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.test.protoinputstream">

    <application>

        <uses-library android:name="android.test.runner"/>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.test.protoinputstream"

                     android:label="ProtoInputStream Tests">

    </instrumentation>

</manifest>
 
 No newline at end of file