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

48995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
966f9e558d Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939." 2011-04-13 15:36:14 -07:00
Glenn Kasten
3220d0a1de am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code 
* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
  Bug 4167061 remove debugging code
 2011-04-13 11:56:41 -07:00
Glenn Kasten
8d2e14daa7 am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code 
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
  Bug 4167061 remove debugging code
 2011-04-13 11:52:32 -07:00
Glenn Kasten
34cd123a2e am b0d6f10e: Bug 4167061 remove debugging code 
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
  Bug 4167061 remove debugging code
 2011-04-13 11:48:28 -07:00
Glenn Kasten
b0d6f10eed Bug 4167061 remove debugging code 
Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
 2011-04-13 11:16:49 -07:00
Gloria Wang
162ee49e1c - Add another parameter in notify() to be able to send timed text sample 
through listener during video playback.
- Add OnTimedTextListener in the MediaPlayer
For feature request 800939.

Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
 2011-04-13 11:11:34 -07:00
Steve Block
62e3dee27d Merge "Fix a typo in FrameLayout JavaDoc" 2011-04-13 11:10:17 -07:00
Elliott Hughes
13f3683d93 Merge "More native code cleanup." 2011-04-13 11:09:57 -07:00
Steve Block
1ba7b7efae Fix a typo in FrameLayout JavaDoc 
Change-Id: I8b016aff1f790fbeaf435170c1ff33455ec91204
 2011-04-13 18:37:17 +01:00
Elliott Hughes
f17b971a75 More native code cleanup. 
Use ScopedUtfChars (fixes a leak in TrafficStats, and fixes a crash in Wifi in
a case where GetStringChars could have been called with a pending exception).

Change-Id: I3465ff392b4038dfdafa6af80ec1314cc6d6a11c
 2011-04-13 10:34:23 -07:00
Elliott Hughes
f9dc3db273 Merge "Use an @hide libcore API to get the FileDescriptor from a Socket." 2011-04-13 10:18:03 -07:00
Elliott Hughes
e9cf71dfd0 Merge "Don't allocate a raw object then call its constructor manually..." 2011-04-13 10:17:46 -07:00
Wu-cheng Li
fda06c0cd9 Merge "Add camera metering area API." 2011-04-13 01:14:42 -07:00
Wu-cheng Li
e98e4c8063 Add camera metering area API. 
The API are still hidden.

bug:3475893
Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
 2011-04-13 16:06:47 +08:00
Dianne Hackborn
2432d1bd48 Forgot to add this file. 
Change-Id: I7b29785599ab8e4b8b29099a8398ef86df6aef31
 2011-04-12 19:12:30 -07:00
Dianne Hackborn
0c5001d776 Add APIs to remove tasks. 
You can remove sub-tasks inside of a task, or an entire task.

When removing an entire task, you can have its process killed
as well.

When the process is killed, any running services will get an
onTaskRemoved() callback for them to do cleanup before their
process is killed (and the service possibly restarted).

Or they can set a new android:stopWithTask attribute to just
have the service automatically (cleanly) stopped at this point.

Change-Id: I1891bc2da006fa53b99c52f9040f1145650e6808
 2011-04-12 18:28:06 -07:00
Elliott Hughes
cf6f7a0f00 Don't allocate a raw object then call its constructor manually... 
We can do this in one step.

Change-Id: Id6b70c83002038caf62fe89cc769eca54ae0c055
 2011-04-12 17:50:45 -07:00
Wink Saville
26b05f7dc3 am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE 
* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
  Fix occasional phone app crash
 2011-04-12 17:03:29 -07:00
Wink Saville
05be003f7f am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE 
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
  Fix occasional phone app crash
 2011-04-12 17:00:57 -07:00
Wink Saville
c078a43627 Merge "Fix occasional phone app crash" into honeycomb-LTE 2011-04-12 16:53:54 -07:00
Elliott Hughes
3495d08c40 Merge "Remove useless forward declarations." 2011-04-12 16:29:49 -07:00
Elliott Hughes
4cb1753ec6 Remove useless forward declarations. 
Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
 2011-04-12 16:10:26 -07:00
Kenny Root
2e3ede527d Merge "Updated system packages retain shared user" 2011-04-12 15:34:42 -07:00
Scott Main
83b61471c3 am bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo 
* commit 'bf3452f36c768808873e5428e3594c7eaec0a10c':
  docs: fix doc typo
 2011-04-12 14:55:32 -07:00
