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

118090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
85d7ecfa4b am 6ed3ce0b: am 253f7295: am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '6ed3ce0b71b8d2c180fc9f610eb13cd35dc8ab5e':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:30:29 -07:00
Jim Miller
6ed3ce0b71 am 253f7295: am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '253f7295c820bf960c0411288495145582a0d3b2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:27:25 -07:00
Jim Miller
253f7295c8 am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '1693f6a5639a1f993bdc1dca9dade5e3eb3c14f2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:23:54 -07:00
Adam Lesinski
b245fa4579 am 42ad5ef1: am ed51f0ac: am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev 
* commit '42ad5ef155b52c4c6770e9e45998b8cb84d7cc9d':
  Fix jank for translucent window transitions
 2013-10-21 17:23:16 -07:00
Adam Lesinski
42ad5ef155 am ed51f0ac: am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev 
* commit 'ed51f0ac8f264c83bbafa397f8ee9a83ab9ab033':
  Fix jank for translucent window transitions
 2013-10-21 17:20:15 -07:00
Jim Miller
1693f6a563 Prevent having multiple seek runnables in flight. 
This fix ensures that only one runnable is running at a time, no matter how
many events come in.  There's probably a better way to do this, but this is a
safe fix.

Fixes bug 11307391

Change-Id: I007c95062b20285571f39603c95fb9174b9a2da3
 2013-10-21 17:17:40 -07:00
Adam Lesinski
ed51f0ac8f am e17e0f0e: Merge "Fix jank for translucent window transitions" into klp-dev 
* commit 'e17e0f0e6cfdf32a8b6d142f49819ca9c90be69c':
  Fix jank for translucent window transitions
 2013-10-21 17:16:51 -07:00
Adam Lesinski
e17e0f0e6c Merge "Fix jank for translucent window transitions" into klp-dev 2013-10-22 00:13:17 +00:00
Adam Lesinski
43d8d3355b Fix jank for translucent window transitions 
When a translucent window is closing, the transition
animation to Launcher is janky because Launcher is
expected to be 'opening' but it has always been open
underneath the translucent window. Therefore, the
animation applied to the translucent app appears
janky.

bug:11253262
Change-Id: I9b6af3291d119e6927401f63785b12f25573f4eb
 2013-10-21 16:41:48 -07:00
Jim Miller
74ec0ca98b am 059d89a1: am 262e5281: am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '059d89a1a447095deaa80a0378f822cb25547c70':
  Workaround for corner case in TransitionManager
 2013-10-21 16:17:59 -07:00
Jim Miller
059d89a1a4 am 262e5281: am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '262e5281d7d678c765ae2500dc05c742946c716b':
  Workaround for corner case in TransitionManager
 2013-10-21 16:14:58 -07:00
Jim Miller
262e5281d7 am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '644696f0a0bee1714868b9e9cf351f1380e68f39':
  Workaround for corner case in TransitionManager
 2013-10-21 16:12:18 -07:00
Matthew Xie
3f96fdd861 am 46cfa691: am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '46cfa691379af957cabecac83ae909ba83f93a8f':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:11:07 -07:00
Jim Miller
644696f0a0 Merge "Workaround for corner case in TransitionManager" into klp-dev 2013-10-21 23:10:01 +00:00
Matthew Xie
46cfa69137 am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:07:53 -07:00
Matthew Xie
9a53fbe44f am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:05:26 -07:00
Matthew Xie
ce39e8ced8 Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 2013-10-21 22:58:53 +00:00
Jim Miller
ee186de4b2 Workaround for corner case in TransitionManager 
This works around a problem where removing a review with unfinished
transitions results in leaked object references to KeyguardTransportControlView.

The workaround disables transitions until we have a better fix.

Fixes bug 11307391

Change-Id: I1df82f2c6f1cd9f5c9076d4c76cfd4aec3b6806c
 2013-10-21 15:36:54 -07:00
Jay Shrauner
642c49304f am 4eaca597: am 3e33d5a7: am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 
* commit '4eaca59766e4631ff9ab6a8648f2444252d7ff40':
  Fix CountryDetector NPE
 2013-10-21 15:34:14 -07:00
Jay Shrauner
4eaca59766 am 3e33d5a7: am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 
* commit '3e33d5a769885dcd7f19f386f165810881e22c16':
  Fix CountryDetector NPE
 2013-10-21 15:31:05 -07:00
Jay Shrauner
3e33d5a769 am 8d51c2f6: Merge "Fix CountryDetector NPE" into klp-dev 
* commit '8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c':
  Fix CountryDetector NPE
 2013-10-21 15:27:43 -07:00
Jay Shrauner
8d51c2f6fa Merge "Fix CountryDetector NPE" into klp-dev 2013-10-21 22:23:55 +00:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN 
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
 2013-10-21 14:56:33 -07:00
