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

126925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
23f64109d0 Import translations. DO NOT MERGE 
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
 2014-03-31 11:37:11 -07:00
Baligh Uddin
dc5e02bdcc Import translations. DO NOT MERGE 
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
 2014-03-31 11:34:59 -07: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
Narayan Kamath
439cf5b433 am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:16:16 +00:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
 2014-03-31 14:10:53 +01:00
Narayan Kamath
439145f0e7 am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class." 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 12:42:14 +00:00
Narayan Kamath
ab561f5b40 Merge "Don't make isSafeMode a field on the Zygote class." 2014-03-31 12:32:50 +00:00
Narayan Kamath
d1a8d9f452 Don't make isSafeMode a field on the Zygote class. 
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
 2014-03-31 13:16:45 +01:00
Christoph Studer
546bec8ebf Notification usage stats 
First cut of gathering implicit notification signals and computing
running stats.

Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users

Stats are aggregated on user, user+pkg, and getKey() levels.

Current stats are printed as part of 'dumpsys notification'.

Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
 2014-03-31 12:50:13 +02:00
Narayan Kamath
37109819d0 am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:53:35 +00:00
Narayan Kamath
303d666f2e am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:48:27 +00:00
Narayan Kamath
0e3f3c7022 am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" 
* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
  Cast CallMethod's size_t parameters to jint
 2014-03-31 09:41:39 +00:00
Narayan Kamath
91bbb75c75 Merge "Cast CallMethod's size_t parameters to jint" 2014-03-31 09:37:32 +00:00
Xiaofei Wan
21e0af987d Fix RenderScriptGL setSurfaceTexture problem 
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().

Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
 2014-03-31 14:40:08 +08:00
Jinsuk Kim
00bc283453 am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '2e59bd788546e29e48b85bda72da6af61704113d':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:50:56 +00:00
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Wink Saville
562ea3fc7b am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '80b4e09849048a78e08911eff9907cae618eba35':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:23:30 +00:00
Wink Saville
80b4e09849 am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:17:38 +00:00
Wink Saville
44b43a51c7 am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" 
* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue
 2014-03-30 15:11:27 +00:00
Wink Saville
1e4cad8198 Merge "GlobalActions: Fix Airplane Mode on/off issue" 2014-03-30 00:15:22 +00:00
John Reck
0d1f634f4b Add invokeFunctor 
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
 2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9 am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.
 2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
 2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful. 
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
 2014-03-29 01:42:41 +00:00
John Reck
c75db8266b Merge "Remove kStatusInvoke & kStatusDraw" 2014-03-29 01:41:50 +00:00
John Reck
903d6407b0 Merge "Remove DisplayList.java" 2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15 Merge "Update several stale RenderNode variable names" 2014-03-29 01:39:57 +00:00