352862 Commits

Author SHA1 Message Date
TreeHugger Robot
9593ca1955 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 19:04:41 +00:00
Bill Yi
1fccf167ff Import translations. DO NOT MERGE
am: 406659b709  -s ours

Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a
2017-12-20 19:03:39 +00:00
TreeHugger Robot
6b93e3931e Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" 2017-12-20 19:02:49 +00:00
Phil Weaver
348bd7191f Merge "Make accessibility anchor id a long" 2017-12-20 19:02:40 +00:00
TreeHugger Robot
0c1f4c2931 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 18:59:40 +00:00
TreeHugger Robot
496af8623f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-20 18:59:10 +00:00
Benedict Wong
413ff10d92 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am: 5949912523
am: 53a0c20517

Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54
2017-12-20 18:58:30 +00:00
Treehugger Robot
f924642729 Merge "Don't include mockito in frameworks-base-testutils" 2017-12-20 18:55:14 +00:00
TreeHugger Robot
dfee3c8fd4 Merge "Don't include mockito in frameworks-base-testutils" 2017-12-20 18:49:51 +00:00
TreeHugger Robot
ea04d2e856 Merge "Fix wrong wallpaper AoD state" 2017-12-20 18:47:20 +00:00
Mady Mellor
ca8e884b85 Add subtype for priority
Intended to use with SliceItem type int to note the priority of an item
(such as an action) within a template.

Test: none
Bug: 68378561
Change-Id: I109adf4ea77638b7d27f3aaa7f8eb1c325287f0c
2017-12-20 10:45:36 -08:00
Benedict Wong
53a0c20517 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4
am: 5949912523

Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e
2017-12-20 18:42:26 +00:00
Eugene Susla
4b7c919e72 Communicate relevantEvents=0 for packages excluded from whitelist
Together with checking isObservableEventType this will result in a11y events
not being generated for packages that are excluded form a11y-service(s)
package whitelist

Test: cts-tradefed run singleCommand cts -d --module CtsAccessibilityServiceTestCases
Change-Id: Id65607aaccc7af7d870d009d609917ff3c6d0712
2017-12-20 10:41:12 -08:00
Benedict Wong
5949912523 Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am: 4edb4c8ec4

Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
2017-12-20 18:35:45 +00:00
Benedict Wong
4edb4c8ec4 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" 2017-12-20 18:25:32 +00:00
Ian Lake
1f4e67b6e1 Improve Fragment+Loader deprecation Javadoc
Make it clear that the framework versions of
Fragments and Loaders should be replaced with their
identically named versions in the Support Library.

Reference the recent work on Lifecycle as an example
of a Support Library only change that should motivate
developers to switch to the Support Library
equivalents.

Test: Reviewed new Javadoc
BUG: 70336450
Change-Id: I93151fa0a316bba824c2e55f80f7de9d30bed3c6
2017-12-20 18:16:40 +00:00
Sanket Padawe
02d8c276d9 Receiving side Call handover API implementation.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:

Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
2017-12-20 10:13:05 -08:00
Andrew Solovay
0472643736 doc: Fixing Javadoc formatting problems.
No code changes, just fixing typos in the doc comments.

Doc is staged to:

http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html

Test: make ds-docs
Bug: 70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f
2017-12-20 18:08:46 +00:00
TreeHugger Robot
518d202413 Merge "Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting. Original-Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f" 2017-12-20 18:06:17 +00:00
TreeHugger Robot
d14c826c82 Merge changes I0face862,If2d091e5,I4e18e63f
* changes:
  AAPT2: Sort artifacts based on the Play Store rules.
  AAPT2: Allow empty group definitions
  AAPT2: Get list of multi-APK artifacts without APK file
2017-12-20 18:05:53 +00:00
Eric Schwarzenbach
1f661c303a Merge "Add new Wifi settings notification drawable." 2017-12-20 18:04:55 +00:00
Fyodor Kupolov
41d761ad0e Merge "Offload switchUser calls to worker threads" 2017-12-20 18:03:32 +00:00
Sanket Padawe
1fb475c622 Merge "Implement Call handover initiation side APIs." am: e2d080481a am: 9053309827
am: 875fd19c48  -s ours

Change-Id: I2176b3a20ed52d5bae63cf30853385b33ed9f96a
2017-12-20 17:57:42 +00:00
TreeHugger Robot
b80dcf259f Merge "1/ index app name. 2/ fix a bug in app update." 2017-12-20 17:50:24 +00:00
Sanket Padawe
875fd19c48 Merge "Implement Call handover initiation side APIs." am: e2d080481a
am: 9053309827

Change-Id: I98828fd1ef99d42ffbfb8650731c1d2b848bc062
2017-12-20 17:48:58 +00:00
Rubin Xu
218718d4d3 Allow system server to query local WiFi MAC address
Bug: 70500939
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testWifi
Change-Id: Ia4b83cc9f898cedeafb0951668d4fd08123cda5d
2017-12-20 17:47:32 +00:00
TreeHugger Robot
ab53b1c232 Merge "Log d when transport updates its attributes" 2017-12-20 17:44:01 +00:00
Sanket Padawe
9053309827 Merge "Implement Call handover initiation side APIs."
am: e2d080481a

Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
2017-12-20 17:41:13 +00:00
TreeHugger Robot
347b7189f2 Merge "Update setLineSpacing docs to mention units" 2017-12-20 17:39:21 +00:00
Arthur Ishiguro
6100aa7e72 Rename ContextHubTransaction.Result IntDef
Use RESULT_ instead of TRANSACTION_ to be consistent with the name.

