68945 Commits

Author SHA1 Message Date
Glenn Kasten
ed4271e1c1 Merge "Add comments about sequence for setting parameters" 2012-03-07 10:38:12 -08:00
Alex Sakhartchouk
42f23b3cfe Merge "Adding more modes to the sampler test app. Fixing pixel placement." 2012-03-07 09:25:56 -08:00
Glenn Kasten
761415bd7f Merge the calls to prepareTracks_l
Change-Id: I1dd759581333e2908d980180d44db7bf5ed6591d
2012-03-07 07:28:12 -08:00
Glenn Kasten
ff249c0dc8 Merge "Remove references to sched_policy.h in RS" 2012-03-07 07:16:46 -08:00
Jeff Sharkey
091ca2d5fb Merge "Avoid updating network stats after shutdown." 2012-03-06 20:04:26 -08:00
Jeff Sharkey
6341fcecc8 Avoid updating network stats after shutdown.
Bug: 6109476
Change-Id: I9a3a8b182c8fa56d83ddc755d204d5b267c9bc5d
2012-03-06 19:59:57 -08:00
Dianne Hackborn
5eb37241fe Merge "Work on more low memory reporting to apps." 2012-03-06 19:06:25 -08:00
Dianne Hackborn
27ff913d56 Work on more low memory reporting to apps.
There are now some new trim memory levels that are sent to
non-background applications as RAM becomes low.

There is a new API for an application to retrieve information
about memory trimming and such on demand.

Fixed various checks against the memory trim level to be
robust (not compare against exact values).

Change-Id: Ifd1c6151124350168aef20a94e517166fd2e03eb
2012-03-06 18:46:32 -08:00
John Reck
afeecb0740 Merge "Fix focus rings for buttons" 2012-03-06 18:22:14 -08:00
John Reck
ef109b0b70 Fix focus rings for buttons
Bug: 6124914

Change-Id: I8cb63de2636afc297756de7733de7bdda920b694
2012-03-06 18:02:11 -08:00
Adam Powell
494e155a5a Merge "Fix some action bar menu layout bugs around config changes" 2012-03-06 17:43:48 -08:00
Adam Powell
f203e0a44e Fix some action bar menu layout bugs around config changes
Bug 5712010

Fix cases where the transition between split/standard action bar menu
presentation wasn't happening properly for windows in activities that
handle their own config/orientation changes.

Change-Id: I7168555e09c9ed448afb8619fd6f0e1466695365
2012-03-06 17:42:47 -08:00
Wink Saville
d28111f4f8 Merge "Telephony: Create and use UiccController" 2012-03-06 17:13:16 -08:00
Wink Saville
22c1700378 Telephony: Create and use UiccController
UiccController creates and disposes IccCard
IccRecords and IccFileHandler is part of IccCard

Change-Id: I3dfb476c76162bbe8443271927a06743bb5e39c4
2012-03-06 17:11:49 -08:00
John Reck
e6725bcba5 Merge "Fix unhandled navigation path" 2012-03-06 17:05:48 -08:00
John Reck
ff8025b994 Merge "Fix FOCUS_BACKWARD search if view had no id" 2012-03-06 17:04:13 -08:00
Jeff Brown
bba4179dc8 Merge "Don't close the database until all references released." 2012-03-06 16:51:13 -08:00
Alex Sakhartchouk
e51ae26282 Adding more modes to the sampler test app.
Fixing pixel placement.

Change-Id: I355cc611ebe0bfb15af96cc498604d9b9fa1a9d3
2012-03-06 16:43:28 -08:00
Jeff Brown
03bd302aeb Don't close the database until all references released.
SQLiteDatabase.close() should call releaseReference() rather than
closing the database immediately.  SQLiteDatabase should also hold
a reference to itself while performing certain operations to
ensure that they complete normally even if another thread closes
the database at the same time.

Fixed a couple of missing or redundant uses of acquireReference()
related to CursorWindows.

To be honest, the reference counting performed by SQLiteClosable should
not be needed, but we're stuck with it in the API.

Bug: 6104842
Change-Id: I3444a697409905d4a36b56418dc7766f5ba76b59
2012-03-06 16:42:56 -08:00
Glenn Kasten
b7a4007563 Merge "Rename fields of AudioSessionRef" 2012-03-06 16:22:30 -08:00
Glenn Kasten
bf10657c8e Add comments about sequence for setting parameters
Change-Id: Iffa59a34c3c47bdc1d3234cdcb4d8ff99c102825
2012-03-06 16:18:17 -08:00
John Reck
1ecebbb27f Fix FOCUS_BACKWARD search if view had no id
Bug: 6126875

Change-Id: I113a7125d71dc3e6cc34d31a669e844a4a882266
2012-03-06 16:08:54 -08:00
John Reck
4fa40371b3 Fix unhandled navigation path
Bug: 6109044
 Tab keys are handled via canTakeFocus & takeFocus (new path)
 Arrow keys are handled by seeing if the keyDown was unhandled (similar to old path)

