OSDN Git Service
Android Build Merger (Role) [Mon, 25 Jun 2018 19:05:33 +0000 (19:05 +0000)]
Merge "Merge "Fix Possible Deadlock with getFeatureState" am:
6bebb8418c am:
057f582e09 am:
9296dcff69"
Brad Ebinger [Mon, 25 Jun 2018 19:05:12 +0000 (12:05 -0700)]
Merge "Fix Possible Deadlock with getFeatureState" am:
6bebb8418c am:
057f582e09
am:
9296dcff69
Change-Id: I22b387d5437ec62d8ba0d6ca869e86772fc44efb
TreeHugger Robot [Mon, 25 Jun 2018 19:02:24 +0000 (19:02 +0000)]
Merge "Request layout if visiblity (thus, size) changes"
Brad Ebinger [Mon, 25 Jun 2018 18:53:41 +0000 (11:53 -0700)]
Merge "Fix Possible Deadlock with getFeatureState" am:
6bebb8418c
am:
057f582e09
Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d
Pavel Grafov [Mon, 25 Jun 2018 18:53:13 +0000 (11:53 -0700)]
Restore separate challenge state on error am:
f10ae7e731
am:
1ed95cb085
Change-Id: I28a6f5f4a05b64ad5a7cf2cda486e84a9a7503e7
Neil Fuller [Mon, 25 Jun 2018 18:47:39 +0000 (18:47 +0000)]
Merge "Minimum viable TimeZoneDetectorService"
Brad Ebinger [Mon, 25 Jun 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Fix Possible Deadlock with getFeatureState"
am:
6bebb8418c
Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069
Pavel Grafov [Mon, 25 Jun 2018 18:45:17 +0000 (11:45 -0700)]
Restore separate challenge state on error
am:
f10ae7e731
Change-Id: I70957dae31bbe98f8286d9c96bccd002f0acdf01
TreeHugger Robot [Mon, 25 Jun 2018 18:41:07 +0000 (18:41 +0000)]
Merge "Handle tri-state location permission."
Brad Ebinger [Mon, 25 Jun 2018 17:30:02 +0000 (17:30 +0000)]
Merge "Fix Possible Deadlock with getFeatureState"
TreeHugger Robot [Mon, 25 Jun 2018 16:18:52 +0000 (16:18 +0000)]
Merge "Add a metadata to control whether an external intent should be opened in the personal profile when in a managed profile."
Ryan Mitchell [Mon, 25 Jun 2018 16:10:59 +0000 (16:10 +0000)]
Merge "AAPT2: Fix unrecognized CDATA"
Evan Laird [Thu, 21 Jun 2018 18:07:10 +0000 (14:07 -0400)]
Request layout if visiblity (thus, size) changes
When wifi or mobile icons update state, they sometimes decide to show /
hide themselves or subviews. When this happens, they need to call
requestLayout() so that StatusIconContainer puts them in the right spot.
Also always center the wifi/mobile icons.
Bug:
110286625
Test: enter demo mode, show wifi and lte, hide lte, show lte -> there
should be no overlapping
Change-Id: Iad49783ac119d9994f4378f5b98f1a5b18f80c5d
Erik Kline [Mon, 25 Jun 2018 13:42:52 +0000 (06:42 -0700)]
[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am:
3580a6a996 am:
fc1bde9261 -s ours
am:
0226df643a -s ours
Change-Id: I1f4073a66609448766af3fc32a629f0d2f919cf4
Erik Kline [Mon, 25 Jun 2018 13:33:21 +0000 (06:33 -0700)]
[automerger skipped] Merge "Prefer default Internet network for upstream tethering." am:
3580a6a996
am:
fc1bde9261 -s ours
Change-Id: I965178ec99083dcd907841b4959e456f6d492516
Erik Kline [Mon, 25 Jun 2018 13:24:22 +0000 (06:24 -0700)]
Merge "Prefer default Internet network for upstream tethering."
am:
3580a6a996
Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774
arangelov [Wed, 30 May 2018 17:24:23 +0000 (18:24 +0100)]
Add a metadata to control whether an external intent should be opened in
the personal profile when in a managed profile.
This change introduces the com.android.settings.profile metadata with possible values "primary_profile_only" and "all_profiles" (the default value when not specified). If an application declares this metadata with a value of "primary_profile_only", in a work profile the ProfileSelectDialog is never shown and the application is opened straight in the personal profile. If an application specifies a value of "all_profiles" or does not specify anything, the ProfileSelectDialog is shown to the user.
Test: atest frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java
Bug:
79868199
Change-Id: I82860307e5745f4c7044980225114efcdcf0c90f
Treehugger Robot [Mon, 25 Jun 2018 12:08:46 +0000 (12:08 +0000)]
Merge "Prefer default Internet network for upstream tethering."
Pavel Grafov [Mon, 25 Jun 2018 11:13:38 +0000 (12:13 +0100)]
Restore separate challenge state on error
Otherwise if something goes wrong when tying the profile to the primary
user, challenge will remain in inconsistent state and the user won't
be able to unlock the profile.
Bug:
110262879
Test: manual, unified both compliant and uncompliant challenge.
Change-Id: I2bea3867541f43cbabd5cabbe8a0f61acc2602ca
Erik Kline [Thu, 14 Jun 2018 08:36:40 +0000 (17:36 +0900)]
Prefer default Internet network for upstream tethering.
Rather than use the crufty config.xml list of upstream transport types,
use ConnectivityService's notion of the default network for the upstream.
In cases where a DUN network is required and the default network is
currently a mobile network, look for a DUN network (code in Tethering
is currently responsible for requesting one).
Test: as follows
- built, flashed, booted
- runtest frameworks-net
- tethered via mobile, joined captive portal network, maintained
laptop access via mobile until captive passed (then used wifi)
- disabled client mode wifi, disabled mobile data, plugged in
ethernet adapter, observed connectivity via ethernet
Bug:
32163131
Bug:
62648872
Bug:
63282480
Bug:
109786760
Bug:
110118584
Bug:
110260419
Merged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
Merged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd
Change-Id: I925b75994e31df8046f3ef9916a2457b4210485e
(cherry picked from commit
4080a1bd15572caf149762e45c958627feceb74d)
Lucas Dupin [Sat, 23 Jun 2018 08:43:44 +0000 (01:43 -0700)]
[automerger skipped] Merge "Conserve expansion after re-inflation" into pi-dev am:
0eb2be3a67
am:
bd037eaedd -s ours
Change-Id: I4a3745dfbfb64f34215ad889916dbef9ee1a929e
Lucas Dupin [Sat, 23 Jun 2018 08:17:10 +0000 (01:17 -0700)]
Merge "Conserve expansion after re-inflation" into pi-dev
am:
0eb2be3a67
Change-Id: I44f868df5cafeac3bef09586403cf955bad1e581
TreeHugger Robot [Sat, 23 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Merge "Conserve expansion after re-inflation" into pi-dev
TreeHugger Robot [Sat, 23 Jun 2018 05:52:22 +0000 (05:52 +0000)]
Merge "Introduced WindowProcessController/Listener (10/n)"
TreeHugger Robot [Sat, 23 Jun 2018 03:03:20 +0000 (03:03 +0000)]
Merge "Notify new IME target before IME starts interacting"
Lucas Dupin [Thu, 21 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Conserve expansion after re-inflation
We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.
Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Merged-In: I41669fb32419ad02a11586ba248a68b47d450413
Fixes:
110530608
Fixes:
110147405
Fixes:
79122419
Yohei Yukawa [Sat, 23 Jun 2018 00:33:19 +0000 (17:33 -0700)]
Notify new IME target before IME starts interacting
Previously, there was a time window between when an IME starts new
input and when the IME issues an IPC IMM#setImeWindowStatus() so that
WindowManagerService (WMS) can be notified about the new IME target
window.
With this CL, it is now guaranteed that WindowManagerService (WMS) is
always notified about the new IME target window before IME starts
interacting with that window.
Note that WMS is not using notified IME target window yet hence there
should be no user-visible behavior change.
Bug:
110531072
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I032b91ce722a16b17518a5d88015c574d7d3e51b
Emilian Peev [Sat, 23 Jun 2018 00:31:37 +0000 (17:31 -0700)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev am:
a749cd584e
am:
8544a07eac
Change-Id: I4da1d84141de7fa5974ff7594318bfa237b7850c
Emilian Peev [Sat, 23 Jun 2018 00:22:01 +0000 (17:22 -0700)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
am:
a749cd584e
Change-Id: I501835fdbc828564c0a06157c970853ed142896a
TreeHugger Robot [Sat, 23 Jun 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 23:49:02 +0000 (23:49 +0000)]
Merge "Make setPrivacy not a hidden api"
Chen Xu [Fri, 22 Jun 2018 23:48:29 +0000 (23:48 +0000)]
Merge "support privilege access rule for carrier identification"
Brad Ebinger [Thu, 21 Jun 2018 17:18:21 +0000 (10:18 -0700)]
Fix Possible Deadlock with getFeatureState
Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.
Also, fixed up some other concurrency code.
Bug:
110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
Kevin Hufnagle [Fri, 22 Jun 2018 23:06:35 +0000 (16:06 -0700)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev am:
d2aadbfd93
am:
b00ca4b456
Change-Id: Ib1955875d74adf64b1a4e353c7521aa071476cda
David Sehr [Fri, 22 Jun 2018 23:00:52 +0000 (23:00 +0000)]
Merge "Split fork and specialize in zygote"
TreeHugger Robot [Fri, 22 Jun 2018 23:00:31 +0000 (23:00 +0000)]
Merge "Fix uris coming into SliceManager.getPinnedSpecs"
Kevin Hufnagle [Fri, 22 Jun 2018 22:50:04 +0000 (15:50 -0700)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
am:
d2aadbfd93
Change-Id: I38378cf68c2ab2e16fdc35504b44114e6648de42
TreeHugger Robot [Fri, 22 Jun 2018 22:10:21 +0000 (22:10 +0000)]
Merge "Conserve expansion after re-inflation"
Kevin Hufnagle [Fri, 22 Jun 2018 21:58:38 +0000 (21:58 +0000)]
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 21:43:19 +0000 (21:43 +0000)]
Merge "Fixed an issue where the shelf was not rounded during the expansion"
TreeHugger Robot [Fri, 22 Jun 2018 21:28:15 +0000 (21:28 +0000)]
Merge "Fix status icon animations"
Wale Ogunwale [Thu, 17 May 2018 16:35:39 +0000 (09:35 -0700)]
Introduced WindowProcessController/Listener (10/n)
One heavy dependence between the current AMS service and activities
is process management which is heavy affected by activities and their
current state. We introduce WindowProcessController and WindowProcessListener
objects as a structured way for the process changes in AM package to
be communicated to the WM package and WindowProcessListner for activity
changes in the WM package to the communicated back to the AM package.
The ProcessRecord object in AM will own the WindowProcessController object
and also implement the WindowProcessListener.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I9e96e841b0f95e99a597cb4629fa5d2fe45760b6
Wei Wang [Thu, 21 Jun 2018 18:29:40 +0000 (11:29 -0700)]
Handle tri-state location permission.
Use noteOp instead of checkOp as checkOp doesn't consider
background status.
Watch location permission changes caused by background status.
Restrict age of last location for foreground-only apps.
Bug:
80318398
Test: Manual
Change-Id: I3499d4150478b6f501966953f8e4a08169f3557c
Yi Jin [Sat, 16 Jun 2018 00:25:32 +0000 (17:25 -0700)]
Make setPrivacy not a hidden api
Bug:
110710413
Test: N/A
Change-Id: Iae8dda7f2295e3080c042398516838d84bd5d5be
Ryan Mitchell [Tue, 5 Jun 2018 17:15:04 +0000 (10:15 -0700)]
AAPT2: Fix unrecognized CDATA
This change adds support for resources that have CDATA blocks within
their values. The blocks should allow any character to occur without
being escaped. It also should not effect the current state of quote
processing.
Bug:
80326349
Test: Created tests in aapt2_tests
Change-Id: Ie1a00e50cffc877e2eb5f788f8d7a1bda839c0cf
TreeHugger Robot [Fri, 22 Jun 2018 20:29:38 +0000 (20:29 +0000)]
Merge "Nit: PackageManagerService"
TreeHugger Robot [Fri, 22 Jun 2018 20:06:45 +0000 (20:06 +0000)]
Merge "Remove sentiment reason"
Jason Monk [Fri, 22 Jun 2018 20:01:55 +0000 (16:01 -0400)]
Fix uris coming into SliceManager.getPinnedSpecs
Test: Added a test
Bug:
110699668
Change-Id: I8c4c377babba4b44484096e5456184dd364350c8
TreeHugger Robot [Fri, 22 Jun 2018 19:58:21 +0000 (19:58 +0000)]
Merge "Remove unused member in VulkanManager."
Matthew Ng [Fri, 22 Jun 2018 19:47:09 +0000 (12:47 -0700)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev am:
95b7c25a58
am:
1622ea15fe
Change-Id: I509cc0c6079b146da78ac607d3edb437f4812dd1
Matthew Ng [Fri, 22 Jun 2018 19:36:26 +0000 (12:36 -0700)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
am:
95b7c25a58
Change-Id: Id2e3d7e859a47936a63ebb5875bda69fbb64c816
Lucas Dupin [Thu, 21 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Conserve expansion after re-inflation
We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.
Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Fixes:
110530608
Fixes:
110147405
Fixes:
79122419
TreeHugger Robot [Fri, 22 Jun 2018 19:24:08 +0000 (19:24 +0000)]
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
Andrii Kulian [Fri, 22 Jun 2018 19:00:28 +0000 (12:00 -0700)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev am:
3a09ade4d1
am:
e36941d4c5
Change-Id: I94b9ae9f9959d27cf420158214f282904362d473
Andrii Kulian [Fri, 22 Jun 2018 18:48:11 +0000 (11:48 -0700)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
am:
3a09ade4d1
Change-Id: Iad7554e7b893563a23a0adb2a4174199ea55beb2
TreeHugger Robot [Fri, 22 Jun 2018 18:44:27 +0000 (18:44 +0000)]
Merge changes from topic "biometrics-face"
* changes:
5/n: Move FaceService to biometrics directory
4/n: Add face authentication framework
Rebecca Silberstein [Fri, 22 Jun 2018 18:34:55 +0000 (11:34 -0700)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev am:
cbf554b78b
am:
5f5f4788f1
Change-Id: I8a260e47661912420c20634c390aef288afaf92b
Rebecca Silberstein [Fri, 22 Jun 2018 18:26:10 +0000 (11:26 -0700)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
am:
cbf554b78b
Change-Id: I7f717d4d6d8a836fc86d67cc453a464830865508
David Sehr [Fri, 22 Jun 2018 17:45:36 +0000 (10:45 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Andrii Kulian [Fri, 22 Jun 2018 18:14:25 +0000 (18:14 +0000)]
Merge "Skip updating stack config if it is detached from a display" into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 18:14:19 +0000 (18:14 +0000)]
Merge "Get WallpaperInfo for current user"
TreeHugger Robot [Fri, 22 Jun 2018 17:52:26 +0000 (17:52 +0000)]
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
Amin Shaikh [Fri, 22 Jun 2018 17:33:17 +0000 (10:33 -0700)]
Merge "Do not announce selected state for QS tiles." into pi-dev am:
bd62416618
am:
e6fb6d5ae6
Change-Id: I3ab94f400cb9c38e6083075f9da2d07e5a40273c
Amin Shaikh [Fri, 22 Jun 2018 17:23:46 +0000 (10:23 -0700)]
Merge "Do not announce selected state for QS tiles." into pi-dev
am:
bd62416618
Change-Id: I5336f81eed377c9d3dfe5932f91fe97a3f91108a
TreeHugger Robot [Fri, 22 Jun 2018 17:12:54 +0000 (17:12 +0000)]
Merge "Do not announce selected state for QS tiles." into pi-dev
TreeHugger Robot [Fri, 22 Jun 2018 17:03:14 +0000 (17:03 +0000)]
Merge "Improve backup and restore for empty sounds"
Patrick Baumann [Wed, 13 Jun 2018 22:21:55 +0000 (15:21 -0700)]
Nit: PackageManagerService
This change makes no functional changes. Instead it removes some dead
code and makes use of a few "modern" language features to improve
readability. tl;dr: There are fewer intellij squigglies now.
Test: builds and runs
Change-Id: Ia8146afc22cc3677fab3b86734fbef3655d8ff05
Alison Cichowlas [Fri, 22 Jun 2018 16:42:26 +0000 (16:42 +0000)]
Merge "Log if we could not mk the dir when saving screenshot."
Julia Reynolds [Fri, 22 Jun 2018 15:54:48 +0000 (08:54 -0700)]
Merge "Remove managed profile toast" into pi-dev am:
7f4e9739e4
am:
1424138d36
Change-Id: I0ce832fff2fc869f68b900e5facc5237a6ba8f84
Greg Daniel [Fri, 22 Jun 2018 14:44:26 +0000 (10:44 -0400)]
Remove unused member in VulkanManager.
A large part of the previous change was specifically around removing
this ref counted data member, and then I just forgot to delete it...
Test: manual testing
Change-Id: Ie9a7f7495789d45a65900c08a27a9d83ad64617c
Julia Reynolds [Fri, 22 Jun 2018 15:29:21 +0000 (08:29 -0700)]
Merge "Remove managed profile toast" into pi-dev
am:
7f4e9739e4
Change-Id: I78e08cc1e3a1ec52cc9bf813ab794c62a73da978
TreeHugger Robot [Fri, 22 Jun 2018 15:19:20 +0000 (15:19 +0000)]
Merge "Remove managed profile toast" into pi-dev
Makoto Onuki [Fri, 22 Jun 2018 15:18:28 +0000 (15:18 +0000)]
Merge "Remove legacy migration code from sync manager"
Julia Reynolds [Fri, 22 Jun 2018 14:40:55 +0000 (10:40 -0400)]
Remove sentiment reason
Change-Id: I9f4426d2252d285b24401fdff5e1df21a46b8d03
Fixes:
110679864
Test: manual
Julia Reynolds [Wed, 20 Jun 2018 14:20:31 +0000 (10:20 -0400)]
Improve backup and restore for empty sounds
Test: runtest systemui-notification
Change-Id: Iab2eebb0da8163f520af95c2ad5fd8f35333a9d5
Fixes:
109777940
Greg Daniel [Fri, 22 Jun 2018 13:27:12 +0000 (13:27 +0000)]
Merge "Manually create and manage vulkan instance and device."
TreeHugger Robot [Fri, 22 Jun 2018 12:00:55 +0000 (12:00 +0000)]
Merge "Use framework VPN icon in VpnDialogs package"
TreeHugger Robot [Fri, 22 Jun 2018 05:52:26 +0000 (05:52 +0000)]
Merge "MediaPlayer2: remove inheritance on MediaPlayerBase"
Jack Yu [Fri, 22 Jun 2018 03:49:21 +0000 (20:49 -0700)]
Merge "Removed dead code in DcTracker" am:
a0b9309ba2 am:
5ae46260e4
am:
9fa40bd92d
Change-Id: I936ed9f443e6abb3184561e5bf7914b2a7c6a2e2
Jack Yu [Fri, 22 Jun 2018 03:39:13 +0000 (20:39 -0700)]
Merge "Removed dead code in DcTracker" am:
a0b9309ba2
am:
5ae46260e4
Change-Id: Ib664690a19a00c6739fd0bff87e343742832478e
Jack Yu [Fri, 22 Jun 2018 03:28:45 +0000 (20:28 -0700)]
Merge "Removed dead code in DcTracker"
am:
a0b9309ba2
Change-Id: I807835bcc1194f695e5fb30098cc82f50fef5d59
TreeHugger Robot [Fri, 22 Jun 2018 03:06:33 +0000 (03:06 +0000)]
Merge "Add new metrics constant for create shortcut page"
TreeHugger Robot [Fri, 22 Jun 2018 02:46:22 +0000 (02:46 +0000)]
Merge "Always send WindowToken when starting IME input"
Yuriy Romanenko [Fri, 22 Jun 2018 00:52:42 +0000 (00:52 +0000)]
Merge "camera2: Fixed typos in StreamConfigurationMap.java"
Treehugger Robot [Fri, 22 Jun 2018 00:21:43 +0000 (00:21 +0000)]
Merge "Removed dead code in DcTracker"
Fan Zhang [Fri, 22 Jun 2018 00:19:02 +0000 (17:19 -0700)]
Add new metrics constant for create shortcut page
Bug:
74806595
Test: rebuild
Change-Id: Ifce389f55a520838721ce4dc059b1accaacd4692
Selim Cinek [Tue, 19 Jun 2018 02:38:11 +0000 (19:38 -0700)]
Fixed an issue where the shelf was not rounded during the expansion
The positioning of the shelf was actually incorrect previously
which would lead to the rounded corners not being rounded
with a cutout. We didn't factor in the minExpandHeight when
when calculating the stack translation.
Change-Id: I50a1e8b36256426deef8816fe7e6d0c2d53842fd
Fixes:
110343077
Test: expand and collapse the notification panel while having a notch
Kevin Chyn [Tue, 19 Jun 2018 18:29:38 +0000 (11:29 -0700)]
5/n: Move FaceService to biometrics directory
Bug:
110387294
Test: builds, observable effect on devices (as expected)
Change-Id: Iaf0814c3c19aa9fa448e250cb3a161bd11fd935e
Gilad Bretter [Thu, 22 Mar 2018 15:04:51 +0000 (17:04 +0200)]
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>
Wale Ogunwale [Thu, 21 Jun 2018 23:36:52 +0000 (23:36 +0000)]
Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (9/n)"
Jeff Sharkey [Thu, 21 Jun 2018 23:35:59 +0000 (23:35 +0000)]
Merge "Introduce RedactingFileDescriptor."
Neil Fuller [Thu, 21 Jun 2018 23:29:44 +0000 (16:29 -0700)]
[automerger skipped] Merge "Trim away some dead code" am:
d6a1657466 -s ours am:
d85b36fde3 -s ours
am:
c7826490b4 -s ours
Change-Id: I6b97b70476bea4e16dac912a59a1bdd105848138
Wei Jia [Wed, 20 Jun 2018 23:54:24 +0000 (16:54 -0700)]
MediaPlayer2: remove inheritance on MediaPlayerBase
rename getMediaPlayer2State to getState
Test: MediaPlayer2Test
Bug:
109928575
Change-Id: I93c1b645bfe2a8be55e41fb07e6ecd9c60155258
Yohei Yukawa [Thu, 21 Jun 2018 23:24:36 +0000 (16:24 -0700)]
Always send WindowToken when starting IME input
In InputMethodManagerService, windowGainedFocus() is a superset of
startInput(). If the window specified to windowGainedFocus() is
already seen in IMMS#mCurFocusedWindow, windowGainedFocus() just works
like startInput(). If the window specified to windowGainedFocus()
does not match to IMMS#mCurFocusedWindow, then it takes care of
everything we need to change the IME target window including tasks
that startInput() does. The reason why we still have startInput() is
just because my previous CL [1], which unified windowGainedFocus() and
startInput() with keeping the existing behavior, did not intend to
change the existing behavior.
Now that we are going to enforce true traceability between input
session and target application window, IMMS#windowGainedFocus() is
what we want to always rely on.
Bug:
110531072
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: I24feedf9ef5aca90ef947f4f2aa3e78365fd8c8a
Neil Fuller [Thu, 21 Jun 2018 23:20:34 +0000 (16:20 -0700)]
[automerger skipped] Merge "Trim away some dead code" am:
d6a1657466 -s ours
am:
d85b36fde3 -s ours
Change-Id: I5b9006099a564fe8de1811e1254a3859ef3449d4
Neil Fuller [Thu, 21 Jun 2018 23:10:26 +0000 (16:10 -0700)]
[automerger skipped] Merge "Trim away some dead code"
am:
d6a1657466 -s ours
Change-Id: I7cb1845584c838fe6bcce743d9f3b9944da5d41b
Lucas Dupin [Tue, 19 Jun 2018 23:05:09 +0000 (16:05 -0700)]
Get WallpaperInfo for current user
Secondary user's WallpaperInfo would always be null otherwise.
Test: manual, switch between users with different live wallpapers
Change-Id: I32d5e04281aa38b00f5350569ef86b5d74de8f07
Fixes:
110275658
zhangkuili [Thu, 21 Jun 2018 22:37:01 +0000 (15:37 -0700)]
Merge "[Stability][hwui] check mmap return value" am:
b352dcd153 am:
399ac24bdf
am:
4fe18f31d5
Change-Id: Id8e6045310f3b480649dbe097f60da2a293603d4
Evan Laird [Thu, 21 Jun 2018 22:29:10 +0000 (15:29 -0700)]
Merge "Add config to disallow the battery % option" into pi-dev am:
a063da83f1
am:
2272f08724
Change-Id: I4de78fe137ed23012f13447d9460bfe19916df33
TreeHugger Robot [Thu, 21 Jun 2018 22:24:40 +0000 (22:24 +0000)]
Merge "Disable PIP settings button when it's invisible."