Commit Graph

1916 Commits

Author SHA1 Message Date
Colin Cross
fac48f998e Remove obsolete aidl list
Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.

Bug: 70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
2018-01-04 14:59:10 -08:00
Colin Cross
e9727164cb Merge changes I9de0ffe9,Idc804896 am: 153fb1c6e0 am: 99161bc1c7
am: 52d4011195

Change-Id: Ia3b7f49d4dbd38660570c7c84991a69f86bf24e4
2018-01-04 01:17:42 +00:00
Colin Cross
153fb1c6e0 Merge changes I9de0ffe9,Idc804896
* changes:
  Use sdkparcelables to generate framework.aidl
  Initial sdkparcelables
2018-01-04 00:48:50 +00:00
Jack Yu
23192ff57f Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c0)
2017-12-27 23:29:49 -08:00
Jack Yu
31db18a4c0 Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
2017-12-27 16:19:20 -08:00
Paul Duffin
9f6282d0ab Remove android.test.mock classes from android.jar
This removes all android.test.mock from the main android.jar.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.mock classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I3d31e4528c99e2e297aaec9c4b657bdd305bd464
2017-12-21 10:58:35 +00:00
TreeHugger Robot
107f7cc4c4 Merge "Remove stream.proto and cpp-streaming-proto generates field name to id mapping by default" 2017-12-19 19:07:53 +00:00
Paul Duffin
187a48de62 Remove non-junit android.test.base classes from android.jar
This removes those android.test.** classes which are part of the
android.test.base stubs jar from the main android.jar.

The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.base classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I9a4df968835166cc3d30c076ef3036711dfe5b7f
2017-12-19 10:42:28 +00:00
Yi Jin
f68e747e05 Remove stream.proto and cpp-streaming-proto generates field name to id
mapping by default

Test: atest incident_helper_test
Change-Id: Iab04973ea78b942e44503fcd6ae60808caf3b9e0
2017-12-18 17:37:50 -08:00
Colin Cross
77ebd08d17 Use sdkparcelables to generate framework.aidl
Use sdkparcelables to extract public parcelables from the
public, test, and system stubs jars, and combine them into
framework.aidl.

Bug: 70046217
Test: m checkbuild
Change-Id: I9de0ffe9dffbd80c8cb785b0624959c52c3200a1
2017-12-16 20:43:50 -08:00
Paul Duffin
1895f2e5bb Remove non-junit android.test.runner classes from android.jar
This removes those android.test.** classes which are part of the
android.test.runner stubs jar from the main android.jar.

The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.runner classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I4e3c3bfea77ce15ca7a9ba7d36aee5396f67affb
2017-12-15 07:34:47 +00:00
Joe Onorato
c9f1a9e3dd Merge "Fix how we build the statsd protos." 2017-12-14 05:33:33 +00:00
TreeHugger Robot
4b1557d3a0 Merge "Give SliceManagerService a concept of pinned slices." 2017-12-14 04:09:55 +00:00
Joe Onorato
62c220b20b Fix how we build the statsd protos.
This lets us include frameworks protos, and use the constants
and messages from them.

Change-Id: I609d6e524f780e6a5beea543a68561bede47813e
Test: make
2017-12-13 18:26:45 -08:00
Jason Monk
74f5e36f49 Give SliceManagerService a concept of pinned slices.
Allow launcher/assistant to pin slices. Also allow other apps
with access to a slice to pin it dynamically by adding a listener
to it. Dynamic pinnings can expire when the host app dies because
the binder will no longer be alive.

Public docs and unhiding will come in a later CL with CTS tests.

Bug: 68378571
Test: runtest --path frameworks/base/services/tests/uiservicestests
Change-Id: I1dd9a839f547fc949922b766ba4b54e6d50f3125
2017-12-13 14:28:09 -05:00
Paul Duffin
e25cedd64d Remove unnecessary filtering of android.test.mock files
Previously the android.test.mock files were in the test-runner/src
directory so had to be filtered out of the android.test.runner source
files but the android.test.mock files are now in their own test-mock/src
directory so the filtering is no longer required.

Bug: 30188076
Test: make checkbuild
Change-Id: I1f28fc0735e16fa166663e5797af641b08a4926c
2017-12-13 07:37:49 +00:00
Colin Cross
d330eeeeda Merge "Separate android.test.mock from test-runner source" 2017-12-12 23:25:48 +00:00
Paul Duffin
69516f4df7 Separate android.test.mock from test-runner source
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit e254526f0f)
2017-12-12 23:23:31 +00:00
Yigit Boyar
193ee545ed Remove data binding from platform docs
They are build in gradle now w/ tools.

Bug: 69160652
Test: n/a
Change-Id: I550f73f64238d6c46c8285a1d0c5523d42c6513e
2017-12-11 13:01:31 -08:00
Jeff Sharkey
c8dc254b94 Another attempt at diffs in offline SDK docs.
We already generate offline SDK docs as part of "docs" build, and
this change simply adds the "-diff" targets so they're also included.

Test: make -j48 docs dist
Bug: 69115817
Change-Id: Iecd3f070280b078fbdca91fdc1a6b8d65b8df863
2017-12-08 14:52:40 -07:00
Jack Yu
b592e29f28 Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Merged-In: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
(cherry picked from commit e44609b158)
2017-12-08 13:28:07 -08:00
Jeff Sharkey
e33a972e3f Emit diffs into offline SDK docs.
We already generate offline SDK docs as part of "docs" build, and
this change simply adds the "-diff" targets so they're also included.