Change-Id: I825de102de31443b1383a8126992c65a4957dcce
2012-03-06 15:38:09 -08:00
Glenn Kasten
6be5247cc5 Merge "Fix indentation for re-organized code" 2012-03-06 15:23:58 -08:00
Nicolas Roard
b4827c089f Merge "Pass the version down to native" 2012-03-06 14:13:54 -08:00
Gilles Debunne
957c800ac0 Merge "Ellipsize avoids spaces and starts right after text" 2012-03-06 13:57:16 -08:00
Glenn Kasten
dbaf2cc1bf Merge "Rename updateWaitTime since a lock is held" 2012-03-06 13:44:56 -08:00
Glenn Kasten
2bad67f3e3 Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
2012-03-06 12:46:21 -08:00
Glenn Kasten
26bbc5c0d3 Fix indentation for re-organized code
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
2012-03-06 12:14:54 -08:00
Adam Powell
75d022af1f Action buttons are now 1 view instead of 3.
Change-Id: I42afe0e4bd20c3dbe86e2c43a6bc1d776361dca9
2012-03-06 12:06:15 -08:00
Nicolas Roard
18e9886342 Pass the version down to native
Change-Id: Ie240ea9875862288cf09fcfa1113b8e6cb3a7b1d
2012-03-06 11:53:56 -08:00
Fabrice Di Meglio
42b40c0ed8 Merge "Fix bug #4972463 Update CTS tests for TextView textDirection" 2012-03-06 11:48:14 -08:00
Glenn Kasten
9a42ac982e Rename fields of AudioSessionRef
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
2012-03-06 11:43:55 -08:00
Robert Greenwalt
06402e91e9 Merge "Make NDC not block forever and handle restart." 2012-03-06 11:30:28 -08:00
Craig Mautner
135fb111df Merge "Fix deadlock by making DropBoxManager call async." 2012-03-06 11:12:40 -08:00
Eric Laurent
d1f0023ddf Merge "MediaPlayerService: fix AudioSink latency" 2012-03-06 10:53:39 -08:00
Eric Laurent
54682583ba Merge "AudioTrack: relax check on minimum buffer size" 2012-03-06 10:52:18 -08:00
Dianne Hackborn
4f03d35f9c Merge "Fix issues #6103378 and #5959515." 2012-03-06 10:34:18 -08:00
James Dong
b7fdddab0d Merge "Remove unused code - MediaSourceSplitter" 2012-03-06 10:23:58 -08:00
James Dong
bc6b837a60 Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object." 2012-03-06 10:23:51 -08:00
Craig Mautner
26caf7adf6 Fix deadlock by making DropBoxManager call async.
Created a Handler and used it to make sendBroadcast call asynchronously.
Deadlock was caused by WindowManagerService Log.wtf call requiring
ActivityManagerService lock while holding its own lock. At the same time
ActivityManagerService was holding its lock while waiting for
WindowManagerService lock.

Tested by forcing a Log.wtf in
WindowManagerServices.updateWindowsAppsAndRotationAnimationsLocked
inside mAppTokens loop. Then ran 'adb shell monkey -v -v 500000'.
Without this fix it would lock up and reboot within a couple of minutes.
With this fix it runs until the Camera app crashes. But that's a
different bug...

Fixes bug 6112676.

Change-Id: I5b360aa08412d117b1765f01bacd931020509db7
2012-03-06 09:30:18 -08:00
Siva Velusamy
aa52141212 Merge "gltrace: Send vertex attribute data after glDraw() call." 2012-03-06 08:59:32 -08:00
Alex Sakhartchouk
6a1d388282 Merge "First draft of the sample function implementation." 2012-03-06 08:31:54 -08:00
Glenn Kasten
66199cf939 Merge "Remove obsolete references to sched_policy.h" 2012-03-06 08:17:43 -08:00
Glenn Kasten
46c92df26d Merge "Remove references to sched_policy.h" 2012-03-06 08:17:20 -08:00
Derek Sollenberger
6d159451bb Merge "Add missing includes for Mutex.h" 2012-03-06 05:27:31 -08:00
Daniel Sandler
6768c11d60 Merge changes I8343449c,I4eaf69a1
* changes:
  New slide-out mechanism.
  Newly reimplemented PhoneStatusBar, now with fewer windows.
2012-03-06 05:18:10 -08:00
Jeff Brown
1b0cc3ca65 Merge "Rename remove callback methods." 2012-03-05 20:38:12 -08:00
Mathias Agopian
18364b31fc Merge "Add ATRACEs for Buffer indices" 2012-03-05 19:41:29 -08:00
James Dong
5fe7057960 Remove unused code - MediaSourceSplitter
Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
2012-03-05 19:30:08 -08:00