OSDN Git Service
Daniel Sandler [Thu, 30 May 2013 19:36:59 +0000 (12:36 -0700)]
am
054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
* commit '
054255c6d282a4ab2a95e56859242a2512871296':
Unhide action to launch Daydream settings.
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:03:01 +0000 (12:03 -0700)]
am
03a91724: am
fa312ff1: am
33b117c4: am
6959f7fa: am
4f3cadaf: am
b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs
* commit '
03a9172407103a8788e526be41a7d2c018e426ca':
Doc change: document AppWidgetHost
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
Matthew Xie [Thu, 30 May 2013 18:50:02 +0000 (11:50 -0700)]
am
b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev
* commit '
b190890a94dc2f0bd11da09f59550f86197f010a':
Update javadoc to give app write better guidence
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:03:41 +0000 (09:03 -0700)]
am
c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev
* commit '
c1d47c50d61063dc41214beb93aeea32f77f2550':
Monitor device rotation
Jean-Michel Trivi [Thu, 30 May 2013 16:00:14 +0000 (16:00 +0000)]
Merge "Monitor device rotation" into jb-mr2-dev
The Android Open Source Project [Thu, 30 May 2013 14:31:33 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1c6be297655eb1d928657bbc6fd7e974ddbf9691
The Android Automerger [Thu, 30 May 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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:26:44 +0000 (18:26 -0700)]
am
b318f7b9: 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
* commit '
b318f7b900a3cc0899b6e2a4bd79b9894f29d74f':
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.
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:20:01 +0000 (17:20 -0700)]
am
d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev
* commit '
d9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
break up LocationManagerService's WakeLock
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)
Scott Main [Wed, 29 May 2013 23:10:40 +0000 (16:10 -0700)]
am
b7e75478: am
9940dc4e: am
408c6601: am
79bff4c1: fix FF bug wrt scrolltop in video page
* commit '
b7e75478c3d6c1b1e08a0c6949a9f0174c92991f':
fix FF bug wrt scrolltop in video page
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:30:24 +0000 (15:30 -0700)]
am
c77e2ade: am
b8339676: am
4aeb8cb3: am
1e4cfd8e: am
f0bca903: am
e55ba431: Merge "Docs bug fix:
B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '
c77e2adeacb96f7889c557307d942309c2786aa1':
Docs bug fix:
B9085293 - Stop Location Updates
Scott Main [Wed, 29 May 2013 22:26:43 +0000 (15:26 -0700)]
am
ccec9de2: am
40f8668a: am
ca725a1a: am
92ff5862: Merge "clean up the results for \'android\' in search suggestions" into jb-mr1.1-ub-dev
* commit '
ccec9de2c524fed576c0afa6833ee637684a5ef5':
clean up the results for 'android' in search suggestions
Scott Main [Wed, 29 May 2013 22:26:41 +0000 (15:26 -0700)]
am
369994da: am
8cf04a40: am
efbcdcd1: am
248573b8: update homepage banner for videos to point to new io13 video channel
* commit '
369994da27fd7aac6f0c7da61d782424f875b83b':
update homepage banner for videos to point to new io13 video channel
Scott Main [Wed, 29 May 2013 22:26:38 +0000 (15:26 -0700)]
am
ae2ab27f: 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 '
ae2ab27f3349d11c7dd7a9ca24c0bce5751c196c':
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: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
Amith Yamasani [Wed, 29 May 2013 22:22:30 +0000 (15:22 -0700)]
am
3ec14d9c: am
9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '
3ec14d9cf16f1e91a763b77effc3f086dbdfbb1d':
framework:base: iterator error in singletone provider
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
John Spurlock [Wed, 29 May 2013 22:18:51 +0000 (15:18 -0700)]
am
50ef7ab7: Docfix: remove confusing "disabled" link label.
* commit '
50ef7ab70ad02deb9ad3694fb894741d6007564a':
Docfix: remove confusing "disabled" link label.
Amith Yamasani [Wed, 29 May 2013 22:18:50 +0000 (15:18 -0700)]
am
9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '
9b76b2d29fa338a128f699a1f40f7f5916a512af':
framework:base: iterator error in singletone provider
Lajos Molnar [Wed, 29 May 2013 22:18:48 +0000 (15:18 -0700)]
am
673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev
* commit '
673903a2759067b29bed7e309211000d365e0ad3':
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
Dirk Dougherty [Wed, 29 May 2013 22:18:45 +0000 (15:18 -0700)]
am
91ea7882: 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 '
91ea7882cdba6bef7918fcd4ff645a9693fdc861':
Doc change: adjust description of NEW_OUTGOING_CALL.
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
Santos Cordon [Wed, 29 May 2013 22:18:43 +0000 (15:18 -0700)]
am
828a77ad: am
57f0de12: am
d8754689: am
c72949c6: am
7999c228: am
7fb15ce7: Update documentation of NEW_OUTGOING_CALL
* commit '
828a77adf8845984189e88394ee9f12577aa063a':
Update documentation of NEW_OUTGOING_CALL
Dianne Hackborn [Wed, 29 May 2013 22:18:40 +0000 (15:18 -0700)]
am
8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
* commit '
8d25fba83872b1806c6c21569fce7c87b50257df':
DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
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
Amith Yamasani [Wed, 29 May 2013 22:04:01 +0000 (22:04 +0000)]
Merge "framework:base: iterator error in singletone provider"
John Spurlock [Wed, 29 May 2013 21:43:16 +0000 (17:43 -0400)]
Docfix: remove confusing "disabled" link label.
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
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
The Android Open Source Project [Wed, 29 May 2013 15:05:58 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I126272e67629e850e151f5601a03812c4b9b1782
The Android Automerger [Wed, 29 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jun Su [Tue, 21 May 2013 09:24:32 +0000 (17:24 +0800)]
framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.
Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
Dave Burke [Wed, 29 May 2013 05:57:59 +0000 (22:57 -0700)]
am
ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev
* commit '
ed8f94fc454098889ccc6cf7745447090dc16905':
Fix up device sounds.
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:27:44 +0000 (22:27 -0700)]
am
6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '
6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
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:37:59 +0000 (21:37 -0700)]
am
295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit '
295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
Don't show emergency calls label unless it's a phone.
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
Robert Greenwalt [Wed, 29 May 2013 04:23:11 +0000 (21:23 -0700)]
am
aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit '
aa4b2ee0d654b345b727cb47afd246d0b769fafd':
Ignore outstanding delayed shutdown on restart
Robert Greenwalt [Wed, 29 May 2013 04:21:24 +0000 (04:21 +0000)]
Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
Baligh Uddin [Wed, 29 May 2013 03:44:52 +0000 (20:44 -0700)]
am
af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
af1e512e3f2b52e563e37c1635cbea06e87e0592':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 29 May 2013 03:42:23 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Robert Greenwalt [Wed, 29 May 2013 02:33:48 +0000 (19:33 -0700)]
Ignore outstanding delayed shutdown on restart
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail. Bug
is timing dependent and hard to repro.
bug:
9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
Dirk Dougherty [Wed, 29 May 2013 00:37:12 +0000 (17:37 -0700)]
Doc change: adjust description of NEW_OUTGOING_CALL.
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
Jean-Michel Trivi [Thu, 23 May 2013 22:02:41 +0000 (15:02 -0700)]
Monitor device rotation
If requested by ro.audio.monitorOrientation property, set orientation
information as audio system parameter on configuration changes.
Bug
9095903
Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
Andrew Hsieh [Wed, 29 May 2013 00:10:02 +0000 (17:10 -0700)]
am
64b5f7cc: am
09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
64b5f7cc4ca094754d4631ffb801b7bb771081ec':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Wed, 29 May 2013 00:08:54 +0000 (17:08 -0700)]
am
09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
09377ddb93a964b9e0def6d84b8beb3a515f4a18':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Wed, 29 May 2013 00:06:54 +0000 (00:06 +0000)]
Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
Santos Cordon [Fri, 17 May 2013 21:48:54 +0000 (14:48 -0700)]
Update documentation of NEW_OUTGOING_CALL
Adds call-handling as a use case for NEW_OUTGOING_CALL
Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
Jeff Sharkey [Tue, 28 May 2013 22:49:16 +0000 (15:49 -0700)]
am
ab4a0541: am
e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '
ab4a0541994d5de9520ad4ba37c3a11c5f540eb5':
Add missing ACTION_MEDIA_UNMOUNTED intent
Jeff Brown [Tue, 28 May 2013 22:49:13 +0000 (15:49 -0700)]
am
dea6e86d: am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
dea6e86dce716b67fe92c9b281fe9e79256f3b78':
Bug fix for building the hover target list
Jeff Sharkey [Tue, 28 May 2013 22:46:08 +0000 (15:46 -0700)]
am
e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '
e4c29de9c69d332d65d2eb490961faffab4467fd':
Add missing ACTION_MEDIA_UNMOUNTED intent
Jeff Brown [Tue, 28 May 2013 22:46:00 +0000 (15:46 -0700)]
am
3422ceb6: Merge "Bug fix for building the hover target list"
* commit '
3422ceb6ba453c28ac39dfce34534e0346394a3a':
Bug fix for building the hover target list
Jeff Brown [Tue, 28 May 2013 22:45:43 +0000 (15:45 -0700)]
am
c8c82009: resolved conflicts for merge of
7573e594 to stage-aosp-master
* commit '
c8c82009dc8c146efadac6b51702922148f6003f':
Properly rotate full [-pi, +pi] orientation range if available
OSDN Git Service