Test: make -j48 docs dist
Bug: 69115817
Change-Id: Ic8b29b32c46feabf1951125edebe60ab8069e844
2017-12-07 16:29:27 -07:00
Jack Yu
c7efe16191 Merge "Moved data connection response into system api." 2017-12-07 19:01:29 +00:00
Jack Yu
e44609b158 Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
2017-12-07 00:27:17 -08:00
Jeff Sharkey
2337aec921 Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types.  This ensures that we don't accidentally
reference undefined classes/interfaces.

Test: manual inspection of API files
Bug: 69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
2017-12-07 00:22:25 -07:00
Jeff Sharkey
bc4f48b21d Emit all APIs using Predicates.
Generate APIs using updated doclava.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
2017-12-06 21:56:12 -07:00
Jason Monk
8f5f7ff5fa Add system service for slices
Will be used to manage permissions and possibly pinned state for slices.

Test: manual
Change-Id: Ie53f4988f817ac5b920087567dbac751e2857dbf
2017-12-05 13:37:37 -05:00
Colin Cross
b42cfb691d Merge "Fix droiddoc when OUT_DIR is an absolute path"
am: 85f095e246

Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7
2017-12-05 01:29:12 +00:00
Colin Cross
0c7609553d Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH).  They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).

Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit bd200ce7d4)
2017-12-05 01:07:53 +00:00
Colin Cross
bd200ce7d4 Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH).  They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).

Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
2017-12-04 14:29:20 -08:00
Colin Cross
943e2aa7ef Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.

Bug: 69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit cf3a0b5355)
2017-12-03 20:23:43 -08:00
Colin Cross
5f4dcf6702 Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.

Bug: 69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit cf3a0b5355)
2017-12-03 17:50:34 +00:00
Colin Cross
cf3a0b5355 Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.

Bug: 69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
2017-11-30 14:14:08 -08:00
Mohamed
cf6e63b4db Merge "Add SMS over IMS APIs" am: 74445ed311 am: 208f232825
am: 09d8a996e0

Change-Id: I0c49f42e220aed34c6bb4801ae80e29aeea329eb
2017-11-30 16:34:15 +00:00
Mohamed
208f232825 Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913
2017-11-30 16:05:36 +00:00
Treehugger Robot
74445ed311 Merge "Add SMS over IMS APIs" 2017-11-30 15:56:30 +00:00
Mohamed
037749df03 Add SMS over IMS APIs
- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.

Moving over from  ag/3265442

Bug: 69846044

Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a
2017-11-29 16:14:57 -08:00
Jeff Sharkey
9952370286 Merge "Add build targets to build @SystemApi diffs." 2017-11-29 23:01:50 +00:00
Jeff Sharkey
d2bf31cc84 Add build targets to build @SystemApi diffs.
Test: make -j32 offline-system-sdk-referenceonly-diff
Bug: 69115817
Change-Id: Ib25d8e60351cb2b4ce5001435baf92d7f738e5f2
2017-11-29 14:42:54 -07:00
Arthur Ishiguro
893832bd38 Merge changes Ibf8cd200,I4ea2f293,I17b545da,Ia139fd6d,I3a7e69f8
* changes:
  Handles load and unload lifecycle callbacks
  Handles hub reset at ContextHubClientManager
  Converts old API message clients to the new API format
  Implements client close and death notification
  Creates framework for new API messaging
2017-11-29 21:00:54 +00:00
Arthur Ishiguro
4e39aa1e19 Creates framework for new API messaging
- Creates IContextHubClientCallback as a proxy to invoke
messaging/life-cycle callbacks for the client.
- Creates IContextHubClient as a proxy to send messages at the client
side.
- Creates a ContextHubClientManager at the service to manage
clients and messaging/lifecycle event callbacks.
- Implements generation of clients at ContextHubManager and sending
messages through ContextHubClient

Bug: 67734082
Test: make from root
Change-Id: I3a7e69f89cd70ea59160a651dcdb729e18027e9f
2017-11-29 10:35:30 -08:00
Sohani Rao
49de715bf3 Merge changes from topics "ProvisioningCallback", "PASSPOINT_APIs"
* changes:
  Introduce Status and Failure code for Provisioning
  Provide APIs for HS2.0 provisioning
2017-11-28 20:14:11 +00:00
Jack Yu
3221d23138 Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 24cd7cbd1e

Change-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337
2017-11-28 17:39:01 +00:00
Paul Duffin
f779efd62c Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

Bug: 30188076
Test: make checkbuild
Change-Id: If4f99a65fcca416ede5b3e63481398f0b451bcb7
2017-11-28 12:03:53 +00:00
Jeff Sharkey
cba2b00258 Merge "Deeper sanity checking of emitted types." 2017-11-28 02:36:17 +00:00
Jeff Sharkey
c204c223a7 Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types.  This ensures that we don't accidentally
reference undefined classes/interfaces.

Test: manual inspection of API files
Bug: 69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
2017-11-27 17:07:40 -07:00
Sohani Rao
2b1c42f9bb Provide APIs for HS2.0 provisioning
Created a new hidden API to be called for starting subscription
provisioning with a certain provider. Create a callback interface and a
callback object to be used by the caller to get provisioning status
updates.

Bug: 67645546
Test: Unit tests
Change-Id: I9592222cfe79c5859c455c5a658956120558059f
2017-11-27 15:11:44 -08:00
Jack Yu
1d1022e445 Moved DataProfile from telephony internal hidden API to System API
This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
(cherry picked from commit fc84bb5f5c)
2017-11-27 14:36:15 -08:00
Neil Fuller
3df6366091 Merge "Explicitly exclude com.android.server from docs" 2017-11-27 21:26:22 +00:00
Jack Yu
9b5696844d Merge "Moved DataProfile from telephony internal hidden API to System API" 2017-11-27 19:50:46 +00:00