From 757fef799d74067e7cd51a1d691be8e39df6729f Mon Sep 17 00:00:00 2001 From: Mike Ma Date: Wed, 3 Oct 2018 11:07:08 -0700 Subject: [PATCH] DO NOT MERGE: Fix signature of KernelCpuProcReader Signatures of blacklist APIs were frozen with Pi release. Need to update the signature manually for a change to KernelCpuProcReader introduced in ag/5055721. Bug: 111805985 Fixes: 117089824 Test: Manual build Test: HiddenApiTest#testSignature Change-Id: I2918afa813417e05f3f0578575a7051fd147aa1a --- config/hiddenapi-private-dex.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/hiddenapi-private-dex.txt b/config/hiddenapi-private-dex.txt index 2c4865514c22..c3cf29a7a7b2 100644 --- a/config/hiddenapi-private-dex.txt +++ b/config/hiddenapi-private-dex.txt @@ -111065,11 +111065,11 @@ Lcom/android/internal/os/KernelCpuProcReader;->ERROR_THRESHOLD:I Lcom/android/internal/os/KernelCpuProcReader;->getActiveTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader; Lcom/android/internal/os/KernelCpuProcReader;->getClusterTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader; Lcom/android/internal/os/KernelCpuProcReader;->getFreqTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader; -Lcom/android/internal/os/KernelCpuProcReader;->INITIAL_BUFFER_SIZE:I Lcom/android/internal/os/KernelCpuProcReader;->mActiveTimeReader:Lcom/android/internal/os/KernelCpuProcReader; Lcom/android/internal/os/KernelCpuProcReader;->MAX_BUFFER_SIZE:I -Lcom/android/internal/os/KernelCpuProcReader;->mBuffer:Ljava/nio/ByteBuffer; +Lcom/android/internal/os/KernelCpuProcReader;->mBuffer:[B Lcom/android/internal/os/KernelCpuProcReader;->mClusterTimeReader:Lcom/android/internal/os/KernelCpuProcReader; +Lcom/android/internal/os/KernelCpuProcReader;->mContentSize:I Lcom/android/internal/os/KernelCpuProcReader;->mErrors:I Lcom/android/internal/os/KernelCpuProcReader;->mFreqTimeReader:Lcom/android/internal/os/KernelCpuProcReader; Lcom/android/internal/os/KernelCpuProcReader;->mLastReadTime:J @@ -111079,7 +111079,6 @@ Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_ACTIVE_TIME:Ljava/lang/S Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_CLUSTER_TIME:Ljava/lang/String; Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_FREQ_TIME:Ljava/lang/String; Lcom/android/internal/os/KernelCpuProcReader;->readBytes()Ljava/nio/ByteBuffer; -Lcom/android/internal/os/KernelCpuProcReader;->resize()Z Lcom/android/internal/os/KernelCpuProcReader;->setThrottleInterval(J)V Lcom/android/internal/os/KernelCpuProcReader;->TAG:Ljava/lang/String; Lcom/android/internal/os/KernelCpuSpeedReader; -- 2.11.0