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

66183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
affb139982 am 43ea4e10: Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 
* commit '43ea4e10dc402d20f506cdb4b4f27e49b4dc0443':
  Added JELLY_BEAN version name; update some targetSdkVersion docs.
 2012-01-25 12:32:13 -08:00
Dianne Hackborn
43ea4e10dc Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." 2012-01-25 12:29:17 -08:00
Jeff Brown
37ba8d6954 am 56965f97: Merge "Fix an inconsistent comment." 
* commit '56965f97b33941440ffa0fc711d5d0f68ea45170':
  Fix an inconsistent comment.
 2012-01-25 11:54:58 -08:00
Jeff Brown
56965f97b3 Merge "Fix an inconsistent comment." 2012-01-25 11:52:48 -08:00
Robert Greenwalt
ae92b4b18a am 01e78a60: am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '01e78a60a44def8edcdbea4c7f85ac5bedec0211':
  Filter our v6 address from tethering dns.
 2012-01-25 11:36:04 -08:00
Robert Greenwalt
01e78a60a4 am 10953351: am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '109533519153307b10e2b3ae327ca4b4cd0c75d3':
  Filter our v6 address from tethering dns.
 2012-01-25 11:33:14 -08:00
Robert Greenwalt
1095335191 am 44f64c96: Merge "Filter our v6 address from tethering dns." into ics-mr1 
* commit '44f64c965776ae65ff85ef8c37afb7e14483bdf2':
  Filter our v6 address from tethering dns.
 2012-01-25 11:30:39 -08:00
Robert Greenwalt
44f64c9657 Merge "Filter our v6 address from tethering dns." into ics-mr1 2012-01-25 11:28:30 -08:00
Dianne Hackborn
81e9276a47 Added JELLY_BEAN version name; update some targetSdkVersion docs. 
Change-Id: Ia38ff5b9ad2b63c2cf667260881222d9ff168052
 2012-01-25 11:16:57 -08:00
Jeff Brown
ebc016c01e Fix an inconsistent comment. 
Change-Id: Iae40dfcca091c9886a05e483f51596c96014e57f
 2012-01-25 10:43:04 -08:00
Jean-Baptiste Queru
3806fc6421 am 61bd3396: am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '61bd33968f5df9e67b60ef75e271ad6f4a7702a1':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:36:17 -08:00
Jean-Baptiste Queru
61bd33968f am 95306d85: am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '95306d85005f165e10a25ad45cadadec6e1f6a31':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:33:42 -08:00
Jean-Baptiste Queru
95306d8500 am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:30:31 -08:00
Jean-Baptiste Queru
64085d03ef am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 
* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
 2012-01-25 10:27:41 -08:00
Jean-Michel Trivi
beab555d71 am 171070d2: Merge "Update AudioTrack.stop() javadoc" 
* commit '171070d25ee35fbd38cdbb989dab7a62df8ff8cf':
  Update AudioTrack.stop() javadoc
 2012-01-25 09:49:25 -08:00
Jean-Michel Trivi
171070d25e Merge "Update AudioTrack.stop() javadoc" 2012-01-25 09:46:01 -08:00
Jean-Baptiste Queru
12045502c4 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Roman Nurik
3c07f95cc9 am 00c3aaa2: am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit '00c3aaa235fe9b247d0a3cc532ee3de728b15434':
  docs: Android Design typo and grammar fixes
 2012-01-25 09:01:07 -08:00
Jean-Baptiste Queru
776faa56eb am d4525204: am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit 'd452520464c5a8cdd7a8d0d09b2fdb92cea1eefb':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-25 09:01:04 -08:00
Jean-Baptiste Queru
01797065ae am 28091796: am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit '28091796a651b19fed6eb291cef041f08d27f886':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-25 09:01:01 -08:00
Daniel Sandler
6785247322 am efbf376a: am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit 'efbf376afd9e37112dcd44c607d5e865da07eec7':
  Stop showing "No internet connection" when there is one.
 2012-01-25 09:00:58 -08:00
Eric Laurent
779d226702 am 172870f3: am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '172870f37dc233922757d35d3180071fa84c59ef':
  AudioFlinger: refine mixer sleep time logic
 2012-01-25 09:00:55 -08:00
Eric Laurent
fe63ab1109 am 9c7d56a7: am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit '9c7d56a78ba819fdc8046ab87c82ee2b57d200b5':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-25 09:00:52 -08:00
Roman Nurik
00c3aaa235 am 92aaf243: am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit '92aaf2431ccb8d5ef1eb456646742c736fa70266':
  docs: Android Design typo and grammar fixes
 2012-01-25 08:57:45 -08:00
Jean-Baptiste Queru
d452520464 am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 
* commit 'e2594b85093441e03150c7cfc540abc626884eaf':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
 2012-01-25 08:57:36 -08:00
Jean-Baptiste Queru
28091796a6 am a3946104: am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" 
* commit 'a39461047eae6022e2c0ef873ffa2c7241b393a9':
  stagefright aacenc: Add missing newlines at the end of files
 2012-01-25 08:57:32 -08:00
Daniel Sandler
efbf376afd am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1 
* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
  Stop showing "No internet connection" when there is one.
 2012-01-25 08:57:27 -08:00
Eric Laurent
172870f37d am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 
* commit '535b0264a4cfa790e549bd9cd09980788f1375f4':
  AudioFlinger: refine mixer sleep time logic
 2012-01-25 08:57:23 -08:00
Eric Laurent
9c7d56a78b am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 
* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
  DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
 2012-01-25 08:57:20 -08:00