Jason Monk
a0e370eb21 am 85bb9056: am 7d167181: am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '85bb9056fc3eaf7eeb826041eb030c13bd9e3e16':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:50:31 -07:00
Jason Monk
85bb9056fc am 7d167181: am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '7d16718105fc2ddf2fa2238df601f8316193e3a5':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:47:24 -07:00
Jason Monk
7d16718105 am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '0aeca87233950933f4f48003f4ebaba342ee2ab8':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:44:08 -07:00
Jason Monk
0aeca87233 Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 2013-10-21 21:40:17 +00:00
Winson Chung
b7e55be181 am 29ffafb6: (-s ours) am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '29ffafb62c66dff3abb66dd6adcae68591421799':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:26:44 -07:00
Winson Chung
29ffafb62c am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '5b0da90a68d00724da422b9d5e4b24244c101517':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:23:27 -07:00
Winson Chung
5b0da90a68 am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '1bab99c8cebbf23379c2ccad9188da1dce6fef09':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:20:57 -07:00
Winson Chung
1bab99c8ce Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 2013-10-21 21:16:23 +00:00
George Mount
e6702cb0f6 Merge "Add ofArgb to ObjectAnimator and ValueAnimator." 2013-10-21 21:13:08 +00:00
Alan Viverette
f7e6c3cb8a am 5c675074: am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit '5c675074c774c4e260f738b52eca47fe9f3e6ffa':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:57:51 -07:00
Alan Viverette
5c675074c7 am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'c5aa0ab2e8c47f0d16077abec1531998fbc5b415':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:55:51 -07:00
Alan Viverette
c5aa0ab2e8 am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'ba551061482780264ab5bc80381e480128789bb6':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:51:10 -07:00
Alan Viverette
ba55106148 Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev 2013-10-21 20:48:57 +00:00
Nick Kralevich
db0abf313f am 7a670250: Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp 
* commit '7a670250c9541e41fd450a70f539cafec2d6028b':
  Add system partition check for vpn dialogs
 2013-10-21 13:25:35 -07:00
Nick Kralevich
7a670250c9 Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp 2013-10-21 20:21:15 +00:00
Jason Monk
1aeaf84a38 Make setting PAC require CONNECTIVITY_INTERNAL 
Also disables all setting of PAC networks through the internal AsyncChannel
methods.  PAC can only be saved through addOrUpdateNetwork for permission
checks.

Bug: 11316946
Change-Id: I51016b578080c342a5e5d536ea9a3fdd4fe16644
 2013-10-21 15:28:44 -04:00
Wink Saville
fb8a2ba89b am 10f03972: am 663345cb: am 089959a0: Merge "Fix typo for radio technology" into klp-dev 
* commit '10f03972cc5f6c4c0d627261ae919ed915f47fb6':
  Fix typo for radio technology
 2013-10-21 12:08:48 -07:00
Wink Saville
10f03972cc am 663345cb: am 089959a0: Merge "Fix typo for radio technology" into klp-dev 
* commit '663345cbd3d1ea11cad8e030d863b7082e5ec4a2':
  Fix typo for radio technology
 2013-10-21 12:07:05 -07:00
Wink Saville
663345cbd3 am 089959a0: Merge "Fix typo for radio technology" into klp-dev 
* commit '089959a063c437a5ad0114c0599d3790fa7cd5ab':
  Fix typo for radio technology
 2013-10-21 12:05:22 -07:00
Wink Saville
089959a063 Merge "Fix typo for radio technology" into klp-dev 2013-10-21 19:03:18 +00:00
Jay Shrauner
a2c93480e3 Fix CountryDetector NPE 
Fix CountryDetector NPE by calling CallerInfo.getCurrentCountryIso() which
checks for potential nulls.

Bug:11291034
Change-Id: I0a4412c432551c64ec30652d69636442653ee337
 2013-10-21 11:57:20 -07:00
Christopher Tate
c6ffd4a2e2 am fd6f5ca6: am 595c48e4: am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev 
* commit 'fd6f5ca64a2541f1a618ac4a087445116e2b8e68':
  Fix priv-app edge case across OTAs
 2013-10-21 11:40:09 -07:00
Christopher Tate
fd6f5ca64a am 595c48e4: am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev 
* commit '595c48e43d8f40baaa8e281959300e582d765f56':
  Fix priv-app edge case across OTAs
 2013-10-21 11:36:32 -07:00
Christopher Tate
595c48e43d am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev 
* commit 'd570dae5775be9df8ee218ce617c50e8097e6dcc':
  Fix priv-app edge case across OTAs
 2013-10-21 11:33:35 -07:00
Christopher Tate
d570dae577 Merge "Fix priv-app edge case across OTAs" into klp-dev 2013-10-21 18:31:14 +00:00
Kenny Root
aec7f751f0 am 1ca39b82: am ddc91628: am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit '1ca39b82d8dc014a9ca1f7614a960f799268126e':
  Removed duplicate items on table of contents
 2013-10-21 10:38:13 -07:00
Kenny Root
1ca39b82d8 am ddc91628: am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit 'ddc91628819f02d6cfb60cfa26b582d52fa76cde':
  Removed duplicate items on table of contents
 2013-10-21 10:35:27 -07:00