464 Commits

Author SHA1 Message Date
Olivier Gaillard
5f04880926 Merge "Enable the generate transaction name for system server." am: 3e3a6e4760
am: c142f686c5

Change-Id: I15fd84d2456eebe8d49cc6c0cf8739ebdd82f7d1
2018-07-23 05:16:08 -07:00
Olivier Gaillard
c142f686c5 Merge "Enable the generate transaction name for system server."
am: 3e3a6e4760

Change-Id: I0d54112c689aeaf83c4bc108af0a303e2850e85a
2018-07-23 05:07:33 -07:00
Olivier Gaillard
b19219207c Enable the generate transaction name for system server.
Size of vdex,art,oat files (flag off -> on)
- framework/boot*.vdex: +10K  (3.589M -> 3.599M)
- framework/arm64/boot*.{art,oat}: +20K  (4.378M -> 4.398M)

Test: manual
Change-Id: I4938ca5459004494a50ec81db9ef9e0f0e6e7a60
2018-07-23 10:15:54 +00:00
Yifan Hong
d8fe7f5796 Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
am: b9fa97dff7

Change-Id: I55e25e25612cbb11cec025ba21b6577d635f1df9
2018-07-18 10:38:42 -07:00
Yifan Hong
58faaa09da IBatteryPropertiesRegistrar: remove unused functions
* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
  functions

Test: builds
Test: boots
Bug: 68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
Merged-In: Ic9a9d337e5cb39784db1a2745297ef985dd31653
(cherry picked from commit dd0e942597b51e517eb65d9ea80595d46a3e89df)
2018-07-17 15:35:49 -07:00
David Brazdil
6a95233f8b Merge changes If285d71a,Iffe5be7c am: f37950d8c3 am: c9b5e65747
am: 3efb177ca6

Change-Id: If7f397e4be6ace357f7a563b4546a9a7694fce65
2018-07-17 04:03:07 -07:00
David Brazdil
3efb177ca6 Merge changes If285d71a,Iffe5be7c am: f37950d8c3
am: c9b5e65747

Change-Id: I047358920ecc478de076c32384390ba856bd8c99
2018-07-17 03:53:35 -07:00
David Brazdil
c9b5e65747 Merge changes If285d71a,Iffe5be7c
am: f37950d8c3

Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
2018-07-17 03:43:13 -07:00
sqian
ea8970cd55 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
2018-07-16 20:34:07 +00:00
Colin Cross
be53388465 Mark installable jars with installable: true am: d7647c1b66
am: f367f909bb

Change-Id: Iad200867b7b73b3e9e5e6c0011ef9cea3cccfdde
2018-07-10 19:15:42 -07:00
Colin Cross
f367f909bb Mark installable jars with installable: true
am: d7647c1b66

Change-Id: If2f6daf0457bae822d88a762ef79f0162ded6ebe
2018-07-10 18:10:57 -07:00
Colin Cross
d7647c1b66 Mark installable jars with installable: true
Most jars don't need to be installed on the device.  Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.

Bug: 110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf
2018-07-10 14:30:07 -07:00
Mathew Inwood
0b5f738f4c Merge "Add build rule for API->source mapping." am: b4919259ab am: 4500790a81
am: c47c718a3b

Change-Id: I7d35a2de0b5fe8c4fe9e4994de910b64c63da2b8
2018-07-10 12:02:21 -07:00
Mathew Inwood
c47c718a3b Merge "Add build rule for API->source mapping." am: b4919259ab
am: 4500790a81

Change-Id: Idc214d73fcf555ac15f865cc9be60909399170f8
2018-07-10 11:51:02 -07:00
Mathew Inwood
4500790a81 Merge "Add build rule for API->source mapping."
am: b4919259ab

Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
2018-07-10 11:41:48 -07:00
Mathew Inwood
b4919259ab Merge "Add build rule for API->source mapping." 2018-07-10 17:12:37 +00:00
Colin Cross
a977a37c85 Merge "Mark installable jars with installable: true" am: 1035f48f61 am: 19609a7993
am: c7f9e053ec

Change-Id: I5934f14ced4a89fa234d75fde733aae1f102cc7a
2018-07-10 09:45:03 -07:00
Colin Cross
c7f9e053ec Merge "Mark installable jars with installable: true" am: 1035f48f61
am: 19609a7993

Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c
2018-07-10 09:29:55 -07:00
Colin Cross
19609a7993 Merge "Mark installable jars with installable: true"
am: 1035f48f61

Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
2018-07-10 09:12:46 -07:00
Mathew Inwood
0a6a273013 Add build rule for API->source mapping.
This is used to get source positions of all class members in the boot
class path, to automate the addition of annotations. See
go/hidden-api-annotations for more context.

