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

Commit cb269aac authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jeff Sharkey
Browse files

Get CtsProviderTestCases building against API. 

To help confirm that we're actually testing developer-visible
behaviors, we need to build against public APIs, since there have
been plenty of examples in this suite of "testing" hidden API
behaviors, which are then misleading to developers.

Bug: 120429729
Test: atest cts/tests/tests/provider/
Exempt-From-Owner-Approval: Trivial API annotations
Change-Id: I07fe33e54f611a6060217f0706fb99b809961f4d
parent 35167389

api/test-current.txt

+40 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ package android { 
    field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";

    field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";

    field public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";

    field public static final String CONFIGURE_DISPLAY_BRIGHTNESS = "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";

    field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";

    field public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
@@ -1053,6 +1054,10 @@ package android.os { 
    method public static java.io.File getStorageDirectory();

  }



  public class FileUtils {

    method public static boolean contains(java.io.File, java.io.File);

  }



  public abstract class HwBinder implements android.os.IHwBinder {

    ctor public HwBinder();

    method public static final void configureRpcThreadpool(long, boolean);
@@ -1218,6 +1223,10 @@ package android.os { 
    method public boolean hasSingleFileDescriptor();

  }



  public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {

    method public static java.io.File getFile(java.io.FileDescriptor) throws java.io.IOException;

  }



  public final class PowerManager {

    method @RequiresPermission("android.permission.POWER_SAVER") public int getPowerSaveMode();

    method @RequiresPermission("android.permission.POWER_SAVER") public boolean setDynamicPowerSavings(boolean, int);
@@ -1485,17 +1494,37 @@ package android.print { 


package android.provider {



  public static final class CalendarContract.Calendars implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.SyncColumns {

    field public static final String[] SYNC_WRITABLE_COLUMNS;

  }



  public static final class CalendarContract.Events implements android.provider.BaseColumns android.provider.CalendarContract.CalendarColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.SyncColumns {

    field public static final String[] SYNC_WRITABLE_COLUMNS;

  }



  public final class ContactsContract {

    field public static final String HIDDEN_COLUMN_PREFIX = "x_";

  }



  public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {

    field public static final android.net.Uri ENTERPRISE_CONTENT_URI;

  }



  public static final class ContactsContract.PinnedPositions {

    field public static final String UNDEMOTE_METHOD = "undemote";

  }



  public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns {

    field public static final android.net.Uri CORP_CONTENT_URI;

  }



  public final class MediaStore {

    method @RequiresPermission("android.permission.CLEAR_APP_USER_DATA") public static void deleteContributedMedia(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;

    method @RequiresPermission("android.permission.CLEAR_APP_USER_DATA") public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;

    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static void deleteContributedMedia(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;

    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;

    method @NonNull public static java.io.File getVolumePath(@NonNull String) throws java.io.FileNotFoundException;

    method @NonNull public static java.util.Collection<java.io.File> getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException;

    field public static final String SCAN_FILE_CALL = "scan_file";

    field public static final String SCAN_VOLUME_CALL = "scan_volume";

  }



  public final class Settings {
@@ -1555,6 +1584,10 @@ package android.provider { 
    field public static final String SMS_CARRIER_PROVISION_ACTION = "android.provider.Telephony.SMS_CARRIER_PROVISION";

  }



  public static final class VoicemailContract.Voicemails implements android.provider.BaseColumns android.provider.OpenableColumns {

    field public static final String _DATA = "_data";

  }



}



package android.security {
@@ -1829,10 +1862,15 @@ package android.telephony { 
  }



  public class TelephonyManager {

    method public int checkCarrierPrivilegesForPackage(String);

    method public int getCarrierIdListVersion();

    method public boolean isRttSupported();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();

    method public void setCarrierTestOverride(String, String, String, String, String, String, String);

    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe

    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

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

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

  }

config/hiddenapi-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ Landroid/os/ParcelableParcel;->getClassLoader()Ljava/lang/ClassLoader; 
Landroid/os/ParcelableParcel;->getParcel()Landroid/os/Parcel;

Landroid/os/ParcelFileDescriptor;-><init>(Ljava/io/FileDescriptor;)V

Landroid/os/ParcelFileDescriptor;->fromData([BLjava/lang/String;)Landroid/os/ParcelFileDescriptor;

Landroid/os/ParcelFileDescriptor;->getFile(Ljava/io/FileDescriptor;)Ljava/io/File;

Landroid/os/ParcelFileDescriptor;->seekTo(J)J

Landroid/os/PerformanceCollector;-><init>()V

Landroid/os/PerformanceCollector;->beginSnapshot(Ljava/lang/String;)V

core/java/android/os/FileUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import static android.system.OsConstants.W_OK; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.ContentResolver;

import android.provider.DocumentsContract.Document;

import android.system.ErrnoException;
@@ -852,6 +853,7 @@ public class FileUtils { 
     *

     * @hide

     */

    @TestApi

    public static boolean contains(File dir, File file) {

        if (dir == null || file == null) return false;

        return contains(dir.getAbsolutePath(), file.getAbsolutePath());

core/java/android/os/ParcelFileDescriptor.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static android.system.OsConstants.S_ISLNK; 
import static android.system.OsConstants.S_ISREG;

import static android.system.OsConstants.S_IWOTH;



import android.annotation.TestApi;

import android.content.BroadcastReceiver;

import android.content.ContentProvider;

import android.os.MessageQueue.OnFileDescriptorEventListener;
@@ -580,6 +581,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
     *

     * @hide

     */

    @TestApi

    public static File getFile(FileDescriptor fd) throws IOException {

        try {

            final String path = Os.readlink("/proc/self/fd/" + fd.getInt$());

core/java/android/provider/CalendarContract.java

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.provider; 
import android.annotation.NonNull;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.AlarmManager;
@@ -805,6 +806,7 @@ public final class CalendarContract { 
         *

         * @hide

         */

        @TestApi

        public static final String[] SYNC_WRITABLE_COLUMNS = new String[] {

            ACCOUNT_NAME,

            ACCOUNT_TYPE,
@@ -1832,6 +1834,7 @@ public final class CalendarContract { 
         *

         * @hide

         */

        @TestApi

        public static final String[] SYNC_WRITABLE_COLUMNS = new String[] {

            _SYNC_ID,

            DIRTY,