Scott Main
bf3452f36c am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo 
* commit '34b42b2ded4741e68413d0aa39f3af146629dcec':
  docs: fix doc typo
 2011-04-12 14:52:30 -07:00
Scott Main
34b42b2ded am 7e8902a9: am f42937a8: docs: fix doc typo 
* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
  docs: fix doc typo
 2011-04-12 14:48:30 -07:00
Scott Main
7e8902a905 am f42937a8: docs: fix doc typo 
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
  docs: fix doc typo
 2011-04-12 14:44:02 -07:00
Kazuhiro Ondo
921c9d2425 Fix occasional phone app crash 
bug #4263503

if GsmDCT is just initialized and LTE/GPRS attach happens
before SIM is completely loaded, phone app would crash
as there is no DataConnection associated with ApnContext.

Change-Id: Ie8007c718c3f68a7b3e42154e60e5b25631ec3c8
 2011-04-12 14:42:02 -07:00
Scott Main
f42937a8aa docs: fix doc typo 
Change-Id: Ia5c32723489a045d865307dbad41edb29b2cfb29
 2011-04-12 14:38:54 -07:00
Elliott Hughes
4390758f27 Use an @hide libcore API to get the FileDescriptor from a Socket. 
Saves having your own native code...

Change-Id: Ib082a6530bcf743a35031500cee6318bc92d4d35
 2011-04-12 14:25:23 -07:00
Eric Fischer
a5228c51ea am 70cf1b97: (-s ours) am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '70cf1b97586a4f1ffa04fe0d83c3590fc22f6a56':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:28:14 -07:00
Scott Main
150b4cba73 am 6ce11bb0: am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links 
* commit '6ce11bb0e1d8e0366f4321f90826d60ee1e52193':
  docs: fix broken links
 2011-04-12 13:27:43 -07:00
Bill Gruber
81b98cc9bb am e3aa4ec6: am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'e3aa4ec6b1c0d1e732fb686c0d8adc7d729b6fc6':
  Doc fix-corrects the cited download locations
 2011-04-12 13:27:38 -07:00
Eric Fischer
70cf1b9758 am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:18:52 -07:00
Scott Main
6ce11bb0e1 am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links 
* commit '91470be46644493be89dc277f3c0f987f34bc937':
  docs: fix broken links
 2011-04-12 13:08:50 -07:00
Scott Main
91470be466 am c7b94371: am b9fedd97: docs: fix broken links 
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
  docs: fix broken links
 2011-04-12 13:06:50 -07:00
Scott Main
c7b94371a0 am b9fedd97: docs: fix broken links 
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
  docs: fix broken links
 2011-04-12 13:02:43 -07:00
Eric Fischer
68cb0ffad0 am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:02:15 -07:00
Scott Main
b9fedd9771 docs: fix broken links 
Change-Id: I20a2f70bc588d9eeec79419d12790f1da9b79863
 2011-04-12 12:58:01 -07:00
Kenny Root
461fa8b05d resolved conflicts for merge of 18490fb9 to master 
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
 2011-04-12 12:51:08 -07:00
Bill Gruber
e3aa4ec6b1 am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
  Doc fix-corrects the cited download locations
 2011-04-12 12:42:26 -07:00
Bill Gruber
a8c68be89d am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations 
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
  Doc fix-corrects the cited download locations
 2011-04-12 12:23:33 -07:00
Elliott Hughes
d3a6956a6d Merge "More native code cleanup." 2011-04-12 12:09:01 -07:00
Eric Fischer
71a556f24e Import revised translations. DO NOT MERGE 
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
 2011-04-12 12:08:59 -07:00
Andy McFadden
b00be00160 Merge "Fix typos." 2011-04-12 12:02:36 -07:00
Bill Gruber
df8fc2e1bf am 9a693ed9: Doc fix-corrects the cited download locations 
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
  Doc fix-corrects the cited download locations
 2011-04-12 11:48:00 -07:00
Doug Zongker
a4f39a6edd Merge "protect all /cache/recovery/last_* files from deletion" 2011-04-12 11:30:47 -07:00
Elliott Hughes
dd66bcbf9d More native code cleanup. 
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
 2011-04-12 11:28:59 -07:00
Andy McFadden
338d12102b Fix typos. 
Change-Id: I455d305f34b07d9ef78fd92ff55ae6f590862f01
 2011-04-12 11:19:25 -07:00
Kenny Root
18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp 
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
 2011-04-12 10:27:15 -07:00