314621 Commits

Author SHA1 Message Date
Alison Cichowlas
b7f67abe34 Use uptimeMillis instead of currentTimeMillis for interval calculation.
uptime is guaranteed monotonic; currentTime may go backwards in the event
of NTP updates or other wackiness.

Test: manual sanity check of logs; android.support.test.metricshelper.MetricsAssertsTest passes
Bug: 37538546, 18584861

Change-Id: I222b20be9d561e1184b11155fe44c574d90872a5
2017-04-26 17:05:11 +00:00
Svetoslav Ganov
dc6cccb905 Get rid of custom negaitve save button label
Removed the ability for an autofill provider to set
a custom string for the negative button. Also make
the old hidden APIs non-abstract to avoid runime
crashes for unimplemented methods.

Test: CtsAutoFillServiceTestCases pass

bug:37649790

Change-Id: If776d26de48382eeb064bdead5d4d5fdb0ff2e7e
2017-04-26 16:48:20 +00:00
Adrian Roos
f84b208a12 Merge "AOD: Fix layout" into oc-dev 2017-04-26 16:43:55 +00:00
Adrian Roos
ce83c81b84 Merge "AOD: Remove wake up fully config flag" into oc-dev 2017-04-26 16:43:36 +00:00
Adrian Roos
6b7c0e9da8 Merge "AOD: Limit visible icons on shelf" into oc-dev 2017-04-26 16:43:25 +00:00
Kang Li
2f85e8a317 Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from
using colons in their customized annotations.

bug: 37496130
Test: skipped, because all changes are in comments.
Change-Id: Ifd7592c50f5079bb6035b051bf63f986c7cbae84
2017-04-26 16:38:14 +00:00
Dongwon Kang
e1a795379d Merge "TIF: fix documentation in TvContract" into oc-dev 2017-04-26 16:22:13 +00:00
Bartosz Fabianowski
237f4b369b Add device ID attestation method to keymaster
Device ID attestation consists of three steps:
* Generate a temporary key
* Attest the key and desired device IDs
* Delete the temporary key

Rather than being spread over three keymaster APIs, these operations
should happen automatically in a single keymaster method.

Bug: 34734938
Test: GTS com.google.android.gts.security.DeviceIdAttestationHostTest

Change-Id: Ifabb5163b9e4d12cb309a6b0ca8e5f2f92d212f4
2017-04-26 17:40:44 +02:00
Jean-Michel Trivi
c4a169cfb4 Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev 2017-04-26 15:27:04 +00:00
Wale Ogunwale
3270f1798d Use ActivityRecord.realActivity when comparing waiting visible
We need to compare against realActivity since that represents the actual
activity that is launched since it can and will be different in the case
of activity alias. realActivity is also what we set in ActivityStarter
when we wait for the activity to be visible.

Change-Id: I48636e83172f259ed69fb65937a83f8a7a0ad138
Fixes: 37665516
Test: am start -W -n  com.google.android.calculator/com.android.calculator2.Calculator twice
2017-04-26 07:29:42 -07:00
Philip P. Moltmann
dd91a5636b Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
* changes:
  Return all previous FillContexts onFill
  Report multiple FillContext-s onSave
2017-04-26 14:16:55 +00:00
Tony Mak
eda0a9ae33 bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN
Test: cts-tradefed cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Fix: 37624960

Change-Id: I0df88d2a019a0c5f8f997db1efede35a20441fa8
2017-04-26 14:00:33 +00:00
Wale Ogunwale
0f8764485b Merge "Reduce use of static variables in window manager unit tests" into oc-dev 2017-04-26 12:35:12 +00:00
Michal Karpinski
c38e2af0d1 Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev 2017-04-26 09:44:55 +00:00
Narayan Kamath
5b12ddcc00 Track libcore change 03e8c7dca78a95ccf719a7.
Deprecate dalvik.system.DexFile.

Bug: 37693775
Test: make checkapi;
Change-Id: I37c9068e3d4b2b2599eee96f75185c13b328bda6
2017-04-26 10:24:09 +01:00
Bill Yi
4610bb567e Import translations. DO NOT MERGE
Change-Id: Iccb67d7bfc8c34b3e6d4e0c4736ec38c0166c1ae
Auto-generated-cl: translation import
2017-04-26 01:55:05 -07:00
Erik Kline
1a4f618812 Clarify some IpManager/ApfFilter debugging output.
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - "adb shell dumpsys wifi ipmanager" shows updated output
Bug: 34793131
Change-Id: I6dec135b97343943efb421ef7b2e84c4751dd5ea
(cherry picked from commit af579eb5b516296a8ec0b02d824f2ba646e60ca2)
2017-04-26 17:17:04 +09:00
Jakub Pawlowski
5df218c5c4 Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
  Bluetooth: expand comments on new PHY constants
  Bluetooth: document status value in PHY read/update
  Bluetooth: Add handler parameter to connectGatt
  Get rid of the IAdvertiserCallabck
