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

122509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
15a07a21eb Use path outlines to define shadow shapes 
Fixes the simplifying assumption that shadow casters were always
rectangular.

Java side APIs + plumbing to pass down correct shapes still need to be added.

Change-Id: Ic4fee90af15679951a44bb5cc6ae454b98c4c194
 2014-01-26 13:43:53 -08:00
Chris Craik
bb615a6ffb Clear root level reorder lists to prevent accessing stale DisplayLists 
bug:12581401

Adds temporary logging which should log/crash earlier on incorrectly
reordering hierarchies.

Change-Id: Iee00940718c3cc868161e754aff93cd3b2747094
 2014-01-24 15:01:40 -08:00
Narayan Kamath
8435cf0d8b Merge "Hide android.os.Parcel.obtain(int)." 2014-01-24 14:59:06 +00:00
Narayan Kamath
01664b3709 am 5d094b94: am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '5d094b947b328d2631a0203c1527b0c7c20ce219':
  Remove unused field from AssetManager.
 2014-01-24 09:52:55 +00:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
 2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
 2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
 2014-01-24 01:42:08 -08:00
Narayan Kamath
8005b9af11 am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '3c30eff63fb33901df4e040ecce78f7755be588f':
  Remove unused field from AssetManager.
 2014-01-24 01:39:47 -08:00
Narayan Kamath
3c30eff63f Merge "Remove unused field from AssetManager." 2014-01-24 09:27:48 +00:00
Selim Gurun
d3dac575aa Merge commit '2474ebe8' into manualmerge 2014-01-23 15:40:34 -08:00
Selim Gurun
632f160463 Merge commit '647c5160' into manualmerge 2014-01-23 15:07:53 -08:00
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:39:53 -08:00
Selim Gurun
d261243c14 am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:37:15 -08:00
Selim Gurun
a3106d1dbe Merge "Revert "Adding freeMemoryForTests static method to WebView."" 2014-01-23 22:26:33 +00:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView." 
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
 2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:54:15 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 11:51:22 -08:00
Selim Gurun
016075239f am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'f6d69ae0f9215e08137b010acb4076a30e3d28c6':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 11:49:00 -08:00
Selim Gurun
f6d69ae0f9 Merge "Adding freeMemoryForTests static method to WebView." 2014-01-23 19:42:19 +00:00
Selim Gurun
c6a2a6e20f Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
Bug: b/10629847

