Commit Graph

910 Commits

Author SHA1 Message Date
Paul Duffin
fc85dca16e Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into qt-dev-plus-aosp am: 23b3ebfd24
am: 4575c69608

Change-Id: I01c64024c8d59a607a2a8c6d41aec852b41d4445
2019-06-19 05:57:37 -07:00
Paul Duffin
8fcace4404 Replace no_framework_libs: true with sdk_version: "core_platform"
(cherry picked from commit 7954524e3cc618830f0bf7b23687bf222ecd285b)

Bug: 134566750
Test: m
Change-Id: I0260942108a13cc5e9bed1d6005abfb8daffe0ac
Exempt-From-Owner-Approval: minor build change
2019-06-19 10:48:09 +01:00
TreeHugger Robot
673d6eddf5 Merge "Gatekeeper generated aidl cpp bindings" 2019-06-14 16:29:53 +00:00
Dan Willemsen
7c7e6ac200 Merge "Match src paths with aidl package name" into qt-dev-plus-aosp am: 04d70c0d4b
am: 284842e915

Change-Id: Iea6615e165e91c93347cce0c8cee0268615f91b9
2019-06-11 12:33:37 -07:00
Dan Willemsen
a38ff9f1bd Match src paths with aidl package name
In order for the build system to track updates to the header files
during incremental builds, always specify the src files using the same
path as the package for C++ compilations.

Bug: 112114177
Test: treehugger
Change-Id: Id548ddd598cac18886da42f06c07540942a306ed
2019-06-11 10:58:04 -07:00
Janis Danisevskis
037a63fb02 Gatekeeper generated aidl cpp bindings
Moved Gatekeeper aidl definitions to system/core/gatekeeperd.

Test: Manually tested setting PIN.
      android.keystore.cts.CipherTest#testCanCreateAuthBoundKeyWhenScreenLocked
      android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
Change-Id: Ie3583f5682727b1f9a82d270764c94fce33388ec
2019-06-07 08:37:37 -07:00
Paul Duffin
14e018a2f2 Merge "Allow the unsupportedappusage-annotation to be used for device variants" am: a1df2cb009 am: e6970c06d7 am: 2a1d151097
am: a477f1ba01

Change-Id: Ibc7b687b904092af051f25f89ff76bcf820cbdc8
2019-06-06 09:07:37 -07:00
Paul Duffin
2a1d151097 Merge "Allow the unsupportedappusage-annotation to be used for device variants" am: a1df2cb009
am: e6970c06d7

Change-Id: Ibf6f3c3895602d332b2a021bccbdab1846ec73b4
2019-06-06 08:50:58 -07:00
Paul Duffin
5219758043 Allow the unsupportedappusage-annotation to be used for device variants
Some modules, e.g. libphonenumber-platform, depend on core platform API
solely for accessing the dalvik.annotation.compat.UnsupportedAppUsage
annotation. Building device variants of unsupportedappusage-annotation
will allow those modules to switch to core_current.

Bug: 134379140
Test: m droid
Change-Id: I1634b8ffd2a28c2663defd2a4a4e40d78b174d91
2019-06-06 13:28:23 +01:00
Dan Willemsen
badb5a3b9b Merge "Merge "Match src paths with aidl package name" am: fe283df7ab am: 705e339d6b am: d6efcba587" into qt-r1-dev-plus-aosp
am: 058da7ffb2

Change-Id: If73f4aa6947936cf7896b0618d30145dbcc5020e
2019-06-05 21:58:04 -07:00
Dan Willemsen
d6efcba587 Merge "Match src paths with aidl package name" am: fe283df7ab
am: 705e339d6b

Change-Id: I5145212534289111205d913d9a66b3208e9f3272
2019-06-05 20:52:48 -07:00
Dan Willemsen
4a49850930 Match src paths with aidl package name
In order for the build system to track updates to the header files
during incremental builds, always specify the src files using the same
path as the package for C++ compilations.

Bug: 112114177
Test: treehugger
Change-Id: I97493c90c888678ce6c5fb56c9c83516b7e2fb2f
2019-06-05 15:51:24 -07:00
Paul Duffin
52093f7160 Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928 am: b5d6cc540c am: 48cce27632
am: 939bfe7a0b

Change-Id: If88994d789e3ae18c67a1a91a65953386c11d488
2019-06-03 08:25:49 -07:00
Paul Duffin
48cce27632 Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928
am: b5d6cc540c