Robert Greenwalt
468531a040 am afacb33f: Merge "resolved conflicts for merge of 67cda1a0 to master" 
* commit 'afacb33f7584ca2f762c2d15472917059c0e9503':
  Use the carrier-given dns addrs for tethering.
 2012-01-25 08:56:25 -08:00
Robert Greenwalt
afacb33f75 Merge "resolved conflicts for merge of 67cda1a0 to master" 2012-01-25 08:54:59 -08:00
George Mount
5a702e378e am 17d3f667: Merge "Fix auto-complete for content-editable fields." 
* commit '17d3f6679aa0589494f958b586e769ae64eb3bca':
  Fix auto-complete for content-editable fields.
 2012-01-25 07:39:52 -08:00
George Mount
17d3f6679a Merge "Fix auto-complete for content-editable fields." 2012-01-25 07:37:30 -08:00
satok
ba76101f3e am f43305fb: Do not spell check when the keyboard language is not supported by the current spell checker 
* commit 'f43305fb057e0818db456065fba9698e2163a762':
  Do not spell check when the keyboard language is not supported by the current spell checker
 2012-01-25 01:51:41 -08:00
satok
f43305fb05 Do not spell check when the keyboard language is not supported by the current spell checker 
Bug: 5787064
Change-Id: I54a3955220bbe3dae999f6634ccd734e658e45c0
 2012-01-25 16:05:11 +09:00
Mathias Agopian
d84b69d8ce am 37c56b94: Merge changes Ib6b6da1d,I6d9a466a 
* commit '37c56b94c48f60369c0223869cf8d86839ec3816':
  improve SurfaceFlinger dumpsys
  hack up frame latency measurement
 2012-01-24 19:24:10 -08:00
Mathias Agopian
37c56b94c4 Merge changes Ib6b6da1d,I6d9a466a 
* changes:
  improve SurfaceFlinger dumpsys
  hack up frame latency measurement
 2012-01-24 19:22:08 -08:00
Mathias Agopian
1d99795d73 improve SurfaceFlinger dumpsys 
It is now possible to say:

dumpsys SurfaceFlinger --latency

to print latency information about all windows

dumpsys SurfaceFlinger --latency window-name

to print the latency stats of the specified window

for instance: dumpsys SurfaceFlinger --latency SurfaceView

The data consists of one line containing global stats, followed by
128 lines of tab separated timestamps in nanosecond.

The first line currently contains the refresh period in nanosecond.
Each 128 following line contains 3 timestamps, of respectively
the app draw time, the vsync timestamp just prior the call to set and
the timestamp of the call to set.

Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
 2012-01-24 18:22:56 -08:00
Roman Nurik
92aaf2431c am cf077fdd: Merge "docs: Android Design typo and grammar fixes" into ics-mr1 
* commit 'cf077fdd79853dd4778598a623dc2f469c1a8934':
  docs: Android Design typo and grammar fixes
 2012-01-24 18:11:12 -08:00
Roman Nurik
cf077fdd79 Merge "docs: Android Design typo and grammar fixes" into ics-mr1 2012-01-24 18:08:52 -08:00
Roman Nurik
5d3b0c7a7a docs: Android Design typo and grammar fixes 
Change-Id: Ice0eb216c985183e2f41c287ea5d1cc7af1f31f2
 2012-01-24 17:51:17 -08:00
Jim Miller
5eace76cb3 am c49da051: Merge "Fix 5907237: dismiss keyguard after the camera app launches." 
* commit 'c49da0510f5ac54b791bbd7ef5e07d109631fbd3':
  Fix 5907237: dismiss keyguard after the camera app launches.
 2012-01-24 17:42:47 -08:00
Jim Miller
c49da0510f Merge "Fix 5907237: dismiss keyguard after the camera app launches." 2012-01-24 17:41:04 -08:00
Svetoslav Ganov
3e80ec3010 am 3ad77466: Merge "Fixing a typo in the NumberPicker documentation." 
* commit '3ad774667d33524d2d6d1472ded15f2c6d6f541d':
  Fixing a typo in the NumberPicker documentation.
 2012-01-24 17:04:47 -08:00
Svetoslav Ganov
3ad774667d Merge "Fixing a typo in the NumberPicker documentation." 2012-01-24 17:02:23 -08:00
Jim Miller
3868cee0b9 Fix 5907237: dismiss keyguard after the camera app launches. 
This fixes a bug where either the home screen or the last app run shows
briefly while we wait for the camera app to launch.  Instead, we have
ActivityManager dismiss keyguard once the camera app is up and running.

Change-Id: I1c2986ad84024dce675216a76c19c937c3e2828d
 2012-01-24 16:59:54 -08:00
Fabrice Di Meglio
16989b17cc am e414613b: Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption" 
* commit 'e414613bb8d9b1ee0234a2b0858d6f447d0d956a':
  Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption
 2012-01-24 16:59:17 -08:00
Fabrice Di Meglio
e414613bb8 Merge "Fix bug #5901103 all_source_project_146981_Android - Android ICS LQA Regression:FA, AR, HE and TH - Font Corruption" 2012-01-24 16:57:21 -08:00
Jean-Michel Trivi
a701da8eba Update AudioTrack.stop() javadoc 
Add more information on the behavior of
  android.media.AudioTrack.stop()

Change-Id: Id0f968e6bb8fe38765a86c43fc065908ee84edf1
 2012-01-24 16:53:57 -08:00
Robert Greenwalt
03d58bc656 Filter our v6 address from tethering dns. 
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.

bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
 2012-01-24 16:44:50 -08:00