Mappings printed in:
out/soong/.intermediates/frameworks/base/hiddenapi-mappings
    /android_common/dex-mapping.txt

Test: make hiddenapi-mappings
Bug: 110868826
Change-Id: Ie67a8be6a5a71447a25d081bd466b8b5e01b0725
2018-07-10 09:20:42 +01:00
Kevin Chyn
02bcebede4 Merge "6/n: Have FaceService extend BiometricService" 2018-06-27 22:09:01 +00:00
Colin Cross
a12c0f506c Mark installable jars with installable: true
Most jars don't need to be installed on the device.  Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.

Bug: 110885583
Test: m checkbuild
Change-Id: I579da7c1a712ec4fb49e288e7f3ab369cb75baf4
2018-06-27 11:49:44 -07:00
Kevin Chyn
a56dff7339 6/n: Have FaceService extend BiometricService
In the Service layer, this change is pretty much the same as ag/4340638.
FingerprintService already extends BiometricService which contains all
of the common code. FaceService now does the same after this change.

Updated the Manager layer to use the infrastructure added in P, namely
  - Private APIs for BiometricPrompt
  - Removed FaceManager#CryptoObject, use biometrics/CryptoObject directly
  - Few other BiometricAuthenticator things

Bug: 110387294

Test: enrolling FP still works
Test: removing FP still works
Test: changing FP name persists across reboots
Test: enumerating still works (extra framework fp, extra hw fp)
Test: keyguard still receives lockout reset callbacks

Change-Id: I2195b08e28d024a120df56fe87b0dd4f9b96505a
2018-06-27 11:31:03 -07:00
Neil Fuller
f18981698d resolve merge conflicts of 55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
am: e01a7adf5a

Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe
2018-06-26 04:05:36 -07:00
Neil Fuller
e01a7adf5a resolve merge conflicts of 55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
2018-06-26 11:55:46 +01:00
Neil Fuller
4d9f7a8bc3 Merge "Minimum viable TimeZoneDetectorService" 2018-06-25 18:47:39 +00:00
TreeHugger Robot
abe78cd313 Merge changes from topic "biometrics-face"
* changes:
  5/n: Move FaceService to biometrics directory
  4/n: Add face authentication framework
2018-06-22 18:44:27 +00:00
Gilad Bretter
cb51b8b847 4/n: Add face authentication framework
This change is cherry-picked and rebased from AOSP
https://android-review.googlesource.com/c/platform/frameworks/base/+/660242

Add face recognition as an identification method, following fingerprint
design. Unlike fingerprint, only one face template can be enrolled per
user, and a vendor message is passed from the HAL all the way to the
client callback to allow GUI indication about the enrolled face
templates.

Add FaceAuthenticationManager and FaceService.
Add face authentication capability to TrustManager and Keyguard.
Modify TrustManager and KeyguardUpdateMonitorCallback fingerprint code
to support generic biometric method to eliminate duplications.
Add BiometricSourceType enum to keep track of the specific biometric
method.

Test: biometric authentication still works on the device

Fixes: 110385761

Change-Id: I5d04fe69a112c13d3ef7330b9c08c146e36c5335
Signed-off-by: Gilad Bretter <gilad.bretter@intel.com>
2018-06-21 17:00:07 -07:00
Neil Fuller
cccc48d0fe Minimum viable TimeZoneDetectorService
This is a do-nothing TimeZoneDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeZoneDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
Change-Id: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
2018-06-21 09:30:34 +00:00
Neil Fuller
7fb88c3928 Minimum viable TimeZoneDetectorService
This is a do-nothing TimeZoneDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeZoneDetectorServiceTest

Test: build / boot
Test: See above
Change-Id: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
2018-06-21 10:28:47 +01:00
Nan Zhang
381f62878d Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54 am: 0da95a5d64
am: 7c96332354

Change-Id: Iea928b33e984049904ca0fdba4923ee06cfd5971
2018-06-18 12:57:03 -07:00
Nan Zhang
7c96332354 Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54
am: 0da95a5d64

Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80
2018-06-18 12:37:13 -07:00
Nan Zhang
0da95a5d64 Merge "Enabled annotations for Metalava based api-stubs."
am: 79d3bf6e54

Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
2018-06-18 12:13:35 -07:00
Nan Zhang
4b81658d40 Enabled annotations for Metalava based api-stubs.
Test: m -j metalava-api-stubs-docs
Bug: b/78245848
Change-Id: I4ba661900a52f246fc0191c31aabfc96b89fa2db
2018-06-13 17:42:09 -07:00
TreeHugger Robot
6006f76ad7 Merge "Split interfaces and service for activities from current AM interfaces (1/n)" 2018-06-12 18:18:48 +00:00
Neil Fuller
267ef30c8b resolve merge conflicts of 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
am: 79d42a61e4

Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
2018-06-12 06:36:14 -07:00
Neil Fuller
79d42a61e4 resolve merge conflicts of 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
2018-06-12 14:23:51 +01:00
Nan Zhang
02006355eb Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp
am: b7a46a7ec5

