Robert Ly
84f00277b1
am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
...
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
2014-08-13 16:12:37 +00:00
Robert Ly
9ada140fc1
am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
...
* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
2014-08-13 16:07:40 +00:00
Jean-Michel Trivi
114e293143
am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
...
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
Add support for AudioAttributes in android.media.Ringtone
2014-08-13 16:07:32 +00:00
Jean-Michel Trivi
9dfce1e648
am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
...
* commit 'f181197f9729dbb629c1383efd5faa3f3e0e4558':
Add support for AudioAttributes in android.media.Ringtone
2014-08-13 15:59:47 +00:00
Raph Levien
06324495db
am 89b0dc88: am c2a5903e: Merge "Resolve invalid Typeface style to default" into lmp-dev
...
* commit '89b0dc88c0cc1d65370dc53050b5bfbcbb0827af':
Resolve invalid Typeface style to default
2014-08-13 15:37:58 +00:00
Raph Levien
179c9a2e29
am c2a5903e: Merge "Resolve invalid Typeface style to default" into lmp-dev
...
* commit 'c2a5903ecd76afdc33a088ce55620dc73e7c9d68':
Resolve invalid Typeface style to default
2014-08-13 15:33:14 +00:00
John Spurlock
401851159c
am 5f5a53d4: am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
...
* commit '5f5a53d4ef5ae248814df733dc32f24f80530f33':
Send LED signal up to SystemUI regardless of setting.
2014-08-13 15:19:54 +00:00
John Spurlock
4d02366538
am f69796cf: Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev
...
* commit 'f69796cffc86e4a5136abd55f46f461c6f5ba2e7':
Send LED signal up to SystemUI regardless of setting.
2014-08-13 15:15:10 +00:00
Jorim Jaggi
728f39f578
am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev
...
* commit '119b3c40078d532dce4b1de56f4645b6ea587874':
Lockscreen launch animations
2014-08-13 14:13:41 +00:00
Jorim Jaggi
bbc461f62a
am 36abea42: Merge "Lockscreen launch animations" into lmp-dev
...
* commit '36abea426c76463185d2befa8e459a7cefe2bbc9':
Lockscreen launch animations
2014-08-13 14:09:35 +00:00
Selim Cinek
49ef812f71
am 7ff730f7: am e2116c44: Merge "Reuse existing TouchHelpers on rotation" into lmp-dev
...
* commit '7ff730f770a510e2809f34075a8b88949133daa8':
Reuse existing TouchHelpers on rotation
2014-08-13 14:07:22 +00:00
Selim Cinek
3a51f54ac2
am e2116c44: Merge "Reuse existing TouchHelpers on rotation" into lmp-dev
...
* commit 'e2116c44bd7f290698f889c356e49746c7677909':
Reuse existing TouchHelpers on rotation
2014-08-13 14:01:55 +00:00
Selim Cinek
7f6e8cfe7f
am 52f1b0d2: am 5aeb57d5: Merge "Reset the notification expanded states on screen off" into lmp-dev
...
* commit '52f1b0d2cf423d2e3612b50941a8ee7f0db1cbff':
Reset the notification expanded states on screen off
2014-08-13 13:55:22 +00:00
Selim Cinek
bf65204d2d
am 5aeb57d5: Merge "Reset the notification expanded states on screen off" into lmp-dev
...
* commit '5aeb57d5a568ab975d96cd29e24d18d38ff997f8':
Reset the notification expanded states on screen off
2014-08-13 13:51:10 +00:00
Lorenzo Colitti
0da5e91b90
am ac292abc: am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress.
...
* commit 'ac292abc8f367da4f0098873dfbf58c6f04cb03f':
Switch RouteInfo to use IpPrefix instead of LinkAddress.
2014-08-13 13:12:08 +00:00
Lorenzo Colitti
29fc0ba18a
am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress.
...
* commit '22ecb7de88e2afb20afd09a8219b924a36850d4b':
Switch RouteInfo to use IpPrefix instead of LinkAddress.
2014-08-13 13:08:20 +00:00
Lorenzo Colitti
1806b1fc25
Switch RouteInfo to use IpPrefix instead of LinkAddress.
...
This addresses a TODO and also makes it possible to create
routes to destinations that are not valid LinkAddresses, such as
multicast addresses.
Bug: 16875580
Change-Id: Id4c77b00dc3064bf27d78cdcbbe035e645748cfe
2014-08-13 21:17:20 +09:00
Narayan Kamath
1c002e9f50
am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting.
...
* commit '8a4c1f74b4032613807bf4589430acdfc0f2e535':
Persist the cpuAbiOverride setting.
2014-08-13 11:52:54 +00:00
Narayan Kamath
899686ab52
am a76f47ee: Persist the cpuAbiOverride setting.
...
* commit 'a76f47ee8bd12174e63ca1cd5a21b98ada7ee101':
Persist the cpuAbiOverride setting.
2014-08-13 11:49:17 +00:00
Narayan Kamath
4903f64ba2
Persist the cpuAbiOverride setting.
...
If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.
bug: 16476618
Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
2014-08-13 12:41:19 +01:00
Sungsoo Lim
0bcef58a6d
am 62d7c9eb: am 16504076: Merge "Fix hashCode of TvContentRating" into lmp-dev
...
* commit '62d7c9eb423394859f5a53d366bd18358c51c154':
Fix hashCode of TvContentRating
2014-08-13 11:22:54 +00:00
Sungsoo Lim
aff99406b4
am 16504076: Merge "Fix hashCode of TvContentRating" into lmp-dev
...
* commit '165040764f3ab10ad2ada2164527449648fa0f42':
Fix hashCode of TvContentRating
2014-08-13 11:17:21 +00:00
Narayan Kamath
2c76715154
am 1c2b4c39: am 5d171a2b: Fix a couple of PM warnings.
...
* commit '1c2b4c39b4a7718b95b13f69ec848479ab5200d7':
Fix a couple of PM warnings.
2014-08-13 11:15:24 +00:00
Narayan Kamath
1854afa37b
am 5d171a2b: Fix a couple of PM warnings.
...
* commit '5d171a2b1f4a54a909e575dbfac7493362937f6c':
Fix a couple of PM warnings.
2014-08-13 11:12:13 +00:00
Narayan Kamath
20200849d1
Fix a couple of PM warnings.
...
- "Could not delete native binary" : This one is a bit of
a WTF. git history tells us this code has been around for
a very long time (the warning's new though). It's a no-op
because codePath always contains the *current* codePath and
trying to remove native libs from the current codePath will
do nothing for bundled apps. This code sounds like it wants
to delete dangling native binaries for system apps that were
upgraded during an OTA. This sounds like a wrong place to do
that, though.
- "Unrecognized code path" : This one's harmless and removed
by moving this call closer to where it's used.
bug: 16823001
Change-Id: I9b40ae507b2c80ff3fdd45d5699df62bfc86514f
2014-08-13 11:05:58 +00:00
Alexandra Gherghina
fc2abe8626
am 25332ad5: am af9c6d08: Merge "Bugfix: adds extra null check" into lmp-dev
...
* commit '25332ad5664112e10b71265fe5b6ebeb590e1dce':
Bugfix: adds extra null check
2014-08-13 10:04:07 +00:00
Alexandra Gherghina
a87f8e6b97
am af9c6d08: Merge "Bugfix: adds extra null check" into lmp-dev
...
* commit 'af9c6d082cca2c0c1fe15c4976414763824f60e3':
Bugfix: adds extra null check
2014-08-13 10:00:06 +00:00
Yohei Yukawa
e69662a125
am c1d16578: am 692b78be: Suppress warnings of redundant calls of #updateCursorAnchorInfo
...
* commit 'c1d16578b78374890b177a0e92d6495d4ee12dbb':
Suppress warnings of redundant calls of #updateCursorAnchorInfo
2014-08-13 09:09:42 +00:00
Yohei Yukawa
45796f2c47
am 692b78be: Suppress warnings of redundant calls of #updateCursorAnchorInfo
...
* commit '692b78be4fea917c3b538ac15f896949a93ac266':
Suppress warnings of redundant calls of #updateCursorAnchorInfo
2014-08-13 09:00:59 +00:00
Yohei Yukawa
7360591bbf
Suppress warnings of redundant calls of #updateCursorAnchorInfo
...
Warnings of redundant calls of #updateCursorAnchorInfo should be
suppressed at least until such redundant calls from
android.widget.Editor are addressed.
BUG: 16996008
Change-Id: I62b6acdab06178520473bd53e56e2cfb62fb17be
2014-08-13 17:17:09 +09:00
Ji-Hwan Lee
e42b655a71
am f7b5efc1: am 88d355e7: Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev
...
* commit 'f7b5efc1293079e7d85aaf6f1720903558cea86f':
TIF: Fix release logic for hardware wrapper input
2014-08-13 06:51:27 +00:00
Ji-Hwan Lee
04cfd23253
am 88d355e7: Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev
...
* commit '88d355e796e47bc1e4223e97e15719aa1d7b40f4':
TIF: Fix release logic for hardware wrapper input
2014-08-13 06:47:04 +00:00
Dianne Hackborn
60f819c355
am 8aff6aaa: am 240384e9: Merge "Turn off voice interaction service restrction for now" into lmp-dev
...
* commit '8aff6aaa510dab196bd8fe37b9b58ea4b173f819':
Turn off voice interaction service restrction for now
2014-08-13 06:14:55 +00:00
Dianne Hackborn
223b678661
am 240384e9: Merge "Turn off voice interaction service restrction for now" into lmp-dev
...
* commit '240384e99d47a9bafdbc09d6f953ab03699eb134':
Turn off voice interaction service restrction for now
2014-08-13 06:10:34 +00:00
Wonsik Kim
927e31e1a3
am 0cb41226: am 78ed5c9d: Merge "TIF: fix parental control data inconsistency" into lmp-dev
...
* commit '0cb41226ef116ee81e38984181edd1b13316c6c6':
TIF: fix parental control data inconsistency
2014-08-13 05:54:57 +00:00
Wonsik Kim
ce2c0c590e
am 78ed5c9d: Merge "TIF: fix parental control data inconsistency" into lmp-dev
...
* commit '78ed5c9d1674e1acb66af1c9aa2eec4eea9be262':
TIF: fix parental control data inconsistency
2014-08-13 05:50:55 +00:00
Svet Ganov
0b1a992809
am f9372016: am b130ba2b: Fix some minor print UX bugs.
...
* commit 'f9372016209b125a3415014790ca48ad76da31fd':
Fix some minor print UX bugs.
2014-08-13 05:21:13 +00:00
Svet Ganov
ac3c3cf4ba
am d06d9738: am 936a5219: Check accessibility cache integrity only on eng builds.
...
* commit 'd06d9738facc6b0fdb7b0081a251f0e03975352d':
Check accessibility cache integrity only on eng builds.
2014-08-13 05:21:08 +00:00
Dan Sandler
ea9c58a2b3
am 6eb58ce4: am 0f875bac: Large text support for notifications.
...
* commit '6eb58ce4d3646070baffa51ac30334e5a17cb518':
Large text support for notifications.
2014-08-13 05:20:59 +00:00
Svet Ganov
da33c3b51d
am b130ba2b: Fix some minor print UX bugs.
...
* commit 'b130ba2baf6af52c252a3daa58d1284cf2182c11':
Fix some minor print UX bugs.
2014-08-13 04:31:25 +00:00
Svet Ganov
d9b13699f6
am 936a5219: Check accessibility cache integrity only on eng builds.
...
* commit '936a52199df60d63572bec5e14e3a57e4decd44f':
Check accessibility cache integrity only on eng builds.
2014-08-13 04:31:19 +00:00
Dan Sandler
cd65a5fe04
am 0f875bac: Large text support for notifications.
...
* commit '0f875bacb5d2bc97192d4e4750a0125daa96db41':
Large text support for notifications.
2014-08-13 04:31:14 +00:00
Yuncheol Heo
7dc08e873c
am df4c5298: am 09f15570: Merge "Implement MHL RAP reception." into lmp-dev
...
* commit 'df4c5298f780181768eb916df9fa23d2d145a078':
Implement MHL RAP reception.
2014-08-13 04:26:23 +00:00
Dianne Hackborn
83a11f23f8
am 905f8e8b: am 50d61878: Merge "Add 560dpi, and some other stuff." into lmp-dev
...
* commit '905f8e8b4b50de019188bec5afa579207b259563':
Add 560dpi, and some other stuff.
2014-08-13 04:26:15 +00:00
keunyoung
fd740ec78b
am eef45610: am 435edc40: fix wrong flag check for virtual display
...
* commit 'eef45610fca1078167b68f722abddb7435f05913':
fix wrong flag check for virtual display
2014-08-13 04:26:10 +00:00
Jae Seo
fe90d78e54
am 3f96209d: am bb1586c1: Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev
...
* commit '3f96209d8791524f1d5df8ae23fffaeaa8725c47':
TIF: Temporarily disable permission check for parental controls
2014-08-13 04:26:04 +00:00
Jinsuk Kim
3ca0fb8e1d
am ecfcfcea: am 4fec909c: CEC: Remove timeout from deviceSelect processing
...
* commit 'ecfcfceae31261a478162f935ce350ba724fb74d':
CEC: Remove timeout from deviceSelect processing
2014-08-13 04:25:57 +00:00
Svet Ganov
38781bd2c2
Fix some minor print UX bugs.
...
1. The last row of print options was not visible on a phone.
2. The preview page size on a phone in landscape unusably small.
3. Updated the Save to PDF icon.
bug:16966145
Change-Id: I25ce1572758c62f34344683af2452fb045bb857e
2014-08-13 04:07:21 +00:00
Svet Ganov
79dea425af
Check accessibility cache integrity only on eng builds.
...
The checks may have false ositives and spam test logs.
bug:1689853:
Change-Id: I576600192823f159e28ecea29f888187eeceb98b
2014-08-13 04:06:48 +00:00
Dan Sandler
539aad4570
Large text support for notifications.
...
Bug: 7216066
Bug: 15437369
Change-Id: I01a07f04c18d374fc1656f0b1f439a7c33c9d80c
2014-08-13 04:02:23 +00:00