OSDN Git Service
Dirk Dougherty [Sat, 1 Jun 2013 15:32:11 +0000 (08:32 -0700)]
am
fdc0c861: am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
fdc0c8618b4e51c322f747202ff94508124e7c9c':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:28:48 +0000 (08:28 -0700)]
am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
b18c725442e498a6447de37c3b9428b09837eda9':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:26:32 +0000 (08:26 -0700)]
am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
a404a62951ad8a2d657a587feb12780e725296e3':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:24:12 +0000 (08:24 -0700)]
am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
6fe992d88abc1c8c75ede638e6b0d52cd06f098f':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Dirk Dougherty [Sat, 1 Jun 2013 15:21:25 +0000 (08:21 -0700)]
am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
4fad5c176a245203c1f8d26397ef6cc838753357':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Jason Sams [Sat, 1 Jun 2013 00:54:17 +0000 (00:54 +0000)]
Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
Baligh Uddin [Fri, 31 May 2013 22:30:29 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Jim Miller [Fri, 31 May 2013 21:41:34 +0000 (21:41 +0000)]
Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev
Dirk Dougherty [Fri, 31 May 2013 21:08:45 +0000 (21:08 +0000)]
Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
Jason Sams [Fri, 31 May 2013 21:00:46 +0000 (14:00 -0700)]
Fix free after use with createFromBitmapResource
Bug
9227350
Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
kmccormick [Fri, 31 May 2013 20:38:15 +0000 (13:38 -0700)]
am
7356dde4: am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
7356dde40439e2c787d28ed05aff4ff81d8a2d39':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:36:43 +0000 (13:36 -0700)]
am
a75fb065: am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
a75fb065aff42ff7671a5b418229294f43da5cf3':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:34:09 +0000 (13:34 -0700)]
am
c02821ef: am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
c02821efde98a62fe9bbfd718847a8c3bd90eea2':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:32:52 +0000 (13:32 -0700)]
am
eca01252: am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
eca0125267d453ab60631317a44abe869eb660fe':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:31:23 +0000 (13:31 -0700)]
am
3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
* commit '
3886fad5d1c50dd14b11185104401887bc129c7f':
Doc Update: fix host title in main doc.
kmccormick [Fri, 31 May 2013 20:28:57 +0000 (20:28 +0000)]
Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs
kmccormick [Fri, 31 May 2013 19:28:05 +0000 (12:28 -0700)]
Doc Update: fix host title in main doc.
Change-Id: Ide683eb651ea7b485dae6c4d348b19a8d988187b
ztenghui [Fri, 31 May 2013 18:05:43 +0000 (18:05 +0000)]
Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
Scott Main [Fri, 31 May 2013 18:00:26 +0000 (11:00 -0700)]
am
75e12713: am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
75e12713108954237991960a9e4b0482063bc09c':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:58:33 +0000 (10:58 -0700)]
am
c1032cca: am
ca9948ae: revise migrating to Studio procedure
* commit '
c1032ccae3511de06cf76a700627c41f0b71209e':
revise migrating to Studio procedure
Scott Main [Fri, 31 May 2013 17:57:24 +0000 (10:57 -0700)]
am
ca9948ae: revise migrating to Studio procedure
* commit '
ca9948ae33e4ffdc057cc8f2b1efef9c38625436':
revise migrating to Studio procedure
ztenghui [Fri, 31 May 2013 17:50:04 +0000 (10:50 -0700)]
MediaMuxer sample code update, no functional change
bug:
9213533
Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
Scott Main [Fri, 31 May 2013 17:42:35 +0000 (10:42 -0700)]
revise migrating to Studio procedure
Change-Id: Ic8d2498414ccdbe45b7ce349ecb84925e9830ee9
Joe Malin [Fri, 31 May 2013 16:08:29 +0000 (09:08 -0700)]
am
13c305e9: am
09bc2f2d: am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
13c305e944610d4b15f22908fed887f6fdbb42fa':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:06:39 +0000 (09:06 -0700)]
am
09bc2f2d: am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
09bc2f2d6449259bbd4820ec33ea7837996612ed':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:04:23 +0000 (09:04 -0700)]
am
7d469061: am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
7d469061ef7cec751fda3e9d13460d2465395d45':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:03:15 +0000 (09:03 -0700)]
am
62ba3609: am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
62ba36096fa14bdc148bbfc85849a7bed44a1b82':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:02:06 +0000 (09:02 -0700)]
am
59e24472: Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
* commit '
59e24472f3fb4f3dc5d1acee40efd6b8b4d66bd7':
Fix #
8499531: Command line instructions
Joe Malin [Fri, 31 May 2013 16:00:04 +0000 (16:00 +0000)]
Merge "Fix #
8499531: Command line instructions" into jb-mr1.1-docs
Jean Chalard [Fri, 31 May 2013 02:44:07 +0000 (02:44 +0000)]
Merge "Improve the documentation for InputConnection." into jb-mr2-dev
Jim Miller [Thu, 30 May 2013 23:43:53 +0000 (16:43 -0700)]
Fix keyguard issue where an incoming SMS would switch widget
This fixes a bug where an incoming notification from AudioManager
would trigger showAppropriateWidgetPage() to be called even though
nothing has changed.
Fixes bug
9202611
Change-Id: If8bbd30b6b324233b5ad6552183c10cc5a335061
Jeff Brown [Fri, 31 May 2013 00:54:41 +0000 (00:54 +0000)]
Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
Joe Malin [Thu, 28 Mar 2013 18:34:05 +0000 (11:34 -0700)]
Fix #
8499531: Command line instructions
Change-Id: I4922855443f1f85e52ad4016ea3e33925c60e08e
Jeff Brown [Thu, 30 May 2013 21:13:51 +0000 (14:13 -0700)]
Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
Bug:
9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
Scott Main [Thu, 30 May 2013 21:00:16 +0000 (14:00 -0700)]
am
c7dda645: am
77da4440: am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
c7dda6454fb513676575a9ce2b28112cdab6cb05':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:58:17 +0000 (13:58 -0700)]
am
77da4440: am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
77da444049f526cf702403f2543a26e208bd8c7b':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:56:02 +0000 (13:56 -0700)]
am
25a49f9f: fix IE 7/8 bugs on IO videos page
* commit '
25a49f9f2e33540dc413210f9dd09c6cec141896':
fix IE 7/8 bugs on IO videos page
Scott Main [Thu, 30 May 2013 20:51:08 +0000 (13:51 -0700)]
fix IE 7/8 bugs on IO videos page
Change-Id: I94d47989e8c1075c9864d0a4577434917a7913d7
Svetoslav [Thu, 30 May 2013 19:48:59 +0000 (19:48 +0000)]
Merge "CalendarView header not updated on year change." into jb-mr2-dev
Daniel Sandler [Thu, 30 May 2013 19:33:06 +0000 (19:33 +0000)]
Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
kmccormick [Thu, 30 May 2013 19:00:58 +0000 (12:00 -0700)]
am
fa312ff1: am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
fa312ff108702388574021a8de22092cdde5dd6f':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:59:00 +0000 (11:59 -0700)]
am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
33b117c493dbddbbe688aa618b99db99ae71d1de':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:56:48 +0000 (11:56 -0700)]
am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
6959f7fad13018e14255ea98ada4221cca28bfab':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:54:02 +0000 (11:54 -0700)]
am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
4f3cadafbb1aa53cbd197239127b1d3c626cb0df':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:52:11 +0000 (11:52 -0700)]
am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
b3803855b0554879836c18b4157194b9c2061219':
Doc change: document AppWidgetHost
kmccormick [Thu, 30 May 2013 18:48:27 +0000 (18:48 +0000)]
Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
Matthew Xie [Thu, 30 May 2013 18:45:42 +0000 (18:45 +0000)]
Merge "Update javadoc to give app write better guidence" into jb-mr2-dev
Matthew Xie [Wed, 29 May 2013 17:19:06 +0000 (10:19 -0700)]
Update javadoc to give app write better guidence
Update javadoc of close methods of GATT cliet and server
Update javadoc of BluetoothAdapter
bug
8963528
Change-Id: I45ec618fd495225ed11a6171f33bfdc218397d4c
kmccormick [Sat, 2 Mar 2013 00:13:21 +0000 (16:13 -0800)]
Doc change: document AppWidgetHost
"Bug:
7540054,
6984998"
Change-Id: Ice48c7023687d0a4aea95a4a10212e6fdd66363f
Jean-Michel Trivi [Thu, 30 May 2013 16:00:14 +0000 (16:00 +0000)]
Merge "Monitor device rotation" into jb-mr2-dev
Jean Chalard [Thu, 23 May 2013 23:06:28 +0000 (08:06 +0900)]
Improve the documentation for InputConnection.
- Add many details to most methods.
- Add comments specific to IME authors and to editor authors.
- Add missing return value docs.
- Straighten out single-spacing vs double spacing.
Bug:
8843866
Change-Id: If1f6dcf0457d5332a7ebb1ebfb1967c6ff0df722
Daniel Sandler [Thu, 30 May 2013 02:28:22 +0000 (22:28 -0400)]
Unhide action to launch Daydream settings.
Bug:
9088316
Change-Id: I70b87e1f320cef4f53b2610a94be8e552dd3a757
Jason Noguchi [Thu, 30 May 2013 01:23:48 +0000 (01:23 +0000)]
Merge "Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests." into jb-mr2-dev
Victoria Lease [Thu, 30 May 2013 00:17:40 +0000 (00:17 +0000)]
Merge "break up LocationManagerService's WakeLock" into jb-mr2-dev
Victoria Lease [Wed, 29 May 2013 22:28:26 +0000 (15:28 -0700)]
break up LocationManagerService's WakeLock
This commit splits LocationManagerService's monolithic WakeLock into
per-LocationManagerService.Receiver WakeLocks, for better WorkSource
accounting. This should make it easier to debug location-related
power issues.
Change-Id: I0d2897c305a38099f9663dc1bc9354ce4bbe1077
(cherry picked from commit
0aa28602d51bf41e46d18ffefe724ebc3ff7a704)
Baligh Uddin [Wed, 29 May 2013 23:50:19 +0000 (16:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I011dcd6cb4a7a86a0391ff6510f3776b798343d7
Auto-generated-cl: translation import
Scott Main [Wed, 29 May 2013 23:07:57 +0000 (16:07 -0700)]
am
9940dc4e: am
408c6601: am
79bff4c1: fix FF bug wrt scrolltop in video page
* commit '
9940dc4e0ed69b83cb3c896b934eeacc1db47765':
fix FF bug wrt scrolltop in video page
Scott Main [Wed, 29 May 2013 23:05:30 +0000 (16:05 -0700)]
am
408c6601: am
79bff4c1: fix FF bug wrt scrolltop in video page
* commit '
408c6601a1b2851ed872125a2291bff73a88285b':
fix FF bug wrt scrolltop in video page
Scott Main [Wed, 29 May 2013 23:02:57 +0000 (16:02 -0700)]
am
79bff4c1: fix FF bug wrt scrolltop in video page
* commit '
79bff4c14cd4f44377e244cc91a0a5c6168aae14':
fix FF bug wrt scrolltop in video page
Scott Main [Wed, 29 May 2013 23:00:19 +0000 (16:00 -0700)]
fix FF bug wrt scrolltop in video page
Change-Id: Ie48f9e457f6f873804933a7f2309a217810ebc89
Joe Malin [Wed, 29 May 2013 22:26:29 +0000 (15:26 -0700)]
am
b8339676: am
4aeb8cb3: am
1e4cfd8e: am
f0bca903: am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
b8339676a20f665453fda9d6f52e0e6c040bbd7d':
Docs bug fix:
B9085293 - Stop Location Updates
Joe Malin [Wed, 29 May 2013 22:24:11 +0000 (15:24 -0700)]
am
4aeb8cb3: am
1e4cfd8e: am
f0bca903: am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
4aeb8cb3fbc342d41abdfa21d242439aadeb9f86':
Docs bug fix:
B9085293 - Stop Location Updates
Scott Main [Wed, 29 May 2013 22:22:01 +0000 (15:22 -0700)]
am
40f8668a: am
ca725a1a: am
92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev
* commit '
40f8668a5f3bde3b89225a047775ccca30d33c40':
clean up the results for 'android' in search suggestions
Scott Main [Wed, 29 May 2013 22:21:56 +0000 (15:21 -0700)]
am
8cf04a40: am
efbcdcd1: am
248573b8: update homepage banner for videos to point to new io13 video channel
* commit '
8cf04a40b9776776db835bede661f6103db078d0':
update homepage banner for videos to point to new io13 video channel
Scott Main [Wed, 29 May 2013 22:21:53 +0000 (15:21 -0700)]
am
d0a87a5d: am
54fd2ab2: am
04a36f70: Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev
* commit '
d0a87a5d141347d6cf5862b743807fce37ffddc4':
add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later
Joe Malin [Wed, 29 May 2013 22:20:26 +0000 (15:20 -0700)]
am
1e4cfd8e: am
f0bca903: am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
1e4cfd8ecf1c96e124c26d66446a63fcf0665184':
Docs bug fix:
B9085293 - Stop Location Updates
Scott Main [Wed, 29 May 2013 22:19:28 +0000 (15:19 -0700)]
am
ca725a1a: am
92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev
* commit '
ca725a1a7d080a13071170ab28064d116bc7e901':
clean up the results for 'android' in search suggestions
Scott Main [Wed, 29 May 2013 22:19:25 +0000 (15:19 -0700)]
am
efbcdcd1: am
248573b8: update homepage banner for videos to point to new io13 video channel
* commit '
efbcdcd15e8dac9f8ed16c5ec0f00c8c56dc4974':
update homepage banner for videos to point to new io13 video channel
Scott Main [Wed, 29 May 2013 22:19:22 +0000 (15:19 -0700)]
am
54fd2ab2: am
04a36f70: Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev
* commit '
54fd2ab2a95f261d55b9a8630dc121c8b24ee3a8':
add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later
Dirk Dougherty [Wed, 29 May 2013 22:19:14 +0000 (15:19 -0700)]
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Change-Id: Icdd4ae184b2a989ac2967420cb5b471aac70808f
Joe Malin [Wed, 29 May 2013 22:18:44 +0000 (15:18 -0700)]
am
f0bca903: am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
f0bca9034874c26e42c35f65d376d77e514b6ef9':
Docs bug fix:
B9085293 - Stop Location Updates
Joe Malin [Wed, 29 May 2013 22:16:45 +0000 (15:16 -0700)]
am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
e55ba43171cb46cc95aa90f83524c4751c7030ff':
Docs bug fix:
B9085293 - Stop Location Updates
Scott Main [Wed, 29 May 2013 22:16:04 +0000 (15:16 -0700)]
am
92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev
* commit '
92ff58628bc8768910723bfc6a2978b05176b470':
clean up the results for 'android' in search suggestions
Scott Main [Wed, 29 May 2013 22:16:01 +0000 (15:16 -0700)]
am
248573b8: update homepage banner for videos to point to new io13 video channel
* commit '
248573b8584524bffb6be035fb1afefa3b714d4c':
update homepage banner for videos to point to new io13 video channel
Scott Main [Wed, 29 May 2013 22:15:58 +0000 (15:15 -0700)]
am
04a36f70: Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev
* commit '
04a36f704ac2c646ebc4c29f6b26f3c907dab7f8':
add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later
Scott Main [Wed, 29 May 2013 22:11:24 +0000 (22:11 +0000)]
Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev
John Spurlock [Wed, 29 May 2013 21:43:16 +0000 (17:43 -0400)]
Docfix: remove confusing "disabled" link label.
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
Svetoslav [Wed, 29 May 2013 21:37:30 +0000 (14:37 -0700)]
CalendarView header not updated on year change.
The calendar view was updating its header only if the focused
month changes. Removed the check whether the displayed month
changed before setting it since the setter is carefully called
only in cases when there is a change. Hence, now if the year
or the month change, we update the header. This is the safest
and least intrusive fix.
bug:
9167305
Change-Id: I98200bb57580f6416abd30c6c25454d4474add64
Joe Malin [Wed, 29 May 2013 21:30:44 +0000 (21:30 +0000)]
Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
Scott Main [Wed, 29 May 2013 19:27:09 +0000 (12:27 -0700)]
update homepage banner for videos to point to new io13 video channel
Change-Id: Ibdf384a3e3e0e082c3d4118efde3ecc69a206fa3
Lajos Molnar [Wed, 29 May 2013 19:11:02 +0000 (19:11 +0000)]
Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev
Lajos Molnar [Tue, 28 May 2013 20:59:33 +0000 (13:59 -0700)]
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.
Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.
Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9169479
Dirk Dougherty [Wed, 29 May 2013 18:42:03 +0000 (11:42 -0700)]
am
f64588a2: am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
f64588a2ce6a0e4e76d7d48c47f82785553b13f3':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 18:41:50 +0000 (11:41 -0700)]
am
57f0de12: am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
57f0de12912c7412820b74e119c4a5e3ad2bc203':
Update documentation of NEW_OUTGOING_CALL
Dianne Hackborn [Wed, 29 May 2013 18:25:30 +0000 (18:25 +0000)]
Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
Scott Main [Wed, 29 May 2013 18:19:26 +0000 (18:19 +0000)]
Merge "add page for google IO videos this is a scrappy page with inline styles and such as a first iteration. plan is to clean this up and make it extensible later" into jb-mr1.1-ub-dev
Scott Main [Wed, 29 May 2013 00:59:12 +0000 (17:59 -0700)]
add page for google IO videos
this is a scrappy page with inline styles and such as a first iteration.
plan is to clean this up and make it extensible later
Change-Id: I3351f6d79f42b807b84540e1c00092440d9b83d8
Dave Burke [Wed, 29 May 2013 05:56:04 +0000 (05:56 +0000)]
Merge "Fix up device sounds." into jb-mr2-dev
Matthew Xie [Wed, 29 May 2013 05:25:47 +0000 (05:25 +0000)]
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
Dirk Dougherty [Wed, 29 May 2013 05:23:11 +0000 (22:23 -0700)]
am
de8ac602: am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
de8ac602e3d74dbcb87dfc4c1cc54fb0553e5f17':
Doc change: adjust description of NEW_OUTGOING_CALL.
Dirk Dougherty [Wed, 29 May 2013 05:21:09 +0000 (22:21 -0700)]
am
963e3ec5: am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
963e3ec55f2ecbb132a627c8d0f6c19d83bc60b8':
Doc change: adjust description of NEW_OUTGOING_CALL.
Dirk Dougherty [Wed, 29 May 2013 05:18:59 +0000 (22:18 -0700)]
am
71d1af4a: am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
71d1af4a7308eeed249bf9b54549311fb781669f':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 05:18:48 +0000 (22:18 -0700)]
am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
d8754689595ab4b5e4e43a89178080d344374869':
Update documentation of NEW_OUTGOING_CALL
Dirk Dougherty [Wed, 29 May 2013 05:17:52 +0000 (22:17 -0700)]
am
a284e201: Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
a284e2013af9624f0093d58ea8d14994c8eda316':
Doc change: adjust description of NEW_OUTGOING_CALL.
Santos Cordon [Wed, 29 May 2013 05:16:51 +0000 (22:16 -0700)]
am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
c72949c6bc6f5654f09482309d9d3ac03aadd67d':
Update documentation of NEW_OUTGOING_CALL
Dirk Dougherty [Wed, 29 May 2013 05:16:00 +0000 (05:16 +0000)]
Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs
Santos Cordon [Wed, 29 May 2013 05:15:39 +0000 (22:15 -0700)]
am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
7999c22867c75f39214d8fa6d99ae61ec8aacc7a':
Update documentation of NEW_OUTGOING_CALL
Santos Cordon [Wed, 29 May 2013 05:14:28 +0000 (22:14 -0700)]
am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
7fb15ce74bbc06c88660440f84845a1f3108c3d3':
Update documentation of NEW_OUTGOING_CALL
Dave Burke [Wed, 29 May 2013 04:44:29 +0000 (21:44 -0700)]
Fix up device sounds.
Bug:
9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
Daniel Sandler [Wed, 29 May 2013 04:36:23 +0000 (04:36 +0000)]
Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev
OSDN Git Service