Change-Id: If5179d1403e99ac2008cfeb89046eb486263817c
2019-06-03 08:15:50 -07:00
Paul Duffin
cd35de3507 Export some api files for use by cts/tests/signature tests
Creates a filegroup for each of these files:
* api/current.txt
* api/system-current.txt
* api/system-removed.txt
* test-base/api/current.txt
* test-mock/api/current.txt
* test-runner/api/current.txt

Bug: 122332514
Test: atest -p cts/tests/signature
Change-Id: Ib031dcc39d3c1cca6dcdf977c0277d5e4875591e
2019-06-03 11:56:35 +01:00
Tobias Thierer
de282f23d6 Merge "bpfmt -w Android.bp" am: c51996859d am: 829f3f0e14 am: 7e1f1e7654
am: ad7a895458

Change-Id: I6bd3b091008cf94e49caf56dd82d6a81a762392d
2019-05-29 15:42:49 -07:00
Tobias Thierer
7e1f1e7654 Merge "bpfmt -w Android.bp" am: c51996859d
am: 829f3f0e14

Change-Id: Iac27f88555798aea4d20477710aa5109fa6ef4eb
2019-05-29 15:17:40 -07:00
Tobias Thierer
3bcc5b5af1 Merge "Merge "Refactoring: Rewrite links in Metalava instead of carrying patches." am: 21558d758d am: 02a8e8c7e3 am: 7e61c246f3" into qt-r1-dev-plus-aosp
am: f353c4ec8f

Change-Id: I2a6a84fdde128b727886697352535b4312dcf511
2019-05-29 14:52:31 -07:00
Tobias Thierer
7e61c246f3 Merge "Refactoring: Rewrite links in Metalava instead of carrying patches." am: 21558d758d
am: 02a8e8c7e3

Change-Id: I859390a539fa34091739538602679edc9dfaf36a
2019-05-29 14:31:22 -07:00
Tobias Thierer
bc05034a26 bpfmt -w Android.bp
This CL reformats Android.bp via the above command line.
Before running it, I first had to "make bpfmt".

Test: Visual inspection / self-review only.

Change-Id: I00857646720198e13f875056793802b2e4350264
2019-05-29 12:26:03 +01:00
Tobias Thierer
8f55941ebc Refactoring: Rewrite links in Metalava instead of carrying patches.
Another CL in this topic introduces the metalava feature flag
--replace-documentation <ancestor java packages> <regex> <replacement>
to perform regex replacements in the documentation of some elements.

This CL uses that feature to re-write links in libcore/ojluni/
documentation that previously carried patches.

Since .bp files don't appear to support String literals that are not
(un)escaped, \ and $ occurring in the regexp/replacement parameters
need to be escaped in the .bp file.

Bug: 129765390
Test: Manually checked that this CL topic does not affect the result of
      "make ds-docs offline-sdk-docs"

