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

Commit bd97e3dd authored by Paul Duffin's avatar Paul Duffin
Browse files

Fix visibility issues with android.test.mock.stubs 

This ensures that the API definitions for the android.test.mock package
matches the definitions in the api/current.txt file.

Bug: 30188076
Test: make update-api
Change-Id: Id325b8cf2f189117ac4cfe7634095ab710eee004
parent 8ca1e41a

test-mock/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 


LOCAL_PATH:= $(call my-dir)



android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)

# Includes the main framework source to ensure that doclava has access to the

# visibility information for the base classes of the mock classes. Without it

# otherwise hidden methods could be visible.

android_test_mock_source_files := \

    $(call all-java-files-under, src/android/test/mock) \

    $(call all-java-files-under, ../core/java) \



# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
@@ -67,6 +72,8 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true 
LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)

android_test_mock_gen_stamp :=



LOCAL_SDK_VERSION := current



include $(BUILD_STATIC_JAVA_LIBRARY)



# Archive a copy of the classes.jar in SDK build.

test-mock/api/android-test-mock-current.txt

+0 −121

File changed.

Preview size limit exceeded, changes collapsed.

test-mock/api/android-test-mock-removed.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ package android.test.mock { 
  public deprecated class MockPackageManager extends android.content.pm.PackageManager {

    method public deprecated java.lang.String getDefaultBrowserPackageName(int);

    method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);

    method public boolean setInstantAppCookie(byte[]);

  }



}