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

153269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
4d54d7f4cd am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit 'ef908af6ba2fe85b244e02a16936b53acdf2931f':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:22:39 +00:00
Tyler Gunn
5ca43a9a0c am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit '5cc214b6c7294df1d0f030ced977e51768eec589':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 18:22:34 +00:00
John Reck
2d72dd2e3e Merge "Have destroy call freePrefetchedLayers" into lmp-dev 2014-09-03 18:18:31 +00:00
Tsuwei Chen
721153d388 am b73f77cd: am 09e97495: Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 
* commit 'b73f77cdca6dccf89cfa7a878e59c8528893cae7':
  Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7
 2014-09-03 18:14:36 +00:00
Christoph Studer
50f33e5716 am df3b9134: am ccf36a07: Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 
* commit 'df3b91348bbe6aac1037be2f861a4c59d93674b3':
  SysUI: Suppress HUNs from non-profile users
 2014-09-03 18:14:31 +00:00
Matthew Williams
61dd95f7ba am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '3e3a7489f074b5f2234d32499cdf229da6562d46':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:14:26 +00:00
John Reck
17035b0211 Have destroy call freePrefetchedLayers 
Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
 2014-09-03 11:13:53 -07:00
Tyler Gunn
65bd3eaad6 Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 2014-09-03 18:12:58 +00:00
Nick Kralevich
01168beebc am 7f534190: am 3d4cfc04: Merge "SELinuxMMAC unit tests" 
* commit '7f534190d629ac21adce0b3f3f74597e63cd3238':
  SELinuxMMAC unit tests
 2014-09-03 18:08:31 +00:00
Tsuwei Chen
65d52cec51 am 09e97495: Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 
* commit '09e97495ff236ce01f46ba9291048e01b27a27ea':
  Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7
 2014-09-03 18:02:44 +00:00
Christoph Studer
dfee554fbc am ccf36a07: Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 
* commit 'ccf36a07417ba51d4bfa04edd2138dadadfe4923':
  SysUI: Suppress HUNs from non-profile users
 2014-09-03 18:02:38 +00:00
Matthew Williams
a9577a8f0e am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit 'f390c6ac2f65573e863fb563ded7ecdb3e839be4':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:02:33 +00:00
Jason Monk
37a5bd8be8 am 874fff78: am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev 
* commit '874fff781a60f77b7df030d932c4fb340086368d':
  Add lock task checking to moving tasks to back
 2014-09-03 18:01:30 +00:00
Nick Kralevich
7f534190d6 am 3d4cfc04: Merge "SELinuxMMAC unit tests" 
* commit '3d4cfc04a7bc882d534a49dfb475180907fcf842':
  SELinuxMMAC unit tests
 2014-09-03 18:01:15 +00:00
Tsuwei Chen
897b59e394 Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 2014-09-03 17:53:51 +00:00
Christoph Studer
6ca2e49f1b Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 2014-09-03 17:52:56 +00:00
Jason Monk
bd28d8ff72 am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev 
* commit 'b0b16c1e5e48a81afebf5469f33f000fe999dbbc':
  Add lock task checking to moving tasks to back
 2014-09-03 17:49:38 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Nick Kralevich
3d4cfc04a7 Merge "SELinuxMMAC unit tests" 2014-09-03 17:48:32 +00:00
Craig Mautner
4f321d86a5 am d1a438b3: am f17528b5: Merge "Unconditionally move stack to front." into lmp-dev 
* commit 'd1a438b37c01b8b39c9073db3649fb6221027c61':
  Unconditionally move stack to front.
 2014-09-03 17:48:18 +00:00
George Mount
705dedb2f5 am aecaeaf1: am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit 'aecaeaf1b06ef68b074e719b2efae1b7525a70b1':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:48:12 +00:00
George Mount
31dce2b27f am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit '1a91de154e18d54b07d2c51da7f74c8f4590e8a0':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:48:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
Craig Mautner
4e8a886b98 am f17528b5: Merge "Unconditionally move stack to front." into lmp-dev 
* commit 'f17528b53cc6f91aa2de39251e01df1d6190c9f2':
  Unconditionally move stack to front.
 2014-09-03 17:45:10 +00:00
