157495 Commits

Author SHA1 Message Date
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
2014-12-09 11:56:22 -08:00
Mathieu Chartier
7fc9176c8a Add zygote space to Dalvik Heap
Broken by
https://googleplex-android-review.git.corp.google.com/#/c/590612/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

Change-Id: I4a58480f1ef1eb17e760245d8690ce92e28ebea3
2014-11-19 13:43:40 -08:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Andrew Lee
e6a1e993c2 Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 2014-11-19 19:00:41 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
Geoff Mendal
9792edd17c am 5fafd21b: (-s ours) Import translations. DO NOT MERGE
* commit '5fafd21b1f15930b729f067be7d2c584add3217b':
  Import translations. DO NOT MERGE
2014-11-19 16:55:43 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
2014-11-19 11:54:53 -05:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
2014-11-19 07:52:29 -08:00
Geoff Mendal
04b6a6d3a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-19 15:19:34 +00:00
Geoff Mendal
2a42085896 Import translations. DO NOT MERGE
Change-Id: Ibfc1a6ef7529620c86fb25ac4ae4b27258a810c1
Auto-generated-cl: translation import
2014-11-19 07:17:01 -08:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Alan Viverette
a489f0b3d9 Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 2014-11-19 02:28:37 +00:00
Alan Viverette
448ff718a0 Re-initialize data when changing time picker 24-hour mode
BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
2014-11-18 18:28:04 -08:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED.
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
2014-11-18 17:34:36 -08:00
Andrew Lee
49e213cd7d Add GENERIC_CONFERENCE to phone capabilities.
This is a temporary capability to recognize CDMA conference calls
so we can show the right strings in the InCallUi. This should be
moved to CallProperties when possible. b/18434985

Bug: 18284408
Change-Id: Ia3e2ff91c8f8a91ff0123df4d3e6a581bdf85895
2014-11-18 17:26:07 -08:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Hao
1c49a6124b am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev
* commit 'c6fdda5284b27ca2ad8f0dc8f359f0bbc69db33d':
  Frameworks/base: Compiled-classes support
2014-11-19 00:17:12 +00:00
Jinsuk Kim
86a1e5a16e CEC: Use thread-safe version for avr info
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.

Bug: 18426137

Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88 Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 2014-11-19 00:09:51 +00:00
Jeff Hao
c6fdda5284 Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 2014-11-18 23:56:33 +00:00
Christopher Tate
04eb368d03 Merge "Prevent some alarm pathologies" into lmp-mr1-dev 2014-11-18 23:49:54 +00:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00
Rubin Xu
3a7d3fc60e Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 2014-11-18 23:42:21 +00:00
Chris Craik
0455174d34 Merge "Update clipToPadding docs" into lmp-mr1-dev 2014-11-18 23:33:30 +00:00
Ricardo Cervera
92ad1d8107 am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit 'b2a2d2c2fe4a8c4794d3025bc10c00404bf79cd8':
  docs: Add link to "Voice search in your app" video.
2014-11-18 23:31:27 +00:00
Ricardo Cervera
b2a2d2c2fe am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit 'e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c':
  docs: Add link to "Voice search in your app" video.
2014-11-18 23:26:41 +00:00
Ricardo Cervera
e9fddfd802 am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit '0d18b091eb5bb5be6f7142821b674e1648158a11':
  docs: Add link to "Voice search in your app" video.
2014-11-18 23:21:29 +00:00
Ricardo Cervera
0d18b091eb Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 2014-11-18 23:16:22 +00:00
Andreas Gampe
cd9c6f508f Frameworks/base: Compiled-classes support
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571
(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)

Change-Id: I04d195c12def4bf1136ed8c6b3dc439b640de7b2
2014-11-18 15:14:06 -08:00
Andres Morales
2830130770 Add a checksum to FRP partition
It will be hard to mandate the contents
of the FRP partition out of factory. Further, for upgrading
units, it would require that OEMs format the partition and then store
a bit saying that they've done so. This adds another attack vector.
Now defeating FRP means either compromising the FRP partition
OR wherever the OEMs decide to store that bit.

This patch adds a checksum to the FRP partition. If the checksum
is not valid, the partition is wiped - disabling OEM unlock.

This ensures that no matter what data comes on the partition, we will 
always disable OEM unlock by default. It also allows OEMs to not have to
worry about initializing the partition, as it happens automatically. 

Bug: 18322021
Change-Id: Ib30782baa771591c30ea95054d3b83f36fc08cc2
2014-11-18 22:52:58 +00:00
Andreas Gampe
2a20f42558 Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 2014-11-18 22:45:50 +00:00
Marco Nelissen
6104fb2862 Merge "Use stream type if set by user" into lmp-mr1-dev 2014-11-18 22:20:05 +00:00
Quddus Chong
25f20bdeab am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
* commit '09cf0729a3b21e7106918cf3690e881a1860ae8b':
  docs: Fixed bugs for Auto docs.
2014-11-18 22:17:53 +00:00
Chris Craik
bde9ffbd56 Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 2014-11-18 22:17:35 +00:00
Quddus Chong
09cf0729a3 am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
* commit 'f256d7ac189e58a6c21a5a71e5a1dddeab2d576f':
  docs: Fixed bugs for Auto docs.
2014-11-18 22:13:06 +00:00
Quddus Chong
f256d7ac18 am 4741fb4b: docs: Fixed bugs for Auto docs.
* commit '4741fb4bb146909fc133ae37ea43dbb7f9edbd04':
  docs: Fixed bugs for Auto docs.
2014-11-18 22:08:10 +00:00
Abhijith Shastry
6807e5f0fe Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 2014-11-18 22:04:58 +00:00
Jeff Sharkey
3597b55d12 Speed up GrantUri.hashCode().
It's used as a key for all outstanding permission grants, so let's
keep it fast.

Bug: 18381401
Change-Id: I4db8dba13302b98f33aacfa3e9acd9a394541cd0
2014-11-18 14:04:18 -08:00
Alan Viverette
fb11949d5b Merge "Don't ignore accessibility overlays during visibility computation" into lmp-mr1-dev 2014-11-18 21:48:13 +00:00
Amit Mahajan
2733ea767b Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 2014-11-18 21:46:51 +00:00
Quddus Chong
4741fb4bb1 docs: Fixed bugs for Auto docs.
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
2014-11-18 13:46:44 -08:00
John Reck
37cdc191e3 Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev 2014-11-18 21:41:17 +00:00
John Reck
3cf61d4b79 Merge "Fix invalidateOutline" into lmp-mr1-dev 2014-11-18 21:30:48 +00:00
John Reck
f0f68117c4 Merge "Trace some interesting events" into lmp-mr1-dev 2014-11-18 21:23:50 +00:00
Jason Monk
cd356f0dda Automatically enable BT when entering BT QS panel
Bug: 18334326
Change-Id: Ifbcdee1a8260ce959eae53c0900851f8da2f97ee
2014-11-18 21:17:40 +00:00
Preeti Ahuja
d4180cc2d4 Telephony: STK CC feature implementation
Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
2014-11-18 13:01:02 -08:00