Commit Graph

58475 Commits

Author SHA1 Message Date
TreeHugger Robot
acc21f572d Merge "fix resolver" into nyc-mr1-dev 2016-06-20 18:45:04 +00:00
Android Build Merger (Role)
6806472ab9 Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am: cdbf412f8e" into nyc-mr1-dev 2016-06-20 18:23:48 +00:00
Gustav Sennton
47b391cf1d Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
am: cdbf412f8e

Change-Id: Ia7ced5f34f7f97e788d48bc0239dfcb640bbdaa6
2016-06-20 18:23:26 +00:00
Trevor Bunker
d94a40f46d Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev 2016-06-20 18:23:18 +00:00
Gustav Sennton
cdbf412f8e Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev 2016-06-20 18:17:06 +00:00
Christopher Tate
0754128dc9 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am: 0f101342e1

Change-Id: I5249aed8cf49c0da111324d5c6ab43b46cdb1196
2016-06-20 17:36:58 +00:00
Robin Lee
964aaea69c Remove @return from void API javadoc
am: 6918675fa1

Change-Id: I70f711ac3bc16d2e2a524de21e5fb8b3548270dc
2016-06-20 17:33:24 +00:00
Christine Hallstrom
ac1873b2fc Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev 2016-06-20 17:23:02 +00:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
Todd Kennedy
958b3410bf fix resolver
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
2016-06-20 10:06:06 -07:00
Adrian Roos
9918234dcf Enable tap-to-pulse only when needed
- Adds InputManager.setPulseEnabled().
- Adds a config overlay for the file controlling touch-to-pulse.
- Hooks up DreamManagerService with InputManager.setPulseEnabled().

Bug: 29253550
Change-Id: I4892311cc30e97d31f7be778930397fbe5c03945
2016-06-20 08:59:48 -07:00
Robin Lee
6918675fa1 Remove @return from void API javadoc
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5)
2016-06-20 14:53:58 +00:00
Gustav Sennton
b088cb36b8 Use newly fetched PackageInfo for loading WebView code.
During a time window between the point at which a webview package
becomes updated and the WebViewUpdateService receiving an intent
declaring this action the WebViewUpdateService APIs will return a
PackageInfo pointing to an old and possibly removed WebView package.
This means that any paths that PackageInfo is referring to could have
been removed.

Currently, we set WebViewFactory.sPackageInfo using one of these APIs
and we might thus try to use deleted paths to to load WebView. This can
cause crashes, so instead fetch a fresh PackageInfo and assign
WebViewFactory.sPackageInfo to that.

Also early-out in loadWebViewNativeLibraryFromPackage if the current
package version doesn't match that of the one fetched from the
WebViewUpdateService.

Bug: 29381682
Change-Id: I2713ce2338a4a96c5317dcdbb363b424513088d5
2016-06-20 14:30:27 +01:00
Svetoslav Ganov
8011f5ed1c Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: If28342d6deab7d0b7e89029229bad060ce7c8a8d
2016-06-18 02:22:52 +00:00
Calvin On
8dad883759 Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am: 1bf8782605

Change-Id: I60d35a8139caf0a1c839654d6c488fede4fa37d7
2016-06-18 02:22:50 +00:00
Jason Monk
fe5ff2279f Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I7327f5e4f7ac2180e0c584dc761b861c14dd475f
2016-06-18 02:09:57 +00:00
Chong Zhang
b0e28cf5b3 Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
am: 2756d0707f

Change-Id: I72a8192317ebaa7c036416a65b415c2471f449de
2016-06-18 02:07:55 +00:00
TreeHugger Robot
d11b5e6661 Merge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into nyc-dev 2016-06-18 02:07:05 +00:00
TreeHugger Robot
f4ddb7ce30 Merge "Fix a race in local settings caches" into nyc-dev 2016-06-18 00:30:28 +00:00
Christine Hallstrom
fc59c344bf Fix early termination of while loop in BluetoothSocket#write
While loop exits too early and misses writing remaining bytes.
Also restructured the loop itself to be more readable.

Change-Id: I71e9b331d20b5ae70175450c3346be43ab56c40c
2016-06-18 00:09:45 +00:00
Yohei Yukawa
01e7c10d37 Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev 2016-06-17 23:23:59 +00:00
Svetoslav Ganov
8c35dcc7ae Fix a race in local settings caches
We send a handle to the generation tracker along with the first accessed
setting but don't send the generation id of when the setting was
actually looked up. So by the time the client gets the setting with the
generation tracker from which to get and cache the last generation the
setting may have changed. We need to pass the generation id along with
the value and the generation tracker.

