Commit Graph

240 Commits

Author SHA1 Message Date
Kevin Chyn
02bcebede4 Merge "6/n: Have FaceService extend BiometricService" 2018-06-27 22:09:01 +00: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
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
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 5e1d95b0cc to stage-aosp-master
am: 79d42a61e4

Change-Id: I8dcebef6e996dfaec01934552aa0f3d6f8c9053a
2018-06-12 06:36:14 -07:00
Neil Fuller
79d42a61e4 resolve merge conflicts of 5e1d95b0cc 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 feeee682a2)
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
Neil Fuller
df3cf2b39d Merge "Minimum viable TimeDetectorService" 2018-06-05 17:52:58 +00:00
Neil Fuller
feeee682a2 Minimum viable TimeDetectorService
This is a do-nothing DeviceContextualizerService 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
Change-Id: I9e4eac70b944441f34491315cd1ce7fa2b9ae150
2018-05-31 09:44:21 +01:00
Jiyong Park
fa15a99fe9 Remove FlpHardwareProvider
After Treble's FLP merge into GNSS HAL, the FlpHardwareProvider is just
an empty shell. Removing FusedLocation and/or Flp + Hardware classes
altogether.

Bug: 35726697
Test: m -j
Test: Open Google Map and then walk around. The dot moves as I walk.

Merged-In: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
Change-Id: I7f413e38b57424e8ebb9d7d14d94f145a48d10f8
(cherry picked from commit 4cc3a1c056)
2018-05-25 16:38:52 +09:00
Andreas Gampe
9eb7586f27 Frameworks: convert platformprotos to soong
(cherry picked from commit af27bf6662)

Bug: 64328974
Test: m
Merged-In: I3729a3132c1ef07dded69801373edf51006fa623
Change-Id: I3729a3132c1ef07dded69801373edf51006fa623
2018-05-24 19:21:49 +00:00
Andreas Gampe
af27bf6662 Frameworks: convert platformprotos to soong
Bug: 64328974
Test: m
Change-Id: I3729a3132c1ef07dded69801373edf51006fa623
2018-05-17 10:49:26 -07:00
Nan Zhang
39d2d18b80 Update Android.bp for api-stubs in order to do api-check.
Bug: b/78034256
Test: m clean && m checkapi

Change-Id: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb
Merged-In: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb
2018-05-15 15:47:01 -07:00
Nan Zhang
a01ad7dc24 Merge "Update Android.bp for api-stubs in order to do api-check." into pi-dev-plus-aosp
am: a2232e2803

Change-Id: Ibc453f8017ca35c69c1274b16e26a561caba8655
2018-05-15 12:02:21 -07:00
Nan Zhang
05c47c8e5c Update Android.bp for api-stubs in order to do api-check.
Bug: b/78034256
Test: m clean && m checkapi

Change-Id: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb
2018-05-09 11:23:43 -07:00
Yifan Hong
dd0e942597 IBatteryPropertiesRegistrar: remove unused functions
* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
  functions

Test: builds
Test: boots
Bug: 68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
2018-05-04 14:50:42 -07:00
David Brazdil
a5d0d86b63 resolve merge conflicts of 4d213e5856 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I9dc9a1e81d9a4d82823e15d1af0cc814a1005174
2018-05-02 13:44:48 +00:00
David Brazdil
96c9cbc1a1 Build same hidden API lists as in pi-dev
P branch builds hidden API lists in a separate invocation of droiddoc
which includes @SystemApi and @TestApi annotated class members in the
public API. This patch creates the same build rule in the master branch,
only with Soong instead of Makefile.

Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
2018-05-02 08:54:02 +00:00
David Brazdil
4f9d4d566c Build hidden API DEX signatures with Soong
Internal master tree is still invoking Doclava with a Makefile build
rule for hidden API, while the remaining Doclava rules have been
migrated to Soong. Do the same for hidden API.

Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Change-Id: Ifa912f8751025b7de24a982a1a227a9c27d18267
2018-04-26 16:06:08 +01:00
David Brazdil
9150bd4b48 Merge "Generate @removed DEX API signatures" am: eddd165c20
am: 86cd9642c3

Change-Id: I936c3b375a4c1a58c301965f6a2922e135699663
2018-04-26 07:41:56 -07:00
David Brazdil
df41728b85 Generate @removed DEX API signatures
CL I8fe27e8c03334f9c90204db1e69447de65a06a38 adds support to generate
a list of all @removed DEX API signatures. Amend the public API build
rule to produce this file.

