LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,639 Commits 2 Branches 0 Tags
652f9784738c6cd77f323c97227f815cfd285fec
Commit Graph

10639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
652f978473 am 7b487466: Clean up Global settings stragglers. 
* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
  Clean up Global settings stragglers.
 2012-09-26 20:16:51 -07:00
Jeff Sharkey
7b4874660e Clean up Global settings stragglers. 
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
 2012-09-26 17:10:48 -07:00
Andrew Hsieh
4d6e7a3b9f am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused" 
* commit '24e005a234eae1def238e4521481e7399b880bf6':
  Replace __unused in linux/sysctl.h with __linux_unused
 2012-09-26 15:50:00 -07:00
Andrew Hsieh
24e005a234 am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused" 
* commit 'c7daea046b9f05fb07936bafd2f7436478781a2d':
  Replace __unused in linux/sysctl.h with __linux_unused
 2012-09-26 15:48:00 -07:00
Andrew Hsieh
c7daea046b Merge "Replace __unused in linux/sysctl.h with __linux_unused" 2012-09-26 15:32:50 -07:00
Andrew Hsieh
36ffaf5406 Replace __unused in linux/sysctl.h with __linux_unused 
To avoid conflict with "#define __unused" in sys/cdefs.h

See
  https://android-review.googlesource.com/#/c/43479
  https://android-review.googlesource.com/#/c/43565

Change-Id: I6b8155570f4398b3ee8845d75bd231bca7f1d86f
 2012-09-26 15:11:39 -07:00
The Android Open Source Project
776db9f1e1 Reconcile with jb-mr1-release - do not merge 
Change-Id: I7aacf788266531fc9b333554cbdae78711b794f7
 2012-09-26 09:06:10 -07:00
The Android Automerger
7862fb2a20 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 06:59:17 -07:00
Adam Momtaz
0fc87b400f am 28542540: Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 
* commit '28542540043817912576e6e6f43e0ca804948d75':
  Added UiAutomator samples to SDK
 2012-09-25 19:08:37 -07:00
Adam Momtaz
2854254004 Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 2012-09-25 19:06:57 -07:00
Adam Momtaz
8213206c6e Added UiAutomator samples to SDK 
Verified tests are building OK.

Change-Id: I838e44e84b3d9e2e503bff4ed2b95887996d8801
 2012-09-25 17:15:17 -07:00
Dianne Hackborn
b441bc8c76 am 7263dad2: Update API demos to match new tab interaction. 
* commit '7263dad223864b9be5aa3458dabdc6f0d8db1f0c':
  Update API demos to match new tab interaction.
 2012-09-25 17:11:42 -07:00
Dianne Hackborn
7263dad223 Update API demos to match new tab interaction. 
Follow changes to FragmentTabManager to continue to work
correctly with it.  Fix the code in the base API demo (which
can't use FragmentTabManager) to work correctly.

Bug #7232088: ListView saved state being lost in some cases

Change-Id: Ib7ba1ab20ff00f2cc95c9f6024ab94783237c9be
 2012-09-25 15:07:06 -07:00
The Android Automerger
9babfd842c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 06:59:23 -07:00
Andy Stadler
7a494bafc0 am e61482e7: Fix .classpath to track bouncycastle/bcprov 
* commit 'e61482e7e58e73f2b8777719afd92cf75681bb3c':
  Fix .classpath to track bouncycastle/bcprov
 2012-09-24 17:39:42 -07:00
Andy Stadler
e61482e7e5 Fix .classpath to track bouncycastle/bcprov 
Change-Id: If8d142ebc96eb76f1e0b12a8d741f2e91b5d8598
 2012-09-24 17:34:26 -07:00
Xavier Ducrohet
45480c46dd am 34580b76: am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit '34580b76b65d83c3085fc63911b3651ce5dc8a57':
  Update platform-tools sdk comp to 15.
 2012-09-24 15:01:58 -07:00
Xavier Ducrohet
34580b76b6 am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit 'fa82c449aefa2a5d47d2342318a64ecb906bd1a9':
  Update platform-tools sdk comp to 15.
 2012-09-24 14:59:25 -07:00
Xavier Ducrohet
fa82c449ae am 45825eae: Update platform-tools sdk comp to 15. 
* commit '45825eae6b2f0436a52699db95644c6477cb6ce9':
  Update platform-tools sdk comp to 15.
 2012-09-24 14:57:36 -07:00
Xavier Ducrohet
45825eae6b Update platform-tools sdk comp to 15. 
Change-Id: Icdcf530ea223c1181b9be9bc1029f126c5558f1d
 2012-09-24 14:54:59 -07:00
Andrew Hsieh
b268da2bcc am 47b1e0b6: am b07d7f6c: Merge "Update NDK headers" 
* commit '47b1e0b6f7b31c644b156baba12613dfbc7c740f':
  Update NDK headers
 2012-09-24 14:05:15 -07:00
Andrew Hsieh
47b1e0b6f7 am b07d7f6c: Merge "Update NDK headers" 
* commit 'b07d7f6c25fe3ea99186c2cdb034449e75419518':
  Update NDK headers
 2012-09-24 14:03:09 -07:00
Andrew Hsieh
b07d7f6c25 Merge "Update NDK headers" 2012-09-24 13:54:51 -07:00
Daniel Sandler
02d2b19fb6 am 35d22bff: Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev 
* commit '35d22bff7a9010c68f079e5e401b1ae3b5847f51':
  Add screensavers to default Eclipse classpath.
 2012-09-24 13:43:48 -07:00
Daniel Sandler
35d22bff7a Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev 2012-09-24 13:42:41 -07:00
Andrew Hsieh
c6427a73a2 Update NDK headers 
Sync NDK headers with bionic's.  Most are new symbols.
The only big differences are in arch-mips/include/asm:

1) arch-mips/include/asm/unistd.h, see
   https://android-review.googlesource.com/#/c/40875
