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

163334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
cf456e3c22 Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 2014-09-19 23:26:18 +00:00
Dianne Hackborn
cfb67ee40c Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 2014-09-19 23:24:19 +00:00
Dianne Hackborn
0ed82e2c21 Work on issue #17381033: Program icon and shortcut disappear after... 
...running monkey test overnight [FACTORY ROM BLOCKER]

Add surface tracing to debug output.

Change-Id: I65f7fc90c51b0805f7e0090141c33d6b60ccb3b4
 2014-09-19 16:22:50 -07:00
Alan Viverette
4828d7afed am a59a64e7: am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'a59a64e7b890e0683592479ec4d985f383792c54':
  Update theme colors for better contrast and de-blueing
 2014-09-19 23:18:55 +00:00
Elliott Hughes
69eb21074f am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '4fec1b488759a89732af151e21a89aa6693ba9bf':
  Use constants instead of resources for ellipsis.
 2014-09-19 23:16:52 +00:00
Christopher Tate
9564b1d2f7 am 9c236001: am a739f0df: Logspam is spam 
* commit '9c23600139f0b410cd85d6495da2fe92c4def17f':
  Logspam is spam
 2014-09-19 23:16:32 +00:00
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
 2014-09-19 16:13:49 -07:00
Amit Mahajan
c2492e19ea Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 2014-09-19 23:12:58 +00:00
Hui Wang
4b57b991ac Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable 
Bug: 17567651, 16308209
Change-Id: Ie164b16b70429d5815e9bef5f8c5489f6e49de36
 2014-09-19 23:11:58 +00:00
Christopher Tate
b9da579818 am a739f0df: Logspam is spam 
* commit 'a739f0df4e63856b30a653f61a0a296fc6148688':
  Logspam is spam
 2014-09-19 23:06:00 +00:00
Chris Craik
9fa364dc72 Account for alpha in hasShadow() 
bug:17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
 2014-09-19 16:04:45 -07:00
Alan Viverette
0e3b5a7986 am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
  Correctly apply max width/height to preference icons
 2014-09-19 23:03:56 +00:00
Alan Viverette
cc3d6afbf9 am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'c53cce28e59fe38525770e06f42244a4bd33a2a0':
  Update theme colors for better contrast and de-blueing
 2014-09-19 23:03:35 +00:00
Alan Viverette
fd6f5bb3a0 am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit 'b55ced8402d28591d324317f1ddcb2db95ea7cb8':
  Correctly apply max width/height to preference icons
 2014-09-19 22:53:24 +00:00
Alan Viverette
3a0caadbf9 am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit '38321d617c25ccc7fe5e9da611d2bc7259016d8c':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:51:28 +00:00
Dan Albert
5648b12da1 resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp 
Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694
 2014-09-19 15:50:13 -07:00
Christopher Tate
eae9216770 Logspam is spam 
This turns out to happen a lot in normal usage, but we're logging
copiously about it each time.  It's reporting "oh hey we're already
in this state" -- and so the log is not useful anyway.

Logspam is spam.

Bug 15169507

Change-Id: Ie2d01ff1b0b3600dd9c15ccf83d60875558f1dc2
 2014-09-19 22:49:20 +00:00
Alan Viverette
4d5e9fc39d am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '13527b41ba5613cf2861782aafa3b2fd3299bcf2':
  Correctly apply max width/height to preference icons
 2014-09-19 22:38:34 +00:00
Alan Viverette
9ad4d87a53 am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:38:26 +00:00
Alan Viverette
edcb2d0e89 Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 2014-09-19 22:28:08 +00:00
Ian Rogers
e9b6cb8058 am ad64befd: am 296a712e: Merge "Make a field final." 
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.
 2014-09-19 22:27:36 +00:00
Alan Viverette
2300412761 am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons
 2014-09-19 22:27:16 +00:00
Svetoslav
86d07089e6 am b38e8d02: am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit 'b38e8d02bc75eb13f9cb78bea6ae6102f594b587':
  Keep existing API behavior that regressed.
 2014-09-19 22:26:25 +00:00
Dianne Hackborn
5f950269ce am 7e3752e6: am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '7e3752e6f54955de8084dc9f320483f79fbc88a4':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:26:20 +00:00
Svetoslav
52dc625669 am e5350332: am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit 'e535033270273ce07384647c99828ab11a5564d0':
  Fix a print spooler crash when printing.
 2014-09-19 22:26:14 +00:00
