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

97393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
a501b5b8d5 AudioTrack error checks 
getMinBufferSize():
  Simplify native_get_min_buff_size error checks and handle more errors.

setPlaybackHeadPosition():
  Disallow for streaming mode [underlying AudioTrack C++ requires this].
  Disallow setPlaybackHeadPosition before write().
  Remove unnecessary synchronization around native_set_position().

setLoopPoints():
  As setLoopPoints() is effectively a variant of setPlaybackHeadPosition(), do the same error checks.

write():
  Don't set "write completed" state if write() parameters are invalid or native write fails.
  It was setting "write completed" flag too early, and ignoring native write return value.
  Detect integer overflow.

reloadStaticData():
  Disallow reloadStaticData() before write().

Change-Id: Iec36fc0ea67095e18a2c238b148dad5545c102c1
 2012-12-05 17:08:48 -08:00
Glenn Kasten
2b0b6596e4 Merge "Replace run-time modes by compile-time constants" 2012-12-05 16:33:58 -08:00
Glenn Kasten
9c1d2de177 Merge "Make mInitializationLooper final" 2012-12-05 15:44:07 -08:00
Glenn Kasten
4e71faec0c Merge "Simplify throw statements" 2012-12-05 15:35:39 -08:00
Glenn Kasten
0fc11dd059 Merge "Remove redundant AudioTrack. qualifiers" 2012-12-05 15:28:06 -08:00
Glenn Kasten
df3cb52798 Remove redundant AudioTrack. qualifiers 
Symbols of the current class don't need to be qualified.

Change-Id: Ic89ce568771165d01d4b5bcf835c591ca0b86541
 2012-12-05 15:24:40 -08:00
The Android Open Source Project
9950edcdcf am 08500d57: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '08500d5741ae5b21a397957cfb441787f0224d77':
 2012-12-05 13:00:59 -08:00
Amith Yamasani
c1493e1a01 am 368ee53f: am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit '368ee53f25cdff7ea89293d2cc81e95816919369':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 13:00:41 -08:00
Andreas Huber
8435d0e8ff Merge "Make it clear that non-optional MediaFormat keys are required" 2012-12-05 12:48:12 -08:00
Dirk Dougherty
e875e9e0d8 am 6350cfb5: am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '6350cfb529b30af88a2bff42962ab111a0cf137b':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-05 12:28:58 -08:00
Scott Main
5923b16f3c am 74dd15b2: am 0de625b5: am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '74dd15b202a9e4b211df916fce3387be19a472c9':
  docs: add link to developer survey on main landing pages
 2012-12-05 12:28:54 -08:00
Laurent Tu
a0a52e3265 am 87830ae7: (-s ours) am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit '87830ae7714ff31b77850d5bca71a19ee1ce4d7f':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-05 12:28:47 -08:00
Scott Main
b34e1ca709 am b0ebd4e9: am 2fb9b61a: am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit 'b0ebd4e941ad9fafac87b4a351398ded2fae85f5':
  docs: fix broken link on maps page
 2012-12-05 12:28:40 -08:00
Scott Main
1311c9f2c6 am 8b93e77c: am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '8b93e77c9dc2f56a234da83c57c75be8c345ff36':
  docs: update webview guide with javascript interface info
 2012-12-05 12:28:33 -08:00
Scott Main
6fc1fc9056 am cbb234e4: am 13bad174: am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit 'cbb234e4b82fc0b05be136ac7f9d1da244c733a4':
  docs: fix AI download links
 2012-12-05 12:28:28 -08:00
Jeff Brown
384e6fe84d am 1edc6111: am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 
* commit '1edc61119d145b05f0b5e1323a2fc0fa6a29d4bc':
  Pin electron beam surface to natural orientation.
 2012-12-05 12:28:25 -08:00
satok
fb21aa84a8 am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 
* commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1':
  Fix an issue on installing 3rd-party IME by a non-primary user
 2012-12-05 12:28:17 -08:00
Scott Main
1c328df482 am c0512832: am 231719fa: am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse 
* commit 'c0512832f49a80697f2eebb889eeaa035a35029c':
  update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
 2012-12-05 12:28:11 -08:00
Victoria Lease
e9d16bcfb1 am 6861e258: (-s ours) am 1d20e05e: am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev 
* commit '6861e258f00425f299155a501db59817e8c0c2e9':
  DO NOT MERGE Notify provider when disposing last UpdateRecord
 2012-12-05 12:23:50 -08:00
Scott Main
1eb8f79deb am 5931fa81: am a8a19ac5: am 3b08bb9d: am f9861221: docs: delete gps overview page 
* commit '5931fa81bdf776f35367d8652a2c6d27452c0f08':
  docs: delete gps overview page
 2012-12-05 12:23:46 -08:00
Raph Levien
454ff49293 am 8a3def6e: am 0da0d337: am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev 
* commit '8a3def6ef9d6c16e25ba4927f5b23081e8dd0cc8':
  Fix for bug 7467609 Bad rendering of Telugu text
 2012-12-05 12:23:42 -08:00
Sascha Prueter
cc6f467c35 am 98c95809: am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev 
* commit '98c958097b0dd458ffd3e12f9692c0c9522d932e':
  PRIORITY_MIN notifications should be truly ambient.
 2012-12-05 12:23:38 -08:00
