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

158462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
438eaf0015 am e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 
* commit 'e0325fe956c2a33b79added92f0e53be2246506a':
  Don't reload the layout every time we enter Recents. (Bug 18160176)
 2014-11-06 19:26:11 +00:00
ztenghui
9b14422a50 am 786d0a03: Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 
* commit '786d0a0353cdbd335b50c6b560073d8d21ec2ee8':
  VD:test:Remove open animation AVD
 2014-11-06 19:25:46 +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
John Reck
327cb3184d Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev 
automerge: 9c13b8c

* commit '9c13b8cfcc6e1d8b422488596538bd8b1f38df57':
  Yank ResourceCache out of Caches
 2014-11-06 18:55:00 +00:00
ztenghui
786d0a0353 Merge "VD:test:Remove open animation AVD" into lmp-mr1-dev 2014-11-06 18:54:49 +00:00
Stuart Scott
a6fc3b1a4b Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 
automerge: c7f1ae8

* commit 'c7f1ae8146d3f4bb9e8e1c0e58543379b854060e':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 18:52:29 +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
b2a6c7b83f am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit '418f4ed077ee0559e7f61b8ea10d53e9784fd631':
  Round charging indication to nearest minute
 2014-11-06 16:26:12 +00: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
fc22dd58c9 am 49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 
* commit '49af6359e04095fa71162c7658f10cf93c94d341':
  Adapted HUN behavior when swiping vertically
 2014-11-06 16:15:54 +00:00
Selim Cinek
8f6719a15d am 140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 
* commit '140e3f88fbd176530f89b3f5f4a29b2a77b97bac':
  Fixed a bug where the HUNs were not clickable
 2014-11-06 16:15:49 +00:00
Selim Cinek
832607e448 am 6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 
* commit '6d7065f50d1e65707f7decc3f56042f808d5488f':
  Fixed a bug that the notifications were not animating when reset
 2014-11-06 16:15:43 +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
ea728d75eb Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev 
automerge: b9744c1

* commit 'b9744c1c1f5e8cc936da7f1832665f77ad5bb18f':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 10:22:13 +00:00
Yuncheol Heo
9188df6ef0 CEC: Allow no parameters with <System Audio Mode Request>. 
automerge: 0361147

* commit '03611473bc1d13f8e55ac92e37a9716c2fd8e412':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 10:21:09 +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
8fafe7b454 am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'db66e1d2b9b63eb1612820dc6572de1e42880646':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:17:54 +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
d87c32aa85 am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'ff636d383c8f0464e543866ae73ec4a367efd15a':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:53:31 +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
6230cdf572 am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '262dc4dafede871712d89f35d630ab2a332ee6cb':
  Update TrustAgentService API after review
 2014-11-06 02:57:39 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
mike dooley
6b93e2b026 am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '8355c500ea6f809ef2e6885aee673d39f1cb223b':
  Adding method to get disconnect cause from conference
 2014-11-06 02:48:58 +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
e7f66ada24 am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit 'fc4e6f70f64676ab375c3e233b6c07e3bc56cb64':
  Add missing secure stop methods
 2014-11-06 02:39:11 +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
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
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
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
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
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
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
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
Eric Laurent
e43bf0821b Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 2014-11-05 22:02:54 +00:00