Selim Gurun
3ee52709ec
am 5a1bcaba: Merge "Remove unpublished optOutDataReductionProxyApi" into lmp-dev
...
* commit '5a1bcaba90331ff0212a12f298c0a5c0b01fcc20':
Remove unpublished optOutDataReductionProxyApi
2014-09-03 23:24:44 +00:00
Dan Sandler
da0f8565e3
am cdb9de6a: Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev
...
* commit 'cdb9de6a3d6fe2373771f7f9c6561519a1b8e2fb':
Reduce RAM requirements of grayscale icon testing
2014-09-03 23:24:40 +00:00
Svetoslav
393a782685
am c23f9664: Merge "NumberPicker not announcing current selection." into lmp-dev
...
* commit 'c23f96644107137d8e6fd48d44b910a3cca3c078':
NumberPicker not announcing current selection.
2014-09-03 23:23:55 +00:00
Eino-Ville Talvala
530d1a4a5f
am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev
...
* commit '25c3598620c9e1a2c8ab3aea766e9da31bc2c5be':
JobScheduler: Fix doc build break
2014-09-03 23:23:30 +00:00
Amith Yamasani
e8646104d3
am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev
...
* commit 'f27739f78aa38da5e3a29e2a1e03c21b6f95f5ee':
Add some @SystemApi tags for internal user-related APIs
2014-09-03 23:23:00 +00:00
Matthew Xie
f77a0e7c9a
am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev
...
* commit '0465993a8c0ddec88311db561b1220786150344a':
Close the base socket when bindListen fails
2014-09-03 23:22:26 +00:00
Alan Viverette
e52c148a91
am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev
...
* commit '3778a6aa6069dae2e7f012732f47c6a7e5196364':
Remove partial support for hotspot changes on focus movement
2014-09-03 22:54:39 +00:00
Selim Gurun
628025335a
Merge "Remove unpublished optOutDataReductionProxyApi" into lmp-dev
2014-09-03 22:18:13 +00:00
Dan Sandler
d1dc910eff
Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev
2014-09-03 22:15:38 +00:00
Dan Sandler
05c362d564
Reduce RAM requirements of grayscale icon testing
...
The isGrayscale family of methods is designed to identify
drawables and bitmaps that apps are using in the largeIcon
position to pose as small icons in order to get the
appropriate background treatment (a solid blue or gray block
in KK/JB, or geniune selvedge denim in ICS/HC).
We can optimize this search two ways:
(1) Reject immediately any largeIcon that is larger than
largeIcons should be (64x64dp). We could one day simply
reject, or resize, these in the notification manager,
but regardless these are not plausible smallIcon
subsitutes. This new constraint is commemorated in the
new name, isGrayscaleIcon().
(2) Shrink the bitmap even smaller before scanning it slowly
in Java. This lets native_drawBitmap do the heavy
lifting across the entire bitmap; we need only scan a
few pixels.
Bug: 16513124
Change-Id: I3a2b79130ed2465a4aedfbb5a556db7f8a7aa132
2014-09-03 23:52:47 +02:00
Selim Gurun
c7a8d06731
Remove unpublished optOutDataReductionProxyApi
...
Bug: 17253647
Per Api council's request, remove this API.
Change-Id: I8e706cc7173b88f3f13b2ac0697f54b25f163798
2014-09-03 14:34:24 -07:00
Svetoslav
058e1f5a38
Merge "NumberPicker not announcing current selection." into lmp-dev
2014-09-03 21:29:16 +00:00
Eino-Ville Talvala
93b47603bf
JobScheduler: Fix doc build break
...
Change-Id: I769da7274fe5e3f64a47c82f893afeee6a11254e
2014-09-03 20:51:13 +00:00
Svetoslav
ca50566101
NumberPicker not announcing current selection.
...
bug:17299486
Change-Id: I73fd33ef3518ef8e6cdd40cd036e8f104dc492b6
2014-09-03 13:26:34 -07:00
Amith Yamasani
bef1036af7
Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev
2014-09-03 20:26:10 +00:00
Amith Yamasani
0e8d7d63ba
Add some @SystemApi tags for internal user-related APIs
...
Also added an internal isManagedProfile()
Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
2014-09-03 13:17:28 -07:00
Matthew Xie
ddfa8e18fd
Merge "Close the base socket when bindListen fails" into lmp-dev
2014-09-03 19:29:03 +00:00
Matthew Xie
726652e9d3
Close the base socket when bindListen fails
...
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
2014-09-03 19:25:39 +00:00
Alan Viverette
94b88e7103
Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev
2014-09-03 18:31:47 +00:00
John Reck
2cb9509870
am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev
...
* commit 'ef908af6ba2fe85b244e02a16936b53acdf2931f':
Have destroy call freePrefetchedLayers
2014-09-03 18:26:41 +00:00
John Reck
2d72dd2e3e
Merge "Have destroy call freePrefetchedLayers" into lmp-dev
2014-09-03 18:18:31 +00:00
John Reck
17035b0211
Have destroy call freePrefetchedLayers
...
Bug: 17208461
There's a potential race condition between HardwareRenderer.destroy()
being called (which calls destroyCanvasAndSurface()) and the renderer
being finalized (which is what calls freePrefetchedLayers), during which
time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
context.
Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
into destroyCanvasAndSurface() where they should have been in the first
place.
Also, if we hit the assertion failure, dump the current state of
Caches to try and provide more context for the failure.
Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
2014-09-03 11:13:53 -07:00
Matthew Williams
bbd04c6956
am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev
...
* commit 'f390c6ac2f65573e863fb563ded7ecdb3e839be4':
Add timeout when waiting to bind to JobService
2014-09-03 18:01:47 +00:00
George Mount
54aa32cb01
am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev
...
* commit '626676503844d2a90792011cd23b099109c8c9d7':
Fix ChangeTransform to work with interruptions
2014-09-03 17:49:57 +00:00
George Mount
7e492f2007
am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev
...
* commit 'dd8159896d9ebc138a01f538445280e5a1d5adae':
Additional fixes for "back" with translucent windows.
2014-09-03 17:49:54 +00:00
Esteban Talavera
64492996c8
am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev
...
* commit '5607db79a3c17d948e717debc74a936ea47c1de8':
Pass ComponentName to probing certificate methods
2014-09-03 17:49:45 +00:00
Wally Yau
c3a65a17fa
am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev
...
* commit 'afa516092430324283256b568fe6b91fb88e82c8':
New keycode definitions for TV remotes.
2014-09-03 17:49:28 +00:00
Matthew Williams
5bdc16974a
Merge "Add timeout when waiting to bind to JobService" into lmp-dev
2014-09-03 17:49:07 +00:00
Matthew Williams
75fc5258b7
Add timeout when waiting to bind to JobService
...
BUG: 17322886
bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.
Also made the javadocs clearer for the JobScheduler class.
Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
2014-09-03 10:47:27 -07:00
George Mount
66946e22b1
Merge "Fix ChangeTransform to work with interruptions" into lmp-dev
2014-09-03 17:30:24 +00:00
George Mount
d847f1a1e3
Merge "Additional fixes for "back" with translucent windows." into lmp-dev
2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de
Additional fixes for "back" with translucent windows.
...
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.
Bug 16215650
Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
2014-09-03 17:29:57 +00:00
George Mount
dc19ac008c
Fix ChangeTransform to work with interruptions
...
Bug 17372872
If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.
Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
2014-09-03 17:29:06 +00:00
Esteban Talavera
aa924b52e9
Merge "Pass ComponentName to probing certificate methods" into lmp-dev
2014-09-03 17:22:41 +00:00
Dake Gu
f01a449630
am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev
...
* commit 'a45b03f85cdfa792122a9301d508e106ce6aa6f6':
ActivityTransition: fix activity not finished on back
2014-09-03 17:16:57 +00:00
Wally Yau
a25d54ffb0
Merge "New keycode definitions for TV remotes." into lmp-dev
2014-09-03 17:15:50 +00:00
Dake Gu
dd725ec4a7
Merge "ActivityTransition: fix activity not finished on back" into lmp-dev
2014-09-03 17:07:09 +00:00
Brian Carlstrom
a27e31a003
am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev
...
* commit 'ef3d85a5d9de21c4569cc1bec4e696bbf44623a6':
Fix DevicePolicyManager javadoc
2014-09-03 17:06:17 +00:00
Chet Haase
a4673b1c74
am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev
...
* commit 'c22d910342406a71094ace8f10a898ea9de360ca':
Fix TransitionManager.go() to allow null transitions
2014-09-03 17:05:29 +00:00
George Mount
ddc5bd84b6
am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev
...
* commit '10e15c3ad6d5395c38c73b72aff4267eed0a66b8':
Make Fragment Transitions match Acitivty Transitions API
2014-09-03 17:05:03 +00:00
Christoph Studer
717ad1da29
am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev
...
* commit '342ece751b683d4532e273f196f4f99dfc569067':
NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
2014-09-03 17:04:38 +00:00
Sander Alewijnse
66b4040c05
am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev
...
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
Add the provisioning extra admin extras bundle.
2014-09-03 17:04:33 +00:00
Yohei Yukawa
b2745fabdd
am ebb6b422: Merge "API Review: InputConnection" into lmp-dev
...
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
API Review: InputConnection
2014-09-03 17:04:21 +00:00
Lorenzo Colitti
1548796fbf
am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev
...
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
2014-09-03 17:04:11 +00:00
Svetoslav
ac92df0a05
am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev
...
* commit '551335a38d0214e739571193369d6e476d9ff75b':
Fix AccessibilityNode's isVisibleToUser behavior.
2014-09-03 16:43:31 +00:00
Alan Viverette
e368dc6208
am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev
...
* commit 'b975fe8793329ad3543b4d2462bf42db524ed161':
Fix accessibility events emitted from TwoStatePreference
2014-09-03 16:42:02 +00:00
Adam Powell
6319a2f12e
am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
...
* commit '1b17f9390020b2801c9b4bea0a5ada5fe7bc37df':
Automatically supply a content description for ToolbarActionBar nav
2014-09-03 16:41:52 +00:00
Yohei Yukawa
73c9bddee1
am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev
...
* commit '667b31d200c5a919909a7c8d677033607d7d33cb':
API Review: CursorAnchorInfo
2014-09-03 16:41:44 +00:00
Lorenzo Colitti
154b83c008
am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev
...
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
Use per-Network connection pools for openConnection.
2014-09-03 16:41:08 +00:00
Lorenzo Colitti
bc940e69f1
am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev
...
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
Pass the socket mark for DNS queries to dnsmasq.
2014-09-03 16:41:03 +00:00