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

151316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nancy Chen
17b1f9138a am 6ad18828: Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 
* commit '6ad1882879c9e537d85079d6a13a6a5c50ba5900':
  Remove onConnectionAdded/Removed() from ConnectionService API
 2014-09-03 19:24:23 +00:00
Marco Fucci
4e68f11672 Disconnect TrustAgent when not active. 
Bug: 17191952
Change-Id: I470261f659a573400b2eb1421eeb953c87e58b66
 2014-09-03 12:24:22 -07:00
Glenn Kasten
65137ae765 am 57d76e43: Merge "Fix regression in CTS for AudioTrack" into lmp-dev 
* commit '57d76e43874309a15d3910bf5e151b4d671e7d3c':
  Fix regression in CTS for AudioTrack
 2014-09-03 19:23:35 +00:00
Alan Viverette
79464269aa am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '3778a6aa6069dae2e7f012732f47c6a7e5196364':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 19:23:15 +00:00
Wink Saville
7d725d3919 am dadcc85e: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'dadcc85e58bcf2389ebca0956e044fc8ccfcab09':
  Prepare to make SubscriptionManager public.
 2014-09-03 19:23:10 +00:00
Wink Saville
8a38a203a9 Rename getActivatedXxx to getActiveXxx 
Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
 2014-09-03 12:22:54 -07:00
Paul Jensen
1f0ce33821 Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 2014-09-03 19:08:16 +00:00
Brian Carlstrom
230561eef4 Restrict lazy dexopt to eng builds only 
Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
 2014-09-03 11:59:38 -07:00
Nancy Chen
8a34d9ed2a Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 2014-09-03 18:41:21 +00:00
Glenn Kasten
49367a367c Merge "Fix regression in CTS for AudioTrack" into lmp-dev 2014-09-03 18:31:59 +00:00
Alan Viverette
94b88e7103 Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 2014-09-03 18:31:47 +00:00
Wink Saville
7f6fa2a1cd Merge "Prepare to make SubscriptionManager public." into lmp-dev 2014-09-03 18:25:45 +00:00
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
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
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
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
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
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
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
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
3df35dd34a am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit 'ef3d85a5d9de21c4569cc1bec4e696bbf44623a6':
  Fix DevicePolicyManager javadoc
 2014-09-03 16:19:30 +00:00
Selim Cinek
5b0e5d3343 am f0c6717c: Merge "Tuned anti-falsing thresholds on the lockscreen" into lmp-dev 
* commit 'f0c6717c5c936f600027fb30ad5745fa16117e9a':
  Tuned anti-falsing thresholds on the lockscreen
 2014-09-03 16:19:24 +00:00
Selim Cinek
cc0198e2ab am e1327275: Merge "Fixed a bug where notification icons where not animating" into lmp-dev 
* commit 'e1327275ca5f9528609938672799da7edd5b7a5c':
  Fixed a bug where notification icons where not animating
 2014-09-03 16:19:19 +00:00
Adrian Roos
7ef28383be am 39dd16c8: Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev 
* commit '39dd16c8f35d0fdd01c25bf51c01b71726819eae':
  Auto dismiss lockscreen when switching to guest
 2014-09-03 16:19:02 +00:00