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

59408 Commits

Author SHA1 Message Date
John Reck
b0d6cd236c am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
  Cleanup DeferredLayerUpdater
 2014-10-03 23:57:09 +00:00
John Reck
d988a45d60 Merge "Cleanup DeferredLayerUpdater" into lmp-dev 2014-10-03 22:22:52 +00:00
John Reck
749906b468 Cleanup DeferredLayerUpdater 
Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
 2014-10-03 15:02:19 -07:00
Dianne Hackborn
d2ece7cb00 am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 19:21:48 +00:00
Dianne Hackborn
d867b7c7a2 Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
 2014-10-03 11:43:10 -07:00
Robert Greenwalt
d4fb0501d9 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev 
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
 2014-10-03 15:40:33 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
John Spurlock
0c6964f359 am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
 2014-10-03 14:00:18 +00:00
Robert Greenwalt
a848c1cc0a Send callbacks for Net property changes 
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
 2014-10-02 21:05:44 -07:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams. 
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
 2014-10-02 20:11:37 -04:00
Dianne Hackborn
bb409199fd am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:41:29 +00:00
Dianne Hackborn
7a73f2c5aa Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 2014-10-02 22:49:43 +00:00
Jeff Brown
2c6d0f0584 am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
  Fix race in RecognizerService teardown.
 2014-10-02 22:09:48 +00:00
Jeff Brown
ae309489c2 Merge "Fix race in RecognizerService teardown." into lmp-dev 2014-10-02 22:04:09 +00:00
Christopher Tate
e3d10c0356 am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:43:31 +00:00
Christopher Tate
004c16654f Tweak wallpaper restore acceptance heuristics 
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
 2014-10-02 14:27:09 -07:00
Dianne Hackborn
67a101aa30 SDK only: Update docs to reflect current implementation. 
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
 2014-10-02 12:44:01 -07:00
Jeff Brown
9615697902 Fix race in RecognizerService teardown. 
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
 2014-10-02 12:10:08 -07:00
Newton Allen
408f7534ef am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:46:03 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
George Mount
60a27c87ef am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:34:15 +00:00
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp 
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
 2014-10-02 11:48:08 +01:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Sreeram Ramachandran
06b4f45899 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
 2014-10-02 06:29:39 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
Dianne Hackborn
e2aa87b8e2 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:28 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
9d96c9fa05 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:16 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
ztenghui
6d0eaf45a9 am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit 'f903304896809039430c5e52bd0c24052f51b14f':
  + correcting shadow visual appearance (b/17610926)
 2014-10-01 23:33:51 +00:00
ztenghui
f903304896 Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 2014-10-01 23:29:32 +00:00
ztenghui
8def74de33 + correcting shadow visual appearance (b/17610926) 
+ adjusting spot and ambient shadow opacity constants to achieve desired appearance
+ reducing ambient scale ratio back to 1.0 to address over-lightening at higher elevations
+ partially revert ag/546290

Change-Id: I9d7f664f73a7b9b83df73b739103c97054bd4f6e
 2014-10-01 16:12:28 -07:00
Hui Shu
00207f564d am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-01 22:39:00 +00:00
Patrick Tjin
df670e7347 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 22:38:31 +00:00
John Reck
5451afcae7 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:37:41 +00:00
Adam Powell
e4275843fe am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:37:27 +00:00
Hui Shu
4979a6ade1 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:37:23 +00:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 22:36:47 +00:00
Narayan Kamath
1ff5abdbb1 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:35:50 +00:00
Brian Carlstrom
753f08f740 am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:35:11 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 22:34:24 +00:00
Hui Shu
4e0ad44fca Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 2014-10-01 22:10:23 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Hui Shu
2267177279 Revert "Remove WebView DRP Setting from Developer Settings" 
This reverts commit eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
 2014-10-01 21:41:07 +00:00
George Mount
24314e7d10 Fix ChangeTransform works only once on a View. 
Bug 17762118

When ChangeTransform is used on a View, its intermediate values
are being set, but not cleared after the transition completes
unless it uses a GhostView. This CL clears the intermediate
values when the animation ends if no GhostView is used.

Change-Id: I2590d9c2bc36d31023b3e1af94d2bd72c9589eb5
 2014-10-01 14:28:05 -07:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones 
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
 2014-10-01 21:17:52 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Adam Powell
c6a06d437c Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 2014-10-01 18:31:56 +00:00