Adrian Roos
53fe1b98fd
Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp
...
am: 6ffddc03b7
2016-06-20 18:52:06 +00:00
Gustav Sennton
4f113f47df
Merge \\\"Use newly fetched PackageInfo for loading WebView code.\\\" into nyc-dev am: cdbf412f8e am: deac870fd1
...
am: 90888027d8
2016-06-20 18:52:02 +00:00
Christopher Tate
4764689d23
Merge \\\"Let bmgr inspect the set of whitelisted transports\\\" into nyc-dev am: 0f101342e1 am: 0754128dc9
...
am: 24c08b27ef
2016-06-20 18:33:17 +00:00
Android Build Merger (Role)
6ffddc03b7
Merge "Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev am: d94a40f46d" into nyc-mr1-dev-plus-aosp
2016-06-20 18:28:42 +00:00
Adrian Roos
531c90e38d
Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev
...
am: d94a40f46d
2016-06-20 18:27:54 +00:00
Gustav Sennton
90888027d8
Merge \\"Use newly fetched PackageInfo for loading WebView code.\\" into nyc-dev am: cdbf412f8e
...
am: deac870fd1
2016-06-20 18:27:32 +00:00
Gustav Sennton
deac870fd1
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:44 +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
Christine Hallstrom
955f8ab45c
Merge \\"Fix early termination of while loop in BluetoothSocket#write\\" into nyc-mr1-dev am: ac1873b2fc
...
am: eb7dc19a1a
2016-06-20 17:54:57 +00:00
Chris Tate
24c08b27ef
Merge \\"Let bmgr inspect the set of whitelisted transports\\" into nyc-dev am: 0f101342e1
...
am: 0754128dc9
2016-06-20 17:54:15 +00:00
Robin Lee
df51ab6cb2
Remove @return from void API javadoc am: 6918675fa1
...
am: 964aaea69c
2016-06-20 17:49:47 +00:00
Christopher Tate
0754128dc9
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
...
am: 0f101342e1
2016-06-20 17:36:58 +00:00
Christopher Tate
abf0d56469
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
...
am: 0f101342e1
2016-06-20 17:35:04 +00:00
Robin Lee
964aaea69c
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:33:24 +00:00
Christine Hallstrom
eb7dc19a1a
Merge \"Fix early termination of while loop in BluetoothSocket#write\" into nyc-mr1-dev
...
am: ac1873b2fc
2016-06-20 17:31:34 +00:00
Robin Lee
8a8a489bbf
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:30:34 +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
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
Clara Bayarri
e96706141d
Merge "Throw ISE when adding a non-public non-static fragment class instance to a transaction"
2016-06-20 13:11:04 +00:00
Robin Lee
4f5beed66f
Merge "Remove @return from void API javadoc"
2016-06-20 10:54:05 +00:00
Seigo Nonaka
7eba3d438c
Merge "Need break to stop unexpected fall through"
2016-06-20 07:30:27 +00:00
Seigo Nonaka
b115719dd4
Remove unnecessary log message.
...
This message was introduced locally for debugging but unexpectedly
upstreamed to master branch.
Change-Id: I6a6da19f6e41b22ed6f7da85ffcc23861852c248
2016-06-20 14:36:26 +09:00
Seigo Nonaka
33fac38ba9
Need break to stop unexpected fall through
...
STATE_LF should finish without processing next case but unexpected fall
through happens due to missing of "break".
Fortunately, this unexpected fall through doesn't cause any problems
since STATE_ODD_NUMBERED_RIS case always finishes without doing anything
when unexpected fall through happens.
Bug: 29491345
Change-Id: I23c673ccfc4a2c786fa41f0f7bacb0885896a509
2016-06-20 05:20:22 +00:00
Svetoslav Ganov
1b288ed197
Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: ee4c0a3c7e
...
am: 235411a3bc
2016-06-18 02:29:12 +00:00
Svetoslav Ganov
8011f5ed1c
Merge \"Fix a race in local settings caches\" into nyc-dev
...
am: f4ddb7ce30
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
2016-06-18 02:22:50 +00:00
John Reck
f5159155d0
Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
...
am: d11b5e6661
2016-06-18 02:14:29 +00:00
Jason Monk
fe5ff2279f
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
...
am: fc70b07385
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
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
Christopher Ferris
9738e7d393
resolve merge conflicts of cf11123 to master
...
Change-Id: I6d65685d415edea0be48bab04a71d4c52b1c66fe
2016-06-17 18:12:01 -07:00
Svetoslav Ganov
235411a3bc
Merge \\"Fix a race in local settings caches\\" into nyc-dev am: f4ddb7ce30
...
am: ee4c0a3c7e
2016-06-18 00:42:16 +00:00
Svetoslav Ganov
ee4c0a3c7e
Merge \"Fix a race in local settings caches\" into nyc-dev
...
am: f4ddb7ce30
2016-06-18 00:38:28 +00:00
Calvin On
173600e853
Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf8782605 am: c535f2a520
...
am: db78416206
2016-06-18 00:30:33 +00:00
TreeHugger Robot
f4ddb7ce30
Merge "Fix a race in local settings caches" into nyc-dev
2016-06-18 00:30:28 +00:00
Wei Wang
cf11123025
Merge \"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\" into nyc-mr1-dev
...
am: 4828bb9330
2016-06-18 00:29:44 +00:00
TreeHugger Robot
4828bb9330
Merge "Catch throwable exceptions." into nyc-mr1-dev
2016-06-18 00:26:43 +00:00
Andre Eisenbach
db78416206
Merge \\"Fix race with BT disable in BLE_ON_STATE\\" into nyc-dev am: 1bf8782605
...
am: c535f2a520
2016-06-18 00:25:17 +00:00
Calvin On
c535f2a520
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
...
am: 1bf8782605
2016-06-18 00:20:14 +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
045de3f08c
Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
...
am: 0d7dcf7bc3
2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3
Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev
...
am: 01e7c10d37
2016-06-17 23:31:12 +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
Christopher Ferris
ea8b5de33d
Catch throwable exceptions.
...
If the zygote dies early enough, certain exceptions disappear and never
result in an error message in the log. Fix the code to catch all
Throwable exceptions so that an error message does not result in a
silent restart of the zygote.
Bug: 29400363
Change-Id: Ib044006629ea4441728921f3c587d0cb295ec745
2016-06-17 15:29:58 -07:00
Makoto Onuki
cb0f366fe2
Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609
...
am: 5a533c9ae3
2016-06-17 21:51:37 +00:00
