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

107389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
399e48e15b am f3c29813: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'f3c29813090539d398bfa7b9bd8ad8398bf23944':
 2013-05-30 14:24:18 -07:00
Jason Noguchi
8b6bbb58c8 am b809577f: 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 'b809577f46c44cd61e4f719b4cd810115bdcf367':
  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-30 14:23:54 -07:00
Victoria Lease
2595f4afe1 am 51ff6f95: (-s ours) am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev 
* commit '51ff6f953c8ddb89fdcdccc9799445b65556b711':
  break up LocationManagerService's WakeLock
 2013-05-30 14:23:49 -07:00
Dmitry Shmidt
e659f12f0f Merge "wifi: Match function prototype from libhardware_legacy" 2013-05-30 20:00:51 +00:00
Amith Yamasani
306fd7fa9e Merge "UX compliance for error messages" 2013-05-30 18:19:04 +00:00
Amith Yamasani
5a3915b06b UX compliance for error messages 
Bug: 9122154
Change-Id: I4a64750f11845a230321450bc6a2955cb73e3b6d
 2013-05-30 10:37:38 -07:00
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
Derek Sollenberger
c648ed7303 Merge "Modifications needed for updating Skia to r9286." 2013-05-30 12:06:47 +00:00
Adam Powell
087d2b2df7 Merge "Optimizations for ResolverActivity" 2013-05-30 01:43:32 +00: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
Adam Powell
0256c6f8d3 Optimizations for ResolverActivity 
Load app icons using AsyncTask instead of during list item binding.

Make sorting resolved components by display name case insensitive.

Change-Id: I8e69781ed021035b9f0dac349791b3d8a674cf60
 2013-05-29 18:14:08 -07:00
Dmitry Shmidt
ffa0242dd4 wifi: Match function prototype from libhardware_legacy 
Change-Id: Ibfffd347e22f71753b085d16f185407308b9be36
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-29 18:10:06 -07: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
Victoria Lease
c7546a504e Merge "break up LocationManagerService's WakeLock" 2013-05-30 00:08:13 +00:00
Victoria Lease
0aa28602d5 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
 2013-05-29 16:18:28 -07:00
Scott Main
e7838dc2e1 am 93c284af: am b7e75478: am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt scrolltop in video page 
* commit '93c284affe7130df4af8f4ed311ba7ee03c5de82':
  fix FF bug wrt scrolltop in video page
 2013-05-29 16:14:47 -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
Romain Guy
c4ea109ba2 Merge "Disable the AssetAtlas when running under valgrind Bug #9191438" 2013-05-29 23:02:19 +00:00
Romain Guy
80b12fcaae Disable the AssetAtlas when running under valgrind 
Bug #9191438

When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)

Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
 2013-05-29 16:01:36 -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
fb6b3348d3 am 40062914: 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 '40062914b524599c502b905100392ed513ec98bc':
  Docs bug fix: B9085293 - Stop Location Updates
 2013-05-29 15:34:30 -07:00
Scott Main
4bbc41907f am 6e9230cf: 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 '6e9230cf29c03b50d58f847b5475e47bb6b20067':
  clean up the results for 'android' in search suggestions
 2013-05-29 15:34:26 -07:00
Scott Main
8b1624c8f6 am 90a40ea8: am 369994da: am 8cf04a40: am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit '90a40ea8d9105a11b634d8b7ed518f826c584f08':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:34:23 -07:00
Scott Main
89616c5c8d am 29e24f5a: 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 '29e24f5ab174723f72c65054364c085add9503db':
  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:34:20 -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
Amith Yamasani
ce863c6fe1 am 096d3843: am 3ec14d9c: am 9b76b2d2: Merge "framework:base: iterator error in singletone provider" 
* commit '096d3843994dfef99a2670c38d72c31e96cdad74':
  framework:base: iterator error in singletone provider
 2013-05-29 15:25:44 -07:00
John Spurlock
4eea762ac8 am c00930f4: am 50ef7ab7: Docfix: remove confusing "disabled" link label. 
* commit 'c00930f4fec3590cb604f32b6c62eeb6ab429e24':
  Docfix: remove confusing "disabled" link label.
 2013-05-29 15:25:38 -07:00
Lajos Molnar
ddcbb64a2a am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit 'fabd32c1fb353c4e1437f1472de5ec2810bda329':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:25:35 -07:00
Dirk Dougherty
8f114bb2ae am 2bf15756: 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 '2bf15756cc416644a4777d76a94947bee75d8b3b':
  Doc change: adjust description of NEW_OUTGOING_CALL.
 2013-05-29 15:25:32 -07:00
Santos Cordon
bc5cfedb10 am 26e20713: am 828a77ad: am 57f0de12: am d8754689: am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '26e20713f17fa165c3f78277babeffeaeda5e652':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-29 15:25:30 -07:00
Dianne Hackborn
429d996f64 am 57d436d4: (-s ours) am 8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev 
* commit '57d436d4dec99fb3a73815040b40fe447c9f1a61':
  DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
 2013-05-29 15:25:27 -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