2) arch-mips/include/asm/*, see
   https://android-review.googlesource.com/#/c/43335
   https://android-review.googlesource.com/#/c/43440
   https://android-review.googlesource.com/#/c/43401

Change-Id: I8204f9b5f2f2c14a31dc28efc8a9d8c66cf73fe2
 2012-09-24 12:31:43 -07:00
Andrew Hsieh
1dc9b29576 am cbe16156: am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit 'cbe16156939bf4637384885c093fd4ec6e3bc72d':
  Update README.CRT.TXT
 2012-09-24 10:20:00 -07:00
Andrew Hsieh
cbe1615693 am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit '0f0de77b131455192e51a0723fb7a79876a4ca17':
  Update README.CRT.TXT
 2012-09-24 10:16:42 -07:00
The Android Open Source Project
6045fb06c5 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3660c9875037e7074623adeeeada1ff476413013
 2012-09-24 10:11:31 -07:00
Andrew Hsieh
0f0de77b13 am b034233a: am 3c901267: Merge "Update README.CRT.TXT" 
* commit 'b034233afae873b98b1b70841439b09fe5d58773':
  Update README.CRT.TXT
 2012-09-24 09:29:54 -07:00
Andrew Hsieh
b034233afa am 3c901267: Merge "Update README.CRT.TXT" 
* commit '3c901267609c17645999aa7a8ca95413ad528038':
  Update README.CRT.TXT
 2012-09-24 09:28:50 -07:00
Andrew Hsieh
3c90126760 Merge "Update README.CRT.TXT" 2012-09-24 09:24:05 -07:00
Daniel Sandler
91fd25b045 Add screensavers to default Eclipse classpath. 
Change-Id: I691634e0f2dd6e3436087302caa09c9fb1eb92c2
 2012-09-22 20:29:34 -04:00
The Android Automerger
ee35616185 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:41:28 -07:00
Andrew Hsieh
a0de803db8 Update README.CRT.TXT 
Change-Id: I7d0ec48c09c47081c01c9366faf993317990b237
 2012-09-21 18:50:16 -07:00
Yu Shan Emily Lau
0c8fe324e5 am 1e1926db: Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev 
* commit '1e1926db0775acd045260511e5c2b62e596e377d':
  For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard.
 2012-09-21 16:25:54 -07:00
Yu Shan Emily Lau
1e1926db07 Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev 2012-09-21 16:24:28 -07:00
Yu Shan Emily Lau
b894c71af8 For the recent SD card access change. 
The non-zogyte process need to use the
Environment#getLegacyExternalStorage to access the sdcard.

Change-Id: I797d235954defe25e1bd8728f167250e4f9d0fe9
 2012-09-21 16:20:12 -07:00
Jim Miller
253dbf5569 am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev 
* commit '81a6b985e4abef7b2be291eb8aa0b85cc78cfd2a':
  Add test case for new keyguard widget API
 2012-09-21 15:25:49 -07:00
Jim Miller
81a6b985e4 Merge "Add test case for new keyguard widget API" into jb-mr1-dev 2012-09-21 15:22:28 -07:00
Brett Chabot
523f3f894d am 99f717d7: Fix runtest syntax. 
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
  Fix runtest syntax.
 2012-09-21 13:06:16 -07:00
Brett Chabot
99f717d7d8 Fix runtest syntax. 
Change-Id: Ief41103c14c30d53f6c2fe8af5511386d57894c2
 2012-09-21 13:01:03 -07:00
Brett Chabot
834218e7fb am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev 
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
  Make coverage work without test defs.
 2012-09-21 12:36:19 -07:00
Brett Chabot
e1bb1d3be9 Merge "Make coverage work without test defs." into jb-mr1-dev 2012-09-21 12:33:55 -07:00
Jim Miller
84fb279107 Add test case for new keyguard widget API 
Change-Id: Ibcb19c15964f4ea4bad36ec102e9aed8b4ea9c41
 2012-09-20 23:46:30 -07:00
The Android Open Source Project
3ad7d24a9f Reconcile with jb-mr1-release - do not merge 
Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a
 2012-09-20 10:35:10 -07:00
Brett Chabot
8ac51186a6 Make coverage work without test defs. 
Change-Id: I946df038e97dc5c2f40a4610d4076e13ab6bde37
 2012-09-20 08:06:05 -07:00
The Android Automerger
7281ec92ae merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 06:59:26 -07:00
Brett Chabot
f5e9dcd829 am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev 
* commit '42c14447df3f46d1176675c0e021726bf6087519':
  Fix install of full build packages.
 2012-09-20 06:08:13 -07:00
Brett Chabot
42c14447df Merge "Fix install of full build packages." into jb-mr1-dev 2012-09-19 17:06:50 -07:00