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

172212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
cdb72e2392 am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'c2a0d9e54e778338d73c99598dc741eebd58a326':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:47:32 +00:00
Jeff Davidson
fb68a97620 am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'dd40ccf36203c740aea3849f54495d1287d02b2b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:43:10 +00:00
Winson Chung
5284dd8d69 am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit '9128396982233d6af49613231100f1bc4b6c477b':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:42:38 +00:00
Dan Albert
7192db8bb5 Merge "Add a missing visibility modifier to fix build." 2014-11-05 21:42:37 +00:00
John Spurlock
c2a0d9e54e am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '66c46c4a9289a8e21c8f36fe06679be5f6534841':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:40:46 +00:00
Winson Chung
9128396982 Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 2014-11-05 21:39:16 +00:00
Jeff Davidson
dd40ccf362 am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'b42bdef51c5a4de44333ad268f25df1aac5ab880':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:37:34 +00:00
John Spurlock
66c46c4a92 am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit '3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:36:13 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
Rob Tsuk
fd15f47554 Log shader source when it fails to compile 
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
 2014-11-05 13:26:19 -08:00
John Spurlock
3a9321d407 Docs: Fix typo in Preference android:order attribute. 
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
 2014-11-05 21:20:36 +00:00
Rich Slogar
4a6ddf5b64 am c9a5af5a: am aaafc8ec: am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'c9a5af5a5dca4f293c44c0632c3fc4b4042e1c36':
  docs:remove  sdk/ndk note
 2014-11-05 21:11:37 +00:00
Rich Slogar
c9a5af5a5d am aaafc8ec: am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'aaafc8ec6701338246ec945bf861fec8ff56a832':
  docs:remove  sdk/ndk note
 2014-11-05 21:02:46 +00:00
Rich Slogar
aaafc8ec67 am faac8b79: am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'faac8b798359a6065a509dc0b127e887fed5d8a4':
  docs:remove  sdk/ndk note
 2014-11-05 20:56:49 +00:00
Sanket Padawe
1793ced11b am 4f1e5614: am 4960a5bb: Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev automerge: d12b695 
* commit '4f1e56143d4b6cfc82ed5898c37bff34cab2178f':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:53:12 +00:00
Andrew Solovay
b442823288 am cf6e9c22: am 4f0850a1: am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4 
* commit 'cf6e9c2213e0d36a6ab62957e2ac6eb0f3a75dd0':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:53:07 +00:00
Ricardo Cervera
c352037fd0 am ab61116d: am 1ea25753: am 5a57ec02: am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge: b2f0f35 
* commit 'ab61116d58095ae7a80f8a952169fbb23dd14005':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:53:03 +00:00
John Spurlock
4901badeca am 7847a7f8: am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '7847a7f8f4b682e6776439058216796d351cb693':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:52:59 +00:00
Rich Slogar
faac8b7983 am c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit 'c3d174a0304d3be57e485c48783d7c101553c78a':
  docs:remove  sdk/ndk note
 2014-11-05 20:50:03 +00:00
Sanket Padawe
4f1e56143d am 4960a5bb: Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev automerge: d12b695 
* commit '4960a5bb0c93aa49c4303e6e9d30139a4a2e9620':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:44:23 +00:00
Andrew Solovay
cf6e9c2213 am 4f0850a1: am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4 
* commit '4f0850a138f02a9bda405f987a0623fa84da2615':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:44:07 +00:00
Ricardo Cervera
ab61116d58 am 1ea25753: am 5a57ec02: am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge: b2f0f35 
* commit '1ea25753505b5814585a9abbfca6a6113bccc228':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:44:02 +00:00
John Spurlock
7847a7f8f4 am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '6ccb72e9940df9b50a213fa84483ed5da9780cd0':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:43:18 +00:00
Adam Lesinski
1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation
 2014-11-05 20:35:27 +00:00
Sanket Padawe
4960a5bb0c Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 
automerge: d12b695

* commit 'd12b69518daabff3c13482f4b5140020b747b71f':
  Changes related to setting default color for sim in multisim.
 2014-11-05 20:33:37 +00:00
