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

172192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
83bdea71c9 am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
automerge: f680c84

* commit 'f680c8434a737873c98231f6d9863e71c43a6783':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 02:09:10 +00:00
Jeff Davidson
f680c8434a am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
* commit '63226dd8f3570bd3b28e4241668843385ba99c2d':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:48:45 +00:00
Jeff Davidson
63226dd8f3 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 
automerge: 24f535b

* commit '24f535b87341b8729d6d4235acc51f0e87916d3a':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:32:55 +00:00
Jeff Davidson
24f535b873 Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev 2014-11-06 01:25:04 +00:00
Robert Greenwalt
ed9fb4a122 am c47a9127: am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'c47a91273c42a2ebd9f6e154d99dcdc51a185609':
  Fix Legacy typing of net-specific requests.
 2014-11-06 00:12:52 +00:00
Jeff Davidson
e40ea96f97 am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit 'a45e98974e571ca539436b295a98d513faa10d19':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-06 00:12:44 +00:00
George Mount
ac418e07f7 am a3fdc18f: am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'a3fdc18fd7a8191d7452e63823d7c4589dd5c894':
  Cancel animation when target changes.
 2014-11-06 00:12:39 +00:00
Robert Greenwalt
c47a91273c am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit 'a4f34eddb3b46a81ce90a9eded54b35b62e40337':
  Fix Legacy typing of net-specific requests.
 2014-11-05 23:45:03 +00:00
Robert Greenwalt
a4f34eddb3 am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 
* commit '7efdb83ceeea3dc916f8a05f59f7b35cb8d13597':
  Fix Legacy typing of net-specific requests.
 2014-11-05 23:40:35 +00:00
Robert Greenwalt
7efdb83cee Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev 2014-11-05 23:36:01 +00:00
Jeff Davidson
a45e98974e am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-05 23:19:44 +00:00
George Mount
a3fdc18fd7 am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'aa6270375263ebf6da4f2f0de31df808eb278563':
  Cancel animation when target changes.
 2014-11-05 23:15:00 +00:00
Jeff Davidson
8cae7f644c am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit '8fe7676ee80019b3efc3369f9c9d9631047d58ef':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-05 23:14:26 +00:00
Jeff Davidson
8fe7676ee8 Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 2014-11-05 23:10:57 +00:00
George Mount
aa62703752 am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev 
* commit 'c838b677749e0c20fc201b0418864be3835711b8':
  Cancel animation when target changes.
 2014-11-05 23:08:24 +00:00
Robert Greenwalt
06314e4eab Fix Legacy typing of net-specific requests. 
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not.  Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
 2014-11-05 15:06:20 -08:00
George Mount
c838b67774 Merge "Cancel animation when target changes." into lmp-mr1-dev 2014-11-05 23:04:18 +00:00
Rob Tsuk
dfd0099ce5 am fce461ea: am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'fce461eada9f0f03cd30e3a5fcb60072d589049a':
  Log shader source when it fails to compile
 2014-11-05 22:35:46 +00:00
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