38105 Commits

Author SHA1 Message Date
Alex Sakhartchouk
0857196107 Cleanup and refactoring of an earlier cl.
Change-Id: I5e356ed88375a1620846e0c500659e3b7ead5030
2010-12-15 10:11:31 -08:00
Irfan Sheriff
320a4beda3 Merge "Handle supplicant stop correctly" 2010-12-15 09:58:12 -08:00
Huahui Wu
957e9ca26e Merge "b/2864818 Prompt the SSL error dialog to user and proceed or cancel the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529" 2010-12-15 09:42:35 -08:00
Huahui Wu
ad053cebc8 b/2864818 Prompt the SSL error dialog to user and proceed or cancel
the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529

Change-Id: I1f4c69c6ddb92324a1ec3c193018e8d703454f56
2010-12-15 09:38:54 -08:00
Andreas Huber
08f83a6cd8 Merge "Emit better (correct) timestamps that respect AAC upsampling." 2010-12-15 09:17:21 -08:00
Ben Murdoch
92272ab189 Merge "Remove fragment as well as the query from URLs when resolving MIME type" 2010-12-15 09:07:02 -08:00
Irfan Sheriff
96071a7031 Handle supplicant stop correctly
- Use a clean terminate for a regular stop and on failure kill supplicant. This prevents
WifiMonitor from getting hung permanently on a socket in case of a kill

- When WifiMonitor exits, kill supplicant and cleanup sockets

Change-Id: I87c32e03d945433f33eed8c326d7f0368925bf55
2010-12-15 08:37:05 -08:00
Leon Scroggins
828e8800b1 Merge "Make a long press on a textfield work." 2010-12-15 07:07:51 -08:00
Leon Scroggins
fcf577665b Make a long press on a textfield work.
Bug:3268584

Even if the WebTextView has not been set up yet.

Change-Id: I8ec2c4ef8146006d6ee84d08e1ddbdb099125047
2010-12-15 09:50:53 -05:00
Ben Murdoch
1870015932 Remove fragment as well as the query from URLs when resolving MIME type
When we try to deduce the MIME type from the file extension of
a URL, strip the fragment off at the same time we are stripping
the query. Otherwise we end up trying to match against some
funny extensions.

Bug:3241908

Change-Id: Ibaa84f0a628f37cd012b6cfbed9a6a666ecae8bb
2010-12-15 11:13:16 +00:00
Jason Sams
1eb9f161a6 Merge "Fix mipmap bug introduced with Allocation cleanup. Add syncAll to rsg headers." 2010-12-15 02:11:26 -08:00
Jason Sams
6d8eb266dd Fix mipmap bug introduced with Allocation cleanup.
Add syncAll to rsg headers.

Change-Id: I02c953f3fddab3c6f4e98570cdad45a59711bbde
2010-12-15 01:41:00 -08:00
Dianne Hackborn
ee02d83e49 Merge "Fix launching of activities that I broke." 2010-12-15 00:22:43 -08:00
Dianne Hackborn
194157638a Fix launching of activities that I broke.
Change-Id: I39f4189bad6bdecdc7f9362410f36453fd816121
2010-12-15 00:20:27 -08:00
Mike Lockwood
a9a3511e47 Add CHAR LIMIT for media storage write permission description strings
BUG: 3174768

Change-Id: I0fa4f34bd6f721ebaefa77d3af3c92bf62fc0b31
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:50:20 -08:00
Mike Lockwood
4453aa4c30 CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file.
Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 23:38:43 -08:00
James Dong
1bfdfc63b3 Merge "Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature" 2010-12-14 22:25:02 -08:00
Dianne Hackborn
4f3867e3ce Time to remove some old APIs!
Change-Id: I73ca23b0d5c7971a00dfa05357f9b630d9b6ebc8
2010-12-14 22:19:03 -08:00
James Dong
88b7741228 Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature
Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
2010-12-14 22:13:14 -08:00
satok
6866d6912b Merge "Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled." 2010-12-14 21:01:05 -08:00
satok
07e7279cb4 Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled.
Bug: 3286682
Change-Id: I6a9c6972c136ca8df85ab2b305d08120c09a4543
2010-12-15 13:46:46 +09:00
Romain Guy
478fed84a0 Merge "Cleanup OpenGLRenderer::drawLines()" 2010-12-14 20:13:18 -08:00
Romain Guy
8d0d4783a0 Cleanup OpenGLRenderer::drawLines()
Change-Id: I3545a616e964335897c6e4148c431a07a2ce2a8b
2010-12-14 20:13:35 -08:00
Mike Lockwood
00ffc9d6d2 Merge "Clean up USB notifications:" 2010-12-14 19:23:02 -08:00
Romain Guy
7dddf275cd Merge "Fix the build." 2010-12-14 18:43:44 -08:00
Romain Guy
67b79ec6e3 Fix the build.
Change-Id: I798d4467b891cce2038da0167467c8a603b647a6
2010-12-14 18:45:12 -08:00
Mathias Agopian
1616dec331 Merge "fix debug.sf.showbackground" 2010-12-14 18:40:18 -08:00
Mathias Agopian
04a709e459 fix debug.sf.showbackground
Change-Id: Ie4eeca006ad6d8030900d8cb0029e4d1c22474fb
2010-12-14 18:38:36 -08:00
Mike Lockwood
b92df0f669 Clean up USB notifications:
Add support for separate USB connected and configuration events