Guang Zhu
07e186ea54 am 32ec47c1: am 63cc22a5: am 4eab3d88: Merge "more app launch test tweaks" into jb-mr1.1-dev 
* commit '32ec47c1b15b5a9c8f8d9e9f324bb6fe353119fe':
  more app launch test tweaks
 2012-12-05 12:23:34 -08:00
Scott Main
851f364648 am f54d82c8: am 639116f1: am 22ab700f: am beb08896: docs: add backup service to gp docs 
* commit 'f54d82c810c14ef4d105c2b015d1277969f33fcd':
  docs: add backup service to gp docs
 2012-12-05 12:23:31 -08:00
Winson Chung
a5c40b774c am 46a1a4b2: am 8f90249d: am ca83e1d5: Merge "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" into jb-mr1.1-dev 
* commit '46a1a4b2febc504a1ceb5429ac329264b158929c':
  Saving and restoring current page when rotating in lockscreen. (Bug 7568412)
 2012-12-05 12:23:27 -08:00
Raph Levien
5fa2cad162 am 4cd6cef3: am 70463dca: am 49ed5da3: Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev 
* commit '4cd6cef3af43d688d75b33c646fc158e837debd0':
  Reorder tone mark and nikhahit in DroidSansThai.ttf
 2012-12-05 12:23:23 -08:00
John Spurlock
de8f01a99b am d201bf77: am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev 
* commit 'd201bf77be606fb21ef469e0174d64a919f92887':
  Kill dreams that do not create a timely service connection.
 2012-12-05 12:23:19 -08:00
Andreas Huber
08067d376e Make it clear that non-optional MediaFormat keys are required 
Also mark KEY_CHANNEL_MASK optional.

Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
 2012-12-05 11:12:26 -08:00
The Android Open Source Project
08500d5741 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I68071eb0e5fc2164b29cda613bfb490fc80f8e12
 2012-12-05 11:08:55 -08:00
The Android Automerger
c1988b66a5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:48 -08:00
Victoria Lease
0a19ad089a Adjust update interval when expiring location requests. 
This is a more complete solution for this issue that disables
location providers when expiring their last request *and* adjusts
update intervals when expiring any request. This should help
further limit battery drain when a high-frequency-update app
exits, as it allows the system to throttle the update interval
back down to something appropriate for the remaining listeners.

Bug: 7611837
Change-Id: I88b419c92940b7e536d48b26e5fc0f72f3c9e73d
 2012-12-05 09:57:40 -08:00
Amith Yamasani
368ee53f25 am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit 'f663cad2248d5d38957f8e1408cd794c0de90202':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:06:02 -08:00
Amith Yamasani
f663cad224 am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit '6c58b155c3bdde355adb03b191e43d8eec089fb2':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:03:32 -08:00
Amith Yamasani
6c58b155c3 Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 2012-12-05 05:45:00 -08:00
Jim Miller
e81f55bae8 am eac4be7e: am 4fa27f31: am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev 
* commit 'eac4be7ef28a9dfba9e6cc6d0501b4bd2146041a':
  Fix ring volume issue by addressing focus regression in keyguard.
 2012-12-04 21:53:44 -08:00
The Android Automerger
84add94ed2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:58:57 -08:00
Dirk Dougherty
6350cfb529 am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '6a3ad968318f7b655b871972770a2bd344adaec5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:48:03 -08:00
Dirk Dougherty
6a3ad96831 am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '1cb5ad47a1137ffab0d935f186c5ea6645dd59e5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:45:39 -08:00
Dirk Dougherty
1cb5ad47a1 am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '147b01bc637ad8d184bd0aa2d6bf902e69c92107':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:43:25 -08:00
Dirk Dougherty
147b01bc63 Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 2012-12-04 18:40:32 -08:00
Dirk Dougherty
b973b3adfe Doc change: In-app Billing -- add notes about orderId change and subscription orderIds. 
Change-Id: Iccd08387a6d28ac04c303f9da10d1d98dbf8f8b1
 2012-12-04 18:38:09 -08:00
Tim Murray
ac2b02386a Merge "Add support for Bitmap-backed Allocations in Java." 2012-12-04 18:37:37 -08:00
Scott Main
74dd15b202 am 0de625b5: am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '0de625b5c687519f1f389fd522556af775ac762e':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:34:07 -08:00
Scott Main
0de625b5c6 am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '174af19814451ddb7e4ec76cfbea06ed86233ddf':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:32:39 -08:00
Scott Main
174af19814 am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '3bb56f02f89d626757b01015be6861f4c6389154':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:31:34 -08:00
Tim Murray
a314551d69 Add support for Bitmap-backed Allocations in Java. 
Change-Id: Iab38a275aa6cdac91c76fa0d134fbc1e8f387913
Bug: 7256604
 2012-12-04 18:27:07 -08:00
Scott Main
3bb56f02f8 docs: add link to developer survey on main landing pages 
Change-Id: Icf635993a6b3ff20d6e226b1e13358fd0ffcd398
 2012-12-04 18:26:52 -08:00
Eric Laurent
526b035bc5 Merge "Allow mute when playing over fixed volume device" 2012-12-04 18:25:37 -08:00
Laurent Tu
87830ae771 am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'aa3ac463c99e50e574fb02c4ea5015beedb8debe':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:49:18 -08:00
Laurent Tu
aa3ac463c9 am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'dd549bcc29402198698865cf4fd9650d0e909d23':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:47:19 -08:00