Commit Graph

1103 Commits

Author SHA1 Message Date
TreeHugger Robot
19e6a8c5c1 Merge "remove framework_base_subdirs" 2019-11-16 08:08:52 +00:00
Jiyong Park
9718349faa Revert "Replace framework-annotation-proc java lib with framework-all"
This reverts commit 0b5eb9a486.

Reason for revert: Broke CtsAndroidTestBase28ApiSignatureTestCases
Bug: 144448055
Test: CtsAndroidTestBase28ApiSignatureTestCases

Change-Id: Ic6997f7b83318fa5d0c819c197cb5965adc31347
2019-11-14 12:13:54 +09:00
TreeHugger Robot
3950314b01 Merge "Java API for pulled atoms" 2019-11-13 23:20:27 +00:00
Tej Singh
5918429fa2 Java API for pulled atoms
This creates a java API for registering pullers. Will implement the
statsd side in a follow up CL.

Test: builds, boots
Change-Id: Ib6735984297ce3148839a6370a3c15b2a585baf5
2019-11-13 13:22:27 -08:00
atrost
56dea3a7cc resolve merge conflicts of 8e8c40b5c2 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3ee4dce9639f9b66a44828f28c1fa7cd645dfe5
2019-11-13 17:21:20 +00:00
Paul Duffin
a3d7e44e19 Merge "Move rewriting of references in OpenJDK source files to libcore" am: 9e9a777021 am: 43ab63fe75
am: 84e6f25e26

Change-Id: I1640854f836a5a38c02a7f675fba7aa7ac043361
2019-11-13 06:15:17 -08:00
TreeHugger Robot
8e7971fe72 Merge "Replace framework-annotation-proc java lib with framework-all" 2019-11-13 12:12:56 +00:00
Anna Trostanetski
b4852382fa Merge "Move android.compat.annotation package out of libcore" 2019-11-13 12:12:24 +00:00
Songchun Fan
7e093d7e7d Merge "[incremental] fundamental aidl interfaces" 2019-11-12 23:01:46 +00:00
Jiyong Park
0b5eb9a486 Replace framework-annotation-proc java lib with framework-all
The purpose of the java lib framework-annotation-proc is to run some
annotation processesors on source files in framework-all-sources.
However, running an annotation processor requires the compilation
of the entire source files; in fact, the output of the annotation
processors are created as byproduct of the compilation. This is a
duplicated compliation because we already are compiling the source files
for the framework-all java lib. To reduce the duplication, replacing
the references to framework-annotation-proc with framework-all, and
removing framework-annotation-proc.

Test: m
Change-Id: I449488cba235211374e2825df97aae84395e60b6
2019-11-12 19:11:48 +09:00
Jiyong Park
e53786e864 remove framework_base_subdirs
Metalava no longer requires it at least for droidstubs in this
directory. Even when local_sourcepath is not set, the -sourcepath option
is set to the module directory (frameworks/base in this case), and
metalava tries to find package.html files under the directory to know if
a package is hidden or not.

Bug: 144264106
Test: m

Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
2019-11-12 14:58:36 +09:00
Paul Duffin
338163b279 Move rewriting of references in OpenJDK source files to libcore
Test: m offline-sdk-docs
      diffed against previous version to ensure this did not change it
Bug: 129765390

Change-Id: I28b5b76744b096c56959ef3b0a6f31fe163b5e4d
2019-11-11 20:19:46 +00:00
Paul Duffin
7de644ffd4 Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs" am: 1a2b940646 am: 2795f9dd92
am: a9b90e91bf

Change-Id: I2aed877054e40ccc0f479194cb38aae0270ceb3f
2019-11-11 10:07:51 -08:00
atrost
1a9455046c Move android.compat.annotation package out of libcore
Test: m + flash
Bug: 142650523
Change-Id: I1321195c8724485a90b162b32c3c8549dbd11c42
2019-11-11 15:10:57 +00:00
Paul Duffin
64b7d40250 Stop merging in annotations from ojluni-annotated-sdk-stubs
The annotations are already merged into the stubs that are exported
from libcore so this is unnecessary.

