Jinsuk Kim
ff0133a194
am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling
...
* commit '527346ab17d4090a15c3408db2047f5e6800c8f4':
CEC: Bug fixes for vendor-specific command handling
2014-09-12 19:17:22 +00:00
Yohei Yukawa
6468b783c6
am 5bdb322f: am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev
...
* commit '5bdb322f8cdbc89113df20d79054d3f6c5d1ad44':
API Review: Clean up removed APIs
2014-09-12 08:27:06 +00:00
Jinsuk Kim
d4a94db1cd
CEC: Bug fixes for vendor-specific command handling
...
- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
is not ready
Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
2014-09-12 16:22:23 +09:00
Jinsuk Kim
73046f81a6
am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev
...
* commit '6d4c60e82ccf11122b7dec64695c20104119af83':
Replace the MHL register name 'scratchpad' with 'vendor'
2014-09-12 05:47:20 +00:00
Craig Mautner
6ec7cd9dab
am a7027783: am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev
...
* commit 'a7027783e39e4da9ef6cc66a200746ffb81e720e':
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
2014-09-12 05:47:14 +00:00
Alan Viverette
129890704d
am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev
...
* commit '36348edf997963043ca1fbf91dc59615d43ebcb1':
Remove unsafe methods that take TypedArray
2014-09-12 05:47:03 +00:00
Michael Wright
3dd0a6aabc
am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
...
* commit '7987089963e29c993146a24470d412c2e83f98fa':
Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
2014-09-12 05:46:19 +00:00
George Mount
9e30945202
am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev
...
* commit '4ac75dced476a891b874a1c573067f2220898bb6':
Fixed empty TransitionSet not notifying listeners.
2014-09-12 05:46:14 +00:00
Amith Yamasani
95edc2dce0
am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev
...
* commit '807bce1c3f178c196783f1cceec7d6d9cc42a520':
Annotate bindServiceAsUser with SystemApi
2014-09-12 05:46:09 +00:00
Brian Carlstrom
13b99f3682
am 3b74850d: am 93468f7c: Merge "Add zygote preloading of shared libraries" into lmp-dev
...
* commit '3b74850dee7e41991794f778eb2f12b43e453a0d':
Add zygote preloading of shared libraries
2014-09-12 05:46:04 +00:00
Yigit Boyar
f0e8dafdba
am 590426f4: am 62bd62e4: Merge "Add support for default content description in DecorToolbar" into lmp-dev
...
* commit '590426f410c3da73926d4ff0a321febf37fbcc49':
Add support for default content description in DecorToolbar
2014-09-12 05:45:58 +00:00
Alan Viverette
1c3d3e6a01
am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev
...
* commit 'bba2b9e8221a91dd03036b47e90f1ea364dc4fd2':
Vertically align toolbar child views with similar gravities
2014-09-12 05:45:53 +00:00
Adam Powell
9c8cfa5a3b
am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev
...
* commit 'e82480b3a5ba0c342225035fac94020e41e5170a':
Remove View methods that can't be used safely from the SDK
2014-09-12 05:45:37 +00:00
Craig Mautner
f20d09c17f
am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev
...
* commit '2c85b1fcebdf08601124eada828da553a8d9f820':
If activity is an alias get maxRecents from target
2014-09-12 05:45:32 +00:00
Jeff Davidson
85e36549ae
am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
...
* commit 'bf2ac88fc4bceb56db27bfd3aa1483216648468f':
Update VpnService Javadoc to reflect new UX.
2014-09-12 05:45:26 +00:00
Prerepa Viswanadham
7af08c0547
am 0d8efe53: am 041299e3: Remove onConnectionCongested callback
...
* commit '0d8efe53e1d3d5eefd48b608416b8ac2a02e7fba':
Remove onConnectionCongested callback
2014-09-12 05:45:13 +00:00
George Mount
189a460a34
am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
...
* commit 'b9a2399e205f231f07176063854a8410a7fec1c1':
Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 05:44:57 +00:00
George Mount
b6d4a7f141
am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
...
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
Have Activity Transitions activited by a new window attribute.
2014-09-12 05:44:51 +00:00
Igor Murashkin
5e03d27960
am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
...
* commit '5d2587c3ff59ac30b411f5b0d593707289ffc0aa':
camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 05:44:41 +00:00
Sreeram Ramachandran
ea949c3002
am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
...
* commit '6e06689c6dc38e57b83d73d22245fffe1b5065c4':
Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 05:44:36 +00:00
Chet Haase
dcce4a5119
am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
...
* commit 'e58831a6a0edce3114686cb8168652a50e956031':
Make starting window hw-accelerated
2014-09-12 05:43:45 +00:00
Paul Lawrence
d0fa8ff165
am 1d255e2d: am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
...
* commit '1d255e2dee274917e16325901508f2ba79878624':
Create correct files in dropbox on encrypted boot
2014-09-12 05:43:36 +00:00
Yohei Yukawa
3fadee4791
API Review: Clean up removed APIs
...
This CL removes old API signatures marked as @removed
in the follow CLs.
- Ic8c6fab58c01206872a34e7ee604cdda1581364d
- Ia8cbb9f6b41cd9509fc0147fd68763dfde593ffc
- I772c48ff18918e48a81e807b48ff907614485c09
This is just a clean-up CL. No behavior change is intended.
BUG: 17200900
BUG: 17320996
BUG: 17365414
Change-Id: Ibfbd5cc1cdebb8851c73477cff55c9b2d631fdea
2014-09-12 11:32:31 +09:00
Jinsuk Kim
68ab6cf0ea
Merge "Replace the MHL register name 'scratchpad' with 'vendor'" into lmp-dev
2014-09-12 02:12:36 +00:00
Craig Mautner
cbc771f50e
Merge changes Ia6fe9724,I682b9acb into lmp-dev
...
* changes:
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
2014-09-12 01:45:29 +00:00
Jinsuk Kim
b3fbf9dbe8
Replace the MHL register name 'scratchpad' with 'vendor'
...
Bug: 17479050
Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
2014-09-12 10:42:14 +09:00
Alan Viverette
e461d549bf
Merge "Remove unsafe methods that take TypedArray" into lmp-dev
2014-09-12 01:30:35 +00:00
Craig Mautner
7d7808fcf8
Show all windows from activity that hides keyguard
...
Popup windows from the activity hiding the keyguard weren't being
shown. This change retrieves that activity from PhoneWindowManager
and applies the show or hide call to the windows that match the
activity.
Fixes bug 16479813.
Change-Id: Ia6fe97240aec85c5233eee9038138f7d48095a6e
2014-09-11 18:02:38 -07:00
Michael Wright
1208e2718d
Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
...
Bug: 17290118
Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
2014-09-12 00:23:14 +00:00
George Mount
a374bc049c
Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev
2014-09-11 23:56:36 +00:00
Amith Yamasani
e1e98741ff
Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev
2014-09-11 23:48:37 +00:00
Amith Yamasani
c85029f7d9
Annotate bindServiceAsUser with SystemApi
...
Bug: 17470388
Change-Id: I0961e6ebabaffd91e3d152074b2f64ca4f9ba8fb
2014-09-11 16:47:17 -07:00
Brian Carlstrom
38c29ca3c7
Merge "Add zygote preloading of shared libraries" into lmp-dev
2014-09-11 23:40:33 +00:00
Brian Carlstrom
6c9af96de5
Add zygote preloading of shared libraries
...
Bug: 17459019
Change-Id: I7cb4ecd0ec9542aa9079420fe158cedca7fca028
2014-09-11 16:36:45 -07:00
Alan Viverette
5171dee215
Remove unsafe methods that take TypedArray
...
BUG: 15782973
Change-Id: Ief4ff69c90c16b0e8c93316af9d46ae9639648fa
2014-09-11 16:33:01 -07:00
Yigit Boyar
dba92d416d
Merge "Add support for default content description in DecorToolbar" into lmp-dev
2014-09-11 23:30:47 +00:00
Alan Viverette
34e53ab66e
Merge "Vertically align toolbar child views with similar gravities" into lmp-dev
2014-09-11 23:24:48 +00:00
Alan Viverette
e3cb7baeb9
Vertically align toolbar child views with similar gravities
...
Also fixes Body1 text size, action bar title size on sw600dp-land.
BUG: 17266152
Change-Id: Ib686dd6e80dfcdad920c922a532f4f5d6252fa19
2014-09-11 16:23:29 -07:00
Adam Powell
fb008d6ac3
Merge "Remove View methods that can't be used safely from the SDK" into lmp-dev
2014-09-11 23:12:27 +00:00
Craig Mautner
3969cabf59
Merge "If activity is an alias get maxRecents from target" into lmp-dev
2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c
If activity is an alias get maxRecents from target
...
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.
Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).
Fixes bug 17391328.
Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
2014-09-11 15:53:44 -07:00
Jeff Davidson
8afddbe7e9
Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
2014-09-11 22:41:24 +00:00
Adam Powell
5eb3ffc24c
Remove View methods that can't be used safely from the SDK
...
View methods that previously accepted a TypedArray to initialize
parameters parsed from xml cannot be used correctly by apps. The
TypedArray passed must always be obtained from a context using the
filter array com.android.internal.R.styleable.View, which is not
visible to the SDK.
A previous change already made this safe for existing apps already
using it so that they don't crash, this change removes these methods
from the SDK entirely.
Change-Id: I62099087ad6fd5bf8363e863b04fd0434b8cdfca
2014-09-11 15:38:55 -07:00
Prerepa Viswanadham
ba4f57a1c6
Remove onConnectionCongested callback
...
Bug:17289507
Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +00:00
George Mount
e6f66e78a5
Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
2014-09-11 22:08:36 +00:00
George Mount
04600023d0
Fixed: TransitionSet setStartDelay did nothing.
...
Bug 17452965
Change-Id: Id2fd6ed3bd8e7156dd3d22dcd83117cec12e3528
2014-09-11 14:59:58 -07:00
George Mount
db352c7835
Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
2014-09-11 21:54:13 +00:00
Igor Murashkin
6894f60c9c
Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
2014-09-11 21:50:34 +00:00
Jeff Davidson
6d6ea3b6be
Update VpnService Javadoc to reflect new UX.
...
The major change is that consent is now "sticky" and lasts until the
user explicitly disables the VPN connection.
Bug: 17474362
Change-Id: Id4e7807e635bbfc7645741135209d46763e280f9
2014-09-11 14:44:31 -07:00
George Mount
38a664986b
Fixed empty TransitionSet not notifying listeners.
...
Bug 17469482
Change-Id: I2673960e75737d659e52132f1f3b8230080adb7b
2014-09-11 14:37:20 -07:00