192348 Commits

Author SHA1 Message Date
Xiaohui Chen
55a302402b Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev 2015-05-14 21:05:36 +00:00
Joe LaPenna
627f26817f Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev 2015-05-14 20:55:19 +00:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Mikhail Naganov
9355966878 Merge "Tiny fix after updating the error reporting API" into mnc-dev 2015-05-14 20:43:05 +00:00
Joseph Wen
de355db3ec Merge "Change the location of Brandmaster statement file." into mnc-dev 2015-05-14 20:31:07 +00:00
Mikhail Naganov
6162eafe7a Tiny fix after updating the error reporting API
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.

Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
2015-05-14 13:30:13 -07:00
Alan Viverette
f93d16bc70 Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev 2015-05-14 20:20:48 +00:00
Jason Sams
f061653202 Merge "Fix issues found during CTS testing of FP16" into mnc-dev 2015-05-14 20:15:40 +00:00
Joseph Wen
d28bb6e3ac Change the location of Brandmaster statement file.
Change the location of statement file for web asset
from /.well-known/associations.json to /.well-known/statements.json.

BUG=21153250

Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
2015-05-14 16:11:10 -04:00
Craig Mautner
fed0196b95 Merge "Lock top task if whitelisting arrives after start." into mnc-dev 2015-05-14 20:03:05 +00:00
Christopher Tate
56341e70a2 Clarify docs for BackupTransport.initializeDevice()
Explicitly call out that even if the backend is in an undefined state
(such as no authenticated account, so there is by definition no work
that can be done here), the transport should return TRANSPORT_OK in
response to initializeDevice().  Error returns from that method must
only be used to indicate that the initialize should be *retried*.

Bug 21136957

Change-Id: I41ad115b92c16092b4d931d9c554a44b77945359
2015-05-14 12:54:24 -07:00
Craig Mautner
e0570201f5 Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.

When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.

Also more locktask debugging.

Fixes bug 21031298.

Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
2015-05-14 12:54:23 -07:00
Wale Ogunwale
92847c9687 Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev 2015-05-14 19:29:35 +00:00
Alan Viverette
c921f27694 Avoid sealed check when unparceling AccessibilityNodeInfo
Previously the unparceling code relied on addAction(), which would
incorrectly crash if the node was sealed.

Bug: 21135077
Change-Id: I773ac27b2dee501ffea0a0587536a192af402c32
2015-05-14 12:26:49 -07:00
Wale Ogunwale
159c3d8a8b Revert "Update IME focus when the active view is losing the focus."
This reverts commit 97c381304207013fd95c7806df4dcca0c69006c0.

This causes issue with the right IME window getting focus.

Bug: 21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
2015-05-14 12:25:24 -07:00
Lajos Molnar
05a822161f media: change final fields to accessors in MediaTimestamp
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8 media: remove setPlaybackRate from MediaPlayer and MediSync
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.

Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
2015-05-14 12:16:44 -07:00
Yorke Lee
0125d76fa3 Merge "Make Conferenceable an abstract class" into mnc-dev 2015-05-14 17:32:45 +00:00
Dan Sandler
02cd9f91a6 Use Context instead of Resources in Icon.createWithResource.
This works around situations where corrupted packages cause
Resources.getResourcePackageName to return something that
does't actually work.

Bug: 21144636
Change-Id: I271518599a8eb89d493f1ceda6cb2e47fb38a4ff
2015-05-14 13:23:12 -04:00
Andrei Stingaceanu
d674f2308a Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev 2015-05-14 17:21:11 +00:00
Clara Bayarri
fdf9f40cb8 Merge "PhoneWindow ActionMode handling tests" into mnc-dev 2015-05-14 16:44:48 +00:00
Alan Viverette
8d0cf8bc45 Merge "Add example for detectResourceMismatches()" into mnc-dev 2015-05-14 16:39:20 +00:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification."
This reverts commit 08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit 5bcbf857d129f4513e562801a4e88077b2655ade.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Mady Mellor
81fa3e8966 Text selection: Fix moving by character when should move by word
The code to restrict handles from crossing did not respect moving by
word or by character. This CL checks the offset to see if it's crossing,
and if it is, it restricts it to the line of the other handle and proceeds
with determining the "actual" offset based on the activated
mode by word / by char).

