Mike Lockwood
a6e14c8293
am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
...
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize
2014-12-04 22:45:07 +00:00
Derek Sollenberger
203c817180
am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 21:46:39 +00:00
Erik Kline
180a30aa57
am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Cheuksan Wang
29ac679f9f
am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API
2014-12-04 21:45:08 +00:00
Mike Lockwood
448403b7a4
Merge "Dont call close in in BluetoothA2dp finalize"
2014-12-04 21:41:13 +00:00
John Reck
a75b0ad384
resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp
...
Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed
2014-12-04 13:41:04 -08:00
Christopher Tate
dff5580711
am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
Adjust wallpaper-restore acceptance criteria
2014-12-04 21:17:37 +00:00
Eino-Ville Talvala
431b65d11f
am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
Revert "Camera: Add new capability flags as system features as well"
2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3
am e6333e51: am f696efa2: Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
...
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
Fix issue #17948584 : Application crash and phone restart when app...
2014-12-04 20:23:25 +00:00
Yin-Chia Yeh
e168dd28f8
am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
...
* commit '871571ae0c4d8f334265b99e274892346756d51b':
Camera: update antibanding spec
2014-12-04 20:23:00 +00:00
Derek Sollenberger
c1a2f38ce0
am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
...
* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
2014-12-04 15:17:01 +00:00
Erik Kline
95b5ca9019
am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
...
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 15:16:04 +00:00
Cheuksan Wang
dba26aa2e7
am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
...
* commit '109ec376da86de1275f73fa432d6344431a457e9':
new SMS/MMS carrier app API
2014-12-04 15:15:33 +00:00
John Reck
a51a0901ad
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
...
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
2014-12-04 15:15:27 +00:00
Christopher Tate
e808d2df76
am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
...
* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
Adjust wallpaper-restore acceptance criteria
2014-12-04 15:14:43 +00:00
Derek Sollenberger
4d9da135ca
Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
2014-12-04 13:04:52 +00:00
Erik Kline
9261d9d645
Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
2014-12-04 03:14:02 +00:00
Cheuksan Wang
109ec376da
Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
2014-12-04 00:19:06 +00:00
John Reck
bd15e4f59c
Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
2014-12-04 00:08:16 +00:00
Christopher Tate
758f45217d
Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
2014-12-03 23:09:34 +00:00
Eino-Ville Talvala
6e21817b8e
am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
...
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
Revert "Camera: Add new capability flags as system features as well"
2014-12-03 23:00:15 +00:00
Eino-Ville Talvala
d23f8b44d5
Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
2014-12-03 22:01:42 +00:00
Dianne Hackborn
e6333e5188
am f696efa2: Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
...
* commit 'f696efa206089bde1274d972239ffb5a8185f613':
Fix issue #17948584 : Application crash and phone restart when app...
2014-12-03 21:38:08 +00:00
Dianne Hackborn
f696efa206
Merge "Fix issue #17948584 : Application crash and phone restart when app..." into lmp-mr1-dev
2014-12-03 21:32:17 +00:00
Christopher Tate
31f25696d9
Adjust wallpaper-restore acceptance criteria
...
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.
Bug 18448052
Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
2014-12-03 13:07:24 -08:00
John Reck
01a5ea35fb
Resume RT-animations after a pauseSurface
...
Bug: 18203577
The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.
To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.
Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
2014-12-03 13:03:59 -08:00
Yin-Chia Yeh
871571ae0c
am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
...
* commit '381343088f964b6428c483f741424a50ef41cb49':
Camera: update antibanding spec
2014-12-03 20:54:23 +00:00
Yin-Chia Yeh
381343088f
Merge "Camera: update antibanding spec" into lmp-mr1-dev
2014-12-03 20:44:05 +00:00
Sreeram Ramachandran
3a8fbb8072
am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
Fix docs per API review.
2014-12-03 20:43:50 +00:00
Etan Cohen
a2ab707c87
am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 20:43:46 +00:00
Winson Chung
fee5e3d32a
am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 20:42:45 +00:00
Dianne Hackborn
b46e9da64c
am bedd1744: am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 20:42:17 +00:00
Lorenzo Colitti
45cd4df6a0
am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
Make StatusBar display all default networks.
2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085
am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
...
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
Add overscan insets to surface frame dimensions in WallpaperService.
2014-12-03 20:40:56 +00:00
Sreeram Ramachandran
95e4474c70
am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
...
* commit '932c33214729fe2d2b09f82ef60a72871f182654':
Fix docs per API review.
2014-12-03 19:50:19 +00:00
Etan Cohen
89b55fc52d
am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)
...
* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
Add a global override for VoLTE calls (which leaves user setting in place)
2014-12-03 19:50:13 +00:00
Sreeram Ramachandran
932c332147
Merge "Fix docs per API review." into lmp-mr1-dev
2014-12-03 19:15:38 +00:00
Eino-Ville Talvala
08a125562c
Revert "Camera: Add new capability flags as system features as well"
...
This reverts commit 6aee1d2ba5 .
But leaves in some of the improved documentation.
Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
2014-12-03 11:12:39 -08:00
Etan Cohen
7ab0ad1ffe
Add a global override for VoLTE calls (which leaves user setting in place)
...
Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
2014-12-03 18:56:45 +00:00
Sreeram Ramachandran
9e956e9b9a
Fix docs per API review.
...
Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
2014-12-03 10:53:35 -08:00
Derek Sollenberger
f29d5a5b21
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
...
bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
2014-12-03 13:43:30 -05:00
Winson Chung
5051109699
am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
...
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
2014-12-03 18:36:15 +00:00
Dianne Hackborn
bedd1744b2
am ef44c051: Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
...
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
Work on issue #18572506 : AppOps in-memory state is invalid after...
2014-12-03 18:35:46 +00:00
Dianne Hackborn
1bc177c585
Fix issue #17948584 : Application crash and phone restart when app...
...
...is installed with <provider> with empty string.
Don't allow empty authorities, just like we don't allow null authorities.
Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
2014-12-03 10:20:30 -08:00
Winson Chung
de9848c641
Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
2014-12-03 18:10:38 +00:00
Dianne Hackborn
ef44c0514d
Merge "Work on issue #18572506 : AppOps in-memory state is invalid after..." into lmp-mr1-dev
2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384
Work on issue #18572506 : AppOps in-memory state is invalid after...
...
...uninstalling updates to a system app
Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.
Also introduce more features to the appops command, which are useful
for testing this.
Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
2014-12-03 10:01:14 -08:00
Lorenzo Colitti
d99cd44f31
am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev
...
* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
Make StatusBar display all default networks.
2014-12-03 17:18:52 +00:00
Alan Viverette
4483f4611e
am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
...
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
2014-12-03 07:56:12 +00:00
George Mount
a3a53251f1
am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
...
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
Keep snapshot order matching the shared elements.
2014-12-03 07:56:00 +00:00