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

100516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
dfd2cfc085 am b3d71a10: Merge "Adjust captive portal test for setup wizard" 
# Via Android (Google) Code Review (1) and Russell Brenner (1)
* commit 'b3d71a106e9f142ffe3ee901c63dac91640a74b9':
  Adjust captive portal test for setup wizard
 2013-02-14 11:36:46 -08:00
Russell Brenner
b3d71a106e Merge "Adjust captive portal test for setup wizard" 2013-02-14 19:31:46 +00:00
Russell Brenner
108da0cfa4 Adjust captive portal test for setup wizard 
During setup wizard, perform captive portal test without the typical
delays.

Change-Id: If596948e732966817aae6201440e87e19be0c2f8
 2013-02-14 11:02:10 -08:00
Craig Mautner
496bdbba30 Remove AppWindowToken lists. 
No longer necessary.

Change-Id: I0d2b96f69152fb93b6ba56f02ce9693ff1370cbc
 2013-02-14 10:56:11 -08:00
Romain Guy
feb6954da1 am 10c0aa24: Merge "Implement support for drawBitmapMesh\'s colors array" 
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '10c0aa246d9b2633c6cb4e5b714abb0031a4f4cd':
  Implement support for drawBitmapMesh's colors array
 2013-02-14 10:54:21 -08:00
Romain Guy
10c0aa246d Merge "Implement support for drawBitmapMesh's colors array" 2013-02-14 18:51:28 +00:00
Craig Mautner
187cd3e161 am 45dc56f3: Merge "Fix build." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '45dc56f3cc6cf890d2f8a28021f46ad1e9028f5e':
  Fix build.
 2013-02-14 10:39:35 -08:00
Craig Mautner
45dc56f3cc Merge "Fix build." 2013-02-14 18:36:10 +00:00
Craig Mautner
ee006a14b2 Fix build. 
Change-Id: I6fb00530536e5203d89805141792289ed7c1d8e3
 2013-02-14 10:35:32 -08:00
Craig Mautner
102f711043 am 534d136a: Merge "Remove unused App methods." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '534d136aa66fb13f7c1b482513627de45c218c29':
  Remove unused App methods.
 2013-02-14 10:16:57 -08:00
Craig Mautner
534d136aa6 Merge "Remove unused App methods." 2013-02-14 18:13:26 +00:00
Jeff Sharkey
ead9389fd2 Remove throttle settings, no longer needed. 
Since the throttle feature has been removed, its configuration
settings are no longer needed.

Change-Id: Iaf3cb74a372d43d580f42566d21843a2eb653d3e
 2013-02-14 09:52:42 -08:00
Robert Greenwalt
9678c61fec am fd869887: Merge "Fix a permissions probem in ConnectivityManager" 
# Via Android (Google) Code Review (1) and Robert Greenwalt (1)
* commit 'fd869887c3477bb2699b72ea752a8466602ea637':
  Fix a permissions probem in ConnectivityManager
 2013-02-14 08:46:28 -08:00
Robert Greenwalt
fd869887c3 Merge "Fix a permissions probem in ConnectivityManager" 2013-02-14 16:43:33 +00:00
Craig Mautner
ac30688b0a am f0b36c55: Merge "Refactor setAppOpVisibility implementation." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit 'f0b36c559074718c5e932c20a9931d97d9c061ef':
  Refactor setAppOpVisibility implementation.
 2013-02-13 22:23:40 -08:00
Craig Mautner
f0b36c5590 Merge "Refactor setAppOpVisibility implementation." 2013-02-14 06:22:32 +00:00
Jason Sams
58300de305 am 30d2f8d6: Merge "Convert live preview demo to IO_OUTPUT" 
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '30d2f8d6e0c26dd32dc8b737170253f015156591':
  Convert live preview demo to IO_OUTPUT
 2013-02-13 18:48:21 -08:00
Jason Sams
30d2f8d6e0 Merge "Convert live preview demo to IO_OUTPUT" 2013-02-14 02:45:40 +00:00
Jeff Sharkey
b65ce57675 Expose longer statfs values, add derived values. 
Since fsblkcnt_t is 8 bytes, provide methods to access larger value
instead of casting to int.  This would start being an issue around
8TB filesystems.

Also add convenience methods to calculate values in bytes.

Change-Id: Ib924425d8d6d82785466f611ca71800cc1e952b6
 2013-02-13 18:40:35 -08:00
Romain Guy
ff316ec7a7 Implement support for drawBitmapMesh's colors array 
Change-Id: I3d901f6267c2918771ac30ff55c8d80c3ab5b725
 2013-02-13 18:39:43 -08:00
Jeff Sharkey
221badd071 am 7e72a693: Merge "Remove sscanf() warnings when parsing stats." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7e72a693cfe2facc701d7202d91c211d212ce20e':
  Remove sscanf() warnings when parsing stats.
 2013-02-13 18:18:07 -08:00
Jeff Sharkey
1f6692f1f9 am aec6bcfb: Merge "Parse network stats using native code." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit 'aec6bcfb767a4b9dfd391bff338a8ff284b29549':
  Parse network stats using native code.
 2013-02-13 18:14:31 -08:00