Adam Lesinski
8491c4ead7 Merge "Merge commit 'fb96e54' into manualmerge" into lmp-mr1-dev-plus-aosp 2014-11-05 20:31:20 +00:00
Sanket Padawe
d12b69518d Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 2014-11-05 20:30:30 +00:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Andrew Solovay
4f0850a138 am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4 
* commit 'fbc3bdec7a2a80e8c3f1cdfebaecc6dba82c9cc6':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:26:24 +00:00
Ricardo Cervera
1ea2575350 am 5a57ec02: am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs automerge: b2f0f35 
* commit '5a57ec024ffb14bbbf8dfdd5215b4a08c33ea97d':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:26:20 +00:00
Andrew Solovay
fbc3bdec7a am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:22:24 +00:00
Dan Albert
a2e5edd08f am be3ac2a8: am 59701b9b: resolved conflicts for merge of 97014933 to stage-aosp-master 
* commit 'be3ac2a80b3607220a118abeb2dd0678f722af2c':
  Fix a wonderful copy/paste time bomb.
 2014-11-05 20:21:44 +00:00
Ricardo Cervera
5a57ec024f am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 
automerge: b2f0f35

* commit 'b2f0f3514c20b478655e4c3f192a98cfea2335ce':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:21:03 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
 2014-11-05 12:20:49 -08:00
Rich Slogar
c3d174a030 am 848d9125: am 1afa82dc: docs:remove sdk/ndk note 
* commit '848d912505079cc3cbd362a4333f0eabfac3c1c5':
  docs:remove  sdk/ndk note
 2014-11-05 20:17:55 +00:00
Craig Mautner
80fd257094 am b3d26022: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 automerge: a72b222 
* commit 'b3d260222fd003c8b537bb9f86625a200bd0f999':
  When keyguard exits use same anim for all windows
 2014-11-05 20:15:51 +00:00
Paul Jensen
66d03ca8c6 am a21622df: am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev automerge: 6ad91cb 
* commit 'a21622df7e1368e7321059a5f5047d2011fd71e5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:15:46 +00:00
Dan Sandler
a026f47494 am c45d74f8: am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev automerge: 125fb86 
* commit 'c45d74f81283af6ffaa7e6fde1194e733f00b0f2':
  Materialize default app icon.
 2014-11-05 20:15:41 +00:00
Ricardo Cervera
4739e17052 am 85ba0d92: am 0f288c6a: am caecc4ae: am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21 
* commit '85ba0d929f4cd6651e5a288d5840b4ee5854e147':
  docs: Add instructions to attach debugger to a running process.
 2014-11-05 20:15:37 +00:00
Bryce Lee
35896c530d am 4947ff46: am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '4947ff462795ae9927b98fa2346634af5bbbf7c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 20:15:32 +00:00
Daniel Sandler
c053e41d02 am 8d37f7c1: am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev 
* commit '8d37f7c1b28c4e82b3bc961d183c313db16d8333':
  More flexible intent extra parsing.
 2014-11-05 20:15:27 +00:00
Rich Slogar
848d912505 am 1afa82dc: docs:remove sdk/ndk note 
* commit '1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
  docs:remove  sdk/ndk note
 2014-11-05 20:13:35 +00:00
Dan Albert
be3ac2a80b am 59701b9b: resolved conflicts for merge of 97014933 to stage-aosp-master 
* commit '59701b9ba5c453e327bc0e6873a9f6ff87a10391':
  Fix a wonderful copy/paste time bomb.
 2014-11-05 20:11:53 +00:00
Craig Mautner
b3d260222f Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 
automerge: a72b222

* commit 'a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c':
  When keyguard exits use same anim for all windows
 2014-11-05 20:01:56 +00:00
Paul Jensen
a21622df7e am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
automerge: 6ad91cb

* commit '6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:00:46 +00:00
Dan Sandler
c45d74f812 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
automerge: 125fb86

* commit '125fb86ee0cc0e49d6847bed7a76829ad87c1312':
  Materialize default app icon.
 2014-11-05 19:59:19 +00:00
John Spurlock
6ccb72e994 Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 
automerge: 2f9e7f6

* commit '2f9e7f6d8b6716f0fcc7db9ef797667ebda8a813':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 19:32:54 +00:00
Adam Lesinski
fb96e54ba8 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 
automerge: 69ecfa9

* commit '69ecfa903492b502b7b1636345e050b57313c251':
  Add error checking to aapt for split generation
 2014-11-05 19:31:22 +00:00
Craig Mautner
a72b2228c2 Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 
automerge: 3f36ba6

* commit '3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
  When keyguard exits use same anim for all windows
 2014-11-05 19:30:19 +00:00
Dan Albert
59701b9ba5 resolved conflicts for merge of 97014933 to stage-aosp-master 
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
 2014-11-05 11:29:34 -08:00