Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,503 Commits 3 Branches 0 Tags
a2c3b355877690d889882da3492950d1b2e0e974
Commit Graph

29503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
a2c3b35587 am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread 
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
 2010-12-08 16:15:08 -08:00
Mathias Agopian
74da537f80 Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread 2010-12-08 15:08:33 -08:00
Brad Fitzpatrick
5f8524d446 am 36af7943: Fix malformed Javadoc. 
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
 2010-12-08 13:23:03 -08:00
Brad Fitzpatrick
36af79434f Fix malformed Javadoc. 
Change-Id: I5cfbd49272117defce5226da0f40a8392457a2e2
 2010-12-08 11:31:07 -08:00
Nick Pelly
8abce7f56e am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread 
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
  Implemented getSize() to return max ndef size.
 2010-12-07 22:57:23 -08:00
Nick Pelly
40ddd4a649 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
6d9fc7e1ef Implemented getSize() to return max ndef size. 
Change-Id: Ia584e8cfa51a4eaef5f03dc436c78a67296c2cae
 2010-12-07 22:54:07 -08:00
Martijn Coenen
2f3ed7912e am 5289b91c: Implement ndef formatting. 
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
 2010-12-07 22:35:01 -08:00
Martijn Coenen
5289b91c88 Implement ndef formatting. 
Change-Id: I6e3e3abdc304bc14d7c93a413e42bf957963e288
 2010-12-07 22:30:39 -08:00
Wink Saville
d9c7fde961 am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:22:01 -08:00
Wink Saville
a00d89e824 am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:18:14 -08:00
Dianne Hackborn
c4b7088f19 am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.
 2010-12-07 22:07:40 -08:00
Dianne Hackborn
42a23783aa Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 2010-12-07 22:04:38 -08:00
Dianne Hackborn
7b9c56fe0f Add more checks for bad values to protect from corrupt files. 
Change-Id: I4174c358c49b93e74920b00fcfd6c68659bf7d08
 2010-12-07 22:02:59 -08:00
Wink Saville
2b858caecb Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00
Mathias Agopian
ee5a3aca57 [317580] fix issue where the screen wouldn't be rotated properly in bypass mode 
In some situations, the screen transformation would not be
applied while in bypass mode.

Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
 2010-12-07 21:16:14 -08:00
Mathias Agopian
4e345ab7df am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread 
* commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2':
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)
 2010-12-07 14:22:56 -08:00
Mathias Agopian
a0f011ff49 am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbread 
* commit '05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:20:14 -08:00
Mathias Agopian
48f42f8c3f am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread 
* commit '4153bf3a259624a2f2dc497b77b225a1fb517abc':
  [3171580] don't automatically log GraphicBuffer allocation failures
 2010-12-07 14:20:09 -08:00
Mathias Agopian
a2977c383d Merge changes Ie03796ae,Ide3e980a into gingerbread 
* changes:
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)
 2010-12-07 14:18:56 -08:00
Mathias Agopian
05813b0eb9 Merge changes I244b5469,I32044e91 into gingerbread 
* changes:
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:18:21 -08:00
Mathias Agopian
4153bf3a25 Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread 2010-12-07 14:17:47 -08:00
Jeff Hamilton
03dc51b1a0 am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread 
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.
 2010-12-07 14:04:40 -08:00
Daniel Sandler
688ad19d95 am f340d082: Merge "More precise status bar battery icons." into gingerbread 
* commit 'f340d082b8488de6f131c1e5932cd3abc16b47c1':
  More precise status bar battery icons.
 2010-12-07 14:01:31 -08:00
Jeff Hamilton
0f74afbbf4 Merge "Remove Type X Tags from the top-level API." into gingerbread 2010-12-07 13:59:29 -08:00
Martijn Coenen
72df4ea830 Remove Type X Tags from the top-level API. 
Also added an extra to carry the ndef message, so we can have it in multiple
Ndef instances without doing an active read.

Change-Id: I2ecabc24732990c5c9979ee3a001a7fb13da21d9
 2010-12-07 13:51:47 -08:00