Alan Viverette
daf8588275 Merge "Correctly apply max width/height to preference icons" into lmp-dev 2014-09-19 22:19:02 +00:00
Alan Viverette
0fa3c1c656 Update theme colors for better contrast and de-blueing 
BUG: 17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
 2014-09-19 22:17:45 +00:00
Svetoslav
9430598f91 am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit 'f2345ebce31740d9fca90c46a9ffb103d723a31f':
  Keep existing API behavior that regressed.
 2014-09-19 22:14:55 +00:00
Dianne Hackborn
1aab9db175 am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '24a306c5f9431535fd019a7a59d2dc6a76050501':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:14:51 +00:00
Elliott Hughes
4fec1b4887 am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
  Use constants instead of resources for ellipsis.
 2014-09-19 22:14:48 +00:00
Svetoslav
06be8ab63c am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit '63f3936c8d6e4dee8027b09d031d6f77482e6610':
  Fix a print spooler crash when printing.
 2014-09-19 22:14:47 +00:00
Dan Albert
1a4527ce94 am 799812cd: Merge "Clean up makefile cruft." 
* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
  Clean up makefile cruft.
 2014-09-19 22:14:42 +00:00
Dan Albert
8791ebf0cd am bcaaebb8: Merge "Clean up test makefiles." 
* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
  Clean up test makefiles.
 2014-09-19 22:14:38 +00:00
Ian Rogers
ad64befd25 am 296a712e: Merge "Make a field final." 
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
  Make a field final.
 2014-09-19 22:14:33 +00:00
Dianne Hackborn
0fe3c25658 Fix issue #17574819: Chrome browser process is killed in background... 
...due to dying renderer process

Don't kill processes if they are bound to a service but not impacting
oom adjustment.

Change-Id: I1cc44e633feaeaad6e996b79a6cfd7b386c04095
 2014-09-19 15:09:39 -07:00
Svetoslav
479ab3b575 am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '61052dec7d76a6ab0a39d2471cea8d9205062a0e':
  Keep existing API behavior that regressed.
 2014-09-19 22:05:06 +00:00
Dianne Hackborn
3acb494257 am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '3052e6ed7d13265378dccdd4b0de2e0e31d9675b':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:05:02 +00:00
Svetoslav
cfcce6bddd am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit '0d397697d0df2b08f5aa0b0e27108e79ea04f764':
  Fix a print spooler crash when printing.
 2014-09-19 22:04:58 +00:00
Elliott Hughes
600ca140e2 Merge "Use constants instead of resources for ellipsis." 2014-09-19 22:02:45 +00:00
Igor Viarheichyk
ed0daa93e4 Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2014-09-19 22:02:08 +00:00
Svetoslav
129ffeb37c am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
  Keep existing API behavior that regressed.
 2014-09-19 21:49:31 +00:00
Dianne Hackborn
662b13b982 am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit 'cb2775a7f11575b355cf8913b15c37f4b8924f79':
  Add new activity dumpsys command to persist all data.
 2014-09-19 21:49:26 +00:00
Svetoslav
518b9dd923 am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit 'a2201272b5b27f3ac9cf90d6332e81fb474c1dbb':
  Fix a print spooler crash when printing.
 2014-09-19 21:49:22 +00:00
George Mount
02c377e139 am 6ba1531e: am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '6ba1531e66ca6c483ef762339513e1086cbdf76d':
  Target only shared elements with shared element Transition
 2014-09-19 21:47:50 +00:00
Jeff Sharkey
f05822e21a am db6c7541: am 84dc7b17: am 4e6d1f66: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev 
* commit 'db6c754149e1c28652a58f3f09327385b936b491':
  Fix bugs when system apps reclaim permissions.
 2014-09-19 21:47:46 +00:00
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +00:00
Dianne Hackborn
79572afb33 Merge "Add new activity dumpsys command to persist all data." into lmp-dev 2014-09-19 21:41:39 +00:00
Svetoslav
451bf37362 Merge "Fix a print spooler crash when printing." into lmp-dev 2014-09-19 21:41:12 +00:00
George Mount
6de4a2aa79 am 42ea88bb: am 0e24bcbb: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '42ea88bb2e1543e114bd8b7773d6ffaf41e0617b':
  Target only shared elements with shared element Transition
 2014-09-19 21:36:01 +00:00
Jeff Sharkey
36e807edf2 am 84dc7b17: am 4e6d1f66: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev 
* commit '84dc7b1752f5d25ba0084371005aac2ad535e0ed':
  Fix bugs when system apps reclaim permissions.
 2014-09-19 21:35:57 +00:00