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

109173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
d6bbda2415 am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'bc5f9b66744b76c676543902d31d324f2dd02d09':
  Doc change: Update gcore reference docs.
 2013-07-11 17:54:00 -07:00
Dirk Dougherty
bc5f9b6674 Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 2013-07-12 00:50:59 +00:00
Scott Main
171699fbdd am 717fb2b6: am 334f6ea6: am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '717fb2b60d91604175f73984b1eaf8c169ae155b':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:48:00 -07:00
Scott Main
717fb2b60d am 334f6ea6: am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '334f6ea68945dd642e6a924bf399d2afd21bf107':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:46:29 -07:00
Scott Main
334f6ea689 am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '24810c6f5854e595b2c78f9c3e44b7d4045a7472':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:44:09 -07:00
Scott Main
24810c6f58 am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '3c13e5284e83390301bf3306e5d77f7014483ea0':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:41:48 -07:00
Romain Guy
6b217a4d2a Merge "Trace bitmaps decoding" 2013-07-12 00:41:24 +00:00
Scott Main
3c13e5284e am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '536fa1bbe10b793e7c5d585c974693349fb8a4f5':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:38:31 -07:00
Romain Guy
787e35793f Trace bitmaps decoding 
Also remove dead code

Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
 2013-07-11 17:37:31 -07:00
Scott Main
536fa1bbe1 am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '84ad0894be13b374b9b75e204dabea6a1579e131':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:36:53 -07:00
Scott Main
84ad0894be fix markup error in download button and fix transition to install/update guide 
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
 2013-07-11 17:33:55 -07:00
Jeff Sharkey
2248ff32ba Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 17:22:41 -07:00
Robert Greenwalt
d76a6851a8 am 6f2b31fc: am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:12:35 -07:00
Robert Greenwalt
6f2b31fcf5 am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '56a7e4ad43eb5288a80b34566db365aaaa845e87':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:09:14 -07:00
Robert Greenwalt
56a7e4ad43 am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '116d46659889f588fa9ffa5e1bc4dda90067fce6':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:07:06 -07:00
Robert Greenwalt
116d466598 Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 2013-07-12 00:04:45 +00:00
Scott Main
dd893b9db3 am 330cf2f7: am 7afc5ca3: am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '330cf2f7ffc619d51bce7901590c33adc4b0c863':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:53:19 -07:00
Scott Main
330cf2f7ff am 7afc5ca3: am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '7afc5ca353c9b4a3839c988fe6c281289495a18a':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:50:57 -07:00
Scott Main
7afc5ca353 am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:47:53 -07:00
Scott Main
57b0fed7a9 am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:44:58 -07:00
Scott Main
603c3d8a9a am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:42:47 -07:00
Scott Main
3e82a9c9a5 am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '276f0ce4df7f58786da08c34f548456129144aed':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:40:11 -07:00
Adam Powell
b4c8ba49ac Fix MenuItemImpl#hasCollapsibleActionView for action providers 
hasCollapsibleActionView was previously checking only that mActionView
was not null, even if the item had a valid ActionProvider that would
later lazily create an action view when prompted. Account for this and
attempt to create the action view if needed when
hasCollapsibleActionView is called.

Bug 8732876

Change-Id: Idf7b329770f686208882509b82a4cb13c70ef32c
 2013-07-11 16:24:12 -07:00
Scott Main
276f0ce4df update Android Studio for v0.2.0. 
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
 2013-07-11 16:22:21 -07:00
Adam Powell
639f37e7ab Merge "Un-hide all ViewParent methods" 2013-07-11 22:50:38 +00:00
Adam Powell
504a10f2f5 Un-hide all ViewParent methods 
Make it possible for code outside the framework to implement the
ViewParent interface.

Change-Id: Ic1b4eb15a4b3da1d16c92b59e039d89861d893e4
 2013-07-11 15:25:59 -07:00
Geremy Condra
1df62d2783 Merge "Permissions to protect socket marking settings" 2013-07-11 22:25:14 +00:00
Igor Murashkin
aec59fa0c8 Merge "camera2 api: Add CameraMetadata get/set support" 2013-07-11 22:17:38 +00:00
Vinit Deshapnde
64f0d5ba15 Allow enabling TDLS on specific routes 
This change exposes couple of internal APIs to enable TDLS between local
machine and a remote machine. The implementation translates client provided
remote IP to a MAC address using system ARP cache, and then instructs the
driver to enable TDLS with that endpoint. Another API takes application
specified MAC address.

