1004 Commits

Author SHA1 Message Date
Meng Wang
e1df98d2e2 Telephony: do not use hidden API ArrayUtils.
Make a local copy instead.

Bug: 137202333
Test: make
Merged-In: I3218bca2d296c548b9d8427f70df8f7a33d0d449
Change-Id: I3218bca2d296c548b9d8427f70df8f7a33d0d449
2019-12-12 16:52:30 -08:00
Treehugger Robot
01e54d44b9 Merge "Addition of util library" 2019-12-13 00:31:06 +00:00
Michele
68370a8685 Addition of util library
Bug: 137202333
Test: Compilation
Test: Scripts to verify correct usage of rules
Change-Id: I20e48e66d6c429a67d367efc2a73991c3aad825c
Merged-In: I20e48e66d6c429a67d367efc2a73991c3aad825c
2019-12-12 10:19:51 -08:00
Treehugger Robot
938bc05883 Merge "Add new UnsupportedAppUsage annotation as lib dependency." 2019-12-12 12:10:55 +00:00
Artur Satayev
700e08b291 Add new UnsupportedAppUsage annotation as lib dependency.
Bug: 145132366
Test: m
Change-Id: Ibb7f8424186149365354a96249c06c9fccde66bd
Merged-In: Ibb7f8424186149365354a96249c06c9fccde66bd
2019-12-11 19:44:16 +00:00
Anton Hansson
b52bd1cbbe Expose SdkExtension in the system SDK
Also tweak the javadoc a little bit.

Bug: 137191822
Bug: 143937447
Test: treehugger
Change-Id: Iae1b025685344c2ffe4ed1089850b447c82a6b83
Merged-In: Iae1b025685344c2ffe4ed1089850b447c82a6b83
2019-12-09 17:21:24 +00:00
Jordan Liu
9fd7c05eb9 Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" 2019-12-07 00:06:23 +00:00
Jordan Liu
bf68dc85a4 Expose some SystemApis and edit framework-cellbroadcast-shared-srcs
The APIs are used in the CellBroadcastService, and the
framework-cellbroadcast-shared-srcs library is also linked there.

Bug: 135956699
Test: manual
Change-Id: I5e71ea1ee1a858c0520c241dc7365733441e0f50
Merged-In: I5e71ea1ee1a858c0520c241dc7365733441e0f50
2019-12-06 11:19:48 -08:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Sarah Chin
226499214c Merge changes from topics "ngran", "update_ngran"
* changes:
  Update NGRAN bands
  Updated AccessNetworkConstants and RadioAccessSpecifier
2019-12-05 21:37:37 +00:00
Songchun Fan
000b5b5bf6 [incremental] parcelable for incfs file descriptors
This parcelable is used to pass incfs fds from vold to system_server.

Test: builds
Change-Id: I7f0af8798d12815fbae404afabf4a88229a705da
Merged-In: Ifc3a43633356951b239486d66ee80d120bc4ab76
2019-12-04 17:42:57 -08:00
Hall Liu
91e1a00846 Merge "telephony-stack util API lib" 2019-12-04 19:22:47 +00:00
Sarah Chin
e138c5e412 Updated AccessNetworkConstants and RadioAccessSpecifier
Bug: 143683654
Test: atest RadioAccessSpecifierTest
Change-Id: I307c8d09483e37d805cbfd17780523040abc9e4b
Merged-In: I307c8d09483e37d805cbfd17780523040abc9e4b
2019-12-03 11:06:58 -08:00
Anton Hansson
0223efdaa1 Merge "Put all updatable sources in one filegroup" 2019-12-02 19:30:36 +00:00
Anton Hansson
b4f3557fde Put all updatable sources in one filegroup
Avoids having to add updatable jars to a bunch of different
lists.

Test: m
Change-Id: Ieb0347a87f5bfc4a6ac8367279b3e97e05bfa6a7
2019-12-02 16:51:50 +00:00
Anton Hansson
4ec07fadef Add SdkExtensions class
It currently just reads a prop that is never set, but that will
be updated separately.