Jeff Sharkey
7e72a693cf Merge "Remove sscanf() warnings when parsing stats." 2013-02-14 02:14:17 +00:00
Jeff Sharkey
9de56d220e Remove sscanf() warnings when parsing stats. 
Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
 2013-02-13 18:13:01 -08:00
Jeff Sharkey
aec6bcfb76 Merge "Parse network stats using native code." 2013-02-14 02:12:31 +00:00
Daniel Sandler
7eb092a39c am 2977a30e: Merge "More debug logs for stuck statusbars." 
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit '2977a30ef422f2be4a5ef74dd1a5a32a6a8f994b':
  More debug logs for stuck statusbars.
 2013-02-13 17:55:15 -08:00
Daniel Sandler
2977a30ef4 Merge "More debug logs for stuck statusbars." 2013-02-14 01:49:59 +00:00
Daniel Sandler
37a38aaecb More debug logs for stuck statusbars. 
Bug: 7686690
Change-Id: Ic58d90a56412579cad0c77f5787a6fc4193a32d1
 2013-02-13 20:47:48 -05:00
Jeff Sharkey
9a2c2a6da9 Parse network stats using native code. 
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.

Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
 2013-02-13 17:40:49 -08:00
Fabrice Di Meglio
c504c4e51d am 336fcac3: Merge "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey" 
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '336fcac31ddccc7e7a6773d03e7cb17967ebb898':
  Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey
 2013-02-13 17:38:31 -08:00
Fabrice Di Meglio
336fcac31d Merge "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey" 2013-02-14 01:35:53 +00:00
Fabrice Di Meglio
ebcacc785b Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey 
- remove remaining dirFlags
- clean method names

Change-Id: I404b643cd10321e977530528168d1d415b3f2eca
 2013-02-13 17:22:52 -08:00
quddusc
83615b4ed8 am 66a4d9cd: am 6b4d73c9: am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (5) and others
* commit '66a4d9cd33b2d253b71acaa9142c66be17ce66e4':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:21:38 -08:00
quddusc
66a4d9cd33 am 6b4d73c9: am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '6b4d73c985996cf3fd1333edc073b5260c9d897e':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:19:31 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
cdcc2e58e9 am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '68785da7a052c75f73f3857ed97b74c3c03883c0':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:15:33 -08:00
quddusc
68785da7a0 am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '62bd23190bdf559c6297ddcc991d18449c2e9d48':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:14:37 -08:00
Kenny Root
f22d550195 am 1247c0a1: am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Android Git Automerger (2) and others
* commit '1247c0a11d54478158dafcaeedd7e49a6b99fb1f':
  VpnDialogs: filter obscured touches
 2013-02-13 17:13:35 -08:00
quddusc
62bd23190b am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and quddusc (1)
* commit '38b6d7a15c6d5196f9b886f15dc58c28734300da':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:12:40 -08:00
Kenny Root
1247c0a11d am a276589b: am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Android Git Automerger (1) and others
* commit 'a276589ba5439e6b06a4f49de7420fbf45104c80':
  VpnDialogs: filter obscured touches
 2013-02-13 17:11:34 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
Kenny Root
a276589ba5 am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '37edbbc62fa031c75ce5a1298fdd07d981907e89':
  VpnDialogs: filter obscured touches
 2013-02-13 17:09:22 -08:00
Mathias Agopian
f9136fd969 get rid of Surface.getIdentity() 
Change-Id: I8b70d77cc1b38009ad71d92025c3beb481a18866
 2013-02-13 17:01:42 -08:00
Michael Runge
8a593a31e4 am 044dca28: Merge "Add logging for kernel audit failures, including SELinux." 
# By Geremy Condra
# Via Android (Google) Code Review (1) and Geremy Condra (1)
* commit '044dca285f567863a5ab345ac139f1fa31cac2cc':
  Add logging for kernel audit failures, including SELinux.
 2013-02-13 16:54:35 -08:00
Michael Runge
044dca285f Merge "Add logging for kernel audit failures, including SELinux." 2013-02-14 00:52:31 +00:00
Kenny Root
37edbbc62f Merge "VpnDialogs: filter obscured touches" 2013-02-14 00:49:20 +00:00
Chris Craik
0229d0818c am 805a6fe7: Merge "Revert "Revert "Use RenderScript for large text blurs""" 
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit '805a6fe7b1417640ccaf7914171cb65515b6ab39':
  Revert "Revert "Use RenderScript for large text blurs""
 2013-02-13 16:45:46 -08:00
Jean-Michel Trivi
b5dc902580 am 4627a47d: Merge "Remove obsolete imports" 
# Via Android (Google) Code Review
* commit '4627a47d94a5322b9a3cea02645929b260a6ee16':
  Remove obsolete imports
 2013-02-13 16:45:44 -08:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Chris Craik
805a6fe7b1 Merge "Revert "Revert "Use RenderScript for large text blurs""" 2013-02-14 00:44:17 +00:00