(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
 2014-01-23 11:21:00 -08:00
Baligh Uddin
2cb1bd2753 Merge "Import translations. DO NOT MERGE" 2014-01-23 17:11:15 +00:00
Baligh Uddin
ae39968fae Import translations. DO NOT MERGE 
Change-Id: Ie068d31c1845ef03118ea7c45e04f729ec3a12df
Auto-generated-cl: translation import
 2014-01-23 08:04:07 -08:00
Baligh Uddin
ff86e532dc Import translations. DO NOT MERGE 
Change-Id: I5d41b182178898b84085e67b192b8d2f1c27fcc9
Auto-generated-cl: translation import
 2014-01-23 07:56:14 -08:00
Narayan Kamath
b34a4615f8 Hide android.os.Parcel.obtain(int). 
This will break on 64 bit because 64 bit pointers are
wider than java int.

Also, this method technically isn't a public API because
it's a protected method on a final class. It shows up in
our api.txt files because of a quirk in the API generation
system.

Change-Id: I2b574943008ed34696b048195c0cac6af1aa0a3b
 2014-01-23 14:26:29 +00:00
Narayan Kamath
62b570e2fe Merge "Java7 Locale & Script related changes." 2014-01-23 09:39:44 +00:00
Christopher Tate
91beb94c65 resolved conflicts for merge of a5bb65aa to master 
Change-Id: Ib286d5194f68c55cfd2e5c17a5eb89ea32add574
 2014-01-22 19:02:04 -08:00
Christopher Tate
a5bb65aaf0 am f2c67e24: am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit 'f2c67e24e460e0d887bdd5167fccac9d5c54f34a':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-23 01:56:39 +00:00
Christopher Tate
f2c67e24e4 am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '8bc01824b999f097aa211c9de9e4dff6a0497432':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-23 01:50:10 +00:00
Christopher Tate
8bc01824b9 am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '094efb3f5350b3ce95dcc790bc237c5caa901a20':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-22 17:47:04 -08:00
Christopher Tate
094efb3f53 am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '407f74f494e5374d9bdceae9d9fb453aa8270f6b':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-22 17:43:52 -08:00
Christopher Tate
407f74f494 Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 2014-01-23 01:40:37 +00:00
Dirk Dougherty
052665d972 am 6cc8c56a: am 830b3df3: am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '6cc8c56a14f509e6e37b175e4255225da411d317':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:47:09 +00:00
Dirk Dougherty
6cc8c56a14 am 830b3df3: am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '830b3df3fa226a961deb35bd39cb49eb6eccbf56':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:43:10 +00:00
Dirk Dougherty
830b3df3fa am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '6bc2bb15fe25a4378a759d697de12de0c8d8725f':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:40:07 +00:00
Dirk Dougherty
6bc2bb15fe am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '9971cbe92284e589d6540cbf22f17c816692bb62':
  Add samples TOC generated from browsable sources.
 2014-01-22 16:36:34 -08:00
Dirk Dougherty
9971cbe922 am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '94ac4f6855d84c6d40006002f43ad1f1a0447954':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:33:06 +00:00
Dirk Dougherty
94ac4f6855 Add samples TOC generated from browsable sources. 
(cherry picked from commit 1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)

Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda
 2014-01-23 00:28:35 +00:00
Christopher Tate
85642f8b23 am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit '222496f82fb78473a876da5dc395714b0fa5b99c':
  Only send storage intents after boot complete
 2014-01-23 00:05:29 +00:00
Christopher Tate
222496f82f am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit '5d734dbc56cd2d4350f4a35f1bedbb6b40247e5c':
  Only send storage intents after boot complete
 2014-01-23 00:01:01 +00:00
Christopher Tate
5d734dbc56 am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit 'e1d18f6eb0e46b7a71ce7cf9ddb1c60dd7ad054f':
  Only send storage intents after boot complete
 2014-01-22 23:57:47 +00:00
Christopher Tate
e1d18f6eb0 am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit '0e3df21642122ae8a43be1a35723782bdd417b7a':
  Only send storage intents after boot complete
 2014-01-22 15:53:58 -08:00
Christopher Tate
0e3df21642 am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit 'cc81bcece411794b4eac6b03b7700a0214fdbb87':
  Only send storage intents after boot complete
 2014-01-22 15:50:31 -08:00
Christopher Tate
cc81bcece4 Merge "Only send storage intents after boot complete" 2014-01-22 23:46:58 +00:00
Marco Nelissen
a0914864f4 Merge "Check that the exif bits are actually there" 2014-01-22 23:12:32 +00:00
Marco Nelissen
0937eed32f Check that the exif bits are actually there 
b/12663599

Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c
 2014-01-22 15:10:57 -08:00
Dianne Hackborn
39e79006cf Merge "Battery stats improvements." 2014-01-22 22:18:13 +00:00
Dianne Hackborn
099bc627c4 Battery stats improvements. 
- Adjust total power use when there is unaccounted power so that our
  percentages don't end up > 100%.
- Fix accounting of isolated uids to be against the owning real app
  uids.
- Rework how we put cpu use into the battery stats to no longer need
  this uid name cache that can confuse the uid it is associated with.
- Finish implementing events in the history, adding a string pool and
  reading/writing/dumping them.
- Add first two events: processes starting and finishing.
- Fix alarm manager reporting of wakeup alarms to be adjusted by the
  WorkSource associated with the alarm, so they are blamed on the
  correct app.
- New "--history" dump option allows you to perform a checkin of
  only the history data.
- Fixed BitDescription bug that would cause incorrect printing of
  changes in some states.

Change-Id: Ifbdd0740132ed178033851c58f165adc0d50f716
 2014-01-22 14:09:02 -08:00