Keep the class @hide for now.

Bug: 137191822
Test: m com.android.sdkext
Change-Id: I1a874bf3d3e34676b5d767c4d03b09337b193cce
2019-12-02 15:32:39 +00:00
Anton Hansson
98460abc89 Add scaffolding for 'sdkext' module
This module will have a java framework part as well as a native
binary. Add directory and hook future java sources into the stub
rules.

Bug: 137191822
Test: m
Change-Id: I5527a055bf935178b88a1b20504b251f18f3d873
2019-12-02 13:56:06 +00:00
Tobias Thierer
8296853914 Android.bp: Add comment about APEX stub dependency for MimeMap.
This addresses a review comment on https://r.android.com/1172924

Test: Treehugger
Change-Id: Ic2106aebf707c9d347f06d5a0dab18614e0ad5a3
2019-11-29 19:42:11 +00:00
Tobias Thierer
17d0c59338 Tweak framework-mime / mimemap dependencies.
This CL addresses an outstanding review comment from
https://r.android.com/1115772 . To be honest, I don't
fully get the semantics of what I've changed, so I've
followed Jiyong's suggestions pretty blindly, except
that I've added the static dependency on mimemap to
framework-minus-apex as opposed to the (non-existing)
frameworks.

Test: Confirmed that the data files are still in framework.jar by
      rebuilding (make installclean && make droid && flashall )
      and then running:
      adb shell su 0 unzip -l /system/framework/framework.jar | grep types
Test: atest CtsMimeMapTestCases
Change-Id: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
Merged-In: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
2019-11-29 19:42:03 +00:00
Jeff Gaston
a08395de66 Replacing @Nullable/@NonNull with @RecentlyNullable/@RecentlyNonNull in non-android APIs
because this causes callers of those APIs to only receive warnings from kotlinc rather than errors.

Bug: 141748642

Test: m api-stubs-docs && \
      cd out/target/common && mv docs docs-new && unzip docs-new/api-stubs-docs-stubs.srcjar -d docs-new/api-stubs-docs-stubs.srcjar_unzipped && cd - && \
      cd frameworks/base && git checkout HEAD^ && cd - && m api-stubs-docs && \
      cd out/target/common && mv docs docs-old && unzip docs-old/api-stubs-docs-stubs.srcjar -d docs-old/api-stubs-docs-stubs.srcjar_unzipped && \
      diff -x "*.html" -r docs-old/ docs-new | grep -v "^diff" | sed 's/^</>/' | grep '^>' | sed 's|androidx.annotation.Recently|android.annotation.|g' | sort | uniq -c | grep "^ *1 " # And notice that there aren't any copies of "androidx.annotation.Recently" without a matching instance of "android.annotation." or vice versa

Test: m api-stubs-docs && out/target/common/docs && unzip api-stubs-docs-stubs.srcjar -d unzipped && cd unzipped && \
      grep -r "@.*NonNull" java | grep -v Recently && \
      grep -r "@.*Nullable" java | grep -v Recently

Change-Id: I156f1788880958cf3d1f030da829e76cefd6072e
Merged-In: I156f1788880958cf3d1f030da829e76cefd6072e
2019-11-27 17:18:22 -05:00
Chen Xu
c00cf99b49 telephony-stack util API lib
attach copyable hidden util API classes to create a jar
file containing these, and statically link it from
telephony mainline modules. Need to jarjar those classes
otherwise classloader will load classes with the same
name in boot class path(framework.jar)

TODO: some Util APIs like AsyncResult which returned from
telephony-common library and used by other apps like Settings.
We should decouple Settings from telephony-common first before
we make a copy and rename AsyncResult.

