Antonio Cansado
d3ae6a9c8e
Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54
...
am: 1d4fd3ed27
2016-06-20 22:44:51 +00:00
Antonio Cansado
1d4fd3ed27
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
...
am: 13cf0e7d54
2016-06-20 22:36:49 +00:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:49 +00:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429
Fix infinite loop when registering data usage callback.
...
Trivial fix is to call the method that takes the handler as a param.
Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Makoto Onuki
7e346ef853
Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba
...
am: c07a7518d6
2016-06-20 21:22:15 +00:00
Makoto Onuki
c07a7518d6
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
...
am: 901c03faba
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
2016-06-20 21:06:42 +00:00
TreeHugger Robot
c4e4a9a039
Merge "Add event tracking to print UI."
2016-06-20 20:57:36 +00:00
Adam Lesinski
8549988a89
Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55f9 am: a804fae3be
...
am: 0f7b0a8cc6
2016-06-20 20:05:22 +00:00
Adam Lesinski
0f7b0a8cc6
Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9
...
am: a804fae3be
2016-06-20 20:00:07 +00:00
Adam Lesinski
145e50243e
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
Adam Lesinski
a804fae3be
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
2016-06-20 19:49:46 +00:00
Roozbeh Pournader
d8914879b5
Merge \\"Fix AAPT-compatible output format for locales\\" into nyc-mr1-dev am: 63ed39f395
...
am: e7978c11c8
2016-06-20 19:38:05 +00:00
Roozbeh Pournader
e7978c11c8
Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
...
am: 63ed39f395
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
2016-06-20 19:22:27 +00:00
Todd Kennedy
7182948b56
Merge \"Merge \\"fix resolver\\" into nyc-mr1-dev am: acc21f572d\" into nyc-mr1-dev-plus-aosp
...
am: 3e68026036
2016-06-20 19:12:31 +00:00
Todd Kennedy
fcb121216c
Merge \"fix resolver\" into nyc-mr1-dev
...
am: acc21f572d
2016-06-20 19:06:15 +00:00
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
Philip P. Moltmann
2e3012624b
Add event tracking to print UI.
...
Bug: 29391676
Change-Id: Iec09ac7296e50329e87268bcb70f5e60d566961c
2016-06-20 11:50:44 -07:00
TreeHugger Robot
acc21f572d
Merge "fix resolver" into nyc-mr1-dev
2016-06-20 18:45:04 +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
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
deac870fd1
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:44 +00:00
Gustav Sennton
47b391cf1d
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
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
Adam Lesinski
f9b20a9ec4
BatteryStats: record best estimated battery capacity
...
Using the coulomb counter, record the estimated max battery
capacity.
Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
2016-06-20 10:58:37 -07: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
Todd Kennedy
958b3410bf
fix resolver
...
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
2016-06-20 10:06:06 -07:00
Makoto Onuki
4d6b87ffdf
Launcher shortcut callback should deliver manifest shortcuts too
...
- Also include "activity" in the key fields, as this is now an
important field.
- Also optimize ShortcutInfo parceling for the "key field only" case.
Bug 29394043
Bug 29451629
Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0
2016-06-20 09:28:05 -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
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
