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

Commit d89c7790 authored by Paul Duffin's avatar Paul Duffin Committed by Jiyong Park
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
(cherry-picked from commit bd97e3dd)

Merged-In: Id325b8cf2f189117ac4cfe7634095ab710eee004
Change-Id: Id325b8cf2f189117ac4cfe7634095ab710eee004
parent cfc6897a

test-mock/Android.mk

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




LOCAL_PATH:= $(call my-dir)

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) \





# Generate the stub source files for android.test.mock.stubs

# Generate the stub source files for android.test.mock.stubs

# ==========================================================

# ==========================================================
@@ -63,6 +68,8 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true 
# Make sure to run droiddoc first to generate the stub source files.

# Make sure to run droiddoc first to generate the stub source files.

LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)

LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)





LOCAL_SDK_VERSION := current



include $(BUILD_STATIC_JAVA_LIBRARY)

include $(BUILD_STATIC_JAVA_LIBRARY)





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

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

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

+0 −122

File changed.

Preview size limit exceeded, changes collapsed.

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

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

  public deprecated class MockPackageManager extends android.content.pm.PackageManager {

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

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

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

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

    method public boolean setInstantAppCookie(byte[]);

  }

  }





}

}