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

105473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
f3c2981309 Reconcile with jb-mr2-release - do not merge 
Change-Id: I1c6be297655eb1d928657bbc6fd7e974ddbf9691
 2013-05-30 07:31:34 -07:00
The Android Automerger
d46ceb9d63 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-30 05:55:42 -07:00
Jason Noguchi
b809577f46 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.
 2013-05-29 18:26:44 -07:00
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
51ff6f953c am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev 
* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock
 2013-05-29 17:20:01 -07: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
93c284affe 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
 2013-05-29 16:10:40 -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
40062914b5 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
 2013-05-29 15:30:24 -07:00
Scott Main
6e9230cf29 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
 2013-05-29 15:26:43 -07:00
Scott Main
90a40ea8d9 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
 2013-05-29 15:26:41 -07:00
Scott Main
29e24f5ab1 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
 2013-05-29 15:26:38 -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
Amith Yamasani
096d384399 am 3ec14d9c: am 9b76b2d2: Merge "framework:base: iterator error in singletone provider" 
* commit '3ec14d9cf16f1e91a763b77effc3f086dbdfbb1d':
  framework:base: iterator error in singletone provider
 2013-05-29 15:22:30 -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
John Spurlock
c00930f4fe am 50ef7ab7: Docfix: remove confusing "disabled" link label. 
* commit '50ef7ab70ad02deb9ad3694fb894741d6007564a':
  Docfix: remove confusing "disabled" link label.
 2013-05-29 15:18:51 -07:00
Amith Yamasani
3ec14d9cf1 am 9b76b2d2: Merge "framework:base: iterator error in singletone provider" 
* commit '9b76b2d29fa338a128f699a1f40f7f5916a512af':
  framework:base: iterator error in singletone provider
 2013-05-29 15:18:50 -07:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Dirk Dougherty
2bf15756cc 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.
 2013-05-29 15:18:45 -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
Santos Cordon
26e20713f1 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
 2013-05-29 15:18:43 -07:00
Dianne Hackborn
57d436d4de 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
 2013-05-29 15:18:40 -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
Amith Yamasani
9b76b2d29f Merge "framework:base: iterator error in singletone provider" 2013-05-29 22:04:01 +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
The Android Open Source Project
452b488c51 Reconcile with jb-mr2-release - do not merge 
Change-Id: I126272e67629e850e151f5601a03812c4b9b1782
 2013-05-29 08:05:59 -07:00