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

172227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Tsuk
fce461eada am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'db6a1358d45430a952aa746f8dfd452d12d7e4be':
  Log shader source when it fails to compile
 2014-11-05 22:31:05 +00:00
Rob Tsuk
db6a1358d4 am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit '6c96cbf581bf97b034e4c65eabe3c0fe8d930bfa':
  Log shader source when it fails to compile
 2014-11-05 22:26:11 +00:00
Jeff Davidson
e56f2bb5ec Allow apps with SCORE_NETWORKS to set the active scorer. 
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.

Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
 2014-11-05 14:25:20 -08:00
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Eric Laurent
bf5d162b91 am c3a61d98: am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit 'c3a61d98387507ed0c24e54f9e056014e23d9d7a':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:15:50 +00:00
Eric Laurent
c3a61d9838 am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit '29218f24719490e26ba41db2875d54853866e39f':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:10:20 +00:00
Eric Laurent
29218f2471 am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit 'e43bf0821b41b135892001ad89518eb08d67bcd4':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:06:23 +00:00
John Spurlock
af4918a661 am f5c825d1: am f97f8304: am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'f5c825d12d1898462a16bc734c2d182ea724388b':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 22:05:43 +00:00
Eric Laurent
e43bf0821b Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 2014-11-05 22:02:54 +00:00
John Spurlock
f5c825d12d am f97f8304: am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'f97f83046745bfc988f2fc5b6549e7c93ffd35c9':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 22:01:24 +00:00
Winson Chung
2da3e70008 am f4b1c8d7: am 5284dd8d: am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit 'f4b1c8d7caa33124daa355b8adce6feba1224f6a':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:56:57 +00:00
John Spurlock
f97f830467 am cdb72e23: am c2a0d9e5: am 66c46c4a: am 3a9321d4: Docs: Fix typo in Preference android:order attribute. 
* commit 'cdb72e2392e76da341496d073c601d04b030c990':
  Docs: Fix typo in Preference android:order attribute.
 2014-11-05 21:55:40 +00:00
Winson Chung
f4b1c8d7ca am 5284dd8d: am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit '5284dd8d6933156ee785d3270754cc6671252625':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:51:38 +00:00
Jeff Davidson
3527aa01cd am fb68a976: am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'fb68a9762087a262146eec5d0e0d3fbdbdf25b6b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:48:16 +00:00
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