Jean-Baptiste Queru
ee27dd356e am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master 
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources
 2010-12-07 13:02:22 -08:00
Jean-Baptiste Queru
12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master 
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
 2010-12-07 12:51:49 -08:00
Daniel Sandler
f340d082b8 Merge "More precise status bar battery icons." into gingerbread 2010-12-07 12:03:36 -08:00
Jean-Baptiste Queru
78742e01f7 Merge "Strings for NI position request are moved to resources" 2010-12-07 12:01:25 -08:00
Nick Pelly
8c30a47d80 am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread 
* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
  Corrected MIFARE default key set
 2010-12-07 09:34:47 -08:00
Nick Pelly
47e6ccb65a Merge "Corrected MIFARE default key set" into gingerbread 2010-12-07 09:29:21 -08:00
Jan Brands
65c3f9806e Corrected MIFARE default key set 
The all-zero key is not a commonly used key.
Fixed naming

Change-Id: I2fb86079159195c6893ea758e8b0bbda266dc420
 2010-12-07 09:27:06 -08:00
Chung-yih Wang
c9cc9ab590 am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 
* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
  Fix SIP bug of different transport/port used for requests.
 2010-12-06 22:10:29 -08:00
Chung-yih Wang
5f86d7f50b Merge "Fix SIP bug of different transport/port used for requests." into gingerbread 2010-12-06 22:07:59 -08:00
Dirk Dougherty
0d49a4e838 am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram. 
* commit '0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
  Doc change: fix href to axis_globe_inverted orientation diagram.
 2010-12-06 19:44:36 -08:00
Dirk Dougherty
0871ee0c6f Doc change: fix href to axis_globe_inverted orientation diagram. 2010-12-06 19:40:21 -08:00
Martijn Coenen
7012f1eb37 am 9a9706a2: Added missing ndef technology to getTech. 
* commit '9a9706a213637b396226afff53c69927283609a7':
  Added missing ndef technology to getTech.
 2010-12-06 18:48:02 -08:00
Nick Pelly
68cea27329 am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 
* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
  Added NdefFormatable tag, initial class with supported methods.
 2010-12-06 18:44:13 -08:00
Martijn Coenen
9a9706a213 Added missing ndef technology to getTech. 
Change-Id: I1f08e140c9bb43a8e894812adbc4d11801637f46
 2010-12-06 18:44:12 -08:00
Nick Pelly
e58e8a715b Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread 2010-12-06 18:41:36 -08:00
Martijn Coenen
39f91ed529 Added NdefFormatable tag, initial class with supported methods. 
Change-Id: Ifa358b5e980158d5e8accb9f42fdcfb29ad81e64
 2010-12-06 18:38:49 -08:00
Chung-yih Wang
f053292d7a Fix SIP bug of different transport/port used for requests. 
bug: http://b/3156148
Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
 2010-12-07 10:36:19 +08:00
Mathias Agopian
0484a673c5 am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread 
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
  [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
 2010-12-06 18:22:57 -08:00
Mathias Agopian
daef0a040d Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread 2010-12-06 18:20:09 -08:00
Nick Pelly
ea294903ca am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
  Remove ACTION_TAG_DISCOVERED from protected broadcast list.
 2010-12-06 17:45:25 -08:00
Nick Pelly
eba947a32a Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread 2010-12-06 17:43:46 -08:00
Nick Pelly
35042f1f58 Remove ACTION_TAG_DISCOVERED from protected broadcast list. 
ACTION_TAG_DISCOVERED is a start activity intent, not a broadcast intent, so
its presence in this list is redundant.

Change-Id: I05419ec9c4471b7b11c9ae50a02e5ac3d9e572d2
 2010-12-06 17:32:59 -08:00
James Dong
23b791cd0f am d57fbe88: Fixed a race condition where some recording frames may not be released 
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
  Fixed a race condition where some recording frames may not be released
 2010-12-06 15:36:04 -08:00
James Dong
d57fbe887f Fixed a race condition where some recording frames may not be released 
bug - 3258924

Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
 2010-12-06 15:05:06 -08:00