Adam Lesinski
145e50243e
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
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
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
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
8a8a489bbf
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:30:34 +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
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
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
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
Svetoslav Ganov
ee4c0a3c7e
Merge \"Fix a race in local settings caches\" into nyc-dev
...
am: f4ddb7ce30
2016-06-18 00:38:28 +00:00
TreeHugger Robot
f4ddb7ce30
Merge "Fix a race in local settings caches" into nyc-dev
2016-06-18 00:30:28 +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
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
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
Jason Monk
c552a36992
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
...
am: fc70b07385
2016-06-17 18:45:04 +00: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
Chong Zhang
dba235d91a
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
...
am: 2756d0707f
2016-06-17 18:26:45 +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
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
...
am: d2a4e1b39c
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
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
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
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
2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
Yorke Lee
3d80871032
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
...
am: f33af2285b
2016-06-16 21:22:22 +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
b7181150c4
Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev
...
am: d06520a488
2016-06-16 21:08:17 +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
403e103eb2
Merge \"Fix issue #29371078 : Foreground jobs should not count...\" into nyc-dev
...
am: 47cfac6803
2016-06-16 18:43:37 +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
Yorke Lee
0e85247195
Limit global drags to apps targeting SDK 24 and above
...
Bug: 29127791
Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Selim Cinek
0630d92064
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
2016-06-16 04:19:48 +00:00
Christopher Tate
e227ec61c2
Let bmgr inspect the set of whitelisted transports
...
Needed for compliance testing.
Bug 29072466
Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Mihai Nita
d80a8e8fe7
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
...
am: c8c9afeacb
2016-06-16 00:37:54 +00:00
Dianne Hackborn
7ab4025474
Fix issue #29371078 : Foreground jobs should not count...
...
...as active for idle maintenance
Nor jobs of whitelisted apps.
Now they don't.
Also remove the no longer used "active download" tracking code.
Change-Id: I553197801f6eabaf15716f3201dd65257a0d4e94
2016-06-15 17:30:24 -07:00
Mihai Niță
c8c9afeacb
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
2016-06-16 00:28:37 +00:00
Amith Yamasani
bf1301f542
Merge \"More thorough cleansing of expired users\" into nyc-dev
...
am: 4f2b1b455e
2016-06-16 00:24:17 +00:00
Amith Yamasani
4f2b1b455e
Merge "More thorough cleansing of expired users" into nyc-dev
2016-06-16 00:14:59 +00:00
Mihai Nita
1711d430cb
Fix for NullPointerException in SuggestedLocaleAdapter
...
Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
2016-06-15 17:07:10 -07:00
Selim Cinek
e9bad242f3
Added dismiss, expand, and collapse accessibility actions
...
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:44:43 +00:00
