68795 Commits

Author SHA1 Message Date
James Dong
f16a2724e0 Fix some JNI issues in the drm framework
o allocated array using new must be deleted using delete[]
o removed duplicated code

Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
2012-03-02 16:54:19 -08:00
The Android Open Source Project
1c32c8a170 am c071d874: am 37d6d98f: Reconcile with ics-mr1-release
* commit 'c071d874386564832ba0b4a87242fb786f96764c':
2012-03-02 16:51:22 -08:00
Scott Main
14db0a2ef9 am 80bc2bf7: am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
* commit '80bc2bf70571aee54eb3265f41260190fe904b6e':
2012-03-02 16:48:36 -08:00
The Android Open Source Project
c071d87438 am 37d6d98f: Reconcile with ics-mr1-release
* commit '37d6d98fe3ea739627e03b78196faba55b427503':
2012-03-02 16:48:24 -08:00
Scott Main
08e1ce82af am a9fae13e: am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
* commit 'a9fae13e81fe8211b95bd55a42f3a9b612adfe48':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:45:44 -08:00
Scott Main
80bc2bf705 am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit 'cc902c78e41549749ad98d96530bef25a3aeae47':
2012-03-02 16:44:21 -08:00
The Android Open Source Project
37d6d98fe3 Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
2012-03-02 16:43:42 -08:00
Scott Main
a9fae13e81 am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '9ad705ce0b8271931f9a09d181069c7466afade4':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:42:36 -08:00
Scott Main
cc902c78e4 am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:40:21 -08:00
Scott Main
9ad705ce0b am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:40:00 -08:00
The Android Open Source Project
b1ae294d25 am 55208109: am 3e72c93b: Reconcile with ics-mr1-release
* commit '552081091de745d5fc1114314fd0cccecfc3f38c':
2012-03-02 16:39:54 -08:00
The Android Open Source Project
552081091d am 3e72c93b: Reconcile with ics-mr1-release
* commit '3e72c93b1652ec021fa0965e432b508b847b2b74':
2012-03-02 16:35:27 -08:00
Irfan Sheriff
db9e6937f1 Merge "Enhance WPS" 2012-03-02 16:33:01 -08:00
The Android Open Source Project
3e72c93b16 Reconcile with ics-mr1-release
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
2012-03-02 16:32:56 -08:00
Scott Main
4143781cde docs: add docs for market OBB
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing

Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
2012-03-02 16:29:33 -08:00
Craig Mautner
86add4350c Fix reference to wrong ArrayList.
Fixes bug 6107296.

Change-Id: I44f2793c1c92686b276e491436a10be4f18c0d48
2012-03-02 16:09:01 -08:00
Craig Mautner
b6df928e5e Merge "Fix rotation so orientation changes aren't dropped. Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change. Fixes bug 6109189." 2012-03-02 16:06:33 -08:00
Craig Mautner
a731cd302d Fix rotation so orientation changes aren't dropped.
Modify test so that rotation animation is entered one final time after rotation completes. This last time causes mUpdateRotation to be set true forcing a test for orientation change.
Fixes bug 6109189.

Change-Id: I25475f336a3439a56b1c540205d09ee48c1d2b7c
2012-03-02 16:03:18 -08:00
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
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
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