Bug: 8538898

Change-Id: Ida343fc42ba3a817a4f380255596e7fb7fcdfb9b
 2013-07-11 15:12:44 -07:00
Jeff Sharkey
84b2dd8927 am df04f644: am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'df04f64434f3310d3eb71d332935616fcdc497a2':
  Recover from corrupt network stats.
 2013-07-11 14:23:28 -07:00
Scott Main
52dc4bf58d add Toshiba usb driver link 
delete Fujitsu-Toshiba
bug: 9755017

Change-Id: If1417c7e697a2bea9fbdd3086ffeaf1528627364
 2013-07-11 14:06:27 -07:00
Chad Brubaker
cca54c4dec Add NetworkManagement support for fwmark routes 
Add NetworkManagementService binds for netd's fwmark routes

Change-Id: I55cf6b198d56f1fb0d20818ddf176a0f779a33b6
 2013-07-11 13:41:40 -07:00
Adam Powell
ea04f3cfc6 Always show overflow buttons on action bars 
The menu button is not pining, it's passed on! This button is no more!
It has ceased to be! It's expired and gone to meet its maker! It's a
stiff! Bereft of life, it rests in peace! If you hadn't nailed it to a
flagship device it'd be pushing up the daisies!

THIS IS AN EX-BUTTON!!

Change-Id: Id523ef8efa7d0fa7120f8430222ac892fcafefda
 2013-07-11 13:25:58 -07:00
Igor Murashkin
b519cc52ec camera2 api: Add CameraMetadata get/set support 
* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)

Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc

Bug: 9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
 2013-07-11 13:06:56 -07:00
John Spurlock
b1d985dee0 Merge "Resolve car dock home activities properly." 2013-07-11 19:30:14 +00:00
Baligh Uddin
894ff8922e Merge "Import translations. DO NOT MERGE" 2013-07-11 18:55:30 +00:00
Baligh Uddin
45544136f5 Merge "Import translations. DO NOT MERGE" 2013-07-11 18:53:28 +00:00
Baligh Uddin
4301744539 Merge "Import translations. DO NOT MERGE" 2013-07-11 18:53:01 +00:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
 2013-07-11 11:41:24 -07:00
Jeff Sharkey
f8b692754f am 1f99a483: Recover from corrupt network stats. 
* commit '1f99a483e410811473b12d8efedd79c738df7af3':
  Recover from corrupt network stats.
 2013-07-11 11:38:50 -07:00
Romain Guy
a7691a47fe Merge "Trace list view items management" 2013-07-11 18:19:24 +00:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 11:18:53 -07:00
Robert Greenwalt
6433ef2900 Block Wifi P2p discovery while doing dhcp. 
bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
 2013-07-11 11:10:08 -07:00
The Android Open Source Project
6b0693a318 am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':
 2013-07-11 10:17:23 -07:00
Elliott Hughes
8964b3bb3d am f445a685: am 0b18c149: am 0f50cb31: Merge "Fix build." 
* commit 'f445a6856777cdcbec14342c2a3510b26ea7b675':
  Fix build.
 2013-07-11 10:17:12 -07:00
The Android Open Source Project
180535015d am f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'f51538f444ca9448d194cf184af4fd8f0554d723':
  Revert "Stop marking gamepads as keyboards"
  Revert "Temporarily disable 'Scan Always' mode"
 2013-07-11 10:17:04 -07:00
Elliott Hughes
a7ac8be1f5 am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master 
* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.
 2013-07-11 10:16:46 -07:00
Jean-Baptiste Queru
11396cfd6f am 4d380d71: am fb231fea: am 425729f9: Merge "Empty commit" 
* commit '4d380d71e06781314b052ea71ef20ed6511e560f':
  Empty commit
 2013-07-11 10:16:36 -07:00
Elliott Hughes
c5de9c3509 Merge "Track libcore API update." 2013-07-11 17:10:19 +00:00
Scott Main
792dd4c0e4 am df541931: am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'df541931f989d0421c38bea6bca7065bd7d4a292':
  update url for backup service key bug: 8834302
 2013-07-11 10:08:20 -07:00