Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,851 Commits 3 Branches 0 Tags
40385cdc9122cb6aaeb77546256cde1e30fcfbca
Commit Graph

47499 Commits

Author SHA1 Message Date
Alan Viverette
fe3f4c811b am 8eb4bf60: am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '8eb4bf6017a34309c90427b1da6cb5f21538946a':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:37:10 +00:00
Alan Viverette
8eb4bf6017 am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '7213a52c42e5dd176b30f01c274f36c63e32718e':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:32:38 +00:00
Alan Viverette
82aaf332b6 Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 2014-11-10 17:18:49 +00:00
Andres Morales
e4aa7e7793 am 9e19c118: am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 
* commit '9e19c118a140518859563ba81b691c6998e5084c':
  Unhide DISALLOW_OUTGOING_BEAM
 2014-11-10 17:05:20 +00:00
Andres Morales
9e19c118a1 am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
  Unhide DISALLOW_OUTGOING_BEAM
 2014-11-10 16:58:53 +00:00
Andres Morales
cc8d56f66c Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 2014-11-10 16:48:45 +00:00
Pete Gast
2f6cd6489f am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
  Expand WearableExtender to customize labels.
 2014-11-10 16:48:29 +00:00
Pete Gast
2ad988aa6e am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '642b4d93b9ce73866d7985172d31661a55aed7be':
  Expand WearableExtender to customize labels.
 2014-11-10 16:45:02 +00:00
Pete Gast
705c9c131a Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 2014-11-10 16:35:57 +00:00
George Mount
92de9c1d7e am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 
automerge: 47b4cf3

* commit '47b4cf3ac488af5b40cca819089905df98e17ab1':
  Allow PathMotion to affect translations in ChangeTransform.
 2014-11-10 15:36:28 +00:00
George Mount
47b4cf3ac4 am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 
* commit '98b4cbf21b0be8a17d006b1b0ddad45510c7a7bf':
  Allow PathMotion to affect translations in ChangeTransform.
 2014-11-10 15:33:40 +00:00
George Mount
8f7d3715c5 Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 2014-11-10 15:25:10 +00:00
Alexandra Gherghina
0695ba054e am 40345df2: am e5332972: am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 
* commit '40345df2768f61d7f5e8e93e1d3b67e32c129498':
  Clarify documentation for DevicePolicyManager
 2014-11-10 14:36:14 +00:00
Alexandra Gherghina
40345df276 am e5332972: am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 
* commit 'e5332972119319c747976f0e7dbee6388295b937':
  Clarify documentation for DevicePolicyManager
 2014-11-10 14:30:14 +00:00
Alexandra Gherghina
541afcd0b7 Clarify documentation for DevicePolicyManager 
Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
 2014-11-10 10:22:47 +00:00
Adam Powell
c6ff9ab808 am 3e03e8b2: am 61effdd2: am e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev 
* commit '3e03e8b20b4c49658921e10c974015e24408e81c':
  Don't register more receivers and observers for every DateTimeView
 2014-11-09 19:31:26 +00:00
Adam Powell
3e03e8b20b am 61effdd2: am e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev 
* commit '61effdd2c2c945504fd788ee0dce5ccc5d57e66b':
  Don't register more receivers and observers for every DateTimeView
 2014-11-09 19:27:31 +00:00
Adam Powell
e5a6f82139 Merge "Don't register more receivers and observers for every DateTimeView" into lmp-mr1-dev 2014-11-09 19:18:54 +00:00
Jim Miller
88e2c6149f am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
automerge: 481fc74

* commit '481fc7427b419efb98428f27c5b0e252183ff315':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:56:45 +00:00
Jim Miller
481fc7427b am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
* commit 'c6a042401a740b360790f71884b66fd3a2a09447':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:45:08 +00:00
Mike Lockwood
7c2b60ed37 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5 
automerge: 5a880e72

* commit '5a880e72024882d1a4ad5a04a4cb4a6aa5e6d426':
  Add dumpsys support for bluetooth
 2014-11-08 03:09:13 +00:00
Amith Yamasani
78673cc6aa am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
automerge: 2a21f24

* commit '2a21f247885780d90873bb25aa7c7f710e4bffcc':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 03:05:45 +00:00
Mike Lockwood
5a880e7202 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5 
* commit 'd73463c61a9ada1083155214be15ba3c653b73f5':
  Add dumpsys support for bluetooth
 2014-11-08 03:00:35 +00:00
Amith Yamasani
2a21f24788 am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
* commit '1aeab291764b77ffa2c6e6eb28441beec6fa041c':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 02:59:55 +00:00
Jim Miller
529206907f Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev 2014-11-08 02:37:17 +00:00
Mike Lockwood
95c05a590f Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev 2014-11-08 02:15:28 +00:00
Amith Yamasani
395b519f4b Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev 2014-11-08 01:39:12 +00:00
Jim Miller
0814d41c73 Change Configure structure to List<PersistableBundle> 
Adding the new structure was making it difficult for
LMP devices to have common source with upcoming API version.

Fixes bug 17008504

Change-Id: I704503cf0ebff113874c87ab11e37735dbe7b8d7
 2014-11-07 17:18:37 -08: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
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
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
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
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
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
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +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
ce8c358712 Update above/below backgrounds in PopupWindow.setBackground() 
BUG: 17718714
Change-Id: I936dfede60bc006a59cd3eb1b18548c7702ae0ee
 2014-11-07 13:19:38 -08:00
John Reck
28b73f7743 am 692135ef: am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '692135effb19df4da42ab8070ebdb29479bd9df0':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:45:45 +00:00
John Reck
692135effb am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '76adcd6ec551637f57f2630a60f6cdb2bbbf908b':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:41:08 +00:00
Jason Monk
0aee5a9b80 am 81f5fa74: am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '81f5fa7422c8c531702427f508df3c069baf8c7e':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:33:30 +00:00
John Reck
ea4e76f68a Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 2014-11-07 19:29:47 +00:00
John Reck
65f2defdfc resolve merge conflicts of cabf8a7 to master. 
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
 2014-11-07 11:29:08 -08:00