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

104027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Noguchi
b318f7b900 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 2013-05-30 01:23:48 +00:00
Victoria Lease
d9f7250a1d Merge "break up LocationManagerService's WakeLock" into jb-mr2-dev 2013-05-30 00:17:40 +00:00
Victoria Lease
a9770e4f06 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)
 2013-05-29 17:11:25 -07:00
Scott Main
b7e75478c3 am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '9940dc4e0ed69b83cb3c896b934eeacc1db47765':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:07:57 -07:00
Scott Main
9940dc4e0e am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '408c6601a1b2851ed872125a2291bff73a88285b':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:05:30 -07:00
Scott Main
408c6601a1 am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '79bff4c14cd4f44377e244cc91a0a5c6168aae14':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:02:57 -07:00
Scott Main
79bff4c14c fix FF bug wrt scrolltop in video page 
Change-Id: Ie48f9e457f6f873804933a7f2309a217810ebc89
 2013-05-29 16:00:19 -07:00
Joe Malin
c77e2adeac 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
 2013-05-29 15:26:29 -07:00
Joe Malin
b8339676a2 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
 2013-05-29 15:24:11 -07:00
Scott Main
ccec9de2c5 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
 2013-05-29 15:22:01 -07:00
Scott Main
369994da27 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
 2013-05-29 15:21:56 -07:00
Scott Main
ae2ab27f33 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
 2013-05-29 15:21:53 -07:00
Joe Malin
4aeb8cb3fb 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
 2013-05-29 15:20:26 -07:00
Scott Main
40f8668a5f 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
 2013-05-29 15:19:28 -07:00
Scott Main
8cf04a40b9 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
 2013-05-29 15:19:25 -07:00
Scott Main
d0a87a5d14 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
 2013-05-29 15:19:22 -07:00
Joe Malin
1e4cfd8ecf 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
 2013-05-29 15:18:44 -07:00
Joe Malin
f0bca90348 am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 
* commit 'e55ba43171cb46cc95aa90f83524c4751c7030ff':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:16:45 -07:00
Scott Main
ca725a1a7d 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
 2013-05-29 15:16:04 -07:00
Scott Main
efbcdcd15e 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
 2013-05-29 15:16:01 -07:00
Scott Main
54fd2ab2a9 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
 2013-05-29 15:15:58 -07:00
Scott Main
92ff58628b Merge "clean up the results for 'android' in search suggestions" into jb-mr1.1-ub-dev 2013-05-29 22:11:24 +00:00
John Spurlock
50ef7ab70a Docfix: remove confusing "disabled" link label. 
Change-Id: I1acb9c8c20b6cda0e6cfb2fc1e450f37e7cd4eeb
 2013-05-29 17:43:16 -04:00
Joe Malin
e55ba43171 Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs 2013-05-29 21:30:44 +00:00
Scott Main
248573b858 update homepage banner for videos to point to new io13 video channel 
Change-Id: Ibdf384a3e3e0e082c3d4118efde3ecc69a206fa3
 2013-05-29 12:27:09 -07:00
Lajos Molnar
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00:00
Lajos Molnar
ecca7f60a6 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
 2013-05-29 12:08:18 -07:00
Dirk Dougherty
91ea7882cd 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.
 2013-05-29 11:42:03 -07:00
Santos Cordon
828a77adf8 am 57f0de12: am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '57f0de12912c7412820b74e119c4a5e3ad2bc203':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-29 11:41:50 -07:00
Dianne Hackborn
8d25fba838 Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev 2013-05-29 18:25:30 +00:00
Scott Main
04a36f704a 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 2013-05-29 18:19:27 +00:00
Scott Main
896f61d913 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
 2013-05-29 11:09:07 -07:00
Dave Burke
ed8f94fc45 Merge "Fix up device sounds." into jb-mr2-dev 2013-05-29 05:56:04 +00:00
Matthew Xie
6ea0636a9c Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 2013-05-29 05:25:47 +00:00
Dirk Dougherty
f64588a2ce 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.
 2013-05-28 22:23:11 -07:00
Dirk Dougherty
de8ac602e3 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.
 2013-05-28 22:21:09 -07:00
Dirk Dougherty
963e3ec55f 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.
 2013-05-28 22:18:59 -07:00
Santos Cordon
57f0de1291 am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'd8754689595ab4b5e4e43a89178080d344374869':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:18:48 -07:00
Dirk Dougherty
71d1af4a73 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.
 2013-05-28 22:17:52 -07:00
Santos Cordon
d875468959 am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'c72949c6bc6f5654f09482309d9d3ac03aadd67d':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:16:51 -07:00
Dirk Dougherty
a284e2013a Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-29 05:16:01 +00:00
Santos Cordon
c72949c6bc am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7999c22867c75f39214d8fa6d99ae61ec8aacc7a':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:15:39 -07:00
Santos Cordon
7999c22867 am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7fb15ce74bbc06c88660440f84845a1f3108c3d3':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:14:28 -07:00
Dave Burke
fbdb7d25de Fix up device sounds. 
Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
 2013-05-28 21:44:29 -07:00
Daniel Sandler
295eddb92f Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev 2013-05-29 04:36:24 +00:00
Robert Greenwalt
aa4b2ee0d6 Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 2013-05-29 04:21:25 +00:00
Baligh Uddin
af1e512e3f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:42:23 +00:00
Robert Greenwalt
e9868c1ba0 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
 2013-05-28 19:33:48 -07:00
Dirk Dougherty
367ce906c8 Doc change: adjust description of NEW_OUTGOING_CALL. 
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
 2013-05-28 17:59:38 -07:00
Santos Cordon
7fb15ce74b Update documentation of NEW_OUTGOING_CALL 
Adds call-handling as a use case for NEW_OUTGOING_CALL

Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
 2013-05-28 16:00:11 -07:00