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

171643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
07a2efce2c am 42d33aa6: am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior." 
* commit '42d33aa635fbe0768b0be44568077874e66e39e0':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:17:47 +00:00
Tim Murray
efc5ceaaa1 am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 
automerge: 54bab10

* commit '54bab10b1facad1ae8ad522b57785f449f3227f9':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:15:08 +00:00
Tim Murray
54bab10b1f am a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 
* commit 'a6bfe6c957739fc172dd97ce4e26d8ec4ee4aa6f':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:10:46 +00:00
Tim Murray
42d33aa635 am 3d00fdf4: Merge "Enable native tracking for RS contexts to improve GC behavior." 
* commit '3d00fdf4cbe9f8fe8363f4ad4fa6c98ae03573ac':
  Enable native tracking for RS contexts to improve GC behavior.
 2014-12-13 00:09:38 +00:00
Tim Murray
a6bfe6c957 Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 2014-12-13 00:03:53 +00:00
Tim Murray
3d00fdf4cb Merge "Enable native tracking for RS contexts to improve GC behavior." 2014-12-13 00:02:31 +00:00
Elliott Hughes
a95b568f9a am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:32:06 +00:00
Elliott Hughes
20c906a8d4 am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit 'a101befbef6a07af0746e3dbcd646d2b69a23492':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:24:37 +00:00
Elliott Hughes
a101befbef Merge "Lose some unnecessary JNI from the zygote." 2014-12-12 23:18:48 +00:00
Bart Sears
2648a66bda am 10fe046c: am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
* commit '10fe046c93324903eea2667dd3ff679930ec997d':
  Tune delivery and batching of alarms
 2014-12-12 22:56:43 +00:00
Bart Sears
10fe046c93 am 1f28a6a5: resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
* commit '1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
  Tune delivery and batching of alarms
 2014-12-12 22:49:43 +00:00
Christopher Tate
75070f2f18 am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
* commit '125579caa1b4fb2de4242b0af3f4749bac9fa699':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:45:34 +00:00
Christopher Tate
125579caa1 am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:37:47 +00:00
Bart Sears
1f28a6a571 resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
 2014-12-12 14:19:57 -08:00
Alan Viverette
81612d80c5 am e260a358: am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit 'e260a358bfc945bf01d901f496b7f30784cbf920':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:11:46 +00:00
Alan Viverette
2e0e2a4407 am 1060d75e: am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '1060d75e3abd37671b0962297f4587dd3d6e0cc8':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:11:40 +00:00
Christopher Tate
012de64e2d Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 2014-12-12 22:11:16 +00:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote. 
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
 2014-12-12 14:07:34 -08:00
Alan Viverette
e260a358bf am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 
* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming
 2014-12-12 22:04:10 +00:00
Alan Viverette
1060d75e3a am 9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 
* commit '9a1b4c29672f7b7a8cfdeedfc2421854439c0af0':
  Move ripple to end state on jump when hardware exit is pending
 2014-12-12 22:04:04 +00:00
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967 Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending 
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
 2014-12-12 13:38:10 -08:00
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 13:30:15 -08:00
Chong Zhang
d7383a8f00 am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'd4bef185a5057904f0e230ac8a2c5866e590094f':
  parse bitrate range for video/audio caps
 2014-12-12 21:02:36 +00:00
Svet Ganov
9b3ab29ffa am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '26c8895465bbc94efb0cc96460e5eabe88382698':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 21:02:30 +00:00
Svet Ganov
1301446c01 am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit 'e608644a9f0fa54a05379c171814569816145801':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 21:02:24 +00:00
Chong Zhang
d4bef185a5 am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'bb177db1fe39f0855f79c15195ae837d87479636':
  parse bitrate range for video/audio caps
 2014-12-12 20:54:49 +00:00
Svet Ganov
26c8895465 am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 20:54:43 +00:00
Svet Ganov
e608644a9f am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
  Fix an edge case in computing click location in accessibility mode.
 2014-12-12 20:54:38 +00:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
7486bc1f5a Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 2014-12-12 20:48:09 +00:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming 
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
 2014-12-12 12:34:15 -08:00
Tim Murray
aefbd5f97c Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 11:34:48 -08:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps 
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
 2014-12-12 11:34:42 -08:00
Kenny Guy
a63b620916 am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
* commit 'dcd42f0fa16802d39245f3ba98a6226bde9a83e6':
  Don't show last used and profile button at same time.
 2014-12-12 18:57:31 +00:00
Tim Kilbourn
d314333341 am d91985cd: am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
* commit 'd91985cd4306ad3d9f422a7392bc8513f6c59e07':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 18:57:25 +00:00
Kenny Guy
dcd42f0fa1 am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev 
* commit '4357d4eabc375c392190cf2d1dfc3aeba9718ceb':
  Don't show last used and profile button at same time.
 2014-12-12 18:50:15 +00:00
Tim Kilbourn
d91985cd43 am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 
* commit '2636ccc1857264a76db8ddaee600f06fadad3c36':
  Revert "Attempt to fix keyguard missing bug"
 2014-12-12 18:50:10 +00:00
Adam Powell
097e3830cd am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:49:37 +00:00
Jason Monk
89b75bdbf6 am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'f8dd5f6a19791fdb6fbe1fc40863c1e8dcf785e6':
  Handle config changes in NetworkController
 2014-12-12 18:49:32 +00:00
Jason Monk
19b6ae0fe8 am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit '106806270c6808c94978ce39e11b7ea73a2cfcf1':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:49:26 +00:00
Kenny Guy
4357d4eabc Merge "Don't show last used and profile button at same time." into lmp-mr1-dev 2014-12-12 18:46:23 +00:00
Tim Kilbourn
2636ccc185 Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 2014-12-12 18:44:19 +00:00
Adam Powell
746079e2ee am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:43:38 +00:00
Jason Monk
f8dd5f6a19 am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController
 2014-12-12 18:43:33 +00:00
Jason Monk
106806270c am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
* commit 'a68697005137c2b5c5feb43b8cac078f7b75ec18':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:43:28 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Jason Monk
a47f968d7e Merge "Handle config changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:40 +00:00