27851 Commits

Author SHA1 Message Date
Scott Main
e4f6728b2d am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboard
Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24'

* commit 'fa32a45af724f675215bff920dd264be4a9aae24':
  update device dashboard
2010-08-03 15:52:43 -07:00
Steve Howard
c7ad9fa080 am 80782220: am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '80782220708fdc8575502ac68c884ddab5c78ac2'

* commit '80782220708fdc8575502ac68c884ddab5c78ac2':
  New secure setting for mobile download size limit.
2010-08-03 15:52:23 -07:00
Adam Powell
9d67668b9b Merge "Add support for action buttons without an icon." 2010-08-03 15:51:25 -07:00
Brad Fitzpatrick
389a916769 Usage Stats: don't block writing stats to disk.
I was seeing lots of stack traces of people hung for noticeable
amounts of time when switching between activities.

e.g. On of the common gmail stacks showing this pause was:

android.os.StrictMode$StrictModeDiskWriteViolation: policy=391 violation=1
  at android.os.StrictMode$AndroidBlockGuardPolicy.startHandlingViolationException(StrictMode.java:272)
  at android.os.StrictMode$AndroidBlockGuardPolicy.onWriteToDisk(StrictMode.java:243)
  at dalvik.system.BlockGuard$WrappedFileSystem.open(BlockGuard.java:238)
  at java.io.FileOutputStream.<init>(FileOutputStream.java:97)
  at java.io.FileOutputStream.<init>(FileOutputStream.java:69)
  at com.android.server.am.UsageStatsService.writeStatsFLOCK(UsageStatsService.java:424)
  at com.android.server.am.UsageStatsService.writeStatsToFile(UsageStatsService.java:398)
  at com.android.server.am.UsageStatsService.notePauseComponent(UsageStatsService.java:539)
  at com.android.server.am.ActivityManagerService.updateUsageStats(ActivityManagerService.java:1856)
  at com.android.server.am.ActivityStack.startPausingLocked(ActivityStack.java:667)
  at com.android.server.am.ActivityStack.finishActivityLocked(ActivityStack.java:2925)
  at com.android.server.am.ActivityStack.requestFinishActivityLocked(ActivityStack.java:2836)
  at com.android.server.am.ActivityManagerService.finishActivity(ActivityManagerService.java:2276)
  at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:237)
  at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:1415)
  at android.os.Binder.execTransact(Binder.java:320)
  at dalvik.system.NativeStart.run(Native Method)

  at android.app.ActivityManagerProxy.finishActivity(ActivityManagerNative.java:1454)
  at android.app.Activity.finish(Activity.java:3260)
  at android.app.Activity.onBackPressed(Activity.java:1929)
  at android.app.Activity.onKeyUp(Activity.java:1907)
  at android.view.KeyEvent.dispatch(KeyEvent.java:1088)
  at android.app.Activity.dispatchKeyEvent(Activity.java:2087)
  at com.android.internal.policy.impl.PhoneWindow$DecorView.dispatchKeyEvent(PhoneWindow.java:1661)
  at android.view.ViewRoot.deliverKeyEventToViewHierarchy(ViewRoot.java:2543)
  at android.view.ViewRoot.handleFinishedEvent(ViewRoot.java:2516)
  at android.view.ViewRoot.handleMessage(ViewRoot.java:1866)
  at android.os.Handler.dispatchMessage(Handler.java:99)
  at android.os.Looper.loop(Looper.java:123)
  at android.app.ActivityThread.main(ActivityThread.java:3609)
  at java.lang.reflect.Method.invokeNative(Native Method)
  at java.lang.reflect.Method.invoke(Method.java:521)
  at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:868)
  at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:626)
  at dalvik.system.NativeStart.main(Native Method)

Change-Id: Id49157bc635017292eaefddc5e22d73f5f4ab05e
2010-08-03 15:41:05 -07:00
James Dong
af3f29e62b Replace CHECK with a failure return value when mCamera->setParameters() fails
if the camera is locked by someone else.

bug - 2827892