Jason Monk
327f7ebc01 Merge "Add lock task checking to moving tasks to back" into lmp-dev 2014-09-03 17:41:41 +00:00
Esteban Talavera
6bf9c6350a am 67330f8c: am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '67330f8c077570c870846b7618b5196827483c84':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:37:01 +00:00
George Mount
0e65326515 am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit '626676503844d2a90792011cd23b099109c8c9d7':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:36:57 +00:00
George Mount
1214ecea82 am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'dd8159896d9ebc138a01f538445280e5a1d5adae':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:36:53 +00:00
Wally Yau
a5aa2b913b am 77f65a70: am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit '77f65a70035e07c29fe74cf08bb9e7efe9b144c7':
  New keycode definitions for TV remotes.
 2014-09-03 17:36:48 +00:00
Craig Mautner
db606d2b28 Merge "Unconditionally move stack to front." into lmp-dev 2014-09-03 17:35:19 +00:00
George Mount
66946e22b1 Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 2014-09-03 17:30:24 +00:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows. 
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
 2014-09-03 17:29:57 +00:00
George Mount
dc19ac008c Fix ChangeTransform to work with interruptions 
Bug 17372872

If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.

Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
 2014-09-03 17:29:06 +00:00
Dake Gu
fa28163129 am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'e384281179ad3a71fcb16e071fa4a575b3e7926c':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:26:00 +00:00
Tom Taylor
a273102082 am e58fbeea: am 6fd9a12c: Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
* commit 'e58fbeea31033336b19901df37794f55f1b0eec1':
  Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId
 2014-09-03 17:25:55 +00:00
Esteban Talavera
c7059840ef am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '5607db79a3c17d948e717debc74a936ea47c1de8':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:25:44 +00:00
Wally Yau
c80030ab70 am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit 'afa516092430324283256b568fe6b91fb88e82c8':
  New keycode definitions for TV remotes.
 2014-09-03 17:25:40 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Christoph Studer
2f9dbbaee7 SysUI: Suppress HUNs from non-profile users 
Bug: 17364652
Change-Id: Ic7a971d64cecc1624b872c776efeaccd09144db7
 2014-09-03 19:20:56 +02:00
Jason Monk
a7a61594df Add lock task checking to moving tasks to back 
Chrome seems to use this method of moving itself to the back on
back presses, causing it to escape lock task mode.

Bug: 17365048
Change-Id: I2e8bc614f771951ed96cfc36f9789d12b1742e70
 2014-09-03 13:17:05 -04:00
Wally Yau
a25d54ffb0 Merge "New keycode definitions for TV remotes." into lmp-dev 2014-09-03 17:15:50 +00:00
Dake Gu
97f3177edf am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a45b03f85cdfa792122a9301d508e106ce6aa6f6':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:13:39 +00:00
Tom Taylor
88d3709164 am 6fd9a12c: Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
* commit '6fd9a12c88c60431c759a80ea23b22efba898d6a':
  Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId
 2014-09-03 17:13:34 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Evan Charlton
23dc241d5e Remove startActivityFromInCall API 
Rip out the startActivityFromInCall API until we can replace it with
something better.

Bug: 16988478
Change-Id: Ib7b0493353262d9e795d78b78a98dd29e7a3f88e
 2014-09-03 10:07:03 -07:00
Tom Taylor
ca015d7625 Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 
Bug 17371475

Change-Id: I2da8e355a3c7b037b55d38484c903f7f387aa97c
 2014-09-03 10:04:04 -07:00
Craig Mautner
02a4aa261c Unconditionally move stack to front. 
Recents was depending on using moveTaskToFront() to also move the
task's stack to the front. But that only works if the task is
actually in the stack because moveTaskToFront() doesn't do the
stack movement if the task is no longer in the stack. This change
calls ActivityStack.moveToFront() in addition to moveTaskToFront().

Fixes bug 17361027.

Also logs callingUid when starting an activity.

Change-Id: I023f956bafae00f45c58757ff5707ce520f02b55
 2014-09-03 10:03:57 -07:00
Brian Carlstrom
a27a0b379d am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '66ce8faf4cefa5bc9b240c748b60f5eb287f0852':
  Fix DevicePolicyManager javadoc
 2014-09-03 16:28:40 +00:00
Selim Cinek
ed53729741 am 1e3e03fc: am f0c6717c: Merge "Tuned anti-falsing thresholds on the lockscreen" into lmp-dev 
* commit '1e3e03fc5ab6db4e9cfb451d7858f12f2bfc7a0a':
  Tuned anti-falsing thresholds on the lockscreen
 2014-09-03 16:28:36 +00:00