Yorke Lee
072ce0c29c
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
2016-06-21 21:20:11 +00:00
Yorke Lee
22faa5ddb1
Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev
2016-06-21 21:10:53 +00:00
Chad Brubaker
0f1b7d3b3d
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
...
am: abe85d3886
2016-06-21 19:59:58 +00:00
Yorke Lee
c8ad0cd316
Tweaks to DragAndDropPermissions behavior
...
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.
Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.
Bug: 29162822
Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
2016-06-21 12:57:52 -07:00
TreeHugger Robot
abe85d3886
Merge "Add getApplicationConfigForPackage" into nyc-dev
2016-06-21 19:51:21 +00:00
Dianne Hackborn
3716762e38
Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
...
am: 5f9afa968d
2016-06-21 19:27:33 +00:00
Dianne Hackborn
5f9afa968d
Merge "Reduce race when connecting to an existing content provider." into nyc-dev
2016-06-21 19:18:39 +00:00
Dianne Hackborn
4de5a3ac66
Reduce race when connecting to an existing content provider.
...
We lost the code that checks to see if the target process still
exists and aborts trying to use it if so. To reduce the race
there, we have a new explicit check of the state of the process.
Hopefully fixes some of issue #28737082 .
Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
2016-06-21 10:04:22 -07: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
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
Chad Brubaker
9f779ab4af
Add getApplicationConfigForPackage
...
getApplicationConfigForPackage will be used by system components that
need to make connections for apps, e.g. DownloadManager, so that their
secure connections have the same configuration as those from the app
itself.
Bug: 29505888
Change-Id: Idf1cac6307431911eda34529d3fd50f9ca0da314
2016-06-20 12:40:20 -07: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