Change-Id: I217d4a00f04ebd57b557d3faef28787c14f23ea0
2010-08-03 15:29:20 -07:00
Alex Sakhartchouk
374b4d9091 Merge "Adding onscreen frame and script time for debugging." 2010-08-03 15:08:01 -07:00
Adam Powell
1f9c7afc5a Add support for action buttons without an icon.
Change-Id: I026bb7463e7a73419dbaf79950d579ba05d04ea8
2010-08-03 15:01:31 -07:00
Charles Chen
c619d82796 Merge "Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting." 2010-08-03 14:50:09 -07:00
Nipun Kwatra
e618c893eb Merge "Allowing useStillCameraForTimeLapse to be set through MediaRecorder.java" 2010-08-03 13:38:25 -07:00
Mike Lockwood
9a2046fb5c MTP: Add support for syncing MTP playlists
MTP playlists now correspond to playlists in the media provider
(like those created by the Music app).

Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-03 15:36:22 -04:00
Mike Lockwood
23ee42f904 MTP: Fix some thread safety issues in MTP server start/stop sequence.
Change-Id: Ied1cddc6220fa7394e8de99df9bc37a1208b04ff
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-03 15:35:38 -04:00
Chris Tate
9f6b16a29b am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Merge commit '5d46ce24cc46dc57d31f809302af916999114ced' into gingerbread-plus-aosp

* commit '5d46ce24cc46dc57d31f809302af916999114ced':
  Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-03 12:25:29 -07:00
Chris Tate
5d46ce24cc Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread 2010-08-03 12:22:50 -07:00
Casey Burkhardt
0920ba5ef1 Fixing font scale in WindowManagerService.
There was a bug that causes WindowManagerService to lose
the fontScale setting.

This fix submitted on behalf of Casey Burkhardt.

Change-Id: I3a76de15adf13badc5efca8d620d14c972a96ec4
2010-08-03 12:22:47 -07:00
Alex Sakhartchouk
6de555001b Adding onscreen frame and script time for debugging.
Change-Id: I5780092d14d49dae556b9969b937c7768e705a64
2010-08-03 12:03:16 -07:00
Chet Haase
d4b5020174 Merge "remove offending .pn file to fix build" 2010-08-03 11:58:53 -07:00
Chet Haase
4d031f6cc5 remove offending .pn file to fix build
Change-Id: I147f7f02e261c963ae93c15cbaab73b06f481f90
2010-08-03 11:56:27 -07:00
Mathias Agopian
d12a98e2b1 am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp

* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-03 11:30:42 -07:00
Mathias Agopian
9abce39a99 Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 2010-08-03 11:29:15 -07:00
Konstantin Lopyrev
77c444dd2b am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
Merge commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp

* commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8':
  Improving profiling of views.
2010-08-03 11:26:25 -07:00
Konstantin Lopyrev
b59b120929 am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp

* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
  Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
6fcf3a5185 Merge "Improving profiling of views." into gingerbread 2010-08-03 11:24:23 -07:00
Konstantin Lopyrev
321f7fad5c Making sure that there is no notification when focus changes from something to nothing.
Change-Id: Ib8b3bdd7f5dd999c933a017fe1b34263afe38e4a
2010-08-03 11:21:55 -07:00
Dianne Hackborn
b1ad5977bc New two-pane mode for PreferenceActivity.
This introduces a whole new way to use PreferenceActivity, as
a container for PreferenceFragments that the user can switch
between from a list of headers.

Change-Id: I1c79b7c78b86790dc460a1414a999aba5de80628
2010-08-03 11:18:23 -07:00
Jacek Surazski
ee9907b461 Merge "Add dumping of Running Service reports to ApplicationErrorReports" 2010-08-03 11:08:21 -07:00
Gilles Debunne
d1ce7496f1 Merge "frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi" 2010-08-03 11:01:25 -07:00
Daniel Sandler
379020aec6 Cleaning up the notification data structures.
Change-Id: I2e39fee81a2bd99245b9de6edd2ce5c45bd733c7
2010-08-03 13:58:02 -04:00
Vasu Nori
6cd0cc4606 Merge "random but useful stuff" 2010-08-03 10:50:56 -07:00
Vasu Nori
0732f7912c random but useful stuff
1. move binding of args to one place - to SQLiteProgram
2. reduce locking time in SQLiteDatabase
3. reduce locking during time of binding of args
4. rmeove test for the deprecated ArrayListCursor
5. a couple of nits here and there

