drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,846 Commits 1 Branch 0 Tags
Commit Graph

126846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
f0cb159884 Merge "Add missing dependency in layoutlib build file" 2014-03-31 23:14:35 +00:00
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
 2014-03-31 16:11:13 -07:00
Glenn Kasten
b9b07b8c48 Merge "AudioTrack and AudioRecord JNI cleanup" 2014-03-31 23:06:50 +00:00
Alan Viverette
30cac644f1 Merge "Switch device default theme over to Quantum" 2014-03-31 22:38:14 +00:00
Baligh Uddin
bf93a28f4c Merge "Import translations. DO NOT MERGE" 2014-03-31 22:11:26 +00:00
Baligh Uddin
9fa67d8e4d Merge "Import translations. DO NOT MERGE" 2014-03-31 22:09:54 +00:00
Alan Viverette
3054e2d5b1 Switch device default theme over to Quantum 
Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af
 2014-03-31 15:01:00 -07:00
Zhihai Xu
6b96c1b2ea am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:35:38 +00:00
Zhihai Xu
7d394df2ab am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Nick Kralevich
0e290b7708 am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'ce30fca85deec8e268009a2acaefe85541ab1e58':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:26:27 +00:00
Nick Kralevich
ce30fca85d am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:20:41 +00:00
Nick Kralevich
e531e2ec6b am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:14:37 +00:00
Nick Kralevich
3b2a9d2279 Merge "Change when the SELinux relabel of /data/data occurs." 2014-03-31 20:09:31 +00:00
ztenghui
2f9ec3560d Merge "Make the reveal animation API public" 2014-03-31 20:08:12 +00:00
Brian Carlstrom
ed99dc89c3 am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 20:06:06 +00:00
Brian Carlstrom
7156b7c65d am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 19:59:31 +00:00
Brian Carlstrom
b11952d6f6 am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit 'e3434fc4fb164b66e529e675dfc31652a4c69cb5':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 19:55:16 +00:00
Craig Stout
285aae15e6 am fe710551: (-s ours) am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 
* commit 'fe710551cfd98ce90f331e3b9a240d46f303f7b1':
  Force refresh of stateful when a child drawable is changed.
 2014-03-31 19:50:01 +00:00
Brian Carlstrom
e3434fc4fb Merge "Improve detail message for X509TrustManagerExtensions argument validation" 2014-03-31 19:49:35 +00:00
Glenn Kasten
01f0e449fb Merge "Fix build from multiple declaration" 2014-03-31 19:28:48 +00:00
Adrian Roos
a3dafcfb26 Add a SampleTrustAgent 
Adds a simple app that shows how to build a trust agent. For
lack of a better place to put this, this stays in Keyguard's tests
for now.

Bug: 13723878
Change-Id: I9ebad253d3d89c846fe8afaad6babce9e7b80b5e
 2014-03-31 19:27:52 +00:00
Glenn Kasten
d1f7354dd8 Fix build from multiple declaration 
Change-Id: Id2dd703aedef0423605407ab7a14ef7b48c2fcdb
 2014-03-31 12:26:22 -07:00
Adrian Roos
46842d946d Make Keyguard trust aware 
Bug: 13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3
 2014-03-31 19:22:48 +00:00
Adrian Roos
53ab5174d5 Merge "Define trust agent framework components" 2014-03-31 19:21:05 +00:00
Adrian Roos
82142c21dd Define trust agent framework components 
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
 2014-03-31 21:18:28 +02:00
Alan Viverette
5c43427cb8 Merge "Clean up LayerDrawable, ensure cached values are cleared on changes" 2014-03-31 19:13:17 +00:00
Alan Viverette
883e04b3c9 Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed" 2014-03-31 19:12:45 +00:00
Adrian Roos
716f20d833 Merge "Define initial trust agent API" 2014-03-31 19:11:36 +00:00
John Reck
b4a132a05f Merge "Turn on RenderThread" 2014-03-31 19:09:13 +00:00
Craig Stout
fe710551cf am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 
* commit 'ecaea7e60c0992ac295163f55c1f986a46eef008':
  Force refresh of stateful when a child drawable is changed.
 2014-03-31 19:08:24 +00:00
Alan Viverette
1c4e36c973 Clean up LayerDrawable, ensure cached values are cleared on changes 
Change-Id: I9a652475b6ad66379b1298bf53cd5dcb1a1dd37b
 2014-03-31 12:07:58 -07:00
Baligh Uddin
c377dde565 Import translations. DO NOT MERGE 
Change-Id: I81bf08f36ce519a1cc397fc3cbb1d92878df54f1
Auto-generated-cl: translation import
 2014-03-31 12:05:36 -07:00
Glenn Kasten
1dd51abaae Merge "Use set() return value instead of separate call to initCheck()" 2014-03-31 19:03:32 +00:00
Craig Stout
ecaea7e60c Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev 2014-03-31 19:02:25 +00:00
Chris Wren
e1791add1a Merge "add a null check around scrollAdapter access" 2014-03-31 18:53:34 +00:00
Chris Wren
de3b1a2b2d add a null check around scrollAdapter access 
Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80
 2014-03-31 14:47:59 -04:00
Adrian Roos
ff2144ccb4 Define initial trust agent API 
Adds the minimal API needed to define a useful trust agent.

Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
 2014-03-31 20:40:49 +02:00
Baligh Uddin
22339a562d Import translations. DO NOT MERGE 
Change-Id: I873e19f2b3e2e27eb1bc555ef8cc3cc09f2de493
Auto-generated-cl: translation import
 2014-03-31 11:25:46 -07:00
Brian Carlstrom
ff9ca781d0 Improve detail message for X509TrustManagerExtensions argument validation 
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
 2014-03-31 11:22:34 -07:00
Glenn Kasten
47bbaea4c3 Merge "Include more information in AudioTrack JNI error logs" 2014-03-31 18:07:43 +00:00
John Reck
8e150fef2b Merge "Add invokeFunctor" 2014-03-31 18:04:06 +00:00
Glenn Kasten
877ffde5f6 Merge "Synchronize channel masks in AudioFormat with system/audio.h" 2014-03-31 17:58:36 +00:00
ztenghui
be23fa2f73 Make the reveal animation API public 
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
 2014-03-31 10:41:31 -07:00
Glenn Kasten
8f81d0832b Include more information in AudioTrack JNI error logs 
Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717
 2014-03-31 10:38:47 -07:00
Glenn Kasten
8bfe0555cc Merge "Fix warnings" 2014-03-31 17:19:49 +00:00
John Reck
0f61cde234 Turn on RenderThread 
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
 2014-03-31 10:19:14 -07:00
Glenn Kasten
0df5cf5ad7 Merge "Fix typo" 2014-03-31 16:53:23 +00:00
Alexandra Gherghina
bd6738b2e1 Merge "Mark the keyguard package as required for profile" 2014-03-31 16:15:48 +00:00
Alexandra Gherghina
d4749eb4a8 Mark the keyguard package as required for profile 
Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84
 2014-03-31 16:15:40 +01:00