LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,682 Commits 2 Branches 0 Tags
45cb1b0a85458dd80fb321c7fa0502e3bd33eaa5
Commit Graph

8682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE. 
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
 2012-02-15 18:32:11 -08:00
Jean-Baptiste Queru
2ea5b27ef5 am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation."" 
* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
  Merge "Projects whitelisted for Windows SDK compilation."
 2012-02-14 14:54:27 -08:00
Jean-Baptiste Queru
96a4c2452e am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation."" 
* commit '5539b1bf6be817b538e9490c826151415f445081':
  Merge "Projects whitelisted for Windows SDK compilation."
 2012-02-14 14:51:40 -08:00
The Android Automerger
d16ed56822 merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:14:35 -08:00
Jean-Baptiste Queru
5539b1bf6b Merge "Merge "Projects whitelisted for Windows SDK compilation."" 2012-02-14 13:02:09 -08:00
Raphael Moll
f06c958f3c Merge "Projects whitelisted for Windows SDK compilation." 
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

(cherry-pick of 2b53ba5897)

Change-Id: I9ea5720291c9057aab3cd4f7f590fa2f7ae17444
 2012-02-14 11:11:06 -08:00
Jean-Baptiste Queru
44039c689e am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 
* commit 'f987c05c776918d121b7e2095a232e4854fde8a8':
  Make sure __u64 is defined even for strict ansi or -std=c99
 2012-02-13 14:29:58 -08:00
Adam Powell
58589851a6 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:19 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Jean-Baptiste Queru
f987c05c77 am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 
* commit '9ce69a5f9fc1e5e4efb19b708c9aa91cfd0969db':
  Make sure __u64 is defined even for strict ansi or -std=c99
 2012-02-13 14:27:33 -08:00
Jean-Baptiste Queru
9ce69a5f9f Merge "Make sure __u64 is defined even for strict ansi or -std=c99" 2012-02-13 14:24:04 -08:00
Scott Main
e4fd504325 am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
  docs: fix minsdkversion for native activity sample
 2012-02-09 12:16:42 -08:00
Scott Main
de797a2fb2 Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3 docs: fix minsdkversion for native activity sample 
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
 2012-02-09 12:10:27 -08:00
Janos Levai
39dc2e8d06 Fix Eclipse classpath file for ICS. 
Change-Id: I89a6489959be450b034d295c9eee9e4622643be3
Signed-off-by: Janos Levai <digistyl3@gmail.com>
 2012-02-08 18:14:44 +02:00
Adam Powell
247df4fe79 Add AppNavigation demo 
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
 2012-02-07 15:02:57 -08:00
Jesse Hall
1276f7ba04 am 0e981c83: EmuGL: Fix heap corruption 
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
 2012-02-06 13:36:19 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption 
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
 2012-02-03 22:54:24 -08:00
Trevor Johns
7b8f2c59cd am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:10:20 -08:00
Trevor Johns
87f81a89f4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:10:20 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect 
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
 2012-02-03 12:32:10 -08:00
Xavier Ducrohet
c90d4c8a09 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:47:16 -08:00
The Android Open Source Project
9114b85e63 Reconcile with ics-mr1-release 
Change-Id: I9edbfba9b4c69b550b60723b903bae30580a149b
 2012-02-01 08:42:39 -08:00
Xavier Ducrohet
df458cb832 Fix api version file with proper data enum. 
The generator tool was broken during the generics fix.

Change-Id: I7e375000ac52fba27af7992ffebb5858baf20b3a
 2012-01-31 19:18:06 -08:00
Xavier Ducrohet
ae8a60985b am e11b2d6c: Update api version file with stripped generics info. 
* commit 'e11b2d6c9f479528092a56bfe94054798e3e4831':
  Update api version file with stripped generics info.
 2012-01-31 15:49:41 -08:00