Include both USB connected/disconnected and configuration state
in USB_STATE Intent

Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents
Now we just have the sticky USB_STATE broadcast

Move USB disconnnect rebouncing from Tethering to UsbService

Change-Id: Id13eb0c5d51152d2a538985d680ba1db7d2241dc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 18:32:59 -08:00
Gilles Debunne
34961cc2e5 Reduced Overfling threshold after many different cefficient tries.
Change-Id: Ib655e73fc75a09c6379883871fabf90793a6cff5
2010-12-14 18:02:48 -08:00
Adam Powell
d7fe27c722 Merge "Fix bug 3274422 - Prevent pop-in of items in certain lists" 2010-12-14 18:01:36 -08:00
Vasu Nori
a738671790 Merge "bug:3264401 changes to support usage of new downloads dir in /data" 2010-12-14 17:57:41 -08:00
Patrick Dubroy
59c8bce664 Merge "Fix build break due to additional arg in Bitmap ctor" 2010-12-14 17:57:00 -08:00
Dianne Hackborn
ad0b61ca67 Merge "Fix Dialog generating multiple onCancel()." 2010-12-14 17:51:44 -08:00
Dianne Hackborn
114405e0ea Fix Dialog generating multiple onCancel().
Issue #3169193: com.google.android.youtube: java.lang.NullPointerException
at com.google.android.youtube.async.UserAuthorizer$3.onCancel(UserAuthorizer.java:324)

A little protection against calling onCancel() after a dialog has been
dismissed.

Change-Id: I7a64c94703da012ce303308563e4a8ed3cb125d3
2010-12-14 17:49:14 -08:00
Scott Main
ad021da2cd am f6847bf3: am e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
* commit 'f6847bf386bc063f178ae2aabfff040ef90bd7d7':
  cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
2010-12-14 17:48:50 -08:00
Dianne Hackborn
7ab7d83254 Merge "Work around issue #3241701: crash in ActivityThread.handleWindowVisibility" 2010-12-14 17:47:39 -08:00
Scott Main
bb3e4cf973 am 3354f4dc: am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '3354f4dc3de531cf5e5039c0b9f40de4fbdac255':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
2010-12-14 17:45:39 -08:00
Scott Main
f6847bf386 am e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
* commit 'e09009d6a63cfab2a64d02ca49a462d46e62f750':
  cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
2010-12-14 17:45:24 -08:00
Scott Main
3354f4dc3d am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '369c1c1fa22802b6504c5cde533d797841700a66':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
2010-12-14 17:42:28 -08:00
Scott Main
e09009d6a6 cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1
docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc

Change-Id: Ib6bdc6220543d71b803c78e1c762f84e5b9d55c3
2010-12-14 17:40:30 -08:00
Scott Main
3207bddb59 am 3c585db2: am 090a3dc3: cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
* commit '3c585db26cca2a45ceff81f8ce08d32ac0fc76ea':
  cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
2010-12-14 17:39:30 -08:00
Romain Guy
82d4a3ab85 Merge "Make Drawable.mCallback a WeakReference." 2010-12-14 17:36:28 -08:00
Xia Wang
72b5ed42de Merge "Disable airplane mode once the test is finished. #3276498 Verify wifi state in 3g->AM->3g test." 2010-12-14 17:36:20 -08:00
Eric Fischer
5814d6963d Merge "Import revised translations." 2010-12-14 17:35:41 -08:00
Scott Main
3c585db26c am 090a3dc3: cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
* commit '090a3dc33fbb0d450dd5823fd2756360e4acdd12':
  cherrypick Change-Id: I1cfbf9ba9dfaf9bd88c4c6874a3a55f065aa591a docs: remove uninstalling link from adt docs (section was previously removed)
2010-12-14 17:34:35 -08:00
Adam Powell
bdccc2d3db Fix bug 3274422 - Prevent pop-in of items in certain lists
Change-Id: Ia4f253b1cb49fbed175d87f8d85fae838a99a614
2010-12-14 17:34:27 -08:00
Scott Main
369c1c1fa2 cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e
docs: anchor link fixes

Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1
2010-12-14 17:34:00 -08:00
Scott Main
7184f36195 am cb27bc7d: am 0846a2f5: cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
* commit 'cb27bc7d29685182ad0694ce7830664bcb758203':
  cherrypick Change-Id: I7033e605213db4b5c73c09c2207bed68a704aa72 docs: update sitemap add new webmaster tools verification file
2010-12-14 17:34:00 -08:00
Romain Guy
f2a47782f3 Make Drawable.mCallback a WeakReference.
Many memory leaks occur because of long lived drawables. This should
help.

Change-Id: I2e9e8dee26579ec56e8e73f08f6b1d62be7812d9
2010-12-14 17:33:00 -08:00