2017-04-26 08:16:53 +00:00
Joe Fernandez
1ef22a5a65 docs: Update ScrollView JavaDoc comments
- reworded introduction for clarity
- crosslink to nestedscrollview
- simplify language around the “don’ts”
- crosslink to the material design guidelines for scrolling techniques

Test: docs only change. Tested with doc build
Change-Id: Ia6d1e5ce0f9abd3db2c1988537bd42013851596f
2017-04-26 00:23:49 -07:00
Bill Yi
6c8de9c6ef Import translations. DO NOT MERGE
Change-Id: I33675c43783b79bf3492b795e2de8b64f07faf5b
Auto-generated-cl: translation import
2017-04-26 00:16:24 -07:00
Joe Fernandez
d9ffaa5eb8 docs: Update LinearLayout JavaDoc comments
Updated top-level description to:

- favor explanations of using XML for setting attributes (instead of using
methods like setGravity()
- add code example
- clarify what "child view" means
- add context around cross-link to layout params
- add context around cross-link Linear Layout guide (this guide focuses on
layout_weight)

Test: docs change only. Tested with doc build
Change-Id: Ifc1fa4cf24e2afa229f1c20b3f725073aff162d7
2017-04-25 23:39:17 -07:00
Joe Fernandez
72a9d591f0 docs: Update ProgressBar JavaDoc comments
- link to material design guidelines for a visual example of
determinate/indeterminate patterns
- reword introduction for clarity
- remove confusing code example, in favor of a concise explanation of
determinate/indeterminate uses
- adds a note about not using progress bar in a dialog

Test: docs change only. Tested with a docs build
Change-Id: I872f7a647eafa6d0f1652549ad2d9d2db4fc81e3
2017-04-25 23:14:09 -07:00
Joe Fernandez
a1bd1712d5 docs: Update RelativeLayout.LayoutParams JavaDoc comments
Added changes to make purpose/usage of RelativeLayout.LayoutParams more
clear:

- clarify the attributes are set on a view contained in a relative layout
- clarify that relative layout uses these values to position the view
- add note that these values are ignored if view is not contained in a
relative layout
- cross-link code sample in Relative Layout guide
- cross-link guide Layout guide to clarify layout params vs regular
attributes

Test: docs change only. Tested with a docs test build.
Change-Id: I4fe1088594c998cee4ff0b2f6295579956c19d6f
2017-04-25 22:38:45 -07:00
Joe Fernandez
38ed689d95 docs: Update EditText JavaDoc comments
rework the edit text introduction and overview.

- adds an example of a basic configuration
- discuss the inputType attribute
- cross link to relevant classes & methods
- Rework the edit text introduction and overview
- wrap guide link in a p to emphasize
- emphasize specifying the inputType is required

Test: docs only change. Verified with doc test build
Change-Id: I78d8c861c51117bfd61e8c37ad83854a2aeec967
2017-04-25 22:06:48 -07:00
Joe Fernandez
bc6c82c20d Merge "docs: Update ListView JavaDoc comments" into oc-dev 2017-04-26 04:56:11 +00:00
Joe Fernandez
0de19fcf6a Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev 2017-04-26 04:55:38 +00:00
Seigo Nonaka
d9de8be233 Load font file from remote provider synchronously.
Since CancellationSignal is not guaranteed to be handled by remote
process, introduce threaded font loading mechanism.
At the same time, this fixes possible NPE issue in openFont.

Bug: 37552479
Test: am instrument -w -e class android.provider.FontsContractE2ETest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner

Change-Id: Ie235c5a57bd172b0882da5aa27a990d7c6686ff2
2017-04-25 21:19:22 -07:00
Wale Ogunwale
11cc516a92 Reduce use of static variables in window manager unit tests
This was causing test cross-contamination since different test might
expect different states from the variables.

Bug: 37682538
Test: tons of it!
Change-Id: Ie8a1ea400695b6346d7dfa3369b5c44bb467a33d
2017-04-25 20:33:30 -07:00
Seigo Nonaka
8ea62b036d Update FontsContract.requestFonts
- Change FontsContract.requestFont plural form to meet other method
naming convension.
- Change FontsContract.requestFonts to accept CancellationSignal to
be able to notify to remote.

Bug: 37326126
Test: am instrument -w -e class android.provider.FontsContractE2ETest
      com.android.frameworks.coretests/\
      android.support.test.runner.AndroidJUnitRunner

Change-Id: I154f943eb4e7c91bff8afd86be479f72e66e5cb7
2017-04-25 19:56:56 -07:00
Felipe Leme
6fba10b037 Merge "Added missing importantForAutofill values on attributes." into oc-dev 2017-04-26 02:56:09 +00:00
Svetoslav Ganov
d8561a26da Make sure autofill service is backed up
Test: manual

bug:36638606

Change-Id: I3367b9eb40a542267fb5d49f9a8bb7aa97ca57fa
2017-04-26 01:57:07 +00:00
Kevin Chyn
0c45b07fe2 FP won't wake device if daemon dies
Keyguard should retry FP auth if HW unavailable occurs

Fixes: 37483809

Test: enroll FP, turn off screen (enter keyguard)
pid biometrics | xargs adb shell kill -9
after 3 seconds, FP should be able to auth again

Change-Id: Ied3a4c07de655f3145ad40e3b73078fe9b161291
2017-04-25 18:23:37 -07:00
TreeHugger Robot
a35e4e5584 Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev 2017-04-26 00:27:57 +00:00
Nathan Harold
bd62d6aff2 Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.

Bug: 37681043
Test: make update-api and make
Merged-In: I8caccd3f8455341cb56a2256354eacbadedff047
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
(cherry picked from commit e38565fc74ee19e27175782be3cf2f0dffefd3a6)
2017-04-25 16:53:50 -07:00
TreeHugger Robot
0a4b7f5a86 Merge "Add concept of implicitly exposed components" into oc-dev 2017-04-25 23:50:21 +00:00
Philip P. Moltmann
121e526476 Return all previous FillContexts onFill
Test: CtsAutoFillServiceTestCases
Fixes: 37673341
Change-Id: I80feb5bd8d6027fb4ec2dd32f5c486dae7c6bc4c
2017-04-25 16:48:31 -07:00
Wale Ogunwale
e44e9e94da Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev 2017-04-25 23:47:58 +00:00
Adrian Roos
14d70cb183 AOD: Limit visible icons on shelf
Only show up to 5 icons on AOD1.

Change-Id: I7d962ef2a4eb5e47ab35a8bdc8f133fddfb1fd84
Test: Have more than 5 notifications, trigger ambient display, observe that at most 5 icons are visible and the rest is collapsed to dots
Fixes: 37641322
2017-04-25 16:46:52 -07:00
Wale Ogunwale
7a8a1778a9 Remove @Presubmit annotation from SettingBackupTest
Can be added back once the tests are fixed.

Bug: 37684646
Bug: 37682538
Test: This is it!
Change-Id: I3690bf91bf371a7ab6a477312a138c205cceee1c
2017-04-25 16:45:12 -07:00
TreeHugger Robot
7e44951bb7 Merge "Fix include" into oc-dev 2017-04-25 23:32:11 +00:00
TreeHugger Robot
1c5b71ec1f Merge "Return correct value at initDataInjection and avoid crash" into oc-dev 2017-04-25 23:18:24 +00:00
TreeHugger Robot
db8f2fc025 Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev 2017-04-25 23:15:52 +00:00
Adrian Roos
5e76c6aad3 AOD: Fix layout
Top had too much padding, while bottom had too
little. Now looking as spec'd.

Bug: 30876804
Test: Trigger Ambient Display, observe that layout matches mocks.
Change-Id: I3ef5e7fba5ca3fbb1b6e800ed11cbe9885c1830e
2017-04-25 16:10:53 -07:00
TreeHugger Robot
781c8cb65e Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev 2017-04-25 22:42:10 +00:00
TreeHugger Robot
5b4e16c3a5 Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev 2017-04-25 22:38:53 +00:00
Felipe Leme
944bef044b Added missing importantForAutofill values on attributes.
Fixes: 37677115
Test: manual verification compiling an app using it

Change-Id: Iaa2650c7354e8c1c476cb3803d40104ae6fc864a
2017-04-25 15:32:05 -07:00
Jean-Michel Trivi
461922fcfc Audio focus enforcement: duck automatically apps for SDK O+
Enforce automatic ducking only for apps written for an SDK target
  level above 25 (N-MR1)

Test: play notification while Podcast Addict is playing, verify it pauses instead of being ducked
Bug: 37506138
Change-Id: Id7e01a92a51308bd7a3f24abc417d2434b532c12
2017-04-25 15:23:17 -07:00
Philip P. Moltmann
c761963214 Report multiple FillContext-s onSave
To make life easier the reponseId is not part of the FillResponse.

Test: CtsAutofillServiceTestCases (added test for multiple Contexts)
Change-Id: If09e00b7267d293e4234a7a9837ad88d73af1b24
Fixes: 36481649
2017-04-25 15:22:08 -07:00
Bill Yi
14f86c1692 Import translations. DO NOT MERGE
Change-Id: Ia4d39566310b4a0fc3f383290d39eddd0a52b267
Auto-generated-cl: translation import
2017-04-25 15:16:05 -07:00
TreeHugger Robot
f879357cae Merge "Camera: Update docs for new auto-generation features" into oc-dev 2017-04-25 22:11:47 +00:00