Bug: 142113521
Test: m checkbuild
      test this change does not change offline-sdk-docs
Change-Id: Icb0b61f80c91f96eaa22a7f1b92ffdf1825636c8
2019-11-08 08:22:35 +00:00
Sudheer Shanka
f5b36964e0 Add a new system service for blob store management.
This change adds a bare-bones system service, implementation will follow
later.

Bug: 143559646
Test: atest cts/tests/BlobStore/src/com/android/cts/blob/BlobStoreManagerTest.java
Change-Id: Idf21dfcd11dd32a42b62c6ad965d6f5ad7eed1b4
2019-11-07 13:37:14 -08:00
Paul Duffin
b45e5a7f94 Merge "Remove unnecessary --hide-package options" am: d4c8842a8a am: 93802493c0
am: 0b5310c3bb

Change-Id: Ia51467e934e22b4c92bc23117fffc124a5efd2bb
2019-11-07 04:43:50 -08:00
Treehugger Robot
d4c8842a8a Merge "Remove unnecessary --hide-package options" 2019-11-07 12:07:04 +00:00
Songchun Fan
0037c3fef2 [incremental] fundamental aidl interfaces
Please review the fundamental AIDL interfaces for enabling
the Incremenetal feature. Basically there are three services:

+ android.os.incremental.IIncrementalService:
Provides basic file operation functions. Will be implemented in native.

+ android.os.incremental.IIncrementalServiceProxy:
Started by SystemServer, is it the proxy that starts native
Incremental Service. The proxy also handles Java tasks like finding
data loader service package, binding to data loader service and talking
to it. Essentially the native Incremental Service controls the
data loader service via this proxy. Will be implemented in Java.

+ android.service.incremental.IIncrementalDataLoaderService:
Defines inteface for the base data loader service. I understand that
data loader is being re-designed but I would like to get the
"placeholder" in master first, and we can iterate on the implementation
details in master.

Test: builds
Change-Id: Ifc3a43633356951b239486d66ee80d120bc4ab76
2019-11-06 11:39:02 -08:00
Paul Duffin
7fb76966a4 Remove unnecessary --hide-package options
The com.android.okhttp and com.android.org.conscrypt packages are no
longer present in the input source so do not need hiding.

Bug: 142113521
Test: m checkbuild
Change-Id: I303b054ec114450b5fce3482eddf3cc3749d3814
2019-11-06 14:18:38 +00:00
Adrian Roos
30602b58ba Merge "API Lint: Ignore CallbackInterface in platform" am: c58832221c am: 1d95a273ff
am: f2d84d6f53

Change-Id: I71e9327e931840499475fd314abbf1854dabccc8
2019-11-05 11:02:11 -08:00
Adrian Roos
c58832221c Merge "API Lint: Ignore CallbackInterface in platform" 2019-11-05 16:17:43 +00:00
Roshan Pius
62efd10ecd Merge "Wifi: JarJar HandlerExecutor" 2019-11-04 21:49:17 +00:00
Michele Berionne
45ccd7acfb Merge "Addition of util library" 2019-11-04 21:35:13 +00:00
Roshan Pius
b0d9a240b1 Wifi: JarJar HandlerExecutor
Removes @hide dependency for wifi stack.

Bug: 142935310
Test: Compiles
Change-Id: I3e3e680b093f74587b441ae34e25220c0fba00d4
2019-11-04 20:00:57 +00:00
Adrian Roos
a90de2e13d API Lint: Ignore CallbackInterface in platform
It is okay to use callback interfaces because with Java 8 default interface
methods avoid the extensibility issue interfaces had previously.

