Commit Graph

11181 Commits

Author SHA1 Message Date
Jeff Brown
ea7dfba76c Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev 2012-10-24 13:28:17 -07:00
Jeff Brown
c875f9321a Add ApiDemos for secure surfaces.
Added three ApiDemos for secure surfaces.  One for Activity,
one for Dialog and one for SurfaceView.  The mechanism is the
same in each case but the API is a little different.

Bug: 7368436
Change-Id: I78bc2a456b4c0f1a553120d72f433095ba7e038c
2012-10-24 12:56:50 -07:00
Laurent Tu
8a5ef7c437 am 8b57938a: am bc4f4fce: Add platform FLP for emulator config
* commit '8b57938a393bbc94ffda1a43a706a7cdf7f4ea0e':
  Add platform FLP for emulator config
2012-10-24 11:07:32 -07:00
Laurent Tu
8b57938a39 am bc4f4fce: Add platform FLP for emulator config
* commit 'bc4f4fcecb47e984093c7dfc3008fe45ac011129':
  Add platform FLP for emulator config
2012-10-24 11:06:14 -07:00
Laurent Tu
bc4f4fcecb Add platform FLP for emulator config
Add platform FLP for emulator config since this is now required by
LocationManagerService.ensureFallbackFusedProviderPresentLocked().

Bug: 7379580
Change-Id: If8a3499103eb96d392939fd1ef70368ec9168ad5
2012-10-23 18:36:46 -07:00
Andrew Hsieh
61601e818f am 42d7eefb: Merge "Let users could query cpu features on device."
* commit '42d7eefb86bf9823f5563b6fa2a741b56cfcbe95':
  Let users could query cpu features on device.
2012-10-22 19:59:35 -07:00
Andrew Hsieh
42d7eefb86 Merge "Let users could query cpu features on device." 2012-10-22 19:54:53 -07:00
Lai Wei-Chih
2c9e934fc5 Let users could query cpu features on device.
Change-Id: I9f5d7c66fb4248f5f8cbbf4c350b82a5b8c3aee9
2012-10-23 10:05:22 +08:00
The Android Automerger
d8cfc7d1aa merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-22 16:41:52 -07:00
Xavier Ducrohet
be080b8494 am 64063993: am dc14aa6f: Merge "Update the API file for the SDK." into jb-mr1-dev
* commit '640639932a3eeac06ee461a289db208d8b09e64d':
  Update the API file for the SDK.
2012-10-22 12:40:05 -07:00
Xavier Ducrohet
640639932a am dc14aa6f: Merge "Update the API file for the SDK." into jb-mr1-dev
* commit 'dc14aa6f1c820bedec1d59ac94d42daf8170845b':
  Update the API file for the SDK.
2012-10-22 12:37:37 -07:00
Xavier Ducrohet
dc14aa6f1c Merge "Update the API file for the SDK." into jb-mr1-dev 2012-10-22 12:34:43 -07:00
Xavier Ducrohet
6cee101c6f Update the API file for the SDK.
Also update the platform tools to rev 16.

Change-Id: I92c8e1f99e4192212ed352f38d84d01c6a95d047
2012-10-22 12:10:32 -07:00
Geremy Condra
bdebbf14fd am 84a3fb98: am 03034847: Fixed runtest to work with python != 2.4
* commit '84a3fb98737c303922d591f5bf30c248b05f2c12':
  Fixed runtest to work with python != 2.4
2012-10-22 10:46:06 -07:00
Geremy Condra
84a3fb9873 am 03034847: Fixed runtest to work with python != 2.4
* commit '03034847073ab9979147f17b1d7f2e8dc3995e26':
  Fixed runtest to work with python != 2.4
2012-10-22 10:44:01 -07:00
Geremy Condra
0303484707 Fixed runtest to work with python != 2.4
Change-Id: I6104adb5a6549eb4eaa3f2096633a49e4743ce50
2012-10-19 15:08:05 -07:00
The Android Automerger
cc8defb1b1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 06:59:22 -07:00
Xavier Ducrohet
40ba6ec818 am 8be1a88d: am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit '8be1a88d20f9d9980075f67396781cb59660a36a':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:59:12 -07:00
Xavier Ducrohet
8be1a88d20 am 43b41f52: am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit '43b41f5298658a5e95410df5ed80f7dea816abd2':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:56:13 -07:00
Xavier Ducrohet
43b41f5298 am bb65013d: (-s ours) am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit 'bb65013d27d222ef63258a574665cd197c985580':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:53:58 -07:00
Xavier Ducrohet
bb65013d27 am fc848872: Update platform source.prop for new layoutlib. do not merge.
* commit 'fc8488729db76770c29bf9a66805fab421bf000c':
  Update platform source.prop for new layoutlib. do not merge.
2012-10-18 17:50:36 -07:00
Xavier Ducrohet
fc8488729d Update platform source.prop for new layoutlib. do not merge.
Change-Id: Idd813cc0c69d67e1f60e23ec0b4254d26e459ba3
2012-10-18 17:40:20 -07:00
Jeff Hamilton
c5d3d8fe47 am 4e9866a7: am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev
* commit '4e9866a74b19819a7deb78c22ed8814cf8ae8456':
  Change the name of the location config value.
