364006 Commits

Author SHA1 Message Date
TreeHugger Robot
840c29eb0b Merge "Rename trustedUserPresenceRequired." into pi-dev 2018-04-02 20:36:34 +00:00
Bryce Lee
540f747861 Merge "Do not set activity's task before clearing in some scenarios." into pi-dev 2018-04-02 20:28:00 +00:00
Bryce Lee
f65ee7e9e3 Do not set activity's task before clearing in some scenarios.
When the clear top and reset task launch flags are specified for a
standard launch mode activity, we should not add the activity to the
task before taking these actions. Doing so leads to the potential of
prematurely ending the starting activity and reparenting the activity
without a window container controller set.

This changelist ensures that the task is not associated until later.

Fixes: 70635977
Test: atest CtsActivityManagerDeviceTestCases:ActivityStarterTests
Change-Id: I8e2245f9ad9f07e259b099daefe9ebb2170ae28d
2018-04-02 13:24:27 -07:00
TreeHugger Robot
1c967fe075 Merge "Updates MediaDrm developer docs" into pi-dev 2018-04-02 20:00:46 +00:00
TreeHugger Robot
3f6b7714a7 Merge "Don't use a copy of window params when showing a dialog." into pi-dev 2018-04-02 19:22:58 +00:00
Shawn Willden
3c1830bd7f Rename trustedUserPresenceRequired.
The existing name is misleading, because it can be read as requiring
that a trusted user be present, rather than the intended meaning of
requiring trusted proof of user presence.  Since this is all about
TEE/SE-based keys, the "trusted" part is implied, so the simple
"userPresenceRequired" name makes more sense.

Bug: 77151288
Test: Keystore CTS tests
Change-Id: If8b533b9f34a1875eaf35cdd1bb8f3709da9761b
2018-04-02 13:03:14 -06:00
TreeHugger Robot
50228a6471 Merge "Revise secure key import API after review" into pi-dev 2018-04-02 18:45:35 +00:00
Yi Jin
ea31cbea93 Remove some letters of verbose log
Bug: 77333635
Test: N/A
Change-Id: I94b288d070dfb372edf345d369d75bb3255f631b
2018-04-02 11:09:57 -07:00
TreeHugger Robot
56051569ab Merge "Use modern c++ code style for incidentd." into pi-dev 2018-04-02 18:01:15 +00:00
Andrii Kulian
38af02e75b Merge "Don't finish activity on duplicate resume request" into pi-dev 2018-04-02 17:58:42 +00:00
Sudheer Shanka
8303baf4d0 Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev 2018-04-02 17:34:16 +00:00
TreeHugger Robot
ce5f2b3e87 Merge "Use per user info for seinfo" into pi-dev 2018-04-02 17:23:34 +00:00
Felipe Leme
15d403dd6a Don't use a copy of window params when showing a dialog.
When a Dialog's show() method is called, it makes a copy (l) of its window param
and change the copy's softInputMode before calling wm.addView(). This call ends
up calling WindowManagerGlobal.addView(view, l, display, parentWindow),
which in turn sets the application token from the parentWindow into l and stores
l on its mParams map.