Test: make checkapi
Change-Id: I7c931af638b83b4242f03dde9bc460b0981f66cd
2019-11-04 19:44:57 +00:00
Amit Mahajan
153d31bc37 Move MmsManager and IMms to frameworks/base/mms
Test: basic sanity
Bug: 140763963
Merged-in: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
Change-Id: Ib2cffce98f62913c3e50c59b63012c39d595d9ce
(cherry picked from commit 6237a6b35c)
2019-11-04 11:27:49 -08:00
Paul Duffin
2210995d9e Merge "Remove libcore implementation source from hiddenapi-mappings" am: 28c3ca2d41 am: 51a20be6ce
am: b159ad47e6

Change-Id: I9308eff29946c2d219c5af198a6e63eef19b0e2b
2019-11-04 09:00:47 -08:00
Adrian Roos
8fa64738e9 Merge "Revert "Revert "API Lint: Enable for TestApi""" 2019-11-04 16:22:21 +00:00
Adrian Roos
d1715e8cee Revert "Revert "API Lint: Enable for TestApi""
This reverts commit 718428355f.

Fixes: 139833475
Test: make droid
Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525
Merged-In: I61316a8f314dccb7718bf8ab159e167d554d2525
2019-11-04 16:33:39 +01:00
Paul Duffin
1e0342fd2c Remove libcore implementation source from hiddenapi-mappings
There is an overlap between the source code provided by the
metalava-api-stubs-default and that provided by the
non_openjdk_java_files and openjdk_java_files filegroups. That causes
problems when switching the API generation from libcore implementation
code to libcore stubs code.

Removing the libcore implementation sources will remove any mappings
from class/member signatures to source location for any files from
libcore but that should not be a problem as that was only used for
batch addition of UnsupportedAppUsage annotations and that has alreadu
been done.

Bug: 143864733
Test: m hiddenapi-mappings && m checkbuild
Change-Id: Id47dcb8fc497c9bafa6f501cb2debb835a5f6942
2019-11-04 14:11:04 +00:00
Amit Mahajan
b14b8bf449 Merge "Create frameworks/base/telephony/common for common non-mainline telephony code." 2019-11-03 17:19:42 +00:00
Jiyong Park
d60c0eaebc Merge "android.test.mock is built with much less number of sources" am: f0b9dfc0b1 am: a321a944ea
am: dcfd8ddce7

Change-Id: I67d7d2e9e490fd71c472e38e105c8fcfcb17df60
2019-11-02 01:27:25 -07:00
Amit Mahajan
ac0fd65067 Create frameworks/base/telephony/common for common non-mainline telephony code.
And move mms util code to the new folder.

Test: basic sanity
Bug: 140763963
Merged-in: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
Change-Id: I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22
(cherry picked from commit d355153dcb)
2019-11-01 16:21:14 -07:00
Michele
badc021aee Addition of util library
Bug: 137202333
Test: Compilation
Test: Scripts to verify correct usage of rules
Change-Id: I20e48e66d6c429a67d367efc2a73991c3aad825c
2019-11-01 11:20:45 -07:00
Brad Ebinger
7a11056a3e Merge "Remove AsyncResult from ims lib for now" 2019-11-01 16:35:18 +00:00
Adrian Roos
7c68a4023b Revert "Revert "API Lint: Enable for TestApi""
This reverts commit 718428355f.

Fixes: 139833475
Test: make droid
Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525
2019-11-01 08:46:15 +01:00
Brad Ebinger
62cccc3f7a Remove AsyncResult from ims lib for now
Remove AsyncResult until dependencies in telephony library
are resolved.

Bug: 143720225
Test: atest FrameworksTelephonyTests
Change-Id: Ib1b0eaa4174cd88b339210c9802e37ae14a3c764
2019-10-31 23:39:08 +00:00
Adrian Roos
a6507293a5 Merge "Revert "API Lint: Enable for TestApi"" 2019-10-31 14:37:48 +00:00
Adrian Roos
718428355f Revert "API Lint: Enable for TestApi"
This reverts commit 375e276553.