2012-10-18 12:44:28 -07:00
Jeff Hamilton
4e9866a74b am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev
* commit '30870013927905645c1afb08a336df2c3e4e7d47':
  Change the name of the location config value.
2012-10-18 12:41:23 -07:00
Jeff Hamilton
3087001392 Merge "Change the name of the location config value." into jb-mr1-dev 2012-10-18 12:39:24 -07:00
The Android Automerger
56311b5943 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-18 06:59:22 -07:00
Xavier Ducrohet
7c11b0ce73 am 9be07e8c: am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev
* commit '9be07e8c914438a4918a272fc8944141964c8d62':
  update source.prop for the sdk platform package.
2012-10-17 17:25:35 -07:00
Xavier Ducrohet
9be07e8c91 am 06c5d2f2: Merge "update source.prop for the sdk platform package." into jb-mr1-dev
* commit '06c5d2f21f1c8ff049c21414a638fa85e080e8e8':
  update source.prop for the sdk platform package.
2012-10-17 17:23:15 -07:00
Xavier Ducrohet
06c5d2f21f Merge "update source.prop for the sdk platform package." into jb-mr1-dev 2012-10-17 17:21:43 -07:00
Xavier Ducrohet
ab136ad100 update source.prop for the sdk platform package.
Uses the new Layoutlib API 9
Requires tools 21.

Change-Id: If1ced35107df4118775d95e3c44ebfd94a0f1209
2012-10-17 17:20:47 -07:00
The Android Automerger
4cce2a32b0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:00 -07:00
Scott Main
580e902e97 am d6d8114b: am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit 'd6d8114ba55ead1756cf13e9f154a52688bb959a':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:48:38 -07:00
Scott Main
d6d8114ba5 am 1cb485c8: am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '1cb485c8b61c05b8885e1566952f6fcfabab412d':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:46:15 -07:00
Scott Main
1cb485c8b6 am b63a8975: am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit 'b63a8975abad7381491aad0d85b107a9cb58ec56':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:44:15 -07:00
Scott Main
b63a8975ab am 37e24aec: am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '37e24aecdee0193648a2d62d594aed8cd137bf89':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:41:21 -07:00
Scott Main
37e24aecde am 352b33ba: add redirect for layout-objects.html bug: 7366567
* commit '352b33ba8bf0b590d7db8fb694ad0360265627eb':
  add redirect for layout-objects.html bug: 7366567
2012-10-17 15:37:42 -07:00
Scott Main
352b33ba8b add redirect for layout-objects.html
bug: 7366567

Change-Id: Ie660fd1353fc7106da1afa5df2951a3e5d9d8477
2012-10-17 11:25:09 -07:00
The Android Automerger
480774f2eb merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-16 17:30:13 -07:00
Jeff Hamilton
13dc6a2223 Change the name of the location config value.
This reverts commit 329b760e8e.

Bug: 7242814
2012-10-16 16:14:25 -05:00
Scott Main
5e75d40830 am 7e78827e: am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '7e78827e935d0dadd93d53f78835a7b6fe141918':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:49:02 -07:00
Scott Main
7e78827e93 am b0cab80d: am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'b0cab80d117ff842767d9bb95ff56d0b8d002d9a':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:46:14 -07:00
Scott Main
b0cab80d11 am 487869a8: am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '487869a86bae6246b51cee91bc4ceb543d23b317':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:43:56 -07:00
Scott Main
487869a86b am 05bca821: am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit '05bca821e1c401bbd9dacb200aa0e6a2759c3478':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:41:19 -07:00
Scott Main
05bca821e1 am ec54ca15: add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
* commit 'ec54ca1518080e12ee042e596f2e1947917293ea':
  add redirect from nofification summary page to Notifications doc because this navigation is now flat so each doc is visible in side nav at top
2012-10-16 11:39:04 -07:00
Andrew Hsieh
d52033cafc am 1d35fba9: Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h"
* commit '1d35fba9bd37d4d6af224bbd25a034a680bca2eb':
  ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
2012-10-16 10:30:47 -07:00
Andrew Hsieh
1d35fba9bd Merge "ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h" 2012-10-16 10:12:26 -07:00
David 'Digit' Turner
db5a5ada90 ndk: Remove LONG_LONG_MIN/MAX hack from pthread.h
The LONG_LONG_MIN, LONG_LONG_MAX and ULONG_LONG_MAX are
GLibc-specific macros. Move their declarations from
<pthread.h> to <limits.h> where they belong.

Change-Id: I597465b99893706ade82069238f60df73d8e236e
2012-10-16 09:49:10 +02:00
Andrew Hsieh
c7ceaa791d am 9f17b1e1: Merge "Remove obsolete LOCAL_NDK_VERSION"
* commit '9f17b1e1a40076470c9e521b298ba29e771419dc':
  Remove obsolete LOCAL_NDK_VERSION
2012-10-15 20:20:58 -07:00
Andrew Hsieh
9f17b1e1a4 Merge "Remove obsolete LOCAL_NDK_VERSION" 2012-10-15 20:05:15 -07:00
The Android Open Source Project
d32a73105b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: If89cb33a85e3457bff663b54d6dc16b05f180294
2012-10-15 07:38:06 -07:00