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

156744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail 
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
 2014-11-10 19:32:28 -08:00
xinhe
8161ed8121 Merge "RSSI indicator says that SIMless device has a SIM" into lmp-mr1-dev 2014-11-06 19:50:45 +00:00
Winson Chung
5191861c88 Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 2014-11-06 19:20:59 +00:00
Winson Chung
e0325fe956 Merge "Don't reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 2014-11-06 19:20:56 +00:00
xinhe
8b79fb6065 RSSI indicator says that SIMless device has a SIM 
For dummy case, subId = -1/-2, we need compare the phoneId
Bug:18247106

Change-Id: I310d8b466ef83936e920d3921267241f42c2243f
 2014-11-06 10:57:04 -08:00
ztenghui
786d0a0353 Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 2014-11-06 18:54:49 +00:00
John Reck
9c13b8cfcc Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev 2014-11-06 18:48:17 +00:00
Stuart Scott
c7f1ae8146 Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 2014-11-06 18:25:49 +00:00
John Reck
a35778c799 Yank ResourceCache out of Caches 
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
 2014-11-06 09:45:10 -08:00
Adrian Roos
418f4ed077 Merge "Round charging indication to nearest minute" into lmp-mr1-dev 2014-11-06 16:22:06 +00:00
Selim Cinek
49af6359e0 Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 2014-11-06 16:12:59 +00:00
Selim Cinek
140e3f88fb Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 2014-11-06 16:12:48 +00:00
Selim Cinek
6d7065f50d Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 2014-11-06 16:12:01 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>. 
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
 2014-11-06 08:27:58 +00:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Yuncheol Heo
ff636d383c Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev 2014-11-06 05:47:49 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause 
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
 2014-11-05 21:02:37 -08:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Yuncheol Heo
a95f1a9b89 CEC: Don't send <Feature Abort> on the short message 
Bug: 18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
 2014-11-06 11:27:25 +09:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08: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
Winson Chung
b0a28ea5d3 Don't reload the layout every time we enter Recents. (Bug 18160176) 
Ensure that we don't reinflate new TaskViews whenever we enter Recents by
keeping the existing TaskStackViews active and returning the existing
TaskViews back into the view pool when Recents is no longer visible.

This CL also ensures that we are preloading the appropriate task metadata
when the user first touches the nav bar, and also reverts the change to use
onEnterAnimationComplete() in favor of the explicitly animation-started
broadcast (to ensure we always get the signal) which fixes a regression
with launching Recents in landscape.

Change-Id: I169fea3cf07a6da3f90b32b005819773c6049ada
 2014-11-05 16:39:13 -08: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
8fe7676ee8 Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 2014-11-05 23:10:57 +00:00
Stuart Scott
bc6a9601d7 Fix NPE when parceling SubInfoRecord 
bug:18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
 2014-11-05 15:07:54 -08: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
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
Winson Chung
559e6d34b4 Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581) 
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
 2014-11-05 14:13:55 -08: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
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
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
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
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
d12b69518d Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev 2014-11-05 20:30:30 +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
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
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
John Spurlock
2f9e7f6d8b Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 2014-11-05 19:17:39 +00:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00