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

68832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
dc043b58cb Merge "Fix flash" 2012-03-02 15:37:53 -08:00
Svetoslav Ganov
2e9e02fd33 Merge "Sync of the NumberPicker attributes with the public Java APIs" 2012-03-02 15:33:33 -08:00
Svetoslav Ganov
72d403ce35 Merge "Sync of the TimePicker attributes with the public Java APIs." 2012-03-02 15:33:20 -08:00
Svetoslav Ganov
e8331bd2e7 Sync of the NumberPicker attributes with the public Java APIs 
1. Renamed some attributes to not overlap with already public
   ones since they are not dedicated for external use.

bug:6094713
bug:6104108

Change-Id: Iab8a906680ebcaa91f020ffbf55cf603a1071437
 2012-03-02 15:15:38 -08:00
Svetoslav Ganov
53b948d3ae Sync of the TimePicker attributes with the public Java APIs. 
1. Renamed an attribute which is not mean to be public so
   its name is not the same as that of an already public one.

bug:6094713

Change-Id: I3f8b3f3840b88265069d3474be7db04056d219c1
 2012-03-02 14:58:12 -08:00
Svetoslav Ganov
3ee7ce2be3 Merge "Fixing the build for real." 2012-03-02 14:57:42 -08:00
Svetoslav Ganov
4b3cdbb2cf Fixing the build for real. 
Change-Id: I6400e599cdf0d2e94d3ac024b9b32de55b1e3760
 2012-03-02 14:56:27 -08:00
Irfan Sheriff
b3ef538fe6 Merge "Fix connect on a network id with zero" 2012-03-02 14:48:51 -08:00
Svetoslav Ganov
cbed96ae47 Merge "Fixing the build" 2012-03-02 14:45:58 -08:00
Svetoslav Ganov
56232eb14a Fixing the build 
Change-Id: Idfb7092dbc707d7626191294f10c9f4d382b2796
 2012-03-02 14:43:19 -08:00
John Reck
f72a4464e6 Fix flash 
Bug: 6110088

Change-Id: Ic7ecb9d773021a0cde803a3920ad716496ccc9ae
 2012-03-02 14:21:18 -08:00
Irfan Sheriff
86a5f5b9af Enhance WPS 
- Add a cancel API
- Add more error reporting on WPS
- Fix network status reporting that showed up with new implementation

Change-Id: I499796c80d16d18df95fb702d029aa7e7283b603
 2012-03-02 14:09:53 -08:00
Svetoslav Ganov
d56ab1e3a1 Merge "Sync of the DatePicker attributes with the public Java APIs." 2012-03-02 14:03:16 -08:00
Glenn Kasten
92454de63c Merge "Fix typos and line length in AudioRecord comments" 2012-03-02 13:48:35 -08:00
Svetoslav Ganov
c49a8be0d2 Sync of the DatePicker attributes with the public Java APIs. 
1. Deprecated two old attributes.

2. Renamed an attribute which is not mean to be public so
   its name is not the same as that of an already public one.

bug:6094713

Change-Id: I577a9e191cbd05cd18cb34105dcdbe53c0a5dd1e
 2012-03-02 13:39:29 -08:00
Svetoslav Ganov
45e96fd28a Merge "Adding getter/setter for all public attributes in CalendarView." 2012-03-02 13:12:22 -08:00
Jeff Sharkey
e861b42379 Allow disk I/O while performing dump(). 
Add Closeable to ParcelFileDescriptor, and always close any incoming
PFDs when dumping.

Bug: 6106309
Change-Id: I25b465692d5e1da0a5980a307cb48a058bc2bca7
 2012-03-02 12:31:27 -08:00
Irfan Sheriff
ab26407124 Fix connect on a network id with zero 
Pass invalid network id on arg1 when using a config object

Change-Id: I8ef047c951911324d9bf79b744c3e7122bb73bae
 2012-03-02 12:24:44 -08:00
Robert Greenwalt
49537043da Merge "Fix the bug net.dns1.pid is same as net.dns2.pid" 2012-03-02 12:00:50 -08:00
The Android Automerger
1df09612c2 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00
Daniel Lam
d137cc7c92 BufferQueue: fixed acquire operation 
Bug: 6082872
Change-Id: I897dc61eb84fed953e51f97871cd3ae6321505d4
 2012-03-02 11:30:56 -08:00
Alon Albert
e6e47f0517 Merge "Add a displayColor column to view_events" 2012-03-02 11:25:54 -08:00
Jeff Brown
8dc3cc2e13 Allow the SQLite sync mode to be set independently for WAL. 
This change leaves the sync mode at FULL for both WAL and non-WAL
but makes it easy to change it for one but not the other.