Change-Id: Idb7366530c4ab255c1348cf48881cf2bde31be1e
2019-05-29 12:26:03 +01:00
Kyunglyul Hyun
c9b19fcaf9 Merge "Media: Introduce MediaRouter2" 2019-05-24 06:00:13 +00:00
Eugene Susla
8261031007 Merge "[fixed] Replace RemoteCallback with AndroidFuture in PermControler" 2019-05-23 19:40:46 +00:00
Kyunglyul Hyun
caae8dc81f Media: Introduce MediaRouter2
Instead of extending MediaRouter, this CL introduce MediaRouter2 class.
This will prevent regression from chaing MediaRouter and we can easily
modify and test `new' features.
For MediaRouter2, IMediaRouter2Client is also added to differentiate the
previous router and the new one in MediaRouterService.

This CL also contains MediaRouter2.sendControlRequest which can be used
to manipulate media routes.
(It is temporarily being used to test MediaRouter2Manager callbacks.)

Bug: 132138073
Test: atest mediaroutertest (w/ mediarouteprovider installed)

Change-Id: I895fe456e38d437cec8e3ca9501cd7f105c5f4d6
2019-05-23 16:48:46 +09:00
Eugene Susla
53f4df30f0 [fixed] Replace RemoteCallback with AndroidFuture in PermControler
This is ag/7529281 + fix ag/7572218

Test: atest AddConfigWidgetTest#testConfigCancelled
atest android.permission.cts.PermissionControllerTest
Change-Id: I9d8f28c0665a7ae4040ea471ed6a0187628a0306
2019-05-17 13:25:53 -07:00
Eugene Susla
8feb3a1df1 Revert "Replace RemoteCallback with AndroidFuture in PermControler"
This reverts commit e7daff9fa3.

Reason for revert: Broke some tests: b/132981879

Change-Id: I3a707c0a67316246532437718132717f0c601255
2019-05-17 20:11:31 +00:00
Aurimas Liutikas
5410807f40 Remove unused support libraries.
Test: none
Change-Id: I0d89c12c07891bff5050c3fc940eb63a16481989
2019-05-16 17:28:35 -07:00
Eugene Susla
e7daff9fa3 Replace RemoteCallback with AndroidFuture in PermControler
- saves ~3 allocation per ipc
- no longer need to [un]bundleize result
- will become typesafe down the road (b/132732312)

Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I6cd9ec5ae31179474536f22f557afb0d9db6a4b9
2019-05-16 12:46:09 -07:00
Brad Ebinger
04eed40880 Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev am: 8b2d80c768
am: 42ce8673bb

Change-Id: I321e452b670f9a79c4629f11d272d59d51c21192
2019-05-10 22:19:58 -07:00
Brad Ebinger
42ce8673bb Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev
am: 8b2d80c768

Change-Id: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83
2019-05-10 13:11:08 -07:00
Brad Ebinger
360415aa13 Trampoline SMS disambig dialog to Telephony
SmsManager used to display a "select default SMS
subscription" dialog every time SmsManager was used
and no default SMS subscription was set. This change
fixes the following issues:
1_ getSubscriptionId no longer pops up a disambig
dialog.
2) The disambig dialog no longer sets the
default, rather it waits for the response from the
user and performs the operation when it receives
a response.
2a) Dialogs can no longer be created from background
services, so we now have a restriction that if
the disambig dialog is shown via a background service,
we will use phone 0 as default (backwards compat for
apps targeting <Q) or fail (on apps targeting Q+).
3) If there is only one active subscription, use that
to perform the operation on MSIM devices instead of
asking and only displaying the one active subscription.
4) Certain non "user-facing" APIs that are used by
carrier apps no longer will pop up a UI.

Bug: 131713446
Bug: 130853716
Bug: 129141025

Test: run SmsManagerTestApp; atest TelephonyFrameworksTests

Change-Id: I6be1c6d7bf6b6ee614b6a7d0369147e3b1890588
2019-05-10 00:14:23 +00:00
Xin Li
5bc12066ca Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Andrei-Valentin Onea
78ac7f47e8 Merge "Support all UnsupportedAppUsage annotations in processor" am: 3423014cbe am: c3c21f9195
am: 0c7c762cdc

Change-Id: Id0bbb05fea0434354573c9fb2e87362ad96e59eb
2019-05-09 09:58:05 -07:00
Andrei-Valentin Onea
0c7c762cdc Merge "Support all UnsupportedAppUsage annotations in processor" am: 3423014cbe
am: c3c21f9195

Change-Id: I595aa4ddbf6f7d7774e17c6d6d88be40e4d59d0d
2019-05-09 08:46:32 -07:00
Andrei-Valentin Onea
c3c21f9195 Merge "Support all UnsupportedAppUsage annotations in processor"
am: 3423014cbe

Change-Id: I2126ed1ed52d61f814d9feccd9da45a9358cf317
2019-05-09 05:36:07 -07:00
Andrei Onea
5e22614098 Support all UnsupportedAppUsage annotations in processor
Add support for the libcore UnsupportedAppUsage annotation to
UnsupportedAppUsageProcessor. This is in order to make the two
annotations even more interchangeable.
Also take the opportunity to correct the documentation:
UnsupportedAppUsageProcessor no longer is involved in creating
greylist.txt, that functionality has been moved to
Class2Greylist.java in the art repository.

Bug: 130721457
Test: m framework-annotation-proc
Change-Id: I5cf1f97ca41349fc053315a2fd5bfd53a80ae128
2019-05-08 18:03:15 +01:00
Mark Renouf
72582bf671 Merge "Adds OnBackPressedOnTaskRoot" into qt-dev am: 1eb6476824
am: 5efa4f6a8b

Change-Id: I306b108dc45ab0dc8e3b0e4764a7660846b37c91
2019-05-07 09:47:01 -07:00
Mark Renouf
446251dc52 Adds OnBackPressedOnTaskRoot
This allows Bubbles to be collapsed instead of finished
when there is only one activity in the stack.

Bug: 126852149
Test: launch activity, press back
Change-Id: Iad8db0549853e3f385d54fc6b6cea5e502d37139
2019-05-07 10:00:07 -04:00
Dario Freni
359548050d Merge "Merge "Use updatable sysprop to for enabling APEX mgmt" into qt-dev am: ca9056eb66" into qt-dev-plus-aosp
am: 8de0b2a8bc

Change-Id: I4a933d405bcca6f6982af30d7faecca477808115
2019-05-01 09:45:33 -07:00
Zimuzo Ezeozue
62a7af0792 Merge "Change watchdog PackageInfo to PackageConfig" into qt-dev am: 0f6db7d1dd
am: a9fd8e1ff1

Change-Id: I97742a524afd91ba83a2fc56a7c0d44883452e83
2019-04-29 13:27:48 -07:00
Dario Freni
2ce84341de Use updatable sysprop to for enabling APEX mgmt
This should prevent unnecessary communication with apexd on devices that
don't support APEX package management.

Bug: 130623080
Test: CTS tests on marlin (no APEX support) and cuttlefish
Change-Id: Ic5fdb088aa1530b3c5aecbd5abd3d794a364c775
2019-04-29 17:35:16 +01:00
Zimuzo
1a9aac7b33 Change watchdog PackageInfo to PackageConfig
Test: atest PackageWatchdogTest
Bug: 131165818
Change-Id: Ie3a385468a0de05bc55862e6f71513077d44bbc0
2019-04-24 20:44:52 +01:00
Kyunglyul Hyun
3aedf02540 Media: enables MR2PS to update provider info
With this CL, MediaRoute2ProviderService can update its provider info
and publish its routes.

MediaRouter2Manager.Callback.onProviderUpdated(info) is alao added to
confirm whether correct provider info is sent.

Also, renamed the AIDLs such as
  IMediaRouter2ManagerClient -> IMediaRouter2Manager
  IMediaRoute2Callback -> IMediaRoute2ProviderClient

and changed on** to notify** in AIDLs.

Logics related to selecting/unselecting will be coverd by following CLs.

Test: atest mediaroutertest (after atest mediarouteprovider)

Change-Id: I5b119fbd0622a9422d3edf720b85e296ac4a5694
2019-04-22 20:11:47 +09:00
Yiwei Zhang
351e9a6bf2 Merge changes from topic "GameDriver2"
am: a88226283d

Change-Id: I632eae432db8490ae78d32b245717a6ab0861f8a
2019-04-18 17:25:47 -07:00
Treehugger Robot
a88226283d Merge changes from topic "GameDriver2"
* changes:
  Game Driver: rename GUP to Game Driver
  [Game Driver] Add support for whitelist.
  [Game Driver] Add blacklist mechanism.
  GUP: Add a global property for genreal preference
  GUP: Update global property for the new dev opt
  GUP: Add metrics constant for GUP UI
2019-04-19 00:06:39 +00:00
Peiyong Lin
ac74bc8f45 [Game Driver] Add blacklist mechanism.
When a blacklist is set, we must not use driver package for those applications
on the blacklist.

BUG: 120869311
Test: Build, flash, boot. Verify with command line.
Change-Id: I1c9f10a3086007038c328a20346ffadeff1861ae
Merged-In: I1c9f10a3086007038c328a20346ffadeff1861ae
2019-04-17 16:22:33 -07:00
Chalard Jean
026b89e4f2 Merge "Move TrafficStats tags for the network stack constants"
am: 3444dd03d6

Change-Id: I13ba9e3077bb4ec28229a09f2d4747a43c281bcc
2019-04-16 23:08:07 -07:00
Chalard Jean
896245a1e2 Move TrafficStats tags for the network stack constants
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.

Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
Merged-In: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
Merged-In: I9b648ed6c687d56db61a54570c7880c51c1bae51
2019-04-17 05:45:40 +00:00
Chalard Jean
c3643acb8d Merge "Move TrafficStats tags for the network stack constants" into qt-dev am: e7ef0a61f2
am: c728f75abd

Change-Id: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
2019-04-16 17:38:30 -07:00
Chalard Jean
e7ef0a61f2 Merge "Move TrafficStats tags for the network stack constants" into qt-dev 2019-04-16 20:30:07 +00:00