Bug: 137202333
Test: Manual & Build
Change-Id: I81a6948246f1453481962699855560c2f64bb413
Merged-In: I81a6948246f1453481962699855560c2f64bb413
2019-11-26 17:01:05 -08:00
Benedict Wong
091e420529 Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig"
* changes:
  Expose IKE module API: IkeManager and IkeSession
  Expose IKE module API: Session Options & EapSessionConfig
  Expose IKE module API: IkeException, configuration & callback
  Expose IKE module API: IKE ID, TS and SaProposal
2019-11-23 03:45:53 +00:00
Ytai Ben-Tsvi
a907efc3bc Add parceling support for HIDL memory in Java
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.

Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
Merged-In: I6cbbf852218c8a631f9014e7caa7a97d17e11889
2019-11-21 15:19:47 -08:00
Treehugger Robot
acd388baf2 Merge "Include androidx stubs in framework docs" 2019-11-20 17:32:09 +00:00
Charles Munger
1b1c0ca9ee Include androidx stubs in framework docs
This will allow javadoc links to androidx packages to resolve.

Test: No behavior changes
Bug: 144042891
Change-Id: I01c1cd637f46c666c28669c1796a1d5a0d249c24
2019-11-19 14:01:19 -08:00
Anton Hansson
d82b2f7e4a Revert "Work around b/70221552"
This reverts commit 159799d7c971777231d17c0aabd60d36044ab331.

Reason for revert: b/70221552 is fixed

Change-Id: Iaae0df6736a3141847376b9ab0115f1c7a31fdb1
2019-11-18 13:40:45 +00:00
Jiyong Park
ced28d531d 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.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 144264106
Test: m

Merged-In: Idfa2aa392ae1da9582e7691a8c06c986baad5088
(cherry picked from commit e53786e864fd3f3097603ef9dfcfcb6b604ee7b1)
Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
2019-11-16 20:48:06 +09:00
evitayan
69d77da91a Expose IKE module API: IKE ID, TS and SaProposal
This commit updates system-current to expose APIs of IKE mainline
module. Changes include:
- Feed IKE API source file to base/Android.bp
- Update system-current.txt to expose IkeIdentification,
  IkeTrafficSelector and SaProposal

Bug: 143983419
Test: make update-api && make
Change-Id: I3826434850de7b264ab44d46ca0bd82359dc98fe
2019-11-14 06:46:25 -08:00
Anna Trostanetski
b4852382fa Merge "Move android.compat.annotation package out of libcore" 2019-11-13 12:12:24 +00: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
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
Treehugger Robot
d4c8842a8a Merge "Remove unnecessary --hide-package options" 2019-11-07 12:07:04 +00: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
c58832221c Merge "API Lint: Ignore CallbackInterface in platform" 2019-11-05 16:17:43 +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 6237a6b35cd127cc39973b640e25d198466229a7)
2019-11-04 11:27:49 -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 718428355f5ab75d1a3ef890f86abc52fe018ce8.

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
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 d355153dcbc125b80113c31dafc80afe1a5fddd6)
2019-11-01 16:21:14 -07: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
f0cc2aa46f Merge "Build API stub with less number of source files" 2019-10-31 04:44:27 +00: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
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
Mark Chien
72d5460dda Merge "[Tether02] Migrate TetheringConfiguration into module" 2019-10-24 13:10:24 +00:00
markchien
a6ba54d59d [Tether02] Migrate TetheringConfiguration into module
TetheringConfiguration is a utility class to encapsulate the various
configuration elements.

Bug: 136040414
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I9434ab213bc5e0fca59f14a6c8cea554abefc3a4
2019-10-24 14:00:05 +08:00
atrost
ff948d8a2f Add a native aidl API.
Introduce a platform_compat_native service that just calls the
platform_compat service.
The new service is needed as it needs a slightly different (more
limited, no ApplicationInfo in cpp) aidl API, and a class can only
extend one stub.

Test: Call the service from dumpsys.cpp (http://aosp/1142055)
Bug: 138275545
Change-Id: Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac
Merged-In: Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac
2019-10-22 18:54:13 +00:00