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

172736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart Scott
0e58219f7f am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit '90cf41c35f5a4c82cd1e992498bcd9b30ad92446':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:15:51 +00:00
Stuart Scott
90cf41c35f Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 2014-11-08 00:09:16 +00:00
Stuart Scott
ab45ec177a SubInfoRecord provides a tinted icon with the initial embossed. 
bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
 2014-11-07 23:53:39 +00:00
Amith Yamasani
83b6ef01a0 Inform PendingIntent sender if broadcast was not queued. 
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.

This is a potential fix for:
Bug: 18290018

Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
 2014-11-07 15:34:04 -08:00
Andreas Gampe
1c0668a3f8 am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw
 2014-11-07 23:17:40 +00:00
Jeff Sharkey
560893ce53 am 284ab646: am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit '284ab646d879dcca4bcc287b26e8c50abc56666d':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:17:36 +00:00
Andreas Gampe
83892ecb5c Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-07 23:15:30 +00:00
Andreas Gampe
dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp 
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
 2014-11-07 15:14:02 -08:00
Jeff Sharkey
284ab646d8 am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit 'f13fe14853ca13830e2bf293f3a24a965570b507':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:13:41 +00:00
Christopher Tate
be98cdce1c am b63fd56b: am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'b63fd56b396dab177959ee33fe41ff40ff5c3c7f':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:13:29 +00:00
Christopher Tate
b63fd56b39 am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'e5205d1ae491a97197d12fc2bc5afe1a449cf75d':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:08:49 +00:00
Jeff Sharkey
f13fe14853 am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit '001b2e93030b06774e6af304157637c1acb94226':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:08:07 +00:00
Christopher Tate
e5205d1ae4 am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit '48a7c3b522625ffbecb0cce7b95be6d41631577b':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:03:21 +00:00
Jeff Sharkey
001b2e9303 Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 2014-11-07 23:03:12 +00:00
John Reck
e19093cad8 am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
  Have an actual fallback if the surface is lost
 2014-11-07 23:01:00 +00:00
Christopher Tate
48a7c3b522 Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 2014-11-07 23:00:24 +00:00
Adam Powell
740da4753a Don't register more receivers and observers for every DateTimeView 
SystemUI uses several of these per notification, so be a little more
conservative and track individual views to update per process instead.

Bug 16902706

Change-Id: Ib77a8e7727d027cae39d5e6f431cac1d1ff8a121
 2014-11-07 14:56:43 -08:00
Andreas Gampe
09f5ca4eb6 am 9a0aa553: am e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds" 
* commit '9a0aa553ad9f6657cbbf0a182566c481e191e6b7':
  Frameworks/base: Turn on -Wall -Werror in cmds
 2014-11-07 22:56:43 +00:00
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
 2014-11-07 22:55:32 +00:00
Jeff Sharkey
ccce016fb1 ProcessCpuTracker touching proc is fine. 
Otherwise we spew hundreds of StrictMode violations.

Bug: 18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
 2014-11-07 14:55:17 -08:00
Andreas Gampe
9a0aa553ad am e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds" 
* commit 'e80c01e8d124c69ca60fc8e7a0ca7001be3796e0':
  Frameworks/base: Turn on -Wall -Werror in cmds
 2014-11-07 22:49:44 +00:00
John Reck
8dda03a086 am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2':
  Have an actual fallback if the surface is lost
 2014-11-07 22:45:33 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
Sander Alewijnse
c4ba217474 am 1b0dbd5c: am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:39:38 +00:00
Sander Alewijnse
1b0dbd5c95 am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:35:51 +00:00
Andreas Gampe
487ae9b8dc Merge "Frameworks/base: Wall Werror in libs/androidfw" 2014-11-07 22:35:42 +00:00
Andreas Gampe
e80c01e8d1 Merge "Frameworks/base: Turn on -Wall -Werror in cmds" 2014-11-07 22:35:32 +00:00
Andreas Gampe
cfedceb8c1 Frameworks/base: Turn on -Wall -Werror in cmds 
Fix small warnings, turn on -Wall -Werror.

Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
 2014-11-07 14:33:51 -08:00
Sander Alewijnse
8c1cd7e61f am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '3eed90f39301089a1c16d6e2c0d027b187567cf0':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:30:50 +00:00
Alan Viverette
75d1cbd71b am e37c761e: am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'e37c761e5e850aebb3be56a2eadaa85cc2134547':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:27:24 +00:00
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +00:00
Alan Viverette
e37c761e5e am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'c30a7623a2f97ce791ed019d7014b842f9c9b7d2':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:20:09 +00:00
Sander Alewijnse
53d63dcd04 Added the restrictions pending application restrictions key. 
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
 2014-11-07 22:19:48 +00:00
Alan Viverette
c30a7623a2 am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit '48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:14:45 +00:00
Alan Viverette
48c8cd06aa Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 2014-11-07 22:09:44 +00:00
John Reck
b23a1b1967 am 0e7c13a1: (-s ours) am 413a6812: am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '0e7c13a143ceec3f84e50b0a89ad0399345f9b2a':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 22:08:43 +00:00
Jason Monk
8dd6f7af9a am ef845286: am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'ef845286e0f0af4155599376a628e904f9ac3bd2':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 22:04:04 +00:00
John Reck
0e7c13a143 am 413a6812: am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '413a68127a7dd1c422e142cbd0e9157c99623de3':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 22:01:02 +00:00
Jason Monk
ef845286e0 am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'e2038151c2a3410a67edc408a1d677b05cda41ec':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:55:37 +00:00
John Reck
413a68127a am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '4734b67dc56950f93da385d3d59b06b0058cf33b':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:52:08 +00:00
John Reck
4734b67dc5 am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '050a8a050de04bd0098cde8fdf665a7202929ee0':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:47:42 +00:00
Andreas Gampe
2204f0bf56 Frameworks/base: Wall Werror in libs/androidfw 
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.

Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
 2014-11-07 13:35:05 -08:00
John Reck
050a8a050d DO NOT MERGE Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit c298f9c9170b9e8721cfb616f784ec22734f22f4)
 2014-11-07 21:33:40 +00:00
Jason Monk
e2038151c2 am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit '872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:29:45 +00:00
Jason Monk
872d4e00ed Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 2014-11-07 21:26:40 +00:00
Tyler Gunn
5fe5179d94 am 5c43813b: am 3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge: af7dfdd 
* commit '5c43813bb26c241e753f36126edfa7e6c73598a5':
  Conference event package performance improvement.
 2014-11-07 21:21:20 +00:00
John Spurlock
64b15265fa am aa1f9804: am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'aa1f9804b43a3590ed845c5606a9f4e9f977b317':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:21:16 +00:00
John Spurlock
bc3c32e2c2 am 41cf9241: am 1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge: e586ab7 
* commit '41cf924137feb7be16f93d5f2701f2af2a74fade':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 21:21:04 +00:00
Tyler Gunn
5c43813bb2 am 3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge: af7dfdd 
* commit '3f5a43b2d3e7b233cda4d6d15cf014689862cf21':
  Conference event package performance improvement.
 2014-11-07 21:14:25 +00:00
John Spurlock
aa1f9804b4 am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'd8367c24f76f0464701228fafe630f8abfbc91da':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:14:19 +00:00