There is also still a check to ensure that one character is selected
after the mode as adjusted the offset.

Bug: 21114827
Change-Id: Idac699ef2eb5d313e77d44b5064c03ff84e0fb88
2015-05-14 09:22:59 -07:00
Joe Fernandez
dfdbc3a891 am a90cb675: am a0f0b5bf: am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit 'a90cb675a53ebf9a749bcaefc19ba00c8cbf7570':
  docs: Add weekly subscriptions and grace period information to IAB docs
2015-05-14 16:05:33 +00:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Paul McLean
fc56b88ac4 Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev 2015-05-14 15:59:20 +00:00
Joe Fernandez
a90cb675a5 am a0f0b5bf: am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit 'a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
  docs: Add weekly subscriptions and grace period information to IAB docs
2015-05-14 15:53:44 +00:00
Chris Craik
30bc0b9ebb Merge "Add tracing for path texture upload" into mnc-dev 2015-05-14 15:53:18 +00:00
Alex Klyubin
a1fb2cf6a6 Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev 2015-05-14 15:51:01 +00:00
Joe Fernandez
a0f0b5bfd8 am 574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '574690b13c8f0d4835c6d86b8e26fc4c9b914037':
  docs: Add weekly subscriptions and grace period information to IAB docs
2015-05-14 15:40:38 +00:00
Clara Bayarri
18cc17a28d PhoneWindow ActionMode handling tests
Tests focusing on action mode creation, how the two types of
modes are handled together and how the lifecycle is handled.

Change-Id: I17fe7a83cba4651b295a8ce80bc449f2f2538048
2015-05-14 16:32:32 +01:00
Michael Wright
1b2e5c11b6 Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 2015-05-14 15:31:14 +00:00
Joe Fernandez
574690b13c Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs 2015-05-14 15:26:37 +00:00
Zoltan Szatmary-Ban
39b8c69a23 Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 2015-05-14 15:13:34 +00:00
Andrei Stingaceanu
fae270c108 Editor: enable double tap for selection after cut/copy.
* detect double tap in the TextView and pass it to Editor.
* add a timer (with getDoubleTapTimeout) for executing the
  single tap job in Editor.
* if double tap is detected then cancel the single tap job.

This way one tap shows the toolbar if within the timeframe
and two taps select the word and show the toolbar.

Bug: 20442587
Change-Id: I0a117939c896fcb13669346e30c9c48d319576dd
2015-05-14 16:11:07 +01:00
Dan Sandler
5bcbf857d1 Merge "Fix icon-related crash." into mnc-dev 2015-05-14 15:10:03 +00:00
Lorenzo Colitti
9e2d14beb3 Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev 2015-05-14 15:07:10 +00:00
Xiyuan Xia
09e8303fd8 Merge "Clear security message on user input" into mnc-dev 2015-05-14 15:05:54 +00:00
John Reck
a0f6b87bbb am 570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev
* commit '570b2052bb8eec8c510941b0a6d77262df28b922':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 14:51:06 +00:00
Lorenzo Colitti
8deb341067 Statically import NetworkCapabilities constants for brevity.
Bug: 18591282
Change-Id: I41c148951724136f31bc663fd81ca9f5de72818a
2015-05-14 23:46:17 +09:00
Lorenzo Colitti
d49159f4e9 Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
2015-05-14 23:46:16 +09:00
John Reck
570b2052bb DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
2015-05-14 07:38:11 -07:00
Andrei Stingaceanu
fa660f79e9 Merge "Fix: text selection bubbles move along with the text" into mnc-dev 2015-05-14 14:27:18 +00:00
Rubin Xu
6e1c17a3df Merge "clear caller identify before sending system update notification" into mnc-dev 2015-05-14 14:00:18 +00:00
Dan Sandler
98b0290bbe Fix icon-related crash.
Bug: 21144636
Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b
2015-05-14 09:53:31 -04:00
Michael Wright
5bd69e6e61 Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit 96238051621ba2dc8a1c20fa48a00ec6ec4735d6.
2015-05-14 14:48:08 +01:00
Michael Wright
3d52869834 Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 2015-05-14 13:47:10 +00:00
Michael Wright
9623805162 Revert "Add new MotionEvent actions for button press and release."
This reverts commit ec0ce51b733f10c620cb9447b074f022d042e31d.
2015-05-14 14:46:25 +01:00