Change-Id: I58b0993effac259938c4f067188bb44ff1fa72cd
2018-06-11 18:57:41 -07:00
TreeHugger Robot
b7a46a7ec5 Merge "Remove test-* sources for Metalava api-stubs." into pi-dev-plus-aosp 2018-06-11 22:10:59 +00:00
TreeHugger Robot
ccccaf99f6 Merge "Frameworks: convert platformprotos to soong" into pi-dev-plus-aosp 2018-06-11 17:23:46 +00:00
Neil Fuller
b557907f51 Minimum viable TimeDetectorService
This is a do-nothing TimeDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.

Unit tests can be run with:

atest FrameworksServicesTests:TimeDetectorServiceTest

Test: build / boot
Test: See above
Merged-In: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
(cherry picked from commit feeee682a23f25760c4a1aa07c00945901911ba3)
2018-06-11 15:29:57 +01:00
Xin Li
bd98091695 Skip ef9f2740a7 in proposed pi-dev-plus-aosp-without-vendor merge. am: f700e7feaa
am: 15bcfcf789

Change-Id: Iec38af6624b30fcdcef4a6b3df45033eb3e15588
2018-06-09 05:49:22 -07:00
Nan Zhang
5b9aa02afd Remove test-* sources for Metalava api-stubs.
We didn't include any test-* sources for api-stubs generation in
internal Master. So also exlude them for Metalava targets.

Bug: b/78245848
Test: m metalava-api-stubs-docs

Change-Id: I08e197275b66d6bea026b909439dd80518465d25
2018-06-08 13:51:27 -07:00
David Brazdil
bb23585a65 Merge "Build dark greylist from public + light grey API" am: 60229832de am: bd0dd0e59f
am: 4c67b9d449

Change-Id: I361df3b16524e7b0be0b48d8bc507caa233fd180
2018-06-08 09:33:18 -07:00
David Brazdil
4c67b9d449 Merge "Build dark greylist from public + light grey API" am: 60229832de
am: bd0dd0e59f

Change-Id: Icf43773b041d8058cd79da2b3f085f33f19f2078
2018-06-08 09:20:59 -07:00
David Brazdil
6f6a126b9c Build dark greylist from public + light grey API
The dark greylist is meant to contain non-SDK APIs which are "related"
to APIs accessible to apps without restrictions. The list used to be
built as all non-SDK APIs in the same package as those on the light
greylist. That is not sufficient and should include the public SDK API
packages too.

This patch modifies the makefile to generate a list of public API DEX
signatures with Doclava and then use that as a basis for the dark
greylist generation.

Bug: 80461842
Bug: 64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: I4b1588013f26661207126b4006cdef0a0fc8ae2c
2018-06-07 09:45:01 +00:00
Wale Ogunwale
65ebd955e1 Split interfaces and service for activities from current AM interfaces (1/n)
First step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the interfaces and service dealing
with activities and their containers (tasks, stack, display) from the
rest of AM interfaces and services. This will allow us to move the new
interfaces and services to WM when the internal states are cleaned-up.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: Ide9b3f89123b768cdbd3e3878113c7a8021187f3
2018-06-06 18:26:21 -07:00
Nan Zhang
ef0a261dd6 Merge "Add metalava based api-stubs modules in Android.bp" am: f907578564 am: 25d4494793
am: 18543da456

Change-Id: I90124871fc88448c74439f9f4a8a66bda38a324a
2018-06-06 01:34:47 -07:00
Nan Zhang
18543da456 Merge "Add metalava based api-stubs modules in Android.bp" am: f907578564
am: 25d4494793

Change-Id: I61a4f39fdef76aa49dea1b007b805cac5e55526f
2018-06-06 01:20:55 -07:00
Nan Zhang
4212eb1bef Add metalava based api-stubs modules in Android.bp
Test: m clean && m metalava-api-stubs-docs
Bug: b/78245848
Change-Id: Ie0943d306af4176d965425ec85236cd173c1e870
2018-06-05 17:00:52 -07:00