Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a1f5fc088d am 1c49a612: am c6fdda52: (-s ours) Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev 
* commit '1c49a6124b1bcada842cf46caf331f81717376bc':
  Frameworks/base: Compiled-classes support
 2014-11-19 00:23:05 +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
Jeff Sharkey
c5efb2b92a am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
  Speed up GrantUri.hashCode().
 2014-11-19 00:14:51 +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
Christopher Tate
f066bf229c am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
  Prevent some alarm pathologies
 2014-11-19 00:09:50 +00:00
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:09:43 +00:00
Rubin Xu
0122db0a63 am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:09:38 +00:00
Chris Craik
df57b22bc6 am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
  Update clipToPadding docs
 2014-11-19 00:09:32 +00:00
Ricardo Cervera
de71dd5cb4 am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit '92ad1d8107e66274f226e9e3159283bb8fe3765a':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:09:27 +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 ca775941f3)

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
f1c84568bc am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 
* commit '2a20f425580b48ec5c130e77eb2a447731e37381':
  Frameworks/base: Compiled-classes support
 2014-11-18 22:52:25 +00:00
Deepanshu Gupta
2c9fbdd29c Fix setTextAppearance for styles with dots. 
Bug: http://b.android.com/78842
Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
 2014-11-18 22:52:10 +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
0acbed256e am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '6104fb2862e591fcd62660f5cd11ab5ca48adebb':
  Use stream type if set by user
 2014-11-18 22:25:12 +00:00
Quddus Chong
53dc7c56da am 25f20bde: am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs. 
* commit '25f20bdeab04c72b4fda405ad1bfbd2ed42ff121':
  docs: Fixed bugs for Auto docs.
 2014-11-18 22:20:53 +00:00
Chris Craik
22e8e8ef57 am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 
* commit 'bde9ffbd56cb420b51f11ca05b5225c1953f048d':
  Fix missing ellipsis when just one character is truncated
 2014-11-18 22:20:48 +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
Abhijith Shastry
cc472e66ef am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 
* commit '6807e5f0feac3cfc85e9fe74378b94bc32a141c5':
  Adding more javadocs to Carrier messaging API.
 2014-11-18 22:10:09 +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
Deepanshu Gupta
12b6d29b7b LayoutLib: Stub AM/PM keycodes in Time Picker. 
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.

Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
 2014-11-18 22:02:40 +00:00
Alan Viverette
a4733b68c4 am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev 
* commit 'fb11949d5bb810b39e34ec707fcddde345c474cd':
  Don't ignore accessibility overlays during visibility computation
 2014-11-18 21:51:31 +00:00
Amit Mahajan
ca1e3e5e83 am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '2733ea767b691ada9faabfd41f4175d320053682':
  Telephony: STK CC feature implementation
 2014-11-18 21:51:16 +00: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
51ce9cacb6 am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
  Don't invalidate() on setClipBounds
 2014-11-18 21:46:44 +00:00
John Reck
37cdc191e3 Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev 2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
  Fix invalidateOutline
 2014-11-18 21:37:40 +00:00
John Reck
3cf61d4b79 Merge "Fix invalidateOutline" into lmp-mr1-dev 2014-11-18 21:30:48 +00:00
John Reck
decc26df39 am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev 
* commit 'f0f68117c432edd5aea406e773ec5bd372976eec':
  Trace some interesting events
 2014-11-18 21:29:15 +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