OSDN Git Service
Mathias Agopian [Fri, 3 Feb 2012 00:27:37 +0000 (16:27 -0800)]
Merge "fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist"
Jeff Sharkey [Fri, 3 Feb 2012 00:26:41 +0000 (16:26 -0800)]
Merge "Support snoozing of data warning notification."
Mathias Agopian [Thu, 2 Feb 2012 23:14:13 +0000 (15:14 -0800)]
fix an issue where SF would spin if /sys/power/wait_for_fb_xxx don't exist
we now exit the Display thread on any error happening on these files.
also refactor the code and remove a lot of unused stuff.
Change-Id: I8d080c35b211890ca20ae09fa36fbdccdf5669a8
James Dong [Fri, 3 Feb 2012 00:15:16 +0000 (16:15 -0800)]
Merge "Unhide AAC_ADTS file format"
Wink Saville [Fri, 3 Feb 2012 00:04:17 +0000 (16:04 -0800)]
Merge "Telephony: Fix get_imsi and icc_io"
Dianne Hackborn [Thu, 2 Feb 2012 23:17:16 +0000 (15:17 -0800)]
Merge "New global setting for developer options."
Romain Guy [Thu, 2 Feb 2012 23:16:30 +0000 (15:16 -0800)]
Merge "Disable debugging code in the font renderer"
Alex Sakhartchouk [Thu, 2 Feb 2012 22:54:32 +0000 (14:54 -0800)]
Merge "Fix an incorrect assert that doesn't account for element array size."
Chet Haase [Thu, 2 Feb 2012 22:35:58 +0000 (14:35 -0800)]
Merge "Fix bug in LayoutTransition that caused views to stay invisible"
Glenn Kasten [Thu, 2 Feb 2012 21:31:23 +0000 (13:31 -0800)]
Merge "Fix const sp<>& in parameter list and return value"
James Dong [Thu, 2 Feb 2012 21:30:49 +0000 (13:30 -0800)]
Merge "Removed a loop for buffer lookup"
Glenn Kasten [Thu, 2 Feb 2012 21:30:48 +0000 (13:30 -0800)]
Merge "Unconditional delete"
Glenn Kasten [Thu, 2 Feb 2012 21:26:12 +0000 (13:26 -0800)]
Merge "More audio_stream_type_t"
Fabrice Di Meglio [Thu, 2 Feb 2012 21:25:30 +0000 (13:25 -0800)]
Merge "Update BiDiTest app"
Glenn Kasten [Thu, 2 Feb 2012 21:24:52 +0000 (13:24 -0800)]
Merge "Thread::getTid returns pid_t gettid() after run"
Jeff Sharkey [Thu, 2 Feb 2012 21:19:37 +0000 (13:19 -0800)]
Merge "Avoid NDC deadlock when re-arming network alert."
Marco Nelissen [Thu, 2 Feb 2012 18:48:01 +0000 (10:48 -0800)]
Merge "Enable media scanner bulk inserts"
Chet Haase [Thu, 2 Feb 2012 18:42:44 +0000 (10:42 -0800)]
Merge "Add Developer Option setting for Animator scaling."
Dianne Hackborn [Thu, 2 Feb 2012 18:41:50 +0000 (10:41 -0800)]
Merge "Use Choreographer for window manager animation timing."
Scott Main [Thu, 2 Feb 2012 18:03:43 +0000 (10:03 -0800)]
am
1e148f50: am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
1e148f509eda581b8ef7cf77acad7f9216034891':
Scott Main [Thu, 2 Feb 2012 18:03:42 +0000 (10:03 -0800)]
Scott Main [Thu, 2 Feb 2012 18:03:25 +0000 (10:03 -0800)]
am
4e133702: am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
4e133702acc81ac72a23aa9784c05deec5be59b6':
docs: fix meta description tag for homepage
Eric Laurent [Thu, 2 Feb 2012 17:39:28 +0000 (09:39 -0800)]
Merge "modifications for new webrtc modules"
James Dong [Thu, 2 Feb 2012 02:53:50 +0000 (18:53 -0800)]
Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
Svetoslav Ganov [Thu, 2 Feb 2012 02:08:01 +0000 (18:08 -0800)]
Merge "Update the comment for View#clearFocus"
Adam Powell [Thu, 2 Feb 2012 01:46:55 +0000 (17:46 -0800)]
Merge "Fix bug
5339708 - edge case in ListView focus restoration"
Fabrice Di Meglio [Thu, 2 Feb 2012 01:21:59 +0000 (17:21 -0800)]
Merge "Fix bug #
5262565 Need to remove CharCount TextDirectionHeuristics"
Stephen Hines [Thu, 2 Feb 2012 01:09:12 +0000 (17:09 -0800)]
Merge "Remove wrapper version check assert."
Jeff Sharkey [Thu, 2 Feb 2012 00:54:53 +0000 (16:54 -0800)]
Merge "Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED."
Jeff Brown [Thu, 2 Feb 2012 00:31:48 +0000 (16:31 -0800)]
Merge "Support automatic cancellation of Loaders."
Romain Guy [Thu, 2 Feb 2012 00:15:17 +0000 (16:15 -0800)]
Merge "Add optional metadata to initiliaze the render threat."
Scott Main [Wed, 1 Feb 2012 23:56:56 +0000 (15:56 -0800)]
am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
2adfc9de0390962701535d0c075c4fb8e886d9d8':
Scott Main [Wed, 1 Feb 2012 23:56:55 +0000 (15:56 -0800)]
Scott Main [Wed, 1 Feb 2012 23:15:10 +0000 (15:15 -0800)]
am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
be09298eb708f6acb6af7028fbca28afdf230008':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:40 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:33 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Chet Haase [Wed, 1 Feb 2012 23:08:26 +0000 (15:08 -0800)]
Merge "Add Developer Option setting for Animator scaling."
Scott Main [Wed, 1 Feb 2012 23:05:41 +0000 (15:05 -0800)]
am
931d1daf: am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
931d1daf1a0b0d61adf1a4c380a7ad00b8ead526':
docs: fix broken link
John Reck [Wed, 1 Feb 2012 23:03:38 +0000 (15:03 -0800)]
Merge "Fix NPE"
Scott Main [Wed, 1 Feb 2012 23:03:15 +0000 (15:03 -0800)]
am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:49 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:30 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Wink Saville [Wed, 1 Feb 2012 22:48:14 +0000 (14:48 -0800)]
Merge "Telephony: Fix sim_refresh as per ril v6"
Stephen Hines [Wed, 1 Feb 2012 22:01:35 +0000 (14:01 -0800)]
Merge "Add test for "public final static"-reflected constant fields."
Scott Main [Wed, 1 Feb 2012 21:59:20 +0000 (13:59 -0800)]
am
4f7f2b8b: am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
4f7f2b8bc3e1e6fb86ef1ccc0897e20c6cac8d48':
Scott Main [Wed, 1 Feb 2012 21:59:19 +0000 (13:59 -0800)]
am
3a080357: am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
3a08035788fe897ad21d53c76c063e9e902750df':
Scott Main [Wed, 1 Feb 2012 21:56:50 +0000 (13:56 -0800)]
am
eea2e9c1: am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
eea2e9c1344dfa30d350a54d4fef69069c6941a9':
Xia Wang [Wed, 1 Feb 2012 21:56:49 +0000 (13:56 -0800)]
am
c8c9ebe8: am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
c8c9ebe868bb16f1b564b95243c0d5fd1d09ad6f':
Scott Main [Wed, 1 Feb 2012 21:54:48 +0000 (13:54 -0800)]
am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
Scott Main [Wed, 1 Feb 2012 21:54:45 +0000 (13:54 -0800)]
am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
e043db892436f643fc2d71df3bc4b2604c556988':
Scott Main [Wed, 1 Feb 2012 21:54:43 +0000 (13:54 -0800)]
am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
13f3c854d8fb635fa824a1ba15fe85152fed131e':
Xia Wang [Wed, 1 Feb 2012 21:54:40 +0000 (13:54 -0800)]
am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
581a33344485181eb3484ba7bf50ff2b52be6d99':
Scott Main [Wed, 1 Feb 2012 21:52:21 +0000 (13:52 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 21:52:19 +0000 (13:52 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 21:52:17 +0000 (13:52 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Xia Wang [Wed, 1 Feb 2012 21:52:13 +0000 (13:52 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Svetoslav Ganov [Wed, 1 Feb 2012 21:45:24 +0000 (13:45 -0800)]
Merge "Speedup the accessibility window querying APIs and clean up."
Andreas Huber [Wed, 1 Feb 2012 21:25:26 +0000 (13:25 -0800)]
Merge "The AMR WB software encoder is now an OMX component."
Siva Velusamy [Wed, 1 Feb 2012 21:08:58 +0000 (13:08 -0800)]
Merge "gltrace: fixup Push & Insert Marker calls"
Siva Velusamy [Wed, 1 Feb 2012 20:16:40 +0000 (12:16 -0800)]
gltrace: fixup Push & Insert Marker calls
Change-Id: I58ced7225fac79ec636a65da4883614a5dce6dff
Scott Main [Wed, 1 Feb 2012 20:01:32 +0000 (12:01 -0800)]
am
d3747509: am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
d3747509f5d3c64f1fbc6255a6f7f20aac023ead':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:58:57 +0000 (11:58 -0800)]
am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:56:23 +0000 (11:56 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:51:56 +0000 (11:51 -0800)]
am
0683d096: am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
0683d0963b95f7c19318e7bfc74fc887332057e4':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:51:53 +0000 (11:51 -0800)]
am
414cc6cf: am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
414cc6cfcdb6d766d095f0af1da76e7da946af84':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:48:28 +0000 (11:48 -0800)]
am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:48:26 +0000 (11:48 -0800)]
am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
9af875ec74e34541539897d7a8069b4ea7f07b12':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:45:51 +0000 (11:45 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:45:49 +0000 (11:45 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1
Andreas Huber [Wed, 1 Feb 2012 19:31:13 +0000 (11:31 -0800)]
Merge "The software AMR NB encoder is now an OMX component."
Xia Wang [Wed, 1 Feb 2012 19:12:05 +0000 (11:12 -0800)]
Merge "Use PackageManager to detect wifi-only devices in ConnectivityManagerTest."
Xia Wang [Wed, 1 Feb 2012 18:59:44 +0000 (10:59 -0800)]
am
606b16bc: am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
606b16bc160e66709408b3e49e273efcff0a148d':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:57:07 +0000 (10:57 -0800)]
am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:54:30 +0000 (10:54 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1
Makoto Onuki [Wed, 1 Feb 2012 18:44:10 +0000 (10:44 -0800)]
Merge "Fix 3 broken unittests."
Dianne Hackborn [Wed, 1 Feb 2012 18:26:51 +0000 (10:26 -0800)]
Merge "Update preload drawables to not include pre-holo assets."
The Android Open Source Project [Wed, 1 Feb 2012 18:06:19 +0000 (10:06 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:22 +0000 (10:01 -0800)]
am
3f3afbef: Reconcile with ics-mr1-release
* commit '
3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':
The Android Open Source Project [Wed, 1 Feb 2012 17:48:36 +0000 (09:48 -0800)]
am
5ec5c752: Reconcile with ics-mr1-release
* commit '
5ec5c7525d3144c306ad245dd10d893ecdf654fa':
Use LTE SNR and RSRP to set signal level bar.
The Android Open Source Project [Wed, 1 Feb 2012 16:49:49 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I79900da9bc339bad1350124768b53026f465a345
The Android Open Source Project [Wed, 1 Feb 2012 16:42:59 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
Scott Main [Wed, 1 Feb 2012 08:18:11 +0000 (00:18 -0800)]
am
1a8a8b73: am
0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag c
* commit '
1a8a8b73d48261384a0f63df894b68db97e7b02c':
docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
Xavier Ducrohet [Wed, 1 Feb 2012 01:44:14 +0000 (17:44 -0800)]
Merge "Add tools specific annotations to the API."
James Dong [Wed, 1 Feb 2012 01:36:37 +0000 (17:36 -0800)]
Merge "add tests module tag to omx_tests"
Jeff Sharkey [Wed, 1 Feb 2012 01:14:14 +0000 (17:14 -0800)]
Merge "Clear identity when updating network stats."
Mathias Agopian [Wed, 1 Feb 2012 00:46:27 +0000 (16:46 -0800)]
Merge "fix an issue with vsync event delivery"
Mathias Agopian [Wed, 1 Feb 2012 00:42:54 +0000 (16:42 -0800)]
fix an issue with vsync event delivery
vsync events were sometimes delivered to connected
client who didn't request them. this happened if
another client requested the delivery and that client
was first in the client list.
also fix the vsync test which didn't request any events as
well as DisplayEventReveiver documentation which was misleading
about the necessity to request vsync events.
Change-Id: Ie990fda3f337f8f0042745c4b2cde67936c45686
Scott Main [Wed, 1 Feb 2012 00:10:38 +0000 (16:10 -0800)]
am
0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form
* commit '
0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
Scott Main [Wed, 1 Feb 2012 00:08:09 +0000 (16:08 -0800)]
Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1
Mathias Agopian [Tue, 31 Jan 2012 23:54:20 +0000 (15:54 -0800)]
Merge "Nexus S now reports the proper frame-rate"
The Android Automerger [Tue, 31 Jan 2012 23:42:17 +0000 (15:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 31 Jan 2012 19:27:43 +0000 (11:27 -0800)]
aapt now sorts the strings in the resource string pool.
In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).
Also add a new aapt command to print the contents of the resource
table string pool.
Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
Stephen Hines [Tue, 31 Jan 2012 23:32:39 +0000 (15:32 -0800)]
Merge "Test RS struct writing/reading."
Jeff Sharkey [Tue, 31 Jan 2012 22:50:30 +0000 (14:50 -0800)]
Merge "Dump xt_qtaguid stats to using GID instead of su."
Justin Ho [Tue, 31 Jan 2012 22:05:26 +0000 (14:05 -0800)]
am
66146c4f: am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d':
Use LTE SNR and RSRP to set signal level bar.
Justin Ho [Tue, 31 Jan 2012 22:02:44 +0000 (14:02 -0800)]
am
792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '
792d83c5087a7a6dec4e64f59f5b78d1041c9585':
Use LTE SNR and RSRP to set signal level bar.
Justin Ho [Tue, 31 Jan 2012 22:00:55 +0000 (14:00 -0800)]
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1