Reason for revert: Breaks the build
Bug: 139833475

Change-Id: I21c2c25152a91b71007f766502c19043ec17a836
2019-10-31 14:36:29 +00:00
Adrian Roos
6d9a140f15 Merge "API Lint: Enable for TestApi" 2019-10-31 13:55:41 +00:00
Jiyong Park
00ea0b1f91 android.test.mock is built with much less number of sources
android.test.mock is built with its own sources plus a small number of
framework sources that provides private APIs that the library's APIs
have references to. Previously, it was built with the entire framework
sources which is too many and should have slowed the build performance.

Bug: 141149570
Test: m
Change-Id: I165ffdfc053a71b323ef7058651d5908df06870f
2019-10-31 20:38:47 +09:00
Jiyong Park
7956435faf Merge "Build API stub with less number of source files" am: f0cc2aa46f am: c86f52bc60
am: 1adc232268

Change-Id: I025b80f7bf04750c490a1035c2a47a55af732ce9
2019-10-30 22:10:14 -07:00
Jiyong Park
f0cc2aa46f Merge "Build API stub with less number of source files" 2019-10-31 04:44:27 +00:00
Adrian Roos
375e276553 API Lint: Enable for TestApi
Fixes: 139833475
Test: mp checkapi
Change-Id: I5d6918a924b30b4bb49b12b84cc2a3707cf54465
2019-10-30 16:58:35 +01:00
Jiyong Park
3c8f37f421 Build API stub with less number of source files
The metalava fix 09094fc5e566a380b7aa1a4c3948ac66cebc0aba allows us to
not include source files having class definitions that are referenced by
private constructors of the API classes.

Removing the now uncessary source files from the input list so that
metalava can run faster.

Bug: 141149570
Test: m
Change-Id: Ib203221600baa0e57393b0d448125676d01bcb8e
2019-10-30 13:25:35 +09:00
TreeHugger Robot
b0ee7f5ab5 Merge "Add frontend constants and callback" 2019-10-30 02:06:59 +00:00
Paul Duffin
5a6072c879 Merge "Ignore classes on the classpath when generating stubs" am: c817b66016 am: 275d3b5585
am: 2b0d8181b0

Change-Id: Ib4ea2b2bf97c4328006922dd850d07abecadeebf
2019-10-29 15:49:34 -07:00
Paul Duffin
179d97038b Ignore classes on the classpath when generating stubs
This prevents metalava from generating stubs that reference classes
which are provided on the classpath. That ensures that removing hidden
classes from the sources does not result in references to those removed
classes from being added to the generated stubs, e.g. in the imports.

Specifically needed to prevent the StrictMode stubs class from
referencing dalvik.system.CloseGuard when that is removed from the
sourcepath as a result of switching the stub generation from using
libcore implementation classes (which contain CloseGuard) to
generated stubs (which does not contain CloseGuard).

Bug: 142113521
Test: m checkbuild
Change-Id: Ib4b87fec6549b69cc69820bc8d8b33f8c4e8535c
2019-10-29 12:23:44 +00:00
Jiyong Park
c893b46034 Replace framework.jar with framework-minus-apex.jar
framework.jar is now a build-time only library which has private symbols
from framework-minus-apex.jar and public symbols from APEXes. Instead of
framework.jar, framework-minus-apex.jar is installed to the device.

framework-minus-apex is installed as framework.jar because the name is
pretty widespread throughout Android. Keeping the original file name for
the backwards compatibility.

Bug: 139391334
Test: m, inspect the build system.img and check that
system/framework/framework.jar exists
Merged-In: Ia12d5984b011a54bd8ef708d0f552298a6ddec8a

(cherry picked from commit 617a16478b0f5875084e339553b7b96f3a292e03)

Change-Id: I30d5c789c1d67cac7dfe6339f244e66af5114767
2019-10-28 15:33:37 +09:00