Xavier Ducrohet
e11b2d6c9f Update api version file with stripped generics info. 
Change-Id: Iac38c14115757cbfa75808ce5e476912da80543d
 2012-01-31 15:44:27 -08:00
The Android Automerger
1c33479a7c merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:41:33 -08:00
The Android Automerger
672a32cc9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:27 -08:00
The Android Open Source Project
068436ed63 Reconcile with ics-mr1-release 
Change-Id: Ibff0a60a4654253950e08e68cafddfe7c9219734
 2012-01-30 13:36:26 -08:00
The Android Automerger
9771093ab8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:22:25 -08:00
Dianne Hackborn
cafd05f0c9 am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit '97d0a1db24c5c46089e5fa6c18b0fb1a49140125':
  Fix bug in the new notification sample.
 2012-01-30 12:56:10 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00
Dianne Hackborn
376e000436 Fix bug in the new notification sample. 
Change-Id: I021c5f374857d1affdddd8be37c0f441aaf14c95
 2012-01-30 11:44:05 -08:00
Yu Shan Emily Lau
075783dcd8 am 979806b0: Regular monkey should not write script log. 
* commit '979806b0a8998654f0b491478360782c0df49498':
  Regular monkey should not write script log.
 2012-01-30 11:26:48 -08:00
Yu Shan Emily Lau
979806b0a8 Regular monkey should not write script log. 
Change-Id: I225cb01d3fb81478ea0e13cc4a6546d71d16d251
 2012-01-30 11:08:53 -08:00
Trevor Johns
8d2e2b91b7 am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 
* commit 'e12dad21f0733c3dad7dc099fc896af86e54f90e':
  Generate a valid main.py for use with developer.android.com.
 2012-01-30 10:28:39 -08:00
Trevor Johns
e12dad21f0 Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 2012-01-30 10:27:05 -08:00
Trevor Johns
662b8f1c9a Adding manual redirect support to developer.android.com. 
Internal bug: 2347145

Change-Id: I0cdcec8a23704ab80878e8cc781b735fd2173011
 2012-01-27 20:16:15 -08:00
Trevor Johns
e52271aff9 Generate a valid main.py for use with developer.android.com. 
This fixes bugs in divide_and_compress_constants.py that caused a corrupt
main.py file to be generated for developer.android.com. Specifically,
extra quotes are no longer added, __main__ is now in quotes, and
webapp.WSGIApplication() parameters are now correct.

Also moved the call to memcache_zipserve.create_handler() to a seperate
line for readability.

Change-Id: I8906c54e70b2889389a95b92d4fbcf05a6c3e22d
 2012-01-27 20:08:25 -08:00
Xavier Ducrohet
54ee466c53 am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 12:02:42 -08:00
Xavier Ducrohet
d4f9372a4d Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 2012-01-27 12:00:38 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/ 
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
 2012-01-27 11:59:10 -08:00
Robert Ly
a0def2c375 am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit '5d1dd1c68f1cefd22a67736677ab19f3fddc0033':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 09:06:29 -08:00
Robert Ly
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08:00
Martin Storsjo
6dd4b91b32 Make sure __u64 is defined even for strict ansi or -std=c99 
The x86 asm headers define __u64 regardless of __STRICT_ANSI__.
The linux/videodev2.h header requires __u64 to be defined, thus
this fixes compiling with -std=c99 when including the
linux/videodev2.h header.

In glibc, the asm/types.h header defines __u64 regardless of
__STRICT_ANSI__.

This commit copies the updated header from bionic into the ndk
platform headers.
 2012-01-27 17:54:02 +02:00
The Android Automerger
9c3b45bd1c merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:08:07 -08:00
Dianne Hackborn
e03f762787 am 85241cc7: Add button to clear back stack. 
* commit '85241cc7950e60747decf21eab81a9c6b9a3e71b':
  Add button to clear back stack.
 2012-01-24 17:19:03 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack. 
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
 2012-01-24 13:39:02 -08:00