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

1769 Commits

Author SHA1 Message Date
Xavier Ducrohet
ddf155b833 am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work
 2011-08-17 14:38:15 -07:00
Xavier Ducrohet
5dcda1fda5 am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
 2011-08-17 14:35:20 -07:00
Xavier Ducrohet
88512f59bc am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
  Fix String16 operator+ to actually work
 2011-08-17 14:31:08 -07:00
Josiah Gaskin
4d07453ded Fix String16 operator+ to actually work 
This change fixes the String16 utility's operator+ function.

Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
 2011-08-16 15:16:04 -07:00
Jean-Baptiste Queru
ed3418076d am b654e6e5: am d144748d: Merge "Add missing include" 
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
  Add missing include
 2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
b654e6e55a am d144748d: Merge "Add missing include" 
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
  Add missing include
 2011-08-11 15:18:22 -07:00
Jean-Baptiste Queru
d1c5b0233c Add missing include 
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
 2011-08-11 13:36:04 -07:00
Jean-Baptiste Queru
e30af493a6 am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
  added stub for getting buffer from surface texture
 2011-08-11 12:24:51 -07:00
Jean-Baptiste Queru
44874c236d am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
  added stub for getting buffer from surface texture
 2011-08-11 12:19:44 -07:00
Chris Craik
311ffe37a5 added stub for getting buffer from surface texture 
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
 2011-08-11 11:56:59 -07:00
Jeff Brown
8f226dcb21 am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." 
* commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
  Fix getSwitchState according to device capabilities.
 2011-08-10 13:59:44 -07:00
Jeff Brown
b4459d8d6d am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 
* commit '7e79b9aad85db332d334f8bc1625bf46f030830f':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
 2011-08-10 13:59:41 -07:00
Jeff Brown
ca97671e2b am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." 
* commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
  Fix getSwitchState according to device capabilities.
 2011-08-10 13:56:33 -07:00
Jeff Brown
7e79b9aad8 am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 
* commit 'dbff91077ddf437b62794e077d2ce9e10fff8170':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
 2011-08-10 13:56:31 -07:00
Jeff Brown
6f5a837c9c Merge "Fix getSwitchState according to device capabilities." 2011-08-10 13:42:03 -07:00
Jeff Brown
dbff91077d Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-08-10 13:41:36 -07:00
Jean-Baptiste Queru
3a5e36f96b am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:19:05 -07:00
Jean-Baptiste Queru
98c531dca9 am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '9b0c6beed2cd5463655712ad80ed160c08611ff8':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:15:24 -07:00
Teng-Hui Zhu
c6ca43176d Fix a compiling error when trying to use setBufferCount 
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
 2011-08-02 16:57:20 -07:00
Derek Sollenberger
a30ed30b75 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp 
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
 2011-07-29 14:16:18 -04:00
Derek Sollenberger
b7f09f28b9 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:53:09 -07:00
Derek Sollenberger
b7ed8471f1 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:50:11 -07:00
Derek Sollenberger
0e4afa1fb1 Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Michaël Burtin
42305c54c7 Fix getSwitchState according to device capabilities. 
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.

Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
 2011-07-29 15:28:02 +02:00
Jeff Brown
d5d7e164d3 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
 2011-07-28 14:00:27 -07:00
Mathias Agopian
913a5a3cc6 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-07-27 11:31:57 -07:00
Xavier Ducrohet
e0947693c9 am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:53:51 -07:00
Jean-Baptiste Queru
7595e84d3a am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility
 2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
0fe0e7a4cb Tweak for forward-compatibility 
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
 2011-06-24 10:49:18 -07:00
Jean-Baptiste Queru
ff3ead5072 am e3b05d09: Merge "Tweaks for forward-compatibility" 
* commit 'e3b05d09163257b888c86f2a560e10c48f4cf029':
  Tweaks for forward-compatibility
 2011-06-20 09:05:07 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility 
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
 2011-06-18 09:42:04 -07:00
Mathias Agopian
ec15afca08 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-06-16 18:26:14 -07:00
Mathias Agopian
3b916233cb am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:15:19 -07:00
Mathias Agopian
e7d3ee9d81 Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
 2011-06-16 17:22:28 -07:00
Mathias Agopian
35e6d6867c am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE) 
* commit '0887b8c2e583e682cd2c1bc909cb3fdbec704004':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)
 2011-06-15 22:42:52 -07:00
Mathias Agopian
552bd67007 am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom" 
* commit 'd5244e0a88ed2f843651aa5ffdc71a45c968e0f3':
  Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"
 2011-06-15 22:12:32 -07:00
Mathias Agopian
8e18668d14 revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE) 
This reverts commit 52a43990880b27808bcf562afcc4209d34728e6e.

Change-Id: I1856a48f863b051395b8091ddfd1e01292fa1b1e
 2011-06-15 20:45:32 -07:00
Mathias Agopian
52a4399088 Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom" 
This reverts commit af6edba59e250adbdfa5b3c3be134f70d8c38a16.

Change-Id: I7793d3ca8a4d20a2b188364f47854328ab5f586d
 2011-06-15 20:42:25 -07:00
Mathias Agopian
85c14352a4 am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into honeycomb-mr2 
* commit '7ecdeb6e548ff71d4f70b343e30136e89eaa3e33':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom
 2011-06-15 20:21:31 -07:00
Mathias Agopian
af6edba59e revert surfaceflinger leak fix as it uncovered a crasher on xoom 
Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
 2011-06-15 19:31:04 -07:00
Mathias Agopian
5137711109 am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:13:04 -07:00
Mathias Agopian
9ee3975883 am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:30:34 -07:00
Mathias Agopian
69b4587bfb DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
 2011-06-14 12:05:42 -07:00
Mathias Agopian
c031afc8e9 am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:15:00 -07:00
Mathias Agopian
afffa8fa9f fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
 2011-06-13 13:58:34 -07:00
Mathias Agopian
a9c9a4baf2 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Jeff Brown
61220e880a am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
  Revert velocity damping. Bug: 4364920
 2011-06-06 20:36:49 -07:00
Jeff Brown
2c1804998b Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:32:18 -07:00