bug:29458487

Change-Id: I0ac4955ba5b10b547f8fe653a7c28e048a4691eb
2016-06-17 15:30:45 -07:00
Calvin On
a0b91d77d6 Fix race with BT disable in BLE_ON_STATE
This will restart the BT stack when it detects a transition
into OFF state while the user enable flag (mEnable) is set.

Bug: 29363429
Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52
2016-06-17 21:18:21 +00:00
Makoto Onuki
a65d8b6609 Merge "Update manifest shortcut XML schema" into nyc-mr1-dev 2016-06-17 20:29:38 +00:00
John Reck
34bf49e4de DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it
Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
(cherry picked from commit aa6e84f21d)
2016-06-17 20:26:10 +00:00
John Reck
e66dedf35b Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev 2016-06-17 20:13:20 +00:00
Makoto Onuki
df6da040e0 Update manifest shortcut XML schema
Use the standard <intent> tag instead of custom tags.

- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it

Bug 29390156
Bug 29077932
Bug 29422018

Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
2016-06-17 11:51:20 -07:00
TreeHugger Robot
fc70b07385 Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev 2016-06-17 18:38:26 +00:00
John Reck
aa6e84f21d Move SurfaceView offscreen if the app stops drawing it
Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
2016-06-17 10:23:54 -07:00
Yohei Yukawa
adebb52588 API Rename: IC#inputContent to IC#commitContent.
As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
2016-06-17 10:10:39 -07:00
Christopher Tate
4f7b337cdd resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
am: 1c3be1a5b1

Change-Id: If72735aeb86874e3d672a9567f03fecdb9ed00eb
2016-06-17 17:09:13 +00:00
Jason Monk
a3453b8bd9 QS API: Fix mService and mTile being null once and for all
Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes: 29121793
2016-06-17 13:04:05 -04:00
Chong Zhang
71f2c31469 Do a forceLayout if pending insets is changed after relayout window
We might have a pending MSG_RESIZED_REPORT, but if it's executed after
relayoutWindow, mPendingInsets will already be the new value and it'll
not forceLayout. So we need to forceLayout here to make sure the measure
cache is cleared.

bug: 29391054

Change-Id: I73793b1427b89e75700369ec3b37053a6a732f0d
2016-06-17 01:11:49 +00:00
TreeHugger Robot
0db08ca3e7 Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev 2016-06-17 01:02:47 +00:00
Christopher Tate
1c3be1a5b1 resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
am: d2a4e1b39c

Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
am: e2c9b1af3e

Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab resolve merge conflicts of cffb19c to mnc-dev
am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386 resolve merge conflicts of cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812 Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
am: ec6c3f7a32

Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
2016-06-16 22:30:17 +00:00
Christopher Tate
ec6c3f7a32 Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f
am: cd777e95a7

Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7 Don\'t trust callers to supply app info to bindBackupAgent()
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
2016-06-16 22:21:37 +00:00
Yorke Lee
599cf6bc4a Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc
2016-06-16 21:21:57 +00:00
Yorke Lee
f33af2285b Merge "Limit global drags to apps targeting SDK 24 and above" into nyc-dev 2016-06-16 21:16:13 +00:00
Gina Dimino
0bae4dcd76 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
am: d06520a488

Change-Id: I127501113d4e290a1e8d0b3a44ba779ec36cdc1d
2016-06-16 21:08:15 +00:00
ugo_yu
f308ab01dc Correct typo in BluetoothSap binder
This patch fixed IBluetoothSap typo as IBluetoothMap in doBind.

Fixes: 29025598
Change-Id: Ieab3d1583839db0a33b1cfa4d2de1f27c9cb3fe4
2016-06-16 21:02:39 +00:00
Gina Dimino
d06520a488 Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev 2016-06-16 21:02:14 +00:00
Dianne Hackborn
b021fca31a Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev
am: 47cfac6803

Change-Id: I94a6674bcb0327bc55fbfc1d18c4a5d6d723a52e
2016-06-16 18:43:57 +00:00
Dianne Hackborn
47cfac6803 Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev 2016-06-16 18:39:03 +00:00
Makoto Onuki
489bafbb4b Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev 2016-06-16 17:05:55 +00:00