Yuncheol Heo
d534b936d7
Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
2014-10-07 00:29:06 +00:00
Chris Craik
0aa69ff2ff
am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 23:51:05 +00:00
Chris Craik
1a6c41fbad
am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 22:35:19 +00:00
Chris Craik
6c9f0a0160
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
2014-10-06 22:06:23 +00:00
Chris Craik
f791703f9b
Avoid changeBounds animations on Views that are not yet laidout
...
bug:17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
2014-10-06 14:55:17 -07:00
Dianne Hackborn
2f577e83cb
am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:22:53 +00:00
John Spurlock
b6f5cb3e45
am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
Fix NPE in StrictMode handling.
2014-10-06 19:22:44 +00:00
Dianne Hackborn
90d557b7a6
am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
John Spurlock
81b96aadbd
am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
2014-10-06 19:16:53 +00:00
Dianne Hackborn
7f7d240b13
Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
2014-10-06 18:48:34 +00:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
Benjamin Franz
31409c0ccd
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
2014-10-06 16:26:27 +00:00
vandwalle
c67e5ae2da
am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
add millisecond timestamp to locallog
2014-10-03 23:57:40 +00:00
John Reck
6a2296d856
am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:30 +00:00
vandwalle
4f5fd78019
am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
...
* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
add millisecond timestamp to locallog
2014-10-03 23:53:17 +00:00
John Reck
9da6e74359
am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
2014-10-03 23:53:05 +00:00
vandwalle
68104b0529
Merge "add millisecond timestamp to locallog" into lmp-dev
2014-10-03 23:31:51 +00:00
Dianne Hackborn
2d7576b082
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
...
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.
Add a new REAL_GET_TASKS that is the actual permission now.
Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.
Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
vandwalle
c520aa89a3
add millisecond timestamp to locallog
...
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
2014-10-03 15:35:25 -07:00
John Reck
d988a45d60
Merge "Cleanup DeferredLayerUpdater" into lmp-dev
2014-10-03 22:22:52 +00:00
John Reck
749906b468
Cleanup DeferredLayerUpdater
...
Bug: 17765082
DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures
Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
2014-10-03 15:02:19 -07:00
Dianne Hackborn
6b1cf642fc
am 5ebb0e6a: am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 21:32:30 +00:00
Dianne Hackborn
5ebb0e6a1e
am d867b7c7: Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 19:21:06 +00:00
Dianne Hackborn
d867b7c7a2
Fix issue #17783882 : AUPT: NPE in Videos: Attempt to invoke virtual method...
...
...'java.lang.String java.lang.String.substring(int)' on a null object reference
Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
2014-10-03 11:43:10 -07:00
Robert Greenwalt
eb35fa56a4
am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
...
* commit '3515ab8092719ea9f61c8c2859bf586aed0955e3':
Send callbacks for Net property changes
2014-10-03 15:46:06 +00:00
Robert Greenwalt
3515ab8092
am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
...
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
24861eabe6
Merge "Send callbacks for Net property changes" into lmp-dev
2014-10-03 15:36:39 +00:00
Benjamin Franz
ec2d48b96d
Introduce new API to get an unbadged icon and unbadge permissions.
...
Bug: 17125560
Change-Id: I61b884186c96cc54dcaf1d3c7ee8f47610fd1d21
2014-10-03 09:41:08 +01:00
Robert Greenwalt
a848c1cc0a
Send callbacks for Net property changes
...
LinkProperties and NetworkCapabilities changes were not calling app callbacks.
bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00
Dianne Hackborn
8aa21f20d8
am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
...
* commit '12dd9943ec01a54453f50a24da2a8e329f2d3790':
SDK only: Update docs to reflect current implementation.
2014-10-02 22:59:51 +00:00
Dianne Hackborn
12dd9943ec
am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
...
* commit '7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
SDK only: Update docs to reflect current implementation.
2014-10-02 22:54:53 +00:00
Dianne Hackborn
7a73f2c5aa
Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
2014-10-02 22:49:43 +00:00
Jeff Brown
6f2d610f4d
am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev
...
* commit 'b82bf9df111031e0f3afa4df29fbc22460e6cc8b':
Fix race in RecognizerService teardown.
2014-10-02 22:12:54 +00:00
Jeff Brown
b82bf9df11
am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev
...
* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
Fix race in RecognizerService teardown.
2014-10-02 22:09:08 +00:00
Jeff Brown
ae309489c2
Merge "Fix race in RecognizerService teardown." into lmp-dev
2014-10-02 22:04:09 +00:00
Christopher Tate
61eae1605d
am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
...
* commit 'ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0':
Tweak wallpaper restore acceptance heuristics
2014-10-02 21:48:24 +00:00
Christopher Tate
ac3aed96eb
am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev
...
* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
Tweak wallpaper restore acceptance heuristics
2014-10-02 21:42:18 +00:00
Christopher Tate
004c16654f
Tweak wallpaper restore acceptance heuristics
...
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.
Bug 17677006
Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
2014-10-02 14:27:09 -07:00
Chris Craik
438fe5937f
Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev
2014-10-02 20:02:31 +00:00
Dianne Hackborn
67a101aa30
SDK only: Update docs to reflect current implementation.
...
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
2014-10-02 12:44:01 -07:00
Jeff Brown
9615697902
Fix race in RecognizerService teardown.
...
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.
Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
2014-10-02 12:10:08 -07:00
Newton Allen
94f5155d6c
am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
...
* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
Fix some documentation typos.
2014-10-02 16:52:50 +00:00
Newton Allen
c68aad9fd0
am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
...
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
Fix some documentation typos.
2014-10-02 16:47:19 +00:00
Newton Allen
d84ce32bd2
Merge "Fix some documentation typos." into lmp-dev
2014-10-02 16:39:12 +00:00
Paul West
c55a2547a1
am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
...
* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
[DS] DSDS support for widget view
2014-10-02 15:28:41 +00:00
Paul West
bebcde4453
Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
2014-10-02 15:24:14 +00:00
George Mount
b29b651dd5
am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
...
* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
Fix ChangeTransform works only once on a View.
2014-10-02 14:39:41 +00:00
George Mount
a590a95c4d
am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
...
* commit 'd982b582d1993288347f771177f6889fe14fb387':
Fix ChangeTransform works only once on a View.
2014-10-02 14:33:15 +00:00
George Mount
d982b582d1
Merge "Fix ChangeTransform works only once on a View." into lmp-dev
2014-10-02 14:27:21 +00:00
Sreeram Ramachandran
4f4b81bd3d
am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
...
* commit 'c04e922f67cacfc428d09fd266f7c9b36a6fb472':
Send app permissions to netd.
2014-10-02 06:34:16 +00:00