Bug: 67734082
Test: make
Change-Id: Ib7cc4d527cc160ec6788449231cdffa5c3e8fc0d
2017-12-20 09:35:00 -08:00
Sanket Padawe
e2d080481a Merge "Implement Call handover initiation side APIs." 2017-12-20 17:33:45 +00:00
TreeHugger Robot
702b491903 Merge "Add MessagingStyle#isGroupConversation()." 2017-12-20 17:20:27 +00:00
Tony Mak
089c35e931 Enforce platform level animation in CrossProfileApps.startMainActivity
With this change, whenever apps start an activity in another profile
using CrossProfileApps.startMainActivity, an animation will be enforced.
For now, we are showing the "open task" animation.
We may put something fancier if we have time in P.

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test - com.android.cts.devicepolicy.CrossProfileAppsHostsideTest
Test: atest services/tests/servicestests/src/com/android/server/pm/crossprofile/CrossProfileAppsServiceImplTest.java
Bug: 70799822

Change-Id: I03525080151c6112633108419d69d64e76a511f3
2017-12-20 17:04:15 +00:00
TreeHugger Robot
1396ffee73 Merge "WorkSource: Add support for chaining attribution." 2017-12-20 17:02:38 +00:00
TreeHugger Robot
1fe3524712 Merge "Update GLUtils to support F16" 2017-12-20 16:53:25 +00:00
Aurimas Liutikas
c095d5b679 Fix broken MenuLayoutPortraitTest
Change-Id: Ic24bfbdc5d9aeb286e1f1ba589896331bb8aa2ba
Test: None
2017-12-20 16:37:21 +00:00
Adrian Roos
4e937c0557 Merge "Display Cutout: Make API public" 2017-12-20 16:33:20 +00:00
Robert Berry
6c1ee52437 Back PlatformKeyManager with database
It was previously using SharedPreferences

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I76a75edb93a3feca645e49162c0d8b3e9485385b
2017-12-20 16:18:12 +00:00
Robert Berry
cbd4b2f46f Add tests for KeySyncUtils now that SecureBox is available
SecureBox is to be merged before this.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I40f783c165faa595c8913ff073915726ae71524d
2017-12-20 15:50:46 +00:00
Bernardo Rufino
7b3701a32c Log d when transport updates its attributes
Bug: 17140907
Test: Triggered an update and checked logs
Change-Id: I21926086ec0078872f3840737f77f79417178f6c
2017-12-20 15:35:52 +00:00
Android Build Merger (Role)
13eec4697c Merge "Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861 am: f5ec7f2e26 am: b24c17efa3" 2017-12-20 15:32:15 +00:00
Alex Light
3ee64f8d50 Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861 am: f5ec7f2e26
am: b24c17efa3

Change-Id: I200e5430fd9696affa37f6330999379173837f2b
2017-12-20 15:31:14 +00:00
TreeHugger Robot
54839e0d30 Merge "AAPT2: Add flag to compile command for outputting symbols" 2017-12-20 15:27:19 +00:00
Alex Light
b24c17efa3 Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861
am: f5ec7f2e26

Change-Id: I95d3064791d497986d0ece010be05749904d1ed3
2017-12-20 15:21:59 +00:00
TreeHugger Robot
e3a65edb25 Merge "AAPT2: treat manifest validation errors as warnings when asked" 2017-12-20 15:18:27 +00:00
Alex Light
f5ec7f2e26 Merge "Add support for selecting alternate JDWP implementations"
am: cbeea23861

Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d
2017-12-20 15:13:34 +00:00
Narayan Kamath
f0202a953f WorkSource: Add support for chaining attribution.
WorkSource objects now hold references to zero or more WorkChain
objects, each of which represent a "chain" of attribution.

This change also changes most WorkSource APIs to be able to
deal with WorkChains. Several APIs do not necessarily make sense with
WorkChains and have been left unmodified :

- boolean diff(WorkSource): Does not account for WorkChains for now.
  This is a public API so we shouln't change it unless we decide to
  make WorkChains public.
- setReturningDiffs(WorkSource): Used internally only, will be removed
  in a future change.
- addReturningNewbs(WorkSource): Used for testing only, fill be removed
  in a future change.

In addition, two new (hidden) APIs have been added to add and query
WorkChains. These APIs have only been added to facilitate testing. They
will most likely change when we add non-test users.

Co-Authored-By: Yang Lu <yanglu@google.com>

Test: WorkSourceTest
Bug: 62390666
Change-Id: Iff361eb98e079c7b2146c092dc27a3618a813c94
2017-12-20 15:13:09 +00:00
Paul Duffin
26b71b8c8d Merge changes from topic "fix-atm-visibility-issues"
* changes:
  Add android.test.mock.stubs-system
  Fix visibility issues with android.test.mock.stubs
2017-12-20 15:09:19 +00:00
Alex Light
cbeea23861 Merge "Add support for selecting alternate JDWP implementations" 2017-12-20 15:04:10 +00:00
Andrew Scull
9dcb7cade9 DPMS: expose password blacklist API for SDK
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPasswordBlacklist
Test: cts-tradefed run cts -m CtsAdminTestCases -t android.admin.cts.DevicePolicyManagerTest

Bug: 63578054
Change-Id: Ide58673ab22dcb4454a67300e8aa23b5fe343e3d
2017-12-20 13:56:15 +00:00