24773 Commits

Author SHA1 Message Date
Dianne Hackborn
325192593b Merge "Fix a few small battery stats problems:" into gingerbread 2010-08-20 14:10:41 -07:00
Nipun Kwatra
fb45748a1e setParamMaxFileDurationUs should allow zero time input as per API of setMaxDuration.
according to MediaRecorder::setMaxDuration documentation we should disable duration limit
when zero or negative time is passed. Currently setParamMaxFileDurationUs was treating
zero/negative as an error case. Fixed that.

Change-Id: I468c3bcc74cb5a34ee3e172cef5147550d6be096
2010-08-20 14:06:48 -07:00
Brian Carlstrom
4d42ccd157 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit 353ab63e412dd15029143de238e9590ab35eb583)
make update-api

Change-Id: I9e61616828a3a5745421350b9a2fc78ba181d388
2010-08-20 13:50:19 -07:00
Dianne Hackborn
99d0452ddc Fix a few small battery stats problems:
- Actually aggregate discharge amounts.
- Actually print the unplugged battery info when currently plugged in.

Change-Id: I22dd6feb73ac1364eb169d3239ce403b0755bb6c
2010-08-20 13:43:00 -07:00
Dianne Hackborn
42f90ca54f Merge "Fix aapt dump badging to support xlarge screens." into gingerbread 2010-08-20 13:39:30 -07:00
Kenny Root
086d084dd9 Add AStorageManager API to NDK
AStorageManager allows users of the NDK to access OBBs for now.

Change-Id: I8a25757901a175aa90a9f3e8c2a5db7873e8615e
2010-08-20 13:27:31 -07:00
Kenny Root
be857d4284 Reorganize MountService IPC
Remove auto-generated AIDL files and replace them with manually edited
.java and .cpp/.h files so that binder calls can be made from either
Java or C++.

Update the makefiles to not attempt to generate the AIDL files and also
remove the old auto-generated .java files.

Put all the storage-related C++ things in libstorage so that we don't
pollute other libraries.

Change-Id: I82d1631295452709f12ff1270f36c3100e652806
2010-08-20 13:17:12 -07:00
Kenny Root
6be237120e Merge "Free created FileMap when uncompressing files" into gingerbread 2010-08-20 13:16:20 -07:00
Dianne Hackborn
baf72cd79c Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 2010-08-20 12:53:07 -07:00
Dianne Hackborn
f43489d7d5 Fix aapt dump badging to support xlarge screens.
Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
2010-08-20 12:44:33 -07:00
Robert Greenwalt
4b1bdc0209 Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 2010-08-20 12:01:56 -07:00
Dianne Hackborn
39792d2262 Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.

Also allow granting of permissions to services because...  well,
it would be really really useful.  And it introduces some
refactoring that we'll need to support cut/paste.

Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
2010-08-20 11:50:00 -07:00
James Dong
b755e32565 Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread 2010-08-20 11:39:29 -07:00
Wu-cheng Li
97a56269d0 Merge "Add camera fps range API." into gingerbread 2010-08-20 11:19:51 -07:00
Wu-cheng Li
454630f237 Add camera fps range API.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
2010-08-20 11:14:17 -07:00
Robert Greenwalt
8afddad7e7 DO NOT MERGE Fixing Connectivity
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed.  Fixed differently on master.

bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
2010-08-20 10:01:55 -07:00
Cary Clark
581f78615a DO NOT MERGE Refactor find and select dialogs
(Merged by hand from master, based on
https://android-git.corp.google.com/g/#change,53490 )

In WebView:
- Remove the select mode, so that while text is selected,
the view may respond to scroll or zoom gestures.
- Remove the getFindIsUp() method -- let the host application
track if the dialog is visible.
- Map long press to select text if the host application does
not already intercept it.
- Draw find 'extras' during zoom animation.
- Draw select 'extras' during animation and scrolling as well.
- Distinguish between selecting text and pressing a shift key
(the shift key is still a possible select text shortcut)
- Add more public (but hidden) interfaces: setUpSelect, selectAll, etc.

In WebChromeClient, add interfaces to allow WebView to tell the host
application that selection has started or finished. A long press on
a part of the view that does not trigger a host context menu may
start the selection (if text is underneath the press), and clicking
the trackball or tapping away from the current selection may
end the selection.

Companion changes in external/webkit and packages/apps/Browser

Change-Id: I2d41662acbdb8bdaa8219b35f18a9276e34636a7
http://b/262451
2010-08-20 12:28:19 -04:00
Andreas Huber
8812535137 Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Change-Id: Ib71113a3bc5aa5fdc088ab4ac3627352499ad3fa
2010-08-20 09:20:39 -07:00
Hung-ying Tyan
b9a1793195 Merge "SipSession: make potential time-consuming ops run on background thread" into gingerbread 2010-08-20 08:26:31 -07:00
Daniel Sandler
3f677b1b3e Merge "Fix periodically disappearing status icons." into gingerbread 2010-08-20 06:01:20 -07:00
Chih-Chung Chang
dc2eabd108 Merge "Don't recycle native bitmap after the finalizer is called." into gingerbread 2010-08-20 03:54:21 -07:00
Hung-ying Tyan
dba514c6d8 SipSession: make potential time-consuming ops run on background thread
http://b/issue?id=2933071

Change-Id: I0467cb5fc41bc2d6e010d20c99b7f0392fb0889e
2010-08-20 17:24:20 +08:00
Chih-Chung Chang
966803ab81 Don't recycle native bitmap after the finalizer is called.
If an object A's finalizer calls Bitmap B's recycle() when B's
finalizer is already called, we will have trouble because the
native bitmap is already freed in the finalizer.

Change-Id: Ic0be8ed75fb3aacee9ce6e3d9908178a55151eb9
2010-08-20 17:10:49 +08:00
Wu-cheng Li
271c1bfd60 Merge "Handle the camera open failure better." into gingerbread 2010-08-19 21:45:46 -07:00
Wu-cheng Li
e7044384b2 Handle the camera open failure better.
Check if camera hardware is NULL to avoid mediaserver crash.

Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
2010-08-19 21:44:06 -07:00
James Dong
9767dbf923 Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder
Change-Id: Ia64c2751b6304e5d5891416bf23ff9b8ec54d5ef
2010-08-19 21:13:35 -07:00
Kenny Root
52b8235238 Free created FileMap when uncompressing files
Change-Id: Ice22c4ecb7c129b74bf60cd66ae79e110b017a4a
2010-08-19 18:39:58 -07:00
Jeff Brown
2f6d975b93 Minor MotionEvent optimization.
Change-Id: I862e934e8dae80f394ffd4ab4b4697037805022c
2010-08-19 18:22:35 -07:00
Jake Hamby
07936528cf Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread 2010-08-19 18:14:18 -07:00
Chia-chi Yeh
d3aaad0e2a Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into gingerbread 2010-08-19 18:08:02 -07:00
James Dong
0ea4ed3bbb Don't drop a late frame which may lead to missing I frames in the MP4 file
Change-Id: I8fef1454264230c1369561670236eb0a19ae4e76
2010-08-19 18:04:27 -07:00
James Dong
439fe407ff Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread 2010-08-19 18:02:23 -07:00
Gilles Debunne
d018a0ce72 Merge "Text selection without trackball." into gingerbread 2010-08-19 17:59:08 -07:00
Jake Hamby
059fe88115 Cosmetic cleanups to SMSDispatcher classes.
Cleaned up some typos and other small fixes in SMSDispatcher in
preparation for checking in my SMS bug fixes. This change doesn't
fix any bugs, but it shouldn't introduce any either.

- Removed unused import statements
- Removed unused private constants and fields
- Fixed typos in Java comments and private constants
- Added generic type parameter to mSTrackers ArrayList
- Removed unnecessary casts
- Fixed indentation of mResultReceiver in SMSDispatcher
- Removed call to get unused smsc in CDMA sendSMS()
- Changed "|=" to "=" in boolean assignment where the variable
  was initialized to false (thus the two operators are equivalent)

Change-Id: Ic19a63a7ef5cdccc7be86043c2a1b863ec8af652
2010-08-19 17:40:37 -07:00
Scott Main
70c9ffbc83 am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread

* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
  docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00
Scott Main
11a72482a0 Merge "docs: add links from widget classes to tutorials" into froyo 2010-08-19 17:31:12 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials
Change-Id: I817e885524951853182b0458df4a32dea1614243
2010-08-19 17:07:13 -07:00
Gilles Debunne
b0d6ba1ec4 Text selection without trackball.
Backported from HC.

Squashed commit of the following:

commit af214a595c7a9fdd11a2dc384f7d4665abf751c0
    Fixes in TextView's selection.

commit eb9fd59ebe6500a66c2003d46b5802299970ae8d
    TextView with Selection Contextual Mode

commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4
    Cosmetic changes around TextView.

commit d4b4b054e87480d984ad18766f5e76553e3080d8
    Double and one and a half tap removed from TextView.

commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5
    Selection handlers in TextView

commit 832be74a5394649e28927484d9a86c6d53b430e7
    New cursor controller in TextViews.

Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
2010-08-19 15:55:02 -07:00
Gilles Debunne
189de28209 Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread 2010-08-19 15:27:12 -07:00
Romain Guy
18ef37258d DO NOT MERGE. Fix the build.
Change-Id: I3322faa948af015f7d8df31b9a4c281f5311f067
2010-08-19 15:15:19 -07:00
Gilles Debunne
75399683a4 Fix for a Resource system bug that displayed the wrong name for missing asset.
I didn't reproduce the bug and cannot ensure that this will fix it. The monkey
with identical parameters stops with an ANR.

Bug http://b/issue?id=2931528

Change-Id: I45f156c6a694f2d67fe514e0f0bb367aa017f08e
2010-08-19 15:10:24 -07:00
Romain Guy
288471d8a5 DO NOT MERGE. Load assets in place instead of deferring until draw.
Before this change, all framework assets would be decoded at drawing time
outside of zygote. This was forcing all apps to re-decode the assets and
zygote to keep an in-memory copy of each asset. This behavior is now
opt-in by setting the inPurgeable flag on BitmapFactory.Options.

Change-Id: Ief823139163d8071b8ee1267746622faf52eb8ec
2010-08-19 15:02:31 -07:00
Doug Zongker
a695cbc943 am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno
Merge commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread

* commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc':
  make android_id random seed depend on time as well as ro.serialno
2010-08-19 14:05:27 -07:00
James Dong
62948fa4de Return error from MPEG4Writer stop() if the check on codec specific data failed
Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
2010-08-19 14:04:04 -07:00
James Dong
cbd038fe20 Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread 2010-08-19 13:59:32 -07:00
Daniel Sandler
0398bf70e7 Fix periodically disappearing status icons.
Occasionally the animation listener wasn't being told that
the ticker animation had completed; this callback was
essential to keeping the status bar's internal state correct
(namely, setting mTicking=false). The safest thing to do is
simply set mTicking to false immediately upon tickerDone()
or tickerHalting().

Bug: 2915280
Change-Id: I997911b12fa2985fa83b42154fb3485220886219
2010-08-19 16:59:11 -04:00
Doug Zongker
0fe27cf5bd make android_id random seed depend on time as well as ro.serialno
Change-Id: I0a48aacd8da30896d91fa05b7791335e6ed751e5
2010-08-19 13:38:26 -07:00
Mathias Agopian
545eab8ae8 Merge "remove unused pixel format" into gingerbread 2010-08-19 13:37:35 -07:00
James Dong
d036662470 Make MediaWriter stop and pause return errors if necessary
o Make the API consistent with SF framework, which the MediaSource
  provides a return status for stop

o Also, helps to convey errors that occurred right when a
  premature stop() is called, leading to a potentially
  mal-formed output file.

Change-Id: I52a932345f38570fdf8ea04d67d73dd94ccd30ef
2010-08-19 13:33:13 -07:00
Jeff Brown
0014474569 Merge "Make the throttling more sensitive to end-to-end latency." into gingerbread 2010-08-19 13:27:58 -07:00