To reduce the number of synchronous writes, it might make sense to
change the sync mode for non-WAL to NORMAL instead of FULL which
should be just as safe.

On the other hand, the sync mode for WAL should probably remain FULL
because there may be an impact on transaction durability otherwise.

Initial experiments show that there might not be a significant
performance benefit to using NORMAL, but we may revisit this later.

Change-Id: Ifcd55bedcfefa6600974c2295ca5d4163b408cbf
 2012-03-02 11:17:16 -08:00
Jeff Brown
24dc6aa03e Change default journal mode to PERSIST. 
Change-Id: I5a72ede093be3ea0f7445df970051ae153f57fed
 2012-03-02 11:17:16 -08:00
Jeff Brown
d2cca91e92 Merge "Add an API for deleting databases." 2012-03-02 11:15:41 -08:00
Jeff Brown
db3c6b8c0d Merge "Adjust WAL checkpoint interval." 2012-03-02 11:15:28 -08:00
Jean-Michel Trivi
dddfc119e2 Merge "Correct GUID errors in audio effect configuration" 2012-03-02 11:11:05 -08:00
James Dong
e43dadffb8 Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes" 2012-03-02 11:01:27 -08:00
Adam Powell
1a7dd039f1 Unhide transient state APIs on View 
Change-Id: I0f14728c94cd3461431352e6f01311934aec9858
 2012-03-02 10:44:36 -08:00
yoonsung.nam
7b72ea71b9 Fix the bug net.dns1.pid is same as net.dns2.pid 
writePidDns() does not increase the index in case first given dns
already exist in the property.

Change-Id: I1129d0042929b3ee119160e53cae0e4143c7ea88
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
 2012-03-02 10:23:03 -08:00
Martijn Coenen
c13accb265 Merge "Hidden API for setting p2p NFC modes." 2012-03-02 10:13:07 -08:00
Jean-Michel Trivi
ae0b36f93f Correct GUID errors in audio effect configuration 
Correct erroneous spaces that were present in some audio effect GUIDs.

Change-Id: Ide3a1552b2f8976f96ee980f1341f935555656d9
 2012-03-02 09:58:05 -08:00
Alon Albert
dc927307ec Add a displayColor column to view_events 
Change-Id: I0f73685ec75e56929553b01d6ede0ad11fba55f4
 2012-03-02 09:43:17 -08:00
Teng-Hui Zhu
ec418d3eae Merge "Make sure egl context is valid for the onTrimMemory call" 2012-03-02 09:41:14 -08:00
Robert Ly
0bf89b3052 am 4c7992e9: am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '4c7992e9d2fc0c73c938cd3d06da27fc6a3efe00':
 2012-03-02 09:14:33 -08:00
Robert Ly
861d5ecc7c am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'b962b98bef33eba634aec41cf9d84527ce9db3bb':
  docs: fixing bug 5942573
 2012-03-02 09:11:54 -08:00
Robert Ly
4c7992e9d2 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'd559bc79d546f1b448cc43851de5f43babc81795':
 2012-03-02 09:10:22 -08:00
Robert Ly
b962b98bef am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '67a15457d184f01fffe162a0983d0b507cb7b358':
  docs: fixing bug 5942573
 2012-03-02 09:09:30 -08:00
Robert Ly
d559bc79d5 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
67a15457d1 am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
e5e11fd666 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
George Mount
062d6d51f2 Merge "Quick fix for Monkey NPE." 2012-03-02 08:43:43 -08:00
Dianne Hackborn
6c9e5d4129 am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'd4202c9d138459a60fde708ecda995f3b599d252':
 2012-03-02 08:42:22 -08:00
Dianne Hackborn
817d5fb864 am 5d87d51f: am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '5d87d51fab7e17793413c9095028963117e276b8':
  Make ResolverActivity update dynamically.
 2012-03-02 08:39:39 -08:00
Dianne Hackborn
d4202c9d13 am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '921e83039d266b6d288fd5e09160d878eccb9e23':
 2012-03-02 08:37:48 -08:00
Dianne Hackborn
5d87d51fab am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'f65951bf5db7a248651cbfa89886d773f95c3e03':
  Make ResolverActivity update dynamically.
 2012-03-02 08:36:05 -08:00
Dianne Hackborn
f65951bf5d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:22 -08:00
Dianne Hackborn
921e83039d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:21 -08:00
Dianne Hackborn
0dd9ec144b Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
George Mount
9a676bfb5f Quick fix for Monkey NPE. 
Bug 6097462
 If paste window is shown before the insert thumb, an NPE
 would be thrown. This will be fixed fully later when the paste
 window is showing up only at the proper times rather than every
 time the insert thumb is shown.

Change-Id: I91eec7c28fc64a2274f5c3cd36784fedcae055ca
 2012-03-02 07:40:38 -08:00