Later, when the dialog layout is changed (for example, if it's resized), the
original params ends up passed to WindowManagerGlobal.updateViewLayout(),
which in turn updates it's internal mParams with it, hence losing the
application token (as the token was set in the copy).

Then, when Autofill (and possibly Assist) is triggered to that activity, the
Dialog's view hierarchy is ignored because WindowManagerGlobal.getRootViews()
ignores views whose params do not have an application token.

This CL fixes this issue by passing the original dialog's param to the wm
method and resetting the softInputMode that was changed, rather than making a
copy.

Test: atest DialogLauncherActivityTest
Test: manual verification with Twitch

Fixes: 68816440

Change-Id: I55f510ab7a44030bc368221b7db1a221bc2e09c8
2018-04-02 10:07:40 -07:00
TreeHugger Robot
78e805684b Merge "Fix right-most navbar icon tinting mismatch" into pi-dev 2018-04-02 15:32:01 +00:00
TreeHugger Robot
7f5670fdcd Merge "Make addUnwantedCapability method public" into pi-dev 2018-04-02 15:07:25 +00:00
TreeHugger Robot
ffe1c2a266 Merge "Restore saveLayer APIs back into the public API." into pi-dev 2018-04-02 14:28:48 +00:00
Remi NGUYEN VAN
07daad2dbf Merge "Calculate multipath quota excluding current day." into pi-dev 2018-04-02 11:21:22 +00:00
TreeHugger Robot
6e66280d35 Merge "Fix PermissionMonitorTest that has been failing." into pi-dev 2018-04-02 09:42:26 +00:00
TreeHugger Robot
bf9dfb16be Merge "TextClassifier API updates." into pi-dev 2018-04-02 09:08:52 +00:00
Remi NGUYEN VAN
bed7b970e7 Calculate multipath quota excluding current day.
The current calculation includes data usage for the current day,
which causes the returned daily quota to change during the day.
This makes it difficult to use for callers that need a fixed
data limit for the day.

Current usage in MultipathPolicyTracker (the only caller) is
incorrect because of this, as it assumes that quota is not constantly
changing.

Test: Tests in go/ag/3803612 pass
Bug: b/72631572
Bug: b/72877610
Change-Id: I9b3edde2dee7c7479d428e2bf2b73297afed3e6b
2018-04-02 17:44:23 +09:00
TreeHugger Robot
4a3ccc18e6 Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev 2018-04-02 08:37:20 +00:00
Chalard Jean
577164bd45 Fix PermissionMonitorTest that has been failing.
The fail is related to a recent fix to PermissionMonitor
that went into pi-dev only : ag/3799094, which fixed getting
the remote package name for the correct macro user instead of
the default. That fix had broken the test, this change fixes it.

Test: test now passes
Bug: 77315205
Change-Id: I26f8276eafe80478d5fefcff92e7dc2f12128bb4
2018-04-02 07:44:21 +00:00
Bernie Innocenti
035dbd438a apf: adjust JNI to accept_packet()'s new signature
Bug: 73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Merged-Id: I0a3ad562496f3e06bc9527af4e038be3cdfe25c6
Merged-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7
Merged-Id: I966776e6574cbf167a6148e20d40e2bdcc887327
Change-Id: Id5c3cec5459ce6f9693457448002e60bbca6c09b
(cherry picked from commit 64bc32c5d4ae8a5c479a15615f99180476e9b2fa)
2018-04-02 16:27:08 +09:00
Remi NGUYEN VAN
6f5a8db2e9 Merge "Add method to NetworkStatsService for UID stats." into pi-dev 2018-04-02 05:40:04 +00:00
Remi NGUYEN VAN
dfa8f0dbce Merge "Differentiate depleted and unset multipath quota" into pi-dev 2018-04-02 05:09:50 +00:00
Bill Yi
e970444839 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 03:55:47 +00:00
Bill Yi
ae73c8bea6 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 03:54:39 +00:00
TreeHugger Robot
138148425c Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev 2018-04-02 03:50:26 +00:00
TreeHugger Robot
299491afe1 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 03:48:25 +00:00
TreeHugger Robot
aaa2849890 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 03:35:17 +00:00
Bo Zhu
3cd574ced9 Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev 2018-04-02 03:02:03 +00:00
TreeHugger Robot
85e4a97789 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 02:45:27 +00:00
Bill Yi
28d1e6f63d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4def9dedaf59e38981c2ea802aa54a0061da6a0b
2018-04-01 19:11:00 -07:00
TreeHugger Robot
879127f31d Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 00:58:23 +00:00
TreeHugger Robot
f03441f47f Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-02 00:57:21 +00:00
TreeHugger Robot
c0f8eb345a Merge "Add config flag to specify if wallpaper is rendered" into pi-dev 2018-04-02 00:19:24 +00:00
Bill Yi
204c5f8e3e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3d47b103c9f6150c224f78ecab946e12e5439954
2018-04-01 17:05:30 -07:00
Bill Yi
4665e9cb3b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icd25d4ae0e198ba80ad85cb0b8369500d7d00098
2018-04-01 16:58:38 -07:00
Bill Yi
3b43c5fa78 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67084b2003296065cf866b5a2e933587f0d8b4a2
2018-04-01 16:51:45 -07:00
TreeHugger Robot
da6cff4e08 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-01 23:39:30 +00:00
Bo Zhu
b10ba442dd Skip the cert xml serial number check if the test root cert is in use
Bug: 77165400
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore

Change-Id: I2242b4a97b9efa60a5a5ad7ab79e786951580299
2018-04-01 16:22:15 -07:00
Bill Yi
fc775b982f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1c0883a67a583134ec82c67269ca77c6a2d50830
2018-04-01 15:32:55 -07:00
Dianne Hackborn
21306849e6 Merge "Fix issue #77230164: Add app op to control foreground services" into pi-dev 2018-04-01 22:26:18 +00:00
Bill Yi
bac732d910 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id1811dea9422d20ad23a590ecf803776a9602c92
2018-04-01 15:19:16 -07:00
Bill Yi
5d0eb04f60 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f44cb512f7edaf24706ece3aa2b832e69379aea
2018-04-01 15:05:31 -07:00
Bill Yi
73960d9005 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3078289f1c8675b32cbeeeae1fdbb6558278fb28
2018-04-01 14:58:25 -07:00
TreeHugger Robot
4ab18af48a Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev 2018-04-01 20:31:28 +00:00
TreeHugger Robot
b152a8c45d Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev 2018-04-01 19:51:53 +00:00
Dmitry Dementyev
bf08774704 Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev 2018-04-01 19:34:31 +00:00
TreeHugger Robot
49eb4c1f1f Merge "Throw an exception if the given root alias is unknown" into pi-dev 2018-04-01 19:30:29 +00:00