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

110492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
cb4728f247 parse named anonymous memory for dumpsys meminfo 
Treat [anon:libc_malloc] as native heap and anything else that
starts with [anon: as unknown.

Bug: 10212959
Change-Id: Ifd120ae86e7a22291383df37d2b96f9f2dcd68b9
 2013-08-09 20:37:23 +00:00
Matthew Williams
96ca46cf87 Fix for scheduling conflicts, address fred's comments 
The last set of comments asked for a renaming. Rather than
confuse the issue now, this patch set focuses on the internals
and API changes can come later.
Renamed AnonymousSyncAdapter -> SyncServiceAdapter

Change-Id: I596ea2f7367b83b357b2f4b56e069448d5591b2a
 2013-08-09 13:37:04 -07:00
Geoffrey Borggaard
9b59e5aa9c Merge "Add a name to the DeviceOwner" into klp-dev 2013-08-09 20:27:26 +00:00
Geoffrey Borggaard
334c7e32d4 Add a name to the DeviceOwner 
We will need to display the name of the device owner (the human
readable name of the institution) to the user.
"This device is managed by google.com"

Change-Id: Ic33b6530c19cb14a118245692697205de3911a58
 2013-08-09 15:56:52 -04:00
Fabrice Di Meglio
88dced2936 Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev 2013-08-09 19:54:19 +00:00
Dianne Hackborn
d81a15c6b7 Merge "Add method for adding two ProcessStats objects together." into klp-dev 2013-08-09 19:10:38 +00:00
Dianne Hackborn
60444fd594 Add method for adding two ProcessStats objects together. 
Also move file reading code over to ProcessStats.

Change-Id: Ib42272b90a408a494044965e98beed16c0b3f8a5
 2013-08-09 12:08:17 -07:00
Fabrice Di Meglio
5af4edef08 Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev 2013-08-09 18:11:33 +00:00
Alan Viverette
26bb253b40 Fix padding adjustment for scrollbars in View, FastScroller 
BUG: 10224791,10248282
Change-Id: Ia89d2cbea163b7cad567ea37161552c1cfd66045
 2013-08-09 10:40:50 -07:00
Mathias Agopian
e4a3e936ef am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev 
* commit '2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46':
  fix-up dependencies to gl headers
 2013-08-09 06:07:21 -07:00
Romain Guy
40bac4107d am ac322988: am 00312300: Remove an unnecessary allocation 
* commit 'ac322988339d98665eff9f5937caff9a4eadd9d2':
  Remove an unnecessary allocation
 2013-08-09 06:07:18 -07:00
Jeff Sharkey
e4c088e7a4 am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev 
* commit '1faca4cd10eaff01a575288e8484a72be66f148f':
  Always include a default DocumentStack.
 2013-08-09 06:07:10 -07:00
Svetoslav
c18aa1880b am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev 
* commit '85dbba82dffd68867623ab7e881f8adb55ff0428':
  Some hygiene for the touch explorer.
 2013-08-09 06:07:02 -07:00
Jeff Sharkey
e7da9c3c4a am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev 
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
  Allow packages.list access with new GID.
 2013-08-09 06:06:58 -07:00
Jonathan Dixon
5abec6ec5f am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev 
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
  Refactor Canvas.drawPicture() to delegate to Picture
 2013-08-09 06:06:55 -07:00
Wink Saville
f90de3a2b5 am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 
* commit '8418a309a3e228538a2cf921f386326a9afe394b':
  If in a mobile captive portal is detected enable fail fast.
 2013-08-09 06:06:42 -07:00
Wink Saville
f5e5ae65aa am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
 2013-08-09 06:06:39 -07:00
Wink Saville
9a353be5d4 am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev 
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
 2013-08-09 06:06:36 -07:00
Jeff Brown
c3a0e6acaa am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
  Use new ISurfaceComposer::destroyDisplay method
 2013-08-09 06:06:33 -07:00
Wink Saville
ca4a147f41 am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev 
* commit '1a5c94fc65038c72045a5cf5509f2cf152c6c406':
  Check that hipri has started.
 2013-08-09 06:06:30 -07:00
Joe Malin
6a777a21a0 am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 
* commit '6023b8289d030e8bf88be33c5f04d298748bd6f4':
  Doc Change: Fix 10224981 error in code snippet
 2013-08-09 06:06:28 -07:00
Dianne Hackborn
2cea3d35e1 am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings... 
* commit 'db7b8e210d97548b8ed21b6453e1e4100b23a07f':
 2013-08-09 06:06:24 -07:00
Martin Kosiba
24ee60be73 Merge "Add super_onDrawVerticalScrollBar to WebView.PrivateAccess." 2013-08-09 12:38:43 +00:00
Martin Kosiba
c95fbbf2ed Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. 
This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74
 2013-08-09 13:36:35 +01:00
Mathias Agopian
2464fcdf4c am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev 
* commit '5893a97cbf398ca3e1bff5444454343d94e25a4c':
  fix-up dependencies to gl headers
 2013-08-09 04:46:15 -07:00
Romain Guy
ac32298833 am 00312300: Remove an unnecessary allocation 
* commit '003123004f7b23b3dc472d5c40b8c1a16df37a54':
  Remove an unnecessary allocation
 2013-08-09 04:46:12 -07:00
destradaa
95e57e7758 am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev 
* commit 'b4430c5c265a9456356aca71792d5d113f2454ab':
  Add FlpHal layer to support Location Batching.
 2013-08-09 02:37:16 -07:00
Dianne Hackborn
2dd43b0947 am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes. 
* commit '30d4de76b1ad224bd41c7581b5beb4ace2020398':
  Get ProcessStats callable from other processes.
 2013-08-09 02:37:13 -07:00
David Christie
8ffe6171c7 am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev 
* commit '262f3ff288d7da3be8db4c38200e5501e87a3445':
  Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION.
 2013-08-09 02:37:08 -07:00
Vinit Deshapnde
dbbcc0ae7e am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev 
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
  Use a single socket to communicate with supplicant
 2013-08-09 02:37:06 -07:00
Joe Malin
ed7ab6c304 am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178 
* commit 'a0ef14817600623efcb43fa82f308c5a104f75c4':
 2013-08-09 02:37:03 -07:00
The Android Open Source Project
efde420031 am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '8ce3bb90cdcef1bfd73b652001c0bb2cd0b2fe6b':
 2013-08-09 02:37:00 -07:00
Marco Nelissen
b204e46623 am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." 
* commit 'a279046232fe6ee42396f5f7529ed3127ce995bd':
 2013-08-09 02:36:57 -07:00
Marco Nelissen
0b800c9702 am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together." 
* commit '910ebd9ed34e5fd2b76db67b2f7e3f2be8ade6ea':
 2013-08-09 02:36:53 -07:00
Amith Yamasani
7d441b8f9d am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev 
* commit '4458c20040ca41d32f982c1a1c971cc94017930b':
  Developer option to force RTL layout
 2013-08-09 02:36:51 -07:00
David Christie
b5171e560e am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that use it (loca 
* commit '0a2ad75d2a75b22753c5543d0a5bcb71a19f2e8a':
  Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don't have to find all the different parts of the code that use it (location settings, location quick settings, power widget, etc).
 2013-08-09 02:36:48 -07:00
John Spurlock
037b958152 am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev 
* commit 'd5e9f2c1597eb406a7bda7ccfa9b11f6b18daeab':
  Fix recent regression in hideytoast.
 2013-08-09 02:36:46 -07:00
Daniel Sandler
9ff38aabf6 am 4a76922e: am d646882a: Add missing densities for HUN backgrounds. 
* commit '4a76922e6c405a9e6f5a98103a88ce4b75b895a5':
  Add missing densities for HUN backgrounds.
 2013-08-09 02:36:44 -07:00
Daniel Sandler
e4eaaccea7 am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev 
* commit '9a81e154cc1c46d67387d01d7bffb2451fdb7e7e':
  OK, now it's a release.
 2013-08-09 02:36:41 -07:00
Craig Mautner
c49976159a am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE 
* commit '3282fa984a13640c5e523a4b9fa70e7b469b432a':
  Use package CompatibilityInfo as default. DO NOT MERGE
 2013-08-09 02:36:39 -07:00
John Spurlock
55ac2033c4 am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade." 
* commit 'd9c51fdcbe053670c4dc083a0bba72b98469293e':
 2013-08-09 02:36:37 -07:00
Chris Wren
948311b332 am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent. 
* commit '60708eaf2fcfcde579d24bd22de6744f53e00e7e':
 2013-08-09 02:36:34 -07:00
Chris Wren
49f8715620 am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot" 
* commit 'e7ea9466a01f1acfbc88cf68a0a81fba4d9e3b7b':
 2013-08-09 02:36:32 -07:00
Ben Murdoch
3c073181aa am cf67ae06: am 137e5a3b: Merge "Fix the build" 
* commit 'cf67ae066ff4a4fd8b79f9f2e2be4e5cf7b4d5c9':
 2013-08-09 02:36:30 -07:00
Chris Wren
83c5fe76c2 am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification 
* commit '4cbafb6a9a91c3ad04982269c7ef635876f6f33f':
 2013-08-09 02:36:27 -07:00
Chris Wren
c97df948a1 am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade." 
* commit '10afd0f0950a16a561ed80077dc5ec6636a148e6':
 2013-08-09 02:36:25 -07:00
Chris Wren
6c495599a1 am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized." 
* commit '457d901b13aebbf9b99a7724a6ac6894ea31ee19':
 2013-08-09 02:36:22 -07:00
Chris Wren
bb7fbc37ef am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets." 
* commit '944e41fe32ea863b61cab0f8002a86f6e5a0412b':
 2013-08-09 02:36:20 -07:00
Matt Casey
d49ccaa2c2 am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services" 
* commit '2c18bc286ecc8fd9ce0ab6cdfac29198a66d0b18':
 2013-08-09 02:36:17 -07:00
Martijn Coenen
7c85bcbda4 am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host." 
* commit '38cfa9358c0aa2a33b088190ada7cc24859ac6b8':
 2013-08-09 02:36:15 -07:00