Bug: 78182899
Test: make
Change-Id: Iba8869ce6e4f401a8e420ad83ab459d25bbbaae0
2018-04-24 16:27:53 +01:00
Anton Hansson
e5bf20608a Move frameworks/base off the SRC_API_DIR variable.
This directory is going away. Migrate to the new paths, and replace the
long list of "since" arguments with a loop in the makefile. Also fix the
soong buildfile to use the new path and the 28 prebuilts.

This removes the need to update it every time an API is finalized (in make,
I don't know how to make loops in soong).

Bug: 77525052
Test: Verified variable is the same before & after, except for path change
Change-Id: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
Merged-In: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
2018-04-23 15:46:19 +01:00
Anton Hansson
6a9e72651b Move frameworks/base off the SRC_API_DIR variable.
This directory is going away. Migrate to the new paths, and replace the
long list of "since" arguments with a loop in the makefile. Also fix the
soong buildfile to use the new path and the 28 prebuilts.

This removes the need to update it every time an API is finalized (in make,
I don't know how to make loops in soong).

Bug: 77525052
Test: Verified variable is the same before & after, except for path change
Change-Id: I1d4e87e7840e979b83779a2aefe176e7c1ed1527
2018-04-23 11:44:53 +01:00
Makoto Onuki
fa3a2acfbc Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
am: a26e755900

Change-Id: Ib0bd9ecc183b1b2c9a6785554e6f717744820da3
2018-04-11 18:39:53 -07:00
Makoto Onuki
49392d335a Add stats logging to ServiceManager and NPMS
ServiceManager:
- Do an event log every N getService() calls with total time spent
in getService().
where N = 100 for core UIDs and 200 for other apps.

- Do an event log if getService() takes longer than N ms.
where N = 10 for core UIDs and 50 for other apps.

... with some extra throttling.

NPMS:
- Do the basic "stats logger" log for updateNetworkEnabledNL() and
isUidNetworkingBlocked()

This CL also enhances StatsLogegr so it now can show the slowest call
and the max # of calls per-second.

Bug: 77853238
Test: Manual test:
- Insert a SIM card
- Set data limit
- toggle airplane mode
- toggle wifi
- toggle mobile data

Then
- "dumpsys netpolicy" and "dumpsys activity processes" and check the stats
- also check "adb logcat -b all | grep ' service_manager'"

Change-Id: I5789541063f95d0eac501189816c8604a4571ba0
2018-04-11 16:37:57 -07:00
Nan Zhang
99ce5c7090 Add filegroup for supporting apache-http stubs generation.
Bug: b/70351683
Test: m clean && m check-apache-http-legacy-api,
and compare the old and new stubs.jar using md5sum.

Change-Id: I0035837aef48a76e40a2c723c2adce3ff129ad28
Merged-In: I0035837aef48a76e40a2c723c2adce3ff129ad28
2018-04-11 14:57:28 -07:00
Nan Zhang
a0f91af44d Add filegroup for supporting apache-http stubs generation.
Bug: b/70351683
Test: m clean && m check-apache-http-legacy-api,
and compare the old and new stubs.jar using md5sum.

Change-Id: I0035837aef48a76e40a2c723c2adce3ff129ad28
2018-04-10 12:46:31 -07:00
Colin Cross
7c99052071 Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b
am: c97d768b6b

Change-Id: I63439c9bcf33f7ed64791e84a493e257b7ec7991
2018-04-10 12:26:56 -07:00
Vishwath Mohan
f2f7495f49 Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev
am: 5ab3cf8bec

Change-Id: Id450c37765a5f657c6fe422aa98e3b7191d7b773
2018-04-05 14:49:14 -07:00
Vishwath Mohan
ecf00cedb6 Rename BiometricDialog to BiometricPrompt.
Renamed to BiometricPrompt per API-council feedback.

Bug: 77494933
Test: m -j70
Change-Id: Ifed2b8f3439a7e671e0ce46d3a7db9f24871b16a
2018-04-05 10:41:19 -07:00
Colin Cross
a2b78a7ed2 Add a droiddoc generator for hwbinder.stubs
hwbinder.stubs provides stubs for @SystemAPI hwbinder classes
that doesn't depend on framework, used to break a dependency cycle
between hidl interfaces and android_system_stubs_current while
satisifying the link type checks.

Bug: 77285514
Test: m checkbuild
Change-Id: Id4093e19f607dc5b0c663e1b637012799ab110c3
2018-03-29 22:41:40 -07:00