Change-Id: I20c33c8ffe3325df67af655f1d20614f7f727cb7
2010-08-03 10:48:14 -07:00
Gilles Debunne
389878e49d frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi
Change-Id: I95c7e6afb84af981867c32fe7f86b140f643b5b9
2010-08-03 10:47:05 -07:00
Elliott Hughes
5515b54d92 Merge "Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table." 2010-08-03 10:45:35 -07:00
Maksymilian Osowski
5ce600e1dc Merge "Added geolocation layoutTestController functions." 2010-08-03 10:38:12 -07:00
James Dong
246aad12cf am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp

* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
  File writer has a designated writer thread now
2010-08-03 10:37:32 -07:00
Maksymilian Osowski
38f28fac14 Added geolocation layoutTestController functions.
Change-Id: Ie9558e873ff589b9e2358623433838f0718ea3b4
2010-08-03 18:37:17 +01:00
Michael Kolb
508654536c Merge "fixed webkit version number in user agent string" 2010-08-03 10:36:25 -07:00
James Dong
3d84280ccc Merge "File writer has a designated writer thread now" into gingerbread 2010-08-03 10:35:55 -07:00
Maksymilian Osowski
6540c26f58 Merge "Added recording of JS dialog messages." 2010-08-03 10:33:21 -07:00
Michael Kolb
11945d1f47 fixed webkit version number in user agent string
Change-Id: Ieb0843140a682d35bacc2bd273d7c697f02746a4
2010-08-03 10:25:07 -07:00
Alex Sakhartchouk
a275354c54 Merge "Adding drop shadow support" 2010-08-03 10:14:51 -07:00
James Dong
9b84e8df41 am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp

* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
  Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-03 10:10:31 -07:00
Maksymilian Osowski
40968a4540 Added recording of JS dialog messages.
Change-Id: I3854f1fea81d47255c9fb398bdcbdff5ed4d8a52
2010-08-03 18:02:42 +01:00
James Dong
a788026fd3 Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread 2010-08-03 09:59:11 -07:00
Robert Greenwalt
fa64bcfb01 Merge "Don't reset connections switching default->hipri" 2010-08-03 09:52:48 -07:00
Makoto Onuki
ec37c88570 Adding a method called when detecting content change.
Added Loader.onContentChanged()  which is called by ForceLoadContentObserver
when it detects a change, rather than forceLoad().

By default onContentChanged() just calls forceLoad(), so there's no change
in behavior.

This is useful when a subclass wants to perform custom operations upon
data chantes.  For example, a subclass may want to limit the number
of automatic requeries per second.

Change-Id: I493dac3f4f1a75b056d2c7065336ea9252dbf424
2010-08-03 09:30:47 -07:00
Maksymilian Osowski
100e106551 Merge "Changed the order of searching for expected result (and added additional location)." 2010-08-03 08:05:46 -07:00
Maksymilian Osowski
c83712e686 Changed the order of searching for expected result (and added additional location).
Change-Id: Ieb59ffcaeb999d0ed5a8445c97e6ea3bbe115e4d
2010-08-03 16:04:58 +01:00
Maksymilian Osowski
ef7f9d2458 Added wakelock to keep the screen from sleeping when executing tests.
Change-Id: Ib6a0ff2a7c906f500868269d6a617553733d33b1
2010-08-03 16:01:50 +01:00
Maksymilian Osowski
19ca35a066 Merge "Added detecting unimplemented layoutTestController functions and green squares." 2010-08-03 07:57:48 -07:00
Maksymilian Osowski
fb60226a03 Merge "First batch of layoutTestController functions + some fixes and tweaks." 2010-08-03 07:57:43 -07:00
Kristian Monsen
8136954a3f After merging webkit to 64264 these hang, so added them to the do not run list.
The tests timeout on chrome and are on the chrome skiplist.

Change-Id: I15c2cb70219c04af0d7bc561a1a8619df76bd0